/*
 * Public API and common code for kernel->userspace relay file support.
 *
 * See Documentation/filesystems/relay.rst for an overview.
 *
 * Copyright (C) 2002-2005 - Tom Zanussi (zanussi@us.ibm.com), IBM Corp
 * Copyright (C) 1999-2005 - Karim Yaghmour (karim@opersys.com)
 *
 * Moved to kernel/relay.c by Paul Mundt, 2006.
 * November 2006 - CPU hotplug support by Mathieu Desnoyers
 * 	(mathieu.desnoyers@polymtl.ca)
 *
 * This file is released under the GPL.
 */
#include <linux/errno.h>
#include <linux/stddef.h>
#include <linux/slab.h>
#include <linux/export.h>
#include <linux/string.h>
#include <linux/relay.h>
#include <linux/vmalloc.h>
#include <linux/mm.h>
#include <linux/cpu.h>
#include <linux/splice.h>

/* list of open channels, for cpu hotplug */
static DEFINE_MUTEX(relay_channels_mutex);
static LIST_HEAD(relay_channels);

/*
 * fault() vm_op implementation for relay file mapping.
 */
static vm_fault_t relay_buf_fault(struct vm_fault *vmf)
{
	struct page *page;
	struct rchan_buf *buf = vmf->vma->vm_private_data;
	pgoff_t pgoff = vmf->pgoff;

	if (!buf)
		return VM_FAULT_OOM;

	page = vmalloc_to_page(buf->start + (pgoff << PAGE_SHIFT));
	if (!page)
		return VM_FAULT_SIGBUS;
	get_page(page);
	vmf->page = page;

	return 0;
}

/*
 * vm_ops for relay file mappings.
 */
static const struct vm_operations_struct relay_file_mmap_ops = {
	.fault = relay_buf_fault,
};

/*
 * allocate an array of pointers of struct page
 */
static struct page **relay_alloc_page_array(unsigned int n_pages)
{
	return kvcalloc(n_pages, sizeof(struct page *), GFP_KERNEL);
}

/*
 * free an array of pointers of struct page
 */
static void relay_free_page_array(struct page **array)
{
	kvfree(array);
}

/**
 *	relay_mmap_buf: - mmap channel buffer to process address space
 *	@buf: relay channel buffer
 *	@vma: vm_area_struct describing memory to be mapped
 *
 *	Returns 0 if ok, negative on error
 *
 *	Caller should already have grabbed mmap_lock.
 */
static int relay_mmap_buf(struct rchan_buf *buf, struct vm_area_struct *vma)
{
	unsigned long length = vma->vm_end - vma->vm_start;

	if (!buf)
		return -EBADF;

	if (length != (unsigned long)buf->chan->alloc_size)
		return -EINVAL;

	vma->vm_ops = &relay_file_mmap_ops;
	vm_flags_set(vma, VM_DONTEXPAND);
	vma->vm_private_data = buf;

	return 0;
}

/**
 *	relay_alloc_buf - allocate a channel buffer
 *	@buf: the buffer struct
 *	@size: total size of the buffer
 *
 *	Returns a pointer to the resulting buffer, %NULL if unsuccessful. The
 *	passed in size will get page aligned, if it isn't already.
 */
static void *relay_alloc_buf(struct rchan_buf *buf, size_t *size)
{
	void *mem;
	unsigned int i, j, n_pages;

	*size = PAGE_ALIGN(*size);
	n_pages = *size >> PAGE_SHIFT;

	buf->page_array = relay_alloc_page_array(n_pages);
	if (!buf->page_array)
		return NULL;

	for (i = 0; i < n_pages; i++) {
		buf->page_array[i] = alloc_page(GFP_KERNEL);
		if (unlikely(!buf->page_array[i]))
			goto depopulate;
		set_page_private(buf->page_array[i], (unsigned long)buf);
	}
	mem = vmap(buf->page_array, n_pages, VM_MAP, PAGE_KERNEL);
	if (!mem)
		goto depopulate;

	memset(mem, 0, *size);
	buf->page_count = n_pages;
	return mem;

depopulate:
	for (j = 0; j < i; j++)
		__free_page(buf->page_array[j]);
	relay_free_page_array(buf->page_array);
	return NULL;
}

/**
 *	relay_create_buf - allocate and initialize a channel buffer
 *	@chan: the relay channel
 *
 *	Returns channel buffer if successful, %NULL otherwise.
 */
static struct rchan_buf *relay_create_buf(struct rchan *chan)
{
	struct rchan_buf *buf;

	if (chan->n_subbufs > KMALLOC_MAX_SIZE / sizeof(size_t))
		return NULL;

	buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL);
	if (!buf)
		return NULL;
	buf->padding = kmalloc_array(chan->n_subbufs, sizeof(size_t),
				     GFP_KERNEL);
	if (!buf->padding)
		goto free_buf;

	buf->start = relay_alloc_buf(buf, &chan->alloc_size);
	if (!buf->start)
		goto free_buf;

	buf->chan = chan;
	kref_get(&buf->chan->kref);
	return buf;

free_buf:
	kfree(buf->padding);
	kfree(buf);
	return NULL;
}

/**
 *	relay_destroy_channel - free the channel struct
 *	@kref: target kernel reference that contains the relay channel
 *
 *	Should only be called from kref_put().
 */
static void relay_destroy_channel(struct kref *kref)
{
	struct rchan *chan = container_of(kref, struct rchan, kref);
	free_percpu(chan->buf);
	kfree(chan);
}

/**
 *	relay_destroy_buf - destroy an rchan_buf struct and associated buffer
 *	@buf: the buffer struct
 */
static void relay_destroy_buf(struct rchan_buf *buf)
{
	struct rchan *chan = buf->chan;
	unsigned int i;

	if (likely(buf->start)) {
		vunmap(buf->start);
		for (i = 0; i < buf->page_count; i++)
			__free_page(buf->page_array[i]);
		relay_free_page_array(buf->page_array);
	}
	*per_cpu_ptr(chan->buf, buf->cpu) = NULL;
	kfree(buf->padding);
	kfree(buf);
	kref_put(&chan->kref, relay_destroy_channel);
}

/**
 *	relay_remove_buf - remove a channel buffer
 *	@kref: target kernel reference that contains the relay buffer
 *
 *	Removes the file from the filesystem, which also frees the
 *	rchan_buf_struct and the channel buffer.  Should only be called from
 *	kref_put().
 */
static void relay_remove_buf(struct kref *kref)
{
	struct rchan_buf *buf = container_of(kref, struct rchan_buf, kref);
	relay_destroy_buf(buf);
}

/**
 *	relay_buf_empty - boolean, is the channel buffer empty?
 *	@buf: channel buffer
 *
 *	Returns 1 if the buffer is empty, 0 otherwise.
 */
static int relay_buf_empty(struct rchan_buf *buf)
{
	return (buf->subbufs_produced - buf->subbufs_consumed) ? 0 : 1;
}

/**
 *	relay_buf_full - boolean, is the channel buffer full?
 *	@buf: channel buffer
 *
 *	Returns 1 if the buffer is full, 0 otherwise.
 */
int relay_buf_full(struct rchan_buf *buf)
{
	size_t ready = buf->subbufs_produced - buf->subbufs_consumed;
	return (ready >= buf->chan->n_subbufs) ? 1 : 0;
}
EXPORT_SYMBOL_GPL(relay_buf_full);

/*
 * High-level relay kernel API and associated functions.
 */

static int relay_subbuf_start(struct rchan_buf *buf, void *subbuf,
			      void *prev_subbuf, size_t prev_padding)
{
	if (!buf->chan->cb->subbuf_start)
		return !relay_buf_full(buf);

	return buf->chan->cb->subbuf_start(buf, subbuf,
					   prev_subbuf, prev_padding);
}

/**
 *	wakeup_readers - wake up readers waiting on a channel
 *	@work: contains the channel buffer
 *
 *	This is the function used to defer reader waking
 */
static void wakeup_readers(struct irq_work *work)
{
	struct rchan_buf *buf;

	buf = container_of(work, struct rchan_buf, wakeup_work);
	wake_up_interruptible(&buf->read_wait);
}

/**
 *	__relay_reset - reset a channel buffer
 *	@buf: the channel buffer
 *	@init: 1 if this is a first-time initialization
 *
 *	See relay_reset() for description of effect.
 */
static void __relay_reset(struct rchan_buf *buf, unsigned int init)
{
	size_t i;

	if (init) {
		init_waitqueue_head(&buf->read_wait);
		kref_init(&buf->kref);
		init_irq_work(&buf->wakeup_work, wakeup_readers);
	} else {
		irq_work_sync(&buf->wakeup_work);
	}

	buf->subbufs_produced = 0;
	buf->subbufs_consumed = 0;
	buf->bytes_consumed = 0;
	buf->finalized = 0;
	buf->data = buf->start;
	buf->offset = 0;

	for (i = 0; i < buf->chan->n_subbufs; i++)
		buf->padding[i] = 0;

	relay_subbuf_start(buf, buf->data, NULL, 0);
}

/**
 *	relay_reset - reset the channel
 *	@chan: the channel
 *
 *	This has the effect of erasing all data from all channel buffers
 *	and restarting the channel in its initial state.  The buffers
 *	are not freed, so any mappings are still in effect.
 *
 *	NOTE. Care should be taken that the channel isn't actually
 *	being used by anything when this call is made.
 */
void relay_reset(struct rchan *chan)
{
	struct rchan_buf *buf;
	unsigned int i;

	if (!chan)
		return;

	if (chan->is_global && (buf = *per_cpu_ptr(chan->buf, 0))) {
		__relay_reset(buf, 0);
		return;
	}

	mutex_lock(&relay_channels_mutex);
	for_each_possible_cpu(i)
		if ((buf = *per_cpu_ptr(chan->buf, i)))
			__relay_reset(buf, 0);
	mutex_unlock(&relay_channels_mutex);
}
EXPORT_SYMBOL_GPL(relay_reset);

static inline void relay_set_buf_dentry(struct rchan_buf *buf,
					struct dentry *dentry)
{
	buf->dentry = dentry;
	d_inode(buf->dentry)->i_size = buf->early_bytes;
}

static struct dentry *relay_create_buf_file(struct rchan *chan,
					    struct rchan_buf *buf,
					    unsigned int cpu)
{
	struct dentry *dentry;
	char *tmpname;

	tmpname = kzalloc(NAME_MAX + 1, GFP_KERNEL);
	if (!tmpname)
		return NULL;
	snprintf(tmpname, NAME_MAX, "%s%d", chan->base_filename, cpu);

	/* Create file in fs */
	dentry = chan->cb->create_buf_file(tmpname, chan->parent,
					   S_IRUSR, buf,
					   &chan->is_global);
	if (IS_ERR(dentry))
		dentry = NULL;

	kfree(tmpname);

	return dentry;
}

/*
 *	relay_open_buf - create a new relay channel buffer
 *
 *	used by relay_open() and CPU hotplug.
 */
static struct rchan_buf *relay_open_buf(struct rchan *chan, unsigned int cpu)
{
	struct rchan_buf *buf;
	struct dentry *dentry;

 	if (chan->is_global)
		return *per_cpu_ptr(chan->buf, 0);

	buf = relay_create_buf(chan);
	if (!buf)
		return NULL;

	if (chan->has_base_filename) {
		dentry = relay_create_buf_file(chan, buf, cpu);
		if (!dentry)
			goto free_buf;
		relay_set_buf_dentry(buf, dentry);
	} else {
		/* Only retrieve global info, nothing more, nothing less */
		dentry = chan->cb->create_buf_file(NULL, NULL,
						   S_IRUSR, buf,
						   &chan->is_global);
		if (IS_ERR_OR_NULL(dentry))
			goto free_buf;
	}

 	buf->cpu = cpu;
 	__relay_reset(buf, 1);

 	if(chan->is_global) {
		*per_cpu_ptr(chan->buf, 0) = buf;
 		buf->cpu = 0;
  	}

	return buf;

free_buf:
 	relay_destroy_buf(buf);
	return NULL;
}

/**
 *	relay_close_buf - close a channel buffer
 *	@buf: channel buffer
 *
 *	Marks the buffer finalized and restores the default callbacks.
 *	The channel buffer and channel buffer data structure are then freed
 *	automatically when the last reference is given up.
 */
static void relay_close_buf(struct rchan_buf *buf)
{
	buf->finalized = 1;
	irq_work_sync(&buf->wakeup_work);
	buf->chan->cb->remove_buf_file(buf->dentry);
	kref_put(&buf->kref, relay_remove_buf);
}

int relay_prepare_cpu(unsigned int cpu)
{
	struct rchan *chan;
	struct rchan_buf *buf;

	mutex_lock(&relay_channels_mutex);
	list_for_each_entry(chan, &relay_channels, list) {
		if (*per_cpu_ptr(chan->buf, cpu))
			continue;
		buf = relay_open_buf(chan, cpu);
		if (!buf) {
			pr_err("relay: cpu %d buffer creation failed\n", cpu);
			mutex_unlock(&relay_channels_mutex);
			return -ENOMEM;
		}
		*per_cpu_ptr(chan->buf, cpu) = buf;
	}
	mutex_unlock(&relay_channels_mutex);
	return 0;
}

/**
 *	relay_open - create a new relay channel
 *	@base_filename: base name of files to create, %NULL for buffering only
 *	@parent: dentry of parent directory, %NULL for root directory or buffer
 *	@subbuf_size: size of sub-buffers
 *	@n_subbufs: number of sub-buffers
 *	@cb: client callback functions
 *	@private_data: user-defined data
 *
 *	Returns channel pointer if successful, %NULL otherwise.
 *
 *	Creates a channel buffer for each cpu using the sizes and
 *	attributes specified.  The created channel buffer files
 *	will be named base_filename0...base_filenameN-1.  File
 *	permissions will be %S_IRUSR.
 *
 *	If opening a buffer (@parent = NULL) that you later wish to register
 *	in a filesystem, call relay_late_setup_files() once the @parent dentry
 *	is available.
 */
struct rchan *relay_open(const char *base_filename,
			 struct dentry *parent,
			 size_t subbuf_size,
			 size_t n_subbufs,
			 const struct rchan_callbacks *cb,
			 void *private_data)
{
	unsigned int i;
	struct rchan *chan;
	struct rchan_buf *buf;

	if (!(subbuf_size && n_subbufs))
		return NULL;
	if (subbuf_size > UINT_MAX / n_subbufs)
		return NULL;
	if (!cb || !cb->create_buf_file || !cb->remove_buf_file)
		return NULL;

	chan = kzalloc(sizeof(struct rchan), GFP_KERNEL);
	if (!chan)
		return NULL;

	chan->buf = alloc_percpu(struct rchan_buf *);
	if (!chan->buf) {
		kfree(chan);
		return NULL;
	}

	chan->version = RELAYFS_CHANNEL_VERSION;
	chan->n_subbufs = n_subbufs;
	chan->subbuf_size = subbuf_size;
	chan->alloc_size = PAGE_ALIGN(subbuf_size * n_subbufs);
	chan->parent = parent;
	chan->private_data = private_data;
	if (base_filename) {
		chan->has_base_filename = 1;
		strscpy(chan->base_filename, base_filename, NAME_MAX);
	}
	chan->cb = cb;
	kref_init(&chan->kref);

	mutex_lock(&relay_channels_mutex);
	for_each_online_cpu(i) {
		buf = relay_open_buf(chan, i);
		if (!buf)
			goto free_bufs;
		*per_cpu_ptr(chan->buf, i) = buf;
	}
	list_add(&chan->list, &relay_channels);
	mutex_unlock(&relay_channels_mutex);

	return chan;

free_bufs:
	for_each_possible_cpu(i) {
		if ((buf = *per_cpu_ptr(chan->buf, i)))
			relay_close_buf(buf);
	}

	kref_put(&chan->kref, relay_destroy_channel);
	mutex_unlock(&relay_channels_mutex);
	return NULL;
}
EXPORT_SYMBOL_GPL(relay_open);

struct rchan_percpu_buf_dispatcher {
	struct rchan_buf *buf;
	struct dentry *dentry;
};

/* Called in atomic context. */
static void __relay_set_buf_dentry(void *info)
{
	struct rchan_percpu_buf_dispatcher *p = info;

	relay_set_buf_dentry(p->buf, p->dentry);
}

/**
 *	relay_late_setup_files - triggers file creation
 *	@chan: channel to operate on
 *	@base_filename: base name of files to create
 *	@parent: dentry of parent directory, %NULL for root directory
 *
 *	Returns 0 if successful, non-zero otherwise.
 *
 *	Use to setup files for a previously buffer-only channel created
 *	by relay_open() with a NULL parent dentry.
 *
 *	For example, this is useful for perfomring early tracing in kernel,
 *	before VFS is up and then exposing the early results once the dentry
 *	is available.
 */
int relay_late_setup_files(struct rchan *chan,
			   const char *base_filename,
			   struct dentry *parent)
{
	int err = 0;
	unsigned int i, curr_cpu;
	unsigned long flags;
	struct dentry *dentry;
	struct rchan_buf *buf;
	struct rchan_percpu_buf_dispatcher disp;

	if (!chan || !base_filename)
		return -EINVAL;

	strscpy(chan->base_filename, base_filename, NAME_MAX);

	mutex_lock(&relay_channels_mutex);
	/* Is chan already set up? */
	if (unlikely(chan->has_base_filename)) {
		mutex_unlock(&relay_channels_mutex);
		return -EEXIST;
	}
	chan->has_base_filename = 1;
	chan->parent = parent;

	if (chan->is_global) {
		err = -EINVAL;
		buf = *per_cpu_ptr(chan->buf, 0);
		if (!WARN_ON_ONCE(!buf)) {
			dentry = relay_create_buf_file(chan, buf, 0);
			if (dentry && !WARN_ON_ONCE(!chan->is_global)) {
				relay_set_buf_dentry(buf, dentry);
				err = 0;
			}
		}
		mutex_unlock(&relay_channels_mutex);
		return err;
	}

	curr_cpu = get_cpu();
	/*
	 * The CPU hotplug notifier ran before us and created buffers with
	 * no files associated. So it's safe to call relay_setup_buf_file()
	 * on all currently online CPUs.
	 */
	for_each_online_cpu(i) {
		buf = *per_cpu_ptr(chan->buf, i);
		if (unlikely(!buf)) {
			WARN_ONCE(1, KERN_ERR "CPU has no buffer!\n");
			err = -EINVAL;
			break;
		}

		dentry = relay_create_buf_file(chan, buf, i);
		if (unlikely(!dentry)) {
			err = -EINVAL;
			break;
		}

		if (curr_cpu == i) {
			local_irq_save(flags);
			relay_set_buf_dentry(buf, dentry);
			local_irq_restore(flags);
		} else {
			disp.buf = buf;
			disp.dentry = dentry;
			smp_mb();
			/* relay_channels_mutex must be held, so wait. */
			err = smp_call_function_single(i,
						       __relay_set_buf_dentry,
						       &disp, 1);
		}
		if (unlikely(err))
			break;
	}
	put_cpu();
	mutex_unlock(&relay_channels_mutex);

	return err;
}
EXPORT_SYMBOL_GPL(relay_late_setup_files);

/**
 *	relay_switch_subbuf - switch to a new sub-buffer
 *	@buf: channel buffer
 *	@length: size of current event
 *
 *	Returns either the length passed in or 0 if full.
 *
 *	Performs sub-buffer-switch tasks such as invoking callbacks,
 *	updating padding counts, waking up readers, etc.
 */
size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
{
	void *old, *new;
	size_t old_subbuf, new_subbuf;

	if (unlikely(length > buf->chan->subbuf_size))
		goto toobig;

	if (buf->offset != buf->chan->subbuf_size + 1) {
		buf->prev_padding = buf->chan->subbuf_size - buf->offset;
		old_subbuf = buf->subbufs_produced % buf->chan->n_subbufs;
		buf->padding[old_subbuf] = buf->prev_padding;
		buf->subbufs_produced++;
		if (buf->dentry)
			d_inode(buf->dentry)->i_size +=
				buf->chan->subbuf_size -
				buf->padding[old_subbuf];
		else
			buf->early_bytes += buf->chan->subbuf_size -
					    buf->padding[old_subbuf];
		smp_mb();
		if (waitqueue_active(&buf->read_wait)) {
			/*
			 * Calling wake_up_interruptible() from here
			 * will deadlock if we happen to be logging
			 * from the scheduler (trying to re-grab
			 * rq->lock), so defer it.
			 */
			irq_work_queue(&buf->wakeup_work);
		}
	}

	old = buf->data;
	new_subbuf = buf->subbufs_produced % buf->chan->n_subbufs;
	new = buf->start + new_subbuf * buf->chan->subbuf_size;
	buf->offset = 0;
	if (!relay_subbuf_start(buf, new, old, buf->prev_padding)) {
		buf->offset = buf->chan->subbuf_size + 1;
		return 0;
	}
	buf->data = new;
	buf->padding[new_subbuf] = 0;

	if (unlikely(length + buf->offset > buf->chan->subbuf_size))
		goto toobig;

	return length;

toobig:
	buf->chan->last_toobig = length;
	return 0;
}
EXPORT_SYMBOL_GPL(relay_switch_subbuf);

/**
 *	relay_subbufs_consumed - update the buffer's sub-buffers-consumed count
 *	@chan: the channel
 *	@cpu: the cpu associated with the channel buffer to update
 *	@subbufs_consumed: number of sub-buffers to add to current buf's count
 *
 *	Adds to the channel buffer's consumed sub-buffer count.
 *	subbufs_consumed should be the number of sub-buffers newly consumed,
 *	not the total consumed.
 *
 *	NOTE. Kernel clients don't need to call this function if the channel
 *	mode is 'overwrite'.
 */
void relay_subbufs_consumed(struct rchan *chan,
			    unsigned int cpu,
			    size_t subbufs_consumed)
{
	struct rchan_buf *buf;

	if (!chan || cpu >= NR_CPUS)
		return;

	buf = *per_cpu_ptr(chan->buf, cpu);
	if (!buf || subbufs_consumed > chan->n_subbufs)
		return;

	if (subbufs_consumed > buf->subbufs_produced - buf->subbufs_consumed)
		buf->subbufs_consumed = buf->subbufs_produced;
	else
		buf->subbufs_consumed += subbufs_consumed;
}
EXPORT_SYMBOL_GPL(relay_subbufs_consumed);

/**
 *	relay_close - close the channel
 *	@chan: the channel
 *
 *	Closes all channel buffers and frees the channel.
 */
void relay_close(struct rchan *chan)
{
	struct rchan_buf *buf;
	unsigned int i;

	if (!chan)
		return;

	mutex_lock(&relay_channels_mutex);
	if (chan->is_global && (buf = *per_cpu_ptr(chan->buf, 0)))
		relay_close_buf(buf);
	else
		for_each_possible_cpu(i)
			if ((buf = *per_cpu_ptr(chan->buf, i)))
				relay_close_buf(buf);

	if (chan->last_toobig)
		printk(KERN_WARNING "relay: one or more items not logged "
		       "[item size (%zd) > sub-buffer size (%zd)]\n",
		       chan->last_toobig, chan->subbuf_size);

	list_del(&chan->list);
	kref_put(&chan->kref, relay_destroy_channel);
	mutex_unlock(&relay_channels_mutex);
}
EXPORT_SYMBOL_GPL(relay_close);

/**
 *	relay_flush - close the channel
 *	@chan: the channel
 *
 *	Flushes all channel buffers, i.e. forces buffer switch.
 */
void relay_flush(struct rchan *chan)
{
	struct rchan_buf *buf;
	unsigned int i;

	if (!chan)
		return;

	if (chan->is_global && (buf = *per_cpu_ptr(chan->buf, 0))) {
		relay_switch_subbuf(buf, 0);
		return;
	}

	mutex_lock(&relay_channels_mutex);
	for_each_possible_cpu(i)
		if ((buf = *per_cpu_ptr(chan->buf, i)))
			relay_switch_subbuf(buf, 0);
	mutex_unlock(&relay_channels_mutex);
}
EXPORT_SYMBOL_GPL(relay_flush);

/**
 *	relay_file_open - open file op for relay files
 *	@inode: the inode
 *	@filp: the file
 *
 *	Increments the channel buffer refcount.
 */
static int relay_file_open(struct inode *inode, struct file *filp)
{
	struct rchan_buf *buf = inode->i_private;
	kref_get(&buf->kref);
	filp->private_data = buf;

	return nonseekable_open(inode, filp);
}

/**
 *	relay_file_mmap - mmap file op for relay files
 *	@filp: the file
 *	@vma: the vma describing what to map
 *
 *	Calls upon relay_mmap_buf() to map the file into user space.
 */
static int relay_file_mmap(struct file *filp, struct vm_area_struct *vma)
{
	struct rchan_buf *buf = filp->private_data;
	return relay_mmap_buf(buf, vma);
}

/**
 *	relay_file_poll - poll file op for relay files
 *	@filp: the file
 *	@wait: poll table
 *
 *	Poll implemention.
 */
static __poll_t relay_file_poll(struct file *filp, poll_table *wait)
{
	__poll_t mask = 0;
	struct rchan_buf *buf = filp->private_data;

	if (buf->finalized)
		return EPOLLERR;

	if (filp->f_mode & FMODE_READ) {
		poll_wait(filp, &buf->read_wait, wait);
		if (!relay_buf_empty(buf))
			mask |= EPOLLIN | EPOLLRDNORM;
	}

	return mask;
}

/**
 *	relay_file_release - release file op for relay files
 *	@inode: the inode
 *	@filp: the file
 *
 *	Decrements the channel refcount, as the filesystem is
 *	no longer using it.
 */
static int relay_file_release(struct inode *inode, struct file *filp)
{
	struct rchan_buf *buf = filp->private_data;
	kref_put(&buf->kref, relay_remove_buf);

	return 0;
}

/*
 *	relay_file_read_consume - update the consumed count for the buffer
 */
static void relay_file_read_consume(struct rchan_buf *buf,
				    size_t read_pos,
				    size_t bytes_consumed)
{
	size_t subbuf_size = buf->chan->subbuf_size;
	size_t n_subbufs = buf->chan->n_subbufs;
	size_t read_subbuf;

	if (buf->subbufs_produced == buf->subbufs_consumed &&
	    buf->offset == buf->bytes_consumed)
		return;

	if (buf->bytes_consumed + bytes_consumed > subbuf_size) {
		relay_subbufs_consumed(buf->chan, buf->cpu, 1);
		buf->bytes_consumed = 0;
	}

	buf->bytes_consumed += bytes_consumed;
	if (!read_pos)
		read_subbuf = buf->subbufs_consumed % n_subbufs;
	else
		read_subbuf = read_pos / buf->chan->subbuf_size;
	if (buf->bytes_consumed + buf->padding[read_subbuf] == subbuf_size) {
		if ((read_subbuf == buf->subbufs_produced % n_subbufs) &&
		    (buf->offset == subbuf_size))
			return;
		relay_subbufs_consumed(buf->chan, buf->cpu, 1);
		buf->bytes_consumed = 0;
	}
}

/*
 *	relay_file_read_avail - boolean, are there unconsumed bytes available?
 */
static int relay_file_read_avail(struct rchan_buf *buf)
{
	size_t subbuf_size = buf->chan->subbuf_size;
	size_t n_subbufs = buf->chan->n_subbufs;
	size_t produced = buf->subbufs_produced;
	size_t consumed;

	relay_file_read_consume(buf, 0, 0);

	consumed = buf->subbufs_consumed;

	if (unlikely(buf->offset > subbuf_size)) {
		if (produced == consumed)
			return 0;
		return 1;
	}

	if (unlikely(produced - consumed >= n_subbufs)) {
		consumed = produced - n_subbufs + 1;
		buf->subbufs_consumed = consumed;
		buf->bytes_consumed = 0;
	}

	produced = (produced % n_subbufs) * subbuf_size + buf->offset;
	consumed = (consumed % n_subbufs) * subbuf_size + buf->bytes_consumed;

	if (consumed > produced)
		produced += n_subbufs * subbuf_size;

	if (consumed == produced) {
		if (buf->offset == subbuf_size &&
		    buf->subbufs_produced > buf->subbufs_consumed)
			return 1;
		return 0;
	}

	return 1;
}

/**
 *	relay_file_read_subbuf_avail - return bytes available in sub-buffer
 *	@read_pos: file read position
 *	@buf: relay channel buffer
 */
static size_t relay_file_read_subbuf_avail(size_t read_pos,
					   struct rchan_buf *buf)
{
	size_t padding, avail = 0;
	size_t read_subbuf, read_offset, write_subbuf, write_offset;
	size_t subbuf_size = buf->chan->subbuf_size;

	write_subbuf = (buf->data - buf->start) / subbuf_size;
	write_offset = buf->offset > subbuf_size ? subbuf_size : buf->offset;
	read_subbuf = read_pos / subbuf_size;
	read_offset = read_pos % subbuf_size;
	padding = buf->padding[read_subbuf];

	if (read_subbuf == write_subbuf) {
		if (read_offset + padding < write_offset)
			avail = write_offset - (read_offset + padding);
	} else
		avail = (subbuf_size - padding) - read_offset;

	return avail;
}

/**
 *	relay_file_read_start_pos - find the first available byte to read
 *	@buf: relay channel buffer
 *
 *	If the read_pos is in the middle of padding, return the
 *	position of the first actually available byte, otherwise
 *	return the original value.
 */
static size_t relay_file_read_start_pos(struct rchan_buf *buf)
{
	size_t read_subbuf, padding, padding_start, padding_end;
	size_t subbuf_size = buf->chan->subbuf_size;
	size_t n_subbufs = buf->chan->n_subbufs;
	size_t consumed = buf->subbufs_consumed % n_subbufs;
	size_t read_pos = (consumed * subbuf_size + buf->bytes_consumed)
			% (n_subbufs * subbuf_size);

	read_subbuf = read_pos / subbuf_size;
	padding = buf->padding[read_subbuf];
	padding_start = (read_subbuf + 1) * subbuf_size - padding;
	padding_end = (read_subbuf + 1) * subbuf_size;
	if (read_pos >= padding_start && read_pos < padding_end) {
		read_subbuf = (read_subbuf + 1) % n_subbufs;
		read_pos = read_subbuf * subbuf_size;
	}

	return read_pos;
}

/**
 *	relay_file_read_end_pos - return the new read position
 *	@read_pos: file read position
 *	@buf: relay channel buffer
 *	@count: number of bytes to be read
 */
static size_t relay_file_read_end_pos(struct rchan_buf *buf,
				      size_t read_pos,
				      size_t count)
{
	size_t read_subbuf, padding, end_pos;
	size_t subbuf_size = buf->chan->subbuf_size;
	size_t n_subbufs = buf->chan->n_subbufs;

	read_subbuf = read_pos / subbuf_size;
	padding = buf->padding[read_subbuf];
	if (read_pos % subbuf_size + count + padding == subbuf_size)
		end_pos = (read_subbuf + 1) * subbuf_size;
	else
		end_pos = read_pos + count;
	if (end_pos >= subbuf_size * n_subbufs)
		end_pos = 0;

	return end_pos;
}

static ssize_t relay_file_read(struct file *filp,
			       char __user *buffer,
			       size_t count,
			       loff_t *ppos)
{
	struct rchan_buf *buf = filp->private_data;
	size_t read_start, avail;
	size_t written = 0;
	int ret;

	if (!count)
		return 0;

	inode_lock(file_inode(filp));
	do {
		void *from;

		if (!relay_file_read_avail(buf))
			break;

		read_start = relay_file_read_start_pos(buf);
		avail = relay_file_read_subbuf_avail(read_start, buf);
		if (!avail)
			break;

		avail = min(count, avail);
		from = buf->start + read_start;
		ret = avail;
		if (copy_to_user(buffer, from, avail))
			break;

		buffer += ret;
		written += ret;
		count -= ret;

		relay_file_read_consume(buf, read_start, ret);
		*ppos = relay_file_read_end_pos(buf, read_start, ret);
	} while (count);
	inode_unlock(file_inode(filp));

	return written;
}

static void relay_consume_bytes(struct rchan_buf *rbuf, int bytes_consumed)
{
	rbuf->bytes_consumed += bytes_consumed;

	if (rbuf->bytes_consumed >= rbuf->chan->subbuf_size) {
		relay_subbufs_consumed(rbuf->chan, rbuf->cpu, 1);
		rbuf->bytes_consumed %= rbuf->chan->subbuf_size;
	}
}

static void relay_pipe_buf_release(struct pipe_inode_info *pipe,
				   struct pipe_buffer *buf)
{
	struct rchan_buf *rbuf;

	rbuf = (struct rchan_buf *)page_private(buf->page);
	relay_consume_bytes(rbuf, buf->private);
}

static const struct pipe_buf_operations relay_pipe_buf_ops = {
	.release	= relay_pipe_buf_release,
	.try_steal	= generic_pipe_buf_try_steal,
	.get		= generic_pipe_buf_get,
};

static void relay_page_release(struct splice_pipe_desc *spd, unsigned int i)
{
}

/*
 *	subbuf_splice_actor - splice up to one subbuf's worth of data
 */
static ssize_t subbuf_splice_actor(struct file *in,
			       loff_t *ppos,
			       struct pipe_inode_info *pipe,
			       size_t len,
			       unsigned int flags,
			       int *nonpad_ret)
{
	unsigned int pidx, poff, total_len, subbuf_pages, nr_pages;
	struct rchan_buf *rbuf = in->private_data;
	unsigned int subbuf_size = rbuf->chan->subbuf_size;
	uint64_t pos = (uint64_t) *ppos;
	uint32_t alloc_size = (uint32_t) rbuf->chan->alloc_size;
	size_t read_start = (size_t) do_div(pos, alloc_size);
	size_t read_subbuf = read_start / subbuf_size;
	size_t padding = rbuf->padding[read_subbuf];
	size_t nonpad_end = read_subbuf * subbuf_size + subbuf_size - padding;
	struct page *pages[PIPE_DEF_BUFFERS];
	struct partial_page partial[PIPE_DEF_BUFFERS];
	struct splice_pipe_desc spd = {
		.pages = pages,
		.nr_pages = 0,
		.nr_pages_max = PIPE_DEF_BUFFERS,
		.partial = partial,
		.ops = &relay_pipe_buf_ops,
		.spd_release = relay_page_release,
	};
	ssize_t ret;

	if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
		return 0;
	if (splice_grow_spd(pipe, &spd))
		return -ENOMEM;

	/*
	 * Adjust read len, if longer than what is available
	 */
	if (len > (subbuf_size - read_start % subbuf_size))
		len = subbuf_size - read_start % subbuf_size;

	subbuf_pages = rbuf->chan->alloc_size >> PAGE_SHIFT;
	pidx = (read_start / PAGE_SIZE) % subbuf_pages;
	poff = read_start & ~PAGE_MASK;
	nr_pages = min_t(unsigned int, subbuf_pages, spd.nr_pages_max);

	for (total_len = 0; spd.nr_pages < nr_pages; spd.nr_pages++) {
		unsigned int this_len, this_end, private;
		unsigned int cur_pos = read_start + total_len;

		if (!len)
			break;

		this_len = min_t(unsigned long, len, PAGE_SIZE - poff);
		private = this_len;

		spd.pages[spd.nr_pages] = rbuf->page_array[pidx];
		spd.partial[spd.nr_pages].offset = poff;

		this_end = cur_pos + this_len;
		if (this_end >= nonpad_end) {
			this_len = nonpad_end - cur_pos;
			private = this_len + padding;
		}
		spd.partial[spd.nr_pages].len = this_len;
		spd.partial[spd.nr_pages].private = private;

		len -= this_len;
		total_len += this_len;
		poff = 0;
		pidx = (pidx + 1) % subbuf_pages;

		if (this_end >= nonpad_end) {
			spd.nr_pages++;
			break;
		}
	}

	ret = 0;
	if (!spd.nr_pages)
		goto out;

	ret = *nonpad_ret = splice_to_pipe(pipe, &spd);
	if (ret < 0 || ret < total_len)
		goto out;

        if (read_start + ret == nonpad_end)
                ret += padding;

out:
	splice_shrink_spd(&spd);
	return ret;
}

static ssize_t relay_file_splice_read(struct file *in,
				      loff_t *ppos,
				      struct pipe_inode_info *pipe,
				      size_t len,
				      unsigned int flags)
{
	ssize_t spliced;
	int ret;
	int nonpad_ret = 0;

	ret = 0;
	spliced = 0;

	while (len && !spliced) {
		ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret);
		if (ret < 0)
			break;
		else if (!ret) {
			if (flags & SPLICE_F_NONBLOCK)
				ret = -EAGAIN;
			break;
		}

		*ppos += ret;
		if (ret > len)
			len = 0;
		else
			len -= ret;
		spliced += nonpad_ret;
		nonpad_ret = 0;
	}

	if (spliced)
		return spliced;

	return ret;
}

const struct file_operations relay_file_operations = {
	.open		= relay_file_open,
	.poll		= relay_file_poll,
	.mmap		= relay_file_mmap,
	.read		= relay_file_read,
	.llseek		= no_llseek,
	.release	= relay_file_release,
	.splice_read	= relay_file_splice_read,
};
EXPORT_SYMBOL_GPL(relay_file_operations);
m.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/scatterlist/linux/mm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/Makefile</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/acct/acct_syscall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/acct/acct_syscall.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/alsa/conf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/alsa/conf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/alsa/mixer-test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/alsa/mixer-test.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/alsa/pcm-test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/alsa/pcm-test.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/alsa/test-pcmtest-driver.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/alsa/test-pcmtest-driver.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/alsa/utimer-test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/alsa/utimer-test.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/abi/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/abi/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/abi/hwcap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/abi/hwcap.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/abi/ptrace.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/abi/ptrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/abi/syscall-abi.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/abi/syscall-abi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/abi/tpidr2.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/abi/tpidr2.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/bti/assembler.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/bti/assembler.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/fp/fp-ptrace.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/fp-ptrace.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/fp/fp-stress.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/fp-stress.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/fp/kernel-test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/kernel-test.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/fp/sve-probe-vls.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/sve-probe-vls.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/fp/sve-ptrace.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/sve-ptrace.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/fp/vec-syscfg.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/vec-syscfg.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/fp/za-ptrace.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/za-ptrace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/fp/zt-ptrace.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/zt-ptrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/fp/zt-test.S?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/zt-test.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/gcs/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/gcs/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/gcs/basic-gcs.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/gcs/basic-gcs.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/gcs/gcs-locking.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/gcs/gcs-locking.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/gcs/gcs-stress.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/gcs/gcs-stress.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/mte/check_buffer_fill.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_buffer_fill.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/mte/check_child_memory.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_child_memory.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/mte/check_hugetlb_options.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_hugetlb_options.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/mte/check_ksm_options.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_ksm_options.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/mte/check_mmap_options.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_mmap_options.c</a></td><td class='right'>896</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 30.7%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 66.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/mte/check_prctl.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_prctl.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/mte/check_tags_inclusion.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_tags_inclusion.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/mte/check_user_mem.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_user_mem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/mte/mte_common_util.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/mte_common_util.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/mte/mte_common_util.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/mte_common_util.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/mte/mte_def.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/mte_def.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/pauth/exec_target.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/pauth/exec_target.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/pauth/pac.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/pauth/pac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/arm64/tags/tags_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/tags/tags_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/.gitignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/DENYLIST.aarch64?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/DENYLIST.aarch64</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/DENYLIST.s390x?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/DENYLIST.s390x</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/Makefile</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/Makefile.docs?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/Makefile.docs</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/bench.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bench.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/bench.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bench.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/benchs/bench_htab_mem.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/bench_htab_mem.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/benchs/bench_lpm_trie_map.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/bench_lpm_trie_map.c</a></td><td class='right'>555</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/benchs/bench_ringbufs.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/bench_ringbufs.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/benchs/bench_sockmap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/bench_sockmap.c</a></td><td class='right'>599</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/benchs/bench_trigger.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/bench_trigger.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/benchs/run_bench_ringbufs.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/run_bench_ringbufs.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/run_bench_trigger.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/bpf_arena_common.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_arena_common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/bpf_arena_list.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_arena_list.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/bpf_arena_strsearch.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_arena_strsearch.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/bpf_atomic.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_atomic.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/bpf_experimental.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_experimental.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/bpf_kfuncs.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_kfuncs.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/bpf_util.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_util.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/cap_helpers.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/cap_helpers.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/cap_helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/cap_helpers.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/cgroup_helpers.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/cgroup_helpers.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/cgroup_helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/cgroup_helpers.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/config</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/config.aarch64?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/config.aarch64</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/config.ppc64el?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/config.ppc64el</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/config.riscv64?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/config.riscv64</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/config.s390x?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/config.s390x</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/config.x86_64?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/config.x86_64</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/map_tests/map_in_map_batch_ops.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/map_tests/map_in_map_batch_ops.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/network_helpers.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/network_helpers.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/network_helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/network_helpers.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/align.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/align.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/arena_atomics.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/arena_atomics.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/arena_spin_lock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/arena_spin_lock.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/arena_strsearch.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/arena_strsearch.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/arg_parsing.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/arg_parsing.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/atomics.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/atomics.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/attach_probe.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/attach_probe.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bpf_cookie.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/bpf_gotox.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bpf_gotox.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/bpf_insn_array.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bpf_insn_array.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/bpf_iter.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bpf_iter.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/bpf_nf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bpf_nf.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/btf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/btf.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/btf_dedup_split.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/btf_dedup_split.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/btf_dump.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/btf_dump.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/btf_split.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/btf_split.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/btf_sysfs.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/btf_sysfs.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/cgroup_mprog_opts.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cgroup_mprog_opts.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/cgroup_mprog_ordering.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cgroup_mprog_ordering.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/cgroup_preorder.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cgroup_preorder.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/cgroup_xattr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cgroup_xattr.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/cgrp_kfunc.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cgrp_kfunc.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/check_mtu.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/check_mtu.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/cls_redirect.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cls_redirect.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/compute_live_registers.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/compute_live_registers.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/core_reloc.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/core_reloc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/cpumask.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cpumask.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/dynptr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/dynptr.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/fd_array.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fd_array.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/fd_htab_lookup.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fd_htab_lookup.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/fentry_fexit.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fentry_fexit.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/fentry_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fentry_test.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/fexit_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fexit_test.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/file_reader.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/file_reader.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/fill_link_info.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fill_link_info.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/flow_dissector_classification.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/flow_dissector_classification.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/for_each.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/for_each.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/free_timer.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/free_timer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/htab_update.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/htab_update.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/kernel_flag.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/kernel_flag.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 8.1%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/linked_list.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/linked_list.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/livepatch_trampoline.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/livepatch_trampoline.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/log_buf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/log_buf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/lwt_helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/lwt_helpers.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/lwt_ip_encap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/lwt_ip_encap.c</a></td><td class='right'>540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/lwt_seg6local.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/lwt_seg6local.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/map_excl.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/map_excl.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/mem_rdonly_untrusted.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/mem_rdonly_untrusted.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/module_attach.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/module_attach.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/mptcp.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/mptcp.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/net_timestamping.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/net_timestamping.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/netns_cookie.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/netns_cookie.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/perf_branches.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/perf_branches.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/pinning_devmap_reuse.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/pinning_devmap_reuse.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/pinning_htab.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/pinning_htab.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/prepare.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/prepare.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/pro_epilogue.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/pro_epilogue.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/prog_tests_framework.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/prog_tests_framework.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/rbtree.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/rbtree.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/read_vsyscall.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/recursive_attach.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/recursive_attach.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/reg_bounds.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/reg_bounds.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/res_spin_lock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/res_spin_lock.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/ringbuf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/ringbuf.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/select_reuseport.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/select_reuseport.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/send_signal.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/send_signal.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/setget_sockopt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/setget_sockopt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/sha256.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sha256.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/sk_assign.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sk_assign.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/sk_bypass_prot_mem.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sk_bypass_prot_mem.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/snprintf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/snprintf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c</a></td><td class='right'>885</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 32.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 66.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/socket_helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/socket_helpers.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sockmap_basic.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/sockmap_helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sockmap_helpers.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sockmap_listen.c</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 17.1%;'/><td class='none' style='width: 82.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/sockmap_redir.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sockmap_redir.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/sockmap_strp.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sockmap_strp.c</a></td><td class='right'>454</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/spin_lock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/spin_lock.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stacktrace_map.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/stacktrace_map_skip.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stacktrace_map_skip.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/stream.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stream.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/string_kfuncs.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/string_kfuncs.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/summarization.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/summarization.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/tailcalls.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tailcalls.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/task_local_data.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/task_local_data.h</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/task_work_stress.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/task_work_stress.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/tc_helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tc_helpers.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/tc_links.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tc_links.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/tc_opts.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tc_opts.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/tc_redirect.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tc_redirect.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_bpf_smc.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_bpf_smc.c</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_btf_ext.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_btf_ext.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_lsm.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_lsm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_struct_ops_id_ops_mapping.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_struct_ops_id_ops_mapping.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_struct_ops_kptr_return.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_struct_ops_kptr_return.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_struct_ops_refcounted.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_struct_ops_refcounted.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_sysctl.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_sysctl.c</a> (renamed from tools/testing/selftests/bpf/test_sysctl.c)</td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_task_local_data.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_task_local_data.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_task_work.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_task_work.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_tc_edt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_tc_edt.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_tc_tunnel.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_tc_tunnel.c</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 73.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_tunnel.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_tunnel.c</a></td><td class='right'>590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.6%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 77.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_veristat.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_veristat.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c</a></td><td class='right'>638</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.2%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 76.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_xsk.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_xsk.c</a></td><td class='right'>2596</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 97.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 2.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/test_xsk.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_xsk.h</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/timer.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/timer.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/timer_crash.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/timer_crash.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/timer_lockup.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/timer_lockup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/timer_mim.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/timer_mim.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/token.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/token.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/tracing_failure.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tracing_failure.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/tracing_struct.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tracing_struct.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/uprobe.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/uprobe.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 81.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/usdt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/usdt.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/user_ringbuf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/user_ringbuf.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/verifier.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/verifier.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/verify_pkcs7_sig.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/verify_pkcs7_sig.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/wq.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/wq.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_metadata.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/xdp_pull_data.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_pull_data.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/xdp_vlan.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_vlan.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/prog_tests/xsk.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xsk.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/arena_atomics.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/arena_atomics.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/arena_spin_lock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/arena_spin_lock.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/arena_strsearch.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/arena_strsearch.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bench_sockmap_prog.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bench_sockmap_prog.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_arena_spin_lock.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_arena_spin_lock.h</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_cc_cubic.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_cc_cubic.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_cubic.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_cubic.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_dctcp.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_dctcp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_gotox.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_gotox.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_iter_map_elem.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_map_elem.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_tasks.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_iter_udp4.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_udp4.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_iter_udp6.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_udp6.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_misc.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_misc.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_qdisc_common.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_qdisc_common.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_qdisc_fail__incompl_ops.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_qdisc_fail__incompl_ops.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_qdisc_fifo.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_qdisc_fifo.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_qdisc_fq.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_qdisc_fq.c</a></td><td class='right'>756</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 28.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 71.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_smc.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_smc.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_test_utils.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_test_utils.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/bpf_tracing_net.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_tracing_net.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_signed_arr_elem_sz.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_signed_arr_elem_sz.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/btf_type_tag_percpu.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/btf_type_tag_percpu.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/cgroup_mprog.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cgroup_mprog.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/cgroup_preorder.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cgroup_preorder.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/cgroup_read_xattr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cgroup_read_xattr.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/cgrp_kfunc_success.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cgrp_kfunc_success.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/changes_pkt_data.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/changes_pkt_data.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/compute_live_registers.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/compute_live_registers.c</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/connect4_dropper.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/connect4_dropper.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/connect4_prog.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/connect4_prog.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/core_reloc_types.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/core_reloc_types.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/cpumask_common.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cpumask_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/cpumask_failure.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cpumask_failure.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/cpumask_success.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cpumask_success.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/crypto_sanity.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/crypto_sanity.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/dmabuf_iter.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/dmabuf_iter.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/dynptr_fail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/dynptr_fail.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/dynptr_success.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/dynptr_success.c</a></td><td class='right'>578</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 78.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/exceptions_assert.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/exceptions_assert.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/fd_htab_lookup.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/fd_htab_lookup.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/file_reader.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/file_reader.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/file_reader_fail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/file_reader_fail.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/for_each_hash_modify.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/for_each_hash_modify.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/freplace_connect_v4_prog.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/freplace_connect_v4_prog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/htab_update.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/htab_update.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/ip_check_defrag.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/ip_check_defrag.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/irq.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/irq.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/iters.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters.c</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/iters_looping.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters_looping.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/iters_state_safety.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters_state_safety.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/iters_task_failure.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters_task_failure.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/iters_testmod.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters_testmod.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/iters_testmod_seq.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters_testmod_seq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/kprobe_write_ctx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/kprobe_write_ctx.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/linked_list_fail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/linked_list_fail.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/linked_list_peek.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/linked_list_peek.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/livepatch_trampoline.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/livepatch_trampoline.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/loop1.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/loop1.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/loop2.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/loop2.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/loop3.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/loop3.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/loop6.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/loop6.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/lpm_trie.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/lpm_trie.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/lpm_trie_bench.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/lpm_trie_bench.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/lpm_trie_map.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/lpm_trie_map.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/lsm.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/lsm.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/lsm_tailcall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/lsm_tailcall.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/map_excl.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/map_excl.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/mem_rdonly_untrusted.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/mem_rdonly_untrusted.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/mptcp_sockmap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/mptcp_sockmap.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/mptcp_subflow.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/mptcp_subflow.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/net_timestamping.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/net_timestamping.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/netns_cookie_prog.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/netns_cookie_prog.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/preempt_lock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/preempt_lock.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/prepare.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/prepare.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/priv_freplace_prog.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/priv_freplace_prog.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/priv_prog.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/priv_prog.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/pro_epilogue_with_kfunc.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/pro_epilogue_with_kfunc.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/profiler.inc.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/profiler.inc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/raw_tp_null.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/raw_tp_null.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/raw_tp_null_fail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/raw_tp_null_fail.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/rbtree.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/rbtree.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/rbtree_fail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/rbtree_fail.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/rbtree_search.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/rbtree_search.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/rcu_read_lock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/rcu_read_lock.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/read_cgroupfs_xattr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/read_cgroupfs_xattr.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/read_vsyscall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/read_vsyscall.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/refcounted_kptr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/refcounted_kptr.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/res_spin_lock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/res_spin_lock.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/res_spin_lock_fail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/res_spin_lock_fail.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/ringbuf_bench.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/ringbuf_bench.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/security_bpf_map.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/security_bpf_map.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/set_global_vars.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/set_global_vars.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/setget_sockopt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/setget_sockopt.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/sk_bypass_prot_mem.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/sk_bypass_prot_mem.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/sock_iter_batch.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/sock_iter_batch.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/stacktrace_ips.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/stacktrace_ips.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/stacktrace_map.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/stacktrace_map.c</a> (renamed from tools/testing/selftests/bpf/progs/test_stacktrace_map.c)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/stream.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/stream.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/stream_fail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/stream_fail.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/string_kfuncs_failure1.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/string_kfuncs_failure1.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/string_kfuncs_failure2.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/string_kfuncs_failure2.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/string_kfuncs_success.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/string_kfuncs_success.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/strncmp_bench.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/strncmp_bench.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/strobemeta.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/strobemeta.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping1.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping1.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping2.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping2.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_kptr_return.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_kptr_return.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__invalid_scalar.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__invalid_scalar.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__local_kptr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__local_kptr.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__nonzero_offset.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__nonzero_offset.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__wrong_type.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__wrong_type.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_private_stack.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_private_stack.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_private_stack_fail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_private_stack_fail.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_private_stack_recur.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_private_stack_recur.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_refcounted.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_refcounted.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__global_subprog.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__global_subprog.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__ref_leak.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__ref_leak.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/summarization.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/summarization.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/summarization_freplace.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/summarization_freplace.c</a> (renamed from tools/testing/selftests/bpf/progs/changes_pkt_data_freplace.c)</td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy1.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy1.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy2.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy3.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy3.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/task_local_data.bpf.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/task_local_data.bpf.h</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/task_work.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/task_work.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/task_work_fail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/task_work_fail.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/task_work_stress.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/task_work_stress.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/tcp_ca_write_sk_pacing.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tcp_ca_write_sk_pacing.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_btf_ext.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_btf_ext.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_cgroup1_hierarchy.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_cgroup1_hierarchy.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_check_mtu.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_check_mtu.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_cls_redirect.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_cls_redirect.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_get_xattr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_get_xattr.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_global_map_resize.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_global_map_resize.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_kernel_flag.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_kernel_flag.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_lookup_key.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_lookup_key.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_module_attach.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_module_attach.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_overhead.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_overhead.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_perf_branches.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_perf_branches.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_pinning_devmap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_pinning_devmap.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_pinning_htab.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_pinning_htab.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_ptr_untrusted.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_ptr_untrusted.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_ringbuf_overwrite.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_ringbuf_overwrite.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_ringbuf_write.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_ringbuf_write.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_select_reuseport_kern.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_select_reuseport_kern.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_set_remove_xattr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_set_remove_xattr.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_sig_in_xattr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_sig_in_xattr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_sockmap_change_tail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_sockmap_change_tail.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_sockmap_ktls.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_sockmap_ktls.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_sockmap_redir.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_sockmap_redir.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_sockmap_strp.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_sockmap_strp.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_spin_lock_fail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_spin_lock_fail.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_subprogs_extable.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_subprogs_extable.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_task_local_data.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_task_local_data.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_task_under_cgroup.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_task_under_cgroup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_tc_change_tail.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tc_change_tail.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_tc_edt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tc_edt.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_tc_tunnel.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tc_tunnel.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_tcp_hdr_options.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tcp_hdr_options.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_uprobe.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_uprobe.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_usdt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_usdt.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_verify_pkcs7_sig.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_verify_pkcs7_sig.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_xdp_devmap_tailcall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_xdp_devmap_tailcall.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_xdp_meta.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_xdp_meta.c</a></td><td class='right'>654</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 75.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_xdp_pull_data.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_xdp_pull_data.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/test_xdp_vlan.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_xdp_vlan.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/timer_interrupt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/timer_interrupt.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/tracing_failure.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tracing_failure.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/tracing_struct.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tracing_struct.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/trigger_bench.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/trigger_bench.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/uprobe_syscall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/uprobe_syscall.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/uprobe_syscall_executed.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/uprobe_syscall_executed.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/uretprobe_stack.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/uretprobe_stack.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_and.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_and.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_arena.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_arena.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_arena_large.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_arena_large.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_array_access.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_array_access.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_async_cb_context.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_async_cb_context.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_bounds.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_bounds.c</a></td><td class='right'>573</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 78.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_bounds_deduction.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_bounds_deduction.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_bpf_trap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_bpf_trap.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_ctx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_ctx.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_div_overflow.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_div_overflow.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_global_ptr_args.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_global_ptr_args.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_gotol.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_gotol.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_gotox.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_gotox.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_ldsx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_ldsx.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_live_stack.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_live_stack.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_load_acquire.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_load_acquire.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_loops1.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_loops1.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_lsm.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_lsm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_map_in_map.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_map_in_map.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_map_ptr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_map_ptr.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_may_goto_1.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_may_goto_1.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_movsx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_movsx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_mul.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_mul.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_netfilter_ctx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_netfilter_ctx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_precision.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_precision.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_private_stack.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_private_stack.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_ref_tracking.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_ref_tracking.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_scalar_ids.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_scalar_ids.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_sock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_sock.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_spill_fill.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_spill_fill.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_stack_ptr.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_stack_ptr.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_store_release.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_store_release.c</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_subprog_precision.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_subprog_precision.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_tailcall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_tailcall.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_unpriv.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_unpriv.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_var_off.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_var_off.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_vfs_accept.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_vfs_accept.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/verifier_vfs_reject.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_vfs_reject.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/wq.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/wq.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/wq_failures.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/wq_failures.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/xdp_metadata.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/xdp_metadata.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/xdp_redirect_map.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/xdp_redirect_map.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/progs/xsk_xdp_progs.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/xsk_xdp_progs.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_bpftool_build.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_bpftool_build.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_bpftool_map.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_bpftool_map.sh</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_btf.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_btf.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_kmods/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_kmods/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_kmods/bpf_test_rqspinlock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_kmods/bpf_test_rqspinlock.c</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_kmods/bpf_testmod.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 87.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_kmods/bpf_testmod.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_kmods/bpf_testmod.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_lirc_mode2_user.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_lirc_mode2_user.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_loader.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_loader.c</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 85.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_lru_map.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_lru_map.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_lwt_ip_encap.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_lwt_ip_encap.sh</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.8%;'/><td class='none' style='width: 82.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_lwt_seg6local.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_lwt_seg6local.sh</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_maps.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_maps.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_progs.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_progs.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_progs.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_progs.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_sockmap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_sockmap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_tag.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_tag.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_tc_edt.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_tc_edt.sh</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_tc_tunnel.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_tc_tunnel.sh</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.0%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_tcpnotify_user.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_tcpnotify_user.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_tunnel.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_tunnel.sh</a></td><td class='right'>645</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 24.1%;'/><td class='none' style='width: 75.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_verifier.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_verifier.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_xdp_redirect_multi.sh</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_xdp_vlan.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_xdp_vlan.sh</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.7%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_xdp_vlan_mode_generic.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_xdp_vlan_mode_generic.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_xdp_vlan_mode_native.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_xdp_vlan_mode_native.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/test_xsk.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_xsk.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/testing_helpers.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/testing_helpers.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/testing_helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/testing_helpers.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/trace_helpers.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/trace_helpers.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/trace_helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/trace_helpers.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/unpriv_helpers.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/unpriv_helpers.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/usdt.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/usdt.h</a></td><td class='right'>545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/verifier/bpf_st_mem.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verifier/bpf_st_mem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/verifier/calls.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verifier/calls.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/verifier/dead_code.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verifier/dead_code.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/verifier/jmp32.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verifier/jmp32.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/verifier/jset.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verifier/jset.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/verify_sig_setup.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verify_sig_setup.sh</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/veristat.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/veristat.c</a></td><td class='right'>964</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 35.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 63.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/vmtest.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/vmtest.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/with_addr.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/with_addr.sh</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/with_tunnels.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/with_tunnels.sh</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/xdp_hw_metadata.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xdp_hw_metadata.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/xdp_redirect_multi.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xdp_redirect_multi.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.5%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/xdping.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xdping.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/xsk.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xsk.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/xsk_xdp_common.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xsk_xdp_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/xskxceiver.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xskxceiver.c</a></td><td class='right'>2370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 87.3%;'/><td class='none' style='width: 11.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/bpf/xskxceiver.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xskxceiver.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/breakpoints/breakpoint_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/breakpoints/breakpoint_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/breakpoints/breakpoint_test_arm64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/breakpoints/step_after_suspend_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/breakpoints/step_after_suspend_test.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cachestat/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cachestat/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cachestat/test_cachestat.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cachestat/test_cachestat.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/capabilities/test_execve.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/capabilities/test_execve.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/capabilities/validate_cap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/capabilities/validate_cap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/lib/cgroup_util.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/lib/cgroup_util.c</a> (renamed from tools/testing/selftests/cgroup/cgroup_util.c)</td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/lib/include/cgroup_util.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/lib/include/cgroup_util.h</a> (renamed from tools/testing/selftests/cgroup/cgroup_util.h)</td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/lib/libcgroup.mk?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/lib/libcgroup.mk</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/test_core.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_core.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/test_cpu.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_cpu.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/test_cpuset.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_cpuset.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/test_cpuset_prs.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_cpuset_prs.sh</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.0%;'/><td class='rem' style='width: 8.0%;'/><td class='none' style='width: 76.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/test_freezer.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_freezer.c</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 74.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/test_hugetlb_memcg.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_hugetlb_memcg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/test_kill.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_kill.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/test_kmem.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_kmem.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/test_memcontrol.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_memcontrol.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/test_pids.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_pids.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cgroup/test_zswap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_zswap.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/clone3/clone3.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/clone3/clone3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/clone3/clone3_clear_sighand.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/clone3/clone3_clear_sighand.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/clone3/clone3_selftests.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/clone3/clone3_selftests.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/clone3/clone3_set_tid.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/clone3/clone3_set_tid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/connector/proc_filter.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/connector/proc_filter.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/core/close_range_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/core/close_range_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/core/unshare_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/core/unshare_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/coredump/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/coredump/.gitignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/coredump/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/coredump/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/coredump/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/coredump/config</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/coredump/coredump_socket_protocol_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/coredump/coredump_socket_protocol_test.c</a></td><td class='right'>1568</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 58.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 41.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/coredump/coredump_socket_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/coredump/coredump_socket_test.c</a></td><td class='right'>742</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 27.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 72.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/coredump/coredump_test.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/coredump/coredump_test.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/coredump/coredump_test_helpers.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/coredump/coredump_test_helpers.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/coredump/stackdump_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/coredump/stackdump_test.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/cpufreq/cpufreq.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cpufreq/cpufreq.sh</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/_chk_dependency.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/_chk_dependency.sh</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/_common.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/_common.sh</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/_damon_sysfs.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/_damon_sysfs.py</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 87.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/_debugfs_common.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/_debugfs_common.sh</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/access_memory_even.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/access_memory_even.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/damon_nr_regions.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/damon_nr_regions.py</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/damos_quota.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/damos_quota.py</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/damos_quota_goal.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/damos_quota_goal.py</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/drgn_dump_damon_status.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/drgn_dump_damon_status.py</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/lru_sort.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/lru_sort.sh</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/reclaim.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/reclaim.sh</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/sysfs.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/sysfs.py</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/sysfs.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/sysfs.sh</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/sysfs_memcg_path_leak.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/sysfs_memcg_path_leak.sh</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/sysfs_no_op_commit_break.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/sysfs_no_op_commit_break.py</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/dma/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/dma/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/dma/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/dma/config</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/dma/dma_map_benchmark.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/dma/dma_map_benchmark.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/dma-buf/udmabuf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/dma-buf/udmabuf.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/.gitignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/Makefile</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/README.rst?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/README.rst</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/bonding/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/bonding/bond_ipsec_offload.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/bond_ipsec_offload.sh</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/bonding/bond_lacp_prio.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/bond_lacp_prio.sh</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/bonding/bond_macvlan_ipvlan.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/bond_macvlan_ipvlan.sh</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/bonding/bond_options.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/bond_options.sh</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/bonding/bond_passive_lacp.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/bond_passive_lacp.sh</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/bonding/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/config</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/bonding/netcons_over_bonding.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/netcons_over_bonding.sh</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/config</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/dsa/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/dsa/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>l---------</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/dsa/tc_taprio.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/dsa/tc_taprio.sh</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/gro.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/gro.c</a> (renamed from tools/testing/selftests/net/gro.c)</td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/gro.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/gro.py</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hds.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hds.py</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/Makefile</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/config</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/csum.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/csum.py</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/devlink_rate_tc_bw.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/devlink_rate_tc_bw.py</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/devmem.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/devmem.py</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/iou-zcrx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/iou-zcrx.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/iou-zcrx.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/iou-zcrx.py</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/irq.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/irq.py</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/lib/py/__init__.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/lib/py/__init__.py</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/lib/py/linkconfig.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/lib/py/linkconfig.py</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.3%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/ncdevmem.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/ncdevmem.c</a></td><td class='right'>1100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.4%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 58.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/nic_link_layer.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/nic_link_layer.py</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/nic_performance.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/nic_performance.py</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/nic_timestamp.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/nic_timestamp.py</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/pp_alloc_fail.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/pp_alloc_fail.py</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/rss_api.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/rss_api.py</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/rss_ctx.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/rss_ctx.py</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/rss_flow_label.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/rss_flow_label.py</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/toeplitz.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/toeplitz.c</a> (renamed from tools/testing/selftests/net/toeplitz.c)</td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/toeplitz.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/toeplitz.py</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/tso.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/tso.py</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/hw/xsk_reconfig.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/xsk_reconfig.py</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/lib/py/__init__.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/lib/py/__init__.py</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/lib/py/env.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/lib/py/env.py</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/lib/py/load.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/lib/py/load.py</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/napi_id.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/napi_id.py</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/napi_id_helper.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/napi_id_helper.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/napi_threaded.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/napi_threaded.py</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netcons_basic.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netcons_basic.sh</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netcons_cmdline.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netcons_cmdline.sh</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netcons_overflow.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netcons_overflow.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netcons_sysdata.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netcons_sysdata.sh</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netcons_torture.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netcons_torture.sh</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netdevsim/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netdevsim/devlink.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/devlink.sh</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netdevsim/ethtool-ring.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/ethtool-ring.sh</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netdevsim/nexthop.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/nexthop.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netdevsim/peer.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/peer.sh</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/netpoll_basic.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netpoll_basic.py</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/ocelot/psfp.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/ocelot/psfp.sh</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/ping.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/ping.py</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/psp.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/psp.py</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/psp_responder.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/psp_responder.c</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/queues.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/queues.py</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/ring_reconfig.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/ring_reconfig.py</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/stats.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/stats.py</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/team/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/team/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/team/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/team/config</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/team/options.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/team/options.sh</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/team/propagation.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/team/propagation.sh</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/virtio_net/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/virtio_net/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/net/xdp.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/xdp.py</a></td><td class='right'>779</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 29.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 70.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/ntsync/ntsync.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/ntsync/ntsync.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/exec/check-exec.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/check-exec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/exec/execveat.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/execveat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/exec/load_address.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/load_address.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/exec/non-regular.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/non-regular.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/exec/null-argv.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/null-argv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/exec/recursion-depth.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/recursion-depth.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/fchmodat2/fchmodat2_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/fchmodat2/fchmodat2_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filelock/ofdlocks.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filelock/ofdlocks.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/anon_inode_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/anon_inode_test.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/binderfs/binderfs_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/binderfs/binderfs_test.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/devpts_pts.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/devpts_pts.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/eventfd/eventfd_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/eventfd/eventfd_test.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/fclog.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/fclog.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/file_stressor.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/file_stressor.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/fuse/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/fuse/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/fuse/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/fuse/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/fuse/fuse_mnt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/fuse/fuse_mnt.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/fuse/fusectl_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/fuse/fusectl_test.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/kernfs_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/kernfs_test.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/mount-notify/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/mount-notify/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/mount-notify/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/mount-notify/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c</a></td><td class='right'>555</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/nsfs/iterate_mntns.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/nsfs/iterate_mntns.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/overlayfs/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/overlayfs/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c</a></td><td class='right'>511</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 80.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/overlayfs/wrappers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/overlayfs/wrappers.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/statmount/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/statmount/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/statmount/listmount_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/statmount/listmount_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/statmount/statmount.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/statmount/statmount.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/statmount/statmount_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/statmount/statmount_test.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/statmount/statmount_test_ns.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/utils.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/utils.c</a></td><td class='right'>589</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/utils.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/utils.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/filesystems/wrappers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/wrappers.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/ftracetest?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/ftracetest</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/00basic/mount_options.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/00basic/mount_options.tc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_fprobe.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/dynevent/add_remove_fprobe.tc</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_tprobe.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/dynevent/add_remove_tprobe.tc</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/dynevent/enable_disable_tprobe.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/dynevent/enable_disable_tprobe.tc</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-multi-filter.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/ftrace/fgraph-multi-filter.tc</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/functions?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/functions</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/.gitignore</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_numa.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_numa.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_numa_mpol.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_numa_mpol.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_priv_hash.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_priv_hash.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_requeue.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_requeue.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_requeue_pi.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_requeue_pi.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_wait.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_wait.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_wait_timeout.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_wait_timeout.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_wait_wouldblock.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/futex_waitv.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_waitv.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/functional/run.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/run.sh</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/include/futex2test.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/include/futex2test.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/include/futextest.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/include/futextest.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/futex/include/logging.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/include/logging.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/gpio/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/gpio/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/gpio/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/gpio/config</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/gpio/gpio-aggregator.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/gpio/gpio-aggregator.sh</a></td><td class='right'>727</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 27.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 72.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/config.common?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/config.common</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/hid_common.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/hid_common.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/hidraw.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/hidraw.c</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/tests/base.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/base.py</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/tests/base_device.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/base_device.py</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/tests/test_apple_keyboard.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_apple_keyboard.py</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/tests/test_gamepad.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_gamepad.py</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/tests/test_ite_keyboard.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_ite_keyboard.py</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/tests/test_mouse.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_mouse.py</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/tests/test_multitouch.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_multitouch.py</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/tests/test_sony.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_sony.py</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/tests/test_tablet.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_tablet.py</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/tests/test_wacom_generic.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_wacom_generic.py</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 83.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/hid/vmtest.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/vmtest.sh</a></td><td class='right'>668</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.8%;'/><td class='rem' style='width: 9.2%;'/><td class='none' style='width: 75.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/intel_pstate/aperf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/intel_pstate/aperf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/iommu/iommufd.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/iommu/iommufd.c</a></td><td class='right'>1017</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 30.0%;'/><td class='rem' style='width: 8.1%;'/><td class='none' style='width: 61.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/iommu/iommufd_fail_nth.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/iommu/iommufd_fail_nth.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/iommu/iommufd_utils.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/iommu/iommufd_utils.h</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 86.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ipc/msgque.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ipc/msgque.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ir/ir_loopback.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ir/ir_loopback.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kcmp/kcmp_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kcmp/kcmp_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kexec/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kexec/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kexec/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kexec/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kexec/test_kexec_jump.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kexec/test_kexec_jump.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kexec/test_kexec_jump.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kexec/test_kexec_jump.sh</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kho/arm64.conf?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kho/arm64.conf</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kho/init.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kho/init.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kho/vmtest.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kho/vmtest.sh</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kho/x86.conf?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kho/x86.conf</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kmod/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kmod/config</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kselftest.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kselftest/module.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest/module.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kselftest/runner.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest/runner.sh</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kselftest_harness.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest_harness.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kselftest_harness/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest_harness/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kselftest_harness/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest_harness/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kselftest_harness/harness-selftest.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest_harness/harness-selftest.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kselftest_harness/harness-selftest.expected?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest_harness/harness-selftest.expected</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kselftest_harness/harness-selftest.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest_harness/harness-selftest.sh</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/Makefile.kvm?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/Makefile.kvm</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/access_tracking_perf_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/access_tracking_perf_test.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arch_timer.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arch_timer.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/aarch32_id_regs.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/aarch32_id_regs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/arch_timer.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/arch_timer.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/at.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/at.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/debug-exceptions.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/debug-exceptions.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/external_aborts.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/external_aborts.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/get-reg-list.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/get-reg-list.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/hello_el2.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/hello_el2.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/host_sve.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/host_sve.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/hypercalls.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/hypercalls.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/kvm-uuid.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/kvm-uuid.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/mmio_abort.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/mmio_abort.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/no-vgic-v3.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/no-vgic-v3.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/page_fault_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/page_fault_test.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/psci_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/psci_test.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/sea_to_user.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/sea_to_user.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/set_id_regs.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/set_id_regs.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/smccc_filter.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/smccc_filter.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/vgic_init.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/vgic_init.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/vgic_irq.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/vgic_irq.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/arm64/vpmu_counter_access.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/vpmu_counter_access.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/config</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/dirty_log_perf_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/dirty_log_perf_test.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/dirty_log_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/dirty_log_test.c</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 10.3%;'/><td class='none' style='width: 80.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/get-reg-list.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/get-reg-list.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/guest_memfd_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/guest_memfd_test.c</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/arm64/arch_timer.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/arch_timer.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/arm64/gic.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/gic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/arm64/gic_v3_its.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/gic_v3_its.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/arm64/kvm_util_arch.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/kvm_util_arch.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/arm64/processor.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/processor.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/arm64/vgic.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/vgic.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/kvm_syscalls.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/kvm_syscalls.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/kvm_util.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/kvm_util.h</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/loongarch/arch_timer.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/loongarch/arch_timer.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/loongarch/kvm_util_arch.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/loongarch/kvm_util_arch.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/loongarch/processor.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/loongarch/processor.h</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/loongarch/ucall.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/loongarch/ucall.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/lru_gen_util.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/lru_gen_util.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/numaif.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/numaif.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/riscv/processor.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/riscv/processor.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/test_util.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/test_util.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/x86/pmu.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/x86/pmu.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/x86/processor.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/x86/processor.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/x86/sev.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/x86/sev.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/include/x86/vmx.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/x86/vmx.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/irqfd_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/irqfd_test.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/kvm_binary_stats_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/kvm_binary_stats_test.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/kvm_create_max_vcpus.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/kvm_create_max_vcpus.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/arm64/gic.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/gic.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/arm64/gic_private.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/gic_private.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/arm64/gic_v3.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/gic_v3.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/arm64/processor.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/processor.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/arm64/vgic.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/vgic.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/kvm_util.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/kvm_util.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 6.7%;'/><td class='none' style='width: 83.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/loongarch/exception.S?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/loongarch/exception.S</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/loongarch/processor.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/loongarch/processor.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/loongarch/ucall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/loongarch/ucall.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/lru_gen_util.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/lru_gen_util.c</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/memstress.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/memstress.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/riscv/handlers.S?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/riscv/handlers.S</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/riscv/processor.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/riscv/processor.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/s390/processor.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/s390/processor.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/sparsebit.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/sparsebit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/test_util.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/test_util.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/userfaultfd_util.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/userfaultfd_util.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/x86/memstress.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/x86/memstress.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/x86/pmu.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/x86/pmu.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/x86/processor.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/x86/processor.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/x86/sev.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/x86/sev.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/lib/x86/vmx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/x86/vmx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/loongarch/arch_timer.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/loongarch/arch_timer.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/memslot_modification_stress_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/memslot_modification_stress_test.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/memslot_perf_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/memslot_perf_test.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/mmu_stress_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/mmu_stress_test.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/pre_fault_memory_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/pre_fault_memory_test.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/riscv/arch_timer.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/riscv/arch_timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/riscv/ebreak_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/riscv/ebreak_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/riscv/get-reg-list.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/riscv/get-reg-list.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/riscv/sbi_pmu_test.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/rseq_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/rseq_test.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/s390/cmma_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/s390/cmma_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/s390/cpumodel_subfuncs_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/s390/cpumodel_subfuncs_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/s390/ucontrol_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/s390/ucontrol_test.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/s390/user_operexec.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/s390/user_operexec.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/set_memory_region_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/set_memory_region_test.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/steal_time.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/steal_time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/aperfmperf_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/aperfmperf_test.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/fastops_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/fastops_test.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/hyperv_cpuid.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/hyperv_cpuid.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/hyperv_features.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/hyperv_features.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/hyperv_ipi.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/hyperv_ipi.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/kvm_buslock_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/kvm_buslock_test.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/monitor_mwait_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/monitor_mwait_test.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/msrs_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/msrs_test.c</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/nested_close_kvm_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/nested_close_kvm_test.c</a> (renamed from tools/testing/selftests/kvm/x86/vmx_close_while_nested_test.c)</td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/nested_emulation_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/nested_emulation_test.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/nested_exceptions_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/nested_exceptions_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c</a> (renamed from tools/testing/selftests/kvm/x86/vmx_tsc_adjust_test.c)</td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c</a> (renamed from tools/testing/selftests/kvm/x86/vmx_nested_tsc_scaling_test.c)</td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/nx_huge_pages_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/nx_huge_pages_test.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/pmu_counters_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/pmu_counters_test.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/pmu_event_filter_test.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/private_mem_conversions_test.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/sev_init2_tests.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/sev_init2_tests.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/sev_smoke_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/sev_smoke_test.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/state_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/state_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/svm_int_ctl_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/svm_int_ctl_test.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/ucna_injection_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/ucna_injection_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/userspace_io_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/userspace_io_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/userspace_msr_exit_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/userspace_msr_exit_test.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/vmx_exception_with_invalid_guest_state.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/vmx_exception_with_invalid_guest_state.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/xapic_ipi_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/xapic_ipi_test.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/xapic_state_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/xapic_state_test.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/xcr0_cpuid_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/xcr0_cpuid_test.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/kvm/x86/xen_shinfo_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/xen_shinfo_test.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/audit.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/audit.h</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/audit_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/audit_test.c</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/base_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/base_test.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/common.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/common.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/config</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/fs_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/fs_test.c</a></td><td class='right'>2109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 78.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 21.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/net_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/net_test.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/ptrace_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/ptrace_test.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/scoped_abstract_unix_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/scoped_abstract_unix_test.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/scoped_signal_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/scoped_signal_test.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/landlock/wait-pipe-sandbox.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/wait-pipe-sandbox.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/lib.mk?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib.mk</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/lib/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/lib/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib/config</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/lib/prime_numbers.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib/prime_numbers.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/lib/printf.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib/printf.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/lib/scanf.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib/scanf.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/livepatch/functions.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/livepatch/functions.sh</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/livepatch/test-ftrace.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/livepatch/test-ftrace.sh</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/livepatch/test-kprobe.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/livepatch/test-kprobe.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/liveupdate/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/liveupdate/.gitignore</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/liveupdate/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/liveupdate/Makefile</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/liveupdate/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/liveupdate/config</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/liveupdate/do_kexec.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/liveupdate/do_kexec.sh</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/liveupdate/liveupdate.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/liveupdate/liveupdate.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/liveupdate/luo_kexec_simple.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/liveupdate/luo_kexec_simple.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/liveupdate/luo_multi_session.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/liveupdate/luo_multi_session.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/liveupdate/luo_test_utils.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/liveupdate/luo_test_utils.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/liveupdate/luo_test_utils.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/liveupdate/luo_test_utils.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/lkdtm/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lkdtm/config</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/lsm/lsm_get_self_attr_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lsm/lsm_get_self_attr_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/lsm/lsm_list_modules_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lsm/lsm_list_modules_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/lsm/lsm_set_self_attr_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lsm/lsm_set_self_attr_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/media_tests/media_device_open.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/media_tests/media_device_open.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/media_tests/media_device_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/media_tests/media_device_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/membarrier/membarrier_test_impl.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/membarrier/membarrier_test_impl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mincore/mincore_selftest.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mincore/mincore_selftest.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/.gitignore</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/charge_reserved_hugetlb.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/charge_reserved_hugetlb.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/compaction_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/compaction_test.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/config</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/cow.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/cow.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 6.5%;'/><td class='none' style='width: 84.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/droppable.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/droppable.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/guard-pages.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/guard-pages.c</a></td><td class='right'>1320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 49.4%;'/><td class='none' style='width: 50.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/guard-regions.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/guard-regions.c</a></td><td class='right'>2326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 87.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 12.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/gup_longterm.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/gup_longterm.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/gup_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/gup_test.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/hmm-tests.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hmm-tests.c</a></td><td class='right'>926</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 32.2%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 65.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/hugepage-mmap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugepage-mmap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/hugepage-mremap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugepage-mremap.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/hugetlb-madvise.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb-madvise.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/hugetlb-read-hwpoison.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb-read-hwpoison.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/hugetlb-soft-offline.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb-soft-offline.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/hugetlb_dio.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb_dio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/hugetlb_fault_after_madv.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb_fault_after_madv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/hugetlb_madv_vs_map.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb_madv_vs_map.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/hugetlb_reparenting_test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb_reparenting_test.sh</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/khugepaged.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/khugepaged.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/ksm_functional_tests.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/ksm_functional_tests.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/ksm_tests.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/ksm_tests.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/madv_populate.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/madv_populate.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/map_fixed_noreplace.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/map_fixed_noreplace.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/map_hugetlb.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/map_hugetlb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/map_populate.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/map_populate.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/mdwe_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/mdwe_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/memfd_secret.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/memfd_secret.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/merge.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/merge.c</a></td><td class='right'>1174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 43.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 56.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/migration.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/migration.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/mkdirty.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/mkdirty.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/mlock-random-test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/mlock-random-test.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/mlock2-tests.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/mlock2-tests.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/mlock2.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/mlock2.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/mrelease_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/mrelease_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/mremap_dontunmap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/mremap_dontunmap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/mremap_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/mremap_test.c</a></td><td class='right'>630</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 76.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/mseal_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/mseal_test.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/on-fault-limit.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/on-fault-limit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/pagemap_ioctl.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/pagemap_ioctl.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/pfnmap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/pfnmap.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/pkey-helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/pkey-helpers.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/pkey-powerpc.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/pkey-powerpc.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/pkey_sighandler_tests.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/pkey_sighandler_tests.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/pkey_util.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/pkey_util.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/prctl_thp_disable.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/prctl_thp_disable.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/process_madv.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/process_madv.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/protection_keys.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/protection_keys.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/rmap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/rmap.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/run_vmtests.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/run_vmtests.sh</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/settings?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/settings</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/soft-dirty.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/soft-dirty.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/split_huge_page_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/split_huge_page_test.c</a></td><td class='right'>559</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.5%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 79.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/test_vmalloc.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/test_vmalloc.sh</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/thp_settings.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/thp_settings.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/thp_settings.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/thp_settings.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/thuge-gen.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/thuge-gen.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/transhuge-stress.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/transhuge-stress.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/uffd-common.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/uffd-common.c</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/uffd-common.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/uffd-common.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/uffd-stress.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/uffd-stress.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/uffd-unit-tests.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/uffd-unit-tests.c</a></td><td class='right'>781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.3%;'/><td class='rem' style='width: 9.9%;'/><td class='none' style='width: 70.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/uffd-wp-mremap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/uffd-wp-mremap.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/va_high_addr_switch.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/va_high_addr_switch.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/va_high_addr_switch.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/va_high_addr_switch.sh</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/virtual_address_range.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/virtual_address_range.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/vm_util.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/vm_util.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mm/vm_util.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/vm_util.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mount_setattr/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mount_setattr/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mount_setattr/mount_setattr_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mount_setattr/mount_setattr_test.c</a></td><td class='right'>703</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 73.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mqueue/mq_open_tests.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mqueue/mq_open_tests.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mqueue/mq_perf_tests.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mqueue/mq_perf_tests.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mseal_system_mappings/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mseal_system_mappings/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mseal_system_mappings/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mseal_system_mappings/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mseal_system_mappings/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mseal_system_mappings/config</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/.gitignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/Makefile</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/config</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/cred_change_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/cred_change_test.c</a></td><td class='right'>814</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 30.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 69.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/file_handle_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/file_handle_test.c</a></td><td class='right'>1429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 53.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 46.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/init_ino_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/init_ino_test.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/listns_efault_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/listns_efault_test.c</a></td><td class='right'>530</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/listns_pagination_bug.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/listns_pagination_bug.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/listns_permissions_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/listns_permissions_test.c</a></td><td class='right'>759</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 28.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 71.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/listns_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/listns_test.c</a></td><td class='right'>679</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/ns_active_ref_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/ns_active_ref_test.c</a></td><td class='right'>2672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/nsid_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/nsid_test.c</a></td><td class='right'>981</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 36.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 63.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/regression_pidfd_setns_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/regression_pidfd_setns_test.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/siocgskns_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/siocgskns_test.c</a></td><td class='right'>1824</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 68.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 31.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/stress_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/stress_test.c</a></td><td class='right'>626</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/namespaces/wrappers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/namespaces/wrappers.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/nci/nci_dev.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/nci/nci_dev.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/.gitignore</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/Makefile</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/af_unix/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/af_unix/.gitignore</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/af_unix/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/af_unix/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/af_unix/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/af_unix/config</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/af_unix/diag_uid.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/af_unix/diag_uid.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/af_unix/msg_oob.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/af_unix/msg_oob.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/af_unix/scm_inq.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/af_unix/scm_inq.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/af_unix/scm_pidfd.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/af_unix/scm_pidfd.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/af_unix/scm_rights.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/af_unix/scm_rights.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/af_unix/so_peek_off.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/af_unix/so_peek_off.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/af_unix/unix_connect.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/af_unix/unix_connect.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/af_unix/unix_connreset.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/af_unix/unix_connreset.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/amt.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/amt.sh</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/bareudp.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/bareudp.sh</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/bench/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/bench/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/bench/page_pool/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/bench/page_pool/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/bench/page_pool/time_bench.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/bench/page_pool/time_bench.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/bench/page_pool/time_bench.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/bench/page_pool/time_bench.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/bench/test_bench_page_pool.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/bench/test_bench_page_pool.sh</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/bind_bhash.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/bind_bhash.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/bind_timewait.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/bind_timewait.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/bind_wildcard.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/bind_wildcard.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/bpf_offload.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/bpf_offload.py</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/broadcast_ether_dst.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/broadcast_ether_dst.sh</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/broadcast_pmtu.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/broadcast_pmtu.sh</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/busy_poll_test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/busy_poll_test.sh</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/busy_poller.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/busy_poller.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/can/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/can/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/can/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/can/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/can/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/can/config</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/can/test_raw_filter.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/can/test_raw_filter.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/can/test_raw_filter.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/can/test_raw_filter.sh</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/cmsg_ip.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/cmsg_ip.sh</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/cmsg_ipv6.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/cmsg_ipv6.sh</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/cmsg_sender.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/cmsg_sender.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/config</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/epoll_busy_poll.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/epoll_busy_poll.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/fcnal-ipv4.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/fcnal-ipv4.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/fcnal-ipv6.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/fcnal-ipv6.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/fcnal-other.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/fcnal-other.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/fcnal-test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/fcnal-test.sh</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 8.1%;'/><td class='none' style='width: 83.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/fdb_flush.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/fdb_flush.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/fdb_notify.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/fdb_notify.sh</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/fib_nexthops.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/fib_nexthops.sh</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/fib_rule_tests.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/fib_rule_tests.sh</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/fib_tests.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/fib_tests.sh</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/Makefile</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/README?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/README</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/bridge_activity_notify.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/bridge_activity_notify.sh</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/bridge_igmp.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/bridge_igmp.sh</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/bridge_mdb.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/bridge_mdb.sh</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/bridge_mld.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/bridge_mld.sh</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/bridge_vlan_aware.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/bridge_vlan_aware.sh</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/config</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/custom_multipath_hash.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/custom_multipath_hash.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/gre_custom_multipath_hash.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/gre_custom_multipath_hash.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/ip6_forward_instats_vrf.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/ip6_forward_instats_vrf.sh</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/ip6gre_custom_multipath_hash.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/ip6gre_custom_multipath_hash.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/lib.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/lib.sh</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/lib_sh_test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/lib_sh_test.sh</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/local_termination.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/local_termination.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/router.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/router.sh</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/router_multicast.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/router_multicast.sh</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/sch_ets.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/sch_ets.sh</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/sch_ets_core.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/sch_ets_core.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/sch_ets_tests.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/sch_ets_tests.sh</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/sch_red.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/sch_red.sh</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/sch_tbf_core.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/sch_tbf_core.sh</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/tc_flower.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/tc_flower.sh</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/tc_flower_port_range.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/tc_flower_port_range.sh</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/tc_taprio.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/tc_taprio.sh</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/tsn_lib.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/tsn_lib.sh</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/vxlan_bridge_1q.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/vxlan_bridge_1q.sh</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh</a></td><td class='right'>766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 28.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 71.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/forwarding/vxlan_reserved.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/forwarding/vxlan_reserved.sh</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/gre_ipv6_lladdr.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/gre_ipv6_lladdr.sh</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/gro.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/gro.sh</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/hsr/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/hsr/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/hsr/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/hsr/config</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/icmp_redirect.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/icmp_redirect.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/io_uring_zerocopy_tx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/io_uring_zerocopy_tx.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ip_local_port_range.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ip_local_port_range.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ip_local_port_range.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ip_local_port_range.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ipsec.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ipsec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ipv6_force_forwarding.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ipv6_force_forwarding.sh</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ipv6_fragmentation.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ipv6_fragmentation.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ipv6_route_update_soft_lockup.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ipv6_route_update_soft_lockup.sh</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib.sh</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/ksft.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/ksft.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/ksft_setup_loopback.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/ksft_setup_loopback.sh</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/py/__init__.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/py/__init__.py</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/py/ksft.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/py/ksft.py</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/py/netns.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/py/netns.py</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/py/nsim.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/py/nsim.py</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/py/utils.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/py/utils.py</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/py/ynl.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/py/ynl.py</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/sh/defer.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/sh/defer.sh</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/xdp_dummy.bpf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/xdp_dummy.bpf.c</a> (renamed from tools/testing/selftests/net/xdp_dummy.bpf.c)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/xdp_helper.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/xdp_helper.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lib/xdp_native.bpf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lib/xdp_native.bpf.c</a></td><td class='right'>680</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/link_netns.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/link_netns.py</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/lwt_dst_cache_ref_loop.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/lwt_dst_cache_ref_loop.sh</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/Makefile</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/config</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/diag.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/diag.sh</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/mptcp_connect.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/mptcp_connect.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/mptcp_connect.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/mptcp_connect.sh</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/mptcp_diag.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/mptcp_diag.c</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/mptcp_inq.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/mptcp_inq.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/mptcp_join.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/mptcp_join.sh</a></td><td class='right'>626</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.1%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 76.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/mptcp_lib.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/mptcp_lib.sh</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/mptcp_sockopt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/mptcp_sockopt.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/mptcp_sockopt.sh</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/pm_netlink.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/pm_netlink.sh</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/pm_nl_ctl.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/pm_nl_ctl.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/simult_flows.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/simult_flows.sh</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/mptcp/userspace_pm.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/mptcp/userspace_pm.sh</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/msg_zerocopy.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/msg_zerocopy.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/msg_zerocopy.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/msg_zerocopy.sh</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/nat6to4.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/nat6to4.sh</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/net_helper.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/net_helper.sh</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netdev-l2addr.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netdev-l2addr.sh</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/Makefile</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/br_netfilter.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/br_netfilter.sh</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/br_netfilter_queue.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/br_netfilter_queue.sh</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/bridge_brouter.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/bridge_brouter.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/config</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/conntrack_clash.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/conntrack_clash.sh</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/conntrack_dump_flush.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/conntrack_resize.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/conntrack_resize.sh</a></td><td class='right'>515</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/conntrack_vrf.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/conntrack_vrf.sh</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/ipvs.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/ipvs.sh</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/nf_nat_edemux.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/nf_nat_edemux.sh</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/nft_concat_range.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/nft_concat_range.sh</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/nft_fib.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/nft_fib.sh</a></td><td class='right'>638</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 76.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/nft_flowtable.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/nft_flowtable.sh</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/nft_interface_stress.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/nft_interface_stress.sh</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/nft_nat.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/nft_nat.sh</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/nft_nat_zones.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/nft_nat_zones.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/nft_queue.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/nft_queue.sh</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/rpath.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/rpath.sh</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/sctp_collision.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/sctp_collision.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netfilter/udpclash.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netfilter/udpclash.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netlink-dumps.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netlink-dumps.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/netns-name.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/netns-name.sh</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/nettest.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/nettest.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/nl_netdev.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/nl_netdev.py</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/openvswitch/openvswitch.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/openvswitch/openvswitch.sh</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/openvswitch/ovs-dpctl.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/openvswitch/ovs-dpctl.py</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/Makefile</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/common.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/common.sh</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/config</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/data64.key?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/data64.key</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/ovpn-cli.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/ovpn-cli.c</a></td><td class='right'>2387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 89.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 10.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/tcp_peers.txt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/tcp_peers.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/test-chachapoly.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/test-chachapoly.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/test-close-socket-tcp.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/test-close-socket-tcp.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/test-close-socket.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/test-close-socket.sh</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/test-float.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/test-float.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/test-large-mtu.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/test-large-mtu.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/test-tcp.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/test-tcp.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/test.sh</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ovpn/udp_peers.txt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ovpn/udp_peers.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/config</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/defaults.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/defaults.sh</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/ksft_runner.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/ksft_runner.sh</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-read.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-read.pkt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_close_no_rst.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_close_no_rst.pkt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_dsack_mult.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_dsack_mult.pkt</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-cookie-not-reqd.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-cookie-not-reqd.pkt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-no-setsockopt.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-no-setsockopt.pkt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-non-tfo-listener.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-non-tfo-listener.pkt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-pure-syn-data.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-pure-syn-data.pkt</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-rw.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-rw.pkt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-zero-payload.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_basic-zero-payload.pkt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_client-ack-dropped-then-recovery-ms-timestamps.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_client-ack-dropped-then-recovery-ms-timestamps.pkt</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_experimental_option.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_experimental_option.pkt</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_fin-close-socket.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_fin-close-socket.pkt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_icmp-before-accept.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_icmp-before-accept.pkt</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_reset-after-accept.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_reset-after-accept.pkt</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_reset-before-accept.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_reset-before-accept.pkt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_reset-close-with-unread-data.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_reset-close-with-unread-data.pkt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_reset-non-tfo-socket.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_reset-non-tfo-socket.pkt</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_sockopt-fastopen-key.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_sockopt-fastopen-key.pkt</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_trigger-rst-listener-closed.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_trigger-rst-listener-closed.pkt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_trigger-rst-reconnect.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_trigger-rst-reconnect.pkt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_fastopen_server_trigger-rst-unread-data-closed.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_fastopen_server_trigger-rst-unread-data-closed.pkt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_inq_client.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_inq_client.pkt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_inq_server.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_inq_server.pkt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_ooo-before-and-after-accept.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_ooo-before-and-after-accept.pkt</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_ooo_rcv_mss.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_ooo_rcv_mss.pkt</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_rcv_big_endseq.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_rcv_big_endseq.pkt</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_rcv_toobig.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_rcv_toobig.pkt</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_rto_synack_rto_max.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_rto_synack_rto_max.pkt</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_syscall_bad_arg_sendmsg-empty-iov.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_syscall_bad_arg_sendmsg-empty-iov.pkt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_user_timeout_user-timeout-probe.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_user_timeout_user-timeout-probe.pkt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_zerocopy_basic.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_zerocopy_basic.pkt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_zerocopy_batch.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_zerocopy_batch.pkt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_zerocopy_client.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_zerocopy_client.pkt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_zerocopy_closed.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_zerocopy_closed.pkt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_zerocopy_epoll_edge.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_zerocopy_epoll_edge.pkt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_zerocopy_epoll_exclusive.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_zerocopy_epoll_exclusive.pkt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_zerocopy_epoll_oneshot.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_zerocopy_epoll_oneshot.pkt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_zerocopy_fastopen-client.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_zerocopy_fastopen-client.pkt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_zerocopy_fastopen-server.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_zerocopy_fastopen-server.pkt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_zerocopy_maxfrags.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_zerocopy_maxfrags.pkt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/packetdrill/tcp_zerocopy_small.pkt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/packetdrill/tcp_zerocopy_small.pkt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/pmtu.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/pmtu.sh</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/proc_net_pktgen.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/proc_net_pktgen.c</a></td><td class='right'>690</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/psock_fanout.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/psock_fanout.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/psock_lib.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/psock_lib.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/psock_tpacket.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/psock_tpacket.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/rds/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/rds/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/reuseaddr_ports_exhausted.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/reuseaddr_ports_exhausted.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/reuseport_addr_any.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/reuseport_addr_any.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/reuseport_bpf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/reuseport_bpf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/reuseport_bpf_numa.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/reuseport_bpf_numa.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/route_hint.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/route_hint.sh</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/rps_default_mask.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/rps_default_mask.sh</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/rtnetlink.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/rtnetlink.py</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/rtnetlink.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/rtnetlink.sh</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/rtnetlink_notification.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/rtnetlink_notification.sh</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/rxtimestamp.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/rxtimestamp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/sctp_hello.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/sctp_hello.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/sctp_vrf.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/sctp_vrf.sh</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/setup_loopback.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/setup_loopback.sh</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/setup_veth.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/setup_veth.sh</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/sk_so_peek_off.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/sk_so_peek_off.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/skf_net_off.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/skf_net_off.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/skf_net_off.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/skf_net_off.sh</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/so_incoming_cpu.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/so_incoming_cpu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/so_rcv_listener.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/so_rcv_listener.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/so_txtime.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/so_txtime.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/socket.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/socket.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/srv6_end_dt46_l3vpn_test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/srv6_end_dt46_l3vpn_test.sh</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/srv6_end_dt4_l3vpn_test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/srv6_end_dt4_l3vpn_test.sh</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/srv6_end_flavors_test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/srv6_end_flavors_test.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/srv6_end_next_csid_l3vpn_test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/srv6_end_next_csid_l3vpn_test.sh</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/srv6_end_x_next_csid_l3vpn_test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/srv6_end_x_next_csid_l3vpn_test.sh</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/srv6_hencap_red_l3vpn_test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/srv6_hencap_red_l3vpn_test.sh</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/srv6_hl2encap_red_l2vpn_test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/srv6_hl2encap_red_l2vpn_test.sh</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/config</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/connect-deny.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/connect-deny.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/connect.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/connect.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/icmps-discard.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/icmps-discard.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/key-management.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/key-management.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/lib/aolib.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/lib/aolib.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/lib/ftrace-tcp.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/lib/ftrace-tcp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/lib/setup.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/lib/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/lib/sock.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/lib/sock.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/restore.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/restore.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/rst.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/rst.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/self-connect.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/self-connect.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/seq-ext.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/seq-ext.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_ao/unsigned-md5.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_ao/unsigned-md5.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_fastopen_backup_key.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_fastopen_backup_key.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tcp_port_share.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tcp_port_share.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/test_blackhole_dev.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/test_blackhole_dev.sh</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/test_bridge_backup_port.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/test_bridge_backup_port.sh</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/test_bridge_neigh_suppress.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/test_bridge_neigh_suppress.sh</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/test_neigh.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/test_neigh.sh</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/test_so_rcv.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/test_so_rcv.sh</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/test_vxlan_fdb_changelink.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/test_vxlan_fdb_changelink.sh</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/test_vxlan_nh.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/test_vxlan_nh.sh</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/test_vxlan_vnifiltering.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/test_vxlan_vnifiltering.sh</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tfo.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tfo.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tfo_passive.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tfo_passive.sh</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tls.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tls.c</a></td><td class='right'>626</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 76.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/toeplitz.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/toeplitz.sh</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/toeplitz_client.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/toeplitz_client.sh</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/traceroute.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/traceroute.sh</a></td><td class='right'>561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.3%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 79.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/tun.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/tun.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/txtimestamp.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/txtimestamp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/udpgro.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/udpgro.sh</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/udpgro_bench.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/udpgro_bench.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/udpgro_frglist.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/udpgro_frglist.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/udpgro_fwd.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/udpgro_fwd.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/udpgso_bench_tx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/udpgso_bench_tx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/veth.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/veth.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/vlan_bridge_binding.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/vlan_bridge_binding.sh</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/vlan_hw_filter.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/vlan_hw_filter.sh</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/vrf_route_leaking.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/vrf_route_leaking.sh</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/net/ynl.mk?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/ynl.mk</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/nolibc/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/nolibc/Makefile</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 11.0%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/nolibc/Makefile.include?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/nolibc/Makefile.include</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/nolibc/Makefile.nolibc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/nolibc/Makefile.nolibc</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/nolibc/nolibc-test-linkage.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/nolibc/nolibc-test-linkage.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/nolibc/nolibc-test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/nolibc/nolibc-test.c</a></td><td class='right'>541</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 79.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/nolibc/run-tests.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/nolibc/run-tests.sh</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/openat2/helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/openat2/helpers.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/openat2/openat2_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/openat2/openat2_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/openat2/rename_attack_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/openat2/rename_attack_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/openat2/resolve_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/openat2/resolve_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pci_endpoint/pci_endpoint_test.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pcie_bwctrl/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pcie_bwctrl/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/perf_events/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/perf_events/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/perf_events/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/perf_events/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/perf_events/mmap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/perf_events/mmap.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/perf_events/remove_on_exec.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/perf_events/remove_on_exec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/perf_events/sigtrap_threads.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/perf_events/sigtrap_threads.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/perf_events/watermark_signal.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/perf_events/watermark_signal.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pid_namespace/pid_max.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pid_namespace/pid_max.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pid_namespace/regression_enomem.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pid_namespace/regression_enomem.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/.gitignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/config</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_bind_mount.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_bind_mount.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_exec_helper.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_exec_helper.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_fdinfo_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_fdinfo_test.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_file_handle_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_file_handle_test.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_getfd_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_getfd_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_info_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_info_test.c</a></td><td class='right'>766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 28.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 71.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_open_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_open_test.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_poll_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_poll_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_setattr_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_setattr_test.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_setns_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_setns_test.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_test.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_wait.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_wait.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/pidfd/pidfd_xattr_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/pidfd/pidfd_xattr_test.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/include/instructions.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/include/instructions.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/include/pkeys.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/include/pkeys.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/mm/pkey_exec_prot.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/mm/pkey_exec_prot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/mm/pkey_siginfo.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/mm/pkey_siginfo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/event_code_tests/event_alternatives_tests_p10.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/event_code_tests/event_alternatives_tests_p10.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/event_code_tests/generic_events_valid_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/event_code_tests/generic_events_valid_test.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_l2l3_sel_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_l2l3_sel_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_radix_scope_qual_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_radix_scope_qual_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_cmp_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_cmp_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/event_code_tests/invalid_event_code_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/event_code_tests/invalid_event_code_test.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/event_code_tests/reserved_bits_mmcra_sample_elig_mode_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/event_code_tests/reserved_bits_mmcra_sample_elig_mode_test.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/sampling_tests/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/sampling_tests/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/sampling_tests/bhrb_filter_map_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/sampling_tests/bhrb_filter_map_test.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/sampling_tests/check_extended_reg_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/sampling_tests/check_extended_reg_test.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/sampling_tests/misc.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/sampling_tests/misc.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/sampling_tests/misc.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/sampling_tests/misc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_cond_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_cond_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_no_branch_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_no_branch_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_ind_call_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_ind_call_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/ptrace/core-pkey.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/ptrace/core-pkey.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/prctl/set-anon-vma-name-test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/prctl/set-anon-vma-name-test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/prctl/set-process-name.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/prctl/set-process-name.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/proc/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/proc/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/proc/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/proc/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/proc/proc-maps-race.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/proc/proc-maps-race.c</a></td><td class='right'>806</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 30.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 69.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/proc/proc-net-dev-lseek.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/proc/proc-net-dev-lseek.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/proc/proc-pid-vm.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/proc/proc-pid-vm.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/proc/proc-pidns.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/proc/proc-pidns.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ptp/testptp.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ptp/testptp.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ptrace/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ptrace/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ptrace/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ptrace/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ptrace/get_set_sud.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ptrace/get_set_sud.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ptrace/get_syscall_info.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ptrace/get_syscall_info.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ptrace/peeksiginfo.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ptrace/peeksiginfo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ptrace/set_syscall_info.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ptrace/set_syscall_info.c</a></td><td class='right'>519</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ptrace/vmaccess.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ptrace/vmaccess.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/bin/console-badness.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/bin/console-badness.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/bin/jitter.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/bin/jitter.sh</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/bin/kvm-again.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/bin/kvm-again.sh</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/bin/kvm-build.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/bin/kvm-build.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/bin/kvm-series.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/bin/kvm-series.sh</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/bin/kvm.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/bin/kvm.sh</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/bin/mktestid.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/bin/mktestid.sh</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/bin/parse-console.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/bin/parse-console.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/bin/torture.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/bin/torture.sh</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/configs/rcu/BUSTED?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/configs/rcu/BUSTED</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/configs/rcu/CFLIST?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/configs/rcu/CFLIST</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/configs/rcu/SRCU-L?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/configs/rcu/SRCU-L</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/configs/rcu/SRCU-L.boot?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/configs/rcu/SRCU-L.boot</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P.boot?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/configs/rcu/SRCU-P.boot</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE01?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/configs/rcu/TREE01</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE04?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/configs/rcu/TREE04</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE07?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/configs/rcu/TREE07</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rcutorture/configs/rcu/TREE10?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rcutorture/configs/rcu/TREE10</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/resctrl/resctrl.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/resctrl/resctrl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ring-buffer/map_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ring-buffer/map_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/README?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/README</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/abi/pointer_masking.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/abi/pointer_masking.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/hwprobe/cbo.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/hwprobe/cbo.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/hwprobe/hwprobe.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/hwprobe/hwprobe.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/hwprobe/which-cpus.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/hwprobe/which-cpus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/mm/mmap_bottomup.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/mm/mmap_bottomup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/mm/mmap_default.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/mm/mmap_default.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/mm/mmap_test.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/mm/mmap_test.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/sigreturn/sigreturn.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/sigreturn/sigreturn.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/vector/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/vector/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/vector/v_initval.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/vector/v_initval.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/vector/vstate_prctl.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/vector/vstate_prctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/riscv/vector/vstate_ptrace.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/riscv/vector/vstate_ptrace.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rseq/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rseq/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rseq/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rseq/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rseq/basic_percpu_ops_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rseq/basic_percpu_ops_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rseq/rseq-riscv-bits.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rseq/rseq-riscv-bits.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rseq/rseq-riscv.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rseq/rseq-riscv.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rseq/rseq-s390.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rseq/rseq-s390.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rseq/rseq.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rseq/rseq.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rseq/rseq.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rseq/rseq.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rseq/run_syscall_errors_test.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rseq/run_syscall_errors_test.sh</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rseq/syscall_errors_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rseq/syscall_errors_test.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rtc/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rtc/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rtc/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rtc/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rtc/rtctest.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rtc/rtctest.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/rtc/setdate.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/rtc/setdate.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/run_kselftest.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/run_kselftest.sh</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched/config</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/allowed_cpus.bpf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/allowed_cpus.bpf.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/allowed_cpus.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/allowed_cpus.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/config</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/enq_select_cpu.bpf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/enq_select_cpu.bpf.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/enq_select_cpu.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/enq_select_cpu.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/enq_select_cpu_fails.bpf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/enq_select_cpu_fails.bpf.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/enq_select_cpu_fails.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/enq_select_cpu_fails.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/exit.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/exit.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/hotplug.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/hotplug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/maximal.bpf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/maximal.bpf.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/numa.bpf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/numa.bpf.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/numa.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/numa.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/peek_dsq.bpf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/peek_dsq.bpf.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sched_ext/peek_dsq.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sched_ext/peek_dsq.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/seccomp/seccomp_benchmark.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/seccomp/seccomp_benchmark.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/seccomp/seccomp_bpf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/seccomp/seccomp_bpf.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sgx/main.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sgx/main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/signal/mangle_uc_sigmask.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/signal/mangle_uc_sigmask.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/signal/sas.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/signal/sas.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sparc64/drivers/adi-test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sparc64/drivers/adi-test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sync/sync_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sync/sync_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/syscall_user_dispatch/sud_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/syscall_user_dispatch/sud_test.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/sysctl/sysctl.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/sysctl/sysctl.sh</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/config</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/nat.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/actions/nat.json</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/actions/police.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/actions/police.json</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/infra/actions.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/infra/actions.json</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json</a></td><td class='right'>909</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 34.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 66.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/qdiscs/codel.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/qdiscs/codel.json</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/qdiscs/dualpi2.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/qdiscs/dualpi2.json</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq.json</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/qdiscs/hhf.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/qdiscs/hhf.json</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/qdiscs/pie.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/qdiscs/pie.json</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tc-tests/qdiscs/sfq.json?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tc-tests/qdiscs/sfq.json</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tc-testing/tdc.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tc-testing/tdc.sh</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tdx/tdx_guest_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tdx/tdx_guest_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/thermal/intel/power_floor/power_floor_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/thermal/intel/power_floor/power_floor_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/thermal/intel/workload_hint/workload_hint_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/thermal/intel/workload_hint/workload_hint_test.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timens/clock_nanosleep.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timens/clock_nanosleep.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timens/exec.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timens/exec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timens/futex.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timens/futex.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timens/gettime_perf.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timens/gettime_perf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timens/procfs.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timens/procfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timens/timens.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timens/timens.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timens/timens.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timens/timens.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timens/timer.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timens/timer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timens/timerfd.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timens/timerfd.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timens/vfork_exec.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timens/vfork_exec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/adjtick.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/adjtick.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/alarmtimer-suspend.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/alarmtimer-suspend.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/change_skew.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/change_skew.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/clocksource-switch.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/clocksource-switch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/freq-step.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/freq-step.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/inconsistency-check.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/inconsistency-check.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/leap-a-day.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/leap-a-day.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/leapcrash.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/leapcrash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/mqueue-lat.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/mqueue-lat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/nanosleep.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/nanosleep.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/nsleep-lat.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/nsleep-lat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/posix_timers.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/posix_timers.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/raw_skew.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/raw_skew.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/rtcpie.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/rtcpie.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/set-2038.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/set-2038.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/set-tai.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/set-tai.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/set-timer-lat.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/set-timer-lat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/set-tz.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/set-tz.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/skew_consistency.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/skew_consistency.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/threadtest.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/threadtest.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/timers/valid-adjtimex.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/timers/valid-adjtimex.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tpm2/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tpm2/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tpm2/test_smoke.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tpm2/test_smoke.sh</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tpm2/tpm2.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tpm2/tpm2.py</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tty/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tty/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tty/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tty/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tty/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tty/config</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tty/tty_tiocsti_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tty/tty_tiocsti_test.c</a></td><td class='right'>650</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/tty/tty_tstamp_update.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/tty/tty_tstamp_update.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/Makefile</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/common.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/common.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/config</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/fault_inject.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/fault_inject.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/file_backed.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/file_backed.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/kublk.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/kublk.c</a></td><td class='right'>1729</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 64.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 35.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/kublk.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/kublk.h</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/null.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/null.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/stripe.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/stripe.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_common.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_common.sh</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_01.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_01.sh</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_02.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_02.sh</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_03.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_03.sh</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_04.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_04.sh</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_05.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_05.sh</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_06.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_06.sh</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_07.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_07.sh</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_08.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_08.sh</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_09.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_09.sh</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_10.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_10.sh</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_11.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_11.sh</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_12.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_12.sh</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_generic_13.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_generic_13.sh</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_loop_01.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_loop_01.sh</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_loop_02.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_loop_02.sh</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_loop_03.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_loop_03.sh</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_loop_04.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_loop_04.sh</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_loop_05.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_loop_05.sh</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_null_01.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_null_01.sh</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_null_02.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_null_02.sh</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_stress_01.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_stress_01.sh</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_stress_02.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_stress_02.sh</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_stress_03.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_stress_03.sh</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_stress_04.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_stress_04.sh</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_stress_05.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_stress_05.sh</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_stripe_01.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_stripe_01.sh</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_stripe_02.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_stripe_02.sh</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_stripe_03.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_stripe_03.sh</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/test_stripe_04.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/test_stripe_04.sh</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/trace/count_ios_per_tid.bt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/trace/count_ios_per_tid.bt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/trace/seq_io.bt?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/trace/seq_io.bt</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/ublk_dep.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/ublk_dep.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/ublk/utils.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ublk/utils.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/uevent/uevent_filtering.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/uevent/uevent_filtering.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/user_events/abi_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/user_events/abi_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/user_events/dyn_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/user_events/dyn_test.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/user_events/ftrace_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/user_events/ftrace_test.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/user_events/perf_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/user_events/perf_test.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/user_events/user_events_selftests.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/user_events/user_events_selftests.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/parse_vdso.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/parse_vdso.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/parse_vdso.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/parse_vdso.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/vdso_call.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/vdso_call.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/vdso_config.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/vdso_config.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>l---------<span class='modechange'>[-rw-r--r--]</span></td><td class='typ'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/vdso_standalone_test_x86.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/vdso_test_abi.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/vdso_test_abi.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/vdso_test_chacha.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/vdso_test_chacha.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/vdso_test_clock_getres.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/vdso_test_clock_getres.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/vdso_test_correctness.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/vdso_test_correctness.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/vdso_test_getcpu.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/vdso_test_getcpu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/vdso_test_getrandom.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/vdso_test_getrandom.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/vdso_test_gettimeofday.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/vdso_test_gettimeofday.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vDSO/vgetrandom-chacha.S?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vDSO/vgetrandom-chacha.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/verification/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/verification/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/verification/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/verification/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/verification/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/verification/config</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/verification/settings?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/verification/settings</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/verification/test.d/functions?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/verification/test.d/functions</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/verification/test.d/rv_monitor_enable_disable.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/verification/test.d/rv_monitor_enable_disable.tc</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/verification/test.d/rv_monitor_reactor.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/verification/test.d/rv_monitor_reactor.tc</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/verification/test.d/rv_monitors_available.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/verification/test.d/rv_monitors_available.tc</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/verification/test.d/rv_wwnr_printk.tc?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/verification/test.d/rv_wwnr_printk.tc</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/verification/verificationtest-ktap?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/verification/verificationtest-ktap</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/.gitignore</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/Makefile</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/drivers/dsa/dsa.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/drivers/dsa/dsa.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.4%;'/></tr></table></td></tr>
<tr><td class='mode'>l---------</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/drivers/dsa/registers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/drivers/dsa/registers.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>l---------</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/drivers/ioat/hw.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/drivers/ioat/hw.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/drivers/ioat/ioat.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/drivers/ioat/ioat.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>l---------</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/drivers/ioat/registers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/drivers/ioat/registers.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/include/libvfio.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/include/libvfio.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/include/libvfio/assert.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/include/libvfio/assert.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/include/libvfio/iommu.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/include/libvfio/iommu.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/include/libvfio/iova_allocator.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/include/libvfio/iova_allocator.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_driver.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_driver.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/iommu.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/iommu.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/iova_allocator.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/iova_allocator.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/libvfio.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/libvfio.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/libvfio.mk?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/libvfio.mk</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/vfio_pci_device.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/vfio_pci_device.c</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/lib/vfio_pci_driver.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/lib/vfio_pci_driver.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/scripts/cleanup.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/scripts/cleanup.sh</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/scripts/lib.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/scripts/lib.sh</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/scripts/run.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/scripts/run.sh</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/scripts/setup.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/scripts/setup.sh</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/vfio_dma_mapping_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/vfio_dma_mapping_test.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/vfio_iommufd_setup_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/vfio_iommufd_setup_test.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/vfio_pci_device_init_perf_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/vfio_pci_device_init_perf_test.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/vfio_pci_device_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/vfio_pci_device_test.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vfio/vfio_pci_driver_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vfio/vfio_pci_driver_test.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vsock/.gitignore?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vsock/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vsock/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vsock/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vsock/config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vsock/config</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vsock/settings?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vsock/settings</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/vsock/vmtest.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/vsock/vmtest.sh</a></td><td class='right'>607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 77.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/watchdog/watchdog-test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/watchdog/watchdog-test.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/wireguard/netns.sh?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/wireguard/netns.sh</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/wireguard/qemu/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/wireguard/qemu/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/wireguard/qemu/debug.config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/wireguard/qemu/debug.config</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/wireguard/qemu/kernel.config?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/wireguard/qemu/kernel.config</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/amx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/amx.c</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 16.0%;'/><td class='none' style='width: 83.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/apx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/apx.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/avx.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/avx.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/bugs/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/bugs/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/bugs/common.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/bugs/common.py</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/bugs/its_indirect_alignment.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/bugs/its_indirect_alignment.py</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/bugs/its_permutations.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/bugs/its_permutations.py</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/bugs/its_ret_alignment.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/bugs/its_ret_alignment.py</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/bugs/its_sysfs.py?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/bugs/its_sysfs.py</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/corrupt_xstate_header.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/corrupt_xstate_header.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/entry_from_vm86.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/entry_from_vm86.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/fsgsbase.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/fsgsbase.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/helpers.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/helpers.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/ioperm.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/ioperm.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/iopl.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/iopl.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/lam.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/lam.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/ldt_gdt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/ldt_gdt.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/mov_ss_trap.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/mov_ss_trap.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/ptrace_syscall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/ptrace_syscall.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/sigaltstack.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/sigaltstack.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/sigreturn.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/sigreturn.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/sigtrap_loop.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/sigtrap_loop.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/single_step_syscall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/single_step_syscall.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/syscall_arg_fault.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/syscall_arg_fault.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/syscall_nt.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/syscall_nt.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/syscall_numbering.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/syscall_numbering.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/sysret_rip.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/sysret_rip.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/test_mremap_vdso.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/test_mremap_vdso.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/test_vsyscall.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/test_vsyscall.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/unwind_vdso.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/unwind_vdso.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/xstate.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/xstate.c</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/x86/xstate.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/x86/xstate.h</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/selftests/zram/README?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/zram/README</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/interval_tree-shim.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/interval_tree-shim.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/linux.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/linux.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/linux/cleanup.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/linux/cleanup.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/linux/idr.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/linux/idr.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/linux/interval_tree.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/linux/interval_tree.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/linux/interval_tree_generic.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/linux/interval_tree_generic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/linux/maple_tree.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/linux/maple_tree.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/linux/rbtree.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/linux/rbtree.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/linux/rbtree_augmented.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/linux/rbtree_augmented.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/linux/rbtree_types.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/linux/rbtree_types.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/maple-shared.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/maple-shared.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/maple-shim.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/maple-shim.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/rbtree-shim.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/rbtree-shim.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/shared/shared.mk?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/shared/shared.mk</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/vma/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/vma/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/tools/testing/vma/linux/atomic.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/vma/linux/atomic.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/vma/vma.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/vma/vma.c</a></td><td class='right'>566</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.8%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 78.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/vma/vma_internal.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/vma/vma_internal.h</a></td><td class='right'>1125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 32.4%;'/><td class='rem' style='width: 9.7%;'/><td class='none' style='width: 57.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/vsock/Makefile?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/vsock/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/vsock/timeout.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/vsock/timeout.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/vsock/timeout.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/vsock/timeout.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/vsock/util.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/vsock/util.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/vsock/util.h?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/vsock/util.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/tools/testing/vsock/vsock_test.c?id2=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/vsock/vsock_test.c</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.3%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 81.8%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1778 files changed, 145244 insertions, 23374 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/tools/testing/crypto/chacha20-s390/test-cipher.c b/tools/testing/crypto/chacha20-s390/test-cipher.c<br/>index 8141d45df51a..827507844e8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/crypto/chacha20-s390/test-cipher.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/crypto/chacha20-s390/test-cipher.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/crypto/chacha20-s390/test-cipher.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/crypto/chacha20-s390/test-cipher.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@ struct skcipher_def {</div><div class='ctx'> /* Perform cipher operations with the chacha lib */</div><div class='ctx'> static int test_lib_chacha(u8 *revert, u8 *cipher, u8 *plain)</div><div class='ctx'> {</div><div class='del'>-	u32 chacha_state[CHACHA_STATE_WORDS];</div><div class='add'>+	struct chacha_state chacha_state;</div><div class='ctx'> 	u8 iv[16], key[32];</div><div class='ctx'> 	u64 start, end;</div><div class='ctx'> </div><div class='hunk'>@@ -66,10 +66,10 @@ static int test_lib_chacha(u8 *revert, u8 *cipher, u8 *plain)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Encrypt */</div><div class='del'>-	chacha_init_arch(chacha_state, (u32*)key, iv);</div><div class='add'>+	chacha_init(&amp;chacha_state, (u32 *)key, iv);</div><div class='ctx'> </div><div class='ctx'> 	start = ktime_get_ns();</div><div class='del'>-	chacha_crypt_arch(chacha_state, cipher, plain, data_size, 20);</div><div class='add'>+	chacha_crypt_arch(&amp;chacha_state, cipher, plain, data_size, 20);</div><div class='ctx'> 	end = ktime_get_ns();</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -81,10 +81,10 @@ static int test_lib_chacha(u8 *revert, u8 *cipher, u8 *plain)</div><div class='ctx'> 	pr_info("lib encryption took: %lld nsec", end - start);</div><div class='ctx'> </div><div class='ctx'> 	/* Decrypt */</div><div class='del'>-	chacha_init_arch(chacha_state, (u32 *)key, iv);</div><div class='add'>+	chacha_init(&amp;chacha_state, (u32 *)key, iv);</div><div class='ctx'> </div><div class='ctx'> 	start = ktime_get_ns();</div><div class='del'>-	chacha_crypt_arch(chacha_state, revert, cipher, data_size, 20);</div><div class='add'>+	chacha_crypt_arch(&amp;chacha_state, revert, cipher, data_size, 20);</div><div class='ctx'> 	end = ktime_get_ns();</div><div class='ctx'> </div><div class='ctx'> 	if (debug)</div><div class='head'>diff --git a/tools/testing/cxl/Kbuild b/tools/testing/cxl/Kbuild<br/>index b1256fee3567..0e151d0572d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/Kbuild?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/cxl/Kbuild</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/Kbuild?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/cxl/Kbuild</a></div><div class='hunk'>@@ -4,23 +4,19 @@ ldflags-y += --wrap=is_acpi_device_node</div><div class='ctx'> ldflags-y += --wrap=acpi_evaluate_integer</div><div class='ctx'> ldflags-y += --wrap=acpi_pci_find_root</div><div class='ctx'> ldflags-y += --wrap=nvdimm_bus_register</div><div class='del'>-ldflags-y += --wrap=devm_cxl_port_enumerate_dports</div><div class='del'>-ldflags-y += --wrap=devm_cxl_setup_hdm</div><div class='del'>-ldflags-y += --wrap=devm_cxl_add_passthrough_decoder</div><div class='del'>-ldflags-y += --wrap=devm_cxl_enumerate_decoders</div><div class='ctx'> ldflags-y += --wrap=cxl_await_media_ready</div><div class='del'>-ldflags-y += --wrap=cxl_hdm_decode_init</div><div class='del'>-ldflags-y += --wrap=cxl_dvsec_rr_decode</div><div class='ctx'> ldflags-y += --wrap=devm_cxl_add_rch_dport</div><div class='del'>-ldflags-y += --wrap=cxl_rcd_component_reg_phys</div><div class='ctx'> ldflags-y += --wrap=cxl_endpoint_parse_cdat</div><div class='ctx'> ldflags-y += --wrap=cxl_dport_init_ras_reporting</div><div class='add'>+ldflags-y += --wrap=devm_cxl_endpoint_decoders_setup</div><div class='add'>+ldflags-y += --wrap=hmat_get_extended_linear_cache_size</div><div class='ctx'> </div><div class='ctx'> DRIVERS := ../../../drivers</div><div class='ctx'> CXL_SRC := $(DRIVERS)/cxl</div><div class='ctx'> CXL_CORE_SRC := $(DRIVERS)/cxl/core</div><div class='ctx'> ccflags-y := -I$(srctree)/drivers/cxl/</div><div class='ctx'> ccflags-y += -D__mock=__weak</div><div class='add'>+ccflags-y += -DCXL_TEST_ENABLE=1</div><div class='ctx'> ccflags-y += -DTRACE_INCLUDE_PATH=$(CXL_CORE_SRC) -I$(srctree)/drivers/cxl/core/</div><div class='ctx'> </div><div class='ctx'> obj-m += cxl_acpi.o</div><div class='hunk'>@@ -61,8 +57,12 @@ cxl_core-y += $(CXL_CORE_SRC)/pci.o</div><div class='ctx'> cxl_core-y += $(CXL_CORE_SRC)/hdm.o</div><div class='ctx'> cxl_core-y += $(CXL_CORE_SRC)/pmu.o</div><div class='ctx'> cxl_core-y += $(CXL_CORE_SRC)/cdat.o</div><div class='add'>+cxl_core-y += $(CXL_CORE_SRC)/ras.o</div><div class='ctx'> cxl_core-$(CONFIG_TRACING) += $(CXL_CORE_SRC)/trace.o</div><div class='ctx'> cxl_core-$(CONFIG_CXL_REGION) += $(CXL_CORE_SRC)/region.o</div><div class='add'>+cxl_core-$(CONFIG_CXL_MCE) += $(CXL_CORE_SRC)/mce.o</div><div class='add'>+cxl_core-$(CONFIG_CXL_FEATURES) += $(CXL_CORE_SRC)/features.o</div><div class='add'>+cxl_core-$(CONFIG_CXL_EDAC_MEM_FEATURES) += $(CXL_CORE_SRC)/edac.o</div><div class='ctx'> cxl_core-y += config_check.o</div><div class='ctx'> cxl_core-y += cxl_core_test.o</div><div class='ctx'> cxl_core-y += cxl_core_exports.o</div><div class='head'>diff --git a/tools/testing/cxl/config_check.c b/tools/testing/cxl/config_check.c<br/>index 0902c5d6e410..a80bc2c062fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/config_check.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/cxl/config_check.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/config_check.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/cxl/config_check.c</a></div><div class='hunk'>@@ -14,4 +14,5 @@ void check(void)</div><div class='ctx'> 	BUILD_BUG_ON(!IS_ENABLED(CONFIG_CXL_REGION_INVALIDATION_TEST));</div><div class='ctx'> 	BUILD_BUG_ON(!IS_ENABLED(CONFIG_NVDIMM_SECURITY_TEST));</div><div class='ctx'> 	BUILD_BUG_ON(!IS_ENABLED(CONFIG_DEBUG_FS));</div><div class='add'>+	BUILD_BUG_ON(!IS_ENABLED(CONFIG_MEMORY_HOTPLUG));</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/cxl/cxl_core_exports.c b/tools/testing/cxl/cxl_core_exports.c<br/>index f088792a8925..6754de35598d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/cxl_core_exports.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/cxl/cxl_core_exports.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/cxl_core_exports.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/cxl/cxl_core_exports.c</a></div><div class='hunk'>@@ -2,6 +2,28 @@</div><div class='ctx'> /* Copyright(c) 2022 Intel Corporation. All rights reserved. */</div><div class='ctx'> </div><div class='ctx'> #include "cxl.h"</div><div class='add'>+#include "exports.h"</div><div class='ctx'> </div><div class='ctx'> /* Exporting of cxl_core symbols that are only used by cxl_test */</div><div class='ctx'> EXPORT_SYMBOL_NS_GPL(cxl_num_decoders_committed, "CXL");</div><div class='add'>+</div><div class='add'>+cxl_add_dport_by_dev_fn _devm_cxl_add_dport_by_dev =</div><div class='add'>+	__devm_cxl_add_dport_by_dev;</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(_devm_cxl_add_dport_by_dev, "CXL");</div><div class='add'>+</div><div class='add'>+struct cxl_dport *devm_cxl_add_dport_by_dev(struct cxl_port *port,</div><div class='add'>+					    struct device *dport_dev)</div><div class='add'>+{</div><div class='add'>+	return _devm_cxl_add_dport_by_dev(port, dport_dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(devm_cxl_add_dport_by_dev, "CXL");</div><div class='add'>+</div><div class='add'>+cxl_switch_decoders_setup_fn _devm_cxl_switch_port_decoders_setup =</div><div class='add'>+	__devm_cxl_switch_port_decoders_setup;</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(_devm_cxl_switch_port_decoders_setup, "CXL");</div><div class='add'>+</div><div class='add'>+int devm_cxl_switch_port_decoders_setup(struct cxl_port *port)</div><div class='add'>+{</div><div class='add'>+	return _devm_cxl_switch_port_decoders_setup(port);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(devm_cxl_switch_port_decoders_setup, "CXL");</div><div class='head'>diff --git a/tools/testing/cxl/exports.h b/tools/testing/cxl/exports.h<br/>new file mode 100644<br/>index 000000000000..7ebee7c0bd67<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/exports.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/cxl/exports.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright(c) 2025 Intel Corporation */</div><div class='add'>+#ifndef __MOCK_CXL_EXPORTS_H_</div><div class='add'>+#define __MOCK_CXL_EXPORTS_H_</div><div class='add'>+</div><div class='add'>+typedef struct cxl_dport *(*cxl_add_dport_by_dev_fn)(struct cxl_port *port,</div><div class='add'>+							  struct device *dport_dev);</div><div class='add'>+extern cxl_add_dport_by_dev_fn _devm_cxl_add_dport_by_dev;</div><div class='add'>+</div><div class='add'>+typedef int(*cxl_switch_decoders_setup_fn)(struct cxl_port *port);</div><div class='add'>+extern cxl_switch_decoders_setup_fn _devm_cxl_switch_port_decoders_setup;</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/tools/testing/cxl/test/Kbuild b/tools/testing/cxl/test/Kbuild<br/>index 6b1927897856..af50972c8b6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/test/Kbuild?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/cxl/test/Kbuild</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/test/Kbuild?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/cxl/test/Kbuild</a></div><div class='hunk'>@@ -4,6 +4,7 @@ ccflags-y := -I$(srctree)/drivers/cxl/ -I$(srctree)/drivers/cxl/core</div><div class='ctx'> obj-m += cxl_test.o</div><div class='ctx'> obj-m += cxl_mock.o</div><div class='ctx'> obj-m += cxl_mock_mem.o</div><div class='add'>+obj-m += cxl_translate.o</div><div class='ctx'> </div><div class='ctx'> cxl_test-y := cxl.o</div><div class='ctx'> cxl_mock-y := mock.o</div><div class='head'>diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c<br/>index cc8948f49117..81e2aef3627a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/test/cxl.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/cxl/test/cxl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/test/cxl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/cxl/test/cxl.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> // Copyright(c) 2021 Intel Corporation. All rights reserved.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/memory_hotplug.h&gt;</div><div class='ctx'> #include &lt;linux/genalloc.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -14,6 +15,7 @@</div><div class='ctx'> #include "mock.h"</div><div class='ctx'> </div><div class='ctx'> static int interleave_arithmetic;</div><div class='add'>+static bool extended_linear_cache;</div><div class='ctx'> </div><div class='ctx'> #define FAKE_QTG_ID	42</div><div class='ctx'> </div><div class='hunk'>@@ -25,6 +27,9 @@ static int interleave_arithmetic;</div><div class='ctx'> #define NR_CXL_PORT_DECODERS 8</div><div class='ctx'> #define NR_BRIDGES (NR_CXL_HOST_BRIDGES + NR_CXL_SINGLE_HOST + NR_CXL_RCH)</div><div class='ctx'> </div><div class='add'>+#define MOCK_AUTO_REGION_SIZE_DEFAULT SZ_512M</div><div class='add'>+static int mock_auto_region_size = MOCK_AUTO_REGION_SIZE_DEFAULT;</div><div class='add'>+</div><div class='ctx'> static struct platform_device *cxl_acpi;</div><div class='ctx'> static struct platform_device *cxl_host_bridge[NR_CXL_HOST_BRIDGES];</div><div class='ctx'> #define NR_MULTI_ROOT (NR_CXL_HOST_BRIDGES * NR_CXL_ROOT_PORTS)</div><div class='hunk'>@@ -155,7 +160,7 @@ static struct {</div><div class='ctx'> 	} cfmws7;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct acpi_cedt_cfmws cfmws;</div><div class='del'>-		u32 target[4];</div><div class='add'>+		u32 target[3];</div><div class='ctx'> 	} cfmws8;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct acpi_cedt_cxims cxims;</div><div class='hunk'>@@ -209,7 +214,7 @@ static struct {</div><div class='ctx'> 			},</div><div class='ctx'> 			.interleave_ways = 0,</div><div class='ctx'> 			.granularity = 4,</div><div class='del'>-			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |</div><div class='add'>+			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |</div><div class='ctx'> 					ACPI_CEDT_CFMWS_RESTRICT_VOLATILE,</div><div class='ctx'> 			.qtg_id = FAKE_QTG_ID,</div><div class='ctx'> 			.window_size = SZ_256M * 4UL,</div><div class='hunk'>@@ -224,7 +229,7 @@ static struct {</div><div class='ctx'> 			},</div><div class='ctx'> 			.interleave_ways = 1,</div><div class='ctx'> 			.granularity = 4,</div><div class='del'>-			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |</div><div class='add'>+			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |</div><div class='ctx'> 					ACPI_CEDT_CFMWS_RESTRICT_VOLATILE,</div><div class='ctx'> 			.qtg_id = FAKE_QTG_ID,</div><div class='ctx'> 			.window_size = SZ_256M * 8UL,</div><div class='hunk'>@@ -239,7 +244,7 @@ static struct {</div><div class='ctx'> 			},</div><div class='ctx'> 			.interleave_ways = 0,</div><div class='ctx'> 			.granularity = 4,</div><div class='del'>-			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |</div><div class='add'>+			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |</div><div class='ctx'> 					ACPI_CEDT_CFMWS_RESTRICT_PMEM,</div><div class='ctx'> 			.qtg_id = FAKE_QTG_ID,</div><div class='ctx'> 			.window_size = SZ_256M * 4UL,</div><div class='hunk'>@@ -254,7 +259,7 @@ static struct {</div><div class='ctx'> 			},</div><div class='ctx'> 			.interleave_ways = 1,</div><div class='ctx'> 			.granularity = 4,</div><div class='del'>-			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |</div><div class='add'>+			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |</div><div class='ctx'> 					ACPI_CEDT_CFMWS_RESTRICT_PMEM,</div><div class='ctx'> 			.qtg_id = FAKE_QTG_ID,</div><div class='ctx'> 			.window_size = SZ_256M * 8UL,</div><div class='hunk'>@@ -269,7 +274,7 @@ static struct {</div><div class='ctx'> 			},</div><div class='ctx'> 			.interleave_ways = 0,</div><div class='ctx'> 			.granularity = 4,</div><div class='del'>-			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |</div><div class='add'>+			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |</div><div class='ctx'> 					ACPI_CEDT_CFMWS_RESTRICT_PMEM,</div><div class='ctx'> 			.qtg_id = FAKE_QTG_ID,</div><div class='ctx'> 			.window_size = SZ_256M * 4UL,</div><div class='hunk'>@@ -284,7 +289,7 @@ static struct {</div><div class='ctx'> 			},</div><div class='ctx'> 			.interleave_ways = 0,</div><div class='ctx'> 			.granularity = 4,</div><div class='del'>-			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |</div><div class='add'>+			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |</div><div class='ctx'> 					ACPI_CEDT_CFMWS_RESTRICT_VOLATILE,</div><div class='ctx'> 			.qtg_id = FAKE_QTG_ID,</div><div class='ctx'> 			.window_size = SZ_256M,</div><div class='hunk'>@@ -301,7 +306,7 @@ static struct {</div><div class='ctx'> 			.interleave_arithmetic = ACPI_CEDT_CFMWS_ARITHMETIC_XOR,</div><div class='ctx'> 			.interleave_ways = 0,</div><div class='ctx'> 			.granularity = 4,</div><div class='del'>-			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |</div><div class='add'>+			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |</div><div class='ctx'> 					ACPI_CEDT_CFMWS_RESTRICT_PMEM,</div><div class='ctx'> 			.qtg_id = FAKE_QTG_ID,</div><div class='ctx'> 			.window_size = SZ_256M * 8UL,</div><div class='hunk'>@@ -317,7 +322,7 @@ static struct {</div><div class='ctx'> 			.interleave_arithmetic = ACPI_CEDT_CFMWS_ARITHMETIC_XOR,</div><div class='ctx'> 			.interleave_ways = 1,</div><div class='ctx'> 			.granularity = 0,</div><div class='del'>-			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |</div><div class='add'>+			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |</div><div class='ctx'> 					ACPI_CEDT_CFMWS_RESTRICT_PMEM,</div><div class='ctx'> 			.qtg_id = FAKE_QTG_ID,</div><div class='ctx'> 			.window_size = SZ_256M * 8UL,</div><div class='hunk'>@@ -331,14 +336,14 @@ static struct {</div><div class='ctx'> 				.length = sizeof(mock_cedt.cfmws8),</div><div class='ctx'> 			},</div><div class='ctx'> 			.interleave_arithmetic = ACPI_CEDT_CFMWS_ARITHMETIC_XOR,</div><div class='del'>-			.interleave_ways = 2,</div><div class='del'>-			.granularity = 0,</div><div class='del'>-			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |</div><div class='add'>+			.interleave_ways = 8,</div><div class='add'>+			.granularity = 1,</div><div class='add'>+			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |</div><div class='ctx'> 					ACPI_CEDT_CFMWS_RESTRICT_PMEM,</div><div class='ctx'> 			.qtg_id = FAKE_QTG_ID,</div><div class='del'>-			.window_size = SZ_256M * 16UL,</div><div class='add'>+			.window_size = SZ_512M * 6UL,</div><div class='ctx'> 		},</div><div class='del'>-		.target = { 0, 1, 0, 1, },</div><div class='add'>+		.target = { 0, 1, 2, },</div><div class='ctx'> 	},</div><div class='ctx'> 	.cxims0 = {</div><div class='ctx'> 		.cxims = {</div><div class='hunk'>@@ -425,6 +430,22 @@ static struct cxl_mock_res *alloc_mock_res(resource_size_t size, int align)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Only update CFMWS0 as this is used by the auto region. */</div><div class='add'>+static void cfmws_elc_update(struct acpi_cedt_cfmws *window, int index)</div><div class='add'>+{</div><div class='add'>+	if (!extended_linear_cache)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (index != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The window size should be 2x of the CXL region size where half is</div><div class='add'>+	 * DRAM and half is CXL</div><div class='add'>+	 */</div><div class='add'>+	window-&gt;window_size = mock_auto_region_size * 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int populate_cedt(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct cxl_mock_res *res;</div><div class='hunk'>@@ -449,6 +470,7 @@ static int populate_cedt(void)</div><div class='ctx'> 	for (i = cfmws_start; i &lt;= cfmws_end; i++) {</div><div class='ctx'> 		struct acpi_cedt_cfmws *window = mock_cfmws[i];</div><div class='ctx'> </div><div class='add'>+		cfmws_elc_update(window, i);</div><div class='ctx'> 		res = alloc_mock_res(window-&gt;window_size, SZ_256M);</div><div class='ctx'> 		if (!res)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -590,6 +612,25 @@ mock_acpi_evaluate_integer(acpi_handle handle, acpi_string pathname,</div><div class='ctx'> 	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mock_hmat_get_extended_linear_cache_size(struct resource *backing_res,</div><div class='add'>+					 int nid, resource_size_t *cache_size)</div><div class='add'>+{</div><div class='add'>+	struct acpi_cedt_cfmws *window = mock_cfmws[0];</div><div class='add'>+	struct resource cfmws0_res =</div><div class='add'>+		DEFINE_RES_MEM(window-&gt;base_hpa, window-&gt;window_size);</div><div class='add'>+</div><div class='add'>+	if (!extended_linear_cache ||</div><div class='add'>+	    !resource_contains(&amp;cfmws0_res, backing_res)) {</div><div class='add'>+		return hmat_get_extended_linear_cache_size(backing_res,</div><div class='add'>+							   nid, cache_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*cache_size = mock_auto_region_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct pci_bus mock_pci_bus[NR_BRIDGES];</div><div class='ctx'> static struct acpi_pci_root mock_pci_root[ARRAY_SIZE(mock_pci_bus)] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -642,15 +683,8 @@ static struct cxl_hdm *mock_cxl_setup_hdm(struct cxl_port *port,</div><div class='ctx'> 	return cxlhdm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mock_cxl_add_passthrough_decoder(struct cxl_port *port)</div><div class='del'>-{</div><div class='del'>-	dev_err(&amp;port-&gt;dev, "unexpected passthrough decoder for cxl_test\n");</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> struct target_map_ctx {</div><div class='del'>-	int *target_map;</div><div class='add'>+	u32 *target_map;</div><div class='ctx'> 	int index;</div><div class='ctx'> 	int target_count;</div><div class='ctx'> };</div><div class='hunk'>@@ -744,7 +778,6 @@ static void mock_init_hdm_decoder(struct cxl_decoder *cxld)</div><div class='ctx'> 	struct cxl_endpoint_decoder *cxled;</div><div class='ctx'> 	struct cxl_switch_decoder *cxlsd;</div><div class='ctx'> 	struct cxl_port *port, *iter;</div><div class='del'>-	const int size = SZ_512M;</div><div class='ctx'> 	struct cxl_memdev *cxlmd;</div><div class='ctx'> 	struct cxl_dport *dport;</div><div class='ctx'> 	struct device *dev;</div><div class='hunk'>@@ -787,9 +820,11 @@ static void mock_init_hdm_decoder(struct cxl_decoder *cxld)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	base = window-&gt;base_hpa;</div><div class='add'>+	if (extended_linear_cache)</div><div class='add'>+		base += mock_auto_region_size;</div><div class='ctx'> 	cxld-&gt;hpa_range = (struct range) {</div><div class='ctx'> 		.start = base,</div><div class='del'>-		.end = base + size - 1,</div><div class='add'>+		.end = base + mock_auto_region_size - 1,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	cxld-&gt;interleave_ways = 2;</div><div class='hunk'>@@ -798,7 +833,8 @@ static void mock_init_hdm_decoder(struct cxl_decoder *cxld)</div><div class='ctx'> 	cxld-&gt;flags = CXL_DECODER_F_ENABLE;</div><div class='ctx'> 	cxled-&gt;state = CXL_DECODER_STATE_AUTO;</div><div class='ctx'> 	port-&gt;commit_end = cxld-&gt;id;</div><div class='del'>-	devm_cxl_dpa_reserve(cxled, 0, size / cxld-&gt;interleave_ways, 0);</div><div class='add'>+	devm_cxl_dpa_reserve(cxled, 0,</div><div class='add'>+			     mock_auto_region_size / cxld-&gt;interleave_ways, 0);</div><div class='ctx'> 	cxld-&gt;commit = mock_decoder_commit;</div><div class='ctx'> 	cxld-&gt;reset = mock_decoder_reset;</div><div class='ctx'> </div><div class='hunk'>@@ -817,15 +853,21 @@ static void mock_init_hdm_decoder(struct cxl_decoder *cxld)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (WARN_ON(!dev))</div><div class='ctx'> 			continue;</div><div class='add'>+</div><div class='ctx'> 		cxlsd = to_cxl_switch_decoder(dev);</div><div class='ctx'> 		if (i == 0) {</div><div class='ctx'> 			/* put cxl_mem.4 second in the decode order */</div><div class='del'>-			if (pdev-&gt;id == 4)</div><div class='add'>+			if (pdev-&gt;id == 4) {</div><div class='ctx'> 				cxlsd-&gt;target[1] = dport;</div><div class='del'>-			else</div><div class='add'>+				cxld-&gt;target_map[1] = dport-&gt;port_id;</div><div class='add'>+			} else {</div><div class='ctx'> 				cxlsd-&gt;target[0] = dport;</div><div class='del'>-		} else</div><div class='add'>+				cxld-&gt;target_map[0] = dport-&gt;port_id;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='ctx'> 			cxlsd-&gt;target[0] = dport;</div><div class='add'>+			cxld-&gt;target_map[0] = dport-&gt;port_id;</div><div class='add'>+		}</div><div class='ctx'> 		cxld = &amp;cxlsd-&gt;cxld;</div><div class='ctx'> 		cxld-&gt;target_type = CXL_DECODER_HOSTONLYMEM;</div><div class='ctx'> 		cxld-&gt;flags = CXL_DECODER_F_ENABLE;</div><div class='hunk'>@@ -841,7 +883,7 @@ static void mock_init_hdm_decoder(struct cxl_decoder *cxld)</div><div class='ctx'> 		cxld-&gt;interleave_granularity = 4096;</div><div class='ctx'> 		cxld-&gt;hpa_range = (struct range) {</div><div class='ctx'> 			.start = base,</div><div class='del'>-			.end = base + size - 1,</div><div class='add'>+			.end = base + mock_auto_region_size - 1,</div><div class='ctx'> 		};</div><div class='ctx'> 		put_device(dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -862,9 +904,7 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm,</div><div class='ctx'> 		target_count = NR_CXL_SWITCH_PORTS;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_CXL_PORT_DECODERS; i++) {</div><div class='del'>-		int target_map[CXL_DECODER_MAX_INTERLEAVE] = { 0 };</div><div class='ctx'> 		struct target_map_ctx ctx = {</div><div class='del'>-			.target_map = target_map,</div><div class='ctx'> 			.target_count = target_count,</div><div class='ctx'> 		};</div><div class='ctx'> 		struct cxl_decoder *cxld;</div><div class='hunk'>@@ -893,6 +933,8 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm,</div><div class='ctx'> 			cxld = &amp;cxled-&gt;cxld;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		ctx.target_map = cxld-&gt;target_map;</div><div class='add'>+</div><div class='ctx'> 		mock_init_hdm_decoder(cxld);</div><div class='ctx'> </div><div class='ctx'> 		if (target_count) {</div><div class='hunk'>@@ -904,7 +946,7 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rc = cxl_decoder_add_locked(cxld, target_map);</div><div class='add'>+		rc = cxl_decoder_add_locked(cxld);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			put_device(&amp;cxld-&gt;dev);</div><div class='ctx'> 			dev_err(&amp;port-&gt;dev, "Failed to add decoder\n");</div><div class='hunk'>@@ -920,10 +962,42 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mock_cxl_port_enumerate_dports(struct cxl_port *port)</div><div class='add'>+static int __mock_cxl_decoders_setup(struct cxl_port *port)</div><div class='add'>+{</div><div class='add'>+	struct cxl_hdm *cxlhdm;</div><div class='add'>+</div><div class='add'>+	cxlhdm = mock_cxl_setup_hdm(port, NULL);</div><div class='add'>+	if (IS_ERR(cxlhdm)) {</div><div class='add'>+		if (PTR_ERR(cxlhdm) != -ENODEV)</div><div class='add'>+			dev_err(&amp;port-&gt;dev, "Failed to map HDM decoder capability\n");</div><div class='add'>+		return PTR_ERR(cxlhdm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mock_cxl_enumerate_decoders(cxlhdm, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mock_cxl_switch_port_decoders_setup(struct cxl_port *port)</div><div class='add'>+{</div><div class='add'>+	if (is_cxl_root(port) || is_cxl_endpoint(port))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return __mock_cxl_decoders_setup(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mock_cxl_endpoint_decoders_setup(struct cxl_port *port)</div><div class='add'>+{</div><div class='add'>+	if (!is_cxl_endpoint(port))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return __mock_cxl_decoders_setup(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_port_array(struct cxl_port *port,</div><div class='add'>+			  struct platform_device ***port_array,</div><div class='add'>+			  int *port_array_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device **array;</div><div class='del'>-	int i, array_size;</div><div class='add'>+	int array_size;</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;depth == 1) {</div><div class='ctx'> 		if (is_multi_bridge(port-&gt;uport_dev)) {</div><div class='hunk'>@@ -957,9 +1031,24 @@ static int mock_cxl_port_enumerate_dports(struct cxl_port *port)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	*port_array = array;</div><div class='add'>+	*port_array_size = array_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cxl_dport *mock_cxl_add_dport_by_dev(struct cxl_port *port,</div><div class='add'>+						   struct device *dport_dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device **array;</div><div class='add'>+	int rc, i, array_size;</div><div class='add'>+</div><div class='add'>+	rc = get_port_array(port, &amp;array, &amp;array_size);</div><div class='add'>+	if (rc)</div><div class='add'>+		return ERR_PTR(rc);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; array_size; i++) {</div><div class='ctx'> 		struct platform_device *pdev = array[i];</div><div class='del'>-		struct cxl_dport *dport;</div><div class='ctx'> </div><div class='ctx'> 		if (pdev-&gt;dev.parent != port-&gt;uport_dev) {</div><div class='ctx'> 			dev_dbg(&amp;port-&gt;dev, "%s: mismatch parent %s\n",</div><div class='hunk'>@@ -968,14 +1057,14 @@ static int mock_cxl_port_enumerate_dports(struct cxl_port *port)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dport = devm_cxl_add_dport(port, &amp;pdev-&gt;dev, pdev-&gt;id,</div><div class='del'>-					   CXL_RESOURCE_NONE);</div><div class='add'>+		if (&amp;pdev-&gt;dev != dport_dev)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-		if (IS_ERR(dport))</div><div class='del'>-			return PTR_ERR(dport);</div><div class='add'>+		return devm_cxl_add_dport(port, &amp;pdev-&gt;dev, pdev-&gt;id,</div><div class='add'>+					  CXL_RESOURCE_NONE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1000,25 +1089,21 @@ static void mock_cxl_endpoint_parse_cdat(struct cxl_port *port)</div><div class='ctx'> 		find_cxl_root(port);</div><div class='ctx'> 	struct cxl_memdev *cxlmd = to_cxl_memdev(port-&gt;uport_dev);</div><div class='ctx'> 	struct cxl_dev_state *cxlds = cxlmd-&gt;cxlds;</div><div class='del'>-	struct cxl_memdev_state *mds = to_cxl_memdev_state(cxlds);</div><div class='ctx'> 	struct access_coordinate ep_c[ACCESS_COORDINATE_MAX];</div><div class='del'>-	struct range pmem_range = {</div><div class='del'>-		.start = cxlds-&gt;pmem_res.start,</div><div class='del'>-		.end = cxlds-&gt;pmem_res.end,</div><div class='del'>-	};</div><div class='del'>-	struct range ram_range = {</div><div class='del'>-		.start = cxlds-&gt;ram_res.start,</div><div class='del'>-		.end = cxlds-&gt;ram_res.end,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	if (!cxl_root)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (range_len(&amp;ram_range))</div><div class='del'>-		dpa_perf_setup(port, &amp;ram_range, &amp;mds-&gt;ram_perf);</div><div class='add'>+	for (int i = 0; i &lt; cxlds-&gt;nr_partitions; i++) {</div><div class='add'>+		struct resource *res = &amp;cxlds-&gt;part[i].res;</div><div class='add'>+		struct cxl_dpa_perf *perf = &amp;cxlds-&gt;part[i].perf;</div><div class='add'>+		struct range range = {</div><div class='add'>+			.start = res-&gt;start,</div><div class='add'>+			.end = res-&gt;end,</div><div class='add'>+		};</div><div class='ctx'> </div><div class='del'>-	if (range_len(&amp;pmem_range))</div><div class='del'>-		dpa_perf_setup(port, &amp;pmem_range, &amp;mds-&gt;pmem_perf);</div><div class='add'>+		dpa_perf_setup(port, &amp;range, perf);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cxl_memdev_update_perf(cxlmd);</div><div class='ctx'> </div><div class='hunk'>@@ -1038,11 +1123,12 @@ static struct cxl_mock_ops cxl_mock_ops = {</div><div class='ctx'> 	.acpi_table_parse_cedt = mock_acpi_table_parse_cedt,</div><div class='ctx'> 	.acpi_evaluate_integer = mock_acpi_evaluate_integer,</div><div class='ctx'> 	.acpi_pci_find_root = mock_acpi_pci_find_root,</div><div class='del'>-	.devm_cxl_port_enumerate_dports = mock_cxl_port_enumerate_dports,</div><div class='del'>-	.devm_cxl_setup_hdm = mock_cxl_setup_hdm,</div><div class='del'>-	.devm_cxl_add_passthrough_decoder = mock_cxl_add_passthrough_decoder,</div><div class='del'>-	.devm_cxl_enumerate_decoders = mock_cxl_enumerate_decoders,</div><div class='add'>+	.devm_cxl_switch_port_decoders_setup = mock_cxl_switch_port_decoders_setup,</div><div class='add'>+	.devm_cxl_endpoint_decoders_setup = mock_cxl_endpoint_decoders_setup,</div><div class='ctx'> 	.cxl_endpoint_parse_cdat = mock_cxl_endpoint_parse_cdat,</div><div class='add'>+	.devm_cxl_add_dport_by_dev = mock_cxl_add_dport_by_dev,</div><div class='add'>+	.hmat_get_extended_linear_cache_size =</div><div class='add'>+		mock_hmat_get_extended_linear_cache_size,</div><div class='ctx'> 	.list = LIST_HEAD_INIT(cxl_mock_ops.list),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1332,6 +1418,7 @@ err_mem:</div><div class='ctx'> static __init int cxl_test_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc, i;</div><div class='add'>+	struct range mappable;</div><div class='ctx'> </div><div class='ctx'> 	cxl_acpi_test();</div><div class='ctx'> 	cxl_core_test();</div><div class='hunk'>@@ -1346,8 +1433,11 @@ static __init int cxl_test_init(void)</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto err_gen_pool_create;</div><div class='ctx'> 	}</div><div class='add'>+	mappable = mhp_get_pluggable_range(true);</div><div class='ctx'> </div><div class='del'>-	rc = gen_pool_add(cxl_mock_pool, iomem_resource.end + 1 - SZ_64G,</div><div class='add'>+	rc = gen_pool_add(cxl_mock_pool,</div><div class='add'>+			  min(iomem_resource.end + 1 - SZ_64G,</div><div class='add'>+			      mappable.end + 1 - SZ_64G),</div><div class='ctx'> 			  SZ_64G, NUMA_NO_NODE);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_gen_pool_add;</div><div class='hunk'>@@ -1528,8 +1618,11 @@ static __exit void cxl_test_exit(void)</div><div class='ctx'> </div><div class='ctx'> module_param(interleave_arithmetic, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(interleave_arithmetic, "Modulo:0, XOR:1");</div><div class='add'>+module_param(extended_linear_cache, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(extended_linear_cache, "Enable extended linear cache support");</div><div class='ctx'> module_init(cxl_test_init);</div><div class='ctx'> module_exit(cxl_test_exit);</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("cxl_test: setup module");</div><div class='ctx'> MODULE_IMPORT_NS("ACPI");</div><div class='ctx'> MODULE_IMPORT_NS("CXL");</div><div class='head'>diff --git a/tools/testing/cxl/test/cxl_translate.c b/tools/testing/cxl/test/cxl_translate.c<br/>new file mode 100644<br/>index 000000000000..2200ae21795c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/test/cxl_translate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/cxl/test/cxl_translate.c</a></div><div class='hunk'>@@ -0,0 +1,445 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright(c) 2025 Intel Corporation. All rights reserved.</div><div class='add'>+</div><div class='add'>+/* Preface all log entries with "cxl_translate" */</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;cxlmem.h&gt;</div><div class='add'>+#include &lt;cxl.h&gt;</div><div class='add'>+</div><div class='add'>+/* Maximum number of test vectors and entry length */</div><div class='add'>+#define MAX_TABLE_ENTRIES 128</div><div class='add'>+#define MAX_ENTRY_LEN 128</div><div class='add'>+</div><div class='add'>+/* Expected number of parameters in each test vector */</div><div class='add'>+#define EXPECTED_PARAMS 7</div><div class='add'>+</div><div class='add'>+/* Module parameters for test vectors */</div><div class='add'>+static char *table[MAX_TABLE_ENTRIES];</div><div class='add'>+static int table_num;</div><div class='add'>+</div><div class='add'>+/* Interleave Arithmetic */</div><div class='add'>+#define MODULO_MATH 0</div><div class='add'>+#define XOR_MATH 1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * XOR mapping configuration</div><div class='add'>+ * The test data sets all use the same set of xormaps. When additional</div><div class='add'>+ * data sets arrive for validation, this static setup will need to</div><div class='add'>+ * be changed to accept xormaps as additional parameters.</div><div class='add'>+ */</div><div class='add'>+struct cxl_cxims_data *cximsd;</div><div class='add'>+static u64 xormaps[] = {</div><div class='add'>+	0x2020900,</div><div class='add'>+	0x4041200,</div><div class='add'>+	0x1010400,</div><div class='add'>+	0x800,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int nr_maps = ARRAY_SIZE(xormaps);</div><div class='add'>+</div><div class='add'>+#define HBIW_TO_NR_MAPS_SIZE (CXL_DECODER_MAX_INTERLEAVE + 1)</div><div class='add'>+static const int hbiw_to_nr_maps[HBIW_TO_NR_MAPS_SIZE] = {</div><div class='add'>+	[1] = 0, [2] = 1, [3] = 0, [4] = 2, [6] = 1, [8] = 3, [12] = 2, [16] = 4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * to_hpa - calculate an HPA offset from a DPA offset and position</div><div class='add'>+ *</div><div class='add'>+ * dpa_offset: device physical address offset</div><div class='add'>+ * pos: devices position in interleave</div><div class='add'>+ * r_eiw: region encoded interleave ways</div><div class='add'>+ * r_eig: region encoded interleave granularity</div><div class='add'>+ * hb_ways: host bridge interleave ways</div><div class='add'>+ * math: interleave arithmetic (MODULO_MATH or XOR_MATH)</div><div class='add'>+ *</div><div class='add'>+ * Returns: host physical address offset</div><div class='add'>+ */</div><div class='add'>+static u64 to_hpa(u64 dpa_offset, int pos, u8 r_eiw, u16 r_eig, u8 hb_ways,</div><div class='add'>+		  u8 math)</div><div class='add'>+{</div><div class='add'>+	u64 hpa_offset;</div><div class='add'>+</div><div class='add'>+	/* Calculate base HPA offset from DPA and position */</div><div class='add'>+	hpa_offset = cxl_calculate_hpa_offset(dpa_offset, pos, r_eiw, r_eig);</div><div class='add'>+</div><div class='add'>+	if (math == XOR_MATH) {</div><div class='add'>+		cximsd-&gt;nr_maps = hbiw_to_nr_maps[hb_ways];</div><div class='add'>+		if (cximsd-&gt;nr_maps)</div><div class='add'>+			return cxl_do_xormap_calc(cximsd, hpa_offset, hb_ways);</div><div class='add'>+	}</div><div class='add'>+	return hpa_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * to_dpa - translate an HPA offset to DPA offset</div><div class='add'>+ *</div><div class='add'>+ * hpa_offset: host physical address offset</div><div class='add'>+ * r_eiw: region encoded interleave ways</div><div class='add'>+ * r_eig: region encoded interleave granularity</div><div class='add'>+ * hb_ways: host bridge interleave ways</div><div class='add'>+ * math: interleave arithmetic (MODULO_MATH or XOR_MATH)</div><div class='add'>+ *</div><div class='add'>+ * Returns: device physical address offset</div><div class='add'>+ */</div><div class='add'>+static u64 to_dpa(u64 hpa_offset, u8 r_eiw, u16 r_eig, u8 hb_ways, u8 math)</div><div class='add'>+{</div><div class='add'>+	u64 offset = hpa_offset;</div><div class='add'>+</div><div class='add'>+	if (math == XOR_MATH) {</div><div class='add'>+		cximsd-&gt;nr_maps = hbiw_to_nr_maps[hb_ways];</div><div class='add'>+		if (cximsd-&gt;nr_maps)</div><div class='add'>+			offset =</div><div class='add'>+				cxl_do_xormap_calc(cximsd, hpa_offset, hb_ways);</div><div class='add'>+	}</div><div class='add'>+	return cxl_calculate_dpa_offset(offset, r_eiw, r_eig);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * to_pos - extract an interleave position from an HPA offset</div><div class='add'>+ *</div><div class='add'>+ * hpa_offset: host physical address offset</div><div class='add'>+ * r_eiw: region encoded interleave ways</div><div class='add'>+ * r_eig: region encoded interleave granularity</div><div class='add'>+ * hb_ways: host bridge interleave ways</div><div class='add'>+ * math: interleave arithmetic (MODULO_MATH or XOR_MATH)</div><div class='add'>+ *</div><div class='add'>+ * Returns: devices position in region interleave</div><div class='add'>+ */</div><div class='add'>+static u64 to_pos(u64 hpa_offset, u8 r_eiw, u16 r_eig, u8 hb_ways, u8 math)</div><div class='add'>+{</div><div class='add'>+	u64 offset = hpa_offset;</div><div class='add'>+</div><div class='add'>+	/* Reverse XOR mapping if specified */</div><div class='add'>+	if (math == XOR_MATH)</div><div class='add'>+		offset = cxl_do_xormap_calc(cximsd, hpa_offset, hb_ways);</div><div class='add'>+</div><div class='add'>+	return cxl_calculate_position(offset, r_eiw, r_eig);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * run_translation_test - execute forward and reverse translations</div><div class='add'>+ *</div><div class='add'>+ * @dpa: device physical address</div><div class='add'>+ * @pos: expected position in region interleave</div><div class='add'>+ * @r_eiw: region encoded interleave ways</div><div class='add'>+ * @r_eig: region encoded interleave granularity</div><div class='add'>+ * @hb_ways: host bridge interleave ways</div><div class='add'>+ * @math: interleave arithmetic (MODULO_MATH or XOR_MATH)</div><div class='add'>+ * @expect_spa: expected system physical address</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success, -1 on failure</div><div class='add'>+ */</div><div class='add'>+static int run_translation_test(u64 dpa, int pos, u8 r_eiw, u16 r_eig,</div><div class='add'>+				u8 hb_ways, int math, u64 expect_hpa)</div><div class='add'>+{</div><div class='add'>+	u64 translated_spa, reverse_dpa;</div><div class='add'>+	int reverse_pos;</div><div class='add'>+</div><div class='add'>+	/* Test Device to Host translation: DPA + POS -&gt; SPA */</div><div class='add'>+	translated_spa = to_hpa(dpa, pos, r_eiw, r_eig, hb_ways, math);</div><div class='add'>+	if (translated_spa != expect_hpa) {</div><div class='add'>+		pr_err("Device to host failed: expected HPA %llu, got %llu\n",</div><div class='add'>+		       expect_hpa, translated_spa);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Test Host to Device DPA translation: SPA -&gt; DPA */</div><div class='add'>+	reverse_dpa = to_dpa(translated_spa, r_eiw, r_eig, hb_ways, math);</div><div class='add'>+	if (reverse_dpa != dpa) {</div><div class='add'>+		pr_err("Host to Device DPA failed: expected %llu, got %llu\n",</div><div class='add'>+		       dpa, reverse_dpa);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Test Host to Device Position translation: SPA -&gt; POS */</div><div class='add'>+	reverse_pos = to_pos(translated_spa, r_eiw, r_eig, hb_ways, math);</div><div class='add'>+	if (reverse_pos != pos) {</div><div class='add'>+		pr_err("Position lookup failed: expected %d, got %d\n", pos,</div><div class='add'>+		       reverse_pos);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * parse_test_vector - parse a single test vector string</div><div class='add'>+ *</div><div class='add'>+ * entry: test vector string to parse</div><div class='add'>+ * dpa: device physical address</div><div class='add'>+ * pos: expected position in region interleave</div><div class='add'>+ * r_eiw: region encoded interleave ways</div><div class='add'>+ * r_eig: region encoded interleave granularity</div><div class='add'>+ * hb_ways: host bridge interleave ways</div><div class='add'>+ * math: interleave arithmetic (MODULO_MATH or XOR_MATH)</div><div class='add'>+ * expect_spa: expected system physical address</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success, negative error code on failure</div><div class='add'>+ */</div><div class='add'>+static int parse_test_vector(const char *entry, u64 *dpa, int *pos, u8 *r_eiw,</div><div class='add'>+			     u16 *r_eig, u8 *hb_ways, int *math,</div><div class='add'>+			     u64 *expect_hpa)</div><div class='add'>+{</div><div class='add'>+	unsigned int tmp_r_eiw, tmp_r_eig, tmp_hb_ways;</div><div class='add'>+	int parsed;</div><div class='add'>+</div><div class='add'>+	parsed = sscanf(entry, "%llu %d %u %u %u %d %llu", dpa, pos, &amp;tmp_r_eiw,</div><div class='add'>+			&amp;tmp_r_eig, &amp;tmp_hb_ways, math, expect_hpa);</div><div class='add'>+</div><div class='add'>+	if (parsed != EXPECTED_PARAMS) {</div><div class='add'>+		pr_err("Parse error: expected %d parameters, got %d in '%s'\n",</div><div class='add'>+		       EXPECTED_PARAMS, parsed, entry);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (tmp_r_eiw &gt; U8_MAX || tmp_r_eig &gt; U16_MAX || tmp_hb_ways &gt; U8_MAX) {</div><div class='add'>+		pr_err("Parameter overflow in entry: '%s'\n", entry);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+	if (*math != MODULO_MATH &amp;&amp; *math != XOR_MATH) {</div><div class='add'>+		pr_err("Invalid math type %d in entry: '%s'\n", *math, entry);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	*r_eiw = tmp_r_eiw;</div><div class='add'>+	*r_eig = tmp_r_eig;</div><div class='add'>+	*hb_ways = tmp_hb_ways;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * setup_xor_mapping - Initialize XOR mapping data structure</div><div class='add'>+ *</div><div class='add'>+ * The test data sets all use the same HBIG so we can use one set</div><div class='add'>+ * of xormaps, and set the number to apply based on HBIW before</div><div class='add'>+ * calling cxl_do_xormap_calc().</div><div class='add'>+ *</div><div class='add'>+ * When additional data sets arrive for validation with different</div><div class='add'>+ * HBIG's this static setup will need to be updated.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success, negative error code on failure</div><div class='add'>+ */</div><div class='add'>+static int setup_xor_mapping(void)</div><div class='add'>+{</div><div class='add'>+	if (nr_maps &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cximsd = kzalloc(struct_size(cximsd, xormaps, nr_maps), GFP_KERNEL);</div><div class='add'>+	if (!cximsd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(cximsd-&gt;xormaps, xormaps, nr_maps * sizeof(*cximsd-&gt;xormaps));</div><div class='add'>+	cximsd-&gt;nr_maps = nr_maps;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_random_params(void)</div><div class='add'>+{</div><div class='add'>+	u8 valid_eiws[] = { 0, 1, 2, 3, 4, 8, 9, 10 };</div><div class='add'>+	u16 valid_eigs[] = { 0, 1, 2, 3, 4, 5, 6 };</div><div class='add'>+	int i, ways, pos, reverse_pos;</div><div class='add'>+	u64 dpa, hpa, reverse_dpa;</div><div class='add'>+	int iterations = 10000;</div><div class='add'>+	int failures = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; iterations; i++) {</div><div class='add'>+		/* Generate valid random parameters for eiw, eig, pos, dpa */</div><div class='add'>+		u8 eiw = valid_eiws[get_random_u32() % ARRAY_SIZE(valid_eiws)];</div><div class='add'>+		u16 eig = valid_eigs[get_random_u32() % ARRAY_SIZE(valid_eigs)];</div><div class='add'>+</div><div class='add'>+		eiw_to_ways(eiw, &amp;ways);</div><div class='add'>+		pos = get_random_u32() % ways;</div><div class='add'>+		dpa = get_random_u64() &gt;&gt; 12;</div><div class='add'>+</div><div class='add'>+		hpa = cxl_calculate_hpa_offset(dpa, pos, eiw, eig);</div><div class='add'>+		reverse_dpa = cxl_calculate_dpa_offset(hpa, eiw, eig);</div><div class='add'>+		reverse_pos = cxl_calculate_position(hpa, eiw, eig);</div><div class='add'>+</div><div class='add'>+		if (reverse_dpa != dpa || reverse_pos != pos) {</div><div class='add'>+			pr_err("test random iter %d FAIL hpa=%llu, dpa=%llu reverse_dpa=%llu, pos=%d reverse_pos=%d eiw=%u eig=%u\n",</div><div class='add'>+			       i, hpa, dpa, reverse_dpa, pos, reverse_pos, eiw,</div><div class='add'>+			       eig);</div><div class='add'>+</div><div class='add'>+			if (failures++ &gt; 10) {</div><div class='add'>+				pr_err("test random too many failures, stop\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	pr_info("..... test random: PASS %d FAIL %d\n", i - failures, failures);</div><div class='add'>+</div><div class='add'>+	if (failures)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct param_test {</div><div class='add'>+	u8 eiw;</div><div class='add'>+	u16 eig;</div><div class='add'>+	int pos;</div><div class='add'>+	bool expect; /* true: expect pass, false: expect fail */</div><div class='add'>+	const char *desc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct param_test param_tests[] = {</div><div class='add'>+	{ 0x0, 0, 0, true, "1-way, min eig=0, pos=0" },</div><div class='add'>+	{ 0x0, 3, 0, true, "1-way, mid eig=3, pos=0" },</div><div class='add'>+	{ 0x0, 6, 0, true, "1-way, max eig=6, pos=0" },</div><div class='add'>+	{ 0x1, 0, 0, true, "2-way, eig=0, pos=0" },</div><div class='add'>+	{ 0x1, 3, 1, true, "2-way, eig=3, max pos=1" },</div><div class='add'>+	{ 0x1, 6, 1, true, "2-way, eig=6, max pos=1" },</div><div class='add'>+	{ 0x2, 0, 0, true, "4-way, eig=0, pos=0" },</div><div class='add'>+	{ 0x2, 3, 3, true, "4-way, eig=3, max pos=3" },</div><div class='add'>+	{ 0x2, 6, 3, true, "4-way, eig=6, max pos=3" },</div><div class='add'>+	{ 0x3, 0, 0, true, "8-way, eig=0, pos=0" },</div><div class='add'>+	{ 0x3, 3, 7, true, "8-way, eig=3, max pos=7" },</div><div class='add'>+	{ 0x3, 6, 7, true, "8-way, eig=6, max pos=7" },</div><div class='add'>+	{ 0x4, 0, 0, true, "16-way, eig=0, pos=0" },</div><div class='add'>+	{ 0x4, 3, 15, true, "16-way, eig=3, max pos=15" },</div><div class='add'>+	{ 0x4, 6, 15, true, "16-way, eig=6, max pos=15" },</div><div class='add'>+	{ 0x8, 0, 0, true, "3-way, eig=0, pos=0" },</div><div class='add'>+	{ 0x8, 3, 2, true, "3-way, eig=3, max pos=2" },</div><div class='add'>+	{ 0x8, 6, 2, true, "3-way, eig=6, max pos=2" },</div><div class='add'>+	{ 0x9, 0, 0, true, "6-way, eig=0, pos=0" },</div><div class='add'>+	{ 0x9, 3, 5, true, "6-way, eig=3, max pos=5" },</div><div class='add'>+	{ 0x9, 6, 5, true, "6-way, eig=6, max pos=5" },</div><div class='add'>+	{ 0xA, 0, 0, true, "12-way, eig=0, pos=0" },</div><div class='add'>+	{ 0xA, 3, 11, true, "12-way, eig=3, max pos=11" },</div><div class='add'>+	{ 0xA, 6, 11, true, "12-way, eig=6, max pos=11" },</div><div class='add'>+	{ 0x5, 0, 0, false, "invalid eiw=5" },</div><div class='add'>+	{ 0x7, 0, 0, false, "invalid eiw=7" },</div><div class='add'>+	{ 0xB, 0, 0, false, "invalid eiw=0xB" },</div><div class='add'>+	{ 0xFF, 0, 0, false, "invalid eiw=0xFF" },</div><div class='add'>+	{ 0x1, 7, 0, false, "invalid eig=7 (out of range)" },</div><div class='add'>+	{ 0x2, 0x10, 0, false, "invalid eig=0x10" },</div><div class='add'>+	{ 0x3, 0xFFFF, 0, false, "invalid eig=0xFFFF" },</div><div class='add'>+	{ 0x1, 0, -1, false, "pos &lt; 0" },</div><div class='add'>+	{ 0x1, 0, 2, false, "2-way, pos=2 (&gt;= ways)" },</div><div class='add'>+	{ 0x2, 0, 4, false, "4-way, pos=4 (&gt;= ways)" },</div><div class='add'>+	{ 0x3, 0, 8, false, "8-way, pos=8 (&gt;= ways)" },</div><div class='add'>+	{ 0x4, 0, 16, false, "16-way, pos=16 (&gt;= ways)" },</div><div class='add'>+	{ 0x8, 0, 3, false, "3-way, pos=3 (&gt;= ways)" },</div><div class='add'>+	{ 0x9, 0, 6, false, "6-way, pos=6 (&gt;= ways)" },</div><div class='add'>+	{ 0xA, 0, 12, false, "12-way, pos=12 (&gt;= ways)" },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int test_cxl_validate_translation_params(void)</div><div class='add'>+{</div><div class='add'>+	int i, rc, failures = 0;</div><div class='add'>+	bool valid;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(param_tests); i++) {</div><div class='add'>+		struct param_test *t = &amp;param_tests[i];</div><div class='add'>+</div><div class='add'>+		rc = cxl_validate_translation_params(t-&gt;eiw, t-&gt;eig, t-&gt;pos);</div><div class='add'>+		valid = (rc == 0);</div><div class='add'>+</div><div class='add'>+		if (valid != t-&gt;expect) {</div><div class='add'>+			pr_err("test params failed: %s\n", t-&gt;desc);</div><div class='add'>+			failures++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	pr_info("..... test params: PASS %d FAIL %d\n", i - failures, failures);</div><div class='add'>+</div><div class='add'>+	if (failures)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cxl_translate_init</div><div class='add'>+ *</div><div class='add'>+ * Run the internal validation tests when no params are passed.</div><div class='add'>+ * Otherwise, parse the parameters (test vectors), and kick off</div><div class='add'>+ * the translation test.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success, negative error code on failure</div><div class='add'>+ */</div><div class='add'>+static int __init cxl_translate_init(void)</div><div class='add'>+{</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	/* If no tables are passed, validate module params only */</div><div class='add'>+	if (table_num == 0) {</div><div class='add'>+		pr_info("Internal validation test start...\n");</div><div class='add'>+		rc = test_cxl_validate_translation_params();</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		rc = test_random_params();</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		pr_info("Internal validation test completed successfully\n");</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("CXL translate test module loaded with %d test vectors\n",</div><div class='add'>+		table_num);</div><div class='add'>+</div><div class='add'>+	rc = setup_xor_mapping();</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Process each test vector */</div><div class='add'>+	for (i = 0; i &lt; table_num; i++) {</div><div class='add'>+		u64 dpa, expect_spa;</div><div class='add'>+		int pos, math;</div><div class='add'>+		u8 r_eiw, hb_ways;</div><div class='add'>+		u16 r_eig;</div><div class='add'>+</div><div class='add'>+		pr_debug("Processing test vector %d: '%s'\n", i, table[i]);</div><div class='add'>+</div><div class='add'>+		/* Parse the test vector */</div><div class='add'>+		rc = parse_test_vector(table[i], &amp;dpa, &amp;pos, &amp;r_eiw, &amp;r_eig,</div><div class='add'>+				       &amp;hb_ways, &amp;math, &amp;expect_spa);</div><div class='add'>+		if (rc) {</div><div class='add'>+			pr_err("CXL Translate Test %d: FAIL\n"</div><div class='add'>+			       "    Failed to parse test vector '%s'\n",</div><div class='add'>+			       i, table[i]);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		/* Run the translation test */</div><div class='add'>+		rc = run_translation_test(dpa, pos, r_eiw, r_eig, hb_ways, math,</div><div class='add'>+					  expect_spa);</div><div class='add'>+		if (rc) {</div><div class='add'>+			pr_err("CXL Translate Test %d: FAIL\n"</div><div class='add'>+			       "    dpa=%llu pos=%d r_eiw=%u r_eig=%u hb_ways=%u math=%s expect_spa=%llu\n",</div><div class='add'>+			       i, dpa, pos, r_eiw, r_eig, hb_ways,</div><div class='add'>+			       (math == XOR_MATH) ? "XOR" : "MODULO",</div><div class='add'>+			       expect_spa);</div><div class='add'>+		} else {</div><div class='add'>+			pr_info("CXL Translate Test %d: PASS\n", i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(cximsd);</div><div class='add'>+	pr_info("CXL translate test completed\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit cxl_translate_exit(void)</div><div class='add'>+{</div><div class='add'>+	pr_info("CXL translate test module unloaded\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_param_array(table, charp, &amp;table_num, 0444);</div><div class='add'>+MODULE_PARM_DESC(table, "Test vectors as space-separated decimal strings");</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("cxl_test: cxl address translation test module");</div><div class='add'>+MODULE_IMPORT_NS("CXL");</div><div class='add'>+</div><div class='add'>+module_init(cxl_translate_init);</div><div class='add'>+module_exit(cxl_translate_exit);</div><div class='head'>diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c<br/>index 8d731bd63988..176dcde570cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/test/mem.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/cxl/test/mem.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/test/mem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/cxl/test/mem.c</a></div><div class='hunk'>@@ -45,6 +45,18 @@ static struct cxl_cel_entry mock_cel[] = {</div><div class='ctx'> 		.effect = CXL_CMD_EFFECT_NONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.opcode = cpu_to_le16(CXL_MBOX_OP_GET_SUPPORTED_FEATURES),</div><div class='add'>+		.effect = CXL_CMD_EFFECT_NONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = cpu_to_le16(CXL_MBOX_OP_GET_FEATURE),</div><div class='add'>+		.effect = CXL_CMD_EFFECT_NONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.opcode = cpu_to_le16(CXL_MBOX_OP_SET_FEATURE),</div><div class='add'>+		.effect = cpu_to_le16(EFFECT(CONF_CHANGE_IMMEDIATE)),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.opcode = cpu_to_le16(CXL_MBOX_OP_IDENTIFY),</div><div class='ctx'> 		.effect = CXL_CMD_EFFECT_NONE,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -66,6 +78,10 @@ static struct cxl_cel_entry mock_cel[] = {</div><div class='ctx'> 		.effect = CXL_CMD_EFFECT_NONE,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.opcode = cpu_to_le16(CXL_MBOX_OP_SET_SHUTDOWN_STATE),</div><div class='add'>+		.effect = POLICY_CHANGE_IMMEDIATE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.opcode = cpu_to_le16(CXL_MBOX_OP_GET_POISON),</div><div class='ctx'> 		.effect = CXL_CMD_EFFECT_NONE,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -145,6 +161,10 @@ struct mock_event_store {</div><div class='ctx'> 	u32 ev_status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct vendor_test_feat {</div><div class='add'>+	__le32 data;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct cxl_mockmem_data {</div><div class='ctx'> 	void *lsa;</div><div class='ctx'> 	void *fw;</div><div class='hunk'>@@ -161,6 +181,8 @@ struct cxl_mockmem_data {</div><div class='ctx'> 	u8 event_buf[SZ_4K];</div><div class='ctx'> 	u64 timestamp;</div><div class='ctx'> 	unsigned long sanitize_timeout;</div><div class='add'>+	struct vendor_test_feat test_feat;</div><div class='add'>+	u8 shutdown_state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mock_event_log *event_find_log(struct device *dev, int log_type)</div><div class='hunk'>@@ -228,22 +250,21 @@ static void mes_add_event(struct mock_event_store *mes,</div><div class='ctx'>  * Vary the number of events returned to simulate events occuring while the</div><div class='ctx'>  * logs are being read.</div><div class='ctx'>  */</div><div class='del'>-static int ret_limit = 0;</div><div class='add'>+static atomic_t event_counter = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='ctx'> static int mock_get_event(struct device *dev, struct cxl_mbox_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct cxl_get_event_payload *pl;</div><div class='ctx'> 	struct mock_event_log *log;</div><div class='del'>-	u16 nr_overflow;</div><div class='add'>+	int ret_limit;</div><div class='ctx'> 	u8 log_type;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;size_in != sizeof(log_type))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ret_limit = (ret_limit + 1) % CXL_TEST_EVENT_RET_MAX;</div><div class='del'>-	if (!ret_limit)</div><div class='del'>-		ret_limit = 1;</div><div class='add'>+	/* Vary return limit from 1 to CXL_TEST_EVENT_RET_MAX */</div><div class='add'>+	ret_limit = (atomic_inc_return(&amp;event_counter) % CXL_TEST_EVENT_RET_MAX) + 1;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;size_out &lt; struct_size(pl, records, ret_limit))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -277,7 +298,7 @@ static int mock_get_event(struct device *dev, struct cxl_mbox_cmd *cmd)</div><div class='ctx'> 		u64 ns;</div><div class='ctx'> </div><div class='ctx'> 		pl-&gt;flags |= CXL_GET_EVENT_FLAG_OVERFLOW;</div><div class='del'>-		pl-&gt;overflow_err_count = cpu_to_le16(nr_overflow);</div><div class='add'>+		pl-&gt;overflow_err_count = cpu_to_le16(log-&gt;nr_overflow);</div><div class='ctx'> 		ns = ktime_get_real_ns();</div><div class='ctx'> 		ns -= 5000000000; /* 5s ago */</div><div class='ctx'> 		pl-&gt;first_overflow_timestamp = cpu_to_le64(ns);</div><div class='hunk'>@@ -1088,6 +1109,21 @@ static int mock_health_info(struct cxl_mbox_cmd *cmd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mock_set_shutdown_state(struct cxl_mockmem_data *mdata,</div><div class='add'>+				   struct cxl_mbox_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct cxl_mbox_set_shutdown_state_in *ss = cmd-&gt;payload_in;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;size_in != sizeof(*ss))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;size_out != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mdata-&gt;shutdown_state = ss-&gt;state;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct mock_poison {</div><div class='ctx'> 	struct cxl_dev_state *cxlds;</div><div class='ctx'> 	u64 dpa;</div><div class='hunk'>@@ -1354,6 +1390,151 @@ static int mock_activate_fw(struct cxl_mockmem_data *mdata,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define CXL_VENDOR_FEATURE_TEST							\</div><div class='add'>+	UUID_INIT(0xffffffff, 0xffff, 0xffff, 0xff, 0xff, 0xff, 0xff, 0xff,	\</div><div class='add'>+		  0xff, 0xff, 0xff)</div><div class='add'>+</div><div class='add'>+static void fill_feature_vendor_test(struct cxl_feat_entry *feat)</div><div class='add'>+{</div><div class='add'>+	feat-&gt;uuid = CXL_VENDOR_FEATURE_TEST;</div><div class='add'>+	feat-&gt;id = 0;</div><div class='add'>+	feat-&gt;get_feat_size = cpu_to_le16(0x4);</div><div class='add'>+	feat-&gt;set_feat_size = cpu_to_le16(0x4);</div><div class='add'>+	feat-&gt;flags = cpu_to_le32(CXL_FEATURE_F_CHANGEABLE |</div><div class='add'>+				  CXL_FEATURE_F_DEFAULT_SEL |</div><div class='add'>+				  CXL_FEATURE_F_SAVED_SEL);</div><div class='add'>+	feat-&gt;get_feat_ver = 1;</div><div class='add'>+	feat-&gt;set_feat_ver = 1;</div><div class='add'>+	feat-&gt;effects = cpu_to_le16(CXL_CMD_CONFIG_CHANGE_COLD_RESET |</div><div class='add'>+				    CXL_CMD_EFFECTS_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_CXL_TEST_FEATS	1</div><div class='add'>+</div><div class='add'>+static int mock_get_test_feature(struct cxl_mockmem_data *mdata,</div><div class='add'>+				 struct cxl_mbox_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct vendor_test_feat *output = cmd-&gt;payload_out;</div><div class='add'>+	struct cxl_mbox_get_feat_in *input = cmd-&gt;payload_in;</div><div class='add'>+	u16 offset = le16_to_cpu(input-&gt;offset);</div><div class='add'>+	u16 count = le16_to_cpu(input-&gt;count);</div><div class='add'>+	u8 *ptr;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; sizeof(*output)) {</div><div class='add'>+		cmd-&gt;return_code = CXL_MBOX_CMD_RC_INPUT;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (offset + count &gt; sizeof(*output)) {</div><div class='add'>+		cmd-&gt;return_code = CXL_MBOX_CMD_RC_INPUT;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr = (u8 *)&amp;mdata-&gt;test_feat + offset;</div><div class='add'>+	memcpy((u8 *)output + offset, ptr, count);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mock_get_feature(struct cxl_mockmem_data *mdata,</div><div class='add'>+			    struct cxl_mbox_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct cxl_mbox_get_feat_in *input = cmd-&gt;payload_in;</div><div class='add'>+</div><div class='add'>+	if (uuid_equal(&amp;input-&gt;uuid, &amp;CXL_VENDOR_FEATURE_TEST))</div><div class='add'>+		return mock_get_test_feature(mdata, cmd);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;return_code = CXL_MBOX_CMD_RC_UNSUPPORTED;</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mock_set_test_feature(struct cxl_mockmem_data *mdata,</div><div class='add'>+				 struct cxl_mbox_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct cxl_mbox_set_feat_in *input = cmd-&gt;payload_in;</div><div class='add'>+	struct vendor_test_feat *test =</div><div class='add'>+		(struct vendor_test_feat *)input-&gt;feat_data;</div><div class='add'>+	u32 action;</div><div class='add'>+</div><div class='add'>+	action = FIELD_GET(CXL_SET_FEAT_FLAG_DATA_TRANSFER_MASK,</div><div class='add'>+			   le32_to_cpu(input-&gt;hdr.flags));</div><div class='add'>+	/*</div><div class='add'>+	 * While it is spec compliant to support other set actions, it is not</div><div class='add'>+	 * necessary to add the complication in the emulation currently. Reject</div><div class='add'>+	 * anything besides full xfer.</div><div class='add'>+	 */</div><div class='add'>+	if (action != CXL_SET_FEAT_FLAG_FULL_DATA_TRANSFER) {</div><div class='add'>+		cmd-&gt;return_code = CXL_MBOX_CMD_RC_INPUT;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Offset should be reserved when doing full transfer */</div><div class='add'>+	if (input-&gt;hdr.offset) {</div><div class='add'>+		cmd-&gt;return_code = CXL_MBOX_CMD_RC_INPUT;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;mdata-&gt;test_feat.data, &amp;test-&gt;data, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mock_set_feature(struct cxl_mockmem_data *mdata,</div><div class='add'>+			    struct cxl_mbox_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct cxl_mbox_set_feat_in *input = cmd-&gt;payload_in;</div><div class='add'>+</div><div class='add'>+	if (uuid_equal(&amp;input-&gt;hdr.uuid, &amp;CXL_VENDOR_FEATURE_TEST))</div><div class='add'>+		return mock_set_test_feature(mdata, cmd);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;return_code = CXL_MBOX_CMD_RC_UNSUPPORTED;</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mock_get_supported_features(struct cxl_mockmem_data *mdata,</div><div class='add'>+				       struct cxl_mbox_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct cxl_mbox_get_sup_feats_in *in = cmd-&gt;payload_in;</div><div class='add'>+	struct cxl_mbox_get_sup_feats_out *out = cmd-&gt;payload_out;</div><div class='add'>+	struct cxl_feat_entry *feat;</div><div class='add'>+	u16 start_idx, count;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;size_out &lt; sizeof(*out)) {</div><div class='add'>+		cmd-&gt;return_code = CXL_MBOX_CMD_RC_PAYLOADLEN;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Current emulation only supports 1 feature</div><div class='add'>+	 */</div><div class='add'>+	start_idx = le16_to_cpu(in-&gt;start_idx);</div><div class='add'>+	if (start_idx != 0) {</div><div class='add'>+		cmd-&gt;return_code = CXL_MBOX_CMD_RC_INPUT;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = le16_to_cpu(in-&gt;count);</div><div class='add'>+	if (count &lt; struct_size(out, ents, 0)) {</div><div class='add'>+		cmd-&gt;return_code = CXL_MBOX_CMD_RC_PAYLOADLEN;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	out-&gt;supported_feats = cpu_to_le16(MAX_CXL_TEST_FEATS);</div><div class='add'>+	cmd-&gt;return_code = 0;</div><div class='add'>+	if (count &lt; struct_size(out, ents, MAX_CXL_TEST_FEATS)) {</div><div class='add'>+		out-&gt;num_entries = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	out-&gt;num_entries = cpu_to_le16(MAX_CXL_TEST_FEATS);</div><div class='add'>+	feat = out-&gt;ents;</div><div class='add'>+	fill_feature_vendor_test(feat);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cxl_mock_mbox_send(struct cxl_mailbox *cxl_mbox,</div><div class='ctx'> 			      struct cxl_mbox_cmd *cmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -1421,6 +1602,9 @@ static int cxl_mock_mbox_send(struct cxl_mailbox *cxl_mbox,</div><div class='ctx'> 	case CXL_MBOX_OP_PASSPHRASE_SECURE_ERASE:</div><div class='ctx'> 		rc = mock_passphrase_secure_erase(mdata, cmd);</div><div class='ctx'> 		break;</div><div class='add'>+	case CXL_MBOX_OP_SET_SHUTDOWN_STATE:</div><div class='add'>+		rc = mock_set_shutdown_state(mdata, cmd);</div><div class='add'>+		break;</div><div class='ctx'> 	case CXL_MBOX_OP_GET_POISON:</div><div class='ctx'> 		rc = mock_get_poison(cxlds, cmd);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1439,6 +1623,15 @@ static int cxl_mock_mbox_send(struct cxl_mailbox *cxl_mbox,</div><div class='ctx'> 	case CXL_MBOX_OP_ACTIVATE_FW:</div><div class='ctx'> 		rc = mock_activate_fw(mdata, cmd);</div><div class='ctx'> 		break;</div><div class='add'>+	case CXL_MBOX_OP_GET_SUPPORTED_FEATURES:</div><div class='add'>+		rc = mock_get_supported_features(mdata, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case CXL_MBOX_OP_GET_FEATURE:</div><div class='add'>+		rc = mock_get_feature(mdata, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case CXL_MBOX_OP_SET_FEATURE:</div><div class='add'>+		rc = mock_set_feature(mdata, cmd);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1486,6 +1679,11 @@ static int cxl_mock_mailbox_create(struct cxl_dev_state *cxlds)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cxl_mock_test_feat_init(struct cxl_mockmem_data *mdata)</div><div class='add'>+{</div><div class='add'>+	mdata-&gt;test_feat.data = cpu_to_le32(0xdeadbeef);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cxl_mock_mem_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='hunk'>@@ -1494,6 +1692,7 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct cxl_dev_state *cxlds;</div><div class='ctx'> 	struct cxl_mockmem_data *mdata;</div><div class='ctx'> 	struct cxl_mailbox *cxl_mbox;</div><div class='add'>+	struct cxl_dpa_info range_info = { 0 };</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	mdata = devm_kzalloc(dev, sizeof(*mdata), GFP_KERNEL);</div><div class='hunk'>@@ -1533,7 +1732,7 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)</div><div class='ctx'> 	mds-&gt;event.buf = (struct cxl_get_event_payload *) mdata-&gt;event_buf;</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;mds-&gt;security.poll_dwork, cxl_mockmem_sanitize_work);</div><div class='ctx'> </div><div class='del'>-	cxlds-&gt;serial = pdev-&gt;id;</div><div class='add'>+	cxlds-&gt;serial = pdev-&gt;id + 1;</div><div class='ctx'> 	if (is_rcd(pdev))</div><div class='ctx'> 		cxlds-&gt;rcd = true;</div><div class='ctx'> </div><div class='hunk'>@@ -1554,10 +1753,18 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	rc = cxl_mem_create_range_info(mds);</div><div class='add'>+	rc = cxl_mem_dpa_fetch(mds, &amp;range_info);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='add'>+	rc = cxl_dpa_setup(cxlds, &amp;range_info);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = devm_cxl_setup_features(cxlds);</div><div class='add'>+	if (rc)</div><div class='add'>+		dev_dbg(dev, "No CXL Features discovered\n");</div><div class='add'>+</div><div class='ctx'> 	cxl_mock_add_event_logs(&amp;mdata-&gt;mes);</div><div class='ctx'> </div><div class='ctx'> 	cxlmd = devm_cxl_add_memdev(&amp;pdev-&gt;dev, cxlds);</div><div class='hunk'>@@ -1572,7 +1779,12 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='add'>+	rc = devm_cxl_setup_fwctl(&amp;pdev-&gt;dev, cxlmd);</div><div class='add'>+	if (rc)</div><div class='add'>+		dev_dbg(dev, "No CXL FWCTL setup\n");</div><div class='add'>+</div><div class='ctx'> 	cxl_mem_get_event_records(mds, CXLDEV_EVENT_STATUS_ALL);</div><div class='add'>+	cxl_mock_test_feat_init(mdata);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1615,27 +1827,10 @@ static ssize_t fw_buf_checksum_show(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct cxl_mockmem_data *mdata = dev_get_drvdata(dev);</div><div class='ctx'> 	u8 hash[SHA256_DIGEST_SIZE];</div><div class='del'>-	unsigned char *hstr, *hptr;</div><div class='del'>-	struct sha256_state sctx;</div><div class='del'>-	ssize_t written = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	sha256_init(&amp;sctx);</div><div class='del'>-	sha256_update(&amp;sctx, mdata-&gt;fw, mdata-&gt;fw_size);</div><div class='del'>-	sha256_final(&amp;sctx, hash);</div><div class='del'>-</div><div class='del'>-	hstr = kzalloc((SHA256_DIGEST_SIZE * 2) + 1, GFP_KERNEL);</div><div class='del'>-	if (!hstr)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	hptr = hstr;</div><div class='del'>-	for (i = 0; i &lt; SHA256_DIGEST_SIZE; i++)</div><div class='del'>-		hptr += sprintf(hptr, "%02x", hash[i]);</div><div class='ctx'> </div><div class='del'>-	written = sysfs_emit(buf, "%s\n", hstr);</div><div class='add'>+	sha256(mdata-&gt;fw, mdata-&gt;fw_size, hash);</div><div class='ctx'> </div><div class='del'>-	kfree(hstr);</div><div class='del'>-	return written;</div><div class='add'>+	return sysfs_emit(buf, "%*phN\n", SHA256_DIGEST_SIZE, hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR_RO(fw_buf_checksum);</div><div class='hunk'>@@ -1696,4 +1891,5 @@ static struct platform_driver cxl_mock_mem_driver = {</div><div class='ctx'> </div><div class='ctx'> module_platform_driver(cxl_mock_mem_driver);</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("cxl_test: mem device mock module");</div><div class='ctx'> MODULE_IMPORT_NS("CXL");</div><div class='head'>diff --git a/tools/testing/cxl/test/mock.c b/tools/testing/cxl/test/mock.c<br/>index af2594e4f35d..44bce80ef3ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/test/mock.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/cxl/test/mock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/test/mock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/cxl/test/mock.c</a></div><div class='hunk'>@@ -10,12 +10,21 @@</div><div class='ctx'> #include &lt;cxlmem.h&gt;</div><div class='ctx'> #include &lt;cxlpci.h&gt;</div><div class='ctx'> #include "mock.h"</div><div class='add'>+#include "../exports.h"</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(mock);</div><div class='ctx'> </div><div class='add'>+static struct cxl_dport *</div><div class='add'>+redirect_devm_cxl_add_dport_by_dev(struct cxl_port *port,</div><div class='add'>+				   struct device *dport_dev);</div><div class='add'>+static int redirect_devm_cxl_switch_port_decoders_setup(struct cxl_port *port);</div><div class='add'>+</div><div class='ctx'> void register_cxl_mock_ops(struct cxl_mock_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	list_add_rcu(&amp;ops-&gt;list, &amp;mock);</div><div class='add'>+	_devm_cxl_add_dport_by_dev = redirect_devm_cxl_add_dport_by_dev;</div><div class='add'>+	_devm_cxl_switch_port_decoders_setup =</div><div class='add'>+		redirect_devm_cxl_switch_port_decoders_setup;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(register_cxl_mock_ops);</div><div class='ctx'> </div><div class='hunk'>@@ -23,6 +32,9 @@ DEFINE_STATIC_SRCU(cxl_mock_srcu);</div><div class='ctx'> </div><div class='ctx'> void unregister_cxl_mock_ops(struct cxl_mock_ops *ops)</div><div class='ctx'> {</div><div class='add'>+	_devm_cxl_switch_port_decoders_setup =</div><div class='add'>+		__devm_cxl_switch_port_decoders_setup;</div><div class='add'>+	_devm_cxl_add_dport_by_dev = __devm_cxl_add_dport_by_dev;</div><div class='ctx'> 	list_del_rcu(&amp;ops-&gt;list);</div><div class='ctx'> 	synchronize_srcu(&amp;cxl_mock_srcu);</div><div class='ctx'> }</div><div class='hunk'>@@ -99,6 +111,26 @@ acpi_status __wrap_acpi_evaluate_integer(acpi_handle handle,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__wrap_acpi_evaluate_integer);</div><div class='ctx'> </div><div class='add'>+int __wrap_hmat_get_extended_linear_cache_size(struct resource *backing_res,</div><div class='add'>+					       int nid,</div><div class='add'>+					       resource_size_t *cache_size)</div><div class='add'>+{</div><div class='add'>+	int index, rc;</div><div class='add'>+	struct cxl_mock_ops *ops = get_cxl_mock_ops(&amp;index);</div><div class='add'>+</div><div class='add'>+	if (ops)</div><div class='add'>+		rc = ops-&gt;hmat_get_extended_linear_cache_size(backing_res, nid,</div><div class='add'>+							      cache_size);</div><div class='add'>+	else</div><div class='add'>+		rc = hmat_get_extended_linear_cache_size(backing_res, nid,</div><div class='add'>+							 cache_size);</div><div class='add'>+</div><div class='add'>+	put_cxl_mock_ops(index);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__wrap_hmat_get_extended_linear_cache_size);</div><div class='add'>+</div><div class='ctx'> struct acpi_pci_root *__wrap_acpi_pci_find_root(acpi_handle handle)</div><div class='ctx'> {</div><div class='ctx'> 	int index;</div><div class='hunk'>@@ -131,70 +163,34 @@ __wrap_nvdimm_bus_register(struct device *dev,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__wrap_nvdimm_bus_register);</div><div class='ctx'> </div><div class='del'>-struct cxl_hdm *__wrap_devm_cxl_setup_hdm(struct cxl_port *port,</div><div class='del'>-					  struct cxl_endpoint_dvsec_info *info)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	int index;</div><div class='del'>-	struct cxl_hdm *cxlhdm;</div><div class='del'>-	struct cxl_mock_ops *ops = get_cxl_mock_ops(&amp;index);</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;is_mock_port(port-&gt;uport_dev))</div><div class='del'>-		cxlhdm = ops-&gt;devm_cxl_setup_hdm(port, info);</div><div class='del'>-	else</div><div class='del'>-		cxlhdm = devm_cxl_setup_hdm(port, info);</div><div class='del'>-	put_cxl_mock_ops(index);</div><div class='del'>-</div><div class='del'>-	return cxlhdm;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_NS_GPL(__wrap_devm_cxl_setup_hdm, "CXL");</div><div class='del'>-</div><div class='del'>-int __wrap_devm_cxl_add_passthrough_decoder(struct cxl_port *port)</div><div class='add'>+int redirect_devm_cxl_switch_port_decoders_setup(struct cxl_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	int rc, index;</div><div class='ctx'> 	struct cxl_mock_ops *ops = get_cxl_mock_ops(&amp;index);</div><div class='ctx'> </div><div class='ctx'> 	if (ops &amp;&amp; ops-&gt;is_mock_port(port-&gt;uport_dev))</div><div class='del'>-		rc = ops-&gt;devm_cxl_add_passthrough_decoder(port);</div><div class='add'>+		rc = ops-&gt;devm_cxl_switch_port_decoders_setup(port);</div><div class='ctx'> 	else</div><div class='del'>-		rc = devm_cxl_add_passthrough_decoder(port);</div><div class='add'>+		rc = __devm_cxl_switch_port_decoders_setup(port);</div><div class='ctx'> 	put_cxl_mock_ops(index);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_NS_GPL(__wrap_devm_cxl_add_passthrough_decoder, "CXL");</div><div class='ctx'> </div><div class='del'>-int __wrap_devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm,</div><div class='del'>-				       struct cxl_endpoint_dvsec_info *info)</div><div class='add'>+int __wrap_devm_cxl_endpoint_decoders_setup(struct cxl_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	int rc, index;</div><div class='del'>-	struct cxl_port *port = cxlhdm-&gt;port;</div><div class='ctx'> 	struct cxl_mock_ops *ops = get_cxl_mock_ops(&amp;index);</div><div class='ctx'> </div><div class='ctx'> 	if (ops &amp;&amp; ops-&gt;is_mock_port(port-&gt;uport_dev))</div><div class='del'>-		rc = ops-&gt;devm_cxl_enumerate_decoders(cxlhdm, info);</div><div class='add'>+		rc = ops-&gt;devm_cxl_endpoint_decoders_setup(port);</div><div class='ctx'> 	else</div><div class='del'>-		rc = devm_cxl_enumerate_decoders(cxlhdm, info);</div><div class='add'>+		rc = devm_cxl_endpoint_decoders_setup(port);</div><div class='ctx'> 	put_cxl_mock_ops(index);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_NS_GPL(__wrap_devm_cxl_enumerate_decoders, "CXL");</div><div class='del'>-</div><div class='del'>-int __wrap_devm_cxl_port_enumerate_dports(struct cxl_port *port)</div><div class='del'>-{</div><div class='del'>-	int rc, index;</div><div class='del'>-	struct cxl_mock_ops *ops = get_cxl_mock_ops(&amp;index);</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;is_mock_port(port-&gt;uport_dev))</div><div class='del'>-		rc = ops-&gt;devm_cxl_port_enumerate_dports(port);</div><div class='del'>-	else</div><div class='del'>-		rc = devm_cxl_port_enumerate_dports(port);</div><div class='del'>-	put_cxl_mock_ops(index);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_NS_GPL(__wrap_devm_cxl_port_enumerate_dports, "CXL");</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(__wrap_devm_cxl_endpoint_decoders_setup, "CXL");</div><div class='ctx'> </div><div class='ctx'> int __wrap_cxl_await_media_ready(struct cxl_dev_state *cxlds)</div><div class='ctx'> {</div><div class='hunk'>@@ -211,39 +207,6 @@ int __wrap_cxl_await_media_ready(struct cxl_dev_state *cxlds)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_NS_GPL(__wrap_cxl_await_media_ready, "CXL");</div><div class='ctx'> </div><div class='del'>-int __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds,</div><div class='del'>-			       struct cxl_hdm *cxlhdm,</div><div class='del'>-			       struct cxl_endpoint_dvsec_info *info)</div><div class='del'>-{</div><div class='del'>-	int rc = 0, index;</div><div class='del'>-	struct cxl_mock_ops *ops = get_cxl_mock_ops(&amp;index);</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;is_mock_dev(cxlds-&gt;dev))</div><div class='del'>-		rc = 0;</div><div class='del'>-	else</div><div class='del'>-		rc = cxl_hdm_decode_init(cxlds, cxlhdm, info);</div><div class='del'>-	put_cxl_mock_ops(index);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_NS_GPL(__wrap_cxl_hdm_decode_init, "CXL");</div><div class='del'>-</div><div class='del'>-int __wrap_cxl_dvsec_rr_decode(struct cxl_dev_state *cxlds,</div><div class='del'>-			       struct cxl_endpoint_dvsec_info *info)</div><div class='del'>-{</div><div class='del'>-	int rc = 0, index;</div><div class='del'>-	struct cxl_mock_ops *ops = get_cxl_mock_ops(&amp;index);</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;is_mock_dev(cxlds-&gt;dev))</div><div class='del'>-		rc = 0;</div><div class='del'>-	else</div><div class='del'>-		rc = cxl_dvsec_rr_decode(cxlds, info);</div><div class='del'>-	put_cxl_mock_ops(index);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_NS_GPL(__wrap_cxl_dvsec_rr_decode, "CXL");</div><div class='del'>-</div><div class='ctx'> struct cxl_dport *__wrap_devm_cxl_add_rch_dport(struct cxl_port *port,</div><div class='ctx'> 						struct device *dport_dev,</div><div class='ctx'> 						int port_id,</div><div class='hunk'>@@ -268,23 +231,6 @@ struct cxl_dport *__wrap_devm_cxl_add_rch_dport(struct cxl_port *port,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_NS_GPL(__wrap_devm_cxl_add_rch_dport, "CXL");</div><div class='ctx'> </div><div class='del'>-resource_size_t __wrap_cxl_rcd_component_reg_phys(struct device *dev,</div><div class='del'>-						  struct cxl_dport *dport)</div><div class='del'>-{</div><div class='del'>-	int index;</div><div class='del'>-	resource_size_t component_reg_phys;</div><div class='del'>-	struct cxl_mock_ops *ops = get_cxl_mock_ops(&amp;index);</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;is_mock_port(dev))</div><div class='del'>-		component_reg_phys = CXL_RESOURCE_NONE;</div><div class='del'>-	else</div><div class='del'>-		component_reg_phys = cxl_rcd_component_reg_phys(dev, dport);</div><div class='del'>-	put_cxl_mock_ops(index);</div><div class='del'>-</div><div class='del'>-	return component_reg_phys;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_NS_GPL(__wrap_cxl_rcd_component_reg_phys, "CXL");</div><div class='del'>-</div><div class='ctx'> void __wrap_cxl_endpoint_parse_cdat(struct cxl_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	int index;</div><div class='hunk'>@@ -311,6 +257,23 @@ void __wrap_cxl_dport_init_ras_reporting(struct cxl_dport *dport, struct device</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_NS_GPL(__wrap_cxl_dport_init_ras_reporting, "CXL");</div><div class='ctx'> </div><div class='add'>+struct cxl_dport *redirect_devm_cxl_add_dport_by_dev(struct cxl_port *port,</div><div class='add'>+						     struct device *dport_dev)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+	struct cxl_mock_ops *ops = get_cxl_mock_ops(&amp;index);</div><div class='add'>+	struct cxl_dport *dport;</div><div class='add'>+</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;is_mock_port(port-&gt;uport_dev))</div><div class='add'>+		dport = ops-&gt;devm_cxl_add_dport_by_dev(port, dport_dev);</div><div class='add'>+	else</div><div class='add'>+		dport = __devm_cxl_add_dport_by_dev(port, dport_dev);</div><div class='add'>+	put_cxl_mock_ops(index);</div><div class='add'>+</div><div class='add'>+	return dport;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("cxl_test: emulation module");</div><div class='ctx'> MODULE_IMPORT_NS("ACPI");</div><div class='ctx'> MODULE_IMPORT_NS("CXL");</div><div class='head'>diff --git a/tools/testing/cxl/test/mock.h b/tools/testing/cxl/test/mock.h<br/>index d1b0271d2822..2684b89c8aa2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/test/mock.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/cxl/test/mock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/cxl/test/mock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/cxl/test/mock.h</a></div><div class='hunk'>@@ -19,13 +19,14 @@ struct cxl_mock_ops {</div><div class='ctx'> 	bool (*is_mock_bus)(struct pci_bus *bus);</div><div class='ctx'> 	bool (*is_mock_port)(struct device *dev);</div><div class='ctx'> 	bool (*is_mock_dev)(struct device *dev);</div><div class='del'>-	int (*devm_cxl_port_enumerate_dports)(struct cxl_port *port);</div><div class='del'>-	struct cxl_hdm *(*devm_cxl_setup_hdm)(</div><div class='del'>-		struct cxl_port *port, struct cxl_endpoint_dvsec_info *info);</div><div class='del'>-	int (*devm_cxl_add_passthrough_decoder)(struct cxl_port *port);</div><div class='del'>-	int (*devm_cxl_enumerate_decoders)(</div><div class='del'>-		struct cxl_hdm *hdm, struct cxl_endpoint_dvsec_info *info);</div><div class='add'>+	int (*devm_cxl_switch_port_decoders_setup)(struct cxl_port *port);</div><div class='add'>+	int (*devm_cxl_endpoint_decoders_setup)(struct cxl_port *port);</div><div class='ctx'> 	void (*cxl_endpoint_parse_cdat)(struct cxl_port *port);</div><div class='add'>+	struct cxl_dport *(*devm_cxl_add_dport_by_dev)(struct cxl_port *port,</div><div class='add'>+						       struct device *dport_dev);</div><div class='add'>+	int (*hmat_get_extended_linear_cache_size)(struct resource *backing_res,</div><div class='add'>+						   int nid,</div><div class='add'>+						   resource_size_t *cache_size);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void register_cxl_mock_ops(struct cxl_mock_ops *ops);</div><div class='head'>diff --git a/tools/testing/ktest/config-bisect.pl b/tools/testing/ktest/config-bisect.pl<br/>index 6fd864935319..bee7cb34a289 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/ktest/config-bisect.pl?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/ktest/config-bisect.pl</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/ktest/config-bisect.pl?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/ktest/config-bisect.pl</a></div><div class='hunk'>@@ -741,9 +741,9 @@ if ($start) {</div><div class='ctx'> 	die "Can not find file $bad\n";</div><div class='ctx'>     }</div><div class='ctx'>     if ($val eq "good") {</div><div class='del'>-	run_command "cp $output_config $good" or die "failed to copy $config to $good\n";</div><div class='add'>+	run_command "cp $output_config $good" or die "failed to copy $output_config to $good\n";</div><div class='ctx'>     } elsif ($val eq "bad") {</div><div class='del'>-	run_command "cp $output_config $bad" or die "failed to copy $config to $bad\n";</div><div class='add'>+	run_command "cp $output_config $bad" or die "failed to copy $output_config to $bad\n";</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl<br/>index 8c8da966c641..001c4df9f7df 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/ktest/ktest.pl?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/ktest/ktest.pl</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/ktest/ktest.pl?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/ktest/ktest.pl</a></div><div class='hunk'>@@ -21,6 +21,8 @@ my %opt;</div><div class='ctx'> my %repeat_tests;</div><div class='ctx'> my %repeats;</div><div class='ctx'> my %evals;</div><div class='add'>+my @command_vars;</div><div class='add'>+my %command_tmp_vars;</div><div class='ctx'> </div><div class='ctx'> #default opts</div><div class='ctx'> my %default = (</div><div class='hunk'>@@ -216,6 +218,7 @@ my $patchcheck_type;</div><div class='ctx'> my $patchcheck_start;</div><div class='ctx'> my $patchcheck_cherry;</div><div class='ctx'> my $patchcheck_end;</div><div class='add'>+my $patchcheck_skip;</div><div class='ctx'> </div><div class='ctx'> my $build_time;</div><div class='ctx'> my $install_time;</div><div class='hunk'>@@ -380,6 +383,7 @@ my %option_map = (</div><div class='ctx'>     "PATCHCHECK_START"		=&gt; \$patchcheck_start,</div><div class='ctx'>     "PATCHCHECK_CHERRY"		=&gt; \$patchcheck_cherry,</div><div class='ctx'>     "PATCHCHECK_END"		=&gt; \$patchcheck_end,</div><div class='add'>+    "PATCHCHECK_SKIP"		=&gt; \$patchcheck_skip,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> # Options may be used by other options, record them.</div><div class='hunk'>@@ -900,14 +904,22 @@ sub set_eval {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> sub set_variable {</div><div class='del'>-    my ($lvalue, $rvalue) = @_;</div><div class='add'>+    my ($lvalue, $rvalue, $command) = @_;</div><div class='ctx'> </div><div class='add'>+    # Command line variables override all others</div><div class='add'>+    if (defined($command_tmp_vars{$lvalue})) {</div><div class='add'>+	return;</div><div class='add'>+    }</div><div class='ctx'>     if ($rvalue =~ /^\s*$/) {</div><div class='ctx'> 	delete $variable{$lvalue};</div><div class='ctx'>     } else {</div><div class='ctx'> 	$rvalue = process_variables($rvalue);</div><div class='ctx'> 	$variable{$lvalue} = $rvalue;</div><div class='ctx'>     }</div><div class='add'>+</div><div class='add'>+    if (defined($command)) {</div><div class='add'>+	$command_tmp_vars{$lvalue} = 1;</div><div class='add'>+    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> sub process_compare {</div><div class='hunk'>@@ -1286,6 +1298,19 @@ sub read_config {</div><div class='ctx'> </div><div class='ctx'>     $test_case = __read_config $config, \$test_num;</div><div class='ctx'> </div><div class='add'>+    foreach my $val (@command_vars) {</div><div class='add'>+	chomp $val;</div><div class='add'>+	my %command_overrides;</div><div class='add'>+	if ($val =~ m/^\s*([A-Z_\[\]\d]+)\s*=\s*(.*?)\s*$/) {</div><div class='add'>+	    my $lvalue = $1;</div><div class='add'>+	    my $rvalue = $2;</div><div class='add'>+</div><div class='add'>+	    set_value($lvalue, $rvalue, 1, \%command_overrides, "COMMAND LINE");</div><div class='add'>+	} else {</div><div class='add'>+	    die "Invalid option definition '$val'\n";</div><div class='add'>+	}</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     # make sure we have all mandatory configs</div><div class='ctx'>     get_mandatory_configs;</div><div class='ctx'> </div><div class='hunk'>@@ -1371,7 +1396,10 @@ sub __eval_option {</div><div class='ctx'> 	# If a variable contains itself, use the default var</div><div class='ctx'> 	if (($var eq $name) &amp;&amp; defined($opt{$var})) {</div><div class='ctx'> 	    $o = $opt{$var};</div><div class='del'>-	    $retval = "$retval$o";</div><div class='add'>+	    # Only append if the default doesn't contain itself</div><div class='add'>+	    if ($o !~ m/\$\{$var\}/) {</div><div class='add'>+		$retval = "$retval$o";</div><div class='add'>+	    }</div><div class='ctx'> 	} elsif (defined($opt{$o})) {</div><div class='ctx'> 	    $o = $opt{$o};</div><div class='ctx'> 	    $retval = "$retval$o";</div><div class='hunk'>@@ -3511,11 +3539,37 @@ sub patchcheck {</div><div class='ctx'> 	@list = reverse @list;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    my %skip_list;</div><div class='add'>+    my $will_skip = 0;</div><div class='add'>+</div><div class='add'>+    if (defined($patchcheck_skip)) {</div><div class='add'>+	foreach my $s (split /\s+/, $patchcheck_skip) {</div><div class='add'>+	    $s = `git log --pretty=oneline $s~1..$s`;</div><div class='add'>+	    $s =~ s/^(\S+).*/$1/;</div><div class='add'>+	    chomp $s;</div><div class='add'>+	    $skip_list{$s} = 1;</div><div class='add'>+	    $will_skip++;</div><div class='add'>+	}</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     doprint("Going to test the following commits:\n");</div><div class='ctx'>     foreach my $l (@list) {</div><div class='add'>+	my $sha1 = $l;</div><div class='add'>+	$sha1 =~ s/^([[:xdigit:]]+).*/$1/;</div><div class='add'>+	next if (defined($skip_list{$sha1}));</div><div class='ctx'> 	doprint "$l\n";</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    if ($will_skip) {</div><div class='add'>+	doprint("\nSkipping the following commits:\n");</div><div class='add'>+	foreach my $l (@list) {</div><div class='add'>+	    my $sha1 = $l;</div><div class='add'>+	    $sha1 =~ s/^([[:xdigit:]]+).*/$1/;</div><div class='add'>+	    next if (!defined($skip_list{$sha1}));</div><div class='add'>+	    doprint "$l\n";</div><div class='add'>+	}</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     my $save_clean = $noclean;</div><div class='ctx'>     my %ignored_warnings;</div><div class='ctx'> </div><div class='hunk'>@@ -3530,6 +3584,11 @@ sub patchcheck {</div><div class='ctx'> 	my $sha1 = $item;</div><div class='ctx'> 	$sha1 =~ s/^([[:xdigit:]]+).*/$1/;</div><div class='ctx'> </div><div class='add'>+	if (defined($skip_list{$sha1})) {</div><div class='add'>+	    doprint "\nSkipping \"$item\"\n\n";</div><div class='add'>+	    next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	doprint "\nProcessing commit \"$item\"\n\n";</div><div class='ctx'> </div><div class='ctx'> 	run_command "git checkout $sha1" or</div><div class='hunk'>@@ -4242,8 +4301,55 @@ sub cancel_test {</div><div class='ctx'>     die "\nCaught Sig Int, test interrupted: $!\n"</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-$#ARGV &lt; 1 or die "ktest.pl version: $VERSION\n   usage: ktest.pl [config-file]\n";</div><div class='add'>+sub die_usage {</div><div class='add'>+    die &lt;&lt; "EOF"</div><div class='add'>+ktest.pl version: $VERSION</div><div class='add'>+   usage: ktest.pl [options] [config-file]</div><div class='add'>+    [options]:</div><div class='add'>+       -D value: Where value can act as an option override.</div><div class='add'>+                -D BUILD_NOCLEAN=1</div><div class='add'>+                    Sets global BUILD_NOCLEAN to 1</div><div class='add'>+                -D TEST_TYPE[2]=build</div><div class='add'>+                    Sets TEST_TYPE of test 2 to "build"</div><div class='add'>+</div><div class='add'>+	        It can also override all temp variables.</div><div class='add'>+                 -D USE_TEMP_DIR:=1</div><div class='add'>+                    Will override all variables that use</div><div class='add'>+                    "USE_TEMP_DIR="</div><div class='add'>+</div><div class='add'>+EOF</div><div class='add'>+;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+while ( $#ARGV &gt;= 0 ) {</div><div class='add'>+    if ( $ARGV[0] eq "-D" ) {</div><div class='add'>+	shift;</div><div class='add'>+	die_usage if ($#ARGV &lt; 1);</div><div class='add'>+	my $val = shift;</div><div class='add'>+</div><div class='add'>+	if ($val =~ m/(.*?):=(.*)$/) {</div><div class='add'>+	    set_variable($1, $2, 1);</div><div class='add'>+	} else {</div><div class='add'>+	    $command_vars[$#command_vars + 1] = $val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+    } elsif ( $ARGV[0] =~ m/^-D(.*)/) {</div><div class='add'>+	my $val = $1;</div><div class='add'>+	shift;</div><div class='ctx'> </div><div class='add'>+	if ($val =~ m/(.*?):=(.*)$/) {</div><div class='add'>+	    set_variable($1, $2, 1);</div><div class='add'>+	} else {</div><div class='add'>+	    $command_vars[$#command_vars + 1] = $val;</div><div class='add'>+	}</div><div class='add'>+    } elsif ( $ARGV[0] eq "-h" ) {</div><div class='add'>+	die_usage;</div><div class='add'>+    } else {</div><div class='add'>+	last;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+$#ARGV &lt; 1 or die_usage;</div><div class='ctx'> if ($#ARGV == 0) {</div><div class='ctx'>     $ktest_config = $ARGV[0];</div><div class='ctx'>     if (! -f $ktest_config) {</div><div class='hunk'>@@ -4303,6 +4409,14 @@ if (defined($opt{"LOG_FILE"})) {</div><div class='ctx'>     if ($opt{"CLEAR_LOG"}) {</div><div class='ctx'> 	unlink $opt{"LOG_FILE"};</div><div class='ctx'>     }</div><div class='add'>+</div><div class='add'>+    if (! -e $opt{"LOG_FILE"} &amp;&amp; $opt{"LOG_FILE"} =~ m,^(.*/),) {</div><div class='add'>+        my $dir = $1;</div><div class='add'>+        if (! -d $dir) {</div><div class='add'>+            mkpath($dir) or die "Failed to create directories '$dir': $!";</div><div class='add'>+            print "\nThe log directory $dir did not exist, so it was created.\n";</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='ctx'>     open(LOG, "&gt;&gt; $opt{LOG_FILE}") or die "Can't write to $opt{LOG_FILE}";</div><div class='ctx'>     LOG-&gt;autoflush(1);</div><div class='ctx'> }</div><div class='hunk'>@@ -4458,6 +4572,10 @@ for (my $i = 1; $i &lt;= $opt{"NUM_TESTS"}; $i++) {</div><div class='ctx'> </div><div class='ctx'>     doprint "RUNNING TEST $i of $opt{NUM_TESTS}$name with option $test_type $run_type$installme\n\n";</div><div class='ctx'> </div><div class='add'>+    # Always show which build directory and output directory is being used</div><div class='add'>+    doprint "BUILD_DIR=$builddir\n";</div><div class='add'>+    doprint "OUTPUT_DIR=$outputdir\n\n";</div><div class='add'>+</div><div class='ctx'>     if (defined($pre_test)) {</div><div class='ctx'> 	my $ret = run_command $pre_test;</div><div class='ctx'> 	if (!$ret &amp;&amp; defined($pre_test_die) &amp;&amp;</div><div class='head'>diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf<br/>index f43477a9b857..9c4c449a8f3e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/ktest/sample.conf?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/ktest/sample.conf</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/ktest/sample.conf?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/ktest/sample.conf</a></div><div class='hunk'>@@ -1017,6 +1017,8 @@</div><div class='ctx'> #      Note, PATCHCHECK_CHERRY requires PATCHCHECK_END to be defined.</div><div class='ctx'> #      (default 0)</div><div class='ctx'> #</div><div class='add'>+#  PATCHCHECK_SKIP is an optional list of shas to skip testing</div><div class='add'>+#</div><div class='ctx'> #  PATCHCHECK_TYPE is required and is the type of test to run:</div><div class='ctx'> #      build, boot, test.</div><div class='ctx'> #</div><div class='head'>diff --git a/tools/testing/kunit/configs/all_tests.config b/tools/testing/kunit/configs/all_tests.config<br/>index b0049be00c70..422e186cf3cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/configs/all_tests.config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/configs/all_tests.config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/configs/all_tests.config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/configs/all_tests.config</a></div><div class='hunk'>@@ -20,6 +20,7 @@ CONFIG_VFAT_FS=y</div><div class='ctx'> </div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_USB4=y</div><div class='add'>+CONFIG_I2C=y</div><div class='ctx'> </div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_MCTP=y</div><div class='hunk'>@@ -41,6 +42,10 @@ CONFIG_DAMON_PADDR=y</div><div class='ctx'> </div><div class='ctx'> CONFIG_REGMAP_BUILD=y</div><div class='ctx'> </div><div class='add'>+CONFIG_AUDIT=y</div><div class='add'>+</div><div class='add'>+CONFIG_PRIME_NUMBERS=y</div><div class='add'>+</div><div class='ctx'> CONFIG_SECURITY=y</div><div class='ctx'> CONFIG_SECURITY_APPARMOR=y</div><div class='ctx'> CONFIG_SECURITY_LANDLOCK=y</div><div class='hunk'>@@ -49,3 +54,4 @@ CONFIG_SOUND=y</div><div class='ctx'> CONFIG_SND=y</div><div class='ctx'> CONFIG_SND_SOC=y</div><div class='ctx'> CONFIG_SND_SOC_TOPOLOGY_BUILD=y</div><div class='add'>+CONFIG_SND_SOC_CS35L56_I2C=y</div><div class='head'>diff --git a/tools/testing/kunit/configs/arch_uml.config b/tools/testing/kunit/configs/arch_uml.config<br/>index 54ad8972681a..28edf816aa70 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/configs/arch_uml.config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/configs/arch_uml.config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/configs/arch_uml.config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/configs/arch_uml.config</a></div><div class='hunk'>@@ -1,8 +1,7 @@</div><div class='ctx'> # Config options which are added to UML builds by default</div><div class='ctx'> </div><div class='del'>-# Enable virtio/pci, as a lot of tests require it.</div><div class='del'>-CONFIG_VIRTIO_UML=y</div><div class='del'>-CONFIG_UML_PCI_OVER_VIRTIO=y</div><div class='add'>+# Enable pci, as a lot of tests require it.</div><div class='add'>+CONFIG_KUNIT_UML_PCI=y</div><div class='ctx'> </div><div class='ctx'> # Enable FORTIFY_SOURCE for wider checking.</div><div class='ctx'> CONFIG_FORTIFY_SOURCE=y</div><div class='head'>diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py<br/>index 7f9ae55fd6d5..cd99c1956331 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/kunit.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/kunit.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/kunit.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/kunit.py</a></div><div class='hunk'>@@ -228,7 +228,7 @@ def parse_tests(request: KunitParseRequest, metadata: kunit_json.Metadata, input</div><div class='ctx'> 		fake_test.counts.passed = 1</div><div class='ctx'> </div><div class='ctx'> 		output: Iterable[str] = input_data</div><div class='del'>-		if request.raw_output == 'all':</div><div class='add'>+		if request.raw_output == 'all' or request.raw_output == 'full':</div><div class='ctx'> 			pass</div><div class='ctx'> 		elif request.raw_output == 'kunit':</div><div class='ctx'> 			output = kunit_parser.extract_tap_lines(output)</div><div class='hunk'>@@ -425,7 +425,7 @@ def add_parse_opts(parser: argparse.ArgumentParser) -&gt; None:</div><div class='ctx'> 	parser.add_argument('--raw_output', help='If set don\'t parse output from kernel. '</div><div class='ctx'> 			    'By default, filters to just KUnit output. Use '</div><div class='ctx'> 			    '--raw_output=all to show everything',</div><div class='del'>-			     type=str, nargs='?', const='all', default=None, choices=['all', 'kunit'])</div><div class='add'>+			     type=str, nargs='?', const='all', default=None, choices=['all', 'full', 'kunit'])</div><div class='ctx'> 	parser.add_argument('--json',</div><div class='ctx'> 			    nargs='?',</div><div class='ctx'> 			    help='Prints parsed test results as JSON to stdout or a file if '</div><div class='head'>diff --git a/tools/testing/kunit/kunit_json.py b/tools/testing/kunit/kunit_json.py<br/>index 10ff65689dd8..80fa4e354a17 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/kunit_json.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/kunit_json.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/kunit_json.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/kunit_json.py</a></div><div class='hunk'>@@ -39,10 +39,20 @@ def _get_group_json(test: Test, common_fields: JsonObj) -&gt; JsonObj:</div><div class='ctx'> 		status = _status_map.get(subtest.status, "FAIL")</div><div class='ctx'> 		test_cases.append({"name": subtest.name, "status": status})</div><div class='ctx'> </div><div class='add'>+	test_counts = test.counts</div><div class='add'>+	counts_json = {</div><div class='add'>+		"tests": test_counts.total(),</div><div class='add'>+		"passed": test_counts.passed,</div><div class='add'>+		"failed": test_counts.failed,</div><div class='add'>+		"crashed": test_counts.crashed,</div><div class='add'>+		"skipped": test_counts.skipped,</div><div class='add'>+		"errors": test_counts.errors,</div><div class='add'>+	}</div><div class='ctx'> 	test_group = {</div><div class='ctx'> 		"name": test.name,</div><div class='ctx'> 		"sub_groups": sub_groups,</div><div class='ctx'> 		"test_cases": test_cases,</div><div class='add'>+		"misc": counts_json</div><div class='ctx'> 	}</div><div class='ctx'> 	test_group.update(common_fields)</div><div class='ctx'> 	return test_group</div><div class='head'>diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py<br/>index d30f90eae9a4..260d8d9aa1db 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/kunit_kernel.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/kunit_kernel.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/kunit_kernel.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/kunit_kernel.py</a></div><div class='hunk'>@@ -14,6 +14,7 @@ import os</div><div class='ctx'> import shlex</div><div class='ctx'> import shutil</div><div class='ctx'> import signal</div><div class='add'>+import sys</div><div class='ctx'> import threading</div><div class='ctx'> from typing import Iterator, List, Optional, Tuple</div><div class='ctx'> from types import FrameType</div><div class='hunk'>@@ -72,8 +73,8 @@ class LinuxSourceTreeOperations:</div><div class='ctx'> 			raise ConfigError(e.output.decode())</div><div class='ctx'> </div><div class='ctx'> 	def make(self, jobs: int, build_dir: str, make_options: Optional[List[str]]) -&gt; None:</div><div class='del'>-		command = ['make', 'all', 'compile_commands.json', 'ARCH=' + self._linux_arch,</div><div class='del'>-			   'O=' + build_dir, '--jobs=' + str(jobs)]</div><div class='add'>+		command = ['make', 'all', 'compile_commands.json', 'scripts_gdb',</div><div class='add'>+			   'ARCH=' + self._linux_arch, 'O=' + build_dir, '--jobs=' + str(jobs)]</div><div class='ctx'> 		if make_options:</div><div class='ctx'> 			command.extend(make_options)</div><div class='ctx'> 		if self._cross_compile:</div><div class='hunk'>@@ -201,6 +202,13 @@ def _default_qemu_config_path(arch: str) -&gt; str:</div><div class='ctx'> 		return config_path</div><div class='ctx'> </div><div class='ctx'> 	options = [f[:-3] for f in os.listdir(QEMU_CONFIGS_DIR) if f.endswith('.py')]</div><div class='add'>+</div><div class='add'>+	if arch == 'help':</div><div class='add'>+		print('um')</div><div class='add'>+		for option in options:</div><div class='add'>+			print(option)</div><div class='add'>+		sys.exit()</div><div class='add'>+</div><div class='ctx'> 	raise ConfigError(arch + ' is not a valid arch, options are ' + str(sorted(options)))</div><div class='ctx'> </div><div class='ctx'> def _get_qemu_ops(config_path: str,</div><div class='head'>diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py<br/>index 29fc27e8949b..333cd3a4a56b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/kunit_parser.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/kunit_parser.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/kunit_parser.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/kunit_parser.py</a></div><div class='hunk'>@@ -352,9 +352,9 @@ def parse_test_plan(lines: LineStream, test: Test) -&gt; bool:</div><div class='ctx'> 	lines.pop()</div><div class='ctx'> 	return True</div><div class='ctx'> </div><div class='del'>-TEST_RESULT = re.compile(r'^\s*(ok|not ok) ([0-9]+) (- )?([^#]*)( # .*)?$')</div><div class='add'>+TEST_RESULT = re.compile(r'^\s*(ok|not ok) ([0-9]+) ?(- )?([^#]*)( # .*)?$')</div><div class='ctx'> </div><div class='del'>-TEST_RESULT_SKIP = re.compile(r'^\s*(ok|not ok) ([0-9]+) (- )?(.*) # SKIP(.*)$')</div><div class='add'>+TEST_RESULT_SKIP = re.compile(r'^\s*(ok|not ok) ([0-9]+) ?(- )?(.*) # SKIP ?(.*)$')</div><div class='ctx'> </div><div class='ctx'> def peek_test_name_match(lines: LineStream, test: Test) -&gt; bool:</div><div class='ctx'> 	"""</div><div class='hunk'>@@ -379,6 +379,8 @@ def peek_test_name_match(lines: LineStream, test: Test) -&gt; bool:</div><div class='ctx'> 	if not match:</div><div class='ctx'> 		return False</div><div class='ctx'> 	name = match.group(4)</div><div class='add'>+	if not name:</div><div class='add'>+		return False</div><div class='ctx'> 	return name == test.name</div><div class='ctx'> </div><div class='ctx'> def parse_test_result(lines: LineStream, test: Test,</div><div class='hunk'>@@ -416,7 +418,7 @@ def parse_test_result(lines: LineStream, test: Test,</div><div class='ctx'> </div><div class='ctx'> 	# Set name of test object</div><div class='ctx'> 	if skip_match:</div><div class='del'>-		test.name = skip_match.group(4)</div><div class='add'>+		test.name = skip_match.group(4) or skip_match.group(5)</div><div class='ctx'> 	else:</div><div class='ctx'> 		test.name = match.group(4)</div><div class='ctx'> </div><div class='hunk'>@@ -759,7 +761,7 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str], is_subtest:</div><div class='ctx'> 		# If parsing the main/top-level test, parse KTAP version line and</div><div class='ctx'> 		# test plan</div><div class='ctx'> 		test.name = "main"</div><div class='del'>-		ktap_line = parse_ktap_header(lines, test, printer)</div><div class='add'>+		parse_ktap_header(lines, test, printer)</div><div class='ctx'> 		test.log.extend(parse_diagnostic(lines))</div><div class='ctx'> 		parse_test_plan(lines, test)</div><div class='ctx'> 		parent_test = True</div><div class='hunk'>@@ -768,13 +770,12 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str], is_subtest:</div><div class='ctx'> 		# the KTAP version line and/or subtest header line</div><div class='ctx'> 		ktap_line = parse_ktap_header(lines, test, printer)</div><div class='ctx'> 		subtest_line = parse_test_header(lines, test)</div><div class='add'>+		test.log.extend(parse_diagnostic(lines))</div><div class='add'>+		parse_test_plan(lines, test)</div><div class='ctx'> 		parent_test = (ktap_line or subtest_line)</div><div class='ctx'> 		if parent_test:</div><div class='del'>-			# If KTAP version line and/or subtest header is found, attempt</div><div class='del'>-			# to parse test plan and print test header</div><div class='del'>-			test.log.extend(parse_diagnostic(lines))</div><div class='del'>-			parse_test_plan(lines, test)</div><div class='ctx'> 			print_test_header(test, printer)</div><div class='add'>+</div><div class='ctx'> 	expected_count = test.expected_count</div><div class='ctx'> 	subtests = []</div><div class='ctx'> 	test_num = 1</div><div class='hunk'>@@ -810,6 +811,10 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str], is_subtest:</div><div class='ctx'> 		test.log.extend(parse_diagnostic(lines))</div><div class='ctx'> 		if test.name != "" and not peek_test_name_match(lines, test):</div><div class='ctx'> 			test.add_error(printer, 'missing subtest result line!')</div><div class='add'>+		elif not lines:</div><div class='add'>+			print_log(test.log, printer)</div><div class='add'>+			test.status = TestStatus.NO_TESTS</div><div class='add'>+			test.add_error(printer, 'No more test results!')</div><div class='ctx'> 		else:</div><div class='ctx'> 			parse_test_result(lines, test, expected_num, printer)</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py<br/>index 0bcb0cc002f8..bbba921e0eac 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/kunit_tool_test.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/kunit_tool_test.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/kunit_tool_test.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/kunit_tool_test.py</a></div><div class='hunk'>@@ -363,6 +363,17 @@ class KUnitParserTest(unittest.TestCase):</div><div class='ctx'> 		self.print_mock.assert_any_call(StrContains('  Indented more.'))</div><div class='ctx'> 		self.noPrintCallContains('not ok 1 test1')</div><div class='ctx'> </div><div class='add'>+	def test_parse_late_test_plan(self):</div><div class='add'>+		output = """</div><div class='add'>+		TAP version 13</div><div class='add'>+		ok 4 test4</div><div class='add'>+		1..4</div><div class='add'>+		"""</div><div class='add'>+		result = kunit_parser.parse_run_tests(output.splitlines(), stdout)</div><div class='add'>+		# Missing test results after test plan should alert a suspected test crash.</div><div class='add'>+		self.assertEqual(kunit_parser.TestStatus.SUCCESS, result.status)</div><div class='add'>+		self.assertEqual(result.counts, kunit_parser.TestCounts(passed=1, errors=2))</div><div class='add'>+</div><div class='ctx'> def line_stream_from_strs(strs: Iterable[str]) -&gt; kunit_parser.LineStream:</div><div class='ctx'> 	return kunit_parser.LineStream(enumerate(strs, start=1))</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/mips.py b/tools/testing/kunit/qemu_configs/mips.py<br/>new file mode 100644<br/>index 000000000000..8899ac157b30<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/mips.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/mips.py</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+from ..qemu_config import QemuArchParams</div><div class='add'>+</div><div class='add'>+QEMU_ARCH = QemuArchParams(linux_arch='mips',</div><div class='add'>+                           kconfig='''</div><div class='add'>+CONFIG_32BIT=y</div><div class='add'>+CONFIG_CPU_BIG_ENDIAN=y</div><div class='add'>+CONFIG_MIPS_MALTA=y</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_POWER_RESET=y</div><div class='add'>+CONFIG_POWER_RESET_SYSCON=y</div><div class='add'>+''',</div><div class='add'>+                           qemu_arch='mips',</div><div class='add'>+                           kernel_path='vmlinuz',</div><div class='add'>+                           kernel_command_line='console=ttyS0',</div><div class='add'>+                           extra_qemu_params=['-M', 'malta'])</div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/mips64.py b/tools/testing/kunit/qemu_configs/mips64.py<br/>new file mode 100644<br/>index 000000000000..1478aed05b94<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/mips64.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/mips64.py</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+from ..qemu_config import QemuArchParams</div><div class='add'>+</div><div class='add'>+QEMU_ARCH = QemuArchParams(linux_arch='mips',</div><div class='add'>+                           kconfig='''</div><div class='add'>+CONFIG_CPU_MIPS64_R2=y</div><div class='add'>+CONFIG_64BIT=y</div><div class='add'>+CONFIG_CPU_BIG_ENDIAN=y</div><div class='add'>+CONFIG_MIPS_MALTA=y</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_POWER_RESET=y</div><div class='add'>+CONFIG_POWER_RESET_SYSCON=y</div><div class='add'>+''',</div><div class='add'>+                           qemu_arch='mips64',</div><div class='add'>+                           kernel_path='vmlinuz',</div><div class='add'>+                           kernel_command_line='console=ttyS0',</div><div class='add'>+                           extra_qemu_params=['-M', 'malta', '-cpu', '5KEc'])</div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/mips64el.py b/tools/testing/kunit/qemu_configs/mips64el.py<br/>new file mode 100644<br/>index 000000000000..300c711d7a82<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/mips64el.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/mips64el.py</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+from ..qemu_config import QemuArchParams</div><div class='add'>+</div><div class='add'>+QEMU_ARCH = QemuArchParams(linux_arch='mips',</div><div class='add'>+                           kconfig='''</div><div class='add'>+CONFIG_CPU_MIPS64_R2=y</div><div class='add'>+CONFIG_64BIT=y</div><div class='add'>+CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_MIPS_MALTA=y</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_POWER_RESET=y</div><div class='add'>+CONFIG_POWER_RESET_SYSCON=y</div><div class='add'>+''',</div><div class='add'>+                           qemu_arch='mips64el',</div><div class='add'>+                           kernel_path='vmlinuz',</div><div class='add'>+                           kernel_command_line='console=ttyS0',</div><div class='add'>+                           extra_qemu_params=['-M', 'malta', '-cpu', '5KEc'])</div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/mipsel.py b/tools/testing/kunit/qemu_configs/mipsel.py<br/>new file mode 100644<br/>index 000000000000..3d3543315b45<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/mipsel.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/mipsel.py</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+from ..qemu_config import QemuArchParams</div><div class='add'>+</div><div class='add'>+QEMU_ARCH = QemuArchParams(linux_arch='mips',</div><div class='add'>+                           kconfig='''</div><div class='add'>+CONFIG_32BIT=y</div><div class='add'>+CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_MIPS_MALTA=y</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_POWER_RESET=y</div><div class='add'>+CONFIG_POWER_RESET_SYSCON=y</div><div class='add'>+''',</div><div class='add'>+                           qemu_arch='mipsel',</div><div class='add'>+                           kernel_path='vmlinuz',</div><div class='add'>+                           kernel_command_line='console=ttyS0',</div><div class='add'>+                           extra_qemu_params=['-M', 'malta'])</div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/powerpc.py b/tools/testing/kunit/qemu_configs/powerpc.py<br/>index 7ec38d4131f7..5b4c895d5d5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/powerpc.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/qemu_configs/powerpc.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/powerpc.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/powerpc.py</a></div><div class='hunk'>@@ -3,6 +3,7 @@ from ..qemu_config import QemuArchParams</div><div class='ctx'> QEMU_ARCH = QemuArchParams(linux_arch='powerpc',</div><div class='ctx'> 			   kconfig='''</div><div class='ctx'> CONFIG_PPC64=y</div><div class='add'>+CONFIG_CPU_BIG_ENDIAN=y</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_HVC_CONSOLE=y''',</div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/powerpc32.py b/tools/testing/kunit/qemu_configs/powerpc32.py<br/>new file mode 100644<br/>index 000000000000..88bd60dbb948<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/powerpc32.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/powerpc32.py</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+from ..qemu_config import QemuArchParams</div><div class='add'>+</div><div class='add'>+QEMU_ARCH = QemuArchParams(linux_arch='powerpc',</div><div class='add'>+			   kconfig='''</div><div class='add'>+CONFIG_PPC32=y</div><div class='add'>+CONFIG_CPU_BIG_ENDIAN=y</div><div class='add'>+CONFIG_ADB_CUDA=y</div><div class='add'>+CONFIG_SERIAL_PMACZILOG=y</div><div class='add'>+CONFIG_SERIAL_PMACZILOG_TTYS=y</div><div class='add'>+CONFIG_SERIAL_PMACZILOG_CONSOLE=y</div><div class='add'>+''',</div><div class='add'>+			   qemu_arch='ppc',</div><div class='add'>+			   kernel_path='vmlinux',</div><div class='add'>+			   kernel_command_line='console=ttyS0',</div><div class='add'>+			   extra_qemu_params=['-M', 'g3beige', '-cpu', 'max'])</div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/powerpcle.py b/tools/testing/kunit/qemu_configs/powerpcle.py<br/>new file mode 100644<br/>index 000000000000..7ddee8af4bd7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/powerpcle.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/powerpcle.py</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+from ..qemu_config import QemuArchParams</div><div class='add'>+</div><div class='add'>+QEMU_ARCH = QemuArchParams(linux_arch='powerpc',</div><div class='add'>+			   kconfig='''</div><div class='add'>+CONFIG_PPC64=y</div><div class='add'>+CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_HVC_CONSOLE=y</div><div class='add'>+''',</div><div class='add'>+			   qemu_arch='ppc64',</div><div class='add'>+			   kernel_path='vmlinux',</div><div class='add'>+			   kernel_command_line='console=ttyS0',</div><div class='add'>+			   extra_qemu_params=['-M', 'pseries', '-cpu', 'power8'])</div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/riscv32.py b/tools/testing/kunit/qemu_configs/riscv32.py<br/>new file mode 100644<br/>index 000000000000..b79ba0ae30f8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/riscv32.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/riscv32.py</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+from ..qemu_config import QemuArchParams</div><div class='add'>+</div><div class='add'>+QEMU_ARCH = QemuArchParams(linux_arch='riscv',</div><div class='add'>+			   kconfig='''</div><div class='add'>+CONFIG_NONPORTABLE=y</div><div class='add'>+CONFIG_ARCH_RV32I=y</div><div class='add'>+CONFIG_ARCH_VIRT=y</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+''',</div><div class='add'>+			   qemu_arch='riscv32',</div><div class='add'>+			   kernel_path='arch/riscv/boot/Image',</div><div class='add'>+			   kernel_command_line='console=ttyS0',</div><div class='add'>+			   extra_qemu_params=['-machine', 'virt'])</div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/sh.py b/tools/testing/kunit/qemu_configs/sh.py<br/>index 78a474a5b95f..f00cb89fdef6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/sh.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/qemu_configs/sh.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/sh.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/sh.py</a></div><div class='hunk'>@@ -7,7 +7,9 @@ CONFIG_CPU_SUBTYPE_SH7751R=y</div><div class='ctx'> CONFIG_MEMORY_START=0x0c000000</div><div class='ctx'> CONFIG_SH_RTS7751R2D=y</div><div class='ctx'> CONFIG_RTS7751R2D_PLUS=y</div><div class='del'>-CONFIG_SERIAL_SH_SCI=y''',</div><div class='add'>+CONFIG_SERIAL_SH_SCI=y</div><div class='add'>+CONFIG_CMDLINE_EXTEND=y</div><div class='add'>+''',</div><div class='ctx'> 			   qemu_arch='sh4',</div><div class='ctx'> 			   kernel_path='arch/sh/boot/zImage',</div><div class='ctx'> 			   kernel_command_line='console=ttySC1',</div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/sparc.py b/tools/testing/kunit/qemu_configs/sparc.py<br/>index e975c4331a7c..2019550a1b69 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/sparc.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/qemu_configs/sparc.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/sparc.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/sparc.py</a></div><div class='hunk'>@@ -2,8 +2,11 @@ from ..qemu_config import QemuArchParams</div><div class='ctx'> </div><div class='ctx'> QEMU_ARCH = QemuArchParams(linux_arch='sparc',</div><div class='ctx'> 			   kconfig='''</div><div class='del'>-CONFIG_SERIAL_8250=y</div><div class='del'>-CONFIG_SERIAL_8250_CONSOLE=y''',</div><div class='add'>+CONFIG_KUNIT_FAULT_TEST=n</div><div class='add'>+CONFIG_SPARC32=y</div><div class='add'>+CONFIG_SERIAL_SUNZILOG=y</div><div class='add'>+CONFIG_SERIAL_SUNZILOG_CONSOLE=y</div><div class='add'>+''',</div><div class='ctx'> 			   qemu_arch='sparc',</div><div class='ctx'> 			   kernel_path='arch/sparc/boot/zImage',</div><div class='ctx'> 			   kernel_command_line='console=ttyS0 mem=256M',</div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/sparc64.py b/tools/testing/kunit/qemu_configs/sparc64.py<br/>new file mode 100644<br/>index 000000000000..53d4e5a8c972<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/sparc64.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/sparc64.py</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+from ..qemu_config import QemuArchParams</div><div class='add'>+</div><div class='add'>+QEMU_ARCH = QemuArchParams(linux_arch='sparc',</div><div class='add'>+			   kconfig='''</div><div class='add'>+CONFIG_64BIT=y</div><div class='add'>+CONFIG_SPARC64=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_SERIAL_SUNSU=y</div><div class='add'>+CONFIG_SERIAL_SUNSU_CONSOLE=y</div><div class='add'>+''',</div><div class='add'>+			   qemu_arch='sparc64',</div><div class='add'>+			   kernel_path='arch/sparc/boot/image',</div><div class='add'>+			   kernel_command_line='console=ttyS0 kunit_shutdown=poweroff',</div><div class='add'>+			   extra_qemu_params=[])</div><div class='head'>diff --git a/tools/testing/kunit/qemu_configs/x86_64.py b/tools/testing/kunit/qemu_configs/x86_64.py<br/>index dc7949076863..4a6bf4e048f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/x86_64.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/qemu_configs/x86_64.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/qemu_configs/x86_64.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/qemu_configs/x86_64.py</a></div><div class='hunk'>@@ -7,4 +7,6 @@ CONFIG_SERIAL_8250_CONSOLE=y''',</div><div class='ctx'> 			   qemu_arch='x86_64',</div><div class='ctx'> 			   kernel_path='arch/x86/boot/bzImage',</div><div class='ctx'> 			   kernel_command_line='console=ttyS0',</div><div class='del'>-			   extra_qemu_params=[])</div><div class='add'>+			   # qboot is faster than SeaBIOS and doesn't mess up</div><div class='add'>+			   # the terminal.</div><div class='add'>+			   extra_qemu_params=['-bios', 'qboot.rom'])</div><div class='head'>diff --git a/tools/testing/kunit/test_data/test_is_test_passed-kselftest.log b/tools/testing/kunit/test_data/test_is_test_passed-kselftest.log<br/>index 65d3f27feaf2..30d9ef18bcec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/test_data/test_is_test_passed-kselftest.log?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/kunit/test_data/test_is_test_passed-kselftest.log</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/kunit/test_data/test_is_test_passed-kselftest.log?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/kunit/test_data/test_is_test_passed-kselftest.log</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> TAP version 13</div><div class='del'>-1..2</div><div class='add'>+1..3</div><div class='ctx'> # selftests: membarrier: membarrier_test_single_thread</div><div class='ctx'> # TAP version 13</div><div class='ctx'> # 1..2</div><div class='hunk'>@@ -12,3 +12,4 @@ ok 1 selftests: membarrier: membarrier_test_single_thread</div><div class='ctx'> # ok 1 sys_membarrier available</div><div class='ctx'> # ok 2 sys membarrier invalid command test: command = -1, flags = 0, errno = 22. Failed as expected</div><div class='ctx'> ok 2 selftests: membarrier: membarrier_test_multi_thread</div><div class='add'>+ok 3 # SKIP selftests: membarrier: membarrier_test_multi_thread</div><div class='head'>diff --git a/tools/testing/memblock/internal.h b/tools/testing/memblock/internal.h<br/>index 1cf82acb2a3e..0ab4b53bb4f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/memblock/internal.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/memblock/internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/memblock/internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/memblock/internal.h</a></div><div class='hunk'>@@ -24,4 +24,10 @@ static inline void accept_memory(phys_addr_t start, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned long free_reserved_area(void *start, void *end,</div><div class='add'>+					       int poison, const char *s)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/tools/testing/memblock/linux/mutex.h b/tools/testing/memblock/linux/mutex.h<br/>new file mode 100644<br/>index 000000000000..ae3f497165d6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/memblock/linux/mutex.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/memblock/linux/mutex.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef _MUTEX_H</div><div class='add'>+#define _MUTEX_H</div><div class='add'>+</div><div class='add'>+#define DEFINE_MUTEX(name) int name</div><div class='add'>+</div><div class='add'>+static inline void dummy_mutex_guard(int *name)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define guard(mutex)	\</div><div class='add'>+	dummy_##mutex##_guard</div><div class='add'>+</div><div class='add'>+#endif /* _MUTEX_H */
\ No newline at end of file</div><div class='head'>diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/memblock/tests/alloc_api.c<br/>index 68f1a75cd72c..c55f67dd367d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/memblock/tests/alloc_api.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/memblock/tests/alloc_api.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/memblock/tests/alloc_api.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/memblock/tests/alloc_api.c</a></div><div class='hunk'>@@ -134,7 +134,7 @@ static int alloc_top_down_before_check(void)</div><div class='ctx'> 	PREFIX_PUSH();</div><div class='ctx'> 	setup_memblock();</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(memblock_end_of_DRAM() - total_size, r1_size);</div><div class='add'>+	memblock_reserve_kern(memblock_end_of_DRAM() - total_size, r1_size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES);</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +182,7 @@ static int alloc_top_down_after_check(void)</div><div class='ctx'> </div><div class='ctx'> 	total_size = r1.size + r2_size;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(r1.base, r1.size);</div><div class='add'>+	memblock_reserve_kern(r1.base, r1.size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES);</div><div class='ctx'> </div><div class='hunk'>@@ -231,8 +231,8 @@ static int alloc_top_down_second_fit_check(void)</div><div class='ctx'> </div><div class='ctx'> 	total_size = r1.size + r2.size + r3_size;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(r1.base, r1.size);</div><div class='del'>-	memblock_reserve(r2.base, r2.size);</div><div class='add'>+	memblock_reserve_kern(r1.base, r1.size);</div><div class='add'>+	memblock_reserve_kern(r2.base, r2.size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES);</div><div class='ctx'> </div><div class='hunk'>@@ -285,8 +285,8 @@ static int alloc_in_between_generic_check(void)</div><div class='ctx'> </div><div class='ctx'> 	total_size = r1.size + r2.size + r3_size;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(r1.base, r1.size);</div><div class='del'>-	memblock_reserve(r2.base, r2.size);</div><div class='add'>+	memblock_reserve_kern(r1.base, r1.size);</div><div class='add'>+	memblock_reserve_kern(r2.base, r2.size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES);</div><div class='ctx'> </div><div class='hunk'>@@ -422,7 +422,7 @@ static int alloc_limited_space_generic_check(void)</div><div class='ctx'> 	setup_memblock();</div><div class='ctx'> </div><div class='ctx'> 	/* Simulate almost-full memory */</div><div class='del'>-	memblock_reserve(memblock_start_of_DRAM(), reserved_size);</div><div class='add'>+	memblock_reserve_kern(memblock_start_of_DRAM(), reserved_size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc(available_size, SMP_CACHE_BYTES);</div><div class='ctx'> </div><div class='hunk'>@@ -608,7 +608,7 @@ static int alloc_bottom_up_before_check(void)</div><div class='ctx'> 	PREFIX_PUSH();</div><div class='ctx'> 	setup_memblock();</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(memblock_start_of_DRAM() + r1_size, r2_size);</div><div class='add'>+	memblock_reserve_kern(memblock_start_of_DRAM() + r1_size, r2_size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc(r1_size, SMP_CACHE_BYTES);</div><div class='ctx'> </div><div class='hunk'>@@ -655,7 +655,7 @@ static int alloc_bottom_up_after_check(void)</div><div class='ctx'> </div><div class='ctx'> 	total_size = r1.size + r2_size;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(r1.base, r1.size);</div><div class='add'>+	memblock_reserve_kern(r1.base, r1.size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES);</div><div class='ctx'> </div><div class='hunk'>@@ -705,8 +705,8 @@ static int alloc_bottom_up_second_fit_check(void)</div><div class='ctx'> </div><div class='ctx'> 	total_size = r1.size + r2.size + r3_size;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(r1.base, r1.size);</div><div class='del'>-	memblock_reserve(r2.base, r2.size);</div><div class='add'>+	memblock_reserve_kern(r1.base, r1.size);</div><div class='add'>+	memblock_reserve_kern(r2.base, r2.size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/memblock/tests/alloc_helpers_api.c b/tools/testing/memblock/tests/alloc_helpers_api.c<br/>index 3ef9486da8a0..e5362cfd2ff3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/memblock/tests/alloc_helpers_api.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/memblock/tests/alloc_helpers_api.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/memblock/tests/alloc_helpers_api.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/memblock/tests/alloc_helpers_api.c</a></div><div class='hunk'>@@ -163,7 +163,7 @@ static int alloc_from_top_down_no_space_above_check(void)</div><div class='ctx'> 	min_addr = memblock_end_of_DRAM() - SMP_CACHE_BYTES * 2;</div><div class='ctx'> </div><div class='ctx'> 	/* No space above this address */</div><div class='del'>-	memblock_reserve(min_addr, r2_size);</div><div class='add'>+	memblock_reserve_kern(min_addr, r2_size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -199,7 +199,7 @@ static int alloc_from_top_down_min_addr_cap_check(void)</div><div class='ctx'> 	start_addr = (phys_addr_t)memblock_start_of_DRAM();</div><div class='ctx'> 	min_addr = start_addr - SMP_CACHE_BYTES * 3;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(start_addr + r1_size, MEM_SIZE - r1_size);</div><div class='add'>+	memblock_reserve_kern(start_addr + r1_size, MEM_SIZE - r1_size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/memblock/tests/alloc_nid_api.c<br/>index 49bb416d34ff..562e4701b0e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/memblock/tests/alloc_nid_api.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/memblock/tests/alloc_nid_api.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/memblock/tests/alloc_nid_api.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/memblock/tests/alloc_nid_api.c</a></div><div class='hunk'>@@ -324,7 +324,7 @@ static int alloc_nid_min_reserved_generic_check(void)</div><div class='ctx'> 	min_addr = max_addr - r2_size;</div><div class='ctx'> 	reserved_base = min_addr - r1_size;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(reserved_base, r1_size);</div><div class='add'>+	memblock_reserve_kern(reserved_base, r1_size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc_nid(r2_size, SMP_CACHE_BYTES,</div><div class='ctx'> 					       min_addr, max_addr,</div><div class='hunk'>@@ -374,7 +374,7 @@ static int alloc_nid_max_reserved_generic_check(void)</div><div class='ctx'> 	max_addr = memblock_end_of_DRAM() - r1_size;</div><div class='ctx'> 	min_addr = max_addr - r2_size;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(max_addr, r1_size);</div><div class='add'>+	memblock_reserve_kern(max_addr, r1_size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc_nid(r2_size, SMP_CACHE_BYTES,</div><div class='ctx'> 					       min_addr, max_addr,</div><div class='hunk'>@@ -436,8 +436,8 @@ static int alloc_nid_top_down_reserved_with_space_check(void)</div><div class='ctx'> 	min_addr = r2.base + r2.size;</div><div class='ctx'> 	max_addr = r1.base;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(r1.base, r1.size);</div><div class='del'>-	memblock_reserve(r2.base, r2.size);</div><div class='add'>+	memblock_reserve_kern(r1.base, r1.size);</div><div class='add'>+	memblock_reserve_kern(r2.base, r2.size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES,</div><div class='ctx'> 					       min_addr, max_addr,</div><div class='hunk'>@@ -499,8 +499,8 @@ static int alloc_nid_reserved_full_merge_generic_check(void)</div><div class='ctx'> 	min_addr = r2.base + r2.size;</div><div class='ctx'> 	max_addr = r1.base;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(r1.base, r1.size);</div><div class='del'>-	memblock_reserve(r2.base, r2.size);</div><div class='add'>+	memblock_reserve_kern(r1.base, r1.size);</div><div class='add'>+	memblock_reserve_kern(r2.base, r2.size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES,</div><div class='ctx'> 					       min_addr, max_addr,</div><div class='hunk'>@@ -563,8 +563,8 @@ static int alloc_nid_top_down_reserved_no_space_check(void)</div><div class='ctx'> 	min_addr = r2.base + r2.size;</div><div class='ctx'> 	max_addr = r1.base;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(r1.base, r1.size);</div><div class='del'>-	memblock_reserve(r2.base, r2.size);</div><div class='add'>+	memblock_reserve_kern(r1.base, r1.size);</div><div class='add'>+	memblock_reserve_kern(r2.base, r2.size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES,</div><div class='ctx'> 					       min_addr, max_addr,</div><div class='hunk'>@@ -909,8 +909,8 @@ static int alloc_nid_bottom_up_reserved_with_space_check(void)</div><div class='ctx'> 	min_addr = r2.base + r2.size;</div><div class='ctx'> 	max_addr = r1.base;</div><div class='ctx'> </div><div class='del'>-	memblock_reserve(r1.base, r1.size);</div><div class='del'>-	memblock_reserve(r2.base, r2.size);</div><div class='add'>+	memblock_reserve_kern(r1.base, r1.size);</div><div class='add'>+	memblock_reserve_kern(r2.base, r2.size);</div><div class='ctx'> </div><div class='ctx'> 	allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES,</div><div class='ctx'> 					       min_addr, max_addr,</div><div class='head'>diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c<br/>index 67503089e6a0..01e836fba488 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/memblock/tests/basic_api.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/memblock/tests/basic_api.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/memblock/tests/basic_api.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/memblock/tests/basic_api.c</a></div><div class='hunk'>@@ -2434,6 +2434,107 @@ static int memblock_overlaps_region_checks(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NUMA</div><div class='add'>+static int memblock_set_node_check(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long i, max_reserved;</div><div class='add'>+	struct memblock_region *rgn;</div><div class='add'>+	void *orig_region;</div><div class='add'>+</div><div class='add'>+	PREFIX_PUSH();</div><div class='add'>+</div><div class='add'>+	reset_memblock_regions();</div><div class='add'>+	memblock_allow_resize();</div><div class='add'>+</div><div class='add'>+	dummy_physical_memory_init();</div><div class='add'>+	memblock_add(dummy_physical_memory_base(), MEM_SIZE);</div><div class='add'>+	orig_region = memblock.reserved.regions;</div><div class='add'>+</div><div class='add'>+	/* Equally Split range to node 0 and 1*/</div><div class='add'>+	memblock_set_node(memblock_start_of_DRAM(),</div><div class='add'>+			memblock_phys_mem_size() / 2, &amp;memblock.memory, 0);</div><div class='add'>+	memblock_set_node(memblock_start_of_DRAM() + memblock_phys_mem_size() / 2,</div><div class='add'>+			memblock_phys_mem_size() / 2, &amp;memblock.memory, 1);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(memblock.memory.cnt, 2);</div><div class='add'>+	rgn = &amp;memblock.memory.regions[0];</div><div class='add'>+	ASSERT_EQ(rgn-&gt;base, memblock_start_of_DRAM());</div><div class='add'>+	ASSERT_EQ(rgn-&gt;size, memblock_phys_mem_size() / 2);</div><div class='add'>+	ASSERT_EQ(memblock_get_region_node(rgn), 0);</div><div class='add'>+	rgn = &amp;memblock.memory.regions[1];</div><div class='add'>+	ASSERT_EQ(rgn-&gt;base, memblock_start_of_DRAM() + memblock_phys_mem_size() / 2);</div><div class='add'>+	ASSERT_EQ(rgn-&gt;size, memblock_phys_mem_size() / 2);</div><div class='add'>+	ASSERT_EQ(memblock_get_region_node(rgn), 1);</div><div class='add'>+</div><div class='add'>+	/* Reserve 126 regions with the last one across node boundary */</div><div class='add'>+	for (i = 0; i &lt; 125; i++)</div><div class='add'>+		memblock_reserve(memblock_start_of_DRAM() + SZ_16 * i, SZ_8);</div><div class='add'>+</div><div class='add'>+	memblock_reserve(memblock_start_of_DRAM() + memblock_phys_mem_size() / 2 - SZ_8,</div><div class='add'>+			SZ_16);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Commit 61167ad5fecd ("mm: pass nid to reserve_bootmem_region()")</div><div class='add'>+	 * do following process to set nid to each memblock.reserved region.</div><div class='add'>+	 * But it may miss some region if memblock_set_node() double the</div><div class='add'>+	 * array.</div><div class='add'>+	 *</div><div class='add'>+	 * By checking 'max', we make sure all region nid is set properly.</div><div class='add'>+	 */</div><div class='add'>+repeat:</div><div class='add'>+	max_reserved = memblock.reserved.max;</div><div class='add'>+	for_each_mem_region(rgn) {</div><div class='add'>+		int nid = memblock_get_region_node(rgn);</div><div class='add'>+</div><div class='add'>+		memblock_set_node(rgn-&gt;base, rgn-&gt;size, &amp;memblock.reserved, nid);</div><div class='add'>+	}</div><div class='add'>+	if (max_reserved != memblock.reserved.max)</div><div class='add'>+		goto repeat;</div><div class='add'>+</div><div class='add'>+	/* Confirm each region has valid node set */</div><div class='add'>+	for_each_reserved_mem_region(rgn) {</div><div class='add'>+		ASSERT_TRUE(numa_valid_node(memblock_get_region_node(rgn)));</div><div class='add'>+		if (rgn == (memblock.reserved.regions + memblock.reserved.cnt - 1))</div><div class='add'>+			ASSERT_EQ(1, memblock_get_region_node(rgn));</div><div class='add'>+		else</div><div class='add'>+			ASSERT_EQ(0, memblock_get_region_node(rgn));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dummy_physical_memory_cleanup();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The current reserved.regions is occupying a range of memory that</div><div class='add'>+	 * allocated from dummy_physical_memory_init(). After free the memory,</div><div class='add'>+	 * we must not use it. So restore the origin memory region to make sure</div><div class='add'>+	 * the tests can run as normal and not affected by the double array.</div><div class='add'>+	 */</div><div class='add'>+	memblock.reserved.regions = orig_region;</div><div class='add'>+	memblock.reserved.cnt = INIT_MEMBLOCK_RESERVED_REGIONS;</div><div class='add'>+</div><div class='add'>+	test_pass_pop();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int memblock_set_node_checks(void)</div><div class='add'>+{</div><div class='add'>+	prefix_reset();</div><div class='add'>+	prefix_push("memblock_set_node");</div><div class='add'>+	test_print("Running memblock_set_node tests...\n");</div><div class='add'>+</div><div class='add'>+	memblock_set_node_check();</div><div class='add'>+</div><div class='add'>+	prefix_pop();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int memblock_set_node_checks(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> int memblock_basic_checks(void)</div><div class='ctx'> {</div><div class='ctx'> 	memblock_initialization_check();</div><div class='hunk'>@@ -2444,6 +2545,7 @@ int memblock_basic_checks(void)</div><div class='ctx'> 	memblock_bottom_up_checks();</div><div class='ctx'> 	memblock_trim_memory_checks();</div><div class='ctx'> 	memblock_overlaps_region_checks();</div><div class='add'>+	memblock_set_node_checks();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/nvdimm/pmem-dax.c b/tools/testing/nvdimm/pmem-dax.c<br/>index c1ec099a3b1d..05e763aab104 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/nvdimm/pmem-dax.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/nvdimm/pmem-dax.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/nvdimm/pmem-dax.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/nvdimm/pmem-dax.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,</div><div class='ctx'> 		long nr_pages, enum dax_access_mode mode, void **kaddr,</div><div class='del'>-		pfn_t *pfn)</div><div class='add'>+		unsigned long *pfn)</div><div class='ctx'> {</div><div class='ctx'> 	resource_size_t offset = PFN_PHYS(pgoff) + pmem-&gt;data_offset;</div><div class='ctx'> </div><div class='hunk'>@@ -29,7 +29,7 @@ long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,</div><div class='ctx'> 			*kaddr = pmem-&gt;virt_addr + offset;</div><div class='ctx'> 		page = vmalloc_to_page(pmem-&gt;virt_addr + offset);</div><div class='ctx'> 		if (pfn)</div><div class='del'>-			*pfn = page_to_pfn_t(page);</div><div class='add'>+			*pfn = page_to_pfn(page);</div><div class='ctx'> 		pr_debug_ratelimited("%s: pmem: %p pgoff: %#lx pfn: %#lx\n",</div><div class='ctx'> 				__func__, pmem, pgoff, page_to_pfn(page));</div><div class='ctx'> </div><div class='hunk'>@@ -39,7 +39,7 @@ long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,</div><div class='ctx'> 	if (kaddr)</div><div class='ctx'> 		*kaddr = pmem-&gt;virt_addr + offset;</div><div class='ctx'> 	if (pfn)</div><div class='del'>-		*pfn = phys_to_pfn_t(pmem-&gt;phys_addr + offset, pmem-&gt;pfn_flags);</div><div class='add'>+		*pfn = PHYS_PFN(pmem-&gt;phys_addr + offset);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If badblocks are present, limit known good range to the</div><div class='head'>diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c<br/>index e4313726fae3..f7e7bfe9bb85 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/nvdimm/test/iomap.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/nvdimm/test/iomap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/nvdimm/test/iomap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/nvdimm/test/iomap.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/pfn_t.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -135,16 +134,6 @@ void *__wrap_devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(__wrap_devm_memremap_pages);</div><div class='ctx'> </div><div class='del'>-pfn_t __wrap_phys_to_pfn_t(phys_addr_t addr, unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	struct nfit_test_resource *nfit_res = get_nfit_res(addr);</div><div class='del'>-</div><div class='del'>-	if (nfit_res)</div><div class='del'>-		flags &amp;= ~PFN_MAP;</div><div class='del'>-        return phys_to_pfn_t(addr, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(__wrap_phys_to_pfn_t);</div><div class='del'>-</div><div class='ctx'> void *__wrap_memremap(resource_size_t offset, size_t size,</div><div class='ctx'> 		unsigned long flags)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/nvdimm/test/ndtest.c b/tools/testing/nvdimm/test/ndtest.c<br/>index 68a064ce598c..8e3b6be53839 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/nvdimm/test/ndtest.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/nvdimm/test/ndtest.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/nvdimm/test/ndtest.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/nvdimm/test/ndtest.c</a></div><div class='hunk'>@@ -850,11 +850,22 @@ static int ndtest_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;dcr_dma = devm_kcalloc(&amp;p-&gt;pdev.dev, NUM_DCR,</div><div class='ctx'> 				 sizeof(dma_addr_t), GFP_KERNEL);</div><div class='add'>+	if (!p-&gt;dcr_dma) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> 	p-&gt;label_dma = devm_kcalloc(&amp;p-&gt;pdev.dev, NUM_DCR,</div><div class='ctx'> 				   sizeof(dma_addr_t), GFP_KERNEL);</div><div class='add'>+	if (!p-&gt;label_dma) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> 	p-&gt;dimm_dma = devm_kcalloc(&amp;p-&gt;pdev.dev, NUM_DCR,</div><div class='ctx'> 				  sizeof(dma_addr_t), GFP_KERNEL);</div><div class='del'>-</div><div class='add'>+	if (!p-&gt;dimm_dma) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> 	rc = ndtest_nvdimm_init(p);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err;</div><div class='head'>diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c<br/>index cfd4378e2129..f87e9f251d13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/nvdimm/test/nfit.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/nvdimm/test/nfit.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/nvdimm/test/nfit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/nvdimm/test/nfit.c</a></div><div class='hunk'>@@ -670,6 +670,7 @@ static int nfit_test_search_spa(struct nvdimm_bus *bus,</div><div class='ctx'> 		.addr = spa-&gt;spa,</div><div class='ctx'> 		.region = NULL,</div><div class='ctx'> 	};</div><div class='add'>+	struct nfit_mem *nfit_mem;</div><div class='ctx'> 	u64 dpa;</div><div class='ctx'> </div><div class='ctx'> 	ret = device_for_each_child(&amp;bus-&gt;dev, &amp;ctx,</div><div class='hunk'>@@ -687,8 +688,12 @@ static int nfit_test_search_spa(struct nvdimm_bus *bus,</div><div class='ctx'> 	 */</div><div class='ctx'> 	nd_mapping = &amp;nd_region-&gt;mapping[nd_region-&gt;ndr_mappings - 1];</div><div class='ctx'> 	nvdimm = nd_mapping-&gt;nvdimm;</div><div class='add'>+	nfit_mem = nvdimm_provider_data(nvdimm);</div><div class='add'>+	if (!nfit_mem)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	spa-&gt;devices[0].nfit_device_handle = handle[nvdimm-&gt;id];</div><div class='add'>+	spa-&gt;devices[0].nfit_device_handle =</div><div class='add'>+		__to_nfit_memdev(nfit_mem)-&gt;device_handle;</div><div class='ctx'> 	spa-&gt;num_nvdimms = 1;</div><div class='ctx'> 	spa-&gt;devices[0].dpa = dpa;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/nvdimm/test/nfit_test.h b/tools/testing/nvdimm/test/nfit_test.h<br/>index b00583d1eace..b9047fb8ea4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/nvdimm/test/nfit_test.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/nvdimm/test/nfit_test.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/nvdimm/test/nfit_test.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/nvdimm/test/nfit_test.h</a></div><div class='hunk'>@@ -212,7 +212,6 @@ void __iomem *__wrap_devm_ioremap(struct device *dev,</div><div class='ctx'> void *__wrap_devm_memremap(struct device *dev, resource_size_t offset,</div><div class='ctx'> 		size_t size, unsigned long flags);</div><div class='ctx'> void *__wrap_devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap);</div><div class='del'>-pfn_t __wrap_phys_to_pfn_t(phys_addr_t addr, unsigned long flags);</div><div class='ctx'> void *__wrap_memremap(resource_size_t offset, size_t size,</div><div class='ctx'> 		unsigned long flags);</div><div class='ctx'> void __wrap_devm_memunmap(struct device *dev, void *addr);</div><div class='head'>diff --git a/tools/testing/radix-tree/Makefile b/tools/testing/radix-tree/Makefile<br/>index 8b3591a51e1f..b2a6660bbd92 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/radix-tree/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/radix-tree/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/radix-tree/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/radix-tree/Makefile</a></div><div class='hunk'>@@ -14,6 +14,7 @@ include ../shared/shared.mk</div><div class='ctx'> </div><div class='ctx'> main:	$(OFILES)</div><div class='ctx'> </div><div class='add'>+xarray.o: ../../../lib/test_xarray.c</div><div class='ctx'> idr-test.o: ../../../lib/test_ida.c</div><div class='ctx'> idr-test: idr-test.o $(CORE_OFILES)</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/radix-tree/idr-test.c b/tools/testing/radix-tree/idr-test.c<br/>index 84b8c3c92c79..2f830ff8396c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/radix-tree/idr-test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/radix-tree/idr-test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/radix-tree/idr-test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/radix-tree/idr-test.c</a></div><div class='hunk'>@@ -499,19 +499,17 @@ void ida_check_random(void)</div><div class='ctx'> 		goto repeat;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ida_simple_get_remove_test(void)</div><div class='add'>+void ida_alloc_free_test(void)</div><div class='ctx'> {</div><div class='ctx'> 	DEFINE_IDA(ida);</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 10000; i++) {</div><div class='del'>-		assert(ida_simple_get(&amp;ida, 0, 20000, GFP_KERNEL) == i);</div><div class='del'>-	}</div><div class='del'>-	assert(ida_simple_get(&amp;ida, 5, 30, GFP_KERNEL) &lt; 0);</div><div class='add'>+	for (i = 0; i &lt; 10000; i++)</div><div class='add'>+		assert(ida_alloc_max(&amp;ida, 20000, GFP_KERNEL) == i);</div><div class='add'>+	assert(ida_alloc_range(&amp;ida, 5, 30, GFP_KERNEL) &lt; 0);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 10000; i++) {</div><div class='del'>-		ida_simple_remove(&amp;ida, i);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; 10000; i++)</div><div class='add'>+		ida_free(&amp;ida, i);</div><div class='ctx'> 	assert(ida_is_empty(&amp;ida));</div><div class='ctx'> </div><div class='ctx'> 	ida_destroy(&amp;ida);</div><div class='hunk'>@@ -524,7 +522,7 @@ void user_ida_checks(void)</div><div class='ctx'> 	ida_check_nomem();</div><div class='ctx'> 	ida_check_conv_user();</div><div class='ctx'> 	ida_check_random();</div><div class='del'>-	ida_simple_get_remove_test();</div><div class='add'>+	ida_alloc_free_test();</div><div class='ctx'> </div><div class='ctx'> 	radix_tree_cpu_dead(1);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c<br/>index bc30050227fd..5c1b18e3ed21 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/radix-tree/maple.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/radix-tree/maple.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/radix-tree/maple.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/radix-tree/maple.c</a></div><div class='hunk'>@@ -8,14 +8,6 @@</div><div class='ctx'>  * difficult to handle in kernel tests.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define CONFIG_DEBUG_MAPLE_TREE</div><div class='del'>-#define CONFIG_MAPLE_SEARCH</div><div class='del'>-#define MAPLE_32BIT (MAPLE_NODE_SLOTS &gt; 31)</div><div class='del'>-#include "test.h"</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='ctx'> #define module_init(x)</div><div class='ctx'> #define module_exit(x)</div><div class='ctx'> #define MODULE_AUTHOR(x)</div><div class='hunk'>@@ -23,7 +15,9 @@</div><div class='ctx'> #define MODULE_LICENSE(x)</div><div class='ctx'> #define dump_stack()	assert(0)</div><div class='ctx'> </div><div class='del'>-#include "../../../lib/maple_tree.c"</div><div class='add'>+#include "test.h"</div><div class='add'>+</div><div class='add'>+#include "../shared/maple-shim.c"</div><div class='ctx'> #include "../../../lib/test_maple_tree.c"</div><div class='ctx'> </div><div class='ctx'> #define RCU_RANGE_COUNT 1000</div><div class='hunk'>@@ -63,430 +57,6 @@ struct rcu_reader_struct {</div><div class='ctx'> 	struct rcu_test_struct2 *test;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int get_alloc_node_count(struct ma_state *mas)</div><div class='del'>-{</div><div class='del'>-	int count = 1;</div><div class='del'>-	struct maple_alloc *node = mas-&gt;alloc;</div><div class='del'>-</div><div class='del'>-	if (!node || ((unsigned long)node &amp; 0x1))</div><div class='del'>-		return 0;</div><div class='del'>-	while (node-&gt;node_count) {</div><div class='del'>-		count += node-&gt;node_count;</div><div class='del'>-		node = node-&gt;slot[0];</div><div class='del'>-	}</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void check_mas_alloc_node_count(struct ma_state *mas)</div><div class='del'>-{</div><div class='del'>-	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 1, GFP_KERNEL);</div><div class='del'>-	mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 3, GFP_KERNEL);</div><div class='del'>-	MT_BUG_ON(mas-&gt;tree, get_alloc_node_count(mas) != mas-&gt;alloc-&gt;total);</div><div class='del'>-	mas_destroy(mas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * check_new_node() - Check the creation of new nodes and error path</div><div class='del'>- * verification.</div><div class='del'>- */</div><div class='del'>-static noinline void __init check_new_node(struct maple_tree *mt)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	struct maple_node *mn, *mn2, *mn3;</div><div class='del'>-	struct maple_alloc *smn;</div><div class='del'>-	struct maple_node *nodes[100];</div><div class='del'>-	int i, j, total;</div><div class='del'>-</div><div class='del'>-	MA_STATE(mas, mt, 0, 0);</div><div class='del'>-</div><div class='del'>-	check_mas_alloc_node_count(&amp;mas);</div><div class='del'>-</div><div class='del'>-	/* Try allocating 3 nodes */</div><div class='del'>-	mtree_lock(mt);</div><div class='del'>-	mt_set_non_kernel(0);</div><div class='del'>-	/* request 3 nodes to be allocated. */</div><div class='del'>-	mas_node_count(&amp;mas, 3);</div><div class='del'>-	/* Allocation request of 3. */</div><div class='del'>-	MT_BUG_ON(mt, mas_alloc_req(&amp;mas) != 3);</div><div class='del'>-	/* Allocate failed. */</div><div class='del'>-	MT_BUG_ON(mt, mas.node != MA_ERROR(-ENOMEM));</div><div class='del'>-	MT_BUG_ON(mt, !mas_nomem(&amp;mas, GFP_KERNEL));</div><div class='del'>-</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 3);</div><div class='del'>-	mn = mas_pop_node(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-	MT_BUG_ON(mt, mn == NULL);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc == NULL);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;slot[0] == NULL);</div><div class='del'>-	mas_push_node(&amp;mas, mn);</div><div class='del'>-	mas_reset(&amp;mas);</div><div class='del'>-	mas_destroy(&amp;mas);</div><div class='del'>-	mtree_unlock(mt);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Try allocating 1 node, then 2 more */</div><div class='del'>-	mtree_lock(mt);</div><div class='del'>-	/* Set allocation request to 1. */</div><div class='del'>-	mas_set_alloc_req(&amp;mas, 1);</div><div class='del'>-	/* Check Allocation request of 1. */</div><div class='del'>-	MT_BUG_ON(mt, mas_alloc_req(&amp;mas) != 1);</div><div class='del'>-	mas_set_err(&amp;mas, -ENOMEM);</div><div class='del'>-	/* Validate allocation request. */</div><div class='del'>-	MT_BUG_ON(mt, !mas_nomem(&amp;mas, GFP_KERNEL));</div><div class='del'>-	/* Eat the requested node. */</div><div class='del'>-	mn = mas_pop_node(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-	MT_BUG_ON(mt, mn == NULL);</div><div class='del'>-	MT_BUG_ON(mt, mn-&gt;slot[0] != NULL);</div><div class='del'>-	MT_BUG_ON(mt, mn-&gt;slot[1] != NULL);</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='del'>-</div><div class='del'>-	mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-	ma_free_rcu(mn);</div><div class='del'>-	mas.status = ma_start;</div><div class='del'>-	mas_destroy(&amp;mas);</div><div class='del'>-	/* Allocate 3 nodes, will fail. */</div><div class='del'>-	mas_node_count(&amp;mas, 3);</div><div class='del'>-	/* Drop the lock and allocate 3 nodes. */</div><div class='del'>-	mas_nomem(&amp;mas, GFP_KERNEL);</div><div class='del'>-	/* Ensure 3 are allocated. */</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 3);</div><div class='del'>-	/* Allocation request of 0. */</div><div class='del'>-	MT_BUG_ON(mt, mas_alloc_req(&amp;mas) != 0);</div><div class='del'>-</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc == NULL);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;slot[0] == NULL);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;slot[1] == NULL);</div><div class='del'>-	/* Ensure we counted 3. */</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 3);</div><div class='del'>-	/* Free. */</div><div class='del'>-	mas_reset(&amp;mas);</div><div class='del'>-	mas_destroy(&amp;mas);</div><div class='del'>-</div><div class='del'>-	/* Set allocation request to 1. */</div><div class='del'>-	mas_set_alloc_req(&amp;mas, 1);</div><div class='del'>-	MT_BUG_ON(mt, mas_alloc_req(&amp;mas) != 1);</div><div class='del'>-	mas_set_err(&amp;mas, -ENOMEM);</div><div class='del'>-	/* Validate allocation request. */</div><div class='del'>-	MT_BUG_ON(mt, !mas_nomem(&amp;mas, GFP_KERNEL));</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 1);</div><div class='del'>-	/* Check the node is only one node. */</div><div class='del'>-	mn = mas_pop_node(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='del'>-	MT_BUG_ON(mt, mn == NULL);</div><div class='del'>-	MT_BUG_ON(mt, mn-&gt;slot[0] != NULL);</div><div class='del'>-	MT_BUG_ON(mt, mn-&gt;slot[1] != NULL);</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='del'>-	mas_push_node(&amp;mas, mn);</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 1);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;node_count);</div><div class='del'>-</div><div class='del'>-	mas_set_alloc_req(&amp;mas, 2); /* request 2 more. */</div><div class='del'>-	MT_BUG_ON(mt, mas_alloc_req(&amp;mas) != 2);</div><div class='del'>-	mas_set_err(&amp;mas, -ENOMEM);</div><div class='del'>-	MT_BUG_ON(mt, !mas_nomem(&amp;mas, GFP_KERNEL));</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 3);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc == NULL);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;slot[0] == NULL);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;slot[1] == NULL);</div><div class='del'>-	for (i = 2; i &gt;= 0; i--) {</div><div class='del'>-		mn = mas_pop_node(&amp;mas);</div><div class='del'>-		MT_BUG_ON(mt, mas_allocated(&amp;mas) != i);</div><div class='del'>-		MT_BUG_ON(mt, !mn);</div><div class='del'>-		MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-		mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-		ma_free_rcu(mn);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	total = 64;</div><div class='del'>-	mas_set_alloc_req(&amp;mas, total); /* request 2 more. */</div><div class='del'>-	MT_BUG_ON(mt, mas_alloc_req(&amp;mas) != total);</div><div class='del'>-	mas_set_err(&amp;mas, -ENOMEM);</div><div class='del'>-	MT_BUG_ON(mt, !mas_nomem(&amp;mas, GFP_KERNEL));</div><div class='del'>-	for (i = total; i &gt; 0; i--) {</div><div class='del'>-		unsigned int e = 0; /* expected node_count */</div><div class='del'>-</div><div class='del'>-		if (!MAPLE_32BIT) {</div><div class='del'>-			if (i &gt;= 35)</div><div class='del'>-				e = i - 34;</div><div class='del'>-			else if (i &gt;= 5)</div><div class='del'>-				e = i - 4;</div><div class='del'>-			else if (i &gt;= 2)</div><div class='del'>-				e = i - 1;</div><div class='del'>-		} else {</div><div class='del'>-			if (i &gt;= 4)</div><div class='del'>-				e = i - 3;</div><div class='del'>-			else if (i &gt;= 1)</div><div class='del'>-				e = i - 1;</div><div class='del'>-			else</div><div class='del'>-				e = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		MT_BUG_ON(mt, mas.alloc-&gt;node_count != e);</div><div class='del'>-		mn = mas_pop_node(&amp;mas);</div><div class='del'>-		MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-		MT_BUG_ON(mt, mas_allocated(&amp;mas) != i - 1);</div><div class='del'>-		MT_BUG_ON(mt, !mn);</div><div class='del'>-		mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-		ma_free_rcu(mn);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	total = 100;</div><div class='del'>-	for (i = 1; i &lt; total; i++) {</div><div class='del'>-		mas_set_alloc_req(&amp;mas, i);</div><div class='del'>-		mas_set_err(&amp;mas, -ENOMEM);</div><div class='del'>-		MT_BUG_ON(mt, !mas_nomem(&amp;mas, GFP_KERNEL));</div><div class='del'>-		for (j = i; j &gt; 0; j--) {</div><div class='del'>-			mn = mas_pop_node(&amp;mas);</div><div class='del'>-			MT_BUG_ON(mt, mas_allocated(&amp;mas) != j - 1);</div><div class='del'>-			MT_BUG_ON(mt, !mn);</div><div class='del'>-			MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-			mas_push_node(&amp;mas, mn);</div><div class='del'>-			MT_BUG_ON(mt, mas_allocated(&amp;mas) != j);</div><div class='del'>-			mn = mas_pop_node(&amp;mas);</div><div class='del'>-			MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-			MT_BUG_ON(mt, mas_allocated(&amp;mas) != j - 1);</div><div class='del'>-			mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-			ma_free_rcu(mn);</div><div class='del'>-		}</div><div class='del'>-		MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='del'>-</div><div class='del'>-		mas_set_alloc_req(&amp;mas, i);</div><div class='del'>-		mas_set_err(&amp;mas, -ENOMEM);</div><div class='del'>-		MT_BUG_ON(mt, !mas_nomem(&amp;mas, GFP_KERNEL));</div><div class='del'>-		for (j = 0; j &lt;= i/2; j++) {</div><div class='del'>-			MT_BUG_ON(mt, mas_allocated(&amp;mas) != i - j);</div><div class='del'>-			nodes[j] = mas_pop_node(&amp;mas);</div><div class='del'>-			MT_BUG_ON(mt, mas_allocated(&amp;mas) != i - j - 1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		while (j) {</div><div class='del'>-			j--;</div><div class='del'>-			mas_push_node(&amp;mas, nodes[j]);</div><div class='del'>-			MT_BUG_ON(mt, mas_allocated(&amp;mas) != i - j);</div><div class='del'>-		}</div><div class='del'>-		MT_BUG_ON(mt, mas_allocated(&amp;mas) != i);</div><div class='del'>-		for (j = 0; j &lt;= i/2; j++) {</div><div class='del'>-			MT_BUG_ON(mt, mas_allocated(&amp;mas) != i - j);</div><div class='del'>-			mn = mas_pop_node(&amp;mas);</div><div class='del'>-			MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-			mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-			ma_free_rcu(mn);</div><div class='del'>-			MT_BUG_ON(mt, mas_allocated(&amp;mas) != i - j - 1);</div><div class='del'>-		}</div><div class='del'>-		mas_reset(&amp;mas);</div><div class='del'>-		MT_BUG_ON(mt, mas_nomem(&amp;mas, GFP_KERNEL));</div><div class='del'>-		mas_destroy(&amp;mas);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set allocation request. */</div><div class='del'>-	total = 500;</div><div class='del'>-	mas_node_count(&amp;mas, total);</div><div class='del'>-	/* Drop the lock and allocate the nodes. */</div><div class='del'>-	mas_nomem(&amp;mas, GFP_KERNEL);</div><div class='del'>-	MT_BUG_ON(mt, !mas.alloc);</div><div class='del'>-	i = 1;</div><div class='del'>-	smn = mas.alloc;</div><div class='del'>-	while (i &lt; total) {</div><div class='del'>-		for (j = 0; j &lt; MAPLE_ALLOC_SLOTS; j++) {</div><div class='del'>-			i++;</div><div class='del'>-			MT_BUG_ON(mt, !smn-&gt;slot[j]);</div><div class='del'>-			if (i == total)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		smn = smn-&gt;slot[0]; /* next. */</div><div class='del'>-	}</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != total);</div><div class='del'>-	mas_reset(&amp;mas);</div><div class='del'>-	mas_destroy(&amp;mas); /* Free. */</div><div class='del'>-</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='del'>-	for (i = 1; i &lt; 128; i++) {</div><div class='del'>-		mas_node_count(&amp;mas, i); /* Request */</div><div class='del'>-		mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-		MT_BUG_ON(mt, mas_allocated(&amp;mas) != i); /* check request filled */</div><div class='del'>-		for (j = i; j &gt; 0; j--) { /*Free the requests */</div><div class='del'>-			mn = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-			MT_BUG_ON(mt, mn == NULL);</div><div class='del'>-			MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-			mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-			ma_free_rcu(mn);</div><div class='del'>-		}</div><div class='del'>-		MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; MAPLE_NODE_MASK + 1; i++) {</div><div class='del'>-		MA_STATE(mas2, mt, 0, 0);</div><div class='del'>-		mas_node_count(&amp;mas, i); /* Request */</div><div class='del'>-		mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-		MT_BUG_ON(mt, mas_allocated(&amp;mas) != i); /* check request filled */</div><div class='del'>-		for (j = 1; j &lt;= i; j++) { /* Move the allocations to mas2 */</div><div class='del'>-			mn = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-			MT_BUG_ON(mt, mn == NULL);</div><div class='del'>-			MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-			mas_push_node(&amp;mas2, mn);</div><div class='del'>-			MT_BUG_ON(mt, mas_allocated(&amp;mas2) != j);</div><div class='del'>-		}</div><div class='del'>-		MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='del'>-		MT_BUG_ON(mt, mas_allocated(&amp;mas2) != i);</div><div class='del'>-</div><div class='del'>-		for (j = i; j &gt; 0; j--) { /*Free the requests */</div><div class='del'>-			MT_BUG_ON(mt, mas_allocated(&amp;mas2) != j);</div><div class='del'>-			mn = mas_pop_node(&amp;mas2); /* get the next node. */</div><div class='del'>-			MT_BUG_ON(mt, mn == NULL);</div><div class='del'>-			MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-			mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-			ma_free_rcu(mn);</div><div class='del'>-		}</div><div class='del'>-		MT_BUG_ON(mt, mas_allocated(&amp;mas2) != 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='del'>-	mas_node_count(&amp;mas, MAPLE_ALLOC_SLOTS + 1); /* Request */</div><div class='del'>-	MT_BUG_ON(mt, mas.node != MA_ERROR(-ENOMEM));</div><div class='del'>-	MT_BUG_ON(mt, !mas_nomem(&amp;mas, GFP_KERNEL));</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != MAPLE_ALLOC_SLOTS + 1);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;node_count != MAPLE_ALLOC_SLOTS);</div><div class='del'>-</div><div class='del'>-	mn = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-	MT_BUG_ON(mt, mn == NULL);</div><div class='del'>-	MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != MAPLE_ALLOC_SLOTS);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;node_count != MAPLE_ALLOC_SLOTS - 1);</div><div class='del'>-</div><div class='del'>-	mas_push_node(&amp;mas, mn);</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != MAPLE_ALLOC_SLOTS + 1);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;node_count != MAPLE_ALLOC_SLOTS);</div><div class='del'>-</div><div class='del'>-	/* Check the limit of pop/push/pop */</div><div class='del'>-	mas_node_count(&amp;mas, MAPLE_ALLOC_SLOTS + 2); /* Request */</div><div class='del'>-	MT_BUG_ON(mt, mas_alloc_req(&amp;mas) != 1);</div><div class='del'>-	MT_BUG_ON(mt, mas.node != MA_ERROR(-ENOMEM));</div><div class='del'>-	MT_BUG_ON(mt, !mas_nomem(&amp;mas, GFP_KERNEL));</div><div class='del'>-	MT_BUG_ON(mt, mas_alloc_req(&amp;mas));</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;node_count != 1);</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != MAPLE_ALLOC_SLOTS + 2);</div><div class='del'>-	mn = mas_pop_node(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != MAPLE_ALLOC_SLOTS + 1);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;node_count  != MAPLE_ALLOC_SLOTS);</div><div class='del'>-	mas_push_node(&amp;mas, mn);</div><div class='del'>-	MT_BUG_ON(mt, mas.alloc-&gt;node_count != 1);</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != MAPLE_ALLOC_SLOTS + 2);</div><div class='del'>-	mn = mas_pop_node(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-	mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-	ma_free_rcu(mn);</div><div class='del'>-	for (i = 1; i &lt;= MAPLE_ALLOC_SLOTS + 1; i++) {</div><div class='del'>-		mn = mas_pop_node(&amp;mas);</div><div class='del'>-		MT_BUG_ON(mt, not_empty(mn));</div><div class='del'>-		mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-		ma_free_rcu(mn);</div><div class='del'>-	}</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	for (i = 3; i &lt; MAPLE_NODE_MASK * 3; i++) {</div><div class='del'>-		mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-		mas_node_count(&amp;mas, i); /* Request */</div><div class='del'>-		mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-		mn = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-		mas_push_node(&amp;mas, mn); /* put it back */</div><div class='del'>-		mas_destroy(&amp;mas);</div><div class='del'>-</div><div class='del'>-		mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-		mas_node_count(&amp;mas, i); /* Request */</div><div class='del'>-		mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-		mn = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-		mn2 = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-		mas_push_node(&amp;mas, mn); /* put them back */</div><div class='del'>-		mas_push_node(&amp;mas, mn2);</div><div class='del'>-		mas_destroy(&amp;mas);</div><div class='del'>-</div><div class='del'>-		mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-		mas_node_count(&amp;mas, i); /* Request */</div><div class='del'>-		mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-		mn = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-		mn2 = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-		mn3 = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-		mas_push_node(&amp;mas, mn); /* put them back */</div><div class='del'>-		mas_push_node(&amp;mas, mn2);</div><div class='del'>-		mas_push_node(&amp;mas, mn3);</div><div class='del'>-		mas_destroy(&amp;mas);</div><div class='del'>-</div><div class='del'>-		mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-		mas_node_count(&amp;mas, i); /* Request */</div><div class='del'>-		mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-		mn = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-		mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-		ma_free_rcu(mn);</div><div class='del'>-		mas_destroy(&amp;mas);</div><div class='del'>-</div><div class='del'>-		mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-		mas_node_count(&amp;mas, i); /* Request */</div><div class='del'>-		mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-		mn = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-		mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-		ma_free_rcu(mn);</div><div class='del'>-		mn = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-		mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-		ma_free_rcu(mn);</div><div class='del'>-		mn = mas_pop_node(&amp;mas); /* get the next node. */</div><div class='del'>-		mn-&gt;parent = ma_parent_ptr(mn);</div><div class='del'>-		ma_free_rcu(mn);</div><div class='del'>-		mas_destroy(&amp;mas);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-	mas_node_count(&amp;mas, 5); /* Request */</div><div class='del'>-	mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 5);</div><div class='del'>-	mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-	mas_node_count(&amp;mas, 10); /* Request */</div><div class='del'>-	mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-	mas.status = ma_start;</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 10);</div><div class='del'>-	mas_destroy(&amp;mas);</div><div class='del'>-</div><div class='del'>-	mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-	mas_node_count(&amp;mas, MAPLE_ALLOC_SLOTS - 1); /* Request */</div><div class='del'>-	mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != MAPLE_ALLOC_SLOTS - 1);</div><div class='del'>-	mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-	mas_node_count(&amp;mas, 10 + MAPLE_ALLOC_SLOTS - 1); /* Request */</div><div class='del'>-	mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-	mas.status = ma_start;</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 10 + MAPLE_ALLOC_SLOTS - 1);</div><div class='del'>-	mas_destroy(&amp;mas);</div><div class='del'>-</div><div class='del'>-	mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-	mas_node_count(&amp;mas, MAPLE_ALLOC_SLOTS + 1); /* Request */</div><div class='del'>-	mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != MAPLE_ALLOC_SLOTS + 1);</div><div class='del'>-	mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-	mas_node_count(&amp;mas, MAPLE_ALLOC_SLOTS * 2 + 2); /* Request */</div><div class='del'>-	mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-	mas.status = ma_start;</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != MAPLE_ALLOC_SLOTS * 2 + 2);</div><div class='del'>-	mas_destroy(&amp;mas);</div><div class='del'>-</div><div class='del'>-	mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-	mas_node_count(&amp;mas, MAPLE_ALLOC_SLOTS * 2 + 1); /* Request */</div><div class='del'>-	mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != MAPLE_ALLOC_SLOTS * 2 + 1);</div><div class='del'>-	mas.node = MA_ERROR(-ENOMEM);</div><div class='del'>-	mas_node_count(&amp;mas, MAPLE_ALLOC_SLOTS * 3 + 2); /* Request */</div><div class='del'>-	mas_nomem(&amp;mas, GFP_KERNEL); /* Fill request */</div><div class='del'>-	mas.status = ma_start;</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != MAPLE_ALLOC_SLOTS * 3 + 2);</div><div class='del'>-	mas_destroy(&amp;mas);</div><div class='del'>-</div><div class='del'>-	mtree_unlock(mt);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Check erasing including RCU.</div><div class='ctx'>  */</div><div class='hunk'>@@ -35062,7 +34632,7 @@ void run_check_rcu_slowread(struct maple_tree *mt, struct rcu_test_struct *vals)</div><div class='ctx'> </div><div class='ctx'> 	int i;</div><div class='ctx'> 	void *(*function)(void *);</div><div class='del'>-	pthread_t readers[20];</div><div class='add'>+	pthread_t readers[30];</div><div class='ctx'> 	unsigned int index = vals-&gt;index;</div><div class='ctx'> </div><div class='ctx'> 	mt_set_in_rcu(mt);</div><div class='hunk'>@@ -35080,14 +34650,14 @@ void run_check_rcu_slowread(struct maple_tree *mt, struct rcu_test_struct *vals)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usleep(5); /* small yield to ensure all threads are at least started. */</div><div class='add'>+	usleep(3); /* small yield to ensure all threads are at least started. */</div><div class='ctx'> </div><div class='ctx'> 	while (index &lt;= vals-&gt;last) {</div><div class='ctx'> 		mtree_store(mt, index,</div><div class='ctx'> 			    (index % 2 ? vals-&gt;entry2 : vals-&gt;entry3),</div><div class='ctx'> 			    GFP_KERNEL);</div><div class='ctx'> 		index++;</div><div class='del'>-		usleep(5);</div><div class='add'>+		usleep(2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (i--)</div><div class='hunk'>@@ -35098,6 +34668,7 @@ void run_check_rcu_slowread(struct maple_tree *mt, struct rcu_test_struct *vals)</div><div class='ctx'> 	MT_BUG_ON(mt, !vals-&gt;seen_entry3);</div><div class='ctx'> 	MT_BUG_ON(mt, !vals-&gt;seen_both);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static noinline void __init check_rcu_simulated(struct maple_tree *mt)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i, nr_entries = 1000;</div><div class='hunk'>@@ -35454,17 +35025,6 @@ static void check_dfs_preorder(struct maple_tree *mt)</div><div class='ctx'> 	MT_BUG_ON(mt, count != e);</div><div class='ctx'> 	mtree_destroy(mt);</div><div class='ctx'> </div><div class='del'>-	mt_init_flags(mt, MT_FLAGS_ALLOC_RANGE);</div><div class='del'>-	mas_reset(&amp;mas);</div><div class='del'>-	mt_zero_nr_tallocated();</div><div class='del'>-	mt_set_non_kernel(200);</div><div class='del'>-	mas_expected_entries(&amp;mas, max);</div><div class='del'>-	for (count = 0; count &lt;= max; count++) {</div><div class='del'>-		mas.index = mas.last = count;</div><div class='del'>-		mas_store(&amp;mas, xa_mk_value(count));</div><div class='del'>-		MT_BUG_ON(mt, mas_is_err(&amp;mas));</div><div class='del'>-	}</div><div class='del'>-	mas_destroy(&amp;mas);</div><div class='ctx'> 	rcu_barrier();</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * pr_info(" -&gt;seq test of 0-%lu %luK in %d active (%d total)\n",</div><div class='hunk'>@@ -35475,15 +35035,77 @@ static void check_dfs_preorder(struct maple_tree *mt)</div><div class='ctx'> }</div><div class='ctx'> /* End of depth first search tests */</div><div class='ctx'> </div><div class='add'>+/* get height of the lowest non-leaf node with free space */</div><div class='add'>+static unsigned char get_vacant_height(struct ma_wr_state *wr_mas, void *entry)</div><div class='add'>+{</div><div class='add'>+	struct ma_state *mas = wr_mas-&gt;mas;</div><div class='add'>+	char vacant_height = 0;</div><div class='add'>+	enum maple_type type;</div><div class='add'>+	unsigned long *pivots;</div><div class='add'>+	unsigned long min = 0;</div><div class='add'>+	unsigned long max = ULONG_MAX;</div><div class='add'>+	unsigned char offset;</div><div class='add'>+</div><div class='add'>+	/* start traversal */</div><div class='add'>+	mas_reset(mas);</div><div class='add'>+	mas_start(mas);</div><div class='add'>+	if (!xa_is_node(mas_root(mas)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	type = mte_node_type(mas-&gt;node);</div><div class='add'>+	wr_mas-&gt;type = type;</div><div class='add'>+	while (!ma_is_leaf(type)) {</div><div class='add'>+		mas_node_walk(mas, mte_to_node(mas-&gt;node), type, &amp;min, &amp;max);</div><div class='add'>+		offset = mas-&gt;offset;</div><div class='add'>+		mas-&gt;end = mas_data_end(mas);</div><div class='add'>+		pivots = ma_pivots(mte_to_node(mas-&gt;node), type);</div><div class='add'>+</div><div class='add'>+		if (pivots) {</div><div class='add'>+			if (offset)</div><div class='add'>+				min = pivots[mas-&gt;offset - 1];</div><div class='add'>+			if (offset &lt; mas-&gt;end)</div><div class='add'>+				max = pivots[mas-&gt;offset];</div><div class='add'>+		}</div><div class='add'>+		wr_mas-&gt;r_max = offset &lt; mas-&gt;end ? pivots[offset] : mas-&gt;max;</div><div class='add'>+</div><div class='add'>+		/* detect spanning write */</div><div class='add'>+		if (mas_is_span_wr(wr_mas))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (mas-&gt;end &lt; mt_slot_count(mas-&gt;node) - 1)</div><div class='add'>+			vacant_height = mas-&gt;depth + 1;</div><div class='add'>+</div><div class='add'>+		mas_descend(mas);</div><div class='add'>+		type = mte_node_type(mas-&gt;node);</div><div class='add'>+		mas-&gt;depth++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vacant_height;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mas_allocated(struct ma_state *mas)</div><div class='add'>+{</div><div class='add'>+	int total = 0;</div><div class='add'>+</div><div class='add'>+	if (mas-&gt;alloc)</div><div class='add'>+		total++;</div><div class='add'>+</div><div class='add'>+	if (mas-&gt;sheaf)</div><div class='add'>+		total += kmem_cache_sheaf_size(mas-&gt;sheaf);</div><div class='add'>+</div><div class='add'>+	return total;</div><div class='add'>+}</div><div class='ctx'> /* Preallocation testing */</div><div class='ctx'> static noinline void __init check_prealloc(struct maple_tree *mt)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i, max = 100;</div><div class='ctx'> 	unsigned long allocated;</div><div class='ctx'> 	unsigned char height;</div><div class='add'>+	unsigned char vacant_height;</div><div class='ctx'> 	struct maple_node *mn;</div><div class='ctx'> 	void *ptr = check_prealloc;</div><div class='ctx'> 	MA_STATE(mas, mt, 10, 20);</div><div class='add'>+	MA_WR_STATE(wr_mas, &amp;mas, ptr);</div><div class='ctx'> </div><div class='ctx'> 	mt_set_non_kernel(1000);</div><div class='ctx'> 	for (i = 0; i &lt;= max; i++)</div><div class='hunk'>@@ -35491,20 +35113,26 @@ static noinline void __init check_prealloc(struct maple_tree *mt)</div><div class='ctx'> </div><div class='ctx'> 	/* Spanning store */</div><div class='ctx'> 	mas_set_range(&amp;mas, 470, 500);</div><div class='del'>-	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='add'>+</div><div class='add'>+	mas_wr_preallocate(&amp;wr_mas, ptr);</div><div class='add'>+	MT_BUG_ON(mt, mas.store_type != wr_spanning_store);</div><div class='add'>+	MT_BUG_ON(mt, mas_is_err(&amp;mas));</div><div class='ctx'> 	allocated = mas_allocated(&amp;mas);</div><div class='ctx'> 	height = mas_mt_height(&amp;mas);</div><div class='add'>+	vacant_height = get_vacant_height(&amp;wr_mas, ptr);</div><div class='ctx'> 	MT_BUG_ON(mt, allocated == 0);</div><div class='del'>-	MT_BUG_ON(mt, allocated != 1 + height * 3);</div><div class='add'>+	MT_BUG_ON(mt, allocated != 1 + (height - vacant_height) * 3);</div><div class='ctx'> 	mas_destroy(&amp;mas);</div><div class='ctx'> 	allocated = mas_allocated(&amp;mas);</div><div class='ctx'> 	MT_BUG_ON(mt, allocated != 0);</div><div class='ctx'> </div><div class='add'>+	mas_wr_preallocate(&amp;wr_mas, ptr);</div><div class='ctx'> 	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='ctx'> 	allocated = mas_allocated(&amp;mas);</div><div class='ctx'> 	height = mas_mt_height(&amp;mas);</div><div class='add'>+	vacant_height = get_vacant_height(&amp;wr_mas, ptr);</div><div class='ctx'> 	MT_BUG_ON(mt, allocated == 0);</div><div class='del'>-	MT_BUG_ON(mt, allocated != 1 + height * 3);</div><div class='add'>+	MT_BUG_ON(mt, allocated != 1 + (height - vacant_height) * 3);</div><div class='ctx'> 	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='ctx'> 	mas_destroy(&amp;mas);</div><div class='ctx'> 	allocated = mas_allocated(&amp;mas);</div><div class='hunk'>@@ -35514,7 +35142,8 @@ static noinline void __init check_prealloc(struct maple_tree *mt)</div><div class='ctx'> 	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='ctx'> 	allocated = mas_allocated(&amp;mas);</div><div class='ctx'> 	height = mas_mt_height(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, allocated != 1 + height * 3);</div><div class='add'>+	vacant_height = get_vacant_height(&amp;wr_mas, ptr);</div><div class='add'>+	MT_BUG_ON(mt, allocated != 1 + (height - vacant_height) * 3);</div><div class='ctx'> 	mn = mas_pop_node(&amp;mas);</div><div class='ctx'> 	MT_BUG_ON(mt, mas_allocated(&amp;mas) != allocated - 1);</div><div class='ctx'> 	mn-&gt;parent = ma_parent_ptr(mn);</div><div class='hunk'>@@ -35527,7 +35156,8 @@ static noinline void __init check_prealloc(struct maple_tree *mt)</div><div class='ctx'> 	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='ctx'> 	allocated = mas_allocated(&amp;mas);</div><div class='ctx'> 	height = mas_mt_height(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, allocated != 1 + height * 3);</div><div class='add'>+	vacant_height = get_vacant_height(&amp;wr_mas, ptr);</div><div class='add'>+	MT_BUG_ON(mt, allocated != 1 + (height - vacant_height) * 3);</div><div class='ctx'> 	mn = mas_pop_node(&amp;mas);</div><div class='ctx'> 	MT_BUG_ON(mt, mas_allocated(&amp;mas) != allocated - 1);</div><div class='ctx'> 	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='hunk'>@@ -35540,20 +35170,8 @@ static noinline void __init check_prealloc(struct maple_tree *mt)</div><div class='ctx'> 	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='ctx'> 	allocated = mas_allocated(&amp;mas);</div><div class='ctx'> 	height = mas_mt_height(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, allocated != 1 + height * 3);</div><div class='del'>-	mn = mas_pop_node(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != allocated - 1);</div><div class='del'>-	mas_push_node(&amp;mas, mn);</div><div class='del'>-	MT_BUG_ON(mt, mas_allocated(&amp;mas) != allocated);</div><div class='del'>-	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='del'>-	mas_destroy(&amp;mas);</div><div class='del'>-	allocated = mas_allocated(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, allocated != 0);</div><div class='del'>-</div><div class='del'>-	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='del'>-	allocated = mas_allocated(&amp;mas);</div><div class='del'>-	height = mas_mt_height(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, allocated != 1 + height * 3);</div><div class='add'>+	vacant_height = get_vacant_height(&amp;wr_mas, ptr);</div><div class='add'>+	MT_BUG_ON(mt, allocated != 1 + (height - vacant_height) * 3);</div><div class='ctx'> 	mas_store_prealloc(&amp;mas, ptr);</div><div class='ctx'> 	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='ctx'> </div><div class='hunk'>@@ -35578,7 +35196,8 @@ static noinline void __init check_prealloc(struct maple_tree *mt)</div><div class='ctx'> 	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='ctx'> 	allocated = mas_allocated(&amp;mas);</div><div class='ctx'> 	height = mas_mt_height(&amp;mas);</div><div class='del'>-	MT_BUG_ON(mt, allocated != 1 + height * 2);</div><div class='add'>+	vacant_height = get_vacant_height(&amp;wr_mas, ptr);</div><div class='add'>+	MT_BUG_ON(mt, allocated != 1 + (height - vacant_height) * 2);</div><div class='ctx'> 	mas_store_prealloc(&amp;mas, ptr);</div><div class='ctx'> 	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='ctx'> 	mt_set_non_kernel(1);</div><div class='hunk'>@@ -35595,8 +35214,14 @@ static noinline void __init check_prealloc(struct maple_tree *mt)</div><div class='ctx'> 	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='ctx'> 	allocated = mas_allocated(&amp;mas);</div><div class='ctx'> 	height = mas_mt_height(&amp;mas);</div><div class='add'>+	vacant_height = get_vacant_height(&amp;wr_mas, ptr);</div><div class='ctx'> 	MT_BUG_ON(mt, allocated == 0);</div><div class='del'>-	MT_BUG_ON(mt, allocated != 1 + height * 3);</div><div class='add'>+	/*</div><div class='add'>+	 * vacant height cannot be used to compute the number of nodes needed</div><div class='add'>+	 * as the root contains two entries which means it is on the verge of</div><div class='add'>+	 * insufficiency. The worst case full height of the tree is needed.</div><div class='add'>+	 */</div><div class='add'>+	MT_BUG_ON(mt, allocated != height * 3 + 1);</div><div class='ctx'> 	mas_store_prealloc(&amp;mas, ptr);</div><div class='ctx'> 	MT_BUG_ON(mt, mas_allocated(&amp;mas) != 0);</div><div class='ctx'> 	mas_set_range(&amp;mas, 0, 200);</div><div class='hunk'>@@ -35605,6 +35230,18 @@ static noinline void __init check_prealloc(struct maple_tree *mt)</div><div class='ctx'> 	allocated = mas_allocated(&amp;mas);</div><div class='ctx'> 	height = mas_mt_height(&amp;mas);</div><div class='ctx'> 	MT_BUG_ON(mt, allocated != 0);</div><div class='add'>+</div><div class='add'>+	/* Chaining multiple preallocations */</div><div class='add'>+	mt_set_in_rcu(mt);</div><div class='add'>+	mas_set_range(&amp;mas, 800, 805); /* Slot store, should be 0 allocations */</div><div class='add'>+	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='add'>+	allocated = mas_allocated(&amp;mas);</div><div class='add'>+	MT_BUG_ON(mt, allocated != 0);</div><div class='add'>+	mas.last = 809; /* Node store */</div><div class='add'>+	MT_BUG_ON(mt, mas_preallocate(&amp;mas, ptr, GFP_KERNEL) != 0);</div><div class='add'>+	allocated = mas_allocated(&amp;mas);</div><div class='add'>+	MT_BUG_ON(mt, allocated != 1);</div><div class='add'>+	mas_store_prealloc(&amp;mas, ptr);</div><div class='ctx'> }</div><div class='ctx'> /* End of preallocation testing */</div><div class='ctx'> </div><div class='hunk'>@@ -36248,6 +35885,50 @@ static noinline void __init check_mtree_dup(struct maple_tree *mt)</div><div class='ctx'> </div><div class='ctx'> extern void test_kmem_cache_bulk(void);</div><div class='ctx'> </div><div class='add'>+static inline void check_spanning_store_height(struct maple_tree *mt)</div><div class='add'>+{</div><div class='add'>+	int index = 0;</div><div class='add'>+	int last = 140;</div><div class='add'>+	MA_STATE(mas, mt, 0, 0);</div><div class='add'>+	mas_lock(&amp;mas);</div><div class='add'>+	while (mt_height(mt) != 3) {</div><div class='add'>+		mas_store_gfp(&amp;mas, xa_mk_value(index), GFP_KERNEL);</div><div class='add'>+		mas_set(&amp;mas, ++index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (MAPLE_32BIT)</div><div class='add'>+		last = 155; /* 32 bit higher branching factor. */</div><div class='add'>+</div><div class='add'>+	mas_set_range(&amp;mas, 90, last);</div><div class='add'>+	mas_store_gfp(&amp;mas, xa_mk_value(index), GFP_KERNEL);</div><div class='add'>+	MT_BUG_ON(mt, mas_mt_height(&amp;mas) != 2);</div><div class='add'>+	mas_unlock(&amp;mas);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test to check the path of a spanning rebalance which results in</div><div class='add'>+ * a collapse where the rebalancing of the child node leads to</div><div class='add'>+ * insufficieny in the parent node.</div><div class='add'>+ */</div><div class='add'>+static void check_collapsing_rebalance(struct maple_tree *mt)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+	MA_STATE(mas, mt, ULONG_MAX, ULONG_MAX);</div><div class='add'>+</div><div class='add'>+	/* create a height 6 tree */</div><div class='add'>+	while (mt_height(mt) &lt; 6) {</div><div class='add'>+		mtree_store_range(mt, i, i + 10, xa_mk_value(i), GFP_KERNEL);</div><div class='add'>+		i += 9;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* delete all entries one at a time, starting from the right */</div><div class='add'>+	do {</div><div class='add'>+		mas_erase(&amp;mas);</div><div class='add'>+	} while (mas_prev(&amp;mas, 0) != NULL);</div><div class='add'>+</div><div class='add'>+	mtree_unlock(mt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* callback function used for check_nomem_writer_race() */</div><div class='ctx'> static void writer2(void *maple_tree)</div><div class='ctx'> {</div><div class='hunk'>@@ -36291,11 +35972,17 @@ static void check_nomem_writer_race(struct maple_tree *mt)</div><div class='ctx'> 	check_load(mt, 6, xa_mk_value(0xC));</div><div class='ctx'> 	mtree_unlock(mt);</div><div class='ctx'> </div><div class='add'>+	mt_set_non_kernel(0);</div><div class='ctx'> 	/* test for the same race but with mas_store_gfp() */</div><div class='ctx'> 	mtree_store_range(mt, 0, 5, xa_mk_value(0xA), GFP_KERNEL);</div><div class='ctx'> 	mtree_store_range(mt, 6, 10, NULL, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	mas_set_range(&amp;mas, 0, 5);</div><div class='add'>+</div><div class='add'>+	/* setup writer 2 that will trigger the race condition */</div><div class='add'>+	mt_set_private(mt);</div><div class='add'>+	mt_set_callback(writer2);</div><div class='add'>+</div><div class='ctx'> 	mtree_lock(mt);</div><div class='ctx'> 	mas_store_gfp(&amp;mas, NULL, GFP_KERNEL);</div><div class='ctx'> </div><div class='hunk'>@@ -36313,6 +36000,7 @@ static void check_nomem_writer_race(struct maple_tree *mt)</div><div class='ctx'>   */</div><div class='ctx'> static inline int check_vma_modification(struct maple_tree *mt)</div><div class='ctx'> {</div><div class='add'>+#if defined(CONFIG_64BIT)</div><div class='ctx'> 	MA_STATE(mas, mt, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	mtree_lock(mt);</div><div class='hunk'>@@ -36336,30 +36024,11 @@ static inline int check_vma_modification(struct maple_tree *mt)</div><div class='ctx'> </div><div class='ctx'> 	mas_destroy(&amp;mas);</div><div class='ctx'> 	mtree_unlock(mt);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * test to check that bulk stores do not use wr_rebalance as the store</div><div class='del'>- * type.</div><div class='del'>- */</div><div class='del'>-static inline void check_bulk_rebalance(struct maple_tree *mt)</div><div class='del'>-{</div><div class='del'>-	MA_STATE(mas, mt, ULONG_MAX, ULONG_MAX);</div><div class='del'>-	int max = 10;</div><div class='del'>-</div><div class='del'>-	build_full_tree(mt, 0, 2);</div><div class='del'>-</div><div class='del'>-	/* erase every entry in the tree */</div><div class='del'>-	do {</div><div class='del'>-		/* set up bulk store mode */</div><div class='del'>-		mas_expected_entries(&amp;mas, max);</div><div class='del'>-		mas_erase(&amp;mas);</div><div class='del'>-		MT_BUG_ON(mt, mas.store_type == wr_rebalance);</div><div class='del'>-	} while (mas_prev(&amp;mas, 0) != NULL);</div><div class='del'>-</div><div class='del'>-	mas_destroy(&amp;mas);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> void farmer_tests(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -36372,10 +36041,6 @@ void farmer_tests(void)</div><div class='ctx'> 	check_vma_modification(&amp;tree);</div><div class='ctx'> 	mtree_destroy(&amp;tree);</div><div class='ctx'> </div><div class='del'>-	mt_init(&amp;tree);</div><div class='del'>-	check_bulk_rebalance(&amp;tree);</div><div class='del'>-	mtree_destroy(&amp;tree);</div><div class='del'>-</div><div class='ctx'> 	tree.ma_root = xa_mk_value(0);</div><div class='ctx'> 	mt_dump(&amp;tree, mt_dump_dec);</div><div class='ctx'> </div><div class='hunk'>@@ -36415,6 +36080,14 @@ void farmer_tests(void)</div><div class='ctx'> 	mtree_destroy(&amp;tree);</div><div class='ctx'> </div><div class='ctx'> 	mt_init_flags(&amp;tree, MT_FLAGS_ALLOC_RANGE);</div><div class='add'>+	check_spanning_store_height(&amp;tree);</div><div class='add'>+	mtree_destroy(&amp;tree);</div><div class='add'>+</div><div class='add'>+	mt_init_flags(&amp;tree, MT_FLAGS_ALLOC_RANGE);</div><div class='add'>+	check_collapsing_rebalance(&amp;tree);</div><div class='add'>+	mtree_destroy(&amp;tree);</div><div class='add'>+</div><div class='add'>+	mt_init_flags(&amp;tree, MT_FLAGS_ALLOC_RANGE);</div><div class='ctx'> 	check_null_expand(&amp;tree);</div><div class='ctx'> 	mtree_destroy(&amp;tree);</div><div class='ctx'> </div><div class='hunk'>@@ -36427,10 +36100,6 @@ void farmer_tests(void)</div><div class='ctx'> 	check_erase_testset(&amp;tree);</div><div class='ctx'> 	mtree_destroy(&amp;tree);</div><div class='ctx'> </div><div class='del'>-	mt_init_flags(&amp;tree, 0);</div><div class='del'>-	check_new_node(&amp;tree);</div><div class='del'>-	mtree_destroy(&amp;tree);</div><div class='del'>-</div><div class='ctx'> 	if (!MAPLE_32BIT) {</div><div class='ctx'> 		mt_init_flags(&amp;tree, MT_FLAGS_ALLOC_RANGE);</div><div class='ctx'> 		check_rcu_simulated(&amp;tree);</div><div class='head'>diff --git a/tools/testing/rbtree/Makefile b/tools/testing/rbtree/Makefile<br/>new file mode 100644<br/>index 000000000000..d7bbae2af4c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/rbtree/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/rbtree/Makefile</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+.PHONY: clean</div><div class='add'>+</div><div class='add'>+TARGETS = rbtree_test interval_tree_test</div><div class='add'>+OFILES = $(SHARED_OFILES) rbtree-shim.o interval_tree-shim.o maple-shim.o</div><div class='add'>+DEPS = ../../../include/linux/rbtree.h \</div><div class='add'>+	../../../include/linux/rbtree_types.h \</div><div class='add'>+	../../../include/linux/rbtree_augmented.h \</div><div class='add'>+	../../../include/linux/interval_tree.h \</div><div class='add'>+	../../../include/linux/interval_tree_generic.h \</div><div class='add'>+	../../../lib/rbtree.c \</div><div class='add'>+	../../../lib/interval_tree.c</div><div class='add'>+</div><div class='add'>+targets: $(TARGETS)</div><div class='add'>+</div><div class='add'>+include ../shared/shared.mk</div><div class='add'>+</div><div class='add'>+ifeq ($(DEBUG), 1)</div><div class='add'>+	CFLAGS += -g</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+$(TARGETS):	$(OFILES)</div><div class='add'>+</div><div class='add'>+rbtree-shim.o: $(DEPS)</div><div class='add'>+rbtree_test.o:  ../../../lib/rbtree_test.c</div><div class='add'>+interval_tree-shim.o: $(DEPS)</div><div class='add'>+interval_tree-shim.o: CFLAGS += -DCONFIG_INTERVAL_TREE_SPAN_ITER</div><div class='add'>+interval_tree_test.o: 	../../../lib/interval_tree_test.c</div><div class='add'>+interval_tree_test.o: CFLAGS += -DCONFIG_INTERVAL_TREE_SPAN_ITER</div><div class='add'>+</div><div class='add'>+clean:</div><div class='add'>+	$(RM) $(TARGETS) *.o radix-tree.c idr.c generated/*</div><div class='head'>diff --git a/tools/testing/rbtree/interval_tree_test.c b/tools/testing/rbtree/interval_tree_test.c<br/>new file mode 100644<br/>index 000000000000..49bc5b534330<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/rbtree/interval_tree_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/rbtree/interval_tree_test.c</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * interval_tree.c: Userspace Interval Tree test-suite</div><div class='add'>+ * Copyright (c) 2025 Wei Yang &lt;richard.weiyang@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/math64.h&gt;</div><div class='add'>+#include &lt;linux/kern_levels.h&gt;</div><div class='add'>+#include "shared.h"</div><div class='add'>+#include "maple-shared.h"</div><div class='add'>+</div><div class='add'>+#include "../../../lib/interval_tree_test.c"</div><div class='add'>+</div><div class='add'>+int usage(void)</div><div class='add'>+{</div><div class='add'>+	fprintf(stderr, "Userland interval tree test cases\n");</div><div class='add'>+	fprintf(stderr, "  -n: Number of nodes in the interval tree\n");</div><div class='add'>+	fprintf(stderr, "  -p: Number of iterations modifying the tree\n");</div><div class='add'>+	fprintf(stderr, "  -q: Number of searches to the interval tree\n");</div><div class='add'>+	fprintf(stderr, "  -s: Number of iterations searching the tree\n");</div><div class='add'>+	fprintf(stderr, "  -a: Searches will iterate all nodes in the tree\n");</div><div class='add'>+	fprintf(stderr, "  -m: Largest value for the interval's endpoint\n");</div><div class='add'>+	fprintf(stderr, "  -r: Random seed\n");</div><div class='add'>+	exit(-1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void interval_tree_tests(void)</div><div class='add'>+{</div><div class='add'>+	interval_tree_test_init();</div><div class='add'>+	interval_tree_test_exit();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char **argv)</div><div class='add'>+{</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	while ((opt = getopt(argc, argv, "n:p:q:s:am:r:")) != -1) {</div><div class='add'>+		if (opt == 'n')</div><div class='add'>+			nnodes = strtoul(optarg, NULL, 0);</div><div class='add'>+		else if (opt == 'p')</div><div class='add'>+			perf_loops = strtoul(optarg, NULL, 0);</div><div class='add'>+		else if (opt == 'q')</div><div class='add'>+			nsearches = strtoul(optarg, NULL, 0);</div><div class='add'>+		else if (opt == 's')</div><div class='add'>+			search_loops = strtoul(optarg, NULL, 0);</div><div class='add'>+		else if (opt == 'a')</div><div class='add'>+			search_all = true;</div><div class='add'>+		else if (opt == 'm')</div><div class='add'>+			max_endpoint = strtoul(optarg, NULL, 0);</div><div class='add'>+		else if (opt == 'r')</div><div class='add'>+			seed = strtoul(optarg, NULL, 0);</div><div class='add'>+		else</div><div class='add'>+			usage();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	maple_tree_init();</div><div class='add'>+	interval_tree_tests();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/rbtree/rbtree_test.c b/tools/testing/rbtree/rbtree_test.c<br/>new file mode 100644<br/>index 000000000000..585c970f679e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/rbtree/rbtree_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/rbtree/rbtree_test.c</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * rbtree_test.c: Userspace Red Black Tree test-suite</div><div class='add'>+ * Copyright (c) 2025 Wei Yang &lt;richard.weiyang@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/math64.h&gt;</div><div class='add'>+#include &lt;linux/kern_levels.h&gt;</div><div class='add'>+#include "shared.h"</div><div class='add'>+</div><div class='add'>+#include "../../../lib/rbtree_test.c"</div><div class='add'>+</div><div class='add'>+int usage(void)</div><div class='add'>+{</div><div class='add'>+	fprintf(stderr, "Userland rbtree test cases\n");</div><div class='add'>+	fprintf(stderr, "  -n: Number of nodes in the rb-tree\n");</div><div class='add'>+	fprintf(stderr, "  -p: Number of iterations modifying the rb-tree\n");</div><div class='add'>+	fprintf(stderr, "  -c: Number of iterations modifying and verifying the rb-tree\n");</div><div class='add'>+	fprintf(stderr, "  -r: Random seed\n");</div><div class='add'>+	exit(-1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rbtree_tests(void)</div><div class='add'>+{</div><div class='add'>+	rbtree_test_init();</div><div class='add'>+	rbtree_test_exit();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char **argv)</div><div class='add'>+{</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	while ((opt = getopt(argc, argv, "n:p:c:r:")) != -1) {</div><div class='add'>+		if (opt == 'n')</div><div class='add'>+			nnodes = strtoul(optarg, NULL, 0);</div><div class='add'>+		else if (opt == 'p')</div><div class='add'>+			perf_loops = strtoul(optarg, NULL, 0);</div><div class='add'>+		else if (opt == 'c')</div><div class='add'>+			check_loops = strtoul(optarg, NULL, 0);</div><div class='add'>+		else if (opt == 'r')</div><div class='add'>+			seed = strtoul(optarg, NULL, 0);</div><div class='add'>+		else</div><div class='add'>+			usage();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rbtree_tests();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/rbtree/test.h b/tools/testing/rbtree/test.h<br/>new file mode 100644<br/>index 000000000000..f1f1b545b55a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/rbtree/test.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/rbtree/test.h</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+void rbtree_tests(void);</div><div class='add'>+void interval_tree_tests(void);</div><div class='head'>diff --git a/tools/testing/scatterlist/linux/mm.h b/tools/testing/scatterlist/linux/mm.h<br/>index 5bd9e6e80625..121ae78d6e88 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/scatterlist/linux/mm.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/scatterlist/linux/mm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/scatterlist/linux/mm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/scatterlist/linux/mm.h</a></div><div class='hunk'>@@ -51,7 +51,6 @@ static inline unsigned long page_to_phys(struct page *page)</div><div class='ctx'> </div><div class='ctx'> #define page_to_pfn(page) ((unsigned long)(page) / PAGE_SIZE)</div><div class='ctx'> #define pfn_to_page(pfn) (void *)((pfn) * PAGE_SIZE)</div><div class='del'>-#define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n))</div><div class='ctx'> </div><div class='ctx'> #define __min(t1, t2, min1, min2, x, y) ({              \</div><div class='ctx'> 	t1 min1 = (x);                                  \</div><div class='head'>diff --git a/tools/testing/selftests/.gitignore b/tools/testing/selftests/.gitignore<br/>index cb24124ac5b9..674aaa02e396 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/.gitignore?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/.gitignore</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/.gitignore</a></div><div class='hunk'>@@ -4,7 +4,6 @@ gpiogpio-hammer</div><div class='ctx'> gpioinclude/</div><div class='ctx'> gpiolsgpio</div><div class='ctx'> kselftest_install/</div><div class='del'>-tpm2/SpaceTest.log</div><div class='ctx'> </div><div class='ctx'> # Python bytecode and cache</div><div class='ctx'> __pycache__/</div><div class='head'>diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile<br/>index 8daac70c2f9d..56e44a98d6a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/Makefile</a></div><div class='hunk'>@@ -35,6 +35,8 @@ TARGETS += filesystems/epoll</div><div class='ctx'> TARGETS += filesystems/fat</div><div class='ctx'> TARGETS += filesystems/overlayfs</div><div class='ctx'> TARGETS += filesystems/statmount</div><div class='add'>+TARGETS += filesystems/mount-notify</div><div class='add'>+TARGETS += filesystems/fuse</div><div class='ctx'> TARGETS += firmware</div><div class='ctx'> TARGETS += fpu</div><div class='ctx'> TARGETS += ftrace</div><div class='hunk'>@@ -47,10 +49,12 @@ TARGETS += ipc</div><div class='ctx'> TARGETS += ir</div><div class='ctx'> TARGETS += kcmp</div><div class='ctx'> TARGETS += kexec</div><div class='add'>+TARGETS += kselftest_harness</div><div class='ctx'> TARGETS += kvm</div><div class='ctx'> TARGETS += landlock</div><div class='ctx'> TARGETS += lib</div><div class='ctx'> TARGETS += livepatch</div><div class='add'>+TARGETS += liveupdate</div><div class='ctx'> TARGETS += lkdtm</div><div class='ctx'> TARGETS += lsm</div><div class='ctx'> TARGETS += membarrier</div><div class='hunk'>@@ -61,17 +65,21 @@ TARGETS += mount</div><div class='ctx'> TARGETS += mount_setattr</div><div class='ctx'> TARGETS += move_mount_set_group</div><div class='ctx'> TARGETS += mqueue</div><div class='add'>+TARGETS += mseal_system_mappings</div><div class='ctx'> TARGETS += nci</div><div class='ctx'> TARGETS += net</div><div class='ctx'> TARGETS += net/af_unix</div><div class='add'>+TARGETS += net/can</div><div class='ctx'> TARGETS += net/forwarding</div><div class='ctx'> TARGETS += net/hsr</div><div class='ctx'> TARGETS += net/mptcp</div><div class='ctx'> TARGETS += net/netfilter</div><div class='ctx'> TARGETS += net/openvswitch</div><div class='add'>+TARGETS += net/ovpn</div><div class='ctx'> TARGETS += net/packetdrill</div><div class='ctx'> TARGETS += net/rds</div><div class='ctx'> TARGETS += net/tcp_ao</div><div class='add'>+TARGETS += nolibc</div><div class='ctx'> TARGETS += nsfs</div><div class='ctx'> TARGETS += pci_endpoint</div><div class='ctx'> TARGETS += pcie_bwctrl</div><div class='hunk'>@@ -113,11 +121,14 @@ endif</div><div class='ctx'> TARGETS += tmpfs</div><div class='ctx'> TARGETS += tpm2</div><div class='ctx'> TARGETS += tty</div><div class='add'>+TARGETS += ublk</div><div class='ctx'> TARGETS += uevent</div><div class='ctx'> TARGETS += user_events</div><div class='ctx'> TARGETS += vDSO</div><div class='ctx'> TARGETS += mm</div><div class='add'>+TARGETS += vfio</div><div class='ctx'> TARGETS += x86</div><div class='add'>+TARGETS += x86/bugs</div><div class='ctx'> TARGETS += zram</div><div class='ctx'> #Please keep the TARGETS list alphabetically sorted</div><div class='ctx'> # Run "make quicktest=1 run_tests" or</div><div class='hunk'>@@ -198,7 +209,7 @@ export KHDR_INCLUDES</div><div class='ctx'> </div><div class='ctx'> all:</div><div class='ctx'> 	@ret=1;							\</div><div class='del'>-	for TARGET in $(TARGETS); do				\</div><div class='add'>+	for TARGET in $(TARGETS) $(INSTALL_DEP_TARGETS); do	\</div><div class='ctx'> 		BUILD_TARGET=$$BUILD/$$TARGET;			\</div><div class='ctx'> 		mkdir $$BUILD_TARGET  -p;			\</div><div class='ctx'> 		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET	\</div><div class='hunk'>@@ -286,6 +297,14 @@ ifdef INSTALL_PATH</div><div class='ctx'> 		$(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET COLLECTION=$$TARGET \</div><div class='ctx'> 			-C $$TARGET emit_tests &gt;&gt; $(TEST_LIST); \</div><div class='ctx'> 	done;</div><div class='add'>+	@VERSION=$$(git describe HEAD 2&gt;/dev/null); \</div><div class='add'>+	if [ -n "$$VERSION" ]; then \</div><div class='add'>+		echo "$$VERSION" &gt; $(INSTALL_PATH)/VERSION; \</div><div class='add'>+		printf "Version saved to $(INSTALL_PATH)/VERSION\n"; \</div><div class='add'>+	else \</div><div class='add'>+		printf "Unable to get version from git describe\n"; \</div><div class='add'>+	fi</div><div class='add'>+	@echo "**Kselftest Installation is complete: $(INSTALL_PATH)**"</div><div class='ctx'> else</div><div class='ctx'> 	$(error Error: set INSTALL_PATH to use install)</div><div class='ctx'> endif</div><div class='hunk'>@@ -298,7 +317,7 @@ gen_tar: install</div><div class='ctx'> 	@echo "Created ${TAR_PATH}"</div><div class='ctx'> </div><div class='ctx'> clean:</div><div class='del'>-	@for TARGET in $(TARGETS); do \</div><div class='add'>+	@for TARGET in $(TARGETS) $(INSTALL_DEP_TARGETS); do \</div><div class='ctx'> 		BUILD_TARGET=$$BUILD/$$TARGET;	\</div><div class='ctx'> 		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\</div><div class='ctx'> 	done;</div><div class='head'>diff --git a/tools/testing/selftests/acct/acct_syscall.c b/tools/testing/selftests/acct/acct_syscall.c<br/>index 87c044fb9293..421adbdc299d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/acct/acct_syscall.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/acct/acct_syscall.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/acct/acct_syscall.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/acct/acct_syscall.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> int main(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/alsa/conf.c b/tools/testing/selftests/alsa/conf.c<br/>index e2b3a5810f47..317212078e36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/alsa/conf.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/alsa/conf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/alsa/conf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/alsa/conf.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;regex.h&gt;</div><div class='ctx'> #include &lt;sys/stat.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "alsa-local.h"</div><div class='ctx'> </div><div class='ctx'> #define SYSFS_ROOT "/sys"</div><div class='hunk'>@@ -448,7 +448,7 @@ int conf_get_bool(snd_config_t *root, const char *key1, const char *key2, int de</div><div class='ctx'> 		ksft_exit_fail_msg("key '%s'.'%s' search error: %s\n", key1, key2, snd_strerror(ret));</div><div class='ctx'> 	ret = snd_config_get_bool(cfg);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		ksft_exit_fail_msg("key '%s'.'%s' is not an bool\n", key1, key2);</div><div class='add'>+		ksft_exit_fail_msg("key '%s'.'%s' is not a bool\n", key1, key2);</div><div class='ctx'> 	return !!ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c<br/>index 2a4b2662035e..d4f845c32804 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/alsa/mixer-test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/alsa/mixer-test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/alsa/mixer-test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/alsa/mixer-test.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;poll.h&gt;</div><div class='ctx'> #include &lt;stdint.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "alsa-local.h"</div><div class='ctx'> </div><div class='ctx'> #define TESTS_PER_CONTROL 7</div><div class='hunk'>@@ -53,10 +53,10 @@ struct ctl_data {</div><div class='ctx'> 	struct ctl_data *next;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int num_cards = 0;</div><div class='del'>-int num_controls = 0;</div><div class='del'>-struct card_data *card_list = NULL;</div><div class='del'>-struct ctl_data *ctl_list = NULL;</div><div class='add'>+int num_cards;</div><div class='add'>+int num_controls;</div><div class='add'>+struct card_data *card_list;</div><div class='add'>+struct ctl_data *ctl_list;</div><div class='ctx'> </div><div class='ctx'> static void find_controls(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/alsa/pcm-test.c b/tools/testing/selftests/alsa/pcm-test.c<br/>index dbd7c222ce93..ee04ccef7d7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/alsa/pcm-test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/alsa/pcm-test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/alsa/pcm-test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/alsa/pcm-test.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;assert.h&gt;</div><div class='ctx'> #include &lt;pthread.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "alsa-local.h"</div><div class='ctx'> </div><div class='ctx'> typedef struct timespec timestamp_t;</div><div class='hunk'>@@ -30,7 +30,7 @@ struct card_data {</div><div class='ctx'> 	struct card_data *next;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct card_data *card_list = NULL;</div><div class='add'>+struct card_data *card_list;</div><div class='ctx'> </div><div class='ctx'> struct pcm_data {</div><div class='ctx'> 	snd_pcm_t *handle;</div><div class='hunk'>@@ -43,10 +43,10 @@ struct pcm_data {</div><div class='ctx'> 	struct pcm_data *next;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct pcm_data *pcm_list = NULL;</div><div class='add'>+struct pcm_data *pcm_list;</div><div class='ctx'> </div><div class='del'>-int num_missing = 0;</div><div class='del'>-struct pcm_data *pcm_missing = NULL;</div><div class='add'>+int num_missing;</div><div class='add'>+struct pcm_data *pcm_missing;</div><div class='ctx'> </div><div class='ctx'> snd_config_t *default_pcm_config;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/alsa/test-pcmtest-driver.c b/tools/testing/selftests/alsa/test-pcmtest-driver.c<br/>index ca81afa4ee90..95065ef3b441 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/alsa/test-pcmtest-driver.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/alsa/test-pcmtest-driver.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/alsa/test-pcmtest-driver.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/alsa/test-pcmtest-driver.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;alsa/asoundlib.h&gt;</div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> #define CH_NUM 4</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/alsa/utimer-test.c b/tools/testing/selftests/alsa/utimer-test.c<br/>index 32ee3ce57721..c45cb226bd8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/alsa/utimer-test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/alsa/utimer-test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/alsa/utimer-test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/alsa/utimer-test.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Ivan Orlov &lt;ivan.orlov0322@gmail.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> #include &lt;sound/asound.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='hunk'>@@ -135,6 +135,7 @@ TEST_F(timer_f, utimer) {</div><div class='ctx'> 	pthread_join(ticking_thread, NULL);</div><div class='ctx'> 	ASSERT_EQ(total_ticks, TICKS_COUNT);</div><div class='ctx'> 	pclose(rfp);</div><div class='add'>+	free(buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> TEST(wrong_timers_test) {</div><div class='head'>diff --git a/tools/testing/selftests/arm64/Makefile b/tools/testing/selftests/arm64/Makefile<br/>index 22029e60eff3..c4c72ee2ef55 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/Makefile</a></div><div class='hunk'>@@ -21,6 +21,8 @@ CFLAGS += $(KHDR_INCLUDES)</div><div class='ctx'> </div><div class='ctx'> CFLAGS += -I$(top_srcdir)/tools/include</div><div class='ctx'> </div><div class='add'>+OUTPUT ?= $(CURDIR)</div><div class='add'>+</div><div class='ctx'> export CFLAGS</div><div class='ctx'> export top_srcdir</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/arm64/abi/Makefile b/tools/testing/selftests/arm64/abi/Makefile<br/>index a6d30c620908..483488f8c2ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/abi/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/abi/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/abi/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/abi/Makefile</a></div><div class='hunk'>@@ -12,4 +12,4 @@ $(OUTPUT)/syscall-abi: syscall-abi.c syscall-abi-asm.S</div><div class='ctx'> $(OUTPUT)/tpidr2: tpidr2.c</div><div class='ctx'> 	$(CC) -fno-asynchronous-unwind-tables -fno-ident -s -Os -nostdlib \</div><div class='ctx'> 		-static -include ../../../../include/nolibc/nolibc.h \</div><div class='del'>-		-ffreestanding -Wall $^ -o $@ -lgcc</div><div class='add'>+		-I../.. -ffreestanding -Wall $^ -o $@ -lgcc</div><div class='head'>diff --git a/tools/testing/selftests/arm64/abi/hwcap.c b/tools/testing/selftests/arm64/abi/hwcap.c<br/>index 35f521e5f41c..c41640f18e4e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/abi/hwcap.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/abi/hwcap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/abi/hwcap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/abi/hwcap.c</a></div><div class='hunk'>@@ -17,10 +17,16 @@</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include &lt;linux/auxvec.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define TESTS_PER_HWCAP 3</div><div class='ctx'> </div><div class='add'>+#ifndef AT_HWCAP3</div><div class='add'>+#define AT_HWCAP3 29</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Function expected to generate exception when the feature is not</div><div class='ctx'>  * supported and return when it is supported. If the specific exception</div><div class='hunk'>@@ -51,7 +57,6 @@ static void cmpbr_sigill(void)</div><div class='ctx'> 	/* Not implemented, too complicated and unreliable anyway */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void crc32_sigill(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* CRC32W W0, W0, W1 */</div><div class='hunk'>@@ -165,6 +170,18 @@ static void lse128_sigill(void)</div><div class='ctx'> 		     : "cc", "memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void lsfe_sigill(void)</div><div class='add'>+{</div><div class='add'>+	float __attribute__ ((aligned (16))) mem;</div><div class='add'>+	register float *memp asm ("x0") = &amp;mem;</div><div class='add'>+</div><div class='add'>+	/* STFADD H0, [X0] */</div><div class='add'>+	asm volatile(".inst 0x7c20801f"</div><div class='add'>+		     : "+r" (memp)</div><div class='add'>+		     :</div><div class='add'>+		     : "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void lut_sigill(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* LUTI2 V0.16B, { V0.16B }, V[0] */</div><div class='hunk'>@@ -759,6 +776,13 @@ static const struct hwcap_data {</div><div class='ctx'> 		.sigill_fn = lse128_sigill,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.name = "LSFE",</div><div class='add'>+		.at_hwcap = AT_HWCAP3,</div><div class='add'>+		.hwcap_bit = HWCAP3_LSFE,</div><div class='add'>+		.cpuinfo = "lsfe",</div><div class='add'>+		.sigill_fn = lsfe_sigill,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.name = "LUT",</div><div class='ctx'> 		.at_hwcap = AT_HWCAP2,</div><div class='ctx'> 		.hwcap_bit = HWCAP2_LUT,</div><div class='hunk'>@@ -1098,6 +1122,18 @@ static const struct hwcap_data {</div><div class='ctx'> 		.sigill_fn = hbc_sigill,</div><div class='ctx'> 		.sigill_reliable = true,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.name = "MTE_FAR",</div><div class='add'>+		.at_hwcap = AT_HWCAP3,</div><div class='add'>+		.hwcap_bit = HWCAP3_MTE_FAR,</div><div class='add'>+		.cpuinfo = "mtefar",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "MTE_STOREONLY",</div><div class='add'>+		.at_hwcap = AT_HWCAP3,</div><div class='add'>+		.hwcap_bit = HWCAP3_MTE_STORE_ONLY,</div><div class='add'>+		.cpuinfo = "mtestoreonly",</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef void (*sighandler_fn)(int, siginfo_t *, void *);</div><div class='head'>diff --git a/tools/testing/selftests/arm64/abi/ptrace.c b/tools/testing/selftests/arm64/abi/ptrace.c<br/>index b51d21f78cf9..0e46ac21c81d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/abi/ptrace.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/abi/ptrace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/abi/ptrace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/abi/ptrace.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define EXPECTED_TESTS 11</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/arm64/abi/syscall-abi.c b/tools/testing/selftests/arm64/abi/syscall-abi.c<br/>index 5ec9a18ec802..b67e3e26fa6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/abi/syscall-abi.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/abi/syscall-abi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/abi/syscall-abi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/abi/syscall-abi.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #include "syscall-abi.h"</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/arm64/abi/tpidr2.c b/tools/testing/selftests/arm64/abi/tpidr2.c<br/>index 285c47dd42f6..1703543fb7c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/abi/tpidr2.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/abi/tpidr2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/abi/tpidr2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/abi/tpidr2.c</a></div><div class='hunk'>@@ -3,31 +3,12 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "kselftest.h"</div><div class='add'>+</div><div class='ctx'> #define SYS_TPIDR2 "S3_3_C13_C0_5"</div><div class='ctx'> </div><div class='ctx'> #define EXPECTED_TESTS 5</div><div class='ctx'> </div><div class='del'>-static void putstr(const char *str)</div><div class='del'>-{</div><div class='del'>-	write(1, str, strlen(str));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void putnum(unsigned int num)</div><div class='del'>-{</div><div class='del'>-	char c;</div><div class='del'>-</div><div class='del'>-	if (num / 10)</div><div class='del'>-		putnum(num / 10);</div><div class='del'>-</div><div class='del'>-	c = '0' + (num % 10);</div><div class='del'>-	write(1, &amp;c, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tests_run;</div><div class='del'>-static int tests_passed;</div><div class='del'>-static int tests_failed;</div><div class='del'>-static int tests_skipped;</div><div class='del'>-</div><div class='ctx'> static void set_tpidr2(uint64_t val)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -50,20 +31,6 @@ static uint64_t get_tpidr2(void)</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void print_summary(void)</div><div class='del'>-{</div><div class='del'>-	if (tests_passed + tests_failed + tests_skipped != EXPECTED_TESTS)</div><div class='del'>-		putstr("# UNEXPECTED TEST COUNT: ");</div><div class='del'>-</div><div class='del'>-	putstr("# Totals: pass:");</div><div class='del'>-	putnum(tests_passed);</div><div class='del'>-	putstr(" fail:");</div><div class='del'>-	putnum(tests_failed);</div><div class='del'>-	putstr(" xfail:0 xpass:0 skip:");</div><div class='del'>-	putnum(tests_skipped);</div><div class='del'>-	putstr(" error:0\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Processes should start with TPIDR2 == 0 */</div><div class='ctx'> static int default_value(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -105,9 +72,8 @@ static int write_fork_read(void)</div><div class='ctx'> 	if (newpid == 0) {</div><div class='ctx'> 		/* In child */</div><div class='ctx'> 		if (get_tpidr2() != oldpid) {</div><div class='del'>-			putstr("# TPIDR2 changed in child: ");</div><div class='del'>-			putnum(get_tpidr2());</div><div class='del'>-			putstr("\n");</div><div class='add'>+			ksft_print_msg("TPIDR2 changed in child: %llx\n",</div><div class='add'>+				       get_tpidr2());</div><div class='ctx'> 			exit(0);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -115,14 +81,12 @@ static int write_fork_read(void)</div><div class='ctx'> 		if (get_tpidr2() == getpid()) {</div><div class='ctx'> 			exit(1);</div><div class='ctx'> 		} else {</div><div class='del'>-			putstr("# Failed to set TPIDR2 in child\n");</div><div class='add'>+			ksft_print_msg("Failed to set TPIDR2 in child\n");</div><div class='ctx'> 			exit(0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (newpid &lt; 0) {</div><div class='del'>-		putstr("# fork() failed: -");</div><div class='del'>-		putnum(-newpid);</div><div class='del'>-		putstr("\n");</div><div class='add'>+		ksft_print_msg("fork() failed: %d\n", newpid);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -132,23 +96,22 @@ static int write_fork_read(void)</div><div class='ctx'> 		if (waiting &lt; 0) {</div><div class='ctx'> 			if (errno == EINTR)</div><div class='ctx'> 				continue;</div><div class='del'>-			putstr("# waitpid() failed: ");</div><div class='del'>-			putnum(errno);</div><div class='del'>-			putstr("\n");</div><div class='add'>+			ksft_print_msg("waitpid() failed: %d\n", errno);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (waiting != newpid) {</div><div class='del'>-			putstr("# waitpid() returned wrong PID\n");</div><div class='add'>+			ksft_print_msg("waitpid() returned wrong PID: %d != %d\n",</div><div class='add'>+				       waiting, newpid);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!WIFEXITED(status)) {</div><div class='del'>-			putstr("# child did not exit\n");</div><div class='add'>+			ksft_print_msg("child did not exit\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (getpid() != get_tpidr2()) {</div><div class='del'>-			putstr("# TPIDR2 corrupted in parent\n");</div><div class='add'>+			ksft_print_msg("TPIDR2 corrupted in parent\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -169,8 +132,10 @@ static int sys_clone(unsigned long clone_flags, unsigned long newsp,</div><div class='ctx'> 			   child_tidptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define __STACK_SIZE (8 * 1024 * 1024)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * If we clone with CLONE_SETTLS then the value in the parent should</div><div class='add'>+ * If we clone with CLONE_VM then the value in the parent should</div><div class='ctx'>  * be unchanged and the child should start with zero and be able to</div><div class='ctx'>  * set its own value.</div><div class='ctx'>  */</div><div class='hunk'>@@ -179,63 +144,65 @@ static int write_clone_read(void)</div><div class='ctx'> 	int parent_tid, child_tid;</div><div class='ctx'> 	pid_t parent, waiting;</div><div class='ctx'> 	int ret, status;</div><div class='add'>+	void *stack;</div><div class='ctx'> </div><div class='ctx'> 	parent = getpid();</div><div class='ctx'> 	set_tpidr2(parent);</div><div class='ctx'> </div><div class='del'>-	ret = sys_clone(CLONE_SETTLS, 0, &amp;parent_tid, 0, &amp;child_tid);</div><div class='add'>+	stack = malloc(__STACK_SIZE);</div><div class='add'>+	if (!stack) {</div><div class='add'>+		ksft_print_msg("malloc() failed\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = sys_clone(CLONE_VM, (unsigned long)stack + __STACK_SIZE,</div><div class='add'>+			&amp;parent_tid, 0, &amp;child_tid);</div><div class='ctx'> 	if (ret == -1) {</div><div class='del'>-		putstr("# clone() failed\n");</div><div class='del'>-		putnum(errno);</div><div class='del'>-		putstr("\n");</div><div class='add'>+		ksft_print_msg("clone() failed: %d\n", errno);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret == 0) {</div><div class='ctx'> 		/* In child */</div><div class='ctx'> 		if (get_tpidr2() != 0) {</div><div class='del'>-			putstr("# TPIDR2 non-zero in child: ");</div><div class='del'>-			putnum(get_tpidr2());</div><div class='del'>-			putstr("\n");</div><div class='add'>+			ksft_print_msg("TPIDR2 non-zero in child: %llx\n",</div><div class='add'>+				       get_tpidr2());</div><div class='ctx'> 			exit(0);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (gettid() == 0)</div><div class='del'>-			putstr("# Child TID==0\n");</div><div class='add'>+			ksft_print_msg("Child TID==0\n");</div><div class='ctx'> 		set_tpidr2(gettid());</div><div class='ctx'> 		if (get_tpidr2() == gettid()) {</div><div class='ctx'> 			exit(1);</div><div class='ctx'> 		} else {</div><div class='del'>-			putstr("# Failed to set TPIDR2 in child\n");</div><div class='add'>+			ksft_print_msg("Failed to set TPIDR2 in child\n");</div><div class='ctx'> 			exit(0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		waiting = wait4(ret, &amp;status, __WCLONE, NULL);</div><div class='add'>+		waiting = waitpid(ret, &amp;status, __WCLONE);</div><div class='ctx'> </div><div class='ctx'> 		if (waiting &lt; 0) {</div><div class='ctx'> 			if (errno == EINTR)</div><div class='ctx'> 				continue;</div><div class='del'>-			putstr("# wait4() failed: ");</div><div class='del'>-			putnum(errno);</div><div class='del'>-			putstr("\n");</div><div class='add'>+			ksft_print_msg("waitpid() failed: %d\n", errno);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (waiting != ret) {</div><div class='del'>-			putstr("# wait4() returned wrong PID ");</div><div class='del'>-			putnum(waiting);</div><div class='del'>-			putstr("\n");</div><div class='add'>+			ksft_print_msg("waitpid() returned wrong PID %d\n",</div><div class='add'>+				       waiting);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!WIFEXITED(status)) {</div><div class='del'>-			putstr("# child did not exit\n");</div><div class='add'>+			ksft_print_msg("child did not exit\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (parent != get_tpidr2()) {</div><div class='del'>-			putstr("# TPIDR2 corrupted in parent\n");</div><div class='add'>+			ksft_print_msg("TPIDR2 corrupted in parent\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -243,35 +210,14 @@ static int write_clone_read(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define run_test(name)			     \</div><div class='del'>-	if (name()) {			     \</div><div class='del'>-		tests_passed++;		     \</div><div class='del'>-	} else {			     \</div><div class='del'>-		tests_failed++;		     \</div><div class='del'>-		putstr("not ");		     \</div><div class='del'>-	}				     \</div><div class='del'>-	putstr("ok ");			     \</div><div class='del'>-	putnum(++tests_run);		     \</div><div class='del'>-	putstr(" " #name "\n");</div><div class='del'>-</div><div class='del'>-#define skip_test(name)			     \</div><div class='del'>-	tests_skipped++;		     \</div><div class='del'>-	putstr("ok ");			     \</div><div class='del'>-	putnum(++tests_run);		     \</div><div class='del'>-	putstr(" # SKIP " #name "\n");</div><div class='del'>-</div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	putstr("TAP version 13\n");</div><div class='del'>-	putstr("1..");</div><div class='del'>-	putnum(EXPECTED_TESTS);</div><div class='del'>-	putstr("\n");</div><div class='add'>+	ksft_print_header();</div><div class='add'>+	ksft_set_plan(5);</div><div class='ctx'> </div><div class='del'>-	putstr("# PID: ");</div><div class='del'>-	putnum(getpid());</div><div class='del'>-	putstr("\n");</div><div class='add'>+	ksft_print_msg("PID: %d\n", getpid());</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This test is run with nolibc which doesn't support hwcap and</div><div class='hunk'>@@ -280,23 +226,21 @@ int main(int argc, char **argv)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = open("/proc/sys/abi/sme_default_vector_length", O_RDONLY, 0);</div><div class='ctx'> 	if (ret &gt;= 0) {</div><div class='del'>-		run_test(default_value);</div><div class='del'>-		run_test(write_read);</div><div class='del'>-		run_test(write_sleep_read);</div><div class='del'>-		run_test(write_fork_read);</div><div class='del'>-		run_test(write_clone_read);</div><div class='add'>+		ksft_test_result(default_value(), "default_value\n");</div><div class='add'>+		ksft_test_result(write_read(), "write_read\n");</div><div class='add'>+		ksft_test_result(write_sleep_read(), "write_sleep_read\n");</div><div class='add'>+		ksft_test_result(write_fork_read(), "write_fork_read\n");</div><div class='add'>+		ksft_test_result(write_clone_read(), "write_clone_read\n");</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		putstr("# SME support not present\n");</div><div class='add'>+		ksft_print_msg("SME support not present\n");</div><div class='ctx'> </div><div class='del'>-		skip_test(default_value);</div><div class='del'>-		skip_test(write_read);</div><div class='del'>-		skip_test(write_sleep_read);</div><div class='del'>-		skip_test(write_fork_read);</div><div class='del'>-		skip_test(write_clone_read);</div><div class='add'>+		ksft_test_result_skip("default_value\n");</div><div class='add'>+		ksft_test_result_skip("write_read\n");</div><div class='add'>+		ksft_test_result_skip("write_sleep_read\n");</div><div class='add'>+		ksft_test_result_skip("write_fork_read\n");</div><div class='add'>+		ksft_test_result_skip("write_clone_read\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	print_summary();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	ksft_finished();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/arm64/bti/assembler.h b/tools/testing/selftests/arm64/bti/assembler.h<br/>index 04e7b72880ef..141cdcbf0b8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/bti/assembler.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/bti/assembler.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/bti/assembler.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/bti/assembler.h</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #define GNU_PROPERTY_AARCH64_FEATURE_1_BTI	(1U &lt;&lt; 0)</div><div class='ctx'> #define GNU_PROPERTY_AARCH64_FEATURE_1_PAC	(1U &lt;&lt; 1)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> .macro startfn name:req</div><div class='ctx'> 	.globl \name</div><div class='ctx'> \name:</div><div class='head'>diff --git a/tools/testing/selftests/arm64/fp/fp-ptrace.c b/tools/testing/selftests/arm64/fp/fp-ptrace.c<br/>index 4930e03a7b99..22c584b78be5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/fp-ptrace.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/fp-ptrace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/fp-ptrace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/fp/fp-ptrace.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;asm/sve_context.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #include "fp-ptrace.h"</div><div class='ctx'> </div><div class='hunk'>@@ -439,10 +439,17 @@ static bool check_ptrace_values_sve(pid_t child, struct test_config *config)</div><div class='ctx'> 		pass = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sve-&gt;size != SVE_PT_SIZE(vq, sve-&gt;flags)) {</div><div class='del'>-		ksft_print_msg("Mismatch in SVE header size: %d != %lu\n",</div><div class='del'>-			       sve-&gt;size, SVE_PT_SIZE(vq, sve-&gt;flags));</div><div class='del'>-		pass = false;</div><div class='add'>+	if (svcr_in &amp; SVCR_SM) {</div><div class='add'>+		if (sve-&gt;size != sizeof(sve)) {</div><div class='add'>+			ksft_print_msg("NT_ARM_SVE reports data with PSTATE.SM\n");</div><div class='add'>+			pass = false;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (sve-&gt;size != SVE_PT_SIZE(vq, sve-&gt;flags)) {</div><div class='add'>+			ksft_print_msg("Mismatch in SVE header size: %d != %lu\n",</div><div class='add'>+				       sve-&gt;size, SVE_PT_SIZE(vq, sve-&gt;flags));</div><div class='add'>+			pass = false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The registers might be in completely different formats! */</div><div class='hunk'>@@ -515,10 +522,17 @@ static bool check_ptrace_values_ssve(pid_t child, struct test_config *config)</div><div class='ctx'> 		pass = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sve-&gt;size != SVE_PT_SIZE(vq, sve-&gt;flags)) {</div><div class='del'>-		ksft_print_msg("Mismatch in SSVE header size: %d != %lu\n",</div><div class='del'>-			       sve-&gt;size, SVE_PT_SIZE(vq, sve-&gt;flags));</div><div class='del'>-		pass = false;</div><div class='add'>+	if (!(svcr_in &amp; SVCR_SM)) {</div><div class='add'>+		if (sve-&gt;size != sizeof(sve)) {</div><div class='add'>+			ksft_print_msg("NT_ARM_SSVE reports data without PSTATE.SM\n");</div><div class='add'>+			pass = false;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (sve-&gt;size != SVE_PT_SIZE(vq, sve-&gt;flags)) {</div><div class='add'>+			ksft_print_msg("Mismatch in SSVE header size: %d != %lu\n",</div><div class='add'>+				       sve-&gt;size, SVE_PT_SIZE(vq, sve-&gt;flags));</div><div class='add'>+			pass = false;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The registers might be in completely different formats! */</div><div class='hunk'>@@ -891,18 +905,11 @@ static void set_initial_values(struct test_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	int vq = __sve_vq_from_vl(vl_in(config));</div><div class='ctx'> 	int sme_vq = __sve_vq_from_vl(config-&gt;sme_vl_in);</div><div class='del'>-	bool sm_change;</div><div class='ctx'> </div><div class='ctx'> 	svcr_in = config-&gt;svcr_in;</div><div class='ctx'> 	svcr_expected = config-&gt;svcr_expected;</div><div class='ctx'> 	svcr_out = 0;</div><div class='ctx'> </div><div class='del'>-	if (sme_supported() &amp;&amp;</div><div class='del'>-	    (svcr_in &amp; SVCR_SM) != (svcr_expected &amp; SVCR_SM))</div><div class='del'>-		sm_change = true;</div><div class='del'>-	else</div><div class='del'>-		sm_change = false;</div><div class='del'>-</div><div class='ctx'> 	fill_random(&amp;v_in, sizeof(v_in));</div><div class='ctx'> 	memcpy(v_expected, v_in, sizeof(v_in));</div><div class='ctx'> 	memset(v_out, 0, sizeof(v_out));</div><div class='hunk'>@@ -953,12 +960,7 @@ static void set_initial_values(struct test_config *config)</div><div class='ctx'> 	if (fpmr_supported()) {</div><div class='ctx'> 		fill_random(&amp;fpmr_in, sizeof(fpmr_in));</div><div class='ctx'> 		fpmr_in &amp;= FPMR_SAFE_BITS;</div><div class='del'>-</div><div class='del'>-		/* Entering or exiting streaming mode clears FPMR */</div><div class='del'>-		if (sm_change)</div><div class='del'>-			fpmr_expected = 0;</div><div class='del'>-		else</div><div class='del'>-			fpmr_expected = fpmr_in;</div><div class='add'>+		fpmr_expected = fpmr_in;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		fpmr_in = 0;</div><div class='ctx'> 		fpmr_expected = 0;</div><div class='hunk'>@@ -1059,11 +1061,31 @@ static bool sve_write_supported(struct test_config *config)</div><div class='ctx'> 		if (config-&gt;sme_vl_in != config-&gt;sme_vl_expected) {</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (!sve_supported())</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool sve_write_fpsimd_supported(struct test_config *config)</div><div class='add'>+{</div><div class='add'>+	if (!sve_supported() &amp;&amp; !sme_supported())</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if ((config-&gt;svcr_in &amp; SVCR_ZA) != (config-&gt;svcr_expected &amp; SVCR_ZA))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (config-&gt;svcr_expected &amp; SVCR_SM)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (config-&gt;sme_vl_in != config-&gt;sme_vl_expected)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void fpsimd_write_expected(struct test_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	int vl;</div><div class='hunk'>@@ -1132,6 +1154,9 @@ static void sve_write_expected(struct test_config *config)</div><div class='ctx'> 	int vl = vl_expected(config);</div><div class='ctx'> 	int sme_vq = __sve_vq_from_vl(config-&gt;sme_vl_expected);</div><div class='ctx'> </div><div class='add'>+	if (!vl)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	fill_random(z_expected, __SVE_ZREGS_SIZE(__sve_vq_from_vl(vl)));</div><div class='ctx'> 	fill_random(p_expected, __SVE_PREGS_SIZE(__sve_vq_from_vl(vl)));</div><div class='ctx'> </div><div class='hunk'>@@ -1150,7 +1175,7 @@ static void sve_write_expected(struct test_config *config)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sve_write(pid_t child, struct test_config *config)</div><div class='add'>+static void sve_write_sve(pid_t child, struct test_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	struct user_sve_header *sve;</div><div class='ctx'> 	struct iovec iov;</div><div class='hunk'>@@ -1159,7 +1184,10 @@ static void sve_write(pid_t child, struct test_config *config)</div><div class='ctx'> 	vl = vl_expected(config);</div><div class='ctx'> 	vq = __sve_vq_from_vl(vl);</div><div class='ctx'> </div><div class='del'>-	iov.iov_len = SVE_PT_SVE_OFFSET + SVE_PT_SVE_SIZE(vq, SVE_PT_REGS_SVE);</div><div class='add'>+	if (!vl)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iov.iov_len = SVE_PT_SIZE(vq, SVE_PT_REGS_SVE);</div><div class='ctx'> 	iov.iov_base = malloc(iov.iov_len);</div><div class='ctx'> 	if (!iov.iov_base) {</div><div class='ctx'> 		ksft_print_msg("Failed allocating %lu byte SVE write buffer\n",</div><div class='hunk'>@@ -1193,20 +1221,45 @@ static void sve_write(pid_t child, struct test_config *config)</div><div class='ctx'> 	free(iov.iov_base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool za_write_supported(struct test_config *config)</div><div class='add'>+static void sve_write_fpsimd(pid_t child, struct test_config *config)</div><div class='ctx'> {</div><div class='del'>-	if (config-&gt;sme_vl_in != config-&gt;sme_vl_expected) {</div><div class='del'>-		/* Changing the SME VL exits streaming mode. */</div><div class='del'>-		if (config-&gt;svcr_expected &amp; SVCR_SM) {</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Otherwise we can't change streaming mode */</div><div class='del'>-		if ((config-&gt;svcr_in &amp; SVCR_SM) !=</div><div class='del'>-		    (config-&gt;svcr_expected &amp; SVCR_SM)) {</div><div class='del'>-			return false;</div><div class='del'>-		}</div><div class='add'>+	struct user_sve_header *sve;</div><div class='add'>+	struct user_fpsimd_state *fpsimd;</div><div class='add'>+	struct iovec iov;</div><div class='add'>+	int ret, vl, vq;</div><div class='add'>+</div><div class='add'>+	vl = vl_expected(config);</div><div class='add'>+	vq = __sve_vq_from_vl(vl);</div><div class='add'>+</div><div class='add'>+	iov.iov_len = SVE_PT_SIZE(vq, SVE_PT_REGS_FPSIMD);</div><div class='add'>+	iov.iov_base = malloc(iov.iov_len);</div><div class='add'>+	if (!iov.iov_base) {</div><div class='add'>+		ksft_print_msg("Failed allocating %lu byte SVE write buffer\n",</div><div class='add'>+			       iov.iov_len);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+	memset(iov.iov_base, 0, iov.iov_len);</div><div class='add'>+</div><div class='add'>+	sve = iov.iov_base;</div><div class='add'>+	sve-&gt;size = iov.iov_len;</div><div class='add'>+	sve-&gt;flags = SVE_PT_REGS_FPSIMD;</div><div class='add'>+	sve-&gt;vl = vl;</div><div class='add'>+</div><div class='add'>+	fpsimd = iov.iov_base + SVE_PT_REGS_OFFSET;</div><div class='add'>+	memcpy(&amp;fpsimd-&gt;vregs, v_expected, sizeof(v_expected));</div><div class='add'>+</div><div class='add'>+	ret = ptrace(PTRACE_SETREGSET, child, NT_ARM_SVE, &amp;iov);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		ksft_print_msg("Failed to write SVE: %s (%d)\n",</div><div class='add'>+			       strerror(errno), errno);</div><div class='add'>+</div><div class='add'>+	free(iov.iov_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool za_write_supported(struct test_config *config)</div><div class='add'>+{</div><div class='add'>+	if ((config-&gt;svcr_in &amp; SVCR_SM) != (config-&gt;svcr_expected &amp; SVCR_SM))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -1224,10 +1277,8 @@ static void za_write_expected(struct test_config *config)</div><div class='ctx'> 		memset(zt_expected, 0, sizeof(zt_expected));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Changing the SME VL flushes ZT, SVE state and exits SM */</div><div class='add'>+	/* Changing the SME VL flushes ZT, SVE state */</div><div class='ctx'> 	if (config-&gt;sme_vl_in != config-&gt;sme_vl_expected) {</div><div class='del'>-		svcr_expected &amp;= ~SVCR_SM;</div><div class='del'>-</div><div class='ctx'> 		sve_vq = __sve_vq_from_vl(vl_expected(config));</div><div class='ctx'> 		memset(z_expected, 0, __SVE_ZREGS_SIZE(sve_vq));</div><div class='ctx'> 		memset(p_expected, 0, __SVE_PREGS_SIZE(sve_vq));</div><div class='hunk'>@@ -1396,7 +1447,13 @@ static struct test_definition sve_test_defs[] = {</div><div class='ctx'> 		.name = "SVE write",</div><div class='ctx'> 		.supported = sve_write_supported,</div><div class='ctx'> 		.set_expected_values = sve_write_expected,</div><div class='del'>-		.modify_values = sve_write,</div><div class='add'>+		.modify_values = sve_write_sve,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "SVE write FPSIMD format",</div><div class='add'>+		.supported = sve_write_fpsimd_supported,</div><div class='add'>+		.set_expected_values = fpsimd_write_expected,</div><div class='add'>+		.modify_values = sve_write_fpsimd,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1508,7 +1565,6 @@ static void run_sve_tests(void)</div><div class='ctx'> 					  &amp;test_config);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_sme_tests(void)</div><div class='hunk'>@@ -1617,7 +1673,7 @@ int main(void)</div><div class='ctx'> 	 * Run the test set if there is no SVE or SME, with those we</div><div class='ctx'> 	 * have to pick a VL for each run.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!sve_supported()) {</div><div class='add'>+	if (!sve_supported() &amp;&amp; !sme_supported()) {</div><div class='ctx'> 		test_config.sve_vl_in = 0;</div><div class='ctx'> 		test_config.sve_vl_expected = 0;</div><div class='ctx'> 		test_config.sme_vl_in = 0;</div><div class='head'>diff --git a/tools/testing/selftests/arm64/fp/fp-stress.c b/tools/testing/selftests/arm64/fp/fp-stress.c<br/>index 74e23208b94c..65e01aba96ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/fp-stress.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/fp-stress.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/fp-stress.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/fp/fp-stress.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;asm/hwcap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define MAX_VLS 16</div><div class='ctx'> </div><div class='hunk'>@@ -105,8 +105,8 @@ static void child_start(struct child_data *child, const char *program)</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Read from the startup pipe, there should be no data</div><div class='del'>-		 * and we should block until it is closed.  We just</div><div class='del'>-		 * carry on on error since this isn't super critical.</div><div class='add'>+		 * and we should block until it is closed. We just</div><div class='add'>+		 * carry-on on error since this isn't super critical.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = read(3, &amp;i, sizeof(i));</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -549,7 +549,7 @@ int main(int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> 	evs = calloc(tests, sizeof(*evs));</div><div class='ctx'> 	if (!evs)</div><div class='del'>-		ksft_exit_fail_msg("Failed to allocated %d epoll events\n",</div><div class='add'>+		ksft_exit_fail_msg("Failed to allocate %d epoll events\n",</div><div class='ctx'> 				   tests);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; cpus; i++) {</div><div class='head'>diff --git a/tools/testing/selftests/arm64/fp/kernel-test.c b/tools/testing/selftests/arm64/fp/kernel-test.c<br/>index 348e8bef62c7..0c40007d1282 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/kernel-test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/kernel-test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/kernel-test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/fp/kernel-test.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@ static void handle_kick_signal(int sig, siginfo_t *info, void *context)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static char *drivers[] = {</div><div class='del'>-	"crct10dif-arm64",</div><div class='ctx'> 	"sha1-ce",</div><div class='ctx'> 	"sha224-arm64",</div><div class='ctx'> 	"sha224-arm64-neon",</div><div class='hunk'>@@ -189,13 +188,13 @@ static bool create_socket(void)</div><div class='ctx'> </div><div class='ctx'> 	ref = malloc(digest_len);</div><div class='ctx'> 	if (!ref) {</div><div class='del'>-		printf("Failed to allocated %d byte reference\n", digest_len);</div><div class='add'>+		printf("Failed to allocate %d byte reference\n", digest_len);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	digest = malloc(digest_len);</div><div class='ctx'> 	if (!digest) {</div><div class='del'>-		printf("Failed to allocated %d byte digest\n", digest_len);</div><div class='add'>+		printf("Failed to allocate %d byte digest\n", digest_len);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/arm64/fp/sve-probe-vls.c b/tools/testing/selftests/arm64/fp/sve-probe-vls.c<br/>index a24eca7a4ecb..df0c1b6eb114 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/sve-probe-vls.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/sve-probe-vls.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/sve-probe-vls.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/fp/sve-probe-vls.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;sys/prctl.h&gt;</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "rdvl.h"</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char **argv)</div><div class='head'>diff --git a/tools/testing/selftests/arm64/fp/sve-ptrace.c b/tools/testing/selftests/arm64/fp/sve-ptrace.c<br/>index 577b6e05e860..28f6b996c5e2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/sve-ptrace.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/sve-ptrace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/sve-ptrace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/fp/sve-ptrace.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> /* &lt;linux/elf.h&gt; and &lt;sys/auxv.h&gt; don't like each other, so: */</div><div class='ctx'> #ifndef NT_ARM_SVE</div><div class='hunk'>@@ -66,7 +66,7 @@ static const struct vec_type vec_types[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define VL_TESTS (((TEST_VQ_MAX - SVE_VQ_MIN) + 1) * 4)</div><div class='del'>-#define FLAG_TESTS 2</div><div class='add'>+#define FLAG_TESTS 4</div><div class='ctx'> #define FPSIMD_TESTS 2</div><div class='ctx'> </div><div class='ctx'> #define EXPECTED_TESTS ((VL_TESTS + FLAG_TESTS + FPSIMD_TESTS) * ARRAY_SIZE(vec_types))</div><div class='hunk'>@@ -95,19 +95,27 @@ static int do_child(void)</div><div class='ctx'> static int get_fpsimd(pid_t pid, struct user_fpsimd_state *fpsimd)</div><div class='ctx'> {</div><div class='ctx'> 	struct iovec iov;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	iov.iov_base = fpsimd;</div><div class='ctx'> 	iov.iov_len = sizeof(*fpsimd);</div><div class='del'>-	return ptrace(PTRACE_GETREGSET, pid, NT_PRFPREG, &amp;iov);</div><div class='add'>+	ret = ptrace(PTRACE_GETREGSET, pid, NT_PRFPREG, &amp;iov);</div><div class='add'>+	if (ret == -1)</div><div class='add'>+		ksft_perror("ptrace(PTRACE_GETREGSET)");</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_fpsimd(pid_t pid, struct user_fpsimd_state *fpsimd)</div><div class='ctx'> {</div><div class='ctx'> 	struct iovec iov;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	iov.iov_base = fpsimd;</div><div class='ctx'> 	iov.iov_len = sizeof(*fpsimd);</div><div class='del'>-	return ptrace(PTRACE_SETREGSET, pid, NT_PRFPREG, &amp;iov);</div><div class='add'>+	ret = ptrace(PTRACE_SETREGSET, pid, NT_PRFPREG, &amp;iov);</div><div class='add'>+	if (ret == -1)</div><div class='add'>+		ksft_perror("ptrace(PTRACE_SETREGSET)");</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct user_sve_header *get_sve(pid_t pid, const struct vec_type *type,</div><div class='hunk'>@@ -115,8 +123,9 @@ static struct user_sve_header *get_sve(pid_t pid, const struct vec_type *type,</div><div class='ctx'> {</div><div class='ctx'> 	struct user_sve_header *sve;</div><div class='ctx'> 	void *p;</div><div class='del'>-	size_t sz = sizeof *sve;</div><div class='add'>+	size_t sz = sizeof(*sve);</div><div class='ctx'> 	struct iovec iov;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (*size &lt; sz) {</div><div class='hunk'>@@ -132,8 +141,11 @@ static struct user_sve_header *get_sve(pid_t pid, const struct vec_type *type,</div><div class='ctx'> </div><div class='ctx'> 		iov.iov_base = *buf;</div><div class='ctx'> 		iov.iov_len = sz;</div><div class='del'>-		if (ptrace(PTRACE_GETREGSET, pid, type-&gt;regset, &amp;iov))</div><div class='add'>+		ret = ptrace(PTRACE_GETREGSET, pid, type-&gt;regset, &amp;iov);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ksft_perror("ptrace(PTRACE_GETREGSET)");</div><div class='ctx'> 			goto error;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		sve = *buf;</div><div class='ctx'> 		if (sve-&gt;size &lt;= sz)</div><div class='hunk'>@@ -152,10 +164,46 @@ static int set_sve(pid_t pid, const struct vec_type *type,</div><div class='ctx'> 		   const struct user_sve_header *sve)</div><div class='ctx'> {</div><div class='ctx'> 	struct iovec iov;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	iov.iov_base = (void *)sve;</div><div class='ctx'> 	iov.iov_len = sve-&gt;size;</div><div class='del'>-	return ptrace(PTRACE_SETREGSET, pid, type-&gt;regset, &amp;iov);</div><div class='add'>+	ret = ptrace(PTRACE_SETREGSET, pid, type-&gt;regset, &amp;iov);</div><div class='add'>+	if (ret == -1)</div><div class='add'>+		ksft_perror("ptrace(PTRACE_SETREGSET)");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* A read operation fails */</div><div class='add'>+static void read_fails(pid_t child, const struct vec_type *type)</div><div class='add'>+{</div><div class='add'>+	struct user_sve_header *new_sve = NULL;</div><div class='add'>+	size_t new_sve_size = 0;</div><div class='add'>+	void *ret;</div><div class='add'>+</div><div class='add'>+	ret = get_sve(child, type, (void **)&amp;new_sve, &amp;new_sve_size);</div><div class='add'>+</div><div class='add'>+	ksft_test_result(ret == NULL, "%s unsupported read fails\n",</div><div class='add'>+			 type-&gt;name);</div><div class='add'>+</div><div class='add'>+	free(new_sve);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* A write operation fails */</div><div class='add'>+static void write_fails(pid_t child, const struct vec_type *type)</div><div class='add'>+{</div><div class='add'>+	struct user_sve_header sve;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Just the header, no data */</div><div class='add'>+	memset(&amp;sve, 0, sizeof(sve));</div><div class='add'>+	sve.size = sizeof(sve);</div><div class='add'>+	sve.flags = SVE_PT_REGS_SVE;</div><div class='add'>+	sve.vl = SVE_VL_MIN;</div><div class='add'>+	ret = set_sve(child, type, &amp;sve);</div><div class='add'>+</div><div class='add'>+	ksft_test_result(ret != 0, "%s unsupported write fails\n",</div><div class='add'>+			 type-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Validate setting and getting the inherit flag */</div><div class='hunk'>@@ -170,7 +218,7 @@ static void ptrace_set_get_inherit(pid_t child, const struct vec_type *type)</div><div class='ctx'> 	memset(&amp;sve, 0, sizeof(sve));</div><div class='ctx'> 	sve.size = sizeof(sve);</div><div class='ctx'> 	sve.vl = sve_vl_from_vq(SVE_VQ_MIN);</div><div class='del'>-	sve.flags = SVE_PT_VL_INHERIT;</div><div class='add'>+	sve.flags = SVE_PT_VL_INHERIT | SVE_PT_REGS_SVE;</div><div class='ctx'> 	ret = set_sve(child, type, &amp;sve);</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		ksft_test_result_fail("Failed to set %s SVE_PT_VL_INHERIT\n",</div><div class='hunk'>@@ -235,6 +283,7 @@ static void ptrace_set_get_vl(pid_t child, const struct vec_type *type,</div><div class='ctx'> 	/* Set the VL by doing a set with no register payload */</div><div class='ctx'> 	memset(&amp;sve, 0, sizeof(sve));</div><div class='ctx'> 	sve.size = sizeof(sve);</div><div class='add'>+	sve.flags = SVE_PT_REGS_SVE;</div><div class='ctx'> 	sve.vl = vl;</div><div class='ctx'> 	ret = set_sve(child, type, &amp;sve);</div><div class='ctx'> 	if (ret != 0) {</div><div class='hunk'>@@ -253,7 +302,7 @@ static void ptrace_set_get_vl(pid_t child, const struct vec_type *type,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ksft_test_result(new_sve-&gt;vl = prctl_vl, "Set %s VL %u\n",</div><div class='add'>+	ksft_test_result(new_sve-&gt;vl == prctl_vl, "Set %s VL %u\n",</div><div class='ctx'> 			 type-&gt;name, vl);</div><div class='ctx'> </div><div class='ctx'> 	free(new_sve);</div><div class='hunk'>@@ -269,6 +318,25 @@ static void check_u32(unsigned int vl, const char *reg,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Set out of range VLs */</div><div class='add'>+static void ptrace_set_vl_ranges(pid_t child, const struct vec_type *type)</div><div class='add'>+{</div><div class='add'>+	struct user_sve_header sve;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sve, 0, sizeof(sve));</div><div class='add'>+	sve.flags = SVE_PT_REGS_SVE;</div><div class='add'>+	sve.size = sizeof(sve);</div><div class='add'>+</div><div class='add'>+	ret = set_sve(child, type, &amp;sve);</div><div class='add'>+	ksft_test_result(ret != 0, "%s Set invalid VL 0\n", type-&gt;name);</div><div class='add'>+</div><div class='add'>+	sve.vl = SVE_VL_MAX + SVE_VQ_BYTES;</div><div class='add'>+	ret = set_sve(child, type, &amp;sve);</div><div class='add'>+	ksft_test_result(ret != 0, "%s Set invalid VL %d\n", type-&gt;name,</div><div class='add'>+			 SVE_VL_MAX + SVE_VQ_BYTES);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Access the FPSIMD registers via the SVE regset */</div><div class='ctx'> static void ptrace_sve_fpsimd(pid_t child, const struct vec_type *type)</div><div class='ctx'> {</div><div class='hunk'>@@ -301,8 +369,10 @@ static void ptrace_sve_fpsimd(pid_t child, const struct vec_type *type)</div><div class='ctx'> 			p[j] = j;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* This should only succeed for SVE */</div><div class='ctx'> 	ret = set_sve(child, type, sve);</div><div class='del'>-	ksft_test_result(ret == 0, "%s FPSIMD set via SVE: %d\n",</div><div class='add'>+	ksft_test_result((type-&gt;regset == NT_ARM_SVE) == (ret == 0),</div><div class='add'>+			 "%s FPSIMD set via SVE: %d\n",</div><div class='ctx'> 			 type-&gt;name, ret);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -324,6 +394,58 @@ out:</div><div class='ctx'> 	free(svebuf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Write the FPSIMD registers via the SVE regset when SVE is not supported */</div><div class='add'>+static void ptrace_sve_fpsimd_no_sve(pid_t child)</div><div class='add'>+{</div><div class='add'>+	void *svebuf;</div><div class='add'>+	struct user_sve_header *sve;</div><div class='add'>+	struct user_fpsimd_state *fpsimd, new_fpsimd;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+	unsigned char *p;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	svebuf = malloc(SVE_PT_SIZE(0, SVE_PT_REGS_FPSIMD));</div><div class='add'>+	if (!svebuf) {</div><div class='add'>+		ksft_test_result_fail("Failed to allocate FPSIMD buffer\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* On a system without SVE the VL should be set to 0 */</div><div class='add'>+	memset(svebuf, 0, SVE_PT_SIZE(0, SVE_PT_REGS_FPSIMD));</div><div class='add'>+	sve = svebuf;</div><div class='add'>+	sve-&gt;flags = SVE_PT_REGS_FPSIMD;</div><div class='add'>+	sve-&gt;size = SVE_PT_SIZE(0, SVE_PT_REGS_FPSIMD);</div><div class='add'>+	sve-&gt;vl = 0;</div><div class='add'>+</div><div class='add'>+	/* Try to set a known FPSIMD state via PT_REGS_SVE */</div><div class='add'>+	fpsimd = (struct user_fpsimd_state *)((char *)sve +</div><div class='add'>+					      SVE_PT_FPSIMD_OFFSET);</div><div class='add'>+	for (i = 0; i &lt; 32; ++i) {</div><div class='add'>+		p = (unsigned char *)&amp;fpsimd-&gt;vregs[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; sizeof(fpsimd-&gt;vregs[i]); ++j)</div><div class='add'>+			p[j] = j;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = set_sve(child, &amp;vec_types[0], sve);</div><div class='add'>+	ksft_test_result(ret == 0, "FPSIMD write via SVE\n");</div><div class='add'>+	if (ret) {</div><div class='add'>+		ksft_test_result_skip("Verify FPSIMD write via SVE\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify via the FPSIMD regset */</div><div class='add'>+	if (get_fpsimd(child, &amp;new_fpsimd)) {</div><div class='add'>+		ksft_test_result_skip("Verify FPSIMD write via SVE\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ksft_test_result(memcmp(fpsimd, &amp;new_fpsimd, sizeof(*fpsimd)) == 0,</div><div class='add'>+			 "Verify FPSIMD write via SVE\n");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	free(svebuf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Validate attempting to set SVE data and read SVE data */</div><div class='ctx'> static void ptrace_set_sve_get_sve_data(pid_t child,</div><div class='ctx'> 					const struct vec_type *type,</div><div class='hunk'>@@ -680,6 +802,20 @@ static int do_parent(pid_t child)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(vec_types); i++) {</div><div class='add'>+		/*</div><div class='add'>+		 * If the vector type isn't supported reads and writes</div><div class='add'>+		 * should fail.</div><div class='add'>+		 */</div><div class='add'>+		if (!(getauxval(vec_types[i].hwcap_type) &amp; vec_types[i].hwcap)) {</div><div class='add'>+			read_fails(child, &amp;vec_types[i]);</div><div class='add'>+			write_fails(child, &amp;vec_types[i]);</div><div class='add'>+		} else {</div><div class='add'>+			ksft_test_result_skip("%s unsupported read fails\n",</div><div class='add'>+					      vec_types[i].name);</div><div class='add'>+			ksft_test_result_skip("%s unsupported write fails\n",</div><div class='add'>+					      vec_types[i].name);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* FPSIMD via SVE regset */</div><div class='ctx'> 		if (getauxval(vec_types[i].hwcap_type) &amp; vec_types[i].hwcap) {</div><div class='ctx'> 			ptrace_sve_fpsimd(child, &amp;vec_types[i]);</div><div class='hunk'>@@ -700,6 +836,17 @@ static int do_parent(pid_t child)</div><div class='ctx'> 					      vec_types[i].name);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Setting out of bounds VLs should fail */</div><div class='add'>+		if (getauxval(vec_types[i].hwcap_type) &amp; vec_types[i].hwcap) {</div><div class='add'>+			ptrace_set_vl_ranges(child, &amp;vec_types[i]);</div><div class='add'>+		} else {</div><div class='add'>+			ksft_test_result_skip("%s Set invalid VL 0\n",</div><div class='add'>+					      vec_types[i].name);</div><div class='add'>+			ksft_test_result_skip("%s Set invalid VL %d\n",</div><div class='add'>+					      vec_types[i].name,</div><div class='add'>+					      SVE_VL_MAX + SVE_VQ_BYTES);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Step through every possible VQ */</div><div class='ctx'> 		for (vq = SVE_VQ_MIN; vq &lt;= TEST_VQ_MAX; vq++) {</div><div class='ctx'> 			vl = sve_vl_from_vq(vq);</div><div class='hunk'>@@ -731,6 +878,15 @@ static int do_parent(pid_t child)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* We support SVE writes of FPSMID format on SME only systems */</div><div class='add'>+	if (!(getauxval(AT_HWCAP) &amp; HWCAP_SVE) &amp;&amp;</div><div class='add'>+	    (getauxval(AT_HWCAP2) &amp; HWCAP2_SME)) {</div><div class='add'>+		ptrace_sve_fpsimd_no_sve(child);</div><div class='add'>+	} else {</div><div class='add'>+		ksft_test_result_skip("FPSIMD write via SVE\n");</div><div class='add'>+		ksft_test_result_skip("Verify FPSIMD write via SVE\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = EXIT_SUCCESS;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='hunk'>@@ -750,9 +906,6 @@ int main(void)</div><div class='ctx'> 	ksft_print_header();</div><div class='ctx'> 	ksft_set_plan(EXPECTED_TESTS);</div><div class='ctx'> </div><div class='del'>-	if (!(getauxval(AT_HWCAP) &amp; HWCAP_SVE))</div><div class='del'>-		ksft_exit_skip("SVE not available\n");</div><div class='del'>-</div><div class='ctx'> 	child = fork();</div><div class='ctx'> 	if (!child)</div><div class='ctx'> 		return do_child();</div><div class='head'>diff --git a/tools/testing/selftests/arm64/fp/vec-syscfg.c b/tools/testing/selftests/arm64/fp/vec-syscfg.c<br/>index ea9c7d47790f..8dd932fdcdc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/vec-syscfg.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/vec-syscfg.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/vec-syscfg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/fp/vec-syscfg.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> #include &lt;asm/hwcap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "rdvl.h"</div><div class='ctx'> </div><div class='ctx'> #define ARCH_MIN_VL SVE_VL_MIN</div><div class='hunk'>@@ -690,7 +690,6 @@ static inline void smstop(void)</div><div class='ctx'> 	asm volatile("msr S0_3_C4_C6_3, xzr");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Verify we can change the SVE vector length while SME is active and</div><div class='ctx'>  * continue to use SME afterwards.</div><div class='head'>diff --git a/tools/testing/selftests/arm64/fp/za-ptrace.c b/tools/testing/selftests/arm64/fp/za-ptrace.c<br/>index 08c777f87ea2..787eed22d059 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/za-ptrace.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/za-ptrace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/za-ptrace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/fp/za-ptrace.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> /* &lt;linux/elf.h&gt; and &lt;sys/auxv.h&gt; don't like each other, so: */</div><div class='ctx'> #ifndef NT_ARM_ZA</div><div class='head'>diff --git a/tools/testing/selftests/arm64/fp/zt-ptrace.c b/tools/testing/selftests/arm64/fp/zt-ptrace.c<br/>index 584b8d59b7ea..f3fa49fd0fbd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/zt-ptrace.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/zt-ptrace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/zt-ptrace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/fp/zt-ptrace.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;asm/sigcontext.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> /* &lt;linux/elf.h&gt; and &lt;sys/auxv.h&gt; don't like each other, so: */</div><div class='ctx'> #ifndef NT_ARM_ZA</div><div class='hunk'>@@ -108,7 +108,6 @@ static int get_zt(pid_t pid, char zt[ZT_SIG_REG_BYTES])</div><div class='ctx'> 	return ptrace(PTRACE_GETREGSET, pid, NT_ARM_ZT, &amp;iov);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int set_zt(pid_t pid, const char zt[ZT_SIG_REG_BYTES])</div><div class='ctx'> {</div><div class='ctx'> 	struct iovec iov;</div><div class='head'>diff --git a/tools/testing/selftests/arm64/fp/zt-test.S b/tools/testing/selftests/arm64/fp/zt-test.S<br/>index 38080f3c3280..a8df05771670 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/zt-test.S?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/fp/zt-test.S</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/fp/zt-test.S?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/fp/zt-test.S</a></div><div class='hunk'>@@ -276,7 +276,7 @@ function barf</div><div class='ctx'> 	bl	putdec</div><div class='ctx'> 	puts	", iteration="</div><div class='ctx'> 	mov	x0, x22</div><div class='del'>-	bl	putdec</div><div class='add'>+	bl	putdecn</div><div class='ctx'> 	puts	"\tExpected ["</div><div class='ctx'> 	mov	x0, x10</div><div class='ctx'> 	mov	x1, x12</div><div class='head'>diff --git a/tools/testing/selftests/arm64/gcs/Makefile b/tools/testing/selftests/arm64/gcs/Makefile<br/>index d2f3497a9103..1fbbf0ca1f02 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/gcs/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/gcs/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/gcs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/gcs/Makefile</a></div><div class='hunk'>@@ -14,11 +14,11 @@ LDLIBS+=-lpthread</div><div class='ctx'> include ../../lib.mk</div><div class='ctx'> </div><div class='ctx'> $(OUTPUT)/basic-gcs: basic-gcs.c</div><div class='del'>-	$(CC) -g -fno-asynchronous-unwind-tables -fno-ident -s -Os -nostdlib \</div><div class='del'>-		-static -include ../../../../include/nolibc/nolibc.h \</div><div class='add'>+	$(CC) $(CFLAGS) -fno-asynchronous-unwind-tables -fno-ident -s -nostdlib -nostdinc \</div><div class='add'>+		-static -I../../../../include/nolibc -include ../../../../include/nolibc/nolibc.h \</div><div class='ctx'> 		-I../../../../../usr/include \</div><div class='ctx'> 		-std=gnu99 -I../.. -g \</div><div class='del'>-		-ffreestanding -Wall $^ -o $@ -lgcc</div><div class='add'>+		-ffreestanding $^ -o $@ -lgcc</div><div class='ctx'> </div><div class='ctx'> $(OUTPUT)/gcs-stress-thread: gcs-stress-thread.S</div><div class='ctx'> 	$(CC) -nostdlib $^ -o $@</div><div class='head'>diff --git a/tools/testing/selftests/arm64/gcs/basic-gcs.c b/tools/testing/selftests/arm64/gcs/basic-gcs.c<br/>index 3fb9742342a3..250977abc398 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/gcs/basic-gcs.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/gcs/basic-gcs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/gcs/basic-gcs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/gcs/basic-gcs.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include &lt;asm/mman.h&gt;</div><div class='add'>+#include &lt;asm/hwcap.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "kselftest.h"</div><div class='hunk'>@@ -298,6 +299,68 @@ out:</div><div class='ctx'> 	return pass;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* A vfork()ed process can run and exit */</div><div class='add'>+static bool test_vfork(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long child_mode;</div><div class='add'>+	int ret, status;</div><div class='add'>+	pid_t pid;</div><div class='add'>+	bool pass = true;</div><div class='add'>+</div><div class='add'>+	pid = vfork();</div><div class='add'>+	if (pid == -1) {</div><div class='add'>+		ksft_print_msg("vfork() failed: %d\n", errno);</div><div class='add'>+		pass = false;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (pid == 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * In child, make sure we can call a function, read</div><div class='add'>+		 * the GCS pointer and status and then exit.</div><div class='add'>+		 */</div><div class='add'>+		valid_gcs_function();</div><div class='add'>+		get_gcspr();</div><div class='add'>+</div><div class='add'>+		ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS,</div><div class='add'>+				  &amp;child_mode, 0, 0, 0);</div><div class='add'>+		if (ret == 0 &amp;&amp; !(child_mode &amp; PR_SHADOW_STACK_ENABLE)) {</div><div class='add'>+			ksft_print_msg("GCS not enabled in child\n");</div><div class='add'>+			ret = EXIT_FAILURE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		_exit(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In parent, check we can still do function calls then check</div><div class='add'>+	 * on the child.</div><div class='add'>+	 */</div><div class='add'>+	valid_gcs_function();</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("Waiting for child %d\n", pid);</div><div class='add'>+</div><div class='add'>+	ret = waitpid(pid, &amp;status, 0);</div><div class='add'>+	if (ret == -1) {</div><div class='add'>+		ksft_print_msg("Failed to wait for child: %d\n",</div><div class='add'>+			       errno);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!WIFEXITED(status)) {</div><div class='add'>+		ksft_print_msg("Child exited due to signal %d\n",</div><div class='add'>+			       WTERMSIG(status));</div><div class='add'>+		pass = false;</div><div class='add'>+	} else if (WEXITSTATUS(status)) {</div><div class='add'>+		ksft_print_msg("Child exited with status %d\n",</div><div class='add'>+			       WEXITSTATUS(status));</div><div class='add'>+		pass = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+</div><div class='add'>+	return pass;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> typedef bool (*gcs_test)(void);</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='hunk'>@@ -314,6 +377,7 @@ static struct {</div><div class='ctx'> 	{ "enable_invalid", enable_invalid, true },</div><div class='ctx'> 	{ "map_guarded_stack", map_guarded_stack },</div><div class='ctx'> 	{ "fork", test_fork },</div><div class='add'>+	{ "vfork", test_vfork },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int main(void)</div><div class='hunk'>@@ -323,14 +387,13 @@ int main(void)</div><div class='ctx'> </div><div class='ctx'> 	ksft_print_header();</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We don't have getauxval() with nolibc so treat a failure to</div><div class='del'>-	 * read GCS state as a lack of support and skip.</div><div class='del'>-	 */</div><div class='add'>+	if (!(getauxval(AT_HWCAP) &amp; HWCAP_GCS))</div><div class='add'>+		ksft_exit_skip("SKIP GCS not supported\n");</div><div class='add'>+</div><div class='ctx'> 	ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS,</div><div class='ctx'> 			  &amp;gcs_mode, 0, 0, 0);</div><div class='ctx'> 	if (ret != 0)</div><div class='del'>-		ksft_exit_skip("Failed to read GCS state: %d\n", ret);</div><div class='add'>+		ksft_exit_fail_msg("Failed to read GCS state: %d\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	if (!(gcs_mode &amp; PR_SHADOW_STACK_ENABLE)) {</div><div class='ctx'> 		gcs_mode = PR_SHADOW_STACK_ENABLE;</div><div class='hunk'>@@ -347,7 +410,7 @@ int main(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* One last test: disable GCS, we can do this one time */</div><div class='del'>-	my_syscall5(__NR_prctl, PR_SET_SHADOW_STACK_STATUS, 0, 0, 0, 0);</div><div class='add'>+	ret = my_syscall5(__NR_prctl, PR_SET_SHADOW_STACK_STATUS, 0, 0, 0, 0);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		ksft_print_msg("Failed to disable GCS: %d\n", ret);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/arm64/gcs/gcs-locking.c b/tools/testing/selftests/arm64/gcs/gcs-locking.c<br/>index 989f75a491b7..1e6abb136ffd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/gcs/gcs-locking.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/gcs/gcs-locking.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/gcs/gcs-locking.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/gcs/gcs-locking.c</a></div><div class='hunk'>@@ -165,7 +165,6 @@ TEST_F(valid_modes, lock_enable_disable_others)</div><div class='ctx'> 	ASSERT_EQ(ret, 0);</div><div class='ctx'> 	ASSERT_EQ(mode, PR_SHADOW_STACK_ALL_MODES);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	ret = my_syscall2(__NR_prctl, PR_SET_SHADOW_STACK_STATUS,</div><div class='ctx'> 			  variant-&gt;mode);</div><div class='ctx'> 	ASSERT_EQ(ret, 0);</div><div class='head'>diff --git a/tools/testing/selftests/arm64/gcs/gcs-stress.c b/tools/testing/selftests/arm64/gcs/gcs-stress.c<br/>index bbc7f4950c13..86d8cd42aee7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/gcs/gcs-stress.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/gcs/gcs-stress.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/gcs/gcs-stress.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/gcs/gcs-stress.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;asm/hwcap.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> struct child_data {</div><div class='ctx'> 	char *name, *output;</div><div class='hunk'>@@ -433,7 +433,7 @@ int main(int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> 	evs = calloc(tests, sizeof(*evs));</div><div class='ctx'> 	if (!evs)</div><div class='del'>-		ksft_exit_fail_msg("Failed to allocated %d epoll events\n",</div><div class='add'>+		ksft_exit_fail_msg("Failed to allocate %d epoll events\n",</div><div class='ctx'> 				   tests);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; gcs_threads; i++)</div><div class='head'>diff --git a/tools/testing/selftests/arm64/mte/check_buffer_fill.c b/tools/testing/selftests/arm64/mte/check_buffer_fill.c<br/>index 2ee7f114d7fa..ff4e07503349 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_buffer_fill.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_buffer_fill.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_buffer_fill.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/mte/check_buffer_fill.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@ static int check_buffer_by_byte(int mem_type, int mode)</div><div class='ctx'> 	int i, j, item;</div><div class='ctx'> 	bool err;</div><div class='ctx'> </div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	item = ARRAY_SIZE(sizes);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; item; i++) {</div><div class='hunk'>@@ -68,7 +68,7 @@ static int check_buffer_underflow_by_byte(int mem_type, int mode,</div><div class='ctx'> 	bool err;</div><div class='ctx'> 	char *und_ptr = NULL;</div><div class='ctx'> </div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	item = ARRAY_SIZE(sizes);</div><div class='ctx'> 	for (i = 0; i &lt; item; i++) {</div><div class='ctx'> 		ptr = (char *)mte_allocate_memory_tag_range(sizes[i], mem_type, 0,</div><div class='hunk'>@@ -164,7 +164,7 @@ static int check_buffer_overflow_by_byte(int mem_type, int mode,</div><div class='ctx'> 	size_t tagged_size, overflow_size;</div><div class='ctx'> 	char *over_ptr = NULL;</div><div class='ctx'> </div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	item = ARRAY_SIZE(sizes);</div><div class='ctx'> 	for (i = 0; i &lt; item; i++) {</div><div class='ctx'> 		ptr = (char *)mte_allocate_memory_tag_range(sizes[i], mem_type, 0,</div><div class='hunk'>@@ -337,7 +337,7 @@ static int check_buffer_by_block(int mem_type, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	int i, item, result = KSFT_PASS;</div><div class='ctx'> </div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	item = ARRAY_SIZE(sizes);</div><div class='ctx'> 	cur_mte_cxt.fault_valid = false;</div><div class='ctx'> 	for (i = 0; i &lt; item; i++) {</div><div class='hunk'>@@ -368,7 +368,7 @@ static int check_memory_initial_tags(int mem_type, int mode, int mapping)</div><div class='ctx'> 	int run, fd;</div><div class='ctx'> 	int total = ARRAY_SIZE(sizes);</div><div class='ctx'> </div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	for (run = 0; run &lt; total; run++) {</div><div class='ctx'> 		/* check initial tags for anonymous mmap */</div><div class='ctx'> 		ptr = (char *)mte_allocate_memory(sizes[run], mem_type, mapping, false);</div><div class='hunk'>@@ -415,7 +415,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Register SIGSEGV handler */</div><div class='del'>-	mte_register_signal(SIGSEGV, mte_default_handler);</div><div class='add'>+	mte_register_signal(SIGSEGV, mte_default_handler, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Set test plan */</div><div class='ctx'> 	ksft_set_plan(20);</div><div class='head'>diff --git a/tools/testing/selftests/arm64/mte/check_child_memory.c b/tools/testing/selftests/arm64/mte/check_child_memory.c<br/>index 7597fc632cad..5e97ee792e4d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_child_memory.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_child_memory.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_child_memory.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/mte/check_child_memory.c</a></div><div class='hunk'>@@ -88,7 +88,7 @@ static int check_child_memory_mapping(int mem_type, int mode, int mapping)</div><div class='ctx'> 	int item = ARRAY_SIZE(sizes);</div><div class='ctx'> </div><div class='ctx'> 	item = ARRAY_SIZE(sizes);</div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	for (run = 0; run &lt; item; run++) {</div><div class='ctx'> 		ptr = (char *)mte_allocate_memory_tag_range(sizes[run], mem_type, mapping,</div><div class='ctx'> 							    UNDERFLOW, OVERFLOW);</div><div class='hunk'>@@ -109,7 +109,7 @@ static int check_child_file_mapping(int mem_type, int mode, int mapping)</div><div class='ctx'> 	int run, fd, map_size, result = KSFT_PASS;</div><div class='ctx'> 	int total = ARRAY_SIZE(sizes);</div><div class='ctx'> </div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	for (run = 0; run &lt; total; run++) {</div><div class='ctx'> 		fd = create_temp_file();</div><div class='ctx'> 		if (fd == -1)</div><div class='hunk'>@@ -160,8 +160,8 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Register SIGSEGV handler */</div><div class='del'>-	mte_register_signal(SIGSEGV, mte_default_handler);</div><div class='del'>-	mte_register_signal(SIGBUS, mte_default_handler);</div><div class='add'>+	mte_register_signal(SIGSEGV, mte_default_handler, false);</div><div class='add'>+	mte_register_signal(SIGBUS, mte_default_handler, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Set test plan */</div><div class='ctx'> 	ksft_set_plan(12);</div><div class='head'>diff --git a/tools/testing/selftests/arm64/mte/check_hugetlb_options.c b/tools/testing/selftests/arm64/mte/check_hugetlb_options.c<br/>index 303260a6dc65..aad1234c7e0f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_hugetlb_options.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_hugetlb_options.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_hugetlb_options.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/mte/check_hugetlb_options.c</a></div><div class='hunk'>@@ -151,7 +151,7 @@ static int check_hugetlb_memory_mapping(int mem_type, int mode, int mapping, int</div><div class='ctx'> </div><div class='ctx'> 	map_size = default_huge_page_size();</div><div class='ctx'> </div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	map_ptr = (char *)mte_allocate_memory(map_size, mem_type, mapping, false);</div><div class='ctx'> 	if (check_allocated_memory(map_ptr, map_size, mem_type, false) != KSFT_PASS)</div><div class='ctx'> 		return KSFT_FAIL;</div><div class='hunk'>@@ -180,7 +180,7 @@ static int check_clear_prot_mte_flag(int mem_type, int mode, int mapping)</div><div class='ctx'> 	unsigned long map_size;</div><div class='ctx'> </div><div class='ctx'> 	prot_flag = PROT_READ | PROT_WRITE;</div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	map_size = default_huge_page_size();</div><div class='ctx'> 	map_ptr = (char *)mte_allocate_memory_tag_range(map_size, mem_type, mapping,</div><div class='ctx'> 							0, 0);</div><div class='hunk'>@@ -210,7 +210,7 @@ static int check_child_hugetlb_memory_mapping(int mem_type, int mode, int mappin</div><div class='ctx'> </div><div class='ctx'> 	map_size = default_huge_page_size();</div><div class='ctx'> </div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	ptr = (char *)mte_allocate_memory_tag_range(map_size, mem_type, mapping,</div><div class='ctx'> 						    0, 0);</div><div class='ctx'> 	if (check_allocated_memory_range(ptr, map_size, mem_type,</div><div class='hunk'>@@ -227,14 +227,16 @@ static int check_child_hugetlb_memory_mapping(int mem_type, int mode, int mappin</div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='add'>+	void *map_ptr;</div><div class='add'>+	unsigned long map_size;</div><div class='ctx'> </div><div class='ctx'> 	err = mte_default_setup();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Register signal handlers */</div><div class='del'>-	mte_register_signal(SIGBUS, mte_default_handler);</div><div class='del'>-	mte_register_signal(SIGSEGV, mte_default_handler);</div><div class='add'>+	mte_register_signal(SIGBUS, mte_default_handler, false);</div><div class='add'>+	mte_register_signal(SIGSEGV, mte_default_handler, false);</div><div class='ctx'> </div><div class='ctx'> 	allocate_hugetlb();</div><div class='ctx'> </div><div class='hunk'>@@ -243,6 +245,15 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		return KSFT_FAIL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Check if MTE supports hugetlb mappings */</div><div class='add'>+	map_size = default_huge_page_size();</div><div class='add'>+	map_ptr = mmap(NULL, map_size, PROT_READ | PROT_MTE,</div><div class='add'>+		       MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0);</div><div class='add'>+	if (map_ptr == MAP_FAILED)</div><div class='add'>+		ksft_exit_skip("PROT_MTE not supported with MAP_HUGETLB mappings\n");</div><div class='add'>+	else</div><div class='add'>+		munmap(map_ptr, map_size);</div><div class='add'>+</div><div class='ctx'> 	/* Set test plan */</div><div class='ctx'> 	ksft_set_plan(12);</div><div class='ctx'> </div><div class='hunk'>@@ -270,13 +281,13 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	"Check clear PROT_MTE flags with private mapping and sync error mode and mmap/mprotect memory\n");</div><div class='ctx'> </div><div class='ctx'> 	evaluate_test(check_child_hugetlb_memory_mapping(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE | MAP_HUGETLB),</div><div class='del'>-		"Check child hugetlb memory with private mapping, precise mode and mmap memory\n");</div><div class='add'>+		"Check child hugetlb memory with private mapping, sync error mode and mmap memory\n");</div><div class='ctx'> 	evaluate_test(check_child_hugetlb_memory_mapping(USE_MMAP, MTE_ASYNC_ERR, MAP_PRIVATE | MAP_HUGETLB),</div><div class='del'>-		"Check child hugetlb memory with private mapping, precise mode and mmap memory\n");</div><div class='add'>+		"Check child hugetlb memory with private mapping, async error mode and mmap memory\n");</div><div class='ctx'> 	evaluate_test(check_child_hugetlb_memory_mapping(USE_MPROTECT, MTE_SYNC_ERR, MAP_PRIVATE | MAP_HUGETLB),</div><div class='del'>-		"Check child hugetlb memory with private mapping, precise mode and mmap/mprotect memory\n");</div><div class='add'>+		"Check child hugetlb memory with private mapping, sync error mode and mmap/mprotect memory\n");</div><div class='ctx'> 	evaluate_test(check_child_hugetlb_memory_mapping(USE_MPROTECT, MTE_ASYNC_ERR, MAP_PRIVATE | MAP_HUGETLB),</div><div class='del'>-		"Check child hugetlb memory with private mapping, precise mode and mmap/mprotect memory\n");</div><div class='add'>+		"Check child hugetlb memory with private mapping, async error mode and mmap/mprotect memory\n");</div><div class='ctx'> </div><div class='ctx'> 	mte_restore_setup();</div><div class='ctx'> 	free_hugetlb();</div><div class='head'>diff --git a/tools/testing/selftests/arm64/mte/check_ksm_options.c b/tools/testing/selftests/arm64/mte/check_ksm_options.c<br/>index 88c74bc46d4f..0cf5faef1724 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_ksm_options.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_ksm_options.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_ksm_options.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/mte/check_ksm_options.c</a></div><div class='hunk'>@@ -106,7 +106,7 @@ static int check_madvise_options(int mem_type, int mode, int mapping)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	ptr = mte_allocate_memory(TEST_UNIT * page_sz, mem_type, mapping, true);</div><div class='ctx'> 	if (check_allocated_memory(ptr, TEST_UNIT * page_sz, mem_type, false) != KSFT_PASS)</div><div class='ctx'> 		return KSFT_FAIL;</div><div class='hunk'>@@ -141,8 +141,8 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		return KSFT_FAIL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Register signal handlers */</div><div class='del'>-	mte_register_signal(SIGBUS, mte_default_handler);</div><div class='del'>-	mte_register_signal(SIGSEGV, mte_default_handler);</div><div class='add'>+	mte_register_signal(SIGBUS, mte_default_handler, false);</div><div class='add'>+	mte_register_signal(SIGSEGV, mte_default_handler, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Set test plan */</div><div class='ctx'> 	ksft_set_plan(4);</div><div class='head'>diff --git a/tools/testing/selftests/arm64/mte/check_mmap_options.c b/tools/testing/selftests/arm64/mte/check_mmap_options.c<br/>index 17694caaff53..c100af3012cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_mmap_options.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_mmap_options.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_mmap_options.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/mte/check_mmap_options.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #define _GNU_SOURCE</div><div class='ctx'> </div><div class='add'>+#include &lt;assert.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> #include &lt;signal.h&gt;</div><div class='hunk'>@@ -23,6 +24,35 @@</div><div class='ctx'> #define OVERFLOW		MT_GRANULE_SIZE</div><div class='ctx'> #define TAG_CHECK_ON		0</div><div class='ctx'> #define TAG_CHECK_OFF		1</div><div class='add'>+#define ATAG_CHECK_ON		1</div><div class='add'>+#define ATAG_CHECK_OFF		0</div><div class='add'>+</div><div class='add'>+#define TEST_NAME_MAX		256</div><div class='add'>+</div><div class='add'>+enum mte_mem_check_type {</div><div class='add'>+	CHECK_ANON_MEM = 0,</div><div class='add'>+	CHECK_FILE_MEM = 1,</div><div class='add'>+	CHECK_CLEAR_PROT_MTE = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mte_tag_op_type {</div><div class='add'>+	TAG_OP_ALL = 0,</div><div class='add'>+	TAG_OP_STONLY = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct check_mmap_testcase {</div><div class='add'>+	int check_type;</div><div class='add'>+	int mem_type;</div><div class='add'>+	int mte_sync;</div><div class='add'>+	int mapping;</div><div class='add'>+	int tag_check;</div><div class='add'>+	int atag_check;</div><div class='add'>+	int tag_op;</div><div class='add'>+	bool enable_tco;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TAG_OP_ALL		0</div><div class='add'>+#define TAG_OP_STONLY		1</div><div class='ctx'> </div><div class='ctx'> static size_t page_size;</div><div class='ctx'> static int sizes[] = {</div><div class='hunk'>@@ -30,8 +60,17 @@ static int sizes[] = {</div><div class='ctx'> 	/* page size - 1*/ 0, /* page_size */ 0, /* page size + 1 */ 0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int check_mte_memory(char *ptr, int size, int mode, int tag_check)</div><div class='add'>+static int check_mte_memory(char *ptr, int size, int mode,</div><div class='add'>+		int tag_check,int atag_check, int tag_op)</div><div class='ctx'> {</div><div class='add'>+	char buf[MT_GRANULE_SIZE];</div><div class='add'>+</div><div class='add'>+	if (!mtefar_support &amp;&amp; atag_check == ATAG_CHECK_ON)</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+</div><div class='add'>+	if (atag_check == ATAG_CHECK_ON)</div><div class='add'>+		ptr = mte_insert_atag(ptr);</div><div class='add'>+</div><div class='ctx'> 	mte_initialize_current_context(mode, (uintptr_t)ptr, size);</div><div class='ctx'> 	memset(ptr, '1', size);</div><div class='ctx'> 	mte_wait_after_trig();</div><div class='hunk'>@@ -54,16 +93,34 @@ static int check_mte_memory(char *ptr, int size, int mode, int tag_check)</div><div class='ctx'> 	if (cur_mte_cxt.fault_valid == true &amp;&amp; tag_check == TAG_CHECK_OFF)</div><div class='ctx'> 		return KSFT_FAIL;</div><div class='ctx'> </div><div class='add'>+	if (tag_op == TAG_OP_STONLY) {</div><div class='add'>+		mte_initialize_current_context(mode, (uintptr_t)ptr, -UNDERFLOW);</div><div class='add'>+		memcpy(buf, ptr - UNDERFLOW, MT_GRANULE_SIZE);</div><div class='add'>+		mte_wait_after_trig();</div><div class='add'>+		if (cur_mte_cxt.fault_valid == true)</div><div class='add'>+			return KSFT_FAIL;</div><div class='add'>+</div><div class='add'>+		mte_initialize_current_context(mode, (uintptr_t)ptr, size + OVERFLOW);</div><div class='add'>+		memcpy(buf, ptr + size, MT_GRANULE_SIZE);</div><div class='add'>+		mte_wait_after_trig();</div><div class='add'>+		if (cur_mte_cxt.fault_valid == true)</div><div class='add'>+			return KSFT_FAIL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return KSFT_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int check_anonymous_memory_mapping(int mem_type, int mode, int mapping, int tag_check)</div><div class='add'>+static int check_anonymous_memory_mapping(int mem_type, int mode, int mapping,</div><div class='add'>+		int tag_check, int atag_check, int tag_op)</div><div class='ctx'> {</div><div class='ctx'> 	char *ptr, *map_ptr;</div><div class='ctx'> 	int run, result, map_size;</div><div class='ctx'> 	int item = ARRAY_SIZE(sizes);</div><div class='ctx'> </div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	if (tag_op == TAG_OP_STONLY &amp;&amp; !mtestonly_support)</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, tag_op);</div><div class='ctx'> 	for (run = 0; run &lt; item; run++) {</div><div class='ctx'> 		map_size = sizes[run] + OVERFLOW + UNDERFLOW;</div><div class='ctx'> 		map_ptr = (char *)mte_allocate_memory(map_size, mem_type, mapping, false);</div><div class='hunk'>@@ -79,23 +136,27 @@ static int check_anonymous_memory_mapping(int mem_type, int mode, int mapping, i</div><div class='ctx'> 			munmap((void *)map_ptr, map_size);</div><div class='ctx'> 			return KSFT_FAIL;</div><div class='ctx'> 		}</div><div class='del'>-		result = check_mte_memory(ptr, sizes[run], mode, tag_check);</div><div class='add'>+		result = check_mte_memory(ptr, sizes[run], mode, tag_check, atag_check, tag_op);</div><div class='ctx'> 		mte_clear_tags((void *)ptr, sizes[run]);</div><div class='ctx'> 		mte_free_memory((void *)map_ptr, map_size, mem_type, false);</div><div class='del'>-		if (result == KSFT_FAIL)</div><div class='del'>-			return KSFT_FAIL;</div><div class='add'>+		if (result != KSFT_PASS)</div><div class='add'>+			return result;</div><div class='ctx'> 	}</div><div class='ctx'> 	return KSFT_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int check_file_memory_mapping(int mem_type, int mode, int mapping, int tag_check)</div><div class='add'>+static int check_file_memory_mapping(int mem_type, int mode, int mapping,</div><div class='add'>+		int tag_check, int atag_check, int tag_op)</div><div class='ctx'> {</div><div class='ctx'> 	char *ptr, *map_ptr;</div><div class='ctx'> 	int run, fd, map_size;</div><div class='ctx'> 	int total = ARRAY_SIZE(sizes);</div><div class='ctx'> 	int result = KSFT_PASS;</div><div class='ctx'> </div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	if (tag_op == TAG_OP_STONLY &amp;&amp; !mtestonly_support)</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, tag_op);</div><div class='ctx'> 	for (run = 0; run &lt; total; run++) {</div><div class='ctx'> 		fd = create_temp_file();</div><div class='ctx'> 		if (fd == -1)</div><div class='hunk'>@@ -117,24 +178,24 @@ static int check_file_memory_mapping(int mem_type, int mode, int mapping, int ta</div><div class='ctx'> 			close(fd);</div><div class='ctx'> 			return KSFT_FAIL;</div><div class='ctx'> 		}</div><div class='del'>-		result = check_mte_memory(ptr, sizes[run], mode, tag_check);</div><div class='add'>+		result = check_mte_memory(ptr, sizes[run], mode, tag_check, atag_check, tag_op);</div><div class='ctx'> 		mte_clear_tags((void *)ptr, sizes[run]);</div><div class='ctx'> 		munmap((void *)map_ptr, map_size);</div><div class='ctx'> 		close(fd);</div><div class='del'>-		if (result == KSFT_FAIL)</div><div class='del'>-			break;</div><div class='add'>+		if (result != KSFT_PASS)</div><div class='add'>+			return result;</div><div class='ctx'> 	}</div><div class='del'>-	return result;</div><div class='add'>+	return KSFT_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int check_clear_prot_mte_flag(int mem_type, int mode, int mapping)</div><div class='add'>+static int check_clear_prot_mte_flag(int mem_type, int mode, int mapping, int atag_check)</div><div class='ctx'> {</div><div class='ctx'> 	char *ptr, *map_ptr;</div><div class='ctx'> 	int run, prot_flag, result, fd, map_size;</div><div class='ctx'> 	int total = ARRAY_SIZE(sizes);</div><div class='ctx'> </div><div class='ctx'> 	prot_flag = PROT_READ | PROT_WRITE;</div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	for (run = 0; run &lt; total; run++) {</div><div class='ctx'> 		map_size = sizes[run] + OVERFLOW + UNDERFLOW;</div><div class='ctx'> 		ptr = (char *)mte_allocate_memory_tag_range(sizes[run], mem_type, mapping,</div><div class='hunk'>@@ -150,10 +211,10 @@ static int check_clear_prot_mte_flag(int mem_type, int mode, int mapping)</div><div class='ctx'> 			ksft_print_msg("FAIL: mprotect not ignoring clear PROT_MTE property\n");</div><div class='ctx'> 			return KSFT_FAIL;</div><div class='ctx'> 		}</div><div class='del'>-		result = check_mte_memory(ptr, sizes[run], mode, TAG_CHECK_ON);</div><div class='add'>+		result = check_mte_memory(ptr, sizes[run], mode, TAG_CHECK_ON, atag_check, TAG_OP_ALL);</div><div class='ctx'> 		mte_free_memory_tag_range((void *)ptr, sizes[run], mem_type, UNDERFLOW, OVERFLOW);</div><div class='ctx'> 		if (result != KSFT_PASS)</div><div class='del'>-			return KSFT_FAIL;</div><div class='add'>+			return result;</div><div class='ctx'> </div><div class='ctx'> 		fd = create_temp_file();</div><div class='ctx'> 		if (fd == -1)</div><div class='hunk'>@@ -174,19 +235,715 @@ static int check_clear_prot_mte_flag(int mem_type, int mode, int mapping)</div><div class='ctx'> 			close(fd);</div><div class='ctx'> 			return KSFT_FAIL;</div><div class='ctx'> 		}</div><div class='del'>-		result = check_mte_memory(ptr, sizes[run], mode, TAG_CHECK_ON);</div><div class='add'>+		result = check_mte_memory(ptr, sizes[run], mode, TAG_CHECK_ON, atag_check, TAG_OP_ALL);</div><div class='ctx'> 		mte_free_memory_tag_range((void *)ptr, sizes[run], mem_type, UNDERFLOW, OVERFLOW);</div><div class='ctx'> 		close(fd);</div><div class='ctx'> 		if (result != KSFT_PASS)</div><div class='del'>-			return KSFT_FAIL;</div><div class='add'>+			return result;</div><div class='ctx'> 	}</div><div class='ctx'> 	return KSFT_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const char *format_test_name(struct check_mmap_testcase *tc)</div><div class='add'>+{</div><div class='add'>+	static char test_name[TEST_NAME_MAX];</div><div class='add'>+	const char *check_type_str;</div><div class='add'>+	const char *mem_type_str;</div><div class='add'>+	const char *sync_str;</div><div class='add'>+	const char *mapping_str;</div><div class='add'>+	const char *tag_check_str;</div><div class='add'>+	const char *atag_check_str;</div><div class='add'>+	const char *tag_op_str;</div><div class='add'>+</div><div class='add'>+	switch (tc-&gt;check_type) {</div><div class='add'>+	case CHECK_ANON_MEM:</div><div class='add'>+		check_type_str = "anonymous memory";</div><div class='add'>+		break;</div><div class='add'>+	case CHECK_FILE_MEM:</div><div class='add'>+		check_type_str = "file memory";</div><div class='add'>+		break;</div><div class='add'>+	case CHECK_CLEAR_PROT_MTE:</div><div class='add'>+		check_type_str = "clear PROT_MTE flags";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		assert(0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (tc-&gt;mem_type) {</div><div class='add'>+	case USE_MMAP:</div><div class='add'>+		mem_type_str = "mmap";</div><div class='add'>+		break;</div><div class='add'>+	case USE_MPROTECT:</div><div class='add'>+		mem_type_str = "mmap/mprotect";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		assert(0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (tc-&gt;mte_sync) {</div><div class='add'>+	case MTE_NONE_ERR:</div><div class='add'>+		sync_str = "no error";</div><div class='add'>+		break;</div><div class='add'>+	case MTE_SYNC_ERR:</div><div class='add'>+		sync_str = "sync error";</div><div class='add'>+		break;</div><div class='add'>+	case MTE_ASYNC_ERR:</div><div class='add'>+		sync_str = "async error";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		assert(0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (tc-&gt;mapping) {</div><div class='add'>+	case MAP_SHARED:</div><div class='add'>+		mapping_str = "shared";</div><div class='add'>+		break;</div><div class='add'>+	case MAP_PRIVATE:</div><div class='add'>+		mapping_str = "private";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		assert(0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (tc-&gt;tag_check) {</div><div class='add'>+	case TAG_CHECK_ON:</div><div class='add'>+		tag_check_str = "tag check on";</div><div class='add'>+		break;</div><div class='add'>+	case TAG_CHECK_OFF:</div><div class='add'>+		tag_check_str = "tag check off";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		assert(0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (tc-&gt;atag_check) {</div><div class='add'>+	case ATAG_CHECK_ON:</div><div class='add'>+		atag_check_str = "with address tag [63:60]";</div><div class='add'>+		break;</div><div class='add'>+	case ATAG_CHECK_OFF:</div><div class='add'>+		atag_check_str = "without address tag [63:60]";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		assert(0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(test_name, sizeof(test_name),</div><div class='add'>+	         "Check %s with %s mapping, %s mode, %s memory and %s (%s)\n",</div><div class='add'>+	         check_type_str, mapping_str, sync_str, mem_type_str,</div><div class='add'>+	         tag_check_str, atag_check_str);</div><div class='add'>+</div><div class='add'>+	switch (tc-&gt;tag_op) {</div><div class='add'>+	case TAG_OP_ALL:</div><div class='add'>+		tag_op_str = "";</div><div class='add'>+		break;</div><div class='add'>+	case TAG_OP_STONLY:</div><div class='add'>+		tag_op_str = " / store-only";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		assert(0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(test_name, TEST_NAME_MAX,</div><div class='add'>+	         "Check %s with %s mapping, %s mode, %s memory and %s (%s%s)\n",</div><div class='add'>+	         check_type_str, mapping_str, sync_str, mem_type_str,</div><div class='add'>+	         tag_check_str, atag_check_str, tag_op_str);</div><div class='add'>+</div><div class='add'>+	return test_name;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err, i;</div><div class='ctx'> 	int item = ARRAY_SIZE(sizes);</div><div class='add'>+	struct check_mmap_testcase test_cases[]= {</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_OFF,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = true,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_OFF,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = true,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_NONE_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_OFF,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_NONE_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_OFF,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_CLEAR_PROT_MTE,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_CLEAR_PROT_MTE,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_OFF,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_ANON_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_SHARED,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_FILE_MEM,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_ASYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_STONLY,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_CLEAR_PROT_MTE,</div><div class='add'>+			.mem_type = USE_MMAP,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.check_type = CHECK_CLEAR_PROT_MTE,</div><div class='add'>+			.mem_type = USE_MPROTECT,</div><div class='add'>+			.mte_sync = MTE_SYNC_ERR,</div><div class='add'>+			.mapping = MAP_PRIVATE,</div><div class='add'>+			.tag_check = TAG_CHECK_ON,</div><div class='add'>+			.atag_check = ATAG_CHECK_ON,</div><div class='add'>+			.tag_op = TAG_OP_ALL,</div><div class='add'>+			.enable_tco = false,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	err = mte_default_setup();</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -200,64 +957,51 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	sizes[item - 2] = page_size;</div><div class='ctx'> 	sizes[item - 1] = page_size + 1;</div><div class='ctx'> </div><div class='del'>-	/* Register signal handlers */</div><div class='del'>-	mte_register_signal(SIGBUS, mte_default_handler);</div><div class='del'>-	mte_register_signal(SIGSEGV, mte_default_handler);</div><div class='del'>-</div><div class='ctx'> 	/* Set test plan */</div><div class='del'>-	ksft_set_plan(22);</div><div class='del'>-</div><div class='del'>-	mte_enable_pstate_tco();</div><div class='del'>-</div><div class='del'>-	evaluate_test(check_anonymous_memory_mapping(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE, TAG_CHECK_OFF),</div><div class='del'>-	"Check anonymous memory with private mapping, sync error mode, mmap memory and tag check off\n");</div><div class='del'>-	evaluate_test(check_file_memory_mapping(USE_MPROTECT, MTE_SYNC_ERR, MAP_PRIVATE, TAG_CHECK_OFF),</div><div class='del'>-	"Check file memory with private mapping, sync error mode, mmap/mprotect memory and tag check off\n");</div><div class='del'>-</div><div class='del'>-	mte_disable_pstate_tco();</div><div class='del'>-	evaluate_test(check_anonymous_memory_mapping(USE_MMAP, MTE_NONE_ERR, MAP_PRIVATE, TAG_CHECK_OFF),</div><div class='del'>-	"Check anonymous memory with private mapping, no error mode, mmap memory and tag check off\n");</div><div class='del'>-	evaluate_test(check_file_memory_mapping(USE_MPROTECT, MTE_NONE_ERR, MAP_PRIVATE, TAG_CHECK_OFF),</div><div class='del'>-	"Check file memory with private mapping, no error mode, mmap/mprotect memory and tag check off\n");</div><div class='del'>-</div><div class='del'>-	evaluate_test(check_anonymous_memory_mapping(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE, TAG_CHECK_ON),</div><div class='del'>-	"Check anonymous memory with private mapping, sync error mode, mmap memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_anonymous_memory_mapping(USE_MPROTECT, MTE_SYNC_ERR, MAP_PRIVATE, TAG_CHECK_ON),</div><div class='del'>-	"Check anonymous memory with private mapping, sync error mode, mmap/mprotect memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_anonymous_memory_mapping(USE_MMAP, MTE_SYNC_ERR, MAP_SHARED, TAG_CHECK_ON),</div><div class='del'>-	"Check anonymous memory with shared mapping, sync error mode, mmap memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_anonymous_memory_mapping(USE_MPROTECT, MTE_SYNC_ERR, MAP_SHARED, TAG_CHECK_ON),</div><div class='del'>-	"Check anonymous memory with shared mapping, sync error mode, mmap/mprotect memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_anonymous_memory_mapping(USE_MMAP, MTE_ASYNC_ERR, MAP_PRIVATE, TAG_CHECK_ON),</div><div class='del'>-	"Check anonymous memory with private mapping, async error mode, mmap memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_anonymous_memory_mapping(USE_MPROTECT, MTE_ASYNC_ERR, MAP_PRIVATE, TAG_CHECK_ON),</div><div class='del'>-	"Check anonymous memory with private mapping, async error mode, mmap/mprotect memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_anonymous_memory_mapping(USE_MMAP, MTE_ASYNC_ERR, MAP_SHARED, TAG_CHECK_ON),</div><div class='del'>-	"Check anonymous memory with shared mapping, async error mode, mmap memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_anonymous_memory_mapping(USE_MPROTECT, MTE_ASYNC_ERR, MAP_SHARED, TAG_CHECK_ON),</div><div class='del'>-	"Check anonymous memory with shared mapping, async error mode, mmap/mprotect memory and tag check on\n");</div><div class='del'>-</div><div class='del'>-	evaluate_test(check_file_memory_mapping(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE, TAG_CHECK_ON),</div><div class='del'>-	"Check file memory with private mapping, sync error mode, mmap memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_file_memory_mapping(USE_MPROTECT, MTE_SYNC_ERR, MAP_PRIVATE, TAG_CHECK_ON),</div><div class='del'>-	"Check file memory with private mapping, sync error mode, mmap/mprotect memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_file_memory_mapping(USE_MMAP, MTE_SYNC_ERR, MAP_SHARED, TAG_CHECK_ON),</div><div class='del'>-	"Check file memory with shared mapping, sync error mode, mmap memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_file_memory_mapping(USE_MPROTECT, MTE_SYNC_ERR, MAP_SHARED, TAG_CHECK_ON),</div><div class='del'>-	"Check file memory with shared mapping, sync error mode, mmap/mprotect memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_file_memory_mapping(USE_MMAP, MTE_ASYNC_ERR, MAP_PRIVATE, TAG_CHECK_ON),</div><div class='del'>-	"Check file memory with private mapping, async error mode, mmap memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_file_memory_mapping(USE_MPROTECT, MTE_ASYNC_ERR, MAP_PRIVATE, TAG_CHECK_ON),</div><div class='del'>-	"Check file memory with private mapping, async error mode, mmap/mprotect memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_file_memory_mapping(USE_MMAP, MTE_ASYNC_ERR, MAP_SHARED, TAG_CHECK_ON),</div><div class='del'>-	"Check file memory with shared mapping, async error mode, mmap memory and tag check on\n");</div><div class='del'>-	evaluate_test(check_file_memory_mapping(USE_MPROTECT, MTE_ASYNC_ERR, MAP_SHARED, TAG_CHECK_ON),</div><div class='del'>-	"Check file memory with shared mapping, async error mode, mmap/mprotect memory and tag check on\n");</div><div class='del'>-</div><div class='del'>-	evaluate_test(check_clear_prot_mte_flag(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE),</div><div class='del'>-	"Check clear PROT_MTE flags with private mapping, sync error mode and mmap memory\n");</div><div class='del'>-	evaluate_test(check_clear_prot_mte_flag(USE_MPROTECT, MTE_SYNC_ERR, MAP_PRIVATE),</div><div class='del'>-	"Check clear PROT_MTE flags with private mapping and sync error mode and mmap/mprotect memory\n");</div><div class='add'>+	ksft_set_plan(ARRAY_SIZE(test_cases));</div><div class='add'>+</div><div class='add'>+	for (i = 0 ; i &lt; ARRAY_SIZE(test_cases); i++) {</div><div class='add'>+		/* Register signal handlers */</div><div class='add'>+		mte_register_signal(SIGBUS, mte_default_handler,</div><div class='add'>+				    test_cases[i].atag_check == ATAG_CHECK_ON);</div><div class='add'>+		mte_register_signal(SIGSEGV, mte_default_handler,</div><div class='add'>+				    test_cases[i].atag_check == ATAG_CHECK_ON);</div><div class='add'>+</div><div class='add'>+		if (test_cases[i].enable_tco)</div><div class='add'>+			mte_enable_pstate_tco();</div><div class='add'>+		else</div><div class='add'>+			mte_disable_pstate_tco();</div><div class='add'>+</div><div class='add'>+		switch (test_cases[i].check_type) {</div><div class='add'>+		case CHECK_ANON_MEM:</div><div class='add'>+			evaluate_test(check_anonymous_memory_mapping(test_cases[i].mem_type,</div><div class='add'>+								     test_cases[i].mte_sync,</div><div class='add'>+								     test_cases[i].mapping,</div><div class='add'>+								     test_cases[i].tag_check,</div><div class='add'>+								     test_cases[i].atag_check,</div><div class='add'>+								     test_cases[i].tag_op),</div><div class='add'>+				      format_test_name(&amp;test_cases[i]));</div><div class='add'>+			break;</div><div class='add'>+		case CHECK_FILE_MEM:</div><div class='add'>+			evaluate_test(check_file_memory_mapping(test_cases[i].mem_type,</div><div class='add'>+							        test_cases[i].mte_sync,</div><div class='add'>+							        test_cases[i].mapping,</div><div class='add'>+							        test_cases[i].tag_check,</div><div class='add'>+							        test_cases[i].atag_check,</div><div class='add'>+								test_cases[i].tag_op),</div><div class='add'>+				      format_test_name(&amp;test_cases[i]));</div><div class='add'>+			break;</div><div class='add'>+		case CHECK_CLEAR_PROT_MTE:</div><div class='add'>+			evaluate_test(check_clear_prot_mte_flag(test_cases[i].mem_type,</div><div class='add'>+							        test_cases[i].mte_sync,</div><div class='add'>+							        test_cases[i].mapping,</div><div class='add'>+							        test_cases[i].atag_check),</div><div class='add'>+				      format_test_name(&amp;test_cases[i]));</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			exit(KSFT_FAIL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mte_restore_setup();</div><div class='ctx'> 	ksft_print_cnts();</div><div class='head'>diff --git a/tools/testing/selftests/arm64/mte/check_prctl.c b/tools/testing/selftests/arm64/mte/check_prctl.c<br/>index 4c89e9538ca0..f7f320defa7b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_prctl.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_prctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_prctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/mte/check_prctl.c</a></div><div class='hunk'>@@ -12,6 +12,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "kselftest.h"</div><div class='ctx'> </div><div class='add'>+#ifndef AT_HWCAP3</div><div class='add'>+#define AT_HWCAP3 29</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int set_tagged_addr_ctrl(int val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -60,7 +64,7 @@ void check_basic_read(void)</div><div class='ctx'> /*</div><div class='ctx'>  * Attempt to set a specified combination of modes.</div><div class='ctx'>  */</div><div class='del'>-void set_mode_test(const char *name, int hwcap2, int mask)</div><div class='add'>+void set_mode_test(const char *name, int hwcap2, int hwcap3, int mask)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -69,6 +73,11 @@ void set_mode_test(const char *name, int hwcap2, int mask)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((getauxval(AT_HWCAP3) &amp; hwcap3) != hwcap3) {</div><div class='add'>+		ksft_test_result_skip("%s\n", name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = set_tagged_addr_ctrl(mask);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		ksft_test_result_fail("%s\n", name);</div><div class='hunk'>@@ -81,7 +90,7 @@ void set_mode_test(const char *name, int hwcap2, int mask)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((ret &amp; PR_MTE_TCF_MASK) == mask) {</div><div class='add'>+	if ((ret &amp; (PR_MTE_TCF_MASK | PR_MTE_STORE_ONLY)) == mask) {</div><div class='ctx'> 		ksft_test_result_pass("%s\n", name);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_print_msg("Got %x, expected %x\n",</div><div class='hunk'>@@ -93,12 +102,16 @@ void set_mode_test(const char *name, int hwcap2, int mask)</div><div class='ctx'> struct mte_mode {</div><div class='ctx'> 	int mask;</div><div class='ctx'> 	int hwcap2;</div><div class='add'>+	int hwcap3;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> } mte_modes[] = {</div><div class='del'>-	{ PR_MTE_TCF_NONE,  0,          "NONE"  },</div><div class='del'>-	{ PR_MTE_TCF_SYNC,  HWCAP2_MTE, "SYNC"  },</div><div class='del'>-	{ PR_MTE_TCF_ASYNC, HWCAP2_MTE, "ASYNC" },</div><div class='del'>-	{ PR_MTE_TCF_SYNC | PR_MTE_TCF_ASYNC,  HWCAP2_MTE, "SYNC+ASYNC"  },</div><div class='add'>+	{ PR_MTE_TCF_NONE,                                        0,          0,                     "NONE"  },</div><div class='add'>+	{ PR_MTE_TCF_SYNC,                                        HWCAP2_MTE, 0,                     "SYNC"  },</div><div class='add'>+	{ PR_MTE_TCF_ASYNC,                                       HWCAP2_MTE, 0,                     "ASYNC" },</div><div class='add'>+	{ PR_MTE_TCF_SYNC | PR_MTE_TCF_ASYNC,                     HWCAP2_MTE, 0,                     "SYNC+ASYNC"  },</div><div class='add'>+	{ PR_MTE_TCF_SYNC | PR_MTE_STORE_ONLY,                    HWCAP2_MTE, HWCAP3_MTE_STORE_ONLY, "SYNC+STONLY" },</div><div class='add'>+	{ PR_MTE_TCF_ASYNC | PR_MTE_STORE_ONLY,                   HWCAP2_MTE, HWCAP3_MTE_STORE_ONLY, "ASYNC+STONLY" },</div><div class='add'>+	{ PR_MTE_TCF_SYNC | PR_MTE_TCF_ASYNC | PR_MTE_STORE_ONLY, HWCAP2_MTE, HWCAP3_MTE_STORE_ONLY, "SYNC+ASYNC+STONLY" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int main(void)</div><div class='hunk'>@@ -106,11 +119,11 @@ int main(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	ksft_print_header();</div><div class='del'>-	ksft_set_plan(5);</div><div class='add'>+	ksft_set_plan(ARRAY_SIZE(mte_modes));</div><div class='ctx'> </div><div class='ctx'> 	check_basic_read();</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(mte_modes); i++)</div><div class='del'>-		set_mode_test(mte_modes[i].name, mte_modes[i].hwcap2,</div><div class='add'>+		set_mode_test(mte_modes[i].name, mte_modes[i].hwcap2, mte_modes[i].hwcap3,</div><div class='ctx'> 			      mte_modes[i].mask);</div><div class='ctx'> </div><div class='ctx'> 	ksft_print_cnts();</div><div class='head'>diff --git a/tools/testing/selftests/arm64/mte/check_tags_inclusion.c b/tools/testing/selftests/arm64/mte/check_tags_inclusion.c<br/>index a3d1e23fe02a..4b764f2a8185 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_tags_inclusion.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_tags_inclusion.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_tags_inclusion.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/mte/check_tags_inclusion.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ static int check_single_included_tags(int mem_type, int mode)</div><div class='ctx'> 		return KSFT_FAIL;</div><div class='ctx'> </div><div class='ctx'> 	for (tag = 0; (tag &lt; MT_TAG_COUNT) &amp;&amp; (result == KSFT_PASS); tag++) {</div><div class='del'>-		ret = mte_switch_mode(mode, MT_INCLUDE_VALID_TAG(tag));</div><div class='add'>+		ret = mte_switch_mode(mode, MT_INCLUDE_VALID_TAG(tag), false);</div><div class='ctx'> 		if (ret != 0)</div><div class='ctx'> 			result = KSFT_FAIL;</div><div class='ctx'> 		/* Try to catch a excluded tag by a number of tries. */</div><div class='hunk'>@@ -91,7 +91,7 @@ static int check_multiple_included_tags(int mem_type, int mode)</div><div class='ctx'> </div><div class='ctx'> 	for (tag = 0; (tag &lt; MT_TAG_COUNT - 1) &amp;&amp; (result == KSFT_PASS); tag++) {</div><div class='ctx'> 		excl_mask |= 1 &lt;&lt; tag;</div><div class='del'>-		mte_switch_mode(mode, MT_INCLUDE_VALID_TAGS(excl_mask));</div><div class='add'>+		mte_switch_mode(mode, MT_INCLUDE_VALID_TAGS(excl_mask), false);</div><div class='ctx'> 		/* Try to catch a excluded tag by a number of tries. */</div><div class='ctx'> 		for (run = 0; (run &lt; RUNS) &amp;&amp; (result == KSFT_PASS); run++) {</div><div class='ctx'> 			ptr = mte_insert_tags(ptr, BUFFER_SIZE);</div><div class='hunk'>@@ -120,7 +120,7 @@ static int check_all_included_tags(int mem_type, int mode)</div><div class='ctx'> 				   mem_type, false) != KSFT_PASS)</div><div class='ctx'> 		return KSFT_FAIL;</div><div class='ctx'> </div><div class='del'>-	ret = mte_switch_mode(mode, MT_INCLUDE_TAG_MASK);</div><div class='add'>+	ret = mte_switch_mode(mode, MT_INCLUDE_TAG_MASK, false);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		return KSFT_FAIL;</div><div class='ctx'> 	/* Try to catch a excluded tag by a number of tries. */</div><div class='hunk'>@@ -145,7 +145,7 @@ static int check_none_included_tags(int mem_type, int mode)</div><div class='ctx'> 	if (check_allocated_memory(ptr, BUFFER_SIZE, mem_type, false) != KSFT_PASS)</div><div class='ctx'> 		return KSFT_FAIL;</div><div class='ctx'> </div><div class='del'>-	ret = mte_switch_mode(mode, MT_EXCLUDE_TAG_MASK);</div><div class='add'>+	ret = mte_switch_mode(mode, MT_EXCLUDE_TAG_MASK, false);</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		return KSFT_FAIL;</div><div class='ctx'> 	/* Try to catch a excluded tag by a number of tries. */</div><div class='hunk'>@@ -180,7 +180,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Register SIGSEGV handler */</div><div class='del'>-	mte_register_signal(SIGSEGV, mte_default_handler);</div><div class='add'>+	mte_register_signal(SIGSEGV, mte_default_handler, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Set test plan */</div><div class='ctx'> 	ksft_set_plan(4);</div><div class='head'>diff --git a/tools/testing/selftests/arm64/mte/check_user_mem.c b/tools/testing/selftests/arm64/mte/check_user_mem.c<br/>index f4ae5f87a3b7..fb7936c4e097 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_user_mem.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/check_user_mem.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/check_user_mem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/mte/check_user_mem.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping,</div><div class='ctx'> </div><div class='ctx'> 	err = KSFT_PASS;</div><div class='ctx'> 	len = 2 * page_sz;</div><div class='del'>-	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false);</div><div class='ctx'> 	fd = create_temp_file();</div><div class='ctx'> 	if (fd == -1)</div><div class='ctx'> 		return KSFT_FAIL;</div><div class='hunk'>@@ -211,7 +211,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Register signal handlers */</div><div class='del'>-	mte_register_signal(SIGSEGV, mte_default_handler);</div><div class='add'>+	mte_register_signal(SIGSEGV, mte_default_handler, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Set test plan */</div><div class='ctx'> 	ksft_set_plan(64);</div><div class='head'>diff --git a/tools/testing/selftests/arm64/mte/mte_common_util.c b/tools/testing/selftests/arm64/mte/mte_common_util.c<br/>index a1dc2fe5285b..397e57dd946a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/mte_common_util.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/mte_common_util.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/mte_common_util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/mte/mte_common_util.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include &lt;signal.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;time.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/auxvec.h&gt;</div><div class='hunk'>@@ -19,20 +20,40 @@</div><div class='ctx'> #include "mte_common_util.h"</div><div class='ctx'> #include "mte_def.h"</div><div class='ctx'> </div><div class='add'>+#ifndef SA_EXPOSE_TAGBITS</div><div class='add'>+#define SA_EXPOSE_TAGBITS 0x00000800</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define INIT_BUFFER_SIZE       256</div><div class='ctx'> </div><div class='ctx'> struct mte_fault_cxt cur_mte_cxt;</div><div class='add'>+bool mtefar_support;</div><div class='add'>+bool mtestonly_support;</div><div class='ctx'> static unsigned int mte_cur_mode;</div><div class='ctx'> static unsigned int mte_cur_pstate_tco;</div><div class='add'>+static bool mte_cur_stonly;</div><div class='ctx'> </div><div class='ctx'> void mte_default_handler(int signum, siginfo_t *si, void *uc)</div><div class='ctx'> {</div><div class='add'>+	struct sigaction sa;</div><div class='ctx'> 	unsigned long addr = (unsigned long)si-&gt;si_addr;</div><div class='add'>+	unsigned char si_tag, si_atag;</div><div class='add'>+</div><div class='add'>+	sigaction(signum, NULL, &amp;sa);</div><div class='add'>+</div><div class='add'>+	if (sa.sa_flags &amp; SA_EXPOSE_TAGBITS) {</div><div class='add'>+		si_tag = MT_FETCH_TAG(addr);</div><div class='add'>+		si_atag = MT_FETCH_ATAG(addr);</div><div class='add'>+		addr = MT_CLEAR_TAGS(addr);</div><div class='add'>+	} else {</div><div class='add'>+		si_tag = 0;</div><div class='add'>+		si_atag = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (signum == SIGSEGV) {</div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-		ksft_print_msg("INFO: SIGSEGV signal at pc=%lx, fault addr=%lx, si_code=%lx\n",</div><div class='del'>-				((ucontext_t *)uc)-&gt;uc_mcontext.pc, addr, si-&gt;si_code);</div><div class='add'>+		ksft_print_msg("INFO: SIGSEGV signal at pc=%lx, fault addr=%lx, si_code=%lx, si_tag=%x, si_atag=%x\n",</div><div class='add'>+				((ucontext_t *)uc)-&gt;uc_mcontext.pc, addr, si-&gt;si_code, si_tag, si_atag);</div><div class='ctx'> #endif</div><div class='ctx'> 		if (si-&gt;si_code == SEGV_MTEAERR) {</div><div class='ctx'> 			if (cur_mte_cxt.trig_si_code == si-&gt;si_code)</div><div class='hunk'>@@ -45,13 +66,18 @@ void mte_default_handler(int signum, siginfo_t *si, void *uc)</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Compare the context for precise error */</div><div class='ctx'> 		else if (si-&gt;si_code == SEGV_MTESERR) {</div><div class='add'>+			if ((!mtefar_support &amp;&amp; si_atag) || (si_atag != MT_FETCH_ATAG(cur_mte_cxt.trig_addr))) {</div><div class='add'>+				ksft_print_msg("Invalid MTE synchronous exception caught for address tag! si_tag=%x, si_atag: %x\n", si_tag, si_atag);</div><div class='add'>+				exit(KSFT_FAIL);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			if (cur_mte_cxt.trig_si_code == si-&gt;si_code &amp;&amp;</div><div class='ctx'> 			    ((cur_mte_cxt.trig_range &gt;= 0 &amp;&amp;</div><div class='del'>-			      addr &gt;= MT_CLEAR_TAG(cur_mte_cxt.trig_addr) &amp;&amp;</div><div class='del'>-			      addr &lt;= (MT_CLEAR_TAG(cur_mte_cxt.trig_addr) + cur_mte_cxt.trig_range)) ||</div><div class='add'>+			      addr &gt;= MT_CLEAR_TAGS(cur_mte_cxt.trig_addr) &amp;&amp;</div><div class='add'>+			      addr &lt;= (MT_CLEAR_TAGS(cur_mte_cxt.trig_addr) + cur_mte_cxt.trig_range)) ||</div><div class='ctx'> 			     (cur_mte_cxt.trig_range &lt; 0 &amp;&amp;</div><div class='del'>-			      addr &lt;= MT_CLEAR_TAG(cur_mte_cxt.trig_addr) &amp;&amp;</div><div class='del'>-			      addr &gt;= (MT_CLEAR_TAG(cur_mte_cxt.trig_addr) + cur_mte_cxt.trig_range)))) {</div><div class='add'>+			      addr &lt;= MT_CLEAR_TAGS(cur_mte_cxt.trig_addr) &amp;&amp;</div><div class='add'>+			      addr &gt;= (MT_CLEAR_TAGS(cur_mte_cxt.trig_addr) + cur_mte_cxt.trig_range)))) {</div><div class='ctx'> 				cur_mte_cxt.fault_valid = true;</div><div class='ctx'> 				/* Adjust the pc by 4 */</div><div class='ctx'> 				((ucontext_t *)uc)-&gt;uc_mcontext.pc += 4;</div><div class='hunk'>@@ -67,11 +93,11 @@ void mte_default_handler(int signum, siginfo_t *si, void *uc)</div><div class='ctx'> 		ksft_print_msg("INFO: SIGBUS signal at pc=%llx, fault addr=%lx, si_code=%x\n",</div><div class='ctx'> 				((ucontext_t *)uc)-&gt;uc_mcontext.pc, addr, si-&gt;si_code);</div><div class='ctx'> 		if ((cur_mte_cxt.trig_range &gt;= 0 &amp;&amp;</div><div class='del'>-		     addr &gt;= MT_CLEAR_TAG(cur_mte_cxt.trig_addr) &amp;&amp;</div><div class='del'>-		     addr &lt;= (MT_CLEAR_TAG(cur_mte_cxt.trig_addr) + cur_mte_cxt.trig_range)) ||</div><div class='add'>+		     addr &gt;= MT_CLEAR_TAGS(cur_mte_cxt.trig_addr) &amp;&amp;</div><div class='add'>+		     addr &lt;= (MT_CLEAR_TAGS(cur_mte_cxt.trig_addr) + cur_mte_cxt.trig_range)) ||</div><div class='ctx'> 		    (cur_mte_cxt.trig_range &lt; 0 &amp;&amp;</div><div class='del'>-		     addr &lt;= MT_CLEAR_TAG(cur_mte_cxt.trig_addr) &amp;&amp;</div><div class='del'>-		     addr &gt;= (MT_CLEAR_TAG(cur_mte_cxt.trig_addr) + cur_mte_cxt.trig_range))) {</div><div class='add'>+		     addr &lt;= MT_CLEAR_TAGS(cur_mte_cxt.trig_addr) &amp;&amp;</div><div class='add'>+		     addr &gt;= (MT_CLEAR_TAGS(cur_mte_cxt.trig_addr) + cur_mte_cxt.trig_range))) {</div><div class='ctx'> 			cur_mte_cxt.fault_valid = true;</div><div class='ctx'> 			/* Adjust the pc by 4 */</div><div class='ctx'> 			((ucontext_t *)uc)-&gt;uc_mcontext.pc += 4;</div><div class='hunk'>@@ -79,12 +105,17 @@ void mte_default_handler(int signum, siginfo_t *si, void *uc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mte_register_signal(int signal, void (*handler)(int, siginfo_t *, void *))</div><div class='add'>+void mte_register_signal(int signal, void (*handler)(int, siginfo_t *, void *),</div><div class='add'>+			 bool export_tags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sigaction sa;</div><div class='ctx'> </div><div class='ctx'> 	sa.sa_sigaction = handler;</div><div class='ctx'> 	sa.sa_flags = SA_SIGINFO;</div><div class='add'>+</div><div class='add'>+	if (export_tags &amp;&amp; signal == SIGSEGV)</div><div class='add'>+		sa.sa_flags |= SA_EXPOSE_TAGBITS;</div><div class='add'>+</div><div class='ctx'> 	sigemptyset(&amp;sa.sa_mask);</div><div class='ctx'> 	sigaction(signal, &amp;sa, NULL);</div><div class='ctx'> }</div><div class='hunk'>@@ -120,6 +151,19 @@ void mte_clear_tags(void *ptr, size_t size)</div><div class='ctx'> 	mte_clear_tag_address_range(ptr, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void *mte_insert_atag(void *ptr)</div><div class='add'>+{</div><div class='add'>+	unsigned char atag;</div><div class='add'>+</div><div class='add'>+	atag =  mtefar_support ? (random() % MT_ATAG_MASK) + 1 : 0;</div><div class='add'>+	return (void *)MT_SET_ATAG((unsigned long)ptr, atag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *mte_clear_atag(void *ptr)</div><div class='add'>+{</div><div class='add'>+	return (void *)MT_CLEAR_ATAG((unsigned long)ptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void *__mte_allocate_memory_range(size_t size, int mem_type, int mapping,</div><div class='ctx'> 					 size_t range_before, size_t range_after,</div><div class='ctx'> 					 bool tags, int fd)</div><div class='hunk'>@@ -272,7 +316,7 @@ void mte_initialize_current_context(int mode, uintptr_t ptr, ssize_t range)</div><div class='ctx'> 		cur_mte_cxt.trig_si_code = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mte_switch_mode(int mte_option, unsigned long incl_mask)</div><div class='add'>+int mte_switch_mode(int mte_option, unsigned long incl_mask, bool stonly)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long en = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -304,6 +348,9 @@ int mte_switch_mode(int mte_option, unsigned long incl_mask)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (mtestonly_support &amp;&amp; stonly)</div><div class='add'>+		en |= PR_MTE_STORE_ONLY;</div><div class='add'>+</div><div class='ctx'> 	en |= (incl_mask &lt;&lt; PR_MTE_TAG_SHIFT);</div><div class='ctx'> 	/* Enable address tagging ABI, mte error reporting mode and tag inclusion mask. */</div><div class='ctx'> 	if (prctl(PR_SET_TAGGED_ADDR_CTRL, en, 0, 0, 0) != 0) {</div><div class='hunk'>@@ -316,12 +363,21 @@ int mte_switch_mode(int mte_option, unsigned long incl_mask)</div><div class='ctx'> int mte_default_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long hwcaps2 = getauxval(AT_HWCAP2);</div><div class='add'>+	unsigned long hwcaps3 = getauxval(AT_HWCAP3);</div><div class='ctx'> 	unsigned long en = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* To generate random address tag */</div><div class='add'>+	srandom(time(NULL));</div><div class='add'>+</div><div class='ctx'> 	if (!(hwcaps2 &amp; HWCAP2_MTE))</div><div class='ctx'> 		ksft_exit_skip("MTE features unavailable\n");</div><div class='ctx'> </div><div class='add'>+	mtefar_support = !!(hwcaps3 &amp; HWCAP3_MTE_FAR);</div><div class='add'>+</div><div class='add'>+	if (hwcaps3 &amp; HWCAP3_MTE_STORE_ONLY)</div><div class='add'>+		mtestonly_support = true;</div><div class='add'>+</div><div class='ctx'> 	/* Get current mte mode */</div><div class='ctx'> 	ret = prctl(PR_GET_TAGGED_ADDR_CTRL, en, 0, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -335,6 +391,8 @@ int mte_default_setup(void)</div><div class='ctx'> 	else if (ret &amp; PR_MTE_TCF_NONE)</div><div class='ctx'> 		mte_cur_mode = MTE_NONE_ERR;</div><div class='ctx'> </div><div class='add'>+	mte_cur_stonly = (ret &amp; PR_MTE_STORE_ONLY) ? true : false;</div><div class='add'>+</div><div class='ctx'> 	mte_cur_pstate_tco = mte_get_pstate_tco();</div><div class='ctx'> 	/* Disable PSTATE.TCO */</div><div class='ctx'> 	mte_disable_pstate_tco();</div><div class='hunk'>@@ -343,7 +401,7 @@ int mte_default_setup(void)</div><div class='ctx'> </div><div class='ctx'> void mte_restore_setup(void)</div><div class='ctx'> {</div><div class='del'>-	mte_switch_mode(mte_cur_mode, MTE_ALLOW_NON_ZERO_TAG);</div><div class='add'>+	mte_switch_mode(mte_cur_mode, MTE_ALLOW_NON_ZERO_TAG, mte_cur_stonly);</div><div class='ctx'> 	if (mte_cur_pstate_tco == MT_PSTATE_TCO_EN)</div><div class='ctx'> 		mte_enable_pstate_tco();</div><div class='ctx'> 	else if (mte_cur_pstate_tco == MT_PSTATE_TCO_DIS)</div><div class='head'>diff --git a/tools/testing/selftests/arm64/mte/mte_common_util.h b/tools/testing/selftests/arm64/mte/mte_common_util.h<br/>index a0017a303beb..250d671329a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/mte_common_util.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/mte_common_util.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/mte_common_util.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/mte/mte_common_util.h</a></div><div class='hunk'>@@ -37,10 +37,13 @@ struct mte_fault_cxt {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct mte_fault_cxt cur_mte_cxt;</div><div class='add'>+extern bool mtefar_support;</div><div class='add'>+extern bool mtestonly_support;</div><div class='ctx'> </div><div class='ctx'> /* MTE utility functions */</div><div class='ctx'> void mte_default_handler(int signum, siginfo_t *si, void *uc);</div><div class='del'>-void mte_register_signal(int signal, void (*handler)(int, siginfo_t *, void *));</div><div class='add'>+void mte_register_signal(int signal, void (*handler)(int, siginfo_t *, void *),</div><div class='add'>+			 bool export_tags);</div><div class='ctx'> void mte_wait_after_trig(void);</div><div class='ctx'> void *mte_allocate_memory(size_t size, int mem_type, int mapping, bool tags);</div><div class='ctx'> void *mte_allocate_memory_tag_range(size_t size, int mem_type, int mapping,</div><div class='hunk'>@@ -54,9 +57,11 @@ void mte_free_memory_tag_range(void *ptr, size_t size, int mem_type,</div><div class='ctx'> 			       size_t range_before, size_t range_after);</div><div class='ctx'> void *mte_insert_tags(void *ptr, size_t size);</div><div class='ctx'> void mte_clear_tags(void *ptr, size_t size);</div><div class='add'>+void *mte_insert_atag(void *ptr);</div><div class='add'>+void *mte_clear_atag(void *ptr);</div><div class='ctx'> int mte_default_setup(void);</div><div class='ctx'> void mte_restore_setup(void);</div><div class='del'>-int mte_switch_mode(int mte_option, unsigned long incl_mask);</div><div class='add'>+int mte_switch_mode(int mte_option, unsigned long incl_mask, bool stonly);</div><div class='ctx'> void mte_initialize_current_context(int mode, uintptr_t ptr, ssize_t range);</div><div class='ctx'> </div><div class='ctx'> /* Common utility functions */</div><div class='head'>diff --git a/tools/testing/selftests/arm64/mte/mte_def.h b/tools/testing/selftests/arm64/mte/mte_def.h<br/>index 9b188254b61a..6ad22f07c9b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/mte_def.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/mte/mte_def.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/mte/mte_def.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/mte/mte_def.h</a></div><div class='hunk'>@@ -42,6 +42,8 @@</div><div class='ctx'> #define MT_TAG_COUNT		16</div><div class='ctx'> #define MT_INCLUDE_TAG_MASK	0xFFFF</div><div class='ctx'> #define MT_EXCLUDE_TAG_MASK	0x0</div><div class='add'>+#define MT_ATAG_SHIFT		60</div><div class='add'>+#define MT_ATAG_MASK		0xFUL</div><div class='ctx'> </div><div class='ctx'> #define MT_ALIGN_GRANULE	(MT_GRANULE_SIZE - 1)</div><div class='ctx'> #define MT_CLEAR_TAG(x)		((x) &amp; ~(MT_TAG_MASK &lt;&lt; MT_TAG_SHIFT))</div><div class='hunk'>@@ -49,6 +51,12 @@</div><div class='ctx'> #define MT_FETCH_TAG(x)		((x &gt;&gt; MT_TAG_SHIFT) &amp; (MT_TAG_MASK))</div><div class='ctx'> #define MT_ALIGN_UP(x)		((x + MT_ALIGN_GRANULE) &amp; ~(MT_ALIGN_GRANULE))</div><div class='ctx'> </div><div class='add'>+#define MT_CLEAR_ATAG(x)	((x) &amp; ~(MT_TAG_MASK &lt;&lt; MT_ATAG_SHIFT))</div><div class='add'>+#define MT_SET_ATAG(x, y)	((x) | (((y) &amp; MT_ATAG_MASK) &lt;&lt; MT_ATAG_SHIFT))</div><div class='add'>+#define MT_FETCH_ATAG(x)	((x &gt;&gt; MT_ATAG_SHIFT) &amp; (MT_ATAG_MASK))</div><div class='add'>+</div><div class='add'>+#define MT_CLEAR_TAGS(x) 	(MT_CLEAR_ATAG(MT_CLEAR_TAG(x)))</div><div class='add'>+</div><div class='ctx'> #define MT_PSTATE_TCO_SHIFT	25</div><div class='ctx'> #define MT_PSTATE_TCO_MASK	~(0x1 &lt;&lt; MT_PSTATE_TCO_SHIFT)</div><div class='ctx'> #define MT_PSTATE_TCO_EN	1</div><div class='head'>diff --git a/tools/testing/selftests/arm64/pauth/exec_target.c b/tools/testing/selftests/arm64/pauth/exec_target.c<br/>index 4435600ca400..e597861b26d6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/pauth/exec_target.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/pauth/exec_target.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/pauth/exec_target.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/pauth/exec_target.c</a></div><div class='hunk'>@@ -13,7 +13,12 @@ int main(void)</div><div class='ctx'> 	unsigned long hwcaps;</div><div class='ctx'> 	size_t val;</div><div class='ctx'> </div><div class='del'>-	fread(&amp;val, sizeof(size_t), 1, stdin);</div><div class='add'>+	size_t size = fread(&amp;val, sizeof(size_t), 1, stdin);</div><div class='add'>+</div><div class='add'>+	if (size != 1) {</div><div class='add'>+		fprintf(stderr, "Could not read input from stdin\n");</div><div class='add'>+		return EXIT_FAILURE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* don't try to execute illegal (unimplemented) instructions) caller</div><div class='ctx'> 	 * should have checked this and keep worker simple</div><div class='head'>diff --git a/tools/testing/selftests/arm64/pauth/pac.c b/tools/testing/selftests/arm64/pauth/pac.c<br/>index 6d21b2fc758d..67d138057707 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/pauth/pac.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/pauth/pac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/pauth/pac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/pauth/pac.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;setjmp.h&gt;</div><div class='ctx'> #include &lt;sched.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> #include "helper.h"</div><div class='ctx'> </div><div class='ctx'> #define PAC_COLLISION_ATTEMPTS 1000</div><div class='head'>diff --git a/tools/testing/selftests/arm64/tags/tags_test.c b/tools/testing/selftests/arm64/tags/tags_test.c<br/>index 8ae26e496c89..375ab47f0edb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/tags/tags_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/arm64/tags/tags_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/arm64/tags/tags_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/arm64/tags/tags_test.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #include &lt;stdint.h&gt;</div><div class='ctx'> #include &lt;sys/prctl.h&gt;</div><div class='ctx'> #include &lt;sys/utsname.h&gt;</div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define SHIFT_TAG(tag)		((uint64_t)(tag) &lt;&lt; 56)</div><div class='ctx'> #define SET_TAG(ptr, tag)	(((uint64_t)(ptr) &amp; ~SHIFT_TAG(0xff)) | \</div><div class='head'>diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore<br/>index e2a2c46c008b..19c1638e312a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/.gitignore?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/.gitignore</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/.gitignore</a></div><div class='hunk'>@@ -21,9 +21,9 @@ test_lirc_mode2_user</div><div class='ctx'> flow_dissector_load</div><div class='ctx'> test_tcpnotify_user</div><div class='ctx'> test_libbpf</div><div class='del'>-test_sysctl</div><div class='ctx'> xdping</div><div class='ctx'> test_cpp</div><div class='add'>+test_progs_verification_cert</div><div class='ctx'> *.d</div><div class='ctx'> *.subskel.h</div><div class='ctx'> *.skel.h</div><div class='hunk'>@@ -33,7 +33,6 @@ test_cpp</div><div class='ctx'> /cpuv4</div><div class='ctx'> /host-tools</div><div class='ctx'> /tools</div><div class='del'>-/runqslower</div><div class='ctx'> /bench</div><div class='ctx'> /veristat</div><div class='ctx'> /sign-file</div><div class='hunk'>@@ -45,3 +44,4 @@ xdp_redirect_multi</div><div class='ctx'> xdp_synproxy</div><div class='ctx'> xdp_hw_metadata</div><div class='ctx'> xdp_features</div><div class='add'>+verification_cert.h</div><div class='head'>diff --git a/tools/testing/selftests/bpf/DENYLIST.aarch64 b/tools/testing/selftests/bpf/DENYLIST.aarch64<br/>deleted file mode 100644<br/>index 901349da680f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/DENYLIST.aarch64?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/DENYLIST.aarch64</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-bpf_cookie/multi_kprobe_attach_api               # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3</div><div class='del'>-bpf_cookie/multi_kprobe_link_api                 # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3</div><div class='del'>-kprobe_multi_bench_attach                        # needs CONFIG_FPROBE</div><div class='del'>-kprobe_multi_test                                # needs CONFIG_FPROBE</div><div class='del'>-module_attach                                    # prog 'kprobe_multi': failed to auto-attach: -95</div><div class='del'>-fentry_test/fentry_many_args                     # fentry_many_args:FAIL:fentry_many_args_attach unexpected error: -524</div><div class='del'>-fexit_test/fexit_many_args                       # fexit_many_args:FAIL:fexit_many_args_attach unexpected error: -524</div><div class='del'>-tracing_struct/struct_many_args                  # struct_many_args:FAIL:tracing_struct_many_args__attach unexpected error: -524</div><div class='del'>-fill_link_info/kprobe_multi_link_info            # bpf_program__attach_kprobe_multi_opts unexpected error: -95</div><div class='del'>-fill_link_info/kretprobe_multi_link_info         # bpf_program__attach_kprobe_multi_opts unexpected error: -95</div><div class='del'>-fill_link_info/kprobe_multi_invalid_ubuff        # bpf_program__attach_kprobe_multi_opts unexpected error: -95</div><div class='del'>-missed/kprobe_recursion                          # missed_kprobe_recursion__attach unexpected error: -95 (errno 95)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/DENYLIST.s390x b/tools/testing/selftests/bpf/DENYLIST.s390x<br/>index 3ebd77206f98..a17baf8c6fd7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/DENYLIST.s390x?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/DENYLIST.s390x</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/DENYLIST.s390x?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/DENYLIST.s390x</a></div><div class='hunk'>@@ -2,4 +2,3 @@</div><div class='ctx'> # Alphabetical order</div><div class='ctx'> get_stack_raw_tp                         # user_stack corrupted user stack                                             (no backchain userspace)</div><div class='ctx'> stacktrace_build_id                      # compare_map_keys stackid_hmap vs. stackmap err -2 errno 2                   (?)</div><div class='del'>-verifier_iterating_callbacks</div><div class='head'>diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile<br/>index 87551628e112..b7030a6e2e76 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/Makefile</a></div><div class='hunk'>@@ -34,6 +34,9 @@ OPT_FLAGS	?= $(if $(RELEASE),-O2,-O0)</div><div class='ctx'> LIBELF_CFLAGS	:= $(shell $(PKG_CONFIG) libelf --cflags 2&gt;/dev/null)</div><div class='ctx'> LIBELF_LIBS	:= $(shell $(PKG_CONFIG) libelf --libs 2&gt;/dev/null || echo -lelf)</div><div class='ctx'> </div><div class='add'>+SKIP_DOCS	?=</div><div class='add'>+SKIP_LLVM	?=</div><div class='add'>+</div><div class='ctx'> ifeq ($(srctree),)</div><div class='ctx'> srctree := $(patsubst %/,%,$(dir $(CURDIR)))</div><div class='ctx'> srctree := $(patsubst %/,%,$(dir $(srctree)))</div><div class='hunk'>@@ -43,6 +46,7 @@ endif</div><div class='ctx'> </div><div class='ctx'> CFLAGS += -g $(OPT_FLAGS) -rdynamic -std=gnu11				\</div><div class='ctx'> 	  -Wall -Werror -fno-omit-frame-pointer				\</div><div class='add'>+	  -Wno-unused-but-set-variable					\</div><div class='ctx'> 	  $(GENFLAGS) $(SAN_CFLAGS) $(LIBELF_CFLAGS)			\</div><div class='ctx'> 	  -I$(CURDIR) -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR)		\</div><div class='ctx'> 	  -I$(TOOLSINCDIR) -I$(TOOLSARCHINCDIR) -I$(APIDIR) -I$(OUTPUT)</div><div class='hunk'>@@ -70,7 +74,7 @@ endif</div><div class='ctx'> # Order correspond to 'make run_tests' order</div><div class='ctx'> TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_progs \</div><div class='ctx'> 	test_sockmap \</div><div class='del'>-	test_tcpnotify_user test_sysctl \</div><div class='add'>+	test_tcpnotify_user \</div><div class='ctx'> 	test_progs-no_alu32</div><div class='ctx'> TEST_INST_SUBDIRS := no_alu32</div><div class='ctx'> </div><div class='hunk'>@@ -95,52 +99,42 @@ TEST_GEN_PROGS += test_progs-cpuv4</div><div class='ctx'> TEST_INST_SUBDIRS += cpuv4</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-TEST_GEN_FILES = test_lwt_ip_encap.bpf.o test_tc_edt.bpf.o</div><div class='ctx'> TEST_FILES = xsk_prereqs.sh $(wildcard progs/btf_dump_test_case_*.c)</div><div class='ctx'> </div><div class='ctx'> # Order correspond to 'make run_tests' order</div><div class='ctx'> TEST_PROGS := test_kmod.sh \</div><div class='del'>-	test_xdp_redirect_multi.sh \</div><div class='del'>-	test_tunnel.sh \</div><div class='del'>-	test_lwt_seg6local.sh \</div><div class='ctx'> 	test_lirc_mode2.sh \</div><div class='del'>-	test_xdp_vlan_mode_generic.sh \</div><div class='del'>-	test_xdp_vlan_mode_native.sh \</div><div class='del'>-	test_lwt_ip_encap.sh \</div><div class='del'>-	test_tc_tunnel.sh \</div><div class='del'>-	test_tc_edt.sh \</div><div class='ctx'> 	test_xdping.sh \</div><div class='ctx'> 	test_bpftool_build.sh \</div><div class='ctx'> 	test_bpftool.sh \</div><div class='add'>+	test_bpftool_map.sh \</div><div class='ctx'> 	test_bpftool_metadata.sh \</div><div class='ctx'> 	test_doc_build.sh \</div><div class='ctx'> 	test_xsk.sh \</div><div class='ctx'> 	test_xdp_features.sh</div><div class='ctx'> </div><div class='del'>-TEST_PROGS_EXTENDED := with_addr.sh \</div><div class='del'>-	with_tunnels.sh ima_setup.sh verify_sig_setup.sh \</div><div class='del'>-	test_xdp_vlan.sh test_bpftool.py</div><div class='add'>+TEST_PROGS_EXTENDED := \</div><div class='add'>+	ima_setup.sh verify_sig_setup.sh \</div><div class='add'>+	test_bpftool.py</div><div class='ctx'> </div><div class='ctx'> TEST_KMODS := bpf_testmod.ko bpf_test_no_cfi.ko bpf_test_modorder_x.ko \</div><div class='del'>-	bpf_test_modorder_y.ko</div><div class='add'>+	bpf_test_modorder_y.ko bpf_test_rqspinlock.ko</div><div class='ctx'> TEST_KMOD_TARGETS = $(addprefix $(OUTPUT)/,$(TEST_KMODS))</div><div class='ctx'> </div><div class='ctx'> # Compile but not part of 'make run_tests'</div><div class='ctx'> TEST_GEN_PROGS_EXTENDED = \</div><div class='ctx'> 	bench \</div><div class='ctx'> 	flow_dissector_load \</div><div class='del'>-	runqslower \</div><div class='ctx'> 	test_cpp \</div><div class='ctx'> 	test_lirc_mode2_user \</div><div class='ctx'> 	veristat \</div><div class='ctx'> 	xdp_features \</div><div class='ctx'> 	xdp_hw_metadata \</div><div class='del'>-	xdp_redirect_multi \</div><div class='ctx'> 	xdp_synproxy \</div><div class='ctx'> 	xdping \</div><div class='ctx'> 	xskxceiver</div><div class='ctx'> </div><div class='del'>-TEST_GEN_FILES += liburandom_read.so urandom_read sign-file uprobe_multi</div><div class='add'>+TEST_GEN_FILES += $(TEST_KMODS) liburandom_read.so urandom_read sign-file uprobe_multi</div><div class='ctx'> </div><div class='ctx'> ifneq ($(V),1)</div><div class='ctx'> submake_extras := feature_display=0</div><div class='hunk'>@@ -179,16 +173,23 @@ override OUTPUT := $(patsubst %/,%,$(OUTPUT))</div><div class='ctx'> endif</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+ifneq ($(SKIP_LLVM),1)</div><div class='ctx'> ifeq ($(feature-llvm),1)</div><div class='ctx'>   LLVM_CFLAGS  += -DHAVE_LLVM_SUPPORT</div><div class='ctx'>   LLVM_CONFIG_LIB_COMPONENTS := mcdisassembler all-targets</div><div class='ctx'>   # both llvm-config and lib.mk add -D_GNU_SOURCE, which ends up as conflict</div><div class='ctx'>   LLVM_CFLAGS  += $(filter-out -D_GNU_SOURCE,$(shell $(LLVM_CONFIG) --cflags))</div><div class='del'>-  LLVM_LDLIBS  += $(shell $(LLVM_CONFIG) --link-static --libs $(LLVM_CONFIG_LIB_COMPONENTS))</div><div class='del'>-  LLVM_LDLIBS  += $(shell $(LLVM_CONFIG) --link-static --system-libs $(LLVM_CONFIG_LIB_COMPONENTS))</div><div class='del'>-  LLVM_LDLIBS  += -lstdc++</div><div class='add'>+  # Prefer linking statically if it's available, otherwise fallback to shared</div><div class='add'>+  ifeq ($(shell $(LLVM_CONFIG) --link-static --libs &gt;/dev/null 2&gt;&amp;1 &amp;&amp; echo static),static)</div><div class='add'>+    LLVM_LDLIBS  += $(shell $(LLVM_CONFIG) --link-static --libs $(LLVM_CONFIG_LIB_COMPONENTS))</div><div class='add'>+    LLVM_LDLIBS  += $(filter-out -lxml2,$(shell $(LLVM_CONFIG) --link-static --system-libs $(LLVM_CONFIG_LIB_COMPONENTS)))</div><div class='add'>+    LLVM_LDLIBS  += -lstdc++</div><div class='add'>+  else</div><div class='add'>+    LLVM_LDLIBS  += $(shell $(LLVM_CONFIG) --link-shared --libs $(LLVM_CONFIG_LIB_COMPONENTS))</div><div class='add'>+  endif</div><div class='ctx'>   LLVM_LDFLAGS += $(shell $(LLVM_CONFIG) --ldflags)</div><div class='ctx'> endif</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> SCRATCH_DIR := $(OUTPUT)/tools</div><div class='ctx'> BUILD_DIR := $(SCRATCH_DIR)/build</div><div class='hunk'>@@ -205,8 +206,6 @@ HOST_INCLUDE_DIR	:= $(INCLUDE_DIR)</div><div class='ctx'> endif</div><div class='ctx'> HOST_BPFOBJ := $(HOST_BUILD_DIR)/libbpf/libbpf.a</div><div class='ctx'> RESOLVE_BTFIDS := $(HOST_BUILD_DIR)/resolve_btfids/resolve_btfids</div><div class='del'>-RUNQSLOWER_OUTPUT := $(BUILD_DIR)/runqslower/</div><div class='del'>-</div><div class='ctx'> VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux)				\</div><div class='ctx'> 		     $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux)	\</div><div class='ctx'> 		     ../../../../vmlinux				\</div><div class='hunk'>@@ -217,7 +216,7 @@ ifeq ($(VMLINUX_BTF),)</div><div class='ctx'> $(error Cannot find a vmlinux for VMLINUX_BTF at any of "$(VMLINUX_BTF_PATHS)")</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-# Define simple and short `make test_progs`, `make test_sysctl`, etc targets</div><div class='add'>+# Define simple and short `make test_progs`, `make test_maps`, etc targets</div><div class='ctx'> # to build individual tests.</div><div class='ctx'> # NOTE: Semicolon at the end is critical to override lib.mk's default static</div><div class='ctx'> # rule for binaries.</div><div class='hunk'>@@ -228,7 +227,7 @@ $(notdir $(TEST_GEN_PROGS) $(TEST_KMODS)				\</div><div class='ctx'> MAKE_DIRS := $(sort $(BUILD_DIR)/libbpf $(HOST_BUILD_DIR)/libbpf	\</div><div class='ctx'> 	       $(BUILD_DIR)/bpftool $(HOST_BUILD_DIR)/bpftool		\</div><div class='ctx'> 	       $(HOST_BUILD_DIR)/resolve_btfids				\</div><div class='del'>-	       $(RUNQSLOWER_OUTPUT) $(INCLUDE_DIR))</div><div class='add'>+	       $(INCLUDE_DIR))</div><div class='ctx'> $(MAKE_DIRS):</div><div class='ctx'> 	$(call msg,MKDIR,,$@)</div><div class='ctx'> 	$(Q)mkdir -p $@</div><div class='hunk'>@@ -300,16 +299,6 @@ TRUNNER_BPFTOOL := $(DEFAULT_BPFTOOL)</div><div class='ctx'> USE_BOOTSTRAP := "bootstrap/"</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-$(OUTPUT)/runqslower: $(BPFOBJ) | $(DEFAULT_BPFTOOL) $(RUNQSLOWER_OUTPUT)</div><div class='del'>-	$(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/runqslower	       \</div><div class='del'>-		    OUTPUT=$(RUNQSLOWER_OUTPUT) VMLINUX_BTF=$(VMLINUX_BTF)     \</div><div class='del'>-		    BPFTOOL_OUTPUT=$(HOST_BUILD_DIR)/bpftool/		       \</div><div class='del'>-		    BPFOBJ_OUTPUT=$(BUILD_DIR)/libbpf/			       \</div><div class='del'>-		    BPFOBJ=$(BPFOBJ) BPF_INCLUDE=$(INCLUDE_DIR)		       \</div><div class='del'>-		    EXTRA_CFLAGS='-g $(OPT_FLAGS) $(SAN_CFLAGS) $(EXTRA_CFLAGS)' \</div><div class='del'>-		    EXTRA_LDFLAGS='$(SAN_LDFLAGS) $(EXTRA_LDFLAGS)' &amp;&amp;	       \</div><div class='del'>-		    cp $(RUNQSLOWER_OUTPUT)runqslower $@</div><div class='del'>-</div><div class='ctx'> TEST_GEN_PROGS_EXTENDED += $(TRUNNER_BPFTOOL)</div><div class='ctx'> </div><div class='ctx'> $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(BPFOBJ)</div><div class='hunk'>@@ -325,7 +314,6 @@ NETWORK_HELPERS := $(OUTPUT)/network_helpers.o</div><div class='ctx'> $(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS)</div><div class='ctx'> $(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS)</div><div class='ctx'> $(OUTPUT)/test_sock_fields: $(CGROUP_HELPERS) $(TESTING_HELPERS)</div><div class='del'>-$(OUTPUT)/test_sysctl: $(CGROUP_HELPERS) $(TESTING_HELPERS)</div><div class='ctx'> $(OUTPUT)/test_tag: $(TESTING_HELPERS)</div><div class='ctx'> $(OUTPUT)/test_lirc_mode2_user: $(TESTING_HELPERS)</div><div class='ctx'> $(OUTPUT)/xdping: $(TESTING_HELPERS)</div><div class='hunk'>@@ -359,7 +347,9 @@ $(CROSS_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile)	\</div><div class='ctx'> 		    prefix= DESTDIR=$(SCRATCH_DIR)/ install-bin</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+ifneq ($(SKIP_DOCS),1)</div><div class='ctx'> all: docs</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> docs:</div><div class='ctx'> 	$(Q)RST2MAN_OPTS="--exit-status=1" $(MAKE) $(submake_extras)	\</div><div class='hunk'>@@ -392,7 +382,7 @@ $(HOST_BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile)		       \</div><div class='ctx'> 		    DESTDIR=$(HOST_SCRATCH_DIR)/ prefix= all install_headers</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-# vmlinux.h is first dumped to a temprorary file and then compared to</div><div class='add'>+# vmlinux.h is first dumped to a temporary file and then compared to</div><div class='ctx'> # the previous version. This helps to avoid unnecessary re-builds of</div><div class='ctx'> # $(TRUNNER_BPF_OBJS)</div><div class='ctx'> $(INCLUDE_DIR)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) | $(INCLUDE_DIR)</div><div class='hunk'>@@ -447,7 +437,9 @@ BPF_CFLAGS = -g -Wall -Werror -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN)	\</div><div class='ctx'> 	     -I$(abspath $(OUTPUT)/../usr/include)			\</div><div class='ctx'> 	     -std=gnu11		 					\</div><div class='ctx'> 	     -fno-strict-aliasing 					\</div><div class='del'>-	     -Wno-compare-distinct-pointer-types</div><div class='add'>+	     -Wno-compare-distinct-pointer-types			\</div><div class='add'>+	     -Wno-initializer-overrides					\</div><div class='add'>+	     #</div><div class='ctx'> # TODO: enable me -Wsign-compare</div><div class='ctx'> </div><div class='ctx'> CLANG_CFLAGS = $(CLANG_SYS_INCLUDES)</div><div class='hunk'>@@ -490,15 +482,17 @@ LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h		\</div><div class='ctx'> 		test_subskeleton.skel.h test_subskeleton_lib.skel.h	\</div><div class='ctx'> 		test_usdt.skel.h</div><div class='ctx'> </div><div class='del'>-LSKELS := fentry_test.c fexit_test.c fexit_sleep.c atomics.c 		\</div><div class='del'>-	trace_printk.c trace_vprintk.c map_ptr_kern.c 			\</div><div class='add'>+LSKELS := fexit_sleep.c trace_printk.c trace_vprintk.c map_ptr_kern.c 	\</div><div class='ctx'> 	core_kern.c core_kern_overflow.c test_ringbuf.c			\</div><div class='del'>-	test_ringbuf_n.c test_ringbuf_map_key.c test_ringbuf_write.c</div><div class='add'>+	test_ringbuf_n.c test_ringbuf_map_key.c test_ringbuf_write.c    \</div><div class='add'>+	test_ringbuf_overwrite.c</div><div class='add'>+</div><div class='add'>+LSKELS_SIGNED := fentry_test.c fexit_test.c atomics.c</div><div class='ctx'> </div><div class='ctx'> # Generate both light skeleton and libbpf skeleton for these</div><div class='ctx'> LSKELS_EXTRA := test_ksyms_module.c test_ksyms_weak.c kfunc_call_test.c \</div><div class='ctx'> 	kfunc_call_test_subprog.c</div><div class='del'>-SKEL_BLACKLIST += $$(LSKELS)</div><div class='add'>+SKEL_BLACKLIST += $$(LSKELS) $$(LSKELS_SIGNED)</div><div class='ctx'> </div><div class='ctx'> test_static_linked.skel.h-deps := test_static_linked1.bpf.o test_static_linked2.bpf.o</div><div class='ctx'> linked_funcs.skel.h-deps := linked_funcs1.bpf.o linked_funcs2.bpf.o</div><div class='hunk'>@@ -529,12 +523,15 @@ HEADERS_FOR_BPF_OBJS := $(wildcard $(BPFDIR)/*.bpf.h)		\</div><div class='ctx'> # $2 - test runner extra "flavor" (e.g., no_alu32, cpuv4, bpf_gcc, etc)</div><div class='ctx'> define DEFINE_TEST_RUNNER</div><div class='ctx'> </div><div class='add'>+LSKEL_SIGN := -S -k $(PRIVATE_KEY) -i $(VERIFICATION_CERT)</div><div class='ctx'> TRUNNER_OUTPUT := $(OUTPUT)$(if $2,/)$2</div><div class='ctx'> TRUNNER_BINARY := $1$(if $2,-)$2</div><div class='ctx'> TRUNNER_TEST_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.test.o,	\</div><div class='ctx'> 				 $$(notdir $$(wildcard $(TRUNNER_TESTS_DIR)/*.c)))</div><div class='ctx'> TRUNNER_EXTRA_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.o,		\</div><div class='ctx'> 				 $$(filter %.c,$(TRUNNER_EXTRA_SOURCES)))</div><div class='add'>+TRUNNER_LIB_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.o,		\</div><div class='add'>+				 $$(filter %.c,$(TRUNNER_LIB_SOURCES)))</div><div class='ctx'> TRUNNER_EXTRA_HDRS := $$(filter %.h,$(TRUNNER_EXTRA_SOURCES))</div><div class='ctx'> TRUNNER_TESTS_HDR := $(TRUNNER_TESTS_DIR)/tests.h</div><div class='ctx'> TRUNNER_BPF_SRCS := $$(notdir $$(wildcard $(TRUNNER_BPF_PROGS_DIR)/*.c))</div><div class='hunk'>@@ -544,6 +541,7 @@ TRUNNER_BPF_SKELS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.skel.h,	\</div><div class='ctx'> 					       $$(TRUNNER_BPF_SRCS)))</div><div class='ctx'> TRUNNER_BPF_LSKELS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.lskel.h, $$(LSKELS) $$(LSKELS_EXTRA))</div><div class='ctx'> TRUNNER_BPF_SKELS_LINKED := $$(addprefix $$(TRUNNER_OUTPUT)/,$(LINKED_SKELS))</div><div class='add'>+TRUNNER_BPF_LSKELS_SIGNED := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.lskel.h, $$(LSKELS_SIGNED))</div><div class='ctx'> TEST_GEN_FILES += $$(TRUNNER_BPF_OBJS)</div><div class='ctx'> </div><div class='ctx'> # Evaluate rules now with extra TRUNNER_XXX variables above already defined</div><div class='hunk'>@@ -598,6 +596,15 @@ $(TRUNNER_BPF_LSKELS): %.lskel.h: %.bpf.o $(BPFTOOL) | $(TRUNNER_OUTPUT)</div><div class='ctx'> 	$(Q)$$(BPFTOOL) gen skeleton -L $$(&lt;:.o=.llinked3.o) name $$(notdir $$(&lt;:.bpf.o=_lskel)) &gt; $$@</div><div class='ctx'> 	$(Q)rm -f $$(&lt;:.o=.llinked1.o) $$(&lt;:.o=.llinked2.o) $$(&lt;:.o=.llinked3.o)</div><div class='ctx'> </div><div class='add'>+$(TRUNNER_BPF_LSKELS_SIGNED): %.lskel.h: %.bpf.o $(BPFTOOL) | $(TRUNNER_OUTPUT)</div><div class='add'>+	$$(call msg,GEN-SKEL,$(TRUNNER_BINARY) (signed),$$@)</div><div class='add'>+	$(Q)$$(BPFTOOL) gen object $$(&lt;:.o=.llinked1.o) $$&lt;</div><div class='add'>+	$(Q)$$(BPFTOOL) gen object $$(&lt;:.o=.llinked2.o) $$(&lt;:.o=.llinked1.o)</div><div class='add'>+	$(Q)$$(BPFTOOL) gen object $$(&lt;:.o=.llinked3.o) $$(&lt;:.o=.llinked2.o)</div><div class='add'>+	$(Q)diff $$(&lt;:.o=.llinked2.o) $$(&lt;:.o=.llinked3.o)</div><div class='add'>+	$(Q)$$(BPFTOOL) gen skeleton $(LSKEL_SIGN) $$(&lt;:.o=.llinked3.o) name $$(notdir $$(&lt;:.bpf.o=_lskel)) &gt; $$@</div><div class='add'>+	$(Q)rm -f $$(&lt;:.o=.llinked1.o) $$(&lt;:.o=.llinked2.o) $$(&lt;:.o=.llinked3.o)</div><div class='add'>+</div><div class='ctx'> $(LINKED_BPF_OBJS): %: $(TRUNNER_OUTPUT)/%</div><div class='ctx'> </div><div class='ctx'> # .SECONDEXPANSION here allows to correctly expand %-deps variables as prerequisites</div><div class='hunk'>@@ -647,6 +654,7 @@ $(TRUNNER_TEST_OBJS:.o=.d): $(TRUNNER_OUTPUT)/%.test.d:			\</div><div class='ctx'> 			    $(TRUNNER_EXTRA_HDRS)			\</div><div class='ctx'> 			    $(TRUNNER_BPF_SKELS)			\</div><div class='ctx'> 			    $(TRUNNER_BPF_LSKELS)			\</div><div class='add'>+			    $(TRUNNER_BPF_LSKELS_SIGNED)		\</div><div class='ctx'> 			    $(TRUNNER_BPF_SKELS_LINKED)			\</div><div class='ctx'> 			    $$(BPFOBJ) | $(TRUNNER_OUTPUT)</div><div class='ctx'> </div><div class='hunk'>@@ -661,11 +669,16 @@ $(foreach N,$(patsubst $(TRUNNER_OUTPUT)/%.o,%,$(TRUNNER_EXTRA_OBJS)),	\</div><div class='ctx'> $(TRUNNER_EXTRA_OBJS): $(TRUNNER_OUTPUT)/%.o:				\</div><div class='ctx'> 		       %.c						\</div><div class='ctx'> 		       $(TRUNNER_EXTRA_HDRS)				\</div><div class='add'>+		       $(VERIFY_SIG_HDR)				\</div><div class='ctx'> 		       $(TRUNNER_TESTS_HDR)				\</div><div class='ctx'> 		       $$(BPFOBJ) | $(TRUNNER_OUTPUT)</div><div class='ctx'> 	$$(call msg,EXT-OBJ,$(TRUNNER_BINARY),$$@)</div><div class='ctx'> 	$(Q)$$(CC) $$(CFLAGS) -c $$&lt; $$(LDLIBS) -o $$@</div><div class='ctx'> </div><div class='add'>+$(TRUNNER_LIB_OBJS): $(TRUNNER_OUTPUT)/%.o:$(TOOLSDIR)/lib/%.c</div><div class='add'>+	$$(call msg,LIB-OBJ,$(TRUNNER_BINARY),$$@)</div><div class='add'>+	$(Q)$$(CC) $$(CFLAGS) -c $$&lt; $$(LDLIBS) -o $$@</div><div class='add'>+</div><div class='ctx'> # non-flavored in-srctree builds receive special treatment, in particular, we</div><div class='ctx'> # do not need to copy extra resources (see e.g. test_btf_dump_case())</div><div class='ctx'> $(TRUNNER_BINARY)-extras: $(TRUNNER_EXTRA_FILES) | $(TRUNNER_OUTPUT)</div><div class='hunk'>@@ -674,25 +687,37 @@ ifneq ($2:$(OUTPUT),:$(shell pwd))</div><div class='ctx'> 	$(Q)rsync -aq $$^ $(TRUNNER_OUTPUT)/</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-$(OUTPUT)/$(TRUNNER_BINARY): LDLIBS += $$(LLVM_LDLIBS)</div><div class='del'>-$(OUTPUT)/$(TRUNNER_BINARY): LDFLAGS += $$(LLVM_LDFLAGS)</div><div class='del'>-</div><div class='ctx'> # some X.test.o files have runtime dependencies on Y.bpf.o files</div><div class='ctx'> $(OUTPUT)/$(TRUNNER_BINARY): | $(TRUNNER_BPF_OBJS)</div><div class='ctx'> </div><div class='ctx'> $(OUTPUT)/$(TRUNNER_BINARY): $(TRUNNER_TEST_OBJS)			\</div><div class='ctx'> 			     $(TRUNNER_EXTRA_OBJS) $$(BPFOBJ)		\</div><div class='add'>+			     $(TRUNNER_LIB_OBJS)			\</div><div class='ctx'> 			     $(RESOLVE_BTFIDS)				\</div><div class='ctx'> 			     $(TRUNNER_BPFTOOL)				\</div><div class='add'>+			     $(OUTPUT)/veristat				\</div><div class='ctx'> 			     | $(TRUNNER_BINARY)-extras</div><div class='ctx'> 	$$(call msg,BINARY,,$$@)</div><div class='del'>-	$(Q)$$(CC) $$(CFLAGS) $$(filter %.a %.o,$$^) $$(LDLIBS) $$(LDFLAGS) -o $$@</div><div class='add'>+	$(Q)$$(CC) $$(CFLAGS) $$(filter %.a %.o,$$^) $$(LDLIBS) $$(LLVM_LDLIBS) $$(LDFLAGS) $$(LLVM_LDFLAGS) -o $$@</div><div class='ctx'> 	$(Q)$(RESOLVE_BTFIDS) --btf $(TRUNNER_OUTPUT)/btf_data.bpf.o $$@</div><div class='ctx'> 	$(Q)ln -sf $(if $2,..,.)/tools/build/bpftool/$(USE_BOOTSTRAP)bpftool \</div><div class='ctx'> 		   $(OUTPUT)/$(if $2,$2/)bpftool</div><div class='ctx'> </div><div class='ctx'> endef</div><div class='ctx'> </div><div class='add'>+VERIFY_SIG_SETUP := $(CURDIR)/verify_sig_setup.sh</div><div class='add'>+VERIFY_SIG_HDR := verification_cert.h</div><div class='add'>+VERIFICATION_CERT   := $(BUILD_DIR)/signing_key.der</div><div class='add'>+PRIVATE_KEY := $(BUILD_DIR)/signing_key.pem</div><div class='add'>+</div><div class='add'>+$(VERIFICATION_CERT) $(PRIVATE_KEY): $(VERIFY_SIG_SETUP)</div><div class='add'>+	$(Q)mkdir -p $(BUILD_DIR)</div><div class='add'>+	$(Q)$(VERIFY_SIG_SETUP) genkey $(BUILD_DIR)</div><div class='add'>+</div><div class='add'>+$(VERIFY_SIG_HDR): $(VERIFICATION_CERT)</div><div class='add'>+	$(Q)ln -fs $&lt; test_progs_verification_cert &amp;&amp; \</div><div class='add'>+	xxd -i test_progs_verification_cert &gt; $@</div><div class='add'>+</div><div class='ctx'> # Define test_progs test runner.</div><div class='ctx'> TRUNNER_TESTS_DIR := prog_tests</div><div class='ctx'> TRUNNER_BPF_PROGS_DIR := progs</div><div class='hunk'>@@ -712,8 +737,10 @@ TRUNNER_EXTRA_SOURCES := test_progs.c		\</div><div class='ctx'> 			 disasm.c		\</div><div class='ctx'> 			 disasm_helpers.c	\</div><div class='ctx'> 			 json_writer.c 		\</div><div class='add'>+			 $(VERIFY_SIG_HDR)		\</div><div class='ctx'> 			 flow_dissector_load.h	\</div><div class='ctx'> 			 ip_check_defrag_frags.h</div><div class='add'>+TRUNNER_LIB_SOURCES := find_bit.c</div><div class='ctx'> TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read				\</div><div class='ctx'> 		       $(OUTPUT)/liburandom_read.so			\</div><div class='ctx'> 		       $(OUTPUT)/xdp_synproxy				\</div><div class='hunk'>@@ -721,7 +748,7 @@ TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read				\</div><div class='ctx'> 		       $(OUTPUT)/uprobe_multi				\</div><div class='ctx'> 		       $(TEST_KMOD_TARGETS)				\</div><div class='ctx'> 		       ima_setup.sh 					\</div><div class='del'>-		       verify_sig_setup.sh				\</div><div class='add'>+		       $(VERIFY_SIG_SETUP)				\</div><div class='ctx'> 		       $(wildcard progs/btf_dump_test_case_*.c)		\</div><div class='ctx'> 		       $(wildcard progs/*.bpf.o)</div><div class='ctx'> TRUNNER_BPF_BUILD_RULE := CLANG_BPF_BUILD_RULE</div><div class='hunk'>@@ -751,6 +778,7 @@ endif</div><div class='ctx'> TRUNNER_TESTS_DIR := map_tests</div><div class='ctx'> TRUNNER_BPF_PROGS_DIR := progs</div><div class='ctx'> TRUNNER_EXTRA_SOURCES := test_maps.c</div><div class='add'>+TRUNNER_LIB_SOURCES :=</div><div class='ctx'> TRUNNER_EXTRA_FILES :=</div><div class='ctx'> TRUNNER_BPF_BUILD_RULE := $$(error no BPF objects should be built)</div><div class='ctx'> TRUNNER_BPF_CFLAGS :=</div><div class='hunk'>@@ -772,7 +800,7 @@ $(OUTPUT)/test_verifier: test_verifier.c verifier/tests.h $(BPFOBJ) | $(OUTPUT)</div><div class='ctx'> 	$(Q)$(CC) $(CFLAGS) $(filter %.a %.o %.c,$^) $(LDLIBS) -o $@</div><div class='ctx'> </div><div class='ctx'> # Include find_bit.c to compile xskxceiver.</div><div class='del'>-EXTRA_SRC := $(TOOLSDIR)/lib/find_bit.c</div><div class='add'>+EXTRA_SRC := $(TOOLSDIR)/lib/find_bit.c prog_tests/test_xsk.c prog_tests/test_xsk.h</div><div class='ctx'> $(OUTPUT)/xskxceiver: $(EXTRA_SRC) xskxceiver.c xskxceiver.h $(OUTPUT)/network_helpers.o $(OUTPUT)/xsk.o $(OUTPUT)/xsk_xdp_progs.skel.h $(BPFOBJ) | $(OUTPUT)</div><div class='ctx'> 	$(call msg,BINARY,,$@)</div><div class='ctx'> 	$(Q)$(CC) $(CFLAGS) $(filter %.a %.o %.c,$^) $(LDLIBS) -o $@</div><div class='hunk'>@@ -811,6 +839,8 @@ $(OUTPUT)/bench_local_storage_create.o: $(OUTPUT)/bench_local_storage_create.ske</div><div class='ctx'> $(OUTPUT)/bench_bpf_hashmap_lookup.o: $(OUTPUT)/bpf_hashmap_lookup.skel.h</div><div class='ctx'> $(OUTPUT)/bench_htab_mem.o: $(OUTPUT)/htab_mem_bench.skel.h</div><div class='ctx'> $(OUTPUT)/bench_bpf_crypto.o: $(OUTPUT)/crypto_bench.skel.h</div><div class='add'>+$(OUTPUT)/bench_sockmap.o: $(OUTPUT)/bench_sockmap_prog.skel.h</div><div class='add'>+$(OUTPUT)/bench_lpm_trie_map.o: $(OUTPUT)/lpm_trie_bench.skel.h $(OUTPUT)/lpm_trie_map.skel.h</div><div class='ctx'> $(OUTPUT)/bench.o: bench.h testing_helpers.h $(BPFOBJ)</div><div class='ctx'> $(OUTPUT)/bench: LDLIBS += -lm</div><div class='ctx'> $(OUTPUT)/bench: $(OUTPUT)/bench.o \</div><div class='hunk'>@@ -831,10 +861,17 @@ $(OUTPUT)/bench: $(OUTPUT)/bench.o \</div><div class='ctx'> 		 $(OUTPUT)/bench_local_storage_create.o \</div><div class='ctx'> 		 $(OUTPUT)/bench_htab_mem.o \</div><div class='ctx'> 		 $(OUTPUT)/bench_bpf_crypto.o \</div><div class='add'>+		 $(OUTPUT)/bench_sockmap.o \</div><div class='add'>+		 $(OUTPUT)/bench_lpm_trie_map.o \</div><div class='ctx'> 		 #</div><div class='ctx'> 	$(call msg,BINARY,,$@)</div><div class='ctx'> 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(filter %.a %.o,$^) $(LDLIBS) -o $@</div><div class='ctx'> </div><div class='add'>+# This works around GCC warning about snprintf truncating strings like:</div><div class='add'>+#</div><div class='add'>+#   char a[PATH_MAX], b[PATH_MAX];</div><div class='add'>+#   snprintf(a, "%s/foo", b);      // triggers -Wformat-truncation</div><div class='add'>+$(OUTPUT)/veristat.o: CFLAGS += -Wno-format-truncation</div><div class='ctx'> $(OUTPUT)/veristat.o: $(BPFOBJ)</div><div class='ctx'> $(OUTPUT)/veristat: $(OUTPUT)/veristat.o</div><div class='ctx'> 	$(call msg,BINARY,,$@)</div><div class='hunk'>@@ -853,7 +890,8 @@ EXTRA_CLEAN := $(SCRATCH_DIR) $(HOST_SCRATCH_DIR)			\</div><div class='ctx'> 	$(addprefix $(OUTPUT)/,*.o *.d *.skel.h *.lskel.h *.subskel.h	\</div><div class='ctx'> 			       no_alu32 cpuv4 bpf_gcc			\</div><div class='ctx'> 			       liburandom_read.so)			\</div><div class='del'>-	$(OUTPUT)/FEATURE-DUMP.selftests</div><div class='add'>+	$(OUTPUT)/FEATURE-DUMP.selftests				\</div><div class='add'>+	test_progs_verification_cert</div><div class='ctx'> </div><div class='ctx'> .PHONY: docs docs-clean</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/Makefile.docs b/tools/testing/selftests/bpf/Makefile.docs<br/>index eb6a4fea8c79..f7f9e7088bb3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/Makefile.docs?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/Makefile.docs</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/Makefile.docs?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/Makefile.docs</a></div><div class='hunk'>@@ -7,12 +7,6 @@ INSTALL ?= install</div><div class='ctx'> RM ?= rm -f</div><div class='ctx'> RMDIR ?= rmdir --ignore-fail-on-non-empty</div><div class='ctx'> </div><div class='del'>-ifeq ($(V),1)</div><div class='del'>-  Q =</div><div class='del'>-else</div><div class='del'>-  Q = @</div><div class='del'>-endif</div><div class='del'>-</div><div class='ctx'> prefix ?= /usr/local</div><div class='ctx'> mandir ?= $(prefix)/man</div><div class='ctx'> man2dir = $(mandir)/man2</div><div class='head'>diff --git a/tools/testing/selftests/bpf/bench.c b/tools/testing/selftests/bpf/bench.c<br/>index 1bd403a5ef7b..bd29bb2e6cb5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bench.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bench.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bench.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/bench.c</a></div><div class='hunk'>@@ -283,6 +283,8 @@ extern struct argp bench_local_storage_create_argp;</div><div class='ctx'> extern struct argp bench_htab_mem_argp;</div><div class='ctx'> extern struct argp bench_trigger_batch_argp;</div><div class='ctx'> extern struct argp bench_crypto_argp;</div><div class='add'>+extern struct argp bench_sockmap_argp;</div><div class='add'>+extern struct argp bench_lpm_trie_map_argp;</div><div class='ctx'> </div><div class='ctx'> static const struct argp_child bench_parsers[] = {</div><div class='ctx'> 	{ &amp;bench_ringbufs_argp, 0, "Ring buffers benchmark", 0 },</div><div class='hunk'>@@ -297,6 +299,8 @@ static const struct argp_child bench_parsers[] = {</div><div class='ctx'> 	{ &amp;bench_htab_mem_argp, 0, "hash map memory benchmark", 0 },</div><div class='ctx'> 	{ &amp;bench_trigger_batch_argp, 0, "BPF triggering benchmark", 0 },</div><div class='ctx'> 	{ &amp;bench_crypto_argp, 0, "bpf crypto benchmark", 0 },</div><div class='add'>+	{ &amp;bench_sockmap_argp, 0, "bpf sockmap benchmark", 0 },</div><div class='add'>+	{ &amp;bench_lpm_trie_map_argp, 0, "LPM trie map benchmark", 0 },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -497,7 +501,7 @@ extern const struct bench bench_rename_rawtp;</div><div class='ctx'> extern const struct bench bench_rename_fentry;</div><div class='ctx'> extern const struct bench bench_rename_fexit;</div><div class='ctx'> </div><div class='del'>-/* pure counting benchmarks to establish theoretical lmits */</div><div class='add'>+/* pure counting benchmarks to establish theoretical limits */</div><div class='ctx'> extern const struct bench bench_trig_usermode_count;</div><div class='ctx'> extern const struct bench bench_trig_syscall_count;</div><div class='ctx'> extern const struct bench bench_trig_kernel_count;</div><div class='hunk'>@@ -508,6 +512,8 @@ extern const struct bench bench_trig_kretprobe;</div><div class='ctx'> extern const struct bench bench_trig_kprobe_multi;</div><div class='ctx'> extern const struct bench bench_trig_kretprobe_multi;</div><div class='ctx'> extern const struct bench bench_trig_fentry;</div><div class='add'>+extern const struct bench bench_trig_kprobe_multi_all;</div><div class='add'>+extern const struct bench bench_trig_kretprobe_multi_all;</div><div class='ctx'> extern const struct bench bench_trig_fexit;</div><div class='ctx'> extern const struct bench bench_trig_fmodret;</div><div class='ctx'> extern const struct bench bench_trig_tp;</div><div class='hunk'>@@ -526,6 +532,12 @@ extern const struct bench bench_trig_uprobe_multi_push;</div><div class='ctx'> extern const struct bench bench_trig_uretprobe_multi_push;</div><div class='ctx'> extern const struct bench bench_trig_uprobe_multi_ret;</div><div class='ctx'> extern const struct bench bench_trig_uretprobe_multi_ret;</div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+extern const struct bench bench_trig_uprobe_nop5;</div><div class='add'>+extern const struct bench bench_trig_uretprobe_nop5;</div><div class='add'>+extern const struct bench bench_trig_uprobe_multi_nop5;</div><div class='add'>+extern const struct bench bench_trig_uretprobe_multi_nop5;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> extern const struct bench bench_rb_libbpf;</div><div class='ctx'> extern const struct bench bench_rb_custom;</div><div class='hunk'>@@ -549,6 +561,14 @@ extern const struct bench bench_local_storage_create;</div><div class='ctx'> extern const struct bench bench_htab_mem;</div><div class='ctx'> extern const struct bench bench_crypto_encrypt;</div><div class='ctx'> extern const struct bench bench_crypto_decrypt;</div><div class='add'>+extern const struct bench bench_sockmap;</div><div class='add'>+extern const struct bench bench_lpm_trie_noop;</div><div class='add'>+extern const struct bench bench_lpm_trie_baseline;</div><div class='add'>+extern const struct bench bench_lpm_trie_lookup;</div><div class='add'>+extern const struct bench bench_lpm_trie_insert;</div><div class='add'>+extern const struct bench bench_lpm_trie_update;</div><div class='add'>+extern const struct bench bench_lpm_trie_delete;</div><div class='add'>+extern const struct bench bench_lpm_trie_free;</div><div class='ctx'> </div><div class='ctx'> static const struct bench *benchs[] = {</div><div class='ctx'> 	&amp;bench_count_global,</div><div class='hunk'>@@ -569,6 +589,8 @@ static const struct bench *benchs[] = {</div><div class='ctx'> 	&amp;bench_trig_kprobe_multi,</div><div class='ctx'> 	&amp;bench_trig_kretprobe_multi,</div><div class='ctx'> 	&amp;bench_trig_fentry,</div><div class='add'>+	&amp;bench_trig_kprobe_multi_all,</div><div class='add'>+	&amp;bench_trig_kretprobe_multi_all,</div><div class='ctx'> 	&amp;bench_trig_fexit,</div><div class='ctx'> 	&amp;bench_trig_fmodret,</div><div class='ctx'> 	&amp;bench_trig_tp,</div><div class='hunk'>@@ -586,6 +608,12 @@ static const struct bench *benchs[] = {</div><div class='ctx'> 	&amp;bench_trig_uretprobe_multi_push,</div><div class='ctx'> 	&amp;bench_trig_uprobe_multi_ret,</div><div class='ctx'> 	&amp;bench_trig_uretprobe_multi_ret,</div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+	&amp;bench_trig_uprobe_nop5,</div><div class='add'>+	&amp;bench_trig_uretprobe_nop5,</div><div class='add'>+	&amp;bench_trig_uprobe_multi_nop5,</div><div class='add'>+	&amp;bench_trig_uretprobe_multi_nop5,</div><div class='add'>+#endif</div><div class='ctx'> 	/* ringbuf/perfbuf benchmarks */</div><div class='ctx'> 	&amp;bench_rb_libbpf,</div><div class='ctx'> 	&amp;bench_rb_custom,</div><div class='hunk'>@@ -609,6 +637,14 @@ static const struct bench *benchs[] = {</div><div class='ctx'> 	&amp;bench_htab_mem,</div><div class='ctx'> 	&amp;bench_crypto_encrypt,</div><div class='ctx'> 	&amp;bench_crypto_decrypt,</div><div class='add'>+	&amp;bench_sockmap,</div><div class='add'>+	&amp;bench_lpm_trie_noop,</div><div class='add'>+	&amp;bench_lpm_trie_baseline,</div><div class='add'>+	&amp;bench_lpm_trie_lookup,</div><div class='add'>+	&amp;bench_lpm_trie_insert,</div><div class='add'>+	&amp;bench_lpm_trie_update,</div><div class='add'>+	&amp;bench_lpm_trie_delete,</div><div class='add'>+	&amp;bench_lpm_trie_free,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void find_benchmark(void)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/bench.h b/tools/testing/selftests/bpf/bench.h<br/>index 005c401b3e22..bea323820ffb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bench.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bench.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bench.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/bench.h</a></div><div class='hunk'>@@ -46,6 +46,7 @@ struct bench_res {</div><div class='ctx'> 	unsigned long gp_ns;</div><div class='ctx'> 	unsigned long gp_ct;</div><div class='ctx'> 	unsigned int stime;</div><div class='add'>+	unsigned long duration_ns;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bench {</div><div class='head'>diff --git a/tools/testing/selftests/bpf/benchs/bench_htab_mem.c b/tools/testing/selftests/bpf/benchs/bench_htab_mem.c<br/>index 926ee822143e..297e32390cd1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/bench_htab_mem.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/bench_htab_mem.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/bench_htab_mem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/benchs/bench_htab_mem.c</a></div><div class='hunk'>@@ -279,6 +279,7 @@ static void htab_mem_read_mem_cgrp_file(const char *name, unsigned long *value)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	got = read(fd, buf, sizeof(buf) - 1);</div><div class='add'>+	close(fd);</div><div class='ctx'> 	if (got &lt;= 0) {</div><div class='ctx'> 		*value = 0;</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -286,8 +287,6 @@ static void htab_mem_read_mem_cgrp_file(const char *name, unsigned long *value)</div><div class='ctx'> 	buf[got] = 0;</div><div class='ctx'> </div><div class='ctx'> 	*value = strtoull(buf, NULL, 0);</div><div class='del'>-</div><div class='del'>-	close(fd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void htab_mem_measure(struct bench_res *res)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/benchs/bench_lpm_trie_map.c b/tools/testing/selftests/bpf/benchs/bench_lpm_trie_map.c<br/>new file mode 100644<br/>index 000000000000..246f6cb3387d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/bench_lpm_trie_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/benchs/bench_lpm_trie_map.c</a></div><div class='hunk'>@@ -0,0 +1,555 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Cloudflare */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * All of these benchmarks operate on tries with keys in the range</div><div class='add'>+ * [0, args.nr_entries), i.e. there are no gaps or partially filled</div><div class='add'>+ * branches of the trie for any key &lt; args.nr_entries.</div><div class='add'>+ *</div><div class='add'>+ * This gives an idea of worst-case behaviour.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;argp.h&gt;</div><div class='add'>+#include &lt;linux/time64.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include "lpm_trie_bench.skel.h"</div><div class='add'>+#include "lpm_trie_map.skel.h"</div><div class='add'>+#include "bench.h"</div><div class='add'>+#include "testing_helpers.h"</div><div class='add'>+#include "progs/lpm_trie.h"</div><div class='add'>+</div><div class='add'>+static struct ctx {</div><div class='add'>+	struct lpm_trie_bench *bench;</div><div class='add'>+} ctx;</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	__u32 nr_entries;</div><div class='add'>+	__u32 prefixlen;</div><div class='add'>+	bool random;</div><div class='add'>+} args = {</div><div class='add'>+	.nr_entries = 0,</div><div class='add'>+	.prefixlen = 32,</div><div class='add'>+	.random = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ARG_NR_ENTRIES = 9000,</div><div class='add'>+	ARG_PREFIX_LEN,</div><div class='add'>+	ARG_RANDOM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct argp_option opts[] = {</div><div class='add'>+	{ "nr_entries", ARG_NR_ENTRIES, "NR_ENTRIES", 0,</div><div class='add'>+	  "Number of unique entries in the LPM trie" },</div><div class='add'>+	{ "prefix_len", ARG_PREFIX_LEN, "PREFIX_LEN", 0,</div><div class='add'>+	  "Number of prefix bits to use in the LPM trie" },</div><div class='add'>+	{ "random", ARG_RANDOM, NULL, 0, "Access random keys during op" },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static error_t lpm_parse_arg(int key, char *arg, struct argp_state *state)</div><div class='add'>+{</div><div class='add'>+	long ret;</div><div class='add'>+</div><div class='add'>+	switch (key) {</div><div class='add'>+	case ARG_NR_ENTRIES:</div><div class='add'>+		ret = strtol(arg, NULL, 10);</div><div class='add'>+		if (ret &lt; 1 || ret &gt; UINT_MAX) {</div><div class='add'>+			fprintf(stderr, "Invalid nr_entries count.");</div><div class='add'>+			argp_usage(state);</div><div class='add'>+		}</div><div class='add'>+		args.nr_entries = ret;</div><div class='add'>+		break;</div><div class='add'>+	case ARG_PREFIX_LEN:</div><div class='add'>+		ret = strtol(arg, NULL, 10);</div><div class='add'>+		if (ret &lt; 1 || ret &gt; UINT_MAX) {</div><div class='add'>+			fprintf(stderr, "Invalid prefix_len value.");</div><div class='add'>+			argp_usage(state);</div><div class='add'>+		}</div><div class='add'>+		args.prefixlen = ret;</div><div class='add'>+		break;</div><div class='add'>+	case ARG_RANDOM:</div><div class='add'>+		args.random = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return ARGP_ERR_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct argp bench_lpm_trie_map_argp = {</div><div class='add'>+	.options = opts,</div><div class='add'>+	.parser = lpm_parse_arg,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void validate_common(void)</div><div class='add'>+{</div><div class='add'>+	if (env.consumer_cnt != 0) {</div><div class='add'>+		fprintf(stderr, "benchmark doesn't support consumer\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args.nr_entries == 0) {</div><div class='add'>+		fprintf(stderr, "Missing --nr_entries parameter\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((1UL &lt;&lt; args.prefixlen) &lt; args.nr_entries) {</div><div class='add'>+		fprintf(stderr, "prefix_len value too small for nr_entries\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lpm_insert_validate(void)</div><div class='add'>+{</div><div class='add'>+	validate_common();</div><div class='add'>+</div><div class='add'>+	if (env.producer_cnt != 1) {</div><div class='add'>+		fprintf(stderr, "lpm-trie-insert requires a single producer\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args.random) {</div><div class='add'>+		fprintf(stderr, "lpm-trie-insert does not support --random\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lpm_delete_validate(void)</div><div class='add'>+{</div><div class='add'>+	validate_common();</div><div class='add'>+</div><div class='add'>+	if (env.producer_cnt != 1) {</div><div class='add'>+		fprintf(stderr, "lpm-trie-delete requires a single producer\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args.random) {</div><div class='add'>+		fprintf(stderr, "lpm-trie-delete does not support --random\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lpm_free_validate(void)</div><div class='add'>+{</div><div class='add'>+	validate_common();</div><div class='add'>+</div><div class='add'>+	if (env.producer_cnt != 1) {</div><div class='add'>+		fprintf(stderr, "lpm-trie-free requires a single producer\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args.random) {</div><div class='add'>+		fprintf(stderr, "lpm-trie-free does not support --random\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct trie_key *keys;</div><div class='add'>+static __u32 *vals;</div><div class='add'>+</div><div class='add'>+static void fill_map(int map_fd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,</div><div class='add'>+		.elem_flags = 0,</div><div class='add'>+		.flags = 0,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_batch(map_fd, keys, vals, &amp;args.nr_entries, &amp;opts);</div><div class='add'>+	if (err) {</div><div class='add'>+		fprintf(stderr, "failed to batch update keys to map: %d\n",</div><div class='add'>+			-err);</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void empty_map(int map_fd)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,</div><div class='add'>+		.elem_flags = 0,</div><div class='add'>+		.flags = 0,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_map_delete_batch(map_fd, keys, &amp;args.nr_entries, &amp;opts);</div><div class='add'>+	if (err) {</div><div class='add'>+		fprintf(stderr, "failed to batch delete keys for map: %d\n",</div><div class='add'>+			-err);</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void attach_prog(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ctx.bench = lpm_trie_bench__open_and_load();</div><div class='add'>+	if (!ctx.bench) {</div><div class='add'>+		fprintf(stderr, "failed to open skeleton\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx.bench-&gt;bss-&gt;nr_entries = args.nr_entries;</div><div class='add'>+	ctx.bench-&gt;bss-&gt;prefixlen = args.prefixlen;</div><div class='add'>+	ctx.bench-&gt;bss-&gt;random = args.random;</div><div class='add'>+</div><div class='add'>+	if (lpm_trie_bench__attach(ctx.bench)) {</div><div class='add'>+		fprintf(stderr, "failed to attach skeleton\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	keys = calloc(args.nr_entries, sizeof(*keys));</div><div class='add'>+	vals = calloc(args.nr_entries, sizeof(*vals));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; args.nr_entries; i++) {</div><div class='add'>+		struct trie_key *k = &amp;keys[i];</div><div class='add'>+		__u32 *v = &amp;vals[i];</div><div class='add'>+</div><div class='add'>+		k-&gt;prefixlen = args.prefixlen;</div><div class='add'>+		k-&gt;data = i;</div><div class='add'>+		*v = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void attach_prog_and_fill_map(void)</div><div class='add'>+{</div><div class='add'>+	int fd;</div><div class='add'>+</div><div class='add'>+	attach_prog();</div><div class='add'>+</div><div class='add'>+	fd = bpf_map__fd(ctx.bench-&gt;maps.trie_map);</div><div class='add'>+	fill_map(fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lpm_noop_setup(void)</div><div class='add'>+{</div><div class='add'>+	attach_prog();</div><div class='add'>+	ctx.bench-&gt;bss-&gt;op = LPM_OP_NOOP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lpm_baseline_setup(void)</div><div class='add'>+{</div><div class='add'>+	attach_prog();</div><div class='add'>+	ctx.bench-&gt;bss-&gt;op = LPM_OP_BASELINE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lpm_lookup_setup(void)</div><div class='add'>+{</div><div class='add'>+	attach_prog_and_fill_map();</div><div class='add'>+	ctx.bench-&gt;bss-&gt;op = LPM_OP_LOOKUP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lpm_insert_setup(void)</div><div class='add'>+{</div><div class='add'>+	attach_prog();</div><div class='add'>+	ctx.bench-&gt;bss-&gt;op = LPM_OP_INSERT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lpm_update_setup(void)</div><div class='add'>+{</div><div class='add'>+	attach_prog_and_fill_map();</div><div class='add'>+	ctx.bench-&gt;bss-&gt;op = LPM_OP_UPDATE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lpm_delete_setup(void)</div><div class='add'>+{</div><div class='add'>+	attach_prog_and_fill_map();</div><div class='add'>+	ctx.bench-&gt;bss-&gt;op = LPM_OP_DELETE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lpm_free_setup(void)</div><div class='add'>+{</div><div class='add'>+	attach_prog();</div><div class='add'>+	ctx.bench-&gt;bss-&gt;op = LPM_OP_FREE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lpm_measure(struct bench_res *res)</div><div class='add'>+{</div><div class='add'>+	res-&gt;hits = atomic_swap(&amp;ctx.bench-&gt;bss-&gt;hits, 0);</div><div class='add'>+	res-&gt;duration_ns = atomic_swap(&amp;ctx.bench-&gt;bss-&gt;duration_ns, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bench_reinit_map(void)</div><div class='add'>+{</div><div class='add'>+	int fd = bpf_map__fd(ctx.bench-&gt;maps.trie_map);</div><div class='add'>+</div><div class='add'>+	switch (ctx.bench-&gt;bss-&gt;op) {</div><div class='add'>+	case LPM_OP_INSERT:</div><div class='add'>+		/* trie_map needs to be emptied */</div><div class='add'>+		empty_map(fd);</div><div class='add'>+		break;</div><div class='add'>+	case LPM_OP_DELETE:</div><div class='add'>+		/* trie_map needs to be refilled */</div><div class='add'>+		fill_map(fd);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		fprintf(stderr, "Unexpected REINIT return code for op %d\n",</div><div class='add'>+				ctx.bench-&gt;bss-&gt;op);</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* For NOOP, BASELINE, LOOKUP, INSERT, UPDATE, and DELETE */</div><div class='add'>+static void *lpm_producer(void *unused __always_unused)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	char in[ETH_HLEN]; /* unused */</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, opts, .data_in = in,</div><div class='add'>+		    .data_size_in = sizeof(in), .repeat = 1, );</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		int fd = bpf_program__fd(ctx.bench-&gt;progs.run_bench);</div><div class='add'>+		err = bpf_prog_test_run_opts(fd, &amp;opts);</div><div class='add'>+		if (err) {</div><div class='add'>+			fprintf(stderr, "failed to run BPF prog: %d\n", err);</div><div class='add'>+			exit(1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check for kernel error code */</div><div class='add'>+		if ((int)opts.retval &lt; 0) {</div><div class='add'>+			fprintf(stderr, "BPF prog returned error: %d\n",</div><div class='add'>+				opts.retval);</div><div class='add'>+			exit(1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (opts.retval) {</div><div class='add'>+		case LPM_BENCH_SUCCESS:</div><div class='add'>+			break;</div><div class='add'>+		case LPM_BENCH_REINIT_MAP:</div><div class='add'>+			bench_reinit_map();</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			fprintf(stderr, "Unexpected BPF prog return code %d for op %d\n",</div><div class='add'>+					opts.retval, ctx.bench-&gt;bss-&gt;op);</div><div class='add'>+			exit(1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *lpm_free_producer(void *unused __always_unused)</div><div class='add'>+{</div><div class='add'>+	while (true) {</div><div class='add'>+		struct lpm_trie_map *skel;</div><div class='add'>+</div><div class='add'>+		skel = lpm_trie_map__open_and_load();</div><div class='add'>+		if (!skel) {</div><div class='add'>+			fprintf(stderr, "failed to open skeleton\n");</div><div class='add'>+			exit(1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fill_map(bpf_map__fd(skel-&gt;maps.trie_free_map));</div><div class='add'>+		lpm_trie_map__destroy(skel);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The standard bench op_report_*() functions assume measurements are</div><div class='add'>+ * taken over a 1-second interval but operations that modify the map</div><div class='add'>+ * (INSERT, DELETE, and FREE) cannot run indefinitely without</div><div class='add'>+ * "resetting" the map to the initial state. Depending on the size of</div><div class='add'>+ * the map, this likely needs to happen before the 1-second timer fires.</div><div class='add'>+ *</div><div class='add'>+ * Calculate the fraction of a second over which the op measurement was</div><div class='add'>+ * taken (to ignore any time spent doing the reset) and report the</div><div class='add'>+ * throughput results per second.</div><div class='add'>+ */</div><div class='add'>+static void frac_second_report_progress(int iter, struct bench_res *res,</div><div class='add'>+					long delta_ns, double rate_divisor,</div><div class='add'>+					char rate)</div><div class='add'>+{</div><div class='add'>+	double hits_per_sec, hits_per_prod;</div><div class='add'>+</div><div class='add'>+	hits_per_sec = res-&gt;hits / rate_divisor /</div><div class='add'>+		(res-&gt;duration_ns / (double)NSEC_PER_SEC);</div><div class='add'>+	hits_per_prod = hits_per_sec / env.producer_cnt;</div><div class='add'>+</div><div class='add'>+	printf("Iter %3d (%7.3lfus): ", iter,</div><div class='add'>+	       (delta_ns - NSEC_PER_SEC) / 1000.0);</div><div class='add'>+	printf("hits %8.3lf%c/s (%7.3lf%c/prod)\n", hits_per_sec, rate,</div><div class='add'>+	       hits_per_prod, rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void frac_second_report_final(struct bench_res res[], int res_cnt,</div><div class='add'>+				     double lat_divisor, double rate_divisor,</div><div class='add'>+				     char rate, const char *unit)</div><div class='add'>+{</div><div class='add'>+	double hits_mean = 0.0, hits_stddev = 0.0;</div><div class='add'>+	double latency = 0.0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; res_cnt; i++) {</div><div class='add'>+		double val = res[i].hits / rate_divisor /</div><div class='add'>+			     (res[i].duration_ns / (double)NSEC_PER_SEC);</div><div class='add'>+		hits_mean += val / (0.0 + res_cnt);</div><div class='add'>+		latency += res[i].duration_ns / res[i].hits / (0.0 + res_cnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (res_cnt &gt; 1) {</div><div class='add'>+		for (i = 0; i &lt; res_cnt; i++) {</div><div class='add'>+			double val =</div><div class='add'>+				res[i].hits / rate_divisor /</div><div class='add'>+				(res[i].duration_ns / (double)NSEC_PER_SEC);</div><div class='add'>+			hits_stddev += (hits_mean - val) * (hits_mean - val) /</div><div class='add'>+				       (res_cnt - 1.0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hits_stddev = sqrt(hits_stddev);</div><div class='add'>+	}</div><div class='add'>+	printf("Summary: throughput %8.3lf \u00B1 %5.3lf %c ops/s (%7.3lf%c ops/prod), ",</div><div class='add'>+	       hits_mean, hits_stddev, rate, hits_mean / env.producer_cnt,</div><div class='add'>+	       rate);</div><div class='add'>+	printf("latency %8.3lf %s/op\n",</div><div class='add'>+	       latency / lat_divisor / env.producer_cnt, unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void insert_ops_report_progress(int iter, struct bench_res *res,</div><div class='add'>+				       long delta_ns)</div><div class='add'>+{</div><div class='add'>+	double rate_divisor = 1000000.0;</div><div class='add'>+	char rate = 'M';</div><div class='add'>+</div><div class='add'>+	frac_second_report_progress(iter, res, delta_ns, rate_divisor, rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void delete_ops_report_progress(int iter, struct bench_res *res,</div><div class='add'>+				       long delta_ns)</div><div class='add'>+{</div><div class='add'>+	double rate_divisor = 1000000.0;</div><div class='add'>+	char rate = 'M';</div><div class='add'>+</div><div class='add'>+	frac_second_report_progress(iter, res, delta_ns, rate_divisor, rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_ops_report_progress(int iter, struct bench_res *res,</div><div class='add'>+				     long delta_ns)</div><div class='add'>+{</div><div class='add'>+	double rate_divisor = 1000.0;</div><div class='add'>+	char rate = 'K';</div><div class='add'>+</div><div class='add'>+	frac_second_report_progress(iter, res, delta_ns, rate_divisor, rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void insert_ops_report_final(struct bench_res res[], int res_cnt)</div><div class='add'>+{</div><div class='add'>+	double lat_divisor = 1.0;</div><div class='add'>+	double rate_divisor = 1000000.0;</div><div class='add'>+	const char *unit = "ns";</div><div class='add'>+	char rate = 'M';</div><div class='add'>+</div><div class='add'>+	frac_second_report_final(res, res_cnt, lat_divisor, rate_divisor, rate,</div><div class='add'>+				 unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void delete_ops_report_final(struct bench_res res[], int res_cnt)</div><div class='add'>+{</div><div class='add'>+	double lat_divisor = 1.0;</div><div class='add'>+	double rate_divisor = 1000000.0;</div><div class='add'>+	const char *unit = "ns";</div><div class='add'>+	char rate = 'M';</div><div class='add'>+</div><div class='add'>+	frac_second_report_final(res, res_cnt, lat_divisor, rate_divisor, rate,</div><div class='add'>+				 unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_ops_report_final(struct bench_res res[], int res_cnt)</div><div class='add'>+{</div><div class='add'>+	double lat_divisor = 1000000.0;</div><div class='add'>+	double rate_divisor = 1000.0;</div><div class='add'>+	const char *unit = "ms";</div><div class='add'>+	char rate = 'K';</div><div class='add'>+</div><div class='add'>+	frac_second_report_final(res, res_cnt, lat_divisor, rate_divisor, rate,</div><div class='add'>+				 unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* noop bench measures harness-overhead */</div><div class='add'>+const struct bench bench_lpm_trie_noop = {</div><div class='add'>+	.name = "lpm-trie-noop",</div><div class='add'>+	.argp = &amp;bench_lpm_trie_map_argp,</div><div class='add'>+	.validate = validate_common,</div><div class='add'>+	.setup = lpm_noop_setup,</div><div class='add'>+	.producer_thread = lpm_producer,</div><div class='add'>+	.measure = lpm_measure,</div><div class='add'>+	.report_progress = ops_report_progress,</div><div class='add'>+	.report_final = ops_report_final,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* baseline overhead for lookup and update */</div><div class='add'>+const struct bench bench_lpm_trie_baseline = {</div><div class='add'>+	.name = "lpm-trie-baseline",</div><div class='add'>+	.argp = &amp;bench_lpm_trie_map_argp,</div><div class='add'>+	.validate = validate_common,</div><div class='add'>+	.setup = lpm_baseline_setup,</div><div class='add'>+	.producer_thread = lpm_producer,</div><div class='add'>+	.measure = lpm_measure,</div><div class='add'>+	.report_progress = ops_report_progress,</div><div class='add'>+	.report_final = ops_report_final,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* measure cost of doing a lookup on existing entries in a full trie */</div><div class='add'>+const struct bench bench_lpm_trie_lookup = {</div><div class='add'>+	.name = "lpm-trie-lookup",</div><div class='add'>+	.argp = &amp;bench_lpm_trie_map_argp,</div><div class='add'>+	.validate = validate_common,</div><div class='add'>+	.setup = lpm_lookup_setup,</div><div class='add'>+	.producer_thread = lpm_producer,</div><div class='add'>+	.measure = lpm_measure,</div><div class='add'>+	.report_progress = ops_report_progress,</div><div class='add'>+	.report_final = ops_report_final,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* measure cost of inserting new entries into an empty trie */</div><div class='add'>+const struct bench bench_lpm_trie_insert = {</div><div class='add'>+	.name = "lpm-trie-insert",</div><div class='add'>+	.argp = &amp;bench_lpm_trie_map_argp,</div><div class='add'>+	.validate = lpm_insert_validate,</div><div class='add'>+	.setup = lpm_insert_setup,</div><div class='add'>+	.producer_thread = lpm_producer,</div><div class='add'>+	.measure = lpm_measure,</div><div class='add'>+	.report_progress = insert_ops_report_progress,</div><div class='add'>+	.report_final = insert_ops_report_final,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* measure cost of updating existing entries in a full trie */</div><div class='add'>+const struct bench bench_lpm_trie_update = {</div><div class='add'>+	.name = "lpm-trie-update",</div><div class='add'>+	.argp = &amp;bench_lpm_trie_map_argp,</div><div class='add'>+	.validate = validate_common,</div><div class='add'>+	.setup = lpm_update_setup,</div><div class='add'>+	.producer_thread = lpm_producer,</div><div class='add'>+	.measure = lpm_measure,</div><div class='add'>+	.report_progress = ops_report_progress,</div><div class='add'>+	.report_final = ops_report_final,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* measure cost of deleting existing entries from a full trie */</div><div class='add'>+const struct bench bench_lpm_trie_delete = {</div><div class='add'>+	.name = "lpm-trie-delete",</div><div class='add'>+	.argp = &amp;bench_lpm_trie_map_argp,</div><div class='add'>+	.validate = lpm_delete_validate,</div><div class='add'>+	.setup = lpm_delete_setup,</div><div class='add'>+	.producer_thread = lpm_producer,</div><div class='add'>+	.measure = lpm_measure,</div><div class='add'>+	.report_progress = delete_ops_report_progress,</div><div class='add'>+	.report_final = delete_ops_report_final,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* measure cost of freeing a full trie */</div><div class='add'>+const struct bench bench_lpm_trie_free = {</div><div class='add'>+	.name = "lpm-trie-free",</div><div class='add'>+	.argp = &amp;bench_lpm_trie_map_argp,</div><div class='add'>+	.validate = lpm_free_validate,</div><div class='add'>+	.setup = lpm_free_setup,</div><div class='add'>+	.producer_thread = lpm_free_producer,</div><div class='add'>+	.measure = lpm_measure,</div><div class='add'>+	.report_progress = free_ops_report_progress,</div><div class='add'>+	.report_final = free_ops_report_final,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/benchs/bench_ringbufs.c b/tools/testing/selftests/bpf/benchs/bench_ringbufs.c<br/>index e1ee979e6acc..01bdce692799 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/bench_ringbufs.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/bench_ringbufs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/bench_ringbufs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/benchs/bench_ringbufs.c</a></div><div class='hunk'>@@ -19,6 +19,8 @@ static struct {</div><div class='ctx'> 	int ringbuf_sz; /* per-ringbuf, in bytes */</div><div class='ctx'> 	bool ringbuf_use_output; /* use slower output API */</div><div class='ctx'> 	int perfbuf_sz; /* per-CPU size, in pages */</div><div class='add'>+	bool overwrite;</div><div class='add'>+	bool bench_producer;</div><div class='ctx'> } args = {</div><div class='ctx'> 	.back2back = false,</div><div class='ctx'> 	.batch_cnt = 500,</div><div class='hunk'>@@ -27,6 +29,8 @@ static struct {</div><div class='ctx'> 	.ringbuf_sz = 512 * 1024,</div><div class='ctx'> 	.ringbuf_use_output = false,</div><div class='ctx'> 	.perfbuf_sz = 128,</div><div class='add'>+	.overwrite = false,</div><div class='add'>+	.bench_producer = false,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -35,6 +39,8 @@ enum {</div><div class='ctx'> 	ARG_RB_BATCH_CNT = 2002,</div><div class='ctx'> 	ARG_RB_SAMPLED = 2003,</div><div class='ctx'> 	ARG_RB_SAMPLE_RATE = 2004,</div><div class='add'>+	ARG_RB_OVERWRITE = 2005,</div><div class='add'>+	ARG_RB_BENCH_PRODUCER = 2006,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct argp_option opts[] = {</div><div class='hunk'>@@ -43,6 +49,8 @@ static const struct argp_option opts[] = {</div><div class='ctx'> 	{ "rb-batch-cnt", ARG_RB_BATCH_CNT, "CNT", 0, "Set BPF-side record batch count"},</div><div class='ctx'> 	{ "rb-sampled", ARG_RB_SAMPLED, NULL, 0, "Notification sampling"},</div><div class='ctx'> 	{ "rb-sample-rate", ARG_RB_SAMPLE_RATE, "RATE", 0, "Notification sample rate"},</div><div class='add'>+	{ "rb-overwrite", ARG_RB_OVERWRITE, NULL, 0, "Overwrite mode"},</div><div class='add'>+	{ "rb-bench-producer", ARG_RB_BENCH_PRODUCER, NULL, 0, "Benchmark producer"},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -72,6 +80,12 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)</div><div class='ctx'> 			argp_usage(state);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case ARG_RB_OVERWRITE:</div><div class='add'>+		args.overwrite = true;</div><div class='add'>+		break;</div><div class='add'>+	case ARG_RB_BENCH_PRODUCER:</div><div class='add'>+		args.bench_producer = true;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return ARGP_ERR_UNKNOWN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -95,8 +109,33 @@ static inline void bufs_trigger_batch(void)</div><div class='ctx'> </div><div class='ctx'> static void bufs_validate(void)</div><div class='ctx'> {</div><div class='del'>-	if (env.consumer_cnt != 1) {</div><div class='del'>-		fprintf(stderr, "rb-libbpf benchmark needs one consumer!\n");</div><div class='add'>+	if (args.bench_producer &amp;&amp; strcmp(env.bench_name, "rb-libbpf")) {</div><div class='add'>+		fprintf(stderr, "--rb-bench-producer only works with rb-libbpf!\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args.overwrite &amp;&amp; !args.bench_producer) {</div><div class='add'>+		fprintf(stderr, "overwrite mode only works with --rb-bench-producer for now!\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args.bench_producer &amp;&amp; env.consumer_cnt != 0) {</div><div class='add'>+		fprintf(stderr, "no consumer is needed for --rb-bench-producer!\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args.bench_producer &amp;&amp; args.back2back) {</div><div class='add'>+		fprintf(stderr, "back-to-back mode makes no sense for --rb-bench-producer!\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args.bench_producer &amp;&amp; args.sampled) {</div><div class='add'>+		fprintf(stderr, "sampling mode makes no sense for --rb-bench-producer!\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!args.bench_producer &amp;&amp; env.consumer_cnt != 1) {</div><div class='add'>+		fprintf(stderr, "benchmarks without --rb-bench-producer require exactly one consumer!\n");</div><div class='ctx'> 		exit(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -128,12 +167,17 @@ static void ringbuf_libbpf_measure(struct bench_res *res)</div><div class='ctx'> {</div><div class='ctx'> 	struct ringbuf_libbpf_ctx *ctx = &amp;ringbuf_libbpf_ctx;</div><div class='ctx'> </div><div class='del'>-	res-&gt;hits = atomic_swap(&amp;buf_hits.value, 0);</div><div class='add'>+	if (args.bench_producer)</div><div class='add'>+		res-&gt;hits = atomic_swap(&amp;ctx-&gt;skel-&gt;bss-&gt;hits, 0);</div><div class='add'>+	else</div><div class='add'>+		res-&gt;hits = atomic_swap(&amp;buf_hits.value, 0);</div><div class='ctx'> 	res-&gt;drops = atomic_swap(&amp;ctx-&gt;skel-&gt;bss-&gt;dropped, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ringbuf_bench *ringbuf_setup_skeleton(void)</div><div class='ctx'> {</div><div class='add'>+	__u32 flags;</div><div class='add'>+	struct bpf_map *ringbuf;</div><div class='ctx'> 	struct ringbuf_bench *skel;</div><div class='ctx'> </div><div class='ctx'> 	setup_libbpf();</div><div class='hunk'>@@ -146,12 +190,19 @@ static struct ringbuf_bench *ringbuf_setup_skeleton(void)</div><div class='ctx'> </div><div class='ctx'> 	skel-&gt;rodata-&gt;batch_cnt = args.batch_cnt;</div><div class='ctx'> 	skel-&gt;rodata-&gt;use_output = args.ringbuf_use_output ? 1 : 0;</div><div class='add'>+	skel-&gt;rodata-&gt;bench_producer = args.bench_producer;</div><div class='ctx'> </div><div class='ctx'> 	if (args.sampled)</div><div class='ctx'> 		/* record data + header take 16 bytes */</div><div class='ctx'> 		skel-&gt;rodata-&gt;wakeup_data_size = args.sample_rate * 16;</div><div class='ctx'> </div><div class='del'>-	bpf_map__set_max_entries(skel-&gt;maps.ringbuf, args.ringbuf_sz);</div><div class='add'>+	ringbuf = skel-&gt;maps.ringbuf;</div><div class='add'>+	if (args.overwrite) {</div><div class='add'>+		flags = bpf_map__map_flags(ringbuf) | BPF_F_RB_OVERWRITE;</div><div class='add'>+		bpf_map__set_map_flags(ringbuf, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_map__set_max_entries(ringbuf, args.ringbuf_sz);</div><div class='ctx'> </div><div class='ctx'> 	if (ringbuf_bench__load(skel)) {</div><div class='ctx'> 		fprintf(stderr, "failed to load skeleton\n");</div><div class='hunk'>@@ -171,10 +222,12 @@ static void ringbuf_libbpf_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct ringbuf_libbpf_ctx *ctx = &amp;ringbuf_libbpf_ctx;</div><div class='ctx'> 	struct bpf_link *link;</div><div class='add'>+	int map_fd;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;skel = ringbuf_setup_skeleton();</div><div class='del'>-	ctx-&gt;ringbuf = ring_buffer__new(bpf_map__fd(ctx-&gt;skel-&gt;maps.ringbuf),</div><div class='del'>-					buf_process_sample, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	map_fd = bpf_map__fd(ctx-&gt;skel-&gt;maps.ringbuf);</div><div class='add'>+	ctx-&gt;ringbuf = ring_buffer__new(map_fd, buf_process_sample, NULL, NULL);</div><div class='ctx'> 	if (!ctx-&gt;ringbuf) {</div><div class='ctx'> 		fprintf(stderr, "failed to create ringbuf\n");</div><div class='ctx'> 		exit(1);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/benchs/bench_sockmap.c b/tools/testing/selftests/bpf/benchs/bench_sockmap.c<br/>new file mode 100644<br/>index 000000000000..cfc072aa7fff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/bench_sockmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/benchs/bench_sockmap.c</a></div><div class='hunk'>@@ -0,0 +1,599 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;error.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+#include &lt;sys/sendfile.h&gt;</div><div class='add'>+#include &lt;arpa/inet.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;argp.h&gt;</div><div class='add'>+#include "bench.h"</div><div class='add'>+#include "bench_sockmap_prog.skel.h"</div><div class='add'>+#include "bpf_util.h"</div><div class='add'>+</div><div class='add'>+#define FILE_SIZE (128 * 1024)</div><div class='add'>+#define DATA_REPEAT_SIZE 10</div><div class='add'>+</div><div class='add'>+static const char snd_data[DATA_REPEAT_SIZE] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};</div><div class='add'>+</div><div class='add'>+/* c1 &lt;-&gt; [p1, p2] &lt;-&gt; c2</div><div class='add'>+ * RX bench(BPF_SK_SKB_STREAM_VERDICT):</div><div class='add'>+ *	ARG_FW_RX_PASS:</div><div class='add'>+ *		send(p2) -&gt; recv(c2) -&gt; bpf skb passthrough -&gt; recv(c2)</div><div class='add'>+ *	ARG_FW_RX_VERDICT_EGRESS:</div><div class='add'>+ *		send(c1) -&gt; verdict skb to tx queuec of p2 -&gt; recv(c2)</div><div class='add'>+ *	ARG_FW_RX_VERDICT_INGRESS:</div><div class='add'>+ *		send(c1) -&gt; verdict skb to rx queuec of c2 -&gt; recv(c2)</div><div class='add'>+ *</div><div class='add'>+ * TX bench(BPF_SK_MSG_VERDIC):</div><div class='add'>+ *	ARG_FW_TX_PASS:</div><div class='add'>+ *		send(p2) -&gt; bpf msg passthrough -&gt; send(p2) -&gt; recv(c2)</div><div class='add'>+ *	ARG_FW_TX_VERDICT_INGRESS:</div><div class='add'>+ *		send(p2) -&gt; verdict msg to rx queue of c2 -&gt; recv(c2)</div><div class='add'>+ *	ARG_FW_TX_VERDICT_EGRESS:</div><div class='add'>+ *		send(p1) -&gt; verdict msg to tx queue of p2 -&gt; recv(c2)</div><div class='add'>+ */</div><div class='add'>+enum SOCKMAP_ARG_FLAG {</div><div class='add'>+	ARG_FW_RX_NORMAL = 11000,</div><div class='add'>+	ARG_FW_RX_PASS,</div><div class='add'>+	ARG_FW_RX_VERDICT_EGRESS,</div><div class='add'>+	ARG_FW_RX_VERDICT_INGRESS,</div><div class='add'>+	ARG_FW_TX_NORMAL,</div><div class='add'>+	ARG_FW_TX_PASS,</div><div class='add'>+	ARG_FW_TX_VERDICT_INGRESS,</div><div class='add'>+	ARG_FW_TX_VERDICT_EGRESS,</div><div class='add'>+	ARG_CTL_RX_STRP,</div><div class='add'>+	ARG_CONSUMER_DELAY_TIME,</div><div class='add'>+	ARG_PRODUCER_DURATION,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TXMODE_NORMAL()				\</div><div class='add'>+	((ctx.mode) == ARG_FW_TX_NORMAL)</div><div class='add'>+</div><div class='add'>+#define TXMODE_BPF_INGRESS()			\</div><div class='add'>+	((ctx.mode) == ARG_FW_TX_VERDICT_INGRESS)</div><div class='add'>+</div><div class='add'>+#define TXMODE_BPF_EGRESS()			\</div><div class='add'>+	((ctx.mode) == ARG_FW_TX_VERDICT_EGRESS)</div><div class='add'>+</div><div class='add'>+#define TXMODE_BPF_PASS()			\</div><div class='add'>+	((ctx.mode) == ARG_FW_TX_PASS)</div><div class='add'>+</div><div class='add'>+#define TXMODE_BPF() (				\</div><div class='add'>+	TXMODE_BPF_PASS() ||			\</div><div class='add'>+	TXMODE_BPF_INGRESS() ||			\</div><div class='add'>+	TXMODE_BPF_EGRESS())</div><div class='add'>+</div><div class='add'>+#define TXMODE() (				\</div><div class='add'>+	TXMODE_NORMAL() ||			\</div><div class='add'>+	TXMODE_BPF())</div><div class='add'>+</div><div class='add'>+#define RXMODE_NORMAL()				\</div><div class='add'>+	((ctx.mode) == ARG_FW_RX_NORMAL)</div><div class='add'>+</div><div class='add'>+#define RXMODE_BPF_PASS()			\</div><div class='add'>+	((ctx.mode) == ARG_FW_RX_PASS)</div><div class='add'>+</div><div class='add'>+#define RXMODE_BPF_VERDICT_EGRESS()		\</div><div class='add'>+	((ctx.mode) == ARG_FW_RX_VERDICT_EGRESS)</div><div class='add'>+</div><div class='add'>+#define RXMODE_BPF_VERDICT_INGRESS()		\</div><div class='add'>+	((ctx.mode) == ARG_FW_RX_VERDICT_INGRESS)</div><div class='add'>+</div><div class='add'>+#define RXMODE_BPF_VERDICT() (			\</div><div class='add'>+	RXMODE_BPF_VERDICT_INGRESS() ||		\</div><div class='add'>+	RXMODE_BPF_VERDICT_EGRESS())</div><div class='add'>+</div><div class='add'>+#define RXMODE_BPF() (				\</div><div class='add'>+	RXMODE_BPF_PASS() ||			\</div><div class='add'>+	RXMODE_BPF_VERDICT())</div><div class='add'>+</div><div class='add'>+#define RXMODE() (				\</div><div class='add'>+	RXMODE_NORMAL() ||			\</div><div class='add'>+	RXMODE_BPF())</div><div class='add'>+</div><div class='add'>+static struct socmap_ctx {</div><div class='add'>+	struct bench_sockmap_prog *skel;</div><div class='add'>+	enum SOCKMAP_ARG_FLAG mode;</div><div class='add'>+	#define c1	fds[0]</div><div class='add'>+	#define p1	fds[1]</div><div class='add'>+	#define c2	fds[2]</div><div class='add'>+	#define p2	fds[3]</div><div class='add'>+	#define sfd	fds[4]</div><div class='add'>+	int		fds[5];</div><div class='add'>+	long		send_calls;</div><div class='add'>+	long		read_calls;</div><div class='add'>+	long		prod_send;</div><div class='add'>+	long		user_read;</div><div class='add'>+	int		file_size;</div><div class='add'>+	int		delay_consumer;</div><div class='add'>+	int		prod_run_time;</div><div class='add'>+	int		strp_size;</div><div class='add'>+} ctx = {</div><div class='add'>+	.prod_send	= 0,</div><div class='add'>+	.user_read	= 0,</div><div class='add'>+	.file_size	= FILE_SIZE,</div><div class='add'>+	.mode		= ARG_FW_RX_VERDICT_EGRESS,</div><div class='add'>+	.fds		= {0},</div><div class='add'>+	.delay_consumer = 0,</div><div class='add'>+	.prod_run_time	= 0,</div><div class='add'>+	.strp_size	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bench_sockmap_prog_destroy(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ctx.fds); i++) {</div><div class='add'>+		if (ctx.fds[i] &gt; 0)</div><div class='add'>+			close(ctx.fds[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bench_sockmap_prog__destroy(ctx.skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_addr(struct sockaddr_storage *ss,</div><div class='add'>+		      socklen_t *len)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_in *addr4 = memset(ss, 0, sizeof(*ss));</div><div class='add'>+</div><div class='add'>+	addr4-&gt;sin_family = AF_INET;</div><div class='add'>+	addr4-&gt;sin_port = 0;</div><div class='add'>+	addr4-&gt;sin_addr.s_addr = htonl(INADDR_LOOPBACK);</div><div class='add'>+	*len = sizeof(*addr4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool set_non_block(int fd, bool blocking)</div><div class='add'>+{</div><div class='add'>+	int flags = fcntl(fd, F_GETFL, 0);</div><div class='add'>+</div><div class='add'>+	if (flags == -1)</div><div class='add'>+		return false;</div><div class='add'>+	flags = blocking ? (flags | O_NONBLOCK) : (flags &amp; ~O_NONBLOCK);</div><div class='add'>+	return (fcntl(fd, F_SETFL, flags) == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_pair(int *c, int *p, int type)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_storage addr;</div><div class='add'>+	int err, cfd, pfd;</div><div class='add'>+	socklen_t addr_len = sizeof(struct sockaddr_storage);</div><div class='add'>+</div><div class='add'>+	err = getsockname(ctx.sfd, (struct sockaddr *)&amp;addr, &amp;addr_len);</div><div class='add'>+	if (err) {</div><div class='add'>+		fprintf(stderr, "getsockname error %d\n", errno);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	cfd = socket(AF_INET, type, 0);</div><div class='add'>+	if (cfd &lt; 0) {</div><div class='add'>+		fprintf(stderr, "socket error %d\n", errno);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = connect(cfd, (struct sockaddr *)&amp;addr, addr_len);</div><div class='add'>+	if (err &amp;&amp; errno != EINPROGRESS) {</div><div class='add'>+		fprintf(stderr, "connect error %d\n", errno);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pfd = accept(ctx.sfd, NULL, NULL);</div><div class='add'>+	if (pfd &lt; 0) {</div><div class='add'>+		fprintf(stderr, "accept error %d\n", errno);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	*c = cfd;</div><div class='add'>+	*p = pfd;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_sockets(void)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_storage addr;</div><div class='add'>+	int err, one = 1;</div><div class='add'>+	socklen_t addr_len;</div><div class='add'>+</div><div class='add'>+	init_addr(&amp;addr, &amp;addr_len);</div><div class='add'>+	ctx.sfd = socket(AF_INET, SOCK_STREAM, 0);</div><div class='add'>+	if (ctx.sfd &lt; 0) {</div><div class='add'>+		fprintf(stderr, "socket error:%d\n", errno);</div><div class='add'>+		return ctx.sfd;</div><div class='add'>+	}</div><div class='add'>+	err = setsockopt(ctx.sfd, SOL_SOCKET, SO_REUSEPORT, &amp;one, sizeof(one));</div><div class='add'>+	if (err) {</div><div class='add'>+		fprintf(stderr, "setsockopt error:%d\n", errno);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = bind(ctx.sfd, (struct sockaddr *)&amp;addr, addr_len);</div><div class='add'>+	if (err) {</div><div class='add'>+		fprintf(stderr, "bind error:%d\n", errno);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = listen(ctx.sfd, SOMAXCONN);</div><div class='add'>+	if (err) {</div><div class='add'>+		fprintf(stderr, "listen error:%d\n", errno);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = create_pair(&amp;ctx.c1, &amp;ctx.p1, SOCK_STREAM);</div><div class='add'>+	if (err) {</div><div class='add'>+		fprintf(stderr, "create_pair 1 error\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = create_pair(&amp;ctx.c2, &amp;ctx.p2, SOCK_STREAM);</div><div class='add'>+	if (err) {</div><div class='add'>+		fprintf(stderr, "create_pair 2 error\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	printf("create socket fd c1:%d p1:%d c2:%d p2:%d\n",</div><div class='add'>+	       ctx.c1, ctx.p1, ctx.c2, ctx.p2);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void validate(void)</div><div class='add'>+{</div><div class='add'>+	if (env.consumer_cnt != 2 || env.producer_cnt != 1 ||</div><div class='add'>+	    !env.affinity)</div><div class='add'>+		goto err;</div><div class='add'>+	return;</div><div class='add'>+err:</div><div class='add'>+	fprintf(stderr, "argument '-c 2 -p 1 -a' is necessary");</div><div class='add'>+	exit(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_rx_sockmap(void)</div><div class='add'>+{</div><div class='add'>+	int verdict, pass, parser, map;</div><div class='add'>+	int zero = 0, one = 1;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	parser = bpf_program__fd(ctx.skel-&gt;progs.prog_skb_parser);</div><div class='add'>+	verdict = bpf_program__fd(ctx.skel-&gt;progs.prog_skb_verdict);</div><div class='add'>+	pass = bpf_program__fd(ctx.skel-&gt;progs.prog_skb_pass);</div><div class='add'>+	map = bpf_map__fd(ctx.skel-&gt;maps.sock_map_rx);</div><div class='add'>+</div><div class='add'>+	if (ctx.strp_size != 0) {</div><div class='add'>+		ctx.skel-&gt;bss-&gt;pkt_size = ctx.strp_size;</div><div class='add'>+		err = bpf_prog_attach(parser, map, BPF_SK_SKB_STREAM_PARSER, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (RXMODE_BPF_VERDICT())</div><div class='add'>+		err = bpf_prog_attach(verdict, map, BPF_SK_SKB_STREAM_VERDICT, 0);</div><div class='add'>+	else if (RXMODE_BPF_PASS())</div><div class='add'>+		err = bpf_prog_attach(pass, map, BPF_SK_SKB_STREAM_VERDICT, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (RXMODE_BPF_PASS())</div><div class='add'>+		return bpf_map_update_elem(map, &amp;zero, &amp;ctx.c2, BPF_NOEXIST);</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(map, &amp;zero, &amp;ctx.p1, BPF_NOEXIST);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (RXMODE_BPF_VERDICT_INGRESS()) {</div><div class='add'>+		ctx.skel-&gt;bss-&gt;verdict_dir = BPF_F_INGRESS;</div><div class='add'>+		err = bpf_map_update_elem(map, &amp;one, &amp;ctx.c2, BPF_NOEXIST);</div><div class='add'>+	} else {</div><div class='add'>+		err = bpf_map_update_elem(map, &amp;one, &amp;ctx.p2, BPF_NOEXIST);</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_tx_sockmap(void)</div><div class='add'>+{</div><div class='add'>+	int zero = 0, one = 1;</div><div class='add'>+	int prog, map;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	map = bpf_map__fd(ctx.skel-&gt;maps.sock_map_tx);</div><div class='add'>+	prog = TXMODE_BPF_PASS() ?</div><div class='add'>+		bpf_program__fd(ctx.skel-&gt;progs.prog_skmsg_pass) :</div><div class='add'>+		bpf_program__fd(ctx.skel-&gt;progs.prog_skmsg_verdict);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach(prog, map, BPF_SK_MSG_VERDICT, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (TXMODE_BPF_EGRESS()) {</div><div class='add'>+		err = bpf_map_update_elem(map, &amp;zero, &amp;ctx.p1, BPF_NOEXIST);</div><div class='add'>+		err |= bpf_map_update_elem(map, &amp;one, &amp;ctx.p2, BPF_NOEXIST);</div><div class='add'>+	} else {</div><div class='add'>+		ctx.skel-&gt;bss-&gt;verdict_dir = BPF_F_INGRESS;</div><div class='add'>+		err = bpf_map_update_elem(map, &amp;zero, &amp;ctx.p2, BPF_NOEXIST);</div><div class='add'>+		err |= bpf_map_update_elem(map, &amp;one, &amp;ctx.c2, BPF_NOEXIST);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ctx.skel = bench_sockmap_prog__open_and_load();</div><div class='add'>+	if (!ctx.skel) {</div><div class='add'>+		fprintf(stderr, "error loading skel\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (create_sockets()) {</div><div class='add'>+		fprintf(stderr, "create_net_mode error\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (RXMODE_BPF()) {</div><div class='add'>+		err = setup_rx_sockmap();</div><div class='add'>+		if (err) {</div><div class='add'>+			fprintf(stderr, "setup_rx_sockmap error:%d\n", err);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	} else if (TXMODE_BPF()) {</div><div class='add'>+		err = setup_tx_sockmap();</div><div class='add'>+		if (err) {</div><div class='add'>+			fprintf(stderr, "setup_tx_sockmap error:%d\n", err);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		fprintf(stderr, "unknown sockmap bench mode: %d\n", ctx.mode);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	bench_sockmap_prog_destroy();</div><div class='add'>+	exit(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void measure(struct bench_res *res)</div><div class='add'>+{</div><div class='add'>+	res-&gt;drops = atomic_swap(&amp;ctx.prod_send, 0);</div><div class='add'>+	res-&gt;hits = atomic_swap(&amp;ctx.skel-&gt;bss-&gt;process_byte, 0);</div><div class='add'>+	res-&gt;false_hits = atomic_swap(&amp;ctx.user_read, 0);</div><div class='add'>+	res-&gt;important_hits = atomic_swap(&amp;ctx.send_calls, 0);</div><div class='add'>+	res-&gt;important_hits |= atomic_swap(&amp;ctx.read_calls, 0) &lt;&lt; 32;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void verify_data(int *check_pos, char *buf, int rcv)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0 ; i &lt; rcv; i++) {</div><div class='add'>+		if (buf[i] != snd_data[(*check_pos) % DATA_REPEAT_SIZE]) {</div><div class='add'>+			fprintf(stderr, "verify data fail");</div><div class='add'>+			exit(1);</div><div class='add'>+		}</div><div class='add'>+		(*check_pos)++;</div><div class='add'>+		if (*check_pos &gt;= FILE_SIZE)</div><div class='add'>+			*check_pos = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *consumer(void *input)</div><div class='add'>+{</div><div class='add'>+	int rcv, sent;</div><div class='add'>+	int check_pos = 0;</div><div class='add'>+	int tid = (long)input;</div><div class='add'>+	int recv_buf_size = FILE_SIZE;</div><div class='add'>+	char *buf = malloc(recv_buf_size);</div><div class='add'>+	int delay_read = ctx.delay_consumer;</div><div class='add'>+</div><div class='add'>+	if (!buf) {</div><div class='add'>+		fprintf(stderr, "fail to init read buffer");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		if (tid == 1) {</div><div class='add'>+			/* consumer 1 is unused for tx test and stream verdict test */</div><div class='add'>+			if (RXMODE_BPF() || TXMODE())</div><div class='add'>+				return NULL;</div><div class='add'>+			/* it's only for RX_NORMAL which service as reserve-proxy mode */</div><div class='add'>+			rcv = read(ctx.p1, buf, recv_buf_size);</div><div class='add'>+			if (rcv &lt; 0) {</div><div class='add'>+				fprintf(stderr, "fail to read p1");</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sent = send(ctx.p2, buf, recv_buf_size, 0);</div><div class='add'>+			if (sent &lt; 0) {</div><div class='add'>+				fprintf(stderr, "fail to send p2");</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (delay_read != 0) {</div><div class='add'>+				if (delay_read &lt; 0)</div><div class='add'>+					return NULL;</div><div class='add'>+				sleep(delay_read);</div><div class='add'>+				delay_read = 0;</div><div class='add'>+			}</div><div class='add'>+			/* read real endpoint by consumer 0 */</div><div class='add'>+			atomic_inc(&amp;ctx.read_calls);</div><div class='add'>+			rcv = read(ctx.c2, buf, recv_buf_size);</div><div class='add'>+			if (rcv &lt; 0 &amp;&amp; errno != EAGAIN) {</div><div class='add'>+				fprintf(stderr, "%s fail to read c2 %d\n", __func__, errno);</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+			verify_data(&amp;check_pos, buf, rcv);</div><div class='add'>+			atomic_add(&amp;ctx.user_read, rcv);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *producer(void *input)</div><div class='add'>+{</div><div class='add'>+	int off = 0, fp, need_sent, sent;</div><div class='add'>+	int file_size = ctx.file_size;</div><div class='add'>+	struct timespec ts1, ts2;</div><div class='add'>+	int target;</div><div class='add'>+	FILE *file;</div><div class='add'>+</div><div class='add'>+	file = tmpfile();</div><div class='add'>+	if (!file) {</div><div class='add'>+		fprintf(stderr, "create file for sendfile");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we need simple verify */</div><div class='add'>+	for (int i = 0; i &lt; file_size; i++) {</div><div class='add'>+		if (fwrite(&amp;snd_data[off], sizeof(char), 1, file) != 1) {</div><div class='add'>+			fprintf(stderr, "init tmpfile error");</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		if (++off &gt;= sizeof(snd_data))</div><div class='add'>+			off = 0;</div><div class='add'>+	}</div><div class='add'>+	fflush(file);</div><div class='add'>+	fseek(file, 0, SEEK_SET);</div><div class='add'>+</div><div class='add'>+	fp = fileno(file);</div><div class='add'>+	need_sent = file_size;</div><div class='add'>+	clock_gettime(CLOCK_MONOTONIC, &amp;ts1);</div><div class='add'>+</div><div class='add'>+	if (RXMODE_BPF_VERDICT())</div><div class='add'>+		target = ctx.c1;</div><div class='add'>+	else if (TXMODE_BPF_EGRESS())</div><div class='add'>+		target = ctx.p1;</div><div class='add'>+	else</div><div class='add'>+		target = ctx.p2;</div><div class='add'>+	set_non_block(target, true);</div><div class='add'>+	while (true) {</div><div class='add'>+		if (ctx.prod_run_time) {</div><div class='add'>+			clock_gettime(CLOCK_MONOTONIC, &amp;ts2);</div><div class='add'>+			if (ts2.tv_sec - ts1.tv_sec &gt; ctx.prod_run_time)</div><div class='add'>+				return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		errno = 0;</div><div class='add'>+		atomic_inc(&amp;ctx.send_calls);</div><div class='add'>+		sent = sendfile(target, fp, NULL, need_sent);</div><div class='add'>+		if (sent &lt; 0) {</div><div class='add'>+			if (errno != EAGAIN &amp;&amp; errno != ENOMEM &amp;&amp; errno != ENOBUFS) {</div><div class='add'>+				fprintf(stderr, "sendfile return %d, errorno %d:%s\n",</div><div class='add'>+					sent, errno, strerror(errno));</div><div class='add'>+				return NULL;</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+		} else if (sent &lt; need_sent) {</div><div class='add'>+			need_sent -= sent;</div><div class='add'>+			atomic_add(&amp;ctx.prod_send, sent);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		atomic_add(&amp;ctx.prod_send, need_sent);</div><div class='add'>+		need_sent = file_size;</div><div class='add'>+		lseek(fp, 0, SEEK_SET);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void report_progress(int iter, struct bench_res *res, long delta_ns)</div><div class='add'>+{</div><div class='add'>+	double speed_mbs, prod_mbs, bpf_mbs, send_hz, read_hz;</div><div class='add'>+</div><div class='add'>+	prod_mbs = res-&gt;drops / 1000000.0 / (delta_ns / 1000000000.0);</div><div class='add'>+	speed_mbs = res-&gt;false_hits / 1000000.0 / (delta_ns / 1000000000.0);</div><div class='add'>+	bpf_mbs = res-&gt;hits / 1000000.0 / (delta_ns / 1000000000.0);</div><div class='add'>+	send_hz = (res-&gt;important_hits &amp; 0xFFFFFFFF) / (delta_ns / 1000000000.0);</div><div class='add'>+	read_hz = (res-&gt;important_hits &gt;&gt; 32) / (delta_ns / 1000000000.0);</div><div class='add'>+</div><div class='add'>+	printf("Iter %3d (%7.3lfus): ",</div><div class='add'>+	       iter, (delta_ns - 1000000000) / 1000.0);</div><div class='add'>+	printf("Send Speed %8.3lf MB/s (%8.3lf calls/s), BPF Speed %8.3lf MB/s, "</div><div class='add'>+	       "Rcv Speed %8.3lf MB/s (%8.3lf calls/s)\n",</div><div class='add'>+	       prod_mbs, send_hz, bpf_mbs, speed_mbs, read_hz);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void report_final(struct bench_res res[], int res_cnt)</div><div class='add'>+{</div><div class='add'>+	double verdict_mbs_mean = 0.0;</div><div class='add'>+	long verdict_total = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; res_cnt; i++) {</div><div class='add'>+		verdict_mbs_mean += res[i].hits / 1000000.0 / (0.0 + res_cnt);</div><div class='add'>+		verdict_total += res[i].hits / 1000000.0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printf("Summary: total trans %8.3lu MB \u00B1 %5.3lf MB/s\n",</div><div class='add'>+	       verdict_total, verdict_mbs_mean);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct argp_option opts[] = {</div><div class='add'>+	{ "rx-normal", ARG_FW_RX_NORMAL, NULL, 0,</div><div class='add'>+		"simple reserve-proxy mode, no bfp enabled"},</div><div class='add'>+	{ "rx-pass", ARG_FW_RX_PASS, NULL, 0,</div><div class='add'>+		"run bpf prog but no redir applied"},</div><div class='add'>+	{ "rx-strp", ARG_CTL_RX_STRP, "Byte", 0,</div><div class='add'>+		"enable strparser and set the encapsulation size"},</div><div class='add'>+	{ "rx-verdict-egress", ARG_FW_RX_VERDICT_EGRESS, NULL, 0,</div><div class='add'>+		"forward data with bpf(stream verdict)"},</div><div class='add'>+	{ "rx-verdict-ingress", ARG_FW_RX_VERDICT_INGRESS, NULL, 0,</div><div class='add'>+		"forward data with bpf(stream verdict)"},</div><div class='add'>+	{ "tx-normal", ARG_FW_TX_NORMAL, NULL, 0,</div><div class='add'>+		"simple c-s mode, no bfp enabled"},</div><div class='add'>+	{ "tx-pass", ARG_FW_TX_PASS, NULL, 0,</div><div class='add'>+		"run bpf prog but no redir applied"},</div><div class='add'>+	{ "tx-verdict-ingress", ARG_FW_TX_VERDICT_INGRESS, NULL, 0,</div><div class='add'>+		"forward msg to ingress queue of another socket"},</div><div class='add'>+	{ "tx-verdict-egress", ARG_FW_TX_VERDICT_EGRESS, NULL, 0,</div><div class='add'>+		"forward msg to egress queue of another socket"},</div><div class='add'>+	{ "delay-consumer", ARG_CONSUMER_DELAY_TIME, "SEC", 0,</div><div class='add'>+		"delay consumer start"},</div><div class='add'>+	{ "producer-duration", ARG_PRODUCER_DURATION, "SEC", 0,</div><div class='add'>+		"producer duration"},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static error_t parse_arg(int key, char *arg, struct argp_state *state)</div><div class='add'>+{</div><div class='add'>+	switch (key) {</div><div class='add'>+	case ARG_FW_RX_NORMAL...ARG_FW_TX_VERDICT_EGRESS:</div><div class='add'>+		ctx.mode = key;</div><div class='add'>+		break;</div><div class='add'>+	case ARG_CONSUMER_DELAY_TIME:</div><div class='add'>+		ctx.delay_consumer = strtol(arg, NULL, 10);</div><div class='add'>+		break;</div><div class='add'>+	case ARG_PRODUCER_DURATION:</div><div class='add'>+		ctx.prod_run_time = strtol(arg, NULL, 10);</div><div class='add'>+		break;</div><div class='add'>+	case ARG_CTL_RX_STRP:</div><div class='add'>+		ctx.strp_size = strtol(arg, NULL, 10);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return ARGP_ERR_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* exported into benchmark runner */</div><div class='add'>+const struct argp bench_sockmap_argp = {</div><div class='add'>+	.options	= opts,</div><div class='add'>+	.parser		= parse_arg,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Benchmark performance of creating bpf local storage  */</div><div class='add'>+const struct bench bench_sockmap = {</div><div class='add'>+	.name			= "sockmap",</div><div class='add'>+	.argp			= &amp;bench_sockmap_argp,</div><div class='add'>+	.validate		= validate,</div><div class='add'>+	.setup			= setup,</div><div class='add'>+	.producer_thread	= producer,</div><div class='add'>+	.consumer_thread	= consumer,</div><div class='add'>+	.measure		= measure,</div><div class='add'>+	.report_progress	= report_progress,</div><div class='add'>+	.report_final		= report_final,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/benchs/bench_trigger.c b/tools/testing/selftests/bpf/benchs/bench_trigger.c<br/>index 32e9f194d449..34018fc3927f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/bench_trigger.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/bench_trigger.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/bench_trigger.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/benchs/bench_trigger.c</a></div><div class='hunk'>@@ -180,10 +180,10 @@ static void trigger_kernel_count_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	setup_ctx();</div><div class='ctx'> 	bpf_program__set_autoload(ctx.skel-&gt;progs.trigger_driver, false);</div><div class='del'>-	bpf_program__set_autoload(ctx.skel-&gt;progs.trigger_count, true);</div><div class='add'>+	bpf_program__set_autoload(ctx.skel-&gt;progs.trigger_kernel_count, true);</div><div class='ctx'> 	load_ctx();</div><div class='ctx'> 	/* override driver program */</div><div class='del'>-	ctx.driver_prog_fd = bpf_program__fd(ctx.skel-&gt;progs.trigger_count);</div><div class='add'>+	ctx.driver_prog_fd = bpf_program__fd(ctx.skel-&gt;progs.trigger_kernel_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void trigger_kprobe_setup(void)</div><div class='hunk'>@@ -226,6 +226,65 @@ static void trigger_fentry_setup(void)</div><div class='ctx'> 	attach_bpf(ctx.skel-&gt;progs.bench_trigger_fentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void attach_ksyms_all(struct bpf_program *empty, bool kretprobe)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_kprobe_multi_opts, opts);</div><div class='add'>+	char **syms = NULL;</div><div class='add'>+	size_t cnt = 0;</div><div class='add'>+</div><div class='add'>+	/* Some recursive functions will be skipped in</div><div class='add'>+	 * bpf_get_ksyms -&gt; skip_entry, as they can introduce sufficient</div><div class='add'>+	 * overhead. However, it's difficut to skip all the recursive</div><div class='add'>+	 * functions for a debug kernel.</div><div class='add'>+	 *</div><div class='add'>+	 * So, don't run the kprobe-multi-all and kretprobe-multi-all on</div><div class='add'>+	 * a debug kernel.</div><div class='add'>+	 */</div><div class='add'>+	if (bpf_get_ksyms(&amp;syms, &amp;cnt, true)) {</div><div class='add'>+		fprintf(stderr, "failed to get ksyms\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opts.syms = (const char **) syms;</div><div class='add'>+	opts.cnt = cnt;</div><div class='add'>+	opts.retprobe = kretprobe;</div><div class='add'>+	/* attach empty to all the kernel functions except bpf_get_numa_node_id. */</div><div class='add'>+	if (!bpf_program__attach_kprobe_multi_opts(empty, NULL, &amp;opts)) {</div><div class='add'>+		fprintf(stderr, "failed to attach bpf_program__attach_kprobe_multi_opts to all\n");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void trigger_kprobe_multi_all_setup(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_program *prog, *empty;</div><div class='add'>+</div><div class='add'>+	setup_ctx();</div><div class='add'>+	empty = ctx.skel-&gt;progs.bench_kprobe_multi_empty;</div><div class='add'>+	prog = ctx.skel-&gt;progs.bench_trigger_kprobe_multi;</div><div class='add'>+	bpf_program__set_autoload(empty, true);</div><div class='add'>+	bpf_program__set_autoload(prog, true);</div><div class='add'>+	load_ctx();</div><div class='add'>+</div><div class='add'>+	attach_ksyms_all(empty, false);</div><div class='add'>+	attach_bpf(prog);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void trigger_kretprobe_multi_all_setup(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_program *prog, *empty;</div><div class='add'>+</div><div class='add'>+	setup_ctx();</div><div class='add'>+	empty = ctx.skel-&gt;progs.bench_kretprobe_multi_empty;</div><div class='add'>+	prog = ctx.skel-&gt;progs.bench_trigger_kretprobe_multi;</div><div class='add'>+	bpf_program__set_autoload(empty, true);</div><div class='add'>+	bpf_program__set_autoload(prog, true);</div><div class='add'>+	load_ctx();</div><div class='add'>+</div><div class='add'>+	attach_ksyms_all(empty, true);</div><div class='add'>+	attach_bpf(prog);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void trigger_fexit_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	setup_ctx();</div><div class='hunk'>@@ -333,6 +392,20 @@ static void *uprobe_producer_ret(void *input)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+__nocf_check __weak void uprobe_target_nop5(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (".byte 0x0f, 0x1f, 0x44, 0x00, 0x00");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *uprobe_producer_nop5(void *input)</div><div class='add'>+{</div><div class='add'>+	while (true)</div><div class='add'>+		uprobe_target_nop5();</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void usetup(bool use_retprobe, bool use_multi, void *target_addr)</div><div class='ctx'> {</div><div class='ctx'> 	size_t uprobe_offset;</div><div class='hunk'>@@ -448,6 +521,28 @@ static void uretprobe_multi_ret_setup(void)</div><div class='ctx'> 	usetup(true, true /* use_multi */, &amp;uprobe_target_ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+static void uprobe_nop5_setup(void)</div><div class='add'>+{</div><div class='add'>+	usetup(false, false /* !use_multi */, &amp;uprobe_target_nop5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uretprobe_nop5_setup(void)</div><div class='add'>+{</div><div class='add'>+	usetup(true, false /* !use_multi */, &amp;uprobe_target_nop5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uprobe_multi_nop5_setup(void)</div><div class='add'>+{</div><div class='add'>+	usetup(false, true /* use_multi */, &amp;uprobe_target_nop5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uretprobe_multi_nop5_setup(void)</div><div class='add'>+{</div><div class='add'>+	usetup(true, true /* use_multi */, &amp;uprobe_target_nop5);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> const struct bench bench_trig_syscall_count = {</div><div class='ctx'> 	.name = "trig-syscall-count",</div><div class='ctx'> 	.validate = trigger_validate,</div><div class='hunk'>@@ -476,6 +571,8 @@ BENCH_TRIG_KERNEL(kretprobe, "kretprobe");</div><div class='ctx'> BENCH_TRIG_KERNEL(kprobe_multi, "kprobe-multi");</div><div class='ctx'> BENCH_TRIG_KERNEL(kretprobe_multi, "kretprobe-multi");</div><div class='ctx'> BENCH_TRIG_KERNEL(fentry, "fentry");</div><div class='add'>+BENCH_TRIG_KERNEL(kprobe_multi_all, "kprobe-multi-all");</div><div class='add'>+BENCH_TRIG_KERNEL(kretprobe_multi_all, "kretprobe-multi-all");</div><div class='ctx'> BENCH_TRIG_KERNEL(fexit, "fexit");</div><div class='ctx'> BENCH_TRIG_KERNEL(fmodret, "fmodret");</div><div class='ctx'> BENCH_TRIG_KERNEL(tp, "tp");</div><div class='hunk'>@@ -506,3 +603,9 @@ BENCH_TRIG_USERMODE(uprobe_multi_ret, ret, "uprobe-multi-ret");</div><div class='ctx'> BENCH_TRIG_USERMODE(uretprobe_multi_nop, nop, "uretprobe-multi-nop");</div><div class='ctx'> BENCH_TRIG_USERMODE(uretprobe_multi_push, push, "uretprobe-multi-push");</div><div class='ctx'> BENCH_TRIG_USERMODE(uretprobe_multi_ret, ret, "uretprobe-multi-ret");</div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+BENCH_TRIG_USERMODE(uprobe_nop5, nop5, "uprobe-nop5");</div><div class='add'>+BENCH_TRIG_USERMODE(uretprobe_nop5, nop5, "uretprobe-nop5");</div><div class='add'>+BENCH_TRIG_USERMODE(uprobe_multi_nop5, nop5, "uprobe-multi-nop5");</div><div class='add'>+BENCH_TRIG_USERMODE(uretprobe_multi_nop5, nop5, "uretprobe-multi-nop5");</div><div class='add'>+#endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/benchs/run_bench_ringbufs.sh b/tools/testing/selftests/bpf/benchs/run_bench_ringbufs.sh<br/>index 91e3567962ff..83e05e837871 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/run_bench_ringbufs.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/run_bench_ringbufs.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/run_bench_ringbufs.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/benchs/run_bench_ringbufs.sh</a></div><div class='hunk'>@@ -49,3 +49,7 @@ for b in 1 2 3 4 8 12 16 20 24 28 32 36 40 44 48 52; do</div><div class='ctx'> 	summarize "rb-libbpf nr_prod $b" "$($RUN_RB_BENCH -p$b --rb-batch-cnt 50 rb-libbpf)"</div><div class='ctx'> done</div><div class='ctx'> </div><div class='add'>+header "Ringbuf, multi-producer contention in overwrite mode, no consumer"</div><div class='add'>+for b in 1 2 3 4 8 12 16 20 24 28 32 36 40 44 48 52; do</div><div class='add'>+	summarize "rb-prod nr_prod $b" "$($RUN_BENCH -p$b --rb-batch-cnt 50 --rb-overwrite --rb-bench-producer rb-libbpf)"</div><div class='add'>+done</div><div class='head'>diff --git a/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh b/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh<br/>index a690f5a68b6b..f7573708a0c3 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/run_bench_trigger.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/benchs/run_bench_trigger.sh</a></div><div class='hunk'>@@ -6,8 +6,8 @@ def_tests=( \</div><div class='ctx'> 	usermode-count kernel-count syscall-count \</div><div class='ctx'> 	fentry fexit fmodret \</div><div class='ctx'> 	rawtp tp \</div><div class='del'>-	kprobe kprobe-multi \</div><div class='del'>-	kretprobe kretprobe-multi \</div><div class='add'>+	kprobe kprobe-multi kprobe-multi-all \</div><div class='add'>+	kretprobe kretprobe-multi kretprobe-multi-all \</div><div class='ctx'> )</div><div class='ctx'> </div><div class='ctx'> tests=("$@")</div><div class='head'>diff --git a/tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh b/tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh<br/>index af169f831f2f..03f55405484b 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> </div><div class='ctx'> set -eufo pipefail</div><div class='ctx'> </div><div class='del'>-for i in usermode-count syscall-count {uprobe,uretprobe}-{nop,push,ret}</div><div class='add'>+for i in usermode-count syscall-count {uprobe,uretprobe}-{nop,push,ret,nop5}</div><div class='ctx'> do</div><div class='ctx'> 	summary=$(sudo ./bench -w2 -d5 -a trig-$i | tail -n1 | cut -d'(' -f1 | cut -d' ' -f3-)</div><div class='ctx'> 	printf "%-15s: %s\n" $i "$summary"</div><div class='head'>diff --git a/tools/testing/selftests/bpf/bpf_arena_common.h b/tools/testing/selftests/bpf/bpf_arena_common.h<br/>index 68a51dcc0669..16f8ce832004 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_arena_common.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_arena_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_arena_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/bpf_arena_common.h</a></div><div class='hunk'>@@ -46,8 +46,11 @@</div><div class='ctx'> </div><div class='ctx'> void __arena* bpf_arena_alloc_pages(void *map, void __arena *addr, __u32 page_cnt,</div><div class='ctx'> 				    int node_id, __u64 flags) __ksym __weak;</div><div class='add'>+int bpf_arena_reserve_pages(void *map, void __arena *addr, __u32 page_cnt) __ksym __weak;</div><div class='ctx'> void bpf_arena_free_pages(void *map, void __arena *ptr, __u32 page_cnt) __ksym __weak;</div><div class='ctx'> </div><div class='add'>+#define arena_base(map) ((void __arena *)((struct bpf_arena *)(map))-&gt;user_vm_start)</div><div class='add'>+</div><div class='ctx'> #else /* when compiled as user space code */</div><div class='ctx'> </div><div class='ctx'> #define __arena</div><div class='head'>diff --git a/tools/testing/selftests/bpf/bpf_arena_list.h b/tools/testing/selftests/bpf/bpf_arena_list.h<br/>index 85dbc3ea4da5..e16fa7d95fcf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_arena_list.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_arena_list.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_arena_list.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/bpf_arena_list.h</a></div><div class='hunk'>@@ -64,14 +64,12 @@ static inline void list_add_head(arena_list_node_t *n, arena_list_head_t *h)</div><div class='ctx'> </div><div class='ctx'> static inline void __list_del(arena_list_node_t *n)</div><div class='ctx'> {</div><div class='del'>-	arena_list_node_t *next = n-&gt;next, *tmp;</div><div class='add'>+	arena_list_node_t *next = n-&gt;next;</div><div class='ctx'> 	arena_list_node_t * __arena *pprev = n-&gt;pprev;</div><div class='ctx'> </div><div class='ctx'> 	cast_user(next);</div><div class='ctx'> 	cast_kern(pprev);</div><div class='del'>-	tmp = *pprev;</div><div class='del'>-	cast_kern(tmp);</div><div class='del'>-	WRITE_ONCE(tmp, next);</div><div class='add'>+	WRITE_ONCE(*pprev, next);</div><div class='ctx'> 	if (next) {</div><div class='ctx'> 		cast_user(pprev);</div><div class='ctx'> 		cast_kern(next);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/bpf_arena_strsearch.h b/tools/testing/selftests/bpf/bpf_arena_strsearch.h<br/>new file mode 100644<br/>index 000000000000..c1b6eaa905bb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_arena_strsearch.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/bpf_arena_strsearch.h</a></div><div class='hunk'>@@ -0,0 +1,128 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#pragma once</div><div class='add'>+#include "bpf_arena_common.h"</div><div class='add'>+</div><div class='add'>+__noinline int bpf_arena_strlen(const char __arena *s __arg_arena)</div><div class='add'>+{</div><div class='add'>+	const char __arena *sc;</div><div class='add'>+</div><div class='add'>+	for (sc = s; *sc != '\0'; ++sc)</div><div class='add'>+		cond_break;</div><div class='add'>+	return sc - s;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * glob_match - Shell-style pattern matching, like !fnmatch(pat, str, 0)</div><div class='add'>+ * @pat: Shell-style pattern to match, e.g. "*.[ch]".</div><div class='add'>+ * @str: String to match.  The pattern must match the entire string.</div><div class='add'>+ *</div><div class='add'>+ * Perform shell-style glob matching, returning true (1) if the match</div><div class='add'>+ * succeeds, or false (0) if it fails.  Equivalent to !fnmatch(@pat, @str, 0).</div><div class='add'>+ *</div><div class='add'>+ * Pattern metacharacters are ?, *, [ and \.</div><div class='add'>+ * (And, inside character classes, !, - and ].)</div><div class='add'>+ *</div><div class='add'>+ * This is small and simple implementation intended for device blacklists</div><div class='add'>+ * where a string is matched against a number of patterns.  Thus, it</div><div class='add'>+ * does not preprocess the patterns.  It is non-recursive, and run-time</div><div class='add'>+ * is at most quadratic: strlen(@str)*strlen(@pat).</div><div class='add'>+ *</div><div class='add'>+ * An example of the worst case is glob_match("*aaaaa", "aaaaaaaaaa");</div><div class='add'>+ * it takes 6 passes over the pattern before matching the string.</div><div class='add'>+ *</div><div class='add'>+ * Like !fnmatch(@pat, @str, 0) and unlike the shell, this does NOT</div><div class='add'>+ * treat / or leading . specially; it isn't actually used for pathnames.</div><div class='add'>+ *</div><div class='add'>+ * Note that according to glob(7) (and unlike bash), character classes</div><div class='add'>+ * are complemented by a leading !; this does not support the regex-style</div><div class='add'>+ * [^a-z] syntax.</div><div class='add'>+ *</div><div class='add'>+ * An opening bracket without a matching close is matched literally.</div><div class='add'>+ */</div><div class='add'>+__noinline bool glob_match(char const __arena *pat __arg_arena, char const __arena *str __arg_arena)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Backtrack to previous * on mismatch and retry starting one</div><div class='add'>+	 * character later in the string.  Because * matches all characters</div><div class='add'>+	 * (no exception for /), it can be easily proved that there's</div><div class='add'>+	 * never a need to backtrack multiple levels.</div><div class='add'>+	 */</div><div class='add'>+	char const __arena *back_pat = NULL, *back_str;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Loop over each token (character or class) in pat, matching</div><div class='add'>+	 * it against the remaining unmatched tail of str.  Return false</div><div class='add'>+	 * on mismatch, or true after matching the trailing nul bytes.</div><div class='add'>+	 */</div><div class='add'>+	for (;;) {</div><div class='add'>+		unsigned char c = *str++;</div><div class='add'>+		unsigned char d = *pat++;</div><div class='add'>+</div><div class='add'>+		switch (d) {</div><div class='add'>+		case '?':	/* Wildcard: anything but nul */</div><div class='add'>+			if (c == '\0')</div><div class='add'>+				return false;</div><div class='add'>+			break;</div><div class='add'>+		case '*':	/* Any-length wildcard */</div><div class='add'>+			if (*pat == '\0')	/* Optimize trailing * case */</div><div class='add'>+				return true;</div><div class='add'>+			back_pat = pat;</div><div class='add'>+			back_str = --str;	/* Allow zero-length match */</div><div class='add'>+			break;</div><div class='add'>+		case '[': {	/* Character class */</div><div class='add'>+			bool match = false, inverted = (*pat == '!');</div><div class='add'>+			char const __arena *class = pat + inverted;</div><div class='add'>+			unsigned char a = *class++;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Iterate over each span in the character class.</div><div class='add'>+			 * A span is either a single character a, or a</div><div class='add'>+			 * range a-b.  The first span may begin with ']'.</div><div class='add'>+			 */</div><div class='add'>+			do {</div><div class='add'>+				unsigned char b = a;</div><div class='add'>+</div><div class='add'>+				if (a == '\0')	/* Malformed */</div><div class='add'>+					goto literal;</div><div class='add'>+</div><div class='add'>+				if (class[0] == '-' &amp;&amp; class[1] != ']') {</div><div class='add'>+					b = class[1];</div><div class='add'>+</div><div class='add'>+					if (b == '\0')</div><div class='add'>+						goto literal;</div><div class='add'>+</div><div class='add'>+					class += 2;</div><div class='add'>+					/* Any special action if a &gt; b? */</div><div class='add'>+				}</div><div class='add'>+				match |= (a &lt;= c &amp;&amp; c &lt;= b);</div><div class='add'>+				cond_break;</div><div class='add'>+			} while ((a = *class++) != ']');</div><div class='add'>+</div><div class='add'>+			if (match == inverted)</div><div class='add'>+				goto backtrack;</div><div class='add'>+			pat = class;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case '\\':</div><div class='add'>+			d = *pat++;</div><div class='add'>+			__attribute__((__fallthrough__));</div><div class='add'>+		default:	/* Literal character */</div><div class='add'>+literal:</div><div class='add'>+			if (c == d) {</div><div class='add'>+				if (d == '\0')</div><div class='add'>+					return true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+backtrack:</div><div class='add'>+			if (c == '\0' || !back_pat)</div><div class='add'>+				return false;	/* No point continuing */</div><div class='add'>+			/* Try again from last *, one character later in str. */</div><div class='add'>+			pat = back_pat;</div><div class='add'>+			str = ++back_str;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		cond_break;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/bpf_atomic.h b/tools/testing/selftests/bpf/bpf_atomic.h<br/>new file mode 100644<br/>index 000000000000..c550e5711967<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_atomic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/bpf_atomic.h</a></div><div class='hunk'>@@ -0,0 +1,140 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#ifndef BPF_ATOMIC_H</div><div class='add'>+#define BPF_ATOMIC_H</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+</div><div class='add'>+extern bool CONFIG_X86_64 __kconfig __weak;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * __unqual_typeof(x) - Declare an unqualified scalar type, leaving</div><div class='add'>+ *			non-scalar types unchanged,</div><div class='add'>+ *</div><div class='add'>+ * Prefer C11 _Generic for better compile-times and simpler code. Note: 'char'</div><div class='add'>+ * is not type-compatible with 'signed char', and we define a separate case.</div><div class='add'>+ *</div><div class='add'>+ * This is copied verbatim from kernel's include/linux/compiler_types.h, but</div><div class='add'>+ * with default expression (for pointers) changed from (x) to (typeof(x)0).</div><div class='add'>+ *</div><div class='add'>+ * This is because LLVM has a bug where for lvalue (x), it does not get rid of</div><div class='add'>+ * an extra address_space qualifier, but does in case of rvalue (typeof(x)0).</div><div class='add'>+ * Hence, for pointers, we need to create an rvalue expression to get the</div><div class='add'>+ * desired type. See https://github.com/llvm/llvm-project/issues/53400.</div><div class='add'>+ */</div><div class='add'>+#define __scalar_type_to_expr_cases(type) \</div><div class='add'>+	unsigned type : (unsigned type)0, signed type : (signed type)0</div><div class='add'>+</div><div class='add'>+#define __unqual_typeof(x)                              \</div><div class='add'>+	typeof(_Generic((x),                            \</div><div class='add'>+		char: (char)0,                          \</div><div class='add'>+		__scalar_type_to_expr_cases(char),      \</div><div class='add'>+		__scalar_type_to_expr_cases(short),     \</div><div class='add'>+		__scalar_type_to_expr_cases(int),       \</div><div class='add'>+		__scalar_type_to_expr_cases(long),      \</div><div class='add'>+		__scalar_type_to_expr_cases(long long), \</div><div class='add'>+		default: (typeof(x))0))</div><div class='add'>+</div><div class='add'>+/* No-op for BPF */</div><div class='add'>+#define cpu_relax() ({})</div><div class='add'>+</div><div class='add'>+#define READ_ONCE(x) (*(volatile typeof(x) *)&amp;(x))</div><div class='add'>+</div><div class='add'>+#define WRITE_ONCE(x, val) ((*(volatile typeof(x) *)&amp;(x)) = (val))</div><div class='add'>+</div><div class='add'>+#define cmpxchg(p, old, new) __sync_val_compare_and_swap((p), old, new)</div><div class='add'>+</div><div class='add'>+#define try_cmpxchg(p, pold, new)                                 \</div><div class='add'>+	({                                                        \</div><div class='add'>+		__unqual_typeof(*(pold)) __o = *(pold);           \</div><div class='add'>+		__unqual_typeof(*(p)) __r = cmpxchg(p, __o, new); \</div><div class='add'>+		if (__r != __o)                                   \</div><div class='add'>+			*(pold) = __r;                            \</div><div class='add'>+		__r == __o;                                       \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define try_cmpxchg_relaxed(p, pold, new) try_cmpxchg(p, pold, new)</div><div class='add'>+</div><div class='add'>+#define try_cmpxchg_acquire(p, pold, new) try_cmpxchg(p, pold, new)</div><div class='add'>+</div><div class='add'>+#define smp_mb()                                 \</div><div class='add'>+	({                                       \</div><div class='add'>+		volatile unsigned long __val;    \</div><div class='add'>+		__sync_fetch_and_add(&amp;__val, 0); \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define smp_rmb()                   \</div><div class='add'>+	({                          \</div><div class='add'>+		if (!CONFIG_X86_64) \</div><div class='add'>+			smp_mb();   \</div><div class='add'>+		else                \</div><div class='add'>+			barrier();  \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define smp_wmb()                   \</div><div class='add'>+	({                          \</div><div class='add'>+		if (!CONFIG_X86_64) \</div><div class='add'>+			smp_mb();   \</div><div class='add'>+		else                \</div><div class='add'>+			barrier();  \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+/* Control dependency provides LOAD-&gt;STORE, provide LOAD-&gt;LOAD */</div><div class='add'>+#define smp_acquire__after_ctrl_dep() ({ smp_rmb(); })</div><div class='add'>+</div><div class='add'>+#define smp_load_acquire(p)                                  \</div><div class='add'>+	({                                                   \</div><div class='add'>+		__unqual_typeof(*(p)) __v = READ_ONCE(*(p)); \</div><div class='add'>+		if (!CONFIG_X86_64)                          \</div><div class='add'>+			smp_mb();                            \</div><div class='add'>+		barrier();                                   \</div><div class='add'>+		__v;                                         \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define smp_store_release(p, val)      \</div><div class='add'>+	({                             \</div><div class='add'>+		if (!CONFIG_X86_64)    \</div><div class='add'>+			smp_mb();      \</div><div class='add'>+		barrier();             \</div><div class='add'>+		WRITE_ONCE(*(p), val); \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define smp_cond_load_relaxed_label(p, cond_expr, label)                \</div><div class='add'>+	({                                                              \</div><div class='add'>+		typeof(p) __ptr = (p);                                  \</div><div class='add'>+		__unqual_typeof(*(p)) VAL;                              \</div><div class='add'>+		for (;;) {                                              \</div><div class='add'>+			VAL = (__unqual_typeof(*(p)))READ_ONCE(*__ptr); \</div><div class='add'>+			if (cond_expr)                                  \</div><div class='add'>+				break;                                  \</div><div class='add'>+			cond_break_label(label);                        \</div><div class='add'>+			cpu_relax();                                    \</div><div class='add'>+		}                                                       \</div><div class='add'>+		(typeof(*(p)))VAL;                                      \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define smp_cond_load_acquire_label(p, cond_expr, label)                  \</div><div class='add'>+	({                                                                \</div><div class='add'>+		__unqual_typeof(*p) __val =                               \</div><div class='add'>+			smp_cond_load_relaxed_label(p, cond_expr, label); \</div><div class='add'>+		smp_acquire__after_ctrl_dep();                            \</div><div class='add'>+		(typeof(*(p)))__val;                                      \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define atomic_read(p) READ_ONCE((p)-&gt;counter)</div><div class='add'>+</div><div class='add'>+#define atomic_cond_read_relaxed_label(p, cond_expr, label) \</div><div class='add'>+	smp_cond_load_relaxed_label(&amp;(p)-&gt;counter, cond_expr, label)</div><div class='add'>+</div><div class='add'>+#define atomic_cond_read_acquire_label(p, cond_expr, label) \</div><div class='add'>+	smp_cond_load_acquire_label(&amp;(p)-&gt;counter, cond_expr, label)</div><div class='add'>+</div><div class='add'>+#define atomic_try_cmpxchg_relaxed(p, pold, new) \</div><div class='add'>+	try_cmpxchg_relaxed(&amp;(p)-&gt;counter, pold, new)</div><div class='add'>+</div><div class='add'>+#define atomic_try_cmpxchg_acquire(p, pold, new) \</div><div class='add'>+	try_cmpxchg_acquire(&amp;(p)-&gt;counter, pold, new)</div><div class='add'>+</div><div class='add'>+#endif /* BPF_ATOMIC_H */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/bpf_experimental.h b/tools/testing/selftests/bpf/bpf_experimental.h<br/>index cd8ecd39c3f3..2cd9165c7348 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_experimental.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_experimental.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_experimental.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/bpf_experimental.h</a></div><div class='hunk'>@@ -219,7 +219,7 @@ extern void bpf_put_file(struct file *file) __ksym;</div><div class='ctx'>  *	including the NULL termination character, stored in the supplied</div><div class='ctx'>  *	buffer. On error, a negative integer is returned.</div><div class='ctx'>  */</div><div class='del'>-extern int bpf_path_d_path(struct path *path, char *buf, size_t buf__sz) __ksym;</div><div class='add'>+extern int bpf_path_d_path(const struct path *path, char *buf, size_t buf__sz) __ksym;</div><div class='ctx'> </div><div class='ctx'> /* This macro must be used to mark the exception callback corresponding to the</div><div class='ctx'>  * main program. For example:</div><div class='hunk'>@@ -368,12 +368,12 @@ l_true:												\</div><div class='ctx'> 	ret;						\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='del'>-#define cond_break					\</div><div class='add'>+#define __cond_break(expr)				\</div><div class='ctx'> 	({ __label__ l_break, l_continue;		\</div><div class='ctx'> 	asm volatile goto("may_goto %l[l_break]"	\</div><div class='ctx'> 		      :::: l_break);			\</div><div class='ctx'> 	goto l_continue;				\</div><div class='del'>-	l_break: break;					\</div><div class='add'>+	l_break: expr;					\</div><div class='ctx'> 	l_continue:;					\</div><div class='ctx'> 	})</div><div class='ctx'> #else</div><div class='hunk'>@@ -392,7 +392,7 @@ l_true:												\</div><div class='ctx'> 	ret;						\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='del'>-#define cond_break					\</div><div class='add'>+#define __cond_break(expr)				\</div><div class='ctx'> 	({ __label__ l_break, l_continue;		\</div><div class='ctx'> 	asm volatile goto("1:.byte 0xe5;		\</div><div class='ctx'> 		      .byte 0;				\</div><div class='hunk'>@@ -400,7 +400,7 @@ l_true:												\</div><div class='ctx'> 		      .short 0"				\</div><div class='ctx'> 		      :::: l_break);			\</div><div class='ctx'> 	goto l_continue;				\</div><div class='del'>-	l_break: break;					\</div><div class='add'>+	l_break: expr;					\</div><div class='ctx'> 	l_continue:;					\</div><div class='ctx'> 	})</div><div class='ctx'> #else</div><div class='hunk'>@@ -418,7 +418,7 @@ l_true:												\</div><div class='ctx'> 	ret;						\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='del'>-#define cond_break					\</div><div class='add'>+#define __cond_break(expr)				\</div><div class='ctx'> 	({ __label__ l_break, l_continue;		\</div><div class='ctx'> 	asm volatile goto("1:.byte 0xe5;		\</div><div class='ctx'> 		      .byte 0;				\</div><div class='hunk'>@@ -426,12 +426,15 @@ l_true:												\</div><div class='ctx'> 		      .short 0"				\</div><div class='ctx'> 		      :::: l_break);			\</div><div class='ctx'> 	goto l_continue;				\</div><div class='del'>-	l_break: break;					\</div><div class='add'>+	l_break: expr;					\</div><div class='ctx'> 	l_continue:;					\</div><div class='ctx'> 	})</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define cond_break __cond_break(break)</div><div class='add'>+#define cond_break_label(label) __cond_break(goto label)</div><div class='add'>+</div><div class='ctx'> #ifndef bpf_nop_mov</div><div class='ctx'> #define bpf_nop_mov(var) \</div><div class='ctx'> 	asm volatile("%[reg]=%[reg]"::[reg]"r"((short)var))</div><div class='hunk'>@@ -588,4 +591,66 @@ extern int bpf_iter_kmem_cache_new(struct bpf_iter_kmem_cache *it) __weak __ksym</div><div class='ctx'> extern struct kmem_cache *bpf_iter_kmem_cache_next(struct bpf_iter_kmem_cache *it) __weak __ksym;</div><div class='ctx'> extern void bpf_iter_kmem_cache_destroy(struct bpf_iter_kmem_cache *it) __weak __ksym;</div><div class='ctx'> </div><div class='add'>+struct bpf_iter_dmabuf;</div><div class='add'>+extern int bpf_iter_dmabuf_new(struct bpf_iter_dmabuf *it) __weak __ksym;</div><div class='add'>+extern struct dma_buf *bpf_iter_dmabuf_next(struct bpf_iter_dmabuf *it) __weak __ksym;</div><div class='add'>+extern void bpf_iter_dmabuf_destroy(struct bpf_iter_dmabuf *it) __weak __ksym;</div><div class='add'>+</div><div class='add'>+extern int bpf_cgroup_read_xattr(struct cgroup *cgroup, const char *name__str,</div><div class='add'>+				 struct bpf_dynptr *value_p) __weak __ksym;</div><div class='add'>+</div><div class='add'>+#define PREEMPT_BITS	8</div><div class='add'>+#define SOFTIRQ_BITS	8</div><div class='add'>+#define HARDIRQ_BITS	4</div><div class='add'>+#define NMI_BITS	4</div><div class='add'>+</div><div class='add'>+#define PREEMPT_SHIFT	0</div><div class='add'>+#define SOFTIRQ_SHIFT	(PREEMPT_SHIFT + PREEMPT_BITS)</div><div class='add'>+#define HARDIRQ_SHIFT	(SOFTIRQ_SHIFT + SOFTIRQ_BITS)</div><div class='add'>+#define NMI_SHIFT	(HARDIRQ_SHIFT + HARDIRQ_BITS)</div><div class='add'>+</div><div class='add'>+#define __IRQ_MASK(x)	((1UL &lt;&lt; (x))-1)</div><div class='add'>+</div><div class='add'>+#define SOFTIRQ_MASK	(__IRQ_MASK(SOFTIRQ_BITS) &lt;&lt; SOFTIRQ_SHIFT)</div><div class='add'>+#define HARDIRQ_MASK	(__IRQ_MASK(HARDIRQ_BITS) &lt;&lt; HARDIRQ_SHIFT)</div><div class='add'>+#define NMI_MASK	(__IRQ_MASK(NMI_BITS)     &lt;&lt; NMI_SHIFT)</div><div class='add'>+</div><div class='add'>+extern bool CONFIG_PREEMPT_RT __kconfig __weak;</div><div class='add'>+#ifdef bpf_target_x86</div><div class='add'>+extern const int __preempt_count __ksym;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct task_struct___preempt_rt {</div><div class='add'>+	int softirq_disable_cnt;</div><div class='add'>+} __attribute__((preserve_access_index));</div><div class='add'>+</div><div class='add'>+static inline int get_preempt_count(void)</div><div class='add'>+{</div><div class='add'>+#if defined(bpf_target_x86)</div><div class='add'>+	return *(int *) bpf_this_cpu_ptr(&amp;__preempt_count);</div><div class='add'>+#elif defined(bpf_target_arm64)</div><div class='add'>+	return bpf_get_current_task_btf()-&gt;thread_info.preempt.count;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Description</div><div class='add'>+ *	Report whether it is in interrupt context. Only works on the following archs:</div><div class='add'>+ *	* x86</div><div class='add'>+ *	* arm64</div><div class='add'>+ */</div><div class='add'>+static inline int bpf_in_interrupt(void)</div><div class='add'>+{</div><div class='add'>+	struct task_struct___preempt_rt *tsk;</div><div class='add'>+	int pcnt;</div><div class='add'>+</div><div class='add'>+	pcnt = get_preempt_count();</div><div class='add'>+	if (!CONFIG_PREEMPT_RT)</div><div class='add'>+		return pcnt &amp; (NMI_MASK | HARDIRQ_MASK | SOFTIRQ_MASK);</div><div class='add'>+</div><div class='add'>+	tsk = (void *) bpf_get_current_task_btf();</div><div class='add'>+	return (pcnt &amp; (NMI_MASK | HARDIRQ_MASK)) |</div><div class='add'>+	       (tsk-&gt;softirq_disable_cnt &amp; SOFTIRQ_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/bpf_kfuncs.h b/tools/testing/selftests/bpf/bpf_kfuncs.h<br/>index 2eb3483f2fb0..e0189254bb6e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_kfuncs.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_kfuncs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_kfuncs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/bpf_kfuncs.h</a></div><div class='hunk'>@@ -19,14 +19,17 @@ extern int bpf_dynptr_from_skb(struct __sk_buff *skb, __u64 flags,</div><div class='ctx'> extern int bpf_dynptr_from_xdp(struct xdp_md *xdp, __u64 flags,</div><div class='ctx'> 			       struct bpf_dynptr *ptr__uninit) __ksym __weak;</div><div class='ctx'> </div><div class='add'>+extern int bpf_dynptr_from_skb_meta(struct __sk_buff *skb, __u64 flags,</div><div class='add'>+				    struct bpf_dynptr *ptr__uninit) __ksym __weak;</div><div class='add'>+</div><div class='ctx'> /* Description</div><div class='ctx'>  *  Obtain a read-only pointer to the dynptr's data</div><div class='ctx'>  * Returns</div><div class='ctx'>  *  Either a direct pointer to the dynptr data or a pointer to the user-provided</div><div class='ctx'>  *  buffer if unable to obtain a direct pointer</div><div class='ctx'>  */</div><div class='del'>-extern void *bpf_dynptr_slice(const struct bpf_dynptr *ptr, __u32 offset,</div><div class='del'>-			      void *buffer, __u32 buffer__szk) __ksym __weak;</div><div class='add'>+extern void *bpf_dynptr_slice(const struct bpf_dynptr *ptr, __u64 offset,</div><div class='add'>+			      void *buffer, __u64 buffer__szk) __ksym __weak;</div><div class='ctx'> </div><div class='ctx'> /* Description</div><div class='ctx'>  *  Obtain a read-write pointer to the dynptr's data</div><div class='hunk'>@@ -34,13 +37,13 @@ extern void *bpf_dynptr_slice(const struct bpf_dynptr *ptr, __u32 offset,</div><div class='ctx'>  *  Either a direct pointer to the dynptr data or a pointer to the user-provided</div><div class='ctx'>  *  buffer if unable to obtain a direct pointer</div><div class='ctx'>  */</div><div class='del'>-extern void *bpf_dynptr_slice_rdwr(const struct bpf_dynptr *ptr, __u32 offset,</div><div class='del'>-			      void *buffer, __u32 buffer__szk) __ksym __weak;</div><div class='add'>+extern void *bpf_dynptr_slice_rdwr(const struct bpf_dynptr *ptr, __u64 offset, void *buffer,</div><div class='add'>+				   __u64 buffer__szk) __ksym __weak;</div><div class='ctx'> </div><div class='del'>-extern int bpf_dynptr_adjust(const struct bpf_dynptr *ptr, __u32 start, __u32 end) __ksym __weak;</div><div class='add'>+extern int bpf_dynptr_adjust(const struct bpf_dynptr *ptr, __u64 start, __u64 end) __ksym __weak;</div><div class='ctx'> extern bool bpf_dynptr_is_null(const struct bpf_dynptr *ptr) __ksym __weak;</div><div class='ctx'> extern bool bpf_dynptr_is_rdonly(const struct bpf_dynptr *ptr) __ksym __weak;</div><div class='del'>-extern __u32 bpf_dynptr_size(const struct bpf_dynptr *ptr) __ksym __weak;</div><div class='add'>+extern __u64 bpf_dynptr_size(const struct bpf_dynptr *ptr) __ksym __weak;</div><div class='ctx'> extern int bpf_dynptr_clone(const struct bpf_dynptr *ptr, struct bpf_dynptr *clone__init) __ksym __weak;</div><div class='ctx'> </div><div class='ctx'> /* Description</div><div class='hunk'>@@ -69,7 +72,7 @@ extern int bpf_get_file_xattr(struct file *file, const char *name,</div><div class='ctx'> 			      struct bpf_dynptr *value_ptr) __ksym;</div><div class='ctx'> extern int bpf_get_fsverity_digest(struct file *file, struct bpf_dynptr *digest_ptr) __ksym;</div><div class='ctx'> </div><div class='del'>-extern struct bpf_key *bpf_lookup_user_key(__u32 serial, __u64 flags) __ksym;</div><div class='add'>+extern struct bpf_key *bpf_lookup_user_key(__s32 serial, __u64 flags) __ksym;</div><div class='ctx'> extern struct bpf_key *bpf_lookup_system_key(__u64 id) __ksym;</div><div class='ctx'> extern void bpf_key_put(struct bpf_key *key) __ksym;</div><div class='ctx'> extern int bpf_verify_pkcs7_signature(struct bpf_dynptr *data_ptr,</div><div class='hunk'>@@ -87,4 +90,9 @@ struct dentry;</div><div class='ctx'>  */</div><div class='ctx'> extern int bpf_get_dentry_xattr(struct dentry *dentry, const char *name,</div><div class='ctx'> 			      struct bpf_dynptr *value_ptr) __ksym __weak;</div><div class='add'>+</div><div class='add'>+extern int bpf_set_dentry_xattr(struct dentry *dentry, const char *name__str,</div><div class='add'>+				const struct bpf_dynptr *value_p, int flags) __ksym __weak;</div><div class='add'>+extern int bpf_remove_dentry_xattr(struct dentry *dentry, const char *name__str) __ksym __weak;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/bpf_util.h b/tools/testing/selftests/bpf/bpf_util.h<br/>index 5f6963a320d7..4bc2d25f33e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_util.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/bpf_util.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/bpf_util.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/bpf_util.h</a></div><div class='hunk'>@@ -67,6 +67,9 @@ static inline void bpf_strlcpy(char *dst, const char *src, size_t sz)</div><div class='ctx'> #define sys_gettid() syscall(SYS_gettid)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* and poison usage to ensure it does not creep back in. */</div><div class='add'>+#pragma GCC poison gettid</div><div class='add'>+</div><div class='ctx'> #ifndef ENOTSUPP</div><div class='ctx'> #define ENOTSUPP 524</div><div class='ctx'> #endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/cap_helpers.c b/tools/testing/selftests/bpf/cap_helpers.c<br/>index d5ac507401d7..98f840c3a38f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/cap_helpers.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/cap_helpers.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/cap_helpers.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/cap_helpers.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@ int cap_enable_effective(__u64 caps, __u64 *old_caps)</div><div class='ctx'> </div><div class='ctx'> 	err = capget(&amp;hdr, data);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='ctx'> 	if (old_caps)</div><div class='ctx'> 		*old_caps = (__u64)(data[1].effective) &lt;&lt; 32 | data[0].effective;</div><div class='hunk'>@@ -32,7 +32,7 @@ int cap_enable_effective(__u64 caps, __u64 *old_caps)</div><div class='ctx'> 	data[1].effective |= cap1;</div><div class='ctx'> 	err = capset(&amp;hdr, data);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -49,7 +49,7 @@ int cap_disable_effective(__u64 caps, __u64 *old_caps)</div><div class='ctx'> </div><div class='ctx'> 	err = capget(&amp;hdr, data);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='ctx'> 	if (old_caps)</div><div class='ctx'> 		*old_caps = (__u64)(data[1].effective) &lt;&lt; 32 | data[0].effective;</div><div class='hunk'>@@ -61,7 +61,7 @@ int cap_disable_effective(__u64 caps, __u64 *old_caps)</div><div class='ctx'> 	data[1].effective &amp;= ~cap1;</div><div class='ctx'> 	err = capset(&amp;hdr, data);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/cap_helpers.h b/tools/testing/selftests/bpf/cap_helpers.h<br/>index 6d163530cb0f..8dcb28557f76 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/cap_helpers.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/cap_helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/cap_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/cap_helpers.h</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef CAP_PERFMON</div><div class='ctx'> #define CAP_PERFMON		38</div><div class='head'>diff --git a/tools/testing/selftests/bpf/cgroup_helpers.c b/tools/testing/selftests/bpf/cgroup_helpers.c<br/>index e4535451322e..20cede4db3ce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/cgroup_helpers.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/cgroup_helpers.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/cgroup_helpers.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/cgroup_helpers.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #include &lt;sys/mount.h&gt;</div><div class='ctx'> #include &lt;sys/stat.h&gt;</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/xattr.h&gt;</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='hunk'>@@ -319,6 +320,26 @@ int join_parent_cgroup(const char *relative_path)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * set_cgroup_xattr() - Set xattr on a cgroup dir</div><div class='add'>+ * @relative_path: The cgroup path, relative to the workdir, to set xattr</div><div class='add'>+ * @name: xattr name</div><div class='add'>+ * @value: xattr value</div><div class='add'>+ *</div><div class='add'>+ * This function set xattr on cgroup dir.</div><div class='add'>+ *</div><div class='add'>+ * On success, it returns 0, otherwise on failure it returns -1.</div><div class='add'>+ */</div><div class='add'>+int set_cgroup_xattr(const char *relative_path,</div><div class='add'>+		     const char *name,</div><div class='add'>+		     const char *value)</div><div class='add'>+{</div><div class='add'>+	char cgroup_path[PATH_MAX + 1];</div><div class='add'>+</div><div class='add'>+	format_cgroup_path(cgroup_path, relative_path);</div><div class='add'>+	return setxattr(cgroup_path, name, value, strlen(value) + 1, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * __cleanup_cgroup_environment() - Delete temporary cgroups</div><div class='ctx'>  *</div><div class='ctx'>  * This is a helper for cleanup_cgroup_environment() that is responsible for</div><div class='hunk'>@@ -391,6 +412,26 @@ void remove_cgroup(const char *relative_path)</div><div class='ctx'> 		log_err("rmdiring cgroup %s .. %s", relative_path, cgroup_path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * remove_cgroup_pid() - Remove a cgroup setup by process identified by PID</div><div class='add'>+ * @relative_path: The cgroup path, relative to the workdir, to remove</div><div class='add'>+ * @pid: PID to be used to find cgroup_path</div><div class='add'>+ *</div><div class='add'>+ * This function expects a cgroup to already be created, relative to the cgroup</div><div class='add'>+ * work dir. It also expects the cgroup doesn't have any children or live</div><div class='add'>+ * processes and it removes the cgroup.</div><div class='add'>+ *</div><div class='add'>+ * On failure, it will print an error to stderr.</div><div class='add'>+ */</div><div class='add'>+void remove_cgroup_pid(const char *relative_path, int pid)</div><div class='add'>+{</div><div class='add'>+	char cgroup_path[PATH_MAX + 1];</div><div class='add'>+</div><div class='add'>+	format_cgroup_path_pid(cgroup_path, relative_path, pid);</div><div class='add'>+	if (rmdir(cgroup_path))</div><div class='add'>+		log_err("rmdiring cgroup %s .. %s", relative_path, cgroup_path);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * create_and_get_cgroup() - Create a cgroup, relative to workdir, and get the FD</div><div class='ctx'>  * @relative_path: The cgroup path, relative to the workdir, to join</div><div class='head'>diff --git a/tools/testing/selftests/bpf/cgroup_helpers.h b/tools/testing/selftests/bpf/cgroup_helpers.h<br/>index 502845160d88..3857304be874 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/cgroup_helpers.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/cgroup_helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/cgroup_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/cgroup_helpers.h</a></div><div class='hunk'>@@ -19,6 +19,7 @@ int cgroup_setup_and_join(const char *relative_path);</div><div class='ctx'> int get_root_cgroup(void);</div><div class='ctx'> int create_and_get_cgroup(const char *relative_path);</div><div class='ctx'> void remove_cgroup(const char *relative_path);</div><div class='add'>+void remove_cgroup_pid(const char *relative_path, int pid);</div><div class='ctx'> unsigned long long get_cgroup_id(const char *relative_path);</div><div class='ctx'> int get_cgroup1_hierarchy_id(const char *subsys_name);</div><div class='ctx'> </div><div class='hunk'>@@ -26,6 +27,10 @@ int join_cgroup(const char *relative_path);</div><div class='ctx'> int join_root_cgroup(void);</div><div class='ctx'> int join_parent_cgroup(const char *relative_path);</div><div class='ctx'> </div><div class='add'>+int set_cgroup_xattr(const char *relative_path,</div><div class='add'>+		     const char *name,</div><div class='add'>+		     const char *value);</div><div class='add'>+</div><div class='ctx'> int setup_cgroup_environment(void);</div><div class='ctx'> void cleanup_cgroup_environment(void);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config<br/>index c378d5d07e02..558839e3c185 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/config</a></div><div class='hunk'>@@ -22,6 +22,8 @@ CONFIG_CRYPTO_AES=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> CONFIG_DEBUG_INFO_BTF=y</div><div class='ctx'> CONFIG_DEBUG_INFO_DWARF4=y</div><div class='add'>+CONFIG_DMABUF_HEAPS=y</div><div class='add'>+CONFIG_DMABUF_HEAPS_SYSTEM=y</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='ctx'> CONFIG_DYNAMIC_FTRACE=y</div><div class='ctx'> CONFIG_FPROBE=y</div><div class='hunk'>@@ -48,6 +50,7 @@ CONFIG_IPV6_SIT=y</div><div class='ctx'> CONFIG_IPV6_TUNNEL=y</div><div class='ctx'> CONFIG_KEYS=y</div><div class='ctx'> CONFIG_LIRC=y</div><div class='add'>+CONFIG_LIVEPATCH=y</div><div class='ctx'> CONFIG_LWTUNNEL=y</div><div class='ctx'> CONFIG_MODULE_SIG=y</div><div class='ctx'> CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='hunk'>@@ -59,6 +62,7 @@ CONFIG_MPLS_IPTUNNEL=y</div><div class='ctx'> CONFIG_MPLS_ROUTING=y</div><div class='ctx'> CONFIG_MPTCP=y</div><div class='ctx'> CONFIG_NET_ACT_GACT=y</div><div class='add'>+CONFIG_NET_ACT_MIRRED=y</div><div class='ctx'> CONFIG_NET_ACT_SKBMOD=y</div><div class='ctx'> CONFIG_NET_CLS=y</div><div class='ctx'> CONFIG_NET_CLS_ACT=y</div><div class='hunk'>@@ -71,8 +75,10 @@ CONFIG_NET_IPGRE=y</div><div class='ctx'> CONFIG_NET_IPGRE_DEMUX=y</div><div class='ctx'> CONFIG_NET_IPIP=y</div><div class='ctx'> CONFIG_NET_MPLS_GSO=y</div><div class='add'>+CONFIG_NET_SCH_BPF=y</div><div class='ctx'> CONFIG_NET_SCH_FQ=y</div><div class='ctx'> CONFIG_NET_SCH_INGRESS=y</div><div class='add'>+CONFIG_NET_SCH_HTB=y</div><div class='ctx'> CONFIG_NET_SCHED=y</div><div class='ctx'> CONFIG_NETDEVSIM=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='hunk'>@@ -93,6 +99,9 @@ CONFIG_NF_TABLES_NETDEV=y</div><div class='ctx'> CONFIG_NF_TABLES_IPV4=y</div><div class='ctx'> CONFIG_NF_TABLES_IPV6=y</div><div class='ctx'> CONFIG_NETFILTER_INGRESS=y</div><div class='add'>+CONFIG_IP_NF_IPTABLES_LEGACY=y</div><div class='add'>+CONFIG_IP6_NF_IPTABLES_LEGACY=y</div><div class='add'>+CONFIG_NETFILTER_XTABLES_LEGACY=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE=y</div><div class='ctx'> CONFIG_NF_FLOW_TABLE_INET=y</div><div class='ctx'> CONFIG_NETFILTER_NETLINK=y</div><div class='hunk'>@@ -101,11 +110,15 @@ CONFIG_IP_NF_IPTABLES=y</div><div class='ctx'> CONFIG_IP6_NF_IPTABLES=y</div><div class='ctx'> CONFIG_IP6_NF_FILTER=y</div><div class='ctx'> CONFIG_NF_NAT=y</div><div class='add'>+CONFIG_PACKET=y</div><div class='ctx'> CONFIG_RC_CORE=y</div><div class='add'>+CONFIG_SAMPLES=y</div><div class='add'>+CONFIG_SAMPLE_LIVEPATCH=m</div><div class='ctx'> CONFIG_SECURITY=y</div><div class='ctx'> CONFIG_SECURITYFS=y</div><div class='ctx'> CONFIG_SYN_COOKIES=y</div><div class='ctx'> CONFIG_TEST_BPF=m</div><div class='add'>+CONFIG_UDMABUF=y</div><div class='ctx'> CONFIG_USERFAULTFD=y</div><div class='ctx'> CONFIG_VSOCKETS=y</div><div class='ctx'> CONFIG_VXLAN=y</div><div class='hunk'>@@ -113,3 +126,8 @@ CONFIG_XDP_SOCKETS=y</div><div class='ctx'> CONFIG_XFRM_INTERFACE=y</div><div class='ctx'> CONFIG_TCP_CONG_DCTCP=y</div><div class='ctx'> CONFIG_TCP_CONG_BBR=y</div><div class='add'>+CONFIG_INFINIBAND=y</div><div class='add'>+CONFIG_SMC=y</div><div class='add'>+CONFIG_SMC_HS_CTRL_BPF=y</div><div class='add'>+CONFIG_DIBS=y</div><div class='add'>+CONFIG_DIBS_LO=y
\ No newline at end of file</div><div class='head'>diff --git a/tools/testing/selftests/bpf/config.aarch64 b/tools/testing/selftests/bpf/config.aarch64<br/>index 3720b7611523..7efad36ceb26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/config.aarch64?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/config.aarch64</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/config.aarch64?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/config.aarch64</a></div><div class='hunk'>@@ -31,10 +31,7 @@ CONFIG_COMPAT=y</div><div class='ctx'> CONFIG_CPUSETS=y</div><div class='ctx'> CONFIG_CRASH_DUMP=y</div><div class='ctx'> CONFIG_CRYPTO_USER_API_RNG=y</div><div class='del'>-CONFIG_CRYPTO_USER_API_SKCIPHER=y</div><div class='ctx'> CONFIG_DEBUG_ATOMIC_SLEEP=y</div><div class='del'>-CONFIG_DEBUG_INFO_BTF=y</div><div class='del'>-CONFIG_DEBUG_INFO_DWARF4=y</div><div class='ctx'> CONFIG_DEBUG_INFO_REDUCED=n</div><div class='ctx'> CONFIG_DEBUG_LIST=y</div><div class='ctx'> CONFIG_DEBUG_LOCKDEP=y</div><div class='hunk'>@@ -46,7 +43,6 @@ CONFIG_DETECT_HUNG_TASK=y</div><div class='ctx'> CONFIG_DEVTMPFS_MOUNT=y</div><div class='ctx'> CONFIG_DEVTMPFS=y</div><div class='ctx'> CONFIG_DRM=y</div><div class='del'>-CONFIG_DUMMY=y</div><div class='ctx'> CONFIG_EXPERT=y</div><div class='ctx'> CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_EXT4_FS_SECURITY=y</div><div class='hunk'>@@ -70,13 +66,11 @@ CONFIG_HZ_100=y</div><div class='ctx'> CONFIG_IDLE_PAGE_TRACKING=y</div><div class='ctx'> CONFIG_IKHEADERS=y</div><div class='ctx'> CONFIG_INET6_ESP=y</div><div class='del'>-CONFIG_INET_ESP=y</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='ctx'> CONFIG_IP_ADVANCED_ROUTER=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='ctx'> CONFIG_IP_MULTIPLE_TABLES=y</div><div class='del'>-CONFIG_IP_NF_IPTABLES=y</div><div class='ctx'> CONFIG_IPV6_SEG6_LWTUNNEL=y</div><div class='ctx'> CONFIG_IPVLAN=y</div><div class='ctx'> CONFIG_JUMP_LABEL=y</div><div class='hunk'>@@ -97,22 +91,18 @@ CONFIG_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_MEMORY_HOTREMOVE=y</div><div class='ctx'> CONFIG_NAMESPACES=y</div><div class='ctx'> CONFIG_NET_ACT_BPF=y</div><div class='del'>-CONFIG_NET_ACT_GACT=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_BPF=y</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='del'>-CONFIG_NET_SCH_FQ=y</div><div class='ctx'> CONFIG_NET_VRF=y</div><div class='ctx'> CONFIG_NET=y</div><div class='del'>-CONFIG_NF_TABLES=y</div><div class='ctx'> CONFIG_NLMON=y</div><div class='ctx'> CONFIG_NO_HZ_IDLE=y</div><div class='ctx'> CONFIG_NR_CPUS=256</div><div class='ctx'> CONFIG_NUMA=y</div><div class='ctx'> CONFIG_OVERLAY_FS=y</div><div class='ctx'> CONFIG_PACKET_DIAG=y</div><div class='del'>-CONFIG_PACKET=y</div><div class='ctx'> CONFIG_PANIC_ON_OOPS=y</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> CONFIG_PCI_HOST_GENERIC=y</div><div class='hunk'>@@ -149,7 +139,6 @@ CONFIG_TASK_XACCT=y</div><div class='ctx'> CONFIG_TCG_TIS=y</div><div class='ctx'> CONFIG_TCG_TPM=y</div><div class='ctx'> CONFIG_TCP_CONG_ADVANCED=y</div><div class='del'>-CONFIG_TCP_CONG_DCTCP=y</div><div class='ctx'> CONFIG_TLS=y</div><div class='ctx'> CONFIG_TMPFS_POSIX_ACL=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='hunk'>@@ -158,10 +147,8 @@ CONFIG_TRANSPARENT_HUGEPAGE=y</div><div class='ctx'> CONFIG_TUN=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='ctx'> CONFIG_UPROBES=y</div><div class='del'>-CONFIG_USELIB=y</div><div class='ctx'> CONFIG_USER_NS=y</div><div class='ctx'> CONFIG_VETH=y</div><div class='ctx'> CONFIG_VLAN_8021Q=y</div><div class='del'>-CONFIG_VSOCKETS=y</div><div class='ctx'> CONFIG_VSOCKETS_LOOPBACK=y</div><div class='ctx'> CONFIG_XFRM_USER=y</div><div class='head'>diff --git a/tools/testing/selftests/bpf/config.ppc64el b/tools/testing/selftests/bpf/config.ppc64el<br/>new file mode 100644<br/>index 000000000000..b53afb5e0b71<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/config.ppc64el?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/config.ppc64el</a></div><div class='hunk'>@@ -0,0 +1,92 @@</div><div class='add'>+CONFIG_ALTIVEC=y</div><div class='add'>+CONFIG_AUDIT=y</div><div class='add'>+CONFIG_BLK_CGROUP=y</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BONDING=y</div><div class='add'>+CONFIG_BPF_JIT_ALWAYS_ON=y</div><div class='add'>+CONFIG_BPF_PRELOAD_UMD=y</div><div class='add'>+CONFIG_BPF_PRELOAD=y</div><div class='add'>+CONFIG_CGROUP_CPUACCT=y</div><div class='add'>+CONFIG_CGROUP_DEVICE=y</div><div class='add'>+CONFIG_CGROUP_FREEZER=y</div><div class='add'>+CONFIG_CGROUP_HUGETLB=y</div><div class='add'>+CONFIG_CGROUP_NET_CLASSID=y</div><div class='add'>+CONFIG_CGROUP_PERF=y</div><div class='add'>+CONFIG_CGROUP_PIDS=y</div><div class='add'>+CONFIG_CGROUP_SCHED=y</div><div class='add'>+CONFIG_CGROUPS=y</div><div class='add'>+CONFIG_CMDLINE_BOOL=y</div><div class='add'>+CONFIG_CMDLINE="console=hvc0 wg.success=hvc1 panic_on_warn=1"</div><div class='add'>+CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_CPUSETS=y</div><div class='add'>+CONFIG_DEBUG_ATOMIC_SLEEP=y</div><div class='add'>+CONFIG_DEBUG_FS=y</div><div class='add'>+CONFIG_DETECT_HUNG_TASK=y</div><div class='add'>+CONFIG_DEVTMPFS_MOUNT=y</div><div class='add'>+CONFIG_DEVTMPFS=y</div><div class='add'>+CONFIG_EXPERT=y</div><div class='add'>+CONFIG_EXT4_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT4_FS_SECURITY=y</div><div class='add'>+CONFIG_EXT4_FS=y</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FRAME_WARN=1280</div><div class='add'>+CONFIG_HARDLOCKUP_DETECTOR=y</div><div class='add'>+CONFIG_HIGH_RES_TIMERS=y</div><div class='add'>+CONFIG_HUGETLBFS=y</div><div class='add'>+CONFIG_HVC_CONSOLE=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_ADVANCED_ROUTER=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+CONFIG_IP_MULTIPLE_TABLES=y</div><div class='add'>+CONFIG_IPV6_SEG6_LWTUNNEL=y</div><div class='add'>+CONFIG_JUMP_LABEL=y</div><div class='add'>+CONFIG_KALLSYMS_ALL=y</div><div class='add'>+CONFIG_KPROBES=y</div><div class='add'>+CONFIG_MEMCG=y</div><div class='add'>+CONFIG_NAMESPACES=y</div><div class='add'>+CONFIG_NET_ACT_BPF=y</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_BPF=y</div><div class='add'>+CONFIG_NET_L3_MASTER_DEV=y</div><div class='add'>+CONFIG_NET_VRF=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_NO_HZ_IDLE=y</div><div class='add'>+CONFIG_NONPORTABLE=y</div><div class='add'>+CONFIG_NR_CPUS=256</div><div class='add'>+CONFIG_PANIC_ON_OOPS=y</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+CONFIG_PCI_HOST_GENERIC=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_PPC64=y</div><div class='add'>+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y</div><div class='add'>+CONFIG_PPC_PSERIES=y</div><div class='add'>+CONFIG_PPC_RADIX_MMU=y</div><div class='add'>+CONFIG_PRINTK_TIME=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+CONFIG_RCU_CPU_STALL_TIMEOUT=60</div><div class='add'>+CONFIG_RT_GROUP_SCHED=y</div><div class='add'>+CONFIG_SECTION_MISMATCH_WARN_ONLY=y</div><div class='add'>+CONFIG_SECURITY_NETWORK=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_OF_PLATFORM=y</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_SOC_VIRT=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_TCP_CONG_ADVANCED=y</div><div class='add'>+CONFIG_THREAD_SHIFT=14</div><div class='add'>+CONFIG_TLS=y</div><div class='add'>+CONFIG_TMPFS_POSIX_ACL=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+CONFIG_TUN=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_UPROBES=y</div><div class='add'>+CONFIG_USER_NS=y</div><div class='add'>+CONFIG_VETH=y</div><div class='add'>+CONFIG_VLAN_8021Q=y</div><div class='add'>+CONFIG_VSOCKETS_LOOPBACK=y</div><div class='add'>+CONFIG_VSX=y</div><div class='add'>+CONFIG_XFRM_USER=y</div><div class='head'>diff --git a/tools/testing/selftests/bpf/config.riscv64 b/tools/testing/selftests/bpf/config.riscv64<br/>index bb7043a80e1a..7bee24a79a71 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/config.riscv64?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/config.riscv64</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/config.riscv64?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/config.riscv64</a></div><div class='hunk'>@@ -48,7 +48,6 @@ CONFIG_NET_VRF=y</div><div class='ctx'> CONFIG_NONPORTABLE=y</div><div class='ctx'> CONFIG_NO_HZ_IDLE=y</div><div class='ctx'> CONFIG_NR_CPUS=256</div><div class='del'>-CONFIG_PACKET=y</div><div class='ctx'> CONFIG_PANIC_ON_OOPS=y</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='head'>diff --git a/tools/testing/selftests/bpf/config.s390x b/tools/testing/selftests/bpf/config.s390x<br/>index 706931a8c2c6..db61878148e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/config.s390x?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/config.s390x</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/config.s390x?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/config.s390x</a></div><div class='hunk'>@@ -22,10 +22,7 @@ CONFIG_CHECKPOINT_RESTORE=y</div><div class='ctx'> CONFIG_CPUSETS=y</div><div class='ctx'> CONFIG_CRASH_DUMP=y</div><div class='ctx'> CONFIG_CRYPTO_USER_API_RNG=y</div><div class='del'>-CONFIG_CRYPTO_USER_API_SKCIPHER=y</div><div class='ctx'> CONFIG_DEBUG_ATOMIC_SLEEP=y</div><div class='del'>-CONFIG_DEBUG_INFO_BTF=y</div><div class='del'>-CONFIG_DEBUG_INFO_DWARF4=y</div><div class='ctx'> CONFIG_DEBUG_LIST=y</div><div class='ctx'> CONFIG_DEBUG_LOCKDEP=y</div><div class='ctx'> CONFIG_DEBUG_NOTIFIERS=y</div><div class='hunk'>@@ -56,11 +53,9 @@ CONFIG_IDLE_PAGE_TRACKING=y</div><div class='ctx'> CONFIG_IKHEADERS=y</div><div class='ctx'> CONFIG_INET6_ESP=y</div><div class='ctx'> CONFIG_INET=y</div><div class='del'>-CONFIG_INET_ESP=y</div><div class='ctx'> CONFIG_IP_ADVANCED_ROUTER=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='ctx'> CONFIG_IP_MULTIPLE_TABLES=y</div><div class='del'>-CONFIG_IP_NF_IPTABLES=y</div><div class='ctx'> CONFIG_IPV6_SEG6_LWTUNNEL=y</div><div class='ctx'> CONFIG_IPVLAN=y</div><div class='ctx'> CONFIG_JUMP_LABEL=y</div><div class='hunk'>@@ -83,18 +78,14 @@ CONFIG_MEMORY_HOTREMOVE=y</div><div class='ctx'> CONFIG_NAMESPACES=y</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_NET_ACT_BPF=y</div><div class='del'>-CONFIG_NET_ACT_GACT=y</div><div class='ctx'> CONFIG_NET_KEY=y</div><div class='del'>-CONFIG_NET_SCH_FQ=y</div><div class='ctx'> CONFIG_NET_VRF=y</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_BPF=y</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=y</div><div class='del'>-CONFIG_NF_TABLES=y</div><div class='ctx'> CONFIG_NO_HZ_IDLE=y</div><div class='ctx'> CONFIG_NR_CPUS=256</div><div class='ctx'> CONFIG_NUMA=y</div><div class='del'>-CONFIG_PACKET=y</div><div class='ctx'> CONFIG_PANIC_ON_OOPS=y</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='hunk'>@@ -119,7 +110,6 @@ CONFIG_TASK_IO_ACCOUNTING=y</div><div class='ctx'> CONFIG_TASK_XACCT=y</div><div class='ctx'> CONFIG_TASKSTATS=y</div><div class='ctx'> CONFIG_TCP_CONG_ADVANCED=y</div><div class='del'>-CONFIG_TCP_CONG_DCTCP=y</div><div class='ctx'> CONFIG_TLS=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_TMPFS_POSIX_ACL=y</div><div class='hunk'>@@ -128,10 +118,8 @@ CONFIG_TRANSPARENT_HUGEPAGE=y</div><div class='ctx'> CONFIG_TUN=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='ctx'> CONFIG_UPROBES=y</div><div class='del'>-CONFIG_USELIB=y</div><div class='ctx'> CONFIG_USER_NS=y</div><div class='ctx'> CONFIG_VETH=y</div><div class='ctx'> CONFIG_VLAN_8021Q=y</div><div class='del'>-CONFIG_VSOCKETS=y</div><div class='ctx'> CONFIG_VSOCKETS_LOOPBACK=y</div><div class='ctx'> CONFIG_XFRM_USER=y</div><div class='head'>diff --git a/tools/testing/selftests/bpf/config.x86_64 b/tools/testing/selftests/bpf/config.x86_64<br/>index 5680befae8c6..42ad817b00ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/config.x86_64?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/config.x86_64</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/config.x86_64?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/config.x86_64</a></div><div class='hunk'>@@ -39,13 +39,11 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y</div><div class='ctx'> CONFIG_CPU_FREQ_STAT=y</div><div class='ctx'> CONFIG_CPU_IDLE_GOV_LADDER=y</div><div class='ctx'> CONFIG_CPUSETS=y</div><div class='del'>-CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRYPTO_BLAKE2B=y</div><div class='ctx'> CONFIG_CRYPTO_SEQIV=y</div><div class='ctx'> CONFIG_CRYPTO_XXHASH=y</div><div class='ctx'> CONFIG_DCB=y</div><div class='ctx'> CONFIG_DEBUG_ATOMIC_SLEEP=y</div><div class='del'>-CONFIG_DEBUG_INFO_BTF=y</div><div class='ctx'> CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y</div><div class='ctx'> CONFIG_DEBUG_MEMORY_INIT=y</div><div class='ctx'> CONFIG_DEFAULT_FQ_CODEL=y</div><div class='hunk'>@@ -105,12 +103,10 @@ CONFIG_HZ_1000=y</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_INPUT_EVDEV=y</div><div class='ctx'> CONFIG_INTEL_POWERCLAMP=y</div><div class='del'>-CONFIG_IP6_NF_IPTABLES=y</div><div class='ctx'> CONFIG_IP_ADVANCED_ROUTER=y</div><div class='ctx'> CONFIG_IP_MROUTE=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='ctx'> CONFIG_IP_MULTIPLE_TABLES=y</div><div class='del'>-CONFIG_IP_NF_IPTABLES=y</div><div class='ctx'> CONFIG_IP_PIMSM_V1=y</div><div class='ctx'> CONFIG_IP_PIMSM_V2=y</div><div class='ctx'> CONFIG_IP_ROUTE_MULTIPATH=y</div><div class='hunk'>@@ -163,7 +159,6 @@ CONFIG_NUMA=y</div><div class='ctx'> CONFIG_NUMA_BALANCING=y</div><div class='ctx'> CONFIG_NVMEM=y</div><div class='ctx'> CONFIG_OSF_PARTITION=y</div><div class='del'>-CONFIG_PACKET=y</div><div class='ctx'> CONFIG_PANIC_ON_OOPS=y</div><div class='ctx'> CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='hunk'>@@ -221,7 +216,6 @@ CONFIG_VALIDATE_FS_PARSER=y</div><div class='ctx'> CONFIG_VETH=y</div><div class='ctx'> CONFIG_VIRT_DRIVERS=y</div><div class='ctx'> CONFIG_VLAN_8021Q=y</div><div class='del'>-CONFIG_VSOCKETS=y</div><div class='ctx'> CONFIG_VSOCKETS_LOOPBACK=y</div><div class='ctx'> CONFIG_X86_ACPI_CPUFREQ=y</div><div class='ctx'> CONFIG_X86_CPUID=y</div><div class='head'>diff --git a/tools/testing/selftests/bpf/map_tests/map_in_map_batch_ops.c b/tools/testing/selftests/bpf/map_tests/map_in_map_batch_ops.c<br/>index 66191ae9863c..79c3ccadb962 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/map_tests/map_in_map_batch_ops.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/map_tests/map_in_map_batch_ops.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/map_tests/map_in_map_batch_ops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/map_tests/map_in_map_batch_ops.c</a></div><div class='hunk'>@@ -120,11 +120,12 @@ static void validate_fetch_results(int outer_map_fd,</div><div class='ctx'> </div><div class='ctx'> static void fetch_and_validate(int outer_map_fd,</div><div class='ctx'> 			       struct bpf_map_batch_opts *opts,</div><div class='del'>-			       __u32 batch_size, bool delete_entries)</div><div class='add'>+			       __u32 batch_size, bool delete_entries,</div><div class='add'>+			       bool has_holes)</div><div class='ctx'> {</div><div class='del'>-	__u32 *fetched_keys, *fetched_values, total_fetched = 0;</div><div class='del'>-	__u32 batch_key = 0, fetch_count, step_size;</div><div class='del'>-	int err, max_entries = OUTER_MAP_ENTRIES;</div><div class='add'>+	int err, max_entries = OUTER_MAP_ENTRIES - !!has_holes;</div><div class='add'>+	__u32 *fetched_keys, *fetched_values, total_fetched = 0, i;</div><div class='add'>+	__u32 batch_key = 0, fetch_count, step_size = batch_size;</div><div class='ctx'> 	__u32 value_size = sizeof(__u32);</div><div class='ctx'> </div><div class='ctx'> 	/* Total entries needs to be fetched */</div><div class='hunk'>@@ -134,9 +135,8 @@ static void fetch_and_validate(int outer_map_fd,</div><div class='ctx'> 	      "Memory allocation failed for fetched_keys or fetched_values",</div><div class='ctx'> 	      "error=%s\n", strerror(errno));</div><div class='ctx'> </div><div class='del'>-	for (step_size = batch_size;</div><div class='del'>-	     step_size &lt;= max_entries;</div><div class='del'>-	     step_size += batch_size) {</div><div class='add'>+	/* hash map may not always return full batch */</div><div class='add'>+	for (i = 0; i &lt; OUTER_MAP_ENTRIES; i++) {</div><div class='ctx'> 		fetch_count = step_size;</div><div class='ctx'> 		err = delete_entries</div><div class='ctx'> 		      ? bpf_map_lookup_and_delete_batch(outer_map_fd,</div><div class='hunk'>@@ -155,6 +155,7 @@ static void fetch_and_validate(int outer_map_fd,</div><div class='ctx'> 		if (err &amp;&amp; errno == ENOSPC) {</div><div class='ctx'> 			/* Fetch again with higher batch size */</div><div class='ctx'> 			total_fetched = 0;</div><div class='add'>+			step_size += batch_size;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -184,18 +185,19 @@ static void fetch_and_validate(int outer_map_fd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void _map_in_map_batch_ops(enum bpf_map_type outer_map_type,</div><div class='del'>-				  enum bpf_map_type inner_map_type)</div><div class='add'>+				  enum bpf_map_type inner_map_type,</div><div class='add'>+				  bool has_holes)</div><div class='ctx'> {</div><div class='add'>+	__u32 max_entries = OUTER_MAP_ENTRIES - !!has_holes;</div><div class='ctx'> 	__u32 *outer_map_keys, *inner_map_fds;</div><div class='del'>-	__u32 max_entries = OUTER_MAP_ENTRIES;</div><div class='ctx'> 	LIBBPF_OPTS(bpf_map_batch_opts, opts);</div><div class='ctx'> 	__u32 value_size = sizeof(__u32);</div><div class='ctx'> 	int batch_size[2] = {5, 10};</div><div class='ctx'> 	__u32 map_index, op_index;</div><div class='ctx'> 	int outer_map_fd, ret;</div><div class='ctx'> </div><div class='del'>-	outer_map_keys = calloc(max_entries, value_size);</div><div class='del'>-	inner_map_fds = calloc(max_entries, value_size);</div><div class='add'>+	outer_map_keys = calloc(OUTER_MAP_ENTRIES, value_size);</div><div class='add'>+	inner_map_fds = calloc(OUTER_MAP_ENTRIES, value_size);</div><div class='ctx'> 	CHECK((!outer_map_keys || !inner_map_fds),</div><div class='ctx'> 	      "Memory allocation failed for outer_map_keys or inner_map_fds",</div><div class='ctx'> 	      "error=%s\n", strerror(errno));</div><div class='hunk'>@@ -209,6 +211,24 @@ static void _map_in_map_batch_ops(enum bpf_map_type outer_map_type,</div><div class='ctx'> 			((outer_map_type == BPF_MAP_TYPE_ARRAY_OF_MAPS)</div><div class='ctx'> 			 ? 9 : 1000) - map_index;</div><div class='ctx'> </div><div class='add'>+	/* This condition is only meaningful for array of maps.</div><div class='add'>+	 *</div><div class='add'>+	 * max_entries == OUTER_MAP_ENTRIES - 1 if it is true. Say</div><div class='add'>+	 * max_entries is short for n, then outer_map_keys looks like:</div><div class='add'>+	 *</div><div class='add'>+	 *   [n, n-1, ... 2, 1]</div><div class='add'>+	 *</div><div class='add'>+	 * We change it to</div><div class='add'>+	 *</div><div class='add'>+	 *   [n, n-1, ... 2, 0]</div><div class='add'>+	 *</div><div class='add'>+	 * So it will leave key 1 as a hole. It will serve to test the</div><div class='add'>+	 * correctness when batch on an array: a "non-exist" key might be</div><div class='add'>+	 * actually allocated and returned from key iteration.</div><div class='add'>+	 */</div><div class='add'>+	if (has_holes)</div><div class='add'>+		outer_map_keys[max_entries - 1]--;</div><div class='add'>+</div><div class='ctx'> 	/* batch operation - map_update */</div><div class='ctx'> 	ret = bpf_map_update_batch(outer_map_fd, outer_map_keys,</div><div class='ctx'> 				   inner_map_fds, &amp;max_entries, &amp;opts);</div><div class='hunk'>@@ -219,15 +239,17 @@ static void _map_in_map_batch_ops(enum bpf_map_type outer_map_type,</div><div class='ctx'> 	/* batch operation - map_lookup */</div><div class='ctx'> 	for (op_index = 0; op_index &lt; 2; ++op_index)</div><div class='ctx'> 		fetch_and_validate(outer_map_fd, &amp;opts,</div><div class='del'>-				   batch_size[op_index], false);</div><div class='add'>+				   batch_size[op_index], false,</div><div class='add'>+				   has_holes);</div><div class='ctx'> </div><div class='ctx'> 	/* batch operation - map_lookup_delete */</div><div class='ctx'> 	if (outer_map_type == BPF_MAP_TYPE_HASH_OF_MAPS)</div><div class='ctx'> 		fetch_and_validate(outer_map_fd, &amp;opts,</div><div class='del'>-				   max_entries, true /*delete*/);</div><div class='add'>+				   max_entries, true /*delete*/,</div><div class='add'>+				   has_holes);</div><div class='ctx'> </div><div class='ctx'> 	/* close all map fds */</div><div class='del'>-	for (map_index = 0; map_index &lt; max_entries; map_index++)</div><div class='add'>+	for (map_index = 0; map_index &lt; OUTER_MAP_ENTRIES; map_index++)</div><div class='ctx'> 		close(inner_map_fds[map_index]);</div><div class='ctx'> 	close(outer_map_fd);</div><div class='ctx'> </div><div class='hunk'>@@ -237,16 +259,20 @@ static void _map_in_map_batch_ops(enum bpf_map_type outer_map_type,</div><div class='ctx'> </div><div class='ctx'> void test_map_in_map_batch_ops_array(void)</div><div class='ctx'> {</div><div class='del'>-	_map_in_map_batch_ops(BPF_MAP_TYPE_ARRAY_OF_MAPS, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	_map_in_map_batch_ops(BPF_MAP_TYPE_ARRAY_OF_MAPS, BPF_MAP_TYPE_ARRAY, false);</div><div class='ctx'> 	printf("%s:PASS with inner ARRAY map\n", __func__);</div><div class='del'>-	_map_in_map_batch_ops(BPF_MAP_TYPE_ARRAY_OF_MAPS, BPF_MAP_TYPE_HASH);</div><div class='add'>+	_map_in_map_batch_ops(BPF_MAP_TYPE_ARRAY_OF_MAPS, BPF_MAP_TYPE_HASH, false);</div><div class='ctx'> 	printf("%s:PASS with inner HASH map\n", __func__);</div><div class='add'>+	_map_in_map_batch_ops(BPF_MAP_TYPE_ARRAY_OF_MAPS, BPF_MAP_TYPE_ARRAY, true);</div><div class='add'>+	printf("%s:PASS with inner ARRAY map with holes\n", __func__);</div><div class='add'>+	_map_in_map_batch_ops(BPF_MAP_TYPE_ARRAY_OF_MAPS, BPF_MAP_TYPE_HASH, true);</div><div class='add'>+	printf("%s:PASS with inner HASH map with holes\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void test_map_in_map_batch_ops_hash(void)</div><div class='ctx'> {</div><div class='del'>-	_map_in_map_batch_ops(BPF_MAP_TYPE_HASH_OF_MAPS, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	_map_in_map_batch_ops(BPF_MAP_TYPE_HASH_OF_MAPS, BPF_MAP_TYPE_ARRAY, false);</div><div class='ctx'> 	printf("%s:PASS with inner ARRAY map\n", __func__);</div><div class='del'>-	_map_in_map_batch_ops(BPF_MAP_TYPE_HASH_OF_MAPS, BPF_MAP_TYPE_HASH);</div><div class='add'>+	_map_in_map_batch_ops(BPF_MAP_TYPE_HASH_OF_MAPS, BPF_MAP_TYPE_HASH, false);</div><div class='ctx'> 	printf("%s:PASS with inner HASH map\n", __func__);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c<br/>index 80844a5fb1fe..0a6a5561bed3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/network_helpers.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/network_helpers.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/network_helpers.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/network_helpers.c</a></div><div class='hunk'>@@ -97,7 +97,7 @@ int settimeo(int fd, int timeout_ms)</div><div class='ctx'> int start_server_addr(int type, const struct sockaddr_storage *addr, socklen_t addrlen,</div><div class='ctx'> 		      const struct network_helper_opts *opts)</div><div class='ctx'> {</div><div class='del'>-	int fd;</div><div class='add'>+	int on = 1, fd;</div><div class='ctx'> </div><div class='ctx'> 	if (!opts)</div><div class='ctx'> 		opts = &amp;default_opts;</div><div class='hunk'>@@ -111,6 +111,12 @@ int start_server_addr(int type, const struct sockaddr_storage *addr, socklen_t a</div><div class='ctx'> 	if (settimeo(fd, opts-&gt;timeout_ms))</div><div class='ctx'> 		goto error_close;</div><div class='ctx'> </div><div class='add'>+	if (type == SOCK_STREAM &amp;&amp;</div><div class='add'>+	    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &amp;on, sizeof(on))) {</div><div class='add'>+		log_err("Failed to enable SO_REUSEADDR");</div><div class='add'>+		goto error_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (opts-&gt;post_socket_cb &amp;&amp;</div><div class='ctx'> 	    opts-&gt;post_socket_cb(fd, opts-&gt;cb_opts)) {</div><div class='ctx'> 		log_err("Failed to call post_socket_cb");</div><div class='hunk'>@@ -446,6 +452,23 @@ char *ping_command(int family)</div><div class='ctx'> 	return "ping";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int append_tid(char *str, size_t sz)</div><div class='add'>+{</div><div class='add'>+	size_t end;</div><div class='add'>+</div><div class='add'>+	if (!str)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	end = strlen(str);</div><div class='add'>+	if (end + 8 &gt; sz)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	sprintf(&amp;str[end], "%07ld", sys_gettid());</div><div class='add'>+	str[end + 7] = '\0';</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int remove_netns(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	char *cmd;</div><div class='hunk'>@@ -548,6 +571,34 @@ void close_netns(struct nstoken *token)</div><div class='ctx'> 	free(token);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int open_tuntap(const char *dev_name, bool need_mac)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct ifreq ifr;</div><div class='add'>+	int fd = open("/dev/net/tun", O_RDWR);</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_GE(fd, 0, "open(/dev/net/tun)"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	ifr.ifr_flags = IFF_NO_PI | (need_mac ? IFF_TAP : IFF_TUN);</div><div class='add'>+	strncpy(ifr.ifr_name, dev_name, IFNAMSIZ - 1);</div><div class='add'>+	ifr.ifr_name[IFNAMSIZ - 1] = '\0';</div><div class='add'>+</div><div class='add'>+	err = ioctl(fd, TUNSETIFF, &amp;ifr);</div><div class='add'>+	if (!ASSERT_OK(err, "ioctl(TUNSETIFF)")) {</div><div class='add'>+		close(fd);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fcntl(fd, F_SETFL, O_NONBLOCK);</div><div class='add'>+	if (!ASSERT_OK(err, "fcntl(O_NONBLOCK)")) {</div><div class='add'>+		close(fd);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int get_socket_local_port(int sock_fd)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_storage addr;</div><div class='hunk'>@@ -721,6 +772,50 @@ int send_recv_data(int lfd, int fd, uint32_t total_bytes)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int tc_prog_attach(const char *dev, int ingress_fd, int egress_fd)</div><div class='add'>+{</div><div class='add'>+	int ifindex, ret;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_TRUE(ingress_fd &gt;= 0 || egress_fd &gt;= 0,</div><div class='add'>+			 "at least one program fd is valid"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	ifindex = if_nametoindex(dev);</div><div class='add'>+	if (!ASSERT_NEQ(ifindex, 0, "get ifindex"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	DECLARE_LIBBPF_OPTS(bpf_tc_hook, hook, .ifindex = ifindex,</div><div class='add'>+			    .attach_point = BPF_TC_INGRESS | BPF_TC_EGRESS);</div><div class='add'>+	DECLARE_LIBBPF_OPTS(bpf_tc_opts, opts1, .handle = 1,</div><div class='add'>+			    .priority = 1, .prog_fd = ingress_fd);</div><div class='add'>+	DECLARE_LIBBPF_OPTS(bpf_tc_opts, opts2, .handle = 1,</div><div class='add'>+			    .priority = 1, .prog_fd = egress_fd);</div><div class='add'>+</div><div class='add'>+	ret = bpf_tc_hook_create(&amp;hook);</div><div class='add'>+	if (!ASSERT_OK(ret, "create tc hook"))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ingress_fd &gt;= 0) {</div><div class='add'>+		hook.attach_point = BPF_TC_INGRESS;</div><div class='add'>+		ret = bpf_tc_attach(&amp;hook, &amp;opts1);</div><div class='add'>+		if (!ASSERT_OK(ret, "bpf_tc_attach")) {</div><div class='add'>+			bpf_tc_hook_destroy(&amp;hook);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (egress_fd &gt;= 0) {</div><div class='add'>+		hook.attach_point = BPF_TC_EGRESS;</div><div class='add'>+		ret = bpf_tc_attach(&amp;hook, &amp;opts2);</div><div class='add'>+		if (!ASSERT_OK(ret, "bpf_tc_attach")) {</div><div class='add'>+			bpf_tc_hook_destroy(&amp;hook);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef TRAFFIC_MONITOR</div><div class='ctx'> struct tmonitor_ctx {</div><div class='ctx'> 	pcap_t *pcap;</div><div class='hunk'>@@ -733,6 +828,36 @@ struct tmonitor_ctx {</div><div class='ctx'> 	int pcap_fd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int __base_pr(const char *format, va_list args)</div><div class='add'>+{</div><div class='add'>+	return vfprintf(stdout, format, args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static tm_print_fn_t __tm_pr = __base_pr;</div><div class='add'>+</div><div class='add'>+tm_print_fn_t traffic_monitor_set_print(tm_print_fn_t fn)</div><div class='add'>+{</div><div class='add'>+	tm_print_fn_t old_print_fn;</div><div class='add'>+</div><div class='add'>+	old_print_fn = __atomic_exchange_n(&amp;__tm_pr, fn, __ATOMIC_RELAXED);</div><div class='add'>+</div><div class='add'>+	return old_print_fn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tm_print(const char *format, ...)</div><div class='add'>+{</div><div class='add'>+	tm_print_fn_t print_fn;</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	print_fn = __atomic_load_n(&amp;__tm_pr, __ATOMIC_RELAXED);</div><div class='add'>+	if (!print_fn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	va_start(args, format);</div><div class='add'>+	print_fn(format, args);</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Is this packet captured with a Ethernet protocol type? */</div><div class='ctx'> static bool is_ethernet(const u_char *packet)</div><div class='ctx'> {</div><div class='hunk'>@@ -750,7 +875,7 @@ static bool is_ethernet(const u_char *packet)</div><div class='ctx'> 	case 770: /* ARPHRD_FRAD */</div><div class='ctx'> 	case 778: /* ARPHDR_IPGRE */</div><div class='ctx'> 	case 803: /* ARPHRD_IEEE80211_RADIOTAP */</div><div class='del'>-		printf("Packet captured: arphdr_type=%d\n", arphdr_type);</div><div class='add'>+		tm_print("Packet captured: arphdr_type=%d\n", arphdr_type);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -771,12 +896,13 @@ static const char *pkt_type_str(u16 pkt_type)</div><div class='ctx'> 	return "Unknown";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define MAX_FLAGS_STRLEN 21</div><div class='ctx'> /* Show the information of the transport layer in the packet */</div><div class='ctx'> static void show_transport(const u_char *packet, u16 len, u32 ifindex,</div><div class='ctx'> 			   const char *src_addr, const char *dst_addr,</div><div class='ctx'> 			   u16 proto, bool ipv6, u8 pkt_type)</div><div class='ctx'> {</div><div class='del'>-	char *ifname, _ifname[IF_NAMESIZE];</div><div class='add'>+	char *ifname, _ifname[IF_NAMESIZE], flags[MAX_FLAGS_STRLEN] = "";</div><div class='ctx'> 	const char *transport_str;</div><div class='ctx'> 	u16 src_port, dst_port;</div><div class='ctx'> 	struct udphdr *udp;</div><div class='hunk'>@@ -799,47 +925,39 @@ static void show_transport(const u_char *packet, u16 len, u32 ifindex,</div><div class='ctx'> 		dst_port = ntohs(tcp-&gt;dest);</div><div class='ctx'> 		transport_str = "TCP";</div><div class='ctx'> 	} else if (proto == IPPROTO_ICMP) {</div><div class='del'>-		printf("%-7s %-3s IPv4 %s &gt; %s: ICMP, length %d, type %d, code %d\n",</div><div class='del'>-		       ifname, pkt_type_str(pkt_type), src_addr, dst_addr, len,</div><div class='del'>-		       packet[0], packet[1]);</div><div class='add'>+		tm_print("%-7s %-3s IPv4 %s &gt; %s: ICMP, length %d, type %d, code %d\n",</div><div class='add'>+			 ifname, pkt_type_str(pkt_type), src_addr, dst_addr, len,</div><div class='add'>+			 packet[0], packet[1]);</div><div class='ctx'> 		return;</div><div class='ctx'> 	} else if (proto == IPPROTO_ICMPV6) {</div><div class='del'>-		printf("%-7s %-3s IPv6 %s &gt; %s: ICMPv6, length %d, type %d, code %d\n",</div><div class='del'>-		       ifname, pkt_type_str(pkt_type), src_addr, dst_addr, len,</div><div class='del'>-		       packet[0], packet[1]);</div><div class='add'>+		tm_print("%-7s %-3s IPv6 %s &gt; %s: ICMPv6, length %d, type %d, code %d\n",</div><div class='add'>+			 ifname, pkt_type_str(pkt_type), src_addr, dst_addr, len,</div><div class='add'>+			 packet[0], packet[1]);</div><div class='ctx'> 		return;</div><div class='ctx'> 	} else {</div><div class='del'>-		printf("%-7s %-3s %s %s &gt; %s: protocol %d\n",</div><div class='del'>-		       ifname, pkt_type_str(pkt_type), ipv6 ? "IPv6" : "IPv4",</div><div class='del'>-		       src_addr, dst_addr, proto);</div><div class='add'>+		tm_print("%-7s %-3s %s %s &gt; %s: protocol %d\n",</div><div class='add'>+			 ifname, pkt_type_str(pkt_type), ipv6 ? "IPv6" : "IPv4",</div><div class='add'>+			 src_addr, dst_addr, proto);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* TCP or UDP*/</div><div class='ctx'> </div><div class='del'>-	flockfile(stdout);</div><div class='add'>+	if (proto == IPPROTO_TCP)</div><div class='add'>+		snprintf(flags, MAX_FLAGS_STRLEN, "%s%s%s%s",</div><div class='add'>+			 tcp-&gt;fin ? ", FIN" : "",</div><div class='add'>+			 tcp-&gt;syn ? ", SYN" : "",</div><div class='add'>+			 tcp-&gt;rst ? ", RST" : "",</div><div class='add'>+			 tcp-&gt;ack ? ", ACK" : "");</div><div class='add'>+</div><div class='ctx'> 	if (ipv6)</div><div class='del'>-		printf("%-7s %-3s IPv6 %s.%d &gt; %s.%d: %s, length %d",</div><div class='del'>-		       ifname, pkt_type_str(pkt_type), src_addr, src_port,</div><div class='del'>-		       dst_addr, dst_port, transport_str, len);</div><div class='add'>+		tm_print("%-7s %-3s IPv6 %s.%d &gt; %s.%d: %s, length %d%s\n",</div><div class='add'>+			 ifname, pkt_type_str(pkt_type), src_addr, src_port,</div><div class='add'>+			 dst_addr, dst_port, transport_str, len, flags);</div><div class='ctx'> 	else</div><div class='del'>-		printf("%-7s %-3s IPv4 %s:%d &gt; %s:%d: %s, length %d",</div><div class='del'>-		       ifname, pkt_type_str(pkt_type), src_addr, src_port,</div><div class='del'>-		       dst_addr, dst_port, transport_str, len);</div><div class='del'>-</div><div class='del'>-	if (proto == IPPROTO_TCP) {</div><div class='del'>-		if (tcp-&gt;fin)</div><div class='del'>-			printf(", FIN");</div><div class='del'>-		if (tcp-&gt;syn)</div><div class='del'>-			printf(", SYN");</div><div class='del'>-		if (tcp-&gt;rst)</div><div class='del'>-			printf(", RST");</div><div class='del'>-		if (tcp-&gt;ack)</div><div class='del'>-			printf(", ACK");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("\n");</div><div class='del'>-	funlockfile(stdout);</div><div class='add'>+		tm_print("%-7s %-3s IPv4 %s:%d &gt; %s:%d: %s, length %d%s\n",</div><div class='add'>+			 ifname, pkt_type_str(pkt_type), src_addr, src_port,</div><div class='add'>+			 dst_addr, dst_port, transport_str, len, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void show_ipv6_packet(const u_char *packet, u32 ifindex, u8 pkt_type)</div><div class='hunk'>@@ -954,8 +1072,8 @@ static void *traffic_monitor_thread(void *arg)</div><div class='ctx'> 				ifname = _ifname;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			printf("%-7s %-3s Unknown network protocol type 0x%x\n",</div><div class='del'>-			       ifname, pkt_type_str(ptype), proto);</div><div class='add'>+			tm_print("%-7s %-3s Unknown network protocol type 0x%x\n",</div><div class='add'>+				 ifname, pkt_type_str(ptype), proto);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1155,8 +1273,9 @@ void traffic_monitor_stop(struct tmonitor_ctx *ctx)</div><div class='ctx'> 	write(ctx-&gt;wake_fd, &amp;w, sizeof(w));</div><div class='ctx'> 	pthread_join(ctx-&gt;thread, NULL);</div><div class='ctx'> </div><div class='del'>-	printf("Packet file: %s\n", strrchr(ctx-&gt;pkt_fname, '/') + 1);</div><div class='add'>+	tm_print("Packet file: %s\n", strrchr(ctx-&gt;pkt_fname, '/') + 1);</div><div class='ctx'> </div><div class='ctx'> 	traffic_monitor_release(ctx);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> #endif /* TRAFFIC_MONITOR */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h<br/>index ebec8a8d6f81..79a010c88e11 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/network_helpers.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/network_helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/network_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/network_helpers.h</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> typedef __u16 __sum16;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/if_packet.h&gt;</div><div class='add'>+#include &lt;linux/if_tun.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='hunk'>@@ -17,6 +18,7 @@ typedef __u16 __sum16;</div><div class='ctx'> #include &lt;netinet/udp.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_endian.h&gt;</div><div class='ctx'> #include &lt;net/if.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MAGIC_VAL 0x1234</div><div class='ctx'> #define NUM_ITER 100000</div><div class='hunk'>@@ -85,6 +87,8 @@ int get_socket_local_port(int sock_fd);</div><div class='ctx'> int get_hw_ring_size(char *ifname, struct ethtool_ringparam *ring_param);</div><div class='ctx'> int set_hw_ring_size(char *ifname, struct ethtool_ringparam *ring_param);</div><div class='ctx'> </div><div class='add'>+int open_tuntap(const char *dev_name, bool need_mac);</div><div class='add'>+</div><div class='ctx'> struct nstoken;</div><div class='ctx'> /**</div><div class='ctx'>  * open_netns() - Switch to specified network namespace by name.</div><div class='hunk'>@@ -98,6 +102,18 @@ int send_recv_data(int lfd, int fd, uint32_t total_bytes);</div><div class='ctx'> int make_netns(const char *name);</div><div class='ctx'> int remove_netns(const char *name);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * append_tid() - Append thread ID to the given string.</div><div class='add'>+ *</div><div class='add'>+ * @str: string to extend</div><div class='add'>+ * @sz: string's size</div><div class='add'>+ *</div><div class='add'>+ * 8 characters are used to append the thread ID (7 digits + '\0')</div><div class='add'>+ *</div><div class='add'>+ * Returns -1 on errors, 0 otherwise</div><div class='add'>+ */</div><div class='add'>+int append_tid(char *str, size_t sz);</div><div class='add'>+</div><div class='ctx'> static __u16 csum_fold(__u32 csum)</div><div class='ctx'> {</div><div class='ctx'> 	csum = (csum &amp; 0xffff) + (csum &gt;&gt; 16);</div><div class='hunk'>@@ -237,10 +253,29 @@ static inline __sum16 build_udp_v6_csum(const struct ipv6hdr *ip6h,</div><div class='ctx'> </div><div class='ctx'> struct tmonitor_ctx;</div><div class='ctx'> </div><div class='add'>+typedef int (*tm_print_fn_t)(const char *format, va_list args);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tc_prog_attach - attach BPF program(s) to an interface</div><div class='add'>+ *</div><div class='add'>+ * Takes file descriptors pointing to at least one, at most two BPF</div><div class='add'>+ * programs, and attach those programs to an interface ingress, egress or</div><div class='add'>+ * both.</div><div class='add'>+ *</div><div class='add'>+ * @dev: string containing the interface name</div><div class='add'>+ * @ingress_fd: file descriptor of the program to attach to interface ingress</div><div class='add'>+ * @egress_fd: file descriptor of the program to attach to interface egress</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success, -1 if no valid file descriptor has been found, if</div><div class='add'>+ * the interface name is invalid or if an error ocurred during attach.</div><div class='add'>+ */</div><div class='add'>+int tc_prog_attach(const char *dev, int ingress_fd, int egress_fd);</div><div class='add'>+</div><div class='ctx'> #ifdef TRAFFIC_MONITOR</div><div class='ctx'> struct tmonitor_ctx *traffic_monitor_start(const char *netns, const char *test_name,</div><div class='ctx'> 					   const char *subtest_name);</div><div class='ctx'> void traffic_monitor_stop(struct tmonitor_ctx *ctx);</div><div class='add'>+tm_print_fn_t traffic_monitor_set_print(tm_print_fn_t fn);</div><div class='ctx'> #else</div><div class='ctx'> static inline struct tmonitor_ctx *traffic_monitor_start(const char *netns, const char *test_name,</div><div class='ctx'> 							 const char *subtest_name)</div><div class='hunk'>@@ -251,6 +286,11 @@ static inline struct tmonitor_ctx *traffic_monitor_start(const char *netns, cons</div><div class='ctx'> static inline void traffic_monitor_stop(struct tmonitor_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline tm_print_fn_t traffic_monitor_set_print(tm_print_fn_t fn)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/align.c b/tools/testing/selftests/bpf/prog_tests/align.c<br/>index 4ebd0da898f5..24c509ce4e5b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/align.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/align.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/align.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/align.c</a></div><div class='hunk'>@@ -42,11 +42,11 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 		.matches = {</div><div class='ctx'> 			{0, "R1", "ctx()"},</div><div class='ctx'> 			{0, "R10", "fp0"},</div><div class='del'>-			{0, "R3_w", "2"},</div><div class='del'>-			{1, "R3_w", "4"},</div><div class='del'>-			{2, "R3_w", "8"},</div><div class='del'>-			{3, "R3_w", "16"},</div><div class='del'>-			{4, "R3_w", "32"},</div><div class='add'>+			{0, "R3", "2"},</div><div class='add'>+			{1, "R3", "4"},</div><div class='add'>+			{2, "R3", "8"},</div><div class='add'>+			{3, "R3", "16"},</div><div class='add'>+			{4, "R3", "32"},</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -70,17 +70,17 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 		.matches = {</div><div class='ctx'> 			{0, "R1", "ctx()"},</div><div class='ctx'> 			{0, "R10", "fp0"},</div><div class='del'>-			{0, "R3_w", "1"},</div><div class='del'>-			{1, "R3_w", "2"},</div><div class='del'>-			{2, "R3_w", "4"},</div><div class='del'>-			{3, "R3_w", "8"},</div><div class='del'>-			{4, "R3_w", "16"},</div><div class='del'>-			{5, "R3_w", "1"},</div><div class='del'>-			{6, "R4_w", "32"},</div><div class='del'>-			{7, "R4_w", "16"},</div><div class='del'>-			{8, "R4_w", "8"},</div><div class='del'>-			{9, "R4_w", "4"},</div><div class='del'>-			{10, "R4_w", "2"},</div><div class='add'>+			{0, "R3", "1"},</div><div class='add'>+			{1, "R3", "2"},</div><div class='add'>+			{2, "R3", "4"},</div><div class='add'>+			{3, "R3", "8"},</div><div class='add'>+			{4, "R3", "16"},</div><div class='add'>+			{5, "R3", "1"},</div><div class='add'>+			{6, "R4", "32"},</div><div class='add'>+			{7, "R4", "16"},</div><div class='add'>+			{8, "R4", "8"},</div><div class='add'>+			{9, "R4", "4"},</div><div class='add'>+			{10, "R4", "2"},</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -99,12 +99,12 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 		.matches = {</div><div class='ctx'> 			{0, "R1", "ctx()"},</div><div class='ctx'> 			{0, "R10", "fp0"},</div><div class='del'>-			{0, "R3_w", "4"},</div><div class='del'>-			{1, "R3_w", "8"},</div><div class='del'>-			{2, "R3_w", "10"},</div><div class='del'>-			{3, "R4_w", "8"},</div><div class='del'>-			{4, "R4_w", "12"},</div><div class='del'>-			{5, "R4_w", "14"},</div><div class='add'>+			{0, "R3", "4"},</div><div class='add'>+			{1, "R3", "8"},</div><div class='add'>+			{2, "R3", "10"},</div><div class='add'>+			{3, "R4", "8"},</div><div class='add'>+			{4, "R4", "12"},</div><div class='add'>+			{5, "R4", "14"},</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -121,10 +121,10 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 		.matches = {</div><div class='ctx'> 			{0, "R1", "ctx()"},</div><div class='ctx'> 			{0, "R10", "fp0"},</div><div class='del'>-			{0, "R3_w", "7"},</div><div class='del'>-			{1, "R3_w", "7"},</div><div class='del'>-			{2, "R3_w", "14"},</div><div class='del'>-			{3, "R3_w", "56"},</div><div class='add'>+			{0, "R3", "7"},</div><div class='add'>+			{1, "R3", "7"},</div><div class='add'>+			{2, "R3", "14"},</div><div class='add'>+			{3, "R3", "56"},</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -162,19 +162,19 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 		.prog_type = BPF_PROG_TYPE_SCHED_CLS,</div><div class='ctx'> 		.matches = {</div><div class='del'>-			{6, "R0_w", "pkt(off=8,r=8)"},</div><div class='del'>-			{6, "R3_w", "var_off=(0x0; 0xff)"},</div><div class='del'>-			{7, "R3_w", "var_off=(0x0; 0x1fe)"},</div><div class='del'>-			{8, "R3_w", "var_off=(0x0; 0x3fc)"},</div><div class='del'>-			{9, "R3_w", "var_off=(0x0; 0x7f8)"},</div><div class='del'>-			{10, "R3_w", "var_off=(0x0; 0xff0)"},</div><div class='del'>-			{12, "R3_w", "pkt_end()"},</div><div class='del'>-			{17, "R4_w", "var_off=(0x0; 0xff)"},</div><div class='del'>-			{18, "R4_w", "var_off=(0x0; 0x1fe0)"},</div><div class='del'>-			{19, "R4_w", "var_off=(0x0; 0xff0)"},</div><div class='del'>-			{20, "R4_w", "var_off=(0x0; 0x7f8)"},</div><div class='del'>-			{21, "R4_w", "var_off=(0x0; 0x3fc)"},</div><div class='del'>-			{22, "R4_w", "var_off=(0x0; 0x1fe)"},</div><div class='add'>+			{6, "R0", "pkt(off=8,r=8)"},</div><div class='add'>+			{6, "R3", "var_off=(0x0; 0xff)"},</div><div class='add'>+			{7, "R3", "var_off=(0x0; 0x1fe)"},</div><div class='add'>+			{8, "R3", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{9, "R3", "var_off=(0x0; 0x7f8)"},</div><div class='add'>+			{10, "R3", "var_off=(0x0; 0xff0)"},</div><div class='add'>+			{12, "R3", "pkt_end()"},</div><div class='add'>+			{17, "R4", "var_off=(0x0; 0xff)"},</div><div class='add'>+			{18, "R4", "var_off=(0x0; 0x1fe0)"},</div><div class='add'>+			{19, "R4", "var_off=(0x0; 0xff0)"},</div><div class='add'>+			{20, "R4", "var_off=(0x0; 0x7f8)"},</div><div class='add'>+			{21, "R4", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{22, "R4", "var_off=(0x0; 0x1fe)"},</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -195,16 +195,16 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 		.prog_type = BPF_PROG_TYPE_SCHED_CLS,</div><div class='ctx'> 		.matches = {</div><div class='del'>-			{6, "R3_w", "var_off=(0x0; 0xff)"},</div><div class='del'>-			{7, "R4_w", "var_off=(0x0; 0xff)"},</div><div class='del'>-			{8, "R4_w", "var_off=(0x0; 0xff)"},</div><div class='del'>-			{9, "R4_w", "var_off=(0x0; 0xff)"},</div><div class='del'>-			{10, "R4_w", "var_off=(0x0; 0x1fe)"},</div><div class='del'>-			{11, "R4_w", "var_off=(0x0; 0xff)"},</div><div class='del'>-			{12, "R4_w", "var_off=(0x0; 0x3fc)"},</div><div class='del'>-			{13, "R4_w", "var_off=(0x0; 0xff)"},</div><div class='del'>-			{14, "R4_w", "var_off=(0x0; 0x7f8)"},</div><div class='del'>-			{15, "R4_w", "var_off=(0x0; 0xff0)"},</div><div class='add'>+			{6, "R3", "var_off=(0x0; 0xff)"},</div><div class='add'>+			{7, "R4", "var_off=(0x0; 0xff)"},</div><div class='add'>+			{8, "R4", "var_off=(0x0; 0xff)"},</div><div class='add'>+			{9, "R4", "var_off=(0x0; 0xff)"},</div><div class='add'>+			{10, "R4", "var_off=(0x0; 0x1fe)"},</div><div class='add'>+			{11, "R4", "var_off=(0x0; 0xff)"},</div><div class='add'>+			{12, "R4", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{13, "R4", "var_off=(0x0; 0xff)"},</div><div class='add'>+			{14, "R4", "var_off=(0x0; 0x7f8)"},</div><div class='add'>+			{15, "R4", "var_off=(0x0; 0xff0)"},</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -235,14 +235,14 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 		.prog_type = BPF_PROG_TYPE_SCHED_CLS,</div><div class='ctx'> 		.matches = {</div><div class='del'>-			{2, "R5_w", "pkt(r=0)"},</div><div class='del'>-			{4, "R5_w", "pkt(off=14,r=0)"},</div><div class='del'>-			{5, "R4_w", "pkt(off=14,r=0)"},</div><div class='add'>+			{2, "R5", "pkt(r=0)"},</div><div class='add'>+			{4, "R5", "pkt(off=14,r=0)"},</div><div class='add'>+			{5, "R4", "pkt(off=14,r=0)"},</div><div class='ctx'> 			{9, "R2", "pkt(r=18)"},</div><div class='ctx'> 			{10, "R5", "pkt(off=14,r=18)"},</div><div class='del'>-			{10, "R4_w", "var_off=(0x0; 0xff)"},</div><div class='del'>-			{13, "R4_w", "var_off=(0x0; 0xffff)"},</div><div class='del'>-			{14, "R4_w", "var_off=(0x0; 0xffff)"},</div><div class='add'>+			{10, "R4", "var_off=(0x0; 0xff)"},</div><div class='add'>+			{13, "R4", "var_off=(0x0; 0xffff)"},</div><div class='add'>+			{14, "R4", "var_off=(0x0; 0xffff)"},</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -299,12 +299,12 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 			/* Calculated offset in R6 has unknown value, but known</div><div class='ctx'> 			 * alignment of 4.</div><div class='ctx'> 			 */</div><div class='del'>-			{6, "R2_w", "pkt(r=8)"},</div><div class='del'>-			{7, "R6_w", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{6, "R2", "pkt(r=8)"},</div><div class='add'>+			{7, "R6", "var_off=(0x0; 0x3fc)"},</div><div class='ctx'> 			/* Offset is added to packet pointer R5, resulting in</div><div class='ctx'> 			 * known fixed offset, and variable offset from R6.</div><div class='ctx'> 			 */</div><div class='del'>-			{11, "R5_w", "pkt(id=1,off=14,"},</div><div class='add'>+			{11, "R5", "pkt(id=1,off=14,"},</div><div class='ctx'> 			/* At the time the word size load is performed from R5,</div><div class='ctx'> 			 * it's total offset is NET_IP_ALIGN + reg-&gt;off (0) +</div><div class='ctx'> 			 * reg-&gt;aux_off (14) which is 16.  Then the variable</div><div class='hunk'>@@ -320,12 +320,12 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 			 * instruction to validate R5 state. We also check</div><div class='ctx'> 			 * that R4 is what it should be in such case.</div><div class='ctx'> 			 */</div><div class='del'>-			{18, "R4_w", "var_off=(0x0; 0x3fc)"},</div><div class='del'>-			{18, "R5_w", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{18, "R4", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{18, "R5", "var_off=(0x0; 0x3fc)"},</div><div class='ctx'> 			/* Constant offset is added to R5, resulting in</div><div class='ctx'> 			 * reg-&gt;off of 14.</div><div class='ctx'> 			 */</div><div class='del'>-			{19, "R5_w", "pkt(id=2,off=14,"},</div><div class='add'>+			{19, "R5", "pkt(id=2,off=14,"},</div><div class='ctx'> 			/* At the time the word size load is performed from R5,</div><div class='ctx'> 			 * its total fixed offset is NET_IP_ALIGN + reg-&gt;off</div><div class='ctx'> 			 * (14) which is 16.  Then the variable offset is 4-byte</div><div class='hunk'>@@ -337,21 +337,21 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 			/* Constant offset is added to R5 packet pointer,</div><div class='ctx'> 			 * resulting in reg-&gt;off value of 14.</div><div class='ctx'> 			 */</div><div class='del'>-			{26, "R5_w", "pkt(off=14,r=8)"},</div><div class='add'>+			{26, "R5", "pkt(off=14,r=8)"},</div><div class='ctx'> 			/* Variable offset is added to R5, resulting in a</div><div class='ctx'> 			 * variable offset of (4n). See comment for insn #18</div><div class='ctx'> 			 * for R4 = R5 trick.</div><div class='ctx'> 			 */</div><div class='del'>-			{28, "R4_w", "var_off=(0x0; 0x3fc)"},</div><div class='del'>-			{28, "R5_w", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{28, "R4", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{28, "R5", "var_off=(0x0; 0x3fc)"},</div><div class='ctx'> 			/* Constant is added to R5 again, setting reg-&gt;off to 18. */</div><div class='del'>-			{29, "R5_w", "pkt(id=3,off=18,"},</div><div class='add'>+			{29, "R5", "pkt(id=3,off=18,"},</div><div class='ctx'> 			/* And once more we add a variable; resulting var_off</div><div class='ctx'> 			 * is still (4n), fixed offset is not changed.</div><div class='ctx'> 			 * Also, we create a new reg-&gt;id.</div><div class='ctx'> 			 */</div><div class='del'>-			{31, "R4_w", "var_off=(0x0; 0x7fc)"},</div><div class='del'>-			{31, "R5_w", "var_off=(0x0; 0x7fc)"},</div><div class='add'>+			{31, "R4", "var_off=(0x0; 0x7fc)"},</div><div class='add'>+			{31, "R5", "var_off=(0x0; 0x7fc)"},</div><div class='ctx'> 			/* At the time the word size load is performed from R5,</div><div class='ctx'> 			 * its total fixed offset is NET_IP_ALIGN + reg-&gt;off (18)</div><div class='ctx'> 			 * which is 20.  Then the variable offset is (4n), so</div><div class='hunk'>@@ -397,12 +397,12 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 			/* Calculated offset in R6 has unknown value, but known</div><div class='ctx'> 			 * alignment of 4.</div><div class='ctx'> 			 */</div><div class='del'>-			{6, "R2_w", "pkt(r=8)"},</div><div class='del'>-			{7, "R6_w", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{6, "R2", "pkt(r=8)"},</div><div class='add'>+			{7, "R6", "var_off=(0x0; 0x3fc)"},</div><div class='ctx'> 			/* Adding 14 makes R6 be (4n+2) */</div><div class='del'>-			{8, "R6_w", "var_off=(0x2; 0x7fc)"},</div><div class='add'>+			{8, "R6", "var_off=(0x2; 0x7fc)"},</div><div class='ctx'> 			/* Packet pointer has (4n+2) offset */</div><div class='del'>-			{11, "R5_w", "var_off=(0x2; 0x7fc)"},</div><div class='add'>+			{11, "R5", "var_off=(0x2; 0x7fc)"},</div><div class='ctx'> 			{12, "R4", "var_off=(0x2; 0x7fc)"},</div><div class='ctx'> 			/* At the time the word size load is performed from R5,</div><div class='ctx'> 			 * its total fixed offset is NET_IP_ALIGN + reg-&gt;off (0)</div><div class='hunk'>@@ -414,11 +414,11 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 			/* Newly read value in R6 was shifted left by 2, so has</div><div class='ctx'> 			 * known alignment of 4.</div><div class='ctx'> 			 */</div><div class='del'>-			{17, "R6_w", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{17, "R6", "var_off=(0x0; 0x3fc)"},</div><div class='ctx'> 			/* Added (4n) to packet pointer's (4n+2) var_off, giving</div><div class='ctx'> 			 * another (4n+2).</div><div class='ctx'> 			 */</div><div class='del'>-			{19, "R5_w", "var_off=(0x2; 0xffc)"},</div><div class='add'>+			{19, "R5", "var_off=(0x2; 0xffc)"},</div><div class='ctx'> 			{20, "R4", "var_off=(0x2; 0xffc)"},</div><div class='ctx'> 			/* At the time the word size load is performed from R5,</div><div class='ctx'> 			 * its total fixed offset is NET_IP_ALIGN + reg-&gt;off (0)</div><div class='hunk'>@@ -459,18 +459,18 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 		.prog_type = BPF_PROG_TYPE_SCHED_CLS,</div><div class='ctx'> 		.result = REJECT,</div><div class='ctx'> 		.matches = {</div><div class='del'>-			{3, "R5_w", "pkt_end()"},</div><div class='add'>+			{3, "R5", "pkt_end()"},</div><div class='ctx'> 			/* (ptr - ptr) &lt;&lt; 2 == unknown, (4n) */</div><div class='del'>-			{5, "R5_w", "var_off=(0x0; 0xfffffffffffffffc)"},</div><div class='add'>+			{5, "R5", "var_off=(0x0; 0xfffffffffffffffc)"},</div><div class='ctx'> 			/* (4n) + 14 == (4n+2).  We blow our bounds, because</div><div class='ctx'> 			 * the add could overflow.</div><div class='ctx'> 			 */</div><div class='del'>-			{6, "R5_w", "var_off=(0x2; 0xfffffffffffffffc)"},</div><div class='add'>+			{6, "R5", "var_off=(0x2; 0xfffffffffffffffc)"},</div><div class='ctx'> 			/* Checked s&gt;=0 */</div><div class='ctx'> 			{9, "R5", "var_off=(0x2; 0x7ffffffffffffffc)"},</div><div class='ctx'> 			/* packet pointer + nonnegative (4n+2) */</div><div class='del'>-			{11, "R6_w", "var_off=(0x2; 0x7ffffffffffffffc)"},</div><div class='del'>-			{12, "R4_w", "var_off=(0x2; 0x7ffffffffffffffc)"},</div><div class='add'>+			{11, "R6", "var_off=(0x2; 0x7ffffffffffffffc)"},</div><div class='add'>+			{12, "R4", "var_off=(0x2; 0x7ffffffffffffffc)"},</div><div class='ctx'> 			/* NET_IP_ALIGN + (4n+2) == (4n), alignment is fine.</div><div class='ctx'> 			 * We checked the bounds, but it might have been able</div><div class='ctx'> 			 * to overflow if the packet pointer started in the</div><div class='hunk'>@@ -478,7 +478,7 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 			 * So we did not get a 'range' on R6, and the access</div><div class='ctx'> 			 * attempt will fail.</div><div class='ctx'> 			 */</div><div class='del'>-			{15, "R6_w", "var_off=(0x2; 0x7ffffffffffffffc)"},</div><div class='add'>+			{15, "R6", "var_off=(0x2; 0x7ffffffffffffffc)"},</div><div class='ctx'> 		}</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -513,12 +513,12 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 			/* Calculated offset in R6 has unknown value, but known</div><div class='ctx'> 			 * alignment of 4.</div><div class='ctx'> 			 */</div><div class='del'>-			{6, "R2_w", "pkt(r=8)"},</div><div class='del'>-			{8, "R6_w", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{6, "R2", "pkt(r=8)"},</div><div class='add'>+			{8, "R6", "var_off=(0x0; 0x3fc)"},</div><div class='ctx'> 			/* Adding 14 makes R6 be (4n+2) */</div><div class='del'>-			{9, "R6_w", "var_off=(0x2; 0x7fc)"},</div><div class='add'>+			{9, "R6", "var_off=(0x2; 0x7fc)"},</div><div class='ctx'> 			/* New unknown value in R7 is (4n) */</div><div class='del'>-			{10, "R7_w", "var_off=(0x0; 0x3fc)"},</div><div class='add'>+			{10, "R7", "var_off=(0x0; 0x3fc)"},</div><div class='ctx'> 			/* Subtracting it from R6 blows our unsigned bounds */</div><div class='ctx'> 			{11, "R6", "var_off=(0x2; 0xfffffffffffffffc)"},</div><div class='ctx'> 			/* Checked s&gt;= 0 */</div><div class='hunk'>@@ -566,16 +566,16 @@ static struct bpf_align_test tests[] = {</div><div class='ctx'> 			/* Calculated offset in R6 has unknown value, but known</div><div class='ctx'> 			 * alignment of 4.</div><div class='ctx'> 			 */</div><div class='del'>-			{6, "R2_w", "pkt(r=8)"},</div><div class='del'>-			{9, "R6_w", "var_off=(0x0; 0x3c)"},</div><div class='add'>+			{6, "R2", "pkt(r=8)"},</div><div class='add'>+			{9, "R6", "var_off=(0x0; 0x3c)"},</div><div class='ctx'> 			/* Adding 14 makes R6 be (4n+2) */</div><div class='del'>-			{10, "R6_w", "var_off=(0x2; 0x7c)"},</div><div class='add'>+			{10, "R6", "var_off=(0x2; 0x7c)"},</div><div class='ctx'> 			/* Subtracting from packet pointer overflows ubounds */</div><div class='del'>-			{13, "R5_w", "var_off=(0xffffffffffffff82; 0x7c)"},</div><div class='add'>+			{13, "R5", "var_off=(0xffffffffffffff82; 0x7c)"},</div><div class='ctx'> 			/* New unknown value in R7 is (4n), &gt;= 76 */</div><div class='del'>-			{14, "R7_w", "var_off=(0x0; 0x7fc)"},</div><div class='add'>+			{14, "R7", "var_off=(0x0; 0x7fc)"},</div><div class='ctx'> 			/* Adding it to packet pointer gives nice bounds again */</div><div class='del'>-			{16, "R5_w", "var_off=(0x2; 0x7fc)"},</div><div class='add'>+			{16, "R5", "var_off=(0x2; 0x7fc)"},</div><div class='ctx'> 			/* At the time the word size load is performed from R5,</div><div class='ctx'> 			 * its total fixed offset is NET_IP_ALIGN + reg-&gt;off (0)</div><div class='ctx'> 			 * which is 2.  Then the variable offset is (4n+2), so</div><div class='hunk'>@@ -610,9 +610,11 @@ static int do_test_single(struct bpf_align_test *test)</div><div class='ctx'> 		.log_size = sizeof(bpf_vlog),</div><div class='ctx'> 		.log_level = 2,</div><div class='ctx'> 	);</div><div class='add'>+	const char *main_pass_start = "0: R1=ctx() R10=fp0";</div><div class='ctx'> 	const char *line_ptr;</div><div class='ctx'> 	int cur_line = -1;</div><div class='ctx'> 	int prog_len, i;</div><div class='add'>+	char *start;</div><div class='ctx'> 	int fd_prog;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -632,7 +634,13 @@ static int do_test_single(struct bpf_align_test *test)</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		/* We make a local copy so that we can strtok() it */</div><div class='ctx'> 		strncpy(bpf_vlog_copy, bpf_vlog, sizeof(bpf_vlog_copy));</div><div class='del'>-		line_ptr = strtok(bpf_vlog_copy, "\n");</div><div class='add'>+		start = strstr(bpf_vlog_copy, main_pass_start);</div><div class='add'>+		if (!start) {</div><div class='add'>+			ret = 1;</div><div class='add'>+			printf("Can't find initial line '%s'\n", main_pass_start);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		line_ptr = strtok(start, "\n");</div><div class='ctx'> 		for (i = 0; i &lt; MAX_MATCHES; i++) {</div><div class='ctx'> 			struct bpf_reg_match m = test-&gt;matches[i];</div><div class='ctx'> 			const char *p;</div><div class='hunk'>@@ -682,6 +690,7 @@ static int do_test_single(struct bpf_align_test *test)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+out:</div><div class='ctx'> 		if (fd_prog &gt;= 0)</div><div class='ctx'> 			close(fd_prog);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/arena_atomics.c b/tools/testing/selftests/bpf/prog_tests/arena_atomics.c<br/>index 26e7c06c6cb4..d98577a6babc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/arena_atomics.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/arena_atomics.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/arena_atomics.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/arena_atomics.c</a></div><div class='hunk'>@@ -162,6 +162,66 @@ static void test_uaf(struct arena_atomics *skel)</div><div class='ctx'> 	ASSERT_EQ(skel-&gt;arena-&gt;uaf_recovery_fails, 0, "uaf_recovery_fails");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_load_acquire(struct arena_atomics *skel)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='add'>+	int err, prog_fd;</div><div class='add'>+</div><div class='add'>+	if (skel-&gt;data-&gt;skip_lacq_srel_tests) {</div><div class='add'>+		printf("%s:SKIP: ENABLE_ATOMICS_TESTS not defined, Clang doesn't support addr_space_cast, and/or JIT doesn't support load-acquire\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No need to attach it, just run it directly */</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.load_acquire);</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+	if (!ASSERT_OK(err, "test_run_opts err"))</div><div class='add'>+		return;</div><div class='add'>+	if (!ASSERT_OK(topts.retval, "test_run_opts retval"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;arena-&gt;load_acquire8_result, 0x12,</div><div class='add'>+		  "load_acquire8_result");</div><div class='add'>+	ASSERT_EQ(skel-&gt;arena-&gt;load_acquire16_result, 0x1234,</div><div class='add'>+		  "load_acquire16_result");</div><div class='add'>+	ASSERT_EQ(skel-&gt;arena-&gt;load_acquire32_result, 0x12345678,</div><div class='add'>+		  "load_acquire32_result");</div><div class='add'>+	ASSERT_EQ(skel-&gt;arena-&gt;load_acquire64_result, 0x1234567890abcdef,</div><div class='add'>+		  "load_acquire64_result");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_store_release(struct arena_atomics *skel)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='add'>+	int err, prog_fd;</div><div class='add'>+</div><div class='add'>+	if (skel-&gt;data-&gt;skip_lacq_srel_tests) {</div><div class='add'>+		printf("%s:SKIP: ENABLE_ATOMICS_TESTS not defined, Clang doesn't support addr_space_cast, and/or JIT doesn't support store-release\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No need to attach it, just run it directly */</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.store_release);</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+	if (!ASSERT_OK(err, "test_run_opts err"))</div><div class='add'>+		return;</div><div class='add'>+	if (!ASSERT_OK(topts.retval, "test_run_opts retval"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;arena-&gt;store_release8_result, 0x12,</div><div class='add'>+		  "store_release8_result");</div><div class='add'>+	ASSERT_EQ(skel-&gt;arena-&gt;store_release16_result, 0x1234,</div><div class='add'>+		  "store_release16_result");</div><div class='add'>+	ASSERT_EQ(skel-&gt;arena-&gt;store_release32_result, 0x12345678,</div><div class='add'>+		  "store_release32_result");</div><div class='add'>+	ASSERT_EQ(skel-&gt;arena-&gt;store_release64_result, 0x1234567890abcdef,</div><div class='add'>+		  "store_release64_result");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_arena_atomics(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct arena_atomics *skel;</div><div class='hunk'>@@ -171,7 +231,7 @@ void test_arena_atomics(void)</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "arena atomics skeleton open"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (skel-&gt;data-&gt;skip_tests) {</div><div class='add'>+	if (skel-&gt;data-&gt;skip_all_tests) {</div><div class='ctx'> 		printf("%s:SKIP:no ENABLE_ATOMICS_TESTS or no addr_space_cast support in clang",</div><div class='ctx'> 		       __func__);</div><div class='ctx'> 		test__skip();</div><div class='hunk'>@@ -198,6 +258,10 @@ void test_arena_atomics(void)</div><div class='ctx'> 		test_xchg(skel);</div><div class='ctx'> 	if (test__start_subtest("uaf"))</div><div class='ctx'> 		test_uaf(skel);</div><div class='add'>+	if (test__start_subtest("load_acquire"))</div><div class='add'>+		test_load_acquire(skel);</div><div class='add'>+	if (test__start_subtest("store_release"))</div><div class='add'>+		test_store_release(skel);</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='ctx'> 	arena_atomics__destroy(skel);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/arena_spin_lock.c b/tools/testing/selftests/bpf/prog_tests/arena_spin_lock.c<br/>new file mode 100644<br/>index 000000000000..693fd86fbde6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/arena_spin_lock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/arena_spin_lock.c</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;network_helpers.h&gt;</div><div class='add'>+#include &lt;sys/sysinfo.h&gt;</div><div class='add'>+</div><div class='add'>+struct __qspinlock { int val; };</div><div class='add'>+typedef struct __qspinlock arena_spinlock_t;</div><div class='add'>+</div><div class='add'>+struct arena_qnode {</div><div class='add'>+	unsigned long next;</div><div class='add'>+	int count;</div><div class='add'>+	int locked;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#include "arena_spin_lock.skel.h"</div><div class='add'>+</div><div class='add'>+static long cpu;</div><div class='add'>+static int repeat;</div><div class='add'>+</div><div class='add'>+pthread_barrier_t barrier;</div><div class='add'>+</div><div class='add'>+static void *spin_lock_thread(void *arg)</div><div class='add'>+{</div><div class='add'>+	int err, prog_fd = *(u32 *)arg;</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts,</div><div class='add'>+		.data_in = &amp;pkt_v4,</div><div class='add'>+		.data_size_in = sizeof(pkt_v4),</div><div class='add'>+		.repeat = repeat,</div><div class='add'>+	);</div><div class='add'>+	cpu_set_t cpuset;</div><div class='add'>+</div><div class='add'>+	CPU_ZERO(&amp;cpuset);</div><div class='add'>+	CPU_SET(__sync_fetch_and_add(&amp;cpu, 1), &amp;cpuset);</div><div class='add'>+	ASSERT_OK(pthread_setaffinity_np(pthread_self(), sizeof(cpuset), &amp;cpuset), "cpu affinity");</div><div class='add'>+</div><div class='add'>+	err = pthread_barrier_wait(&amp;barrier);</div><div class='add'>+	if (err != PTHREAD_BARRIER_SERIAL_THREAD &amp;&amp; err != 0)</div><div class='add'>+		ASSERT_FALSE(true, "pthread_barrier");</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+	ASSERT_OK(err, "test_run err");</div><div class='add'>+</div><div class='add'>+	if (topts.retval == -EOPNOTSUPP)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ((int)topts.retval, 0, "test_run retval");</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	pthread_exit(arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_arena_spin_lock_size(int size)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='add'>+	struct arena_spin_lock *skel;</div><div class='add'>+	pthread_t thread_id[16];</div><div class='add'>+	int prog_fd, i, err;</div><div class='add'>+	int nthreads;</div><div class='add'>+	void *ret;</div><div class='add'>+</div><div class='add'>+	nthreads = MIN(get_nprocs(), ARRAY_SIZE(thread_id));</div><div class='add'>+	if (nthreads &lt; 2) {</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skel = arena_spin_lock__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "arena_spin_lock__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (skel-&gt;data-&gt;test_skip == 2) {</div><div class='add'>+		test__skip();</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	skel-&gt;bss-&gt;cs_count = size;</div><div class='add'>+	skel-&gt;bss-&gt;limit = repeat * nthreads;</div><div class='add'>+</div><div class='add'>+	ASSERT_OK(pthread_barrier_init(&amp;barrier, NULL, nthreads), "barrier init");</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.prog);</div><div class='add'>+	for (i = 0; i &lt; nthreads; i++) {</div><div class='add'>+		err = pthread_create(&amp;thread_id[i], NULL, &amp;spin_lock_thread, &amp;prog_fd);</div><div class='add'>+		if (!ASSERT_OK(err, "pthread_create"))</div><div class='add'>+			goto end_barrier;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nthreads; i++) {</div><div class='add'>+		if (!ASSERT_OK(pthread_join(thread_id[i], &amp;ret), "pthread_join"))</div><div class='add'>+			goto end_barrier;</div><div class='add'>+		if (!ASSERT_EQ(ret, &amp;prog_fd, "ret == prog_fd"))</div><div class='add'>+			goto end_barrier;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skel-&gt;data-&gt;test_skip == 3) {</div><div class='add'>+		printf("%s:SKIP: CONFIG_NR_CPUS exceed the maximum supported by arena spinlock\n",</div><div class='add'>+		       __func__);</div><div class='add'>+		test__skip();</div><div class='add'>+		goto end_barrier;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;counter, repeat * nthreads, "check counter value");</div><div class='add'>+</div><div class='add'>+end_barrier:</div><div class='add'>+	pthread_barrier_destroy(&amp;barrier);</div><div class='add'>+end:</div><div class='add'>+	arena_spin_lock__destroy(skel);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_arena_spin_lock(void)</div><div class='add'>+{</div><div class='add'>+	repeat = 1000;</div><div class='add'>+	if (test__start_subtest("arena_spin_lock_1"))</div><div class='add'>+		test_arena_spin_lock_size(1);</div><div class='add'>+	cpu = 0;</div><div class='add'>+	if (test__start_subtest("arena_spin_lock_1000"))</div><div class='add'>+		test_arena_spin_lock_size(1000);</div><div class='add'>+	cpu = 0;</div><div class='add'>+	repeat = 100;</div><div class='add'>+	if (test__start_subtest("arena_spin_lock_50000"))</div><div class='add'>+		test_arena_spin_lock_size(50000);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/arena_strsearch.c b/tools/testing/selftests/bpf/prog_tests/arena_strsearch.c<br/>new file mode 100644<br/>index 000000000000..f81a0c066505<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/arena_strsearch.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/arena_strsearch.c</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "arena_strsearch.skel.h"</div><div class='add'>+</div><div class='add'>+static void test_arena_str(void)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, opts);</div><div class='add'>+	struct arena_strsearch *skel;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skel = arena_strsearch__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "arena_strsearch__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = bpf_prog_test_run_opts(bpf_program__fd(skel-&gt;progs.arena_strsearch), &amp;opts);</div><div class='add'>+	ASSERT_OK(ret, "ret_add");</div><div class='add'>+	ASSERT_OK(opts.retval, "retval");</div><div class='add'>+	if (skel-&gt;bss-&gt;skip) {</div><div class='add'>+		printf("%s:SKIP:compiler doesn't support arena_cast\n", __func__);</div><div class='add'>+		test__skip();</div><div class='add'>+	}</div><div class='add'>+	arena_strsearch__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_arena_strsearch(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("arena_strsearch"))</div><div class='add'>+		test_arena_str();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/arg_parsing.c b/tools/testing/selftests/bpf/prog_tests/arg_parsing.c<br/>index bb143de68875..e27d66b75fb1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/arg_parsing.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/arg_parsing.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/arg_parsing.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/arg_parsing.c</a></div><div class='hunk'>@@ -144,11 +144,17 @@ static void test_parse_test_list_file(void)</div><div class='ctx'> 	if (!ASSERT_OK(ferror(fp), "prepare tmp"))</div><div class='ctx'> 		goto out_fclose;</div><div class='ctx'> </div><div class='add'>+	if (!ASSERT_OK(fsync(fileno(fp)), "fsync tmp"))</div><div class='add'>+		goto out_fclose;</div><div class='add'>+</div><div class='ctx'> 	init_test_filter_set(&amp;set);</div><div class='ctx'> </div><div class='del'>-	ASSERT_OK(parse_test_list_file(tmpfile, &amp;set, true), "parse file");</div><div class='add'>+	if (!ASSERT_OK(parse_test_list_file(tmpfile, &amp;set, true), "parse file"))</div><div class='add'>+		goto out_fclose;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(set.cnt, 4, "test  count"))</div><div class='add'>+		goto out_free_set;</div><div class='ctx'> </div><div class='del'>-	ASSERT_EQ(set.cnt, 4, "test  count");</div><div class='ctx'> 	ASSERT_OK(strcmp("test_with_spaces", set.tests[0].name), "test 0 name");</div><div class='ctx'> 	ASSERT_EQ(set.tests[0].subtest_cnt, 0, "test 0 subtest count");</div><div class='ctx'> 	ASSERT_OK(strcmp("testA", set.tests[1].name), "test 1 name");</div><div class='hunk'>@@ -158,8 +164,8 @@ static void test_parse_test_list_file(void)</div><div class='ctx'> 	ASSERT_OK(strcmp("testB", set.tests[2].name), "test 2 name");</div><div class='ctx'> 	ASSERT_OK(strcmp("testC_no_eof_newline", set.tests[3].name), "test 3 name");</div><div class='ctx'> </div><div class='add'>+out_free_set:</div><div class='ctx'> 	free_test_filter_set(&amp;set);</div><div class='del'>-</div><div class='ctx'> out_fclose:</div><div class='ctx'> 	fclose(fp);</div><div class='ctx'> out_remove:</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/atomics.c b/tools/testing/selftests/bpf/prog_tests/atomics.c<br/>index 13e101f370a1..92b5f378bfb8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/atomics.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/atomics.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/atomics.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/atomics.c</a></div><div class='hunk'>@@ -165,11 +165,17 @@ static void test_xchg(struct atomics_lskel *skel)</div><div class='ctx'> void test_atomics(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct atomics_lskel *skel;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	skel = atomics_lskel__open_and_load();</div><div class='del'>-	if (!ASSERT_OK_PTR(skel, "atomics skeleton load"))</div><div class='add'>+	skel = atomics_lskel__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "atomics skeleton open"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	skel-&gt;keyring_id = KEY_SPEC_SESSION_KEYRING;</div><div class='add'>+	err = atomics_lskel__load(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "atomics skeleton load"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='ctx'> 	if (skel-&gt;data-&gt;skip_tests) {</div><div class='ctx'> 		printf("%s:SKIP:no ENABLE_ATOMICS_TESTS (missing Clang BPF atomics support)",</div><div class='ctx'> 		       __func__);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/testing/selftests/bpf/prog_tests/attach_probe.c<br/>index 329c7862b52d..9e77e5da7097 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/attach_probe.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/attach_probe.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/attach_probe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/attach_probe.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #include "test_attach_kprobe_sleepable.skel.h"</div><div class='ctx'> #include "test_attach_probe_manual.skel.h"</div><div class='ctx'> #include "test_attach_probe.skel.h"</div><div class='add'>+#include "kprobe_write_ctx.skel.h"</div><div class='ctx'> </div><div class='ctx'> /* this is how USDT semaphore is actually defined, except volatile modifier */</div><div class='ctx'> volatile unsigned short uprobe_ref_ctr __attribute__((unused)) __attribute((section(".probes")));</div><div class='hunk'>@@ -122,6 +123,110 @@ cleanup:</div><div class='ctx'> 	test_attach_probe_manual__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* attach uprobe/uretprobe long event name testings */</div><div class='add'>+static void test_attach_uprobe_long_event_name(void)</div><div class='add'>+{</div><div class='add'>+	DECLARE_LIBBPF_OPTS(bpf_uprobe_opts, uprobe_opts);</div><div class='add'>+	struct bpf_link *uprobe_link, *uretprobe_link;</div><div class='add'>+	struct test_attach_probe_manual *skel;</div><div class='add'>+	ssize_t uprobe_offset;</div><div class='add'>+	char path[PATH_MAX] = {0};</div><div class='add'>+</div><div class='add'>+	skel = test_attach_probe_manual__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_kprobe_manual_open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	uprobe_offset = get_uprobe_offset(&amp;trigger_func);</div><div class='add'>+	if (!ASSERT_GE(uprobe_offset, 0, "uprobe_offset"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_GT(readlink("/proc/self/exe", path, PATH_MAX - 1), 0, "readlink"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/* manual-attach uprobe/uretprobe */</div><div class='add'>+	uprobe_opts.attach_mode = PROBE_ATTACH_MODE_LEGACY;</div><div class='add'>+	uprobe_opts.ref_ctr_offset = 0;</div><div class='add'>+	uprobe_opts.retprobe = false;</div><div class='add'>+	uprobe_link = bpf_program__attach_uprobe_opts(skel-&gt;progs.handle_uprobe,</div><div class='add'>+						      0 /* self pid */,</div><div class='add'>+						      path,</div><div class='add'>+						      uprobe_offset,</div><div class='add'>+						      &amp;uprobe_opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(uprobe_link, "attach_uprobe_long_event_name"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	skel-&gt;links.handle_uprobe = uprobe_link;</div><div class='add'>+</div><div class='add'>+	uprobe_opts.retprobe = true;</div><div class='add'>+	uretprobe_link = bpf_program__attach_uprobe_opts(skel-&gt;progs.handle_uretprobe,</div><div class='add'>+							 -1 /* any pid */,</div><div class='add'>+							 path,</div><div class='add'>+							 uprobe_offset, &amp;uprobe_opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(uretprobe_link, "attach_uretprobe_long_event_name"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	skel-&gt;links.handle_uretprobe = uretprobe_link;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	test_attach_probe_manual__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* attach kprobe/kretprobe long event name testings */</div><div class='add'>+static void test_attach_kprobe_long_event_name(void)</div><div class='add'>+{</div><div class='add'>+	DECLARE_LIBBPF_OPTS(bpf_kprobe_opts, kprobe_opts);</div><div class='add'>+	struct bpf_link *kprobe_link, *kretprobe_link;</div><div class='add'>+	struct test_attach_probe_manual *skel;</div><div class='add'>+</div><div class='add'>+	skel = test_attach_probe_manual__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_kprobe_manual_open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* manual-attach kprobe/kretprobe */</div><div class='add'>+	kprobe_opts.attach_mode = PROBE_ATTACH_MODE_LEGACY;</div><div class='add'>+	kprobe_opts.retprobe = false;</div><div class='add'>+	kprobe_link = bpf_program__attach_kprobe_opts(skel-&gt;progs.handle_kprobe,</div><div class='add'>+						      "bpf_testmod_looooooooooooooooooooooooooooooong_name",</div><div class='add'>+						      &amp;kprobe_opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(kprobe_link, "attach_kprobe_long_event_name"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	skel-&gt;links.handle_kprobe = kprobe_link;</div><div class='add'>+</div><div class='add'>+	kprobe_opts.retprobe = true;</div><div class='add'>+	kretprobe_link = bpf_program__attach_kprobe_opts(skel-&gt;progs.handle_kretprobe,</div><div class='add'>+							 "bpf_testmod_looooooooooooooooooooooooooooooong_name",</div><div class='add'>+							 &amp;kprobe_opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(kretprobe_link, "attach_kretprobe_long_event_name"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	skel-&gt;links.handle_kretprobe = kretprobe_link;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	test_attach_probe_manual__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+/* attach kprobe/kretprobe long event name testings */</div><div class='add'>+static void test_attach_kprobe_write_ctx(void)</div><div class='add'>+{</div><div class='add'>+	struct kprobe_write_ctx *skel = NULL;</div><div class='add'>+	struct bpf_link *link = NULL;</div><div class='add'>+</div><div class='add'>+	skel = kprobe_write_ctx__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "kprobe_write_ctx__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach_kprobe_opts(skel-&gt;progs.kprobe_write_ctx,</div><div class='add'>+					     "bpf_fentry_test1", NULL);</div><div class='add'>+	if (!ASSERT_ERR_PTR(link, "bpf_program__attach_kprobe_opts"))</div><div class='add'>+		bpf_link__destroy(link);</div><div class='add'>+</div><div class='add'>+	kprobe_write_ctx__destroy(skel);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void test_attach_kprobe_write_ctx(void)</div><div class='add'>+{</div><div class='add'>+	test__skip();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void test_attach_probe_auto(struct test_attach_probe *skel)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_link *uprobe_err_link;</div><div class='hunk'>@@ -323,6 +428,13 @@ void test_attach_probe(void)</div><div class='ctx'> 	if (test__start_subtest("uprobe-ref_ctr"))</div><div class='ctx'> 		test_uprobe_ref_ctr(skel);</div><div class='ctx'> </div><div class='add'>+	if (test__start_subtest("uprobe-long_name"))</div><div class='add'>+		test_attach_uprobe_long_event_name();</div><div class='add'>+	if (test__start_subtest("kprobe-long_name"))</div><div class='add'>+		test_attach_kprobe_long_event_name();</div><div class='add'>+	if (test__start_subtest("kprobe-write-ctx"))</div><div class='add'>+		test_attach_kprobe_write_ctx();</div><div class='add'>+</div><div class='ctx'> cleanup:</div><div class='ctx'> 	test_attach_probe__destroy(skel);</div><div class='ctx'> 	ASSERT_EQ(uprobe_ref_ctr, 0, "uprobe_ref_ctr_cleanup");</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c b/tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c<br/>index cc184e4420f6..42b49870e520 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c</a></div><div class='hunk'>@@ -6,10 +6,14 @@</div><div class='ctx'> #include &lt;test_progs.h&gt;</div><div class='ctx'> #include "bloom_filter_map.skel.h"</div><div class='ctx'> </div><div class='add'>+#ifndef NUMA_NO_NODE</div><div class='add'>+#define NUMA_NO_NODE	(-1)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void test_fail_cases(void)</div><div class='ctx'> {</div><div class='ctx'> 	LIBBPF_OPTS(bpf_map_create_opts, opts);</div><div class='del'>-	__u32 value;</div><div class='add'>+	__u32 value = 0;</div><div class='ctx'> 	int fd, err;</div><div class='ctx'> </div><div class='ctx'> 	/* Invalid key size */</div><div class='hunk'>@@ -69,6 +73,7 @@ static void test_success_cases(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Create a map */</div><div class='ctx'> 	opts.map_flags = BPF_F_ZERO_SEED | BPF_F_NUMA_NODE;</div><div class='add'>+	opts.numa_node = NUMA_NO_NODE;</div><div class='ctx'> 	fd = bpf_map_create(BPF_MAP_TYPE_BLOOM_FILTER, NULL, 0, sizeof(value), 100, &amp;opts);</div><div class='ctx'> 	if (!ASSERT_GE(fd, 0, "bpf_map_create bloom filter success case"))</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c<br/>index 6befa870434b..75f4dff7d042 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bpf_cookie.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/bpf_cookie.c</a></div><div class='hunk'>@@ -450,8 +450,7 @@ static void pe_subtest(struct test_bpf_cookie *skel)</div><div class='ctx'> 	attr.size = sizeof(attr);</div><div class='ctx'> 	attr.type = PERF_TYPE_SOFTWARE;</div><div class='ctx'> 	attr.config = PERF_COUNT_SW_CPU_CLOCK;</div><div class='del'>-	attr.freq = 1;</div><div class='del'>-	attr.sample_freq = 10000;</div><div class='add'>+	attr.sample_period = 100000;</div><div class='ctx'> 	pfd = syscall(__NR_perf_event_open, &amp;attr, -1, 0, -1, PERF_FLAG_FD_CLOEXEC);</div><div class='ctx'> 	if (!ASSERT_GE(pfd, 0, "perf_fd"))</div><div class='ctx'> 		goto cleanup;</div><div class='hunk'>@@ -489,10 +488,28 @@ cleanup:</div><div class='ctx'> 	bpf_link__destroy(link);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int verify_tracing_link_info(int fd, u64 cookie)</div><div class='add'>+{</div><div class='add'>+	struct bpf_link_info info;</div><div class='add'>+	int err;</div><div class='add'>+	u32 len = sizeof(info);</div><div class='add'>+</div><div class='add'>+	err = bpf_link_get_info_by_fd(fd, &amp;info, &amp;len);</div><div class='add'>+	if (!ASSERT_OK(err, "get_link_info"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(info.type, BPF_LINK_TYPE_TRACING, "link_type"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(info.tracing.cookie, cookie, "tracing_cookie");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void tracing_subtest(struct test_bpf_cookie *skel)</div><div class='ctx'> {</div><div class='ctx'> 	__u64 cookie;</div><div class='del'>-	int prog_fd;</div><div class='add'>+	int prog_fd, err;</div><div class='ctx'> 	int fentry_fd = -1, fexit_fd = -1, fmod_ret_fd = -1;</div><div class='ctx'> 	LIBBPF_OPTS(bpf_test_run_opts, opts);</div><div class='ctx'> 	LIBBPF_OPTS(bpf_link_create_opts, link_opts);</div><div class='hunk'>@@ -507,6 +524,10 @@ static void tracing_subtest(struct test_bpf_cookie *skel)</div><div class='ctx'> 	if (!ASSERT_GE(fentry_fd, 0, "fentry.link_create"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='add'>+	err = verify_tracing_link_info(fentry_fd, cookie);</div><div class='add'>+	if (!ASSERT_OK(err, "verify_tracing_link_info"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='ctx'> 	cookie = 0x20000000000000L;</div><div class='ctx'> 	prog_fd = bpf_program__fd(skel-&gt;progs.fexit_test1);</div><div class='ctx'> 	link_opts.tracing.cookie = cookie;</div><div class='hunk'>@@ -635,10 +656,29 @@ cleanup:</div><div class='ctx'> 	bpf_link__destroy(link);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int verify_raw_tp_link_info(int fd, u64 cookie)</div><div class='add'>+{</div><div class='add'>+	struct bpf_link_info info;</div><div class='add'>+	int err;</div><div class='add'>+	u32 len = sizeof(info);</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	err = bpf_link_get_info_by_fd(fd, &amp;info, &amp;len);</div><div class='add'>+	if (!ASSERT_OK(err, "get_link_info"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(info.type, BPF_LINK_TYPE_RAW_TRACEPOINT, "link_type"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(info.raw_tracepoint.cookie, cookie, "raw_tp_cookie");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void raw_tp_subtest(struct test_bpf_cookie *skel)</div><div class='ctx'> {</div><div class='ctx'> 	__u64 cookie;</div><div class='del'>-	int prog_fd, link_fd = -1;</div><div class='add'>+	int err, prog_fd, link_fd = -1;</div><div class='ctx'> 	struct bpf_link *link = NULL;</div><div class='ctx'> 	LIBBPF_OPTS(bpf_raw_tp_opts, raw_tp_opts);</div><div class='ctx'> 	LIBBPF_OPTS(bpf_raw_tracepoint_opts, opts);</div><div class='hunk'>@@ -656,6 +696,11 @@ static void raw_tp_subtest(struct test_bpf_cookie *skel)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	usleep(1); /* trigger */</div><div class='add'>+</div><div class='add'>+	err = verify_raw_tp_link_info(link_fd, cookie);</div><div class='add'>+	if (!ASSERT_OK(err, "verify_raw_tp_link_info"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='ctx'> 	close(link_fd); /* detach */</div><div class='ctx'> 	link_fd = -1;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_gotox.c b/tools/testing/selftests/bpf/prog_tests/bpf_gotox.c<br/>new file mode 100644<br/>index 000000000000..d138cc7b1bda<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bpf_gotox.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/bpf_gotox.c</a></div><div class='hunk'>@@ -0,0 +1,292 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;linux/in6.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;bpf/bpf.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bpf_gotox.skel.h"</div><div class='add'>+</div><div class='add'>+static void __test_run(struct bpf_program *prog, void *ctx_in, size_t ctx_size_in)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts,</div><div class='add'>+			    .ctx_in = ctx_in,</div><div class='add'>+			    .ctx_size_in = ctx_size_in,</div><div class='add'>+		   );</div><div class='add'>+	int err, prog_fd;</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(prog);</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+	ASSERT_OK(err, "test_run_opts err");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __subtest(struct bpf_gotox *skel, void (*check)(struct bpf_gotox *))</div><div class='add'>+{</div><div class='add'>+	if (skel-&gt;data-&gt;skip)</div><div class='add'>+		test__skip();</div><div class='add'>+	else</div><div class='add'>+		check(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_simple(struct bpf_gotox *skel,</div><div class='add'>+			 struct bpf_program *prog,</div><div class='add'>+			 __u64 ctx_in,</div><div class='add'>+			 __u64 expected)</div><div class='add'>+{</div><div class='add'>+	skel-&gt;bss-&gt;ret_user = 0;</div><div class='add'>+</div><div class='add'>+	__test_run(prog, &amp;ctx_in, sizeof(ctx_in));</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(skel-&gt;bss-&gt;ret_user, expected, "skel-&gt;bss-&gt;ret_user"))</div><div class='add'>+		return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_simple_fentry(struct bpf_gotox *skel,</div><div class='add'>+				struct bpf_program *prog,</div><div class='add'>+				__u64 ctx_in,</div><div class='add'>+				__u64 expected)</div><div class='add'>+{</div><div class='add'>+	skel-&gt;bss-&gt;in_user = ctx_in;</div><div class='add'>+	skel-&gt;bss-&gt;ret_user = 0;</div><div class='add'>+</div><div class='add'>+	/* trigger */</div><div class='add'>+	usleep(1);</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(skel-&gt;bss-&gt;ret_user, expected, "skel-&gt;bss-&gt;ret_user"))</div><div class='add'>+		return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* validate that for two loads of the same jump table libbpf generates only one map */</div><div class='add'>+static void check_one_map_two_jumps(struct bpf_gotox *skel)</div><div class='add'>+{</div><div class='add'>+	struct bpf_prog_info prog_info;</div><div class='add'>+	struct bpf_map_info map_info;</div><div class='add'>+	__u32 len;</div><div class='add'>+	__u32 map_ids[16];</div><div class='add'>+	int prog_fd, map_fd;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+	bool seen = false;</div><div class='add'>+</div><div class='add'>+	memset(&amp;prog_info, 0, sizeof(prog_info));</div><div class='add'>+	prog_info.map_ids = (long)map_ids;</div><div class='add'>+	prog_info.nr_map_ids = ARRAY_SIZE(map_ids);</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.one_map_two_jumps);</div><div class='add'>+	if (!ASSERT_GE(prog_fd, 0, "bpf_program__fd(one_map_two_jumps)"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	len = sizeof(prog_info);</div><div class='add'>+	ret = bpf_obj_get_info_by_fd(prog_fd, &amp;prog_info, &amp;len);</div><div class='add'>+	if (!ASSERT_OK(ret, "bpf_obj_get_info_by_fd(prog_fd)"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; prog_info.nr_map_ids; i++) {</div><div class='add'>+		map_fd  = bpf_map_get_fd_by_id(map_ids[i]);</div><div class='add'>+		if (!ASSERT_GE(map_fd, 0, "bpf_map_get_fd_by_id"))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		len = sizeof(map_info);</div><div class='add'>+		memset(&amp;map_info, 0, len);</div><div class='add'>+		ret = bpf_obj_get_info_by_fd(map_fd, &amp;map_info, &amp;len);</div><div class='add'>+		if (!ASSERT_OK(ret, "bpf_obj_get_info_by_fd(map_fd)")) {</div><div class='add'>+			close(map_fd);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (map_info.type == BPF_MAP_TYPE_INSN_ARRAY) {</div><div class='add'>+			if (!ASSERT_EQ(seen, false, "more than one INSN_ARRAY map")) {</div><div class='add'>+				close(map_fd);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+			seen = true;</div><div class='add'>+		}</div><div class='add'>+		close(map_fd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(seen, true, "no INSN_ARRAY map");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_one_switch(struct bpf_gotox *skel)</div><div class='add'>+{</div><div class='add'>+	__u64 in[]   = {0, 1, 2, 3, 4,  5, 77};</div><div class='add'>+	__u64 out[]  = {2, 3, 4, 5, 7, 19, 19};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple(skel, skel-&gt;progs.one_switch, in[i], out[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_one_switch_non_zero_sec_off(struct bpf_gotox *skel)</div><div class='add'>+{</div><div class='add'>+	__u64 in[]   = {0, 1, 2, 3, 4,  5, 77};</div><div class='add'>+	__u64 out[]  = {2, 3, 4, 5, 7, 19, 19};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple(skel, skel-&gt;progs.one_switch_non_zero_sec_off, in[i], out[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_two_switches(struct bpf_gotox *skel)</div><div class='add'>+{</div><div class='add'>+	__u64 in[]   = {0, 1, 2, 3, 4,  5, 77};</div><div class='add'>+	__u64 out[] = {103, 104, 107, 205, 115, 1019, 1019};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple(skel, skel-&gt;progs.two_switches, in[i], out[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_big_jump_table(struct bpf_gotox *skel)</div><div class='add'>+{</div><div class='add'>+	__u64 in[]  = {0, 11, 27, 31, 22, 45, 99};</div><div class='add'>+	__u64 out[] = {2,  3,  4,  5, 19, 19, 19};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple(skel, skel-&gt;progs.big_jump_table, in[i], out[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_one_jump_two_maps(struct bpf_gotox *skel)</div><div class='add'>+{</div><div class='add'>+	__u64 in[]  = {0, 1, 2, 3, 4,  5, 77};</div><div class='add'>+	__u64 out[] = {12, 15, 7 , 15, 12, 15, 15};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple(skel, skel-&gt;progs.one_jump_two_maps, in[i], out[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_static_global(struct bpf_gotox *skel)</div><div class='add'>+{</div><div class='add'>+	__u64 in[]   = {0, 1, 2, 3, 4,  5, 77};</div><div class='add'>+	__u64 out[]  = {2, 3, 4, 5, 7, 19, 19};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple(skel, skel-&gt;progs.use_static_global1, in[i], out[i]);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple(skel, skel-&gt;progs.use_static_global2, in[i], out[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_nonstatic_global(struct bpf_gotox *skel)</div><div class='add'>+{</div><div class='add'>+	__u64 in[]   = {0, 1, 2, 3, 4,  5, 77};</div><div class='add'>+	__u64 out[]  = {2, 3, 4, 5, 7, 19, 19};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple(skel, skel-&gt;progs.use_nonstatic_global1, in[i], out[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple(skel, skel-&gt;progs.use_nonstatic_global2, in[i], out[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_other_sec(struct bpf_gotox *skel)</div><div class='add'>+{</div><div class='add'>+	struct bpf_link *link;</div><div class='add'>+	__u64 in[]   = {0, 1, 2, 3, 4,  5, 77};</div><div class='add'>+	__u64 out[]  = {2, 3, 4, 5, 7, 19, 19};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach(skel-&gt;progs.simple_test_other_sec);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "link"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple_fentry(skel, skel-&gt;progs.simple_test_other_sec, in[i], out[i]);</div><div class='add'>+</div><div class='add'>+	bpf_link__destroy(link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_static_global_other_sec(struct bpf_gotox *skel)</div><div class='add'>+{</div><div class='add'>+	struct bpf_link *link;</div><div class='add'>+	__u64 in[]   = {0, 1, 2, 3, 4,  5, 77};</div><div class='add'>+	__u64 out[]  = {2, 3, 4, 5, 7, 19, 19};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach(skel-&gt;progs.use_static_global_other_sec);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "link"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple_fentry(skel, skel-&gt;progs.use_static_global_other_sec, in[i], out[i]);</div><div class='add'>+</div><div class='add'>+	bpf_link__destroy(link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_nonstatic_global_other_sec(struct bpf_gotox *skel)</div><div class='add'>+{</div><div class='add'>+	struct bpf_link *link;</div><div class='add'>+	__u64 in[]   = {0, 1, 2, 3, 4,  5, 77};</div><div class='add'>+	__u64 out[]  = {2, 3, 4, 5, 7, 19, 19};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach(skel-&gt;progs.use_nonstatic_global_other_sec);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "link"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(in); i++)</div><div class='add'>+		check_simple_fentry(skel, skel-&gt;progs.use_nonstatic_global_other_sec, in[i], out[i]);</div><div class='add'>+</div><div class='add'>+	bpf_link__destroy(link);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_bpf_gotox(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_gotox *skel;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skel = bpf_gotox__open();</div><div class='add'>+	if (!ASSERT_NEQ(skel, NULL, "bpf_gotox__open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = bpf_gotox__load(skel);</div><div class='add'>+	if (!ASSERT_OK(ret, "bpf_gotox__load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;pid = getpid();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("one-switch"))</div><div class='add'>+		__subtest(skel, check_one_switch);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("one-switch-non-zero-sec-offset"))</div><div class='add'>+		__subtest(skel, check_one_switch_non_zero_sec_off);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("two-switches"))</div><div class='add'>+		__subtest(skel, check_two_switches);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("big-jump-table"))</div><div class='add'>+		__subtest(skel, check_big_jump_table);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("static-global"))</div><div class='add'>+		__subtest(skel, check_static_global);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("nonstatic-global"))</div><div class='add'>+		__subtest(skel, check_nonstatic_global);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("other-sec"))</div><div class='add'>+		__subtest(skel, check_other_sec);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("static-global-other-sec"))</div><div class='add'>+		__subtest(skel, check_static_global_other_sec);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("nonstatic-global-other-sec"))</div><div class='add'>+		__subtest(skel, check_nonstatic_global_other_sec);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("one-jump-two-maps"))</div><div class='add'>+		__subtest(skel, check_one_jump_two_maps);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("one-map-two-jumps"))</div><div class='add'>+		__subtest(skel, check_one_map_two_jumps);</div><div class='add'>+</div><div class='add'>+	bpf_gotox__destroy(skel);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_insn_array.c b/tools/testing/selftests/bpf/prog_tests/bpf_insn_array.c<br/>new file mode 100644<br/>index 000000000000..269870bec941<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bpf_insn_array.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/bpf_insn_array.c</a></div><div class='hunk'>@@ -0,0 +1,504 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;bpf/bpf.h&gt;</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+static int map_create(__u32 map_type, __u32 max_entries)</div><div class='add'>+{</div><div class='add'>+	const char *map_name = "insn_array";</div><div class='add'>+	__u32 key_size = 4;</div><div class='add'>+	__u32 value_size = sizeof(struct bpf_insn_array_value);</div><div class='add'>+</div><div class='add'>+	return bpf_map_create(map_type, map_name, key_size, value_size, max_entries, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prog_load(struct bpf_insn *insns, __u32 insn_cnt, int *fd_array, __u32 fd_array_cnt)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_load_opts, opts);</div><div class='add'>+</div><div class='add'>+	opts.fd_array = fd_array;</div><div class='add'>+	opts.fd_array_cnt = fd_array_cnt;</div><div class='add'>+</div><div class='add'>+	return bpf_prog_load(BPF_PROG_TYPE_XDP, NULL, "GPL", insns, insn_cnt, &amp;opts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __check_success(struct bpf_insn *insns, __u32 insn_cnt, __u32 *map_in, __u32 *map_out)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn_array_value val = {};</div><div class='add'>+	int prog_fd = -1, map_fd, i;</div><div class='add'>+</div><div class='add'>+	map_fd = map_create(BPF_MAP_TYPE_INSN_ARRAY, insn_cnt);</div><div class='add'>+	if (!ASSERT_GE(map_fd, 0, "map_create"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; insn_cnt; i++) {</div><div class='add'>+		val.orig_off = map_in[i];</div><div class='add'>+		if (!ASSERT_EQ(bpf_map_update_elem(map_fd, &amp;i, &amp;val, 0), 0, "bpf_map_update_elem"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(bpf_map_freeze(map_fd), 0, "bpf_map_freeze"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	prog_fd = prog_load(insns, insn_cnt, &amp;map_fd, 1);</div><div class='add'>+	if (!ASSERT_GE(prog_fd, 0, "bpf(BPF_PROG_LOAD)"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; insn_cnt; i++) {</div><div class='add'>+		char buf[64];</div><div class='add'>+</div><div class='add'>+		if (!ASSERT_EQ(bpf_map_lookup_elem(map_fd, &amp;i, &amp;val), 0, "bpf_map_lookup_elem"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+</div><div class='add'>+		snprintf(buf, sizeof(buf), "val.xlated_off should be equal map_out[%d]", i);</div><div class='add'>+		ASSERT_EQ(val.xlated_off, map_out[i], buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	close(prog_fd);</div><div class='add'>+	close(map_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Load a program, which will not be anyhow mangled by the verifier.  Add an</div><div class='add'>+ * insn_array map pointing to every instruction. Check that it hasn't changed</div><div class='add'>+ * after the program load.</div><div class='add'>+ */</div><div class='add'>+static void check_one_to_one_mapping(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn insns[] = {</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 4),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 3),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 2),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 1),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 0),</div><div class='add'>+		BPF_EXIT_INSN(),</div><div class='add'>+	};</div><div class='add'>+	__u32 map_in[] = {0, 1, 2, 3, 4, 5};</div><div class='add'>+	__u32 map_out[] = {0, 1, 2, 3, 4, 5};</div><div class='add'>+</div><div class='add'>+	__check_success(insns, ARRAY_SIZE(insns), map_in, map_out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Load a program with two patches (get jiffies, for simplicity). Add an</div><div class='add'>+ * insn_array map pointing to every instruction. Check how it was changed</div><div class='add'>+ * after the program load.</div><div class='add'>+ */</div><div class='add'>+static void check_simple(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn insns[] = {</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 2),</div><div class='add'>+		BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_jiffies64),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 1),</div><div class='add'>+		BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_jiffies64),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 0),</div><div class='add'>+		BPF_EXIT_INSN(),</div><div class='add'>+	};</div><div class='add'>+	__u32 map_in[] = {0, 1, 2, 3, 4, 5};</div><div class='add'>+	__u32 map_out[] = {0, 1, 4, 5, 8, 9};</div><div class='add'>+</div><div class='add'>+	__check_success(insns, ARRAY_SIZE(insns), map_in, map_out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Verifier can delete code in two cases: nops &amp; dead code. From insn</div><div class='add'>+ * array's point of view, the two cases are the same, so test using</div><div class='add'>+ * the simplest method: by loading some nops</div><div class='add'>+ */</div><div class='add'>+static void check_deletions(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn insns[] = {</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 2),</div><div class='add'>+		BPF_JMP_IMM(BPF_JA, 0, 0, 0), /* nop */</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 1),</div><div class='add'>+		BPF_JMP_IMM(BPF_JA, 0, 0, 0), /* nop */</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 0),</div><div class='add'>+		BPF_EXIT_INSN(),</div><div class='add'>+	};</div><div class='add'>+	__u32 map_in[] = {0, 1, 2, 3, 4, 5};</div><div class='add'>+	__u32 map_out[] = {0, -1, 1, -1, 2, 3};</div><div class='add'>+</div><div class='add'>+	__check_success(insns, ARRAY_SIZE(insns), map_in, map_out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Same test as check_deletions, but also add code which adds instructions</div><div class='add'>+ */</div><div class='add'>+static void check_deletions_with_functions(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn insns[] = {</div><div class='add'>+		BPF_JMP_IMM(BPF_JA, 0, 0, 0), /* nop */</div><div class='add'>+		BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_jiffies64),</div><div class='add'>+		BPF_JMP_IMM(BPF_JA, 0, 0, 0), /* nop */</div><div class='add'>+		BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 1, 0, 2),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 1),</div><div class='add'>+		BPF_EXIT_INSN(),</div><div class='add'>+		BPF_JMP_IMM(BPF_JA, 0, 0, 0), /* nop */</div><div class='add'>+		BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_jiffies64),</div><div class='add'>+		BPF_JMP_IMM(BPF_JA, 0, 0, 0), /* nop */</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 2),</div><div class='add'>+		BPF_EXIT_INSN(),</div><div class='add'>+	};</div><div class='add'>+	__u32 map_in[] =  { 0, 1,  2, 3, 4, 5, /* func */  6, 7,  8, 9, 10};</div><div class='add'>+	__u32 map_out[] = {-1, 0, -1, 3, 4, 5, /* func */ -1, 6, -1, 9, 10};</div><div class='add'>+</div><div class='add'>+	__check_success(insns, ARRAY_SIZE(insns), map_in, map_out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Try to load a program with a map which points to outside of the program</div><div class='add'>+ */</div><div class='add'>+static void check_out_of_bounds_index(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn insns[] = {</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 4),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 3),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 2),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 1),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 0),</div><div class='add'>+		BPF_EXIT_INSN(),</div><div class='add'>+	};</div><div class='add'>+	int prog_fd, map_fd;</div><div class='add'>+	struct bpf_insn_array_value val = {};</div><div class='add'>+	int key;</div><div class='add'>+</div><div class='add'>+	map_fd = map_create(BPF_MAP_TYPE_INSN_ARRAY, 1);</div><div class='add'>+	if (!ASSERT_GE(map_fd, 0, "map_create"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	key = 0;</div><div class='add'>+	val.orig_off = ARRAY_SIZE(insns); /* too big */</div><div class='add'>+	if (!ASSERT_EQ(bpf_map_update_elem(map_fd, &amp;key, &amp;val, 0), 0, "bpf_map_update_elem"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(bpf_map_freeze(map_fd), 0, "bpf_map_freeze"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	prog_fd = prog_load(insns, ARRAY_SIZE(insns), &amp;map_fd, 1);</div><div class='add'>+	if (!ASSERT_EQ(prog_fd, -EINVAL, "program should have been rejected (prog_fd != -EINVAL)")) {</div><div class='add'>+		close(prog_fd);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	close(map_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Try to load a program with a map which points to the middle of 16-bit insn</div><div class='add'>+ */</div><div class='add'>+static void check_mid_insn_index(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn insns[] = {</div><div class='add'>+		BPF_LD_IMM64(BPF_REG_0, 0), /* 2 x 8 */</div><div class='add'>+		BPF_EXIT_INSN(),</div><div class='add'>+	};</div><div class='add'>+	int prog_fd, map_fd;</div><div class='add'>+	struct bpf_insn_array_value val = {};</div><div class='add'>+	int key;</div><div class='add'>+</div><div class='add'>+	map_fd = map_create(BPF_MAP_TYPE_INSN_ARRAY, 1);</div><div class='add'>+	if (!ASSERT_GE(map_fd, 0, "map_create"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	key = 0;</div><div class='add'>+	val.orig_off = 1; /* middle of 16-byte instruction */</div><div class='add'>+	if (!ASSERT_EQ(bpf_map_update_elem(map_fd, &amp;key, &amp;val, 0), 0, "bpf_map_update_elem"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(bpf_map_freeze(map_fd), 0, "bpf_map_freeze"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	prog_fd = prog_load(insns, ARRAY_SIZE(insns), &amp;map_fd, 1);</div><div class='add'>+	if (!ASSERT_EQ(prog_fd, -EINVAL, "program should have been rejected (prog_fd != -EINVAL)")) {</div><div class='add'>+		close(prog_fd);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	close(map_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_incorrect_index(void)</div><div class='add'>+{</div><div class='add'>+	check_out_of_bounds_index();</div><div class='add'>+	check_mid_insn_index();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_bpf_jit_harden(char *level)</div><div class='add'>+{</div><div class='add'>+	char old_level;</div><div class='add'>+	int err = -1;</div><div class='add'>+	int fd = -1;</div><div class='add'>+</div><div class='add'>+	fd = open("/proc/sys/net/core/bpf_jit_harden", O_RDWR | O_NONBLOCK);</div><div class='add'>+	if (fd &lt; 0) {</div><div class='add'>+		ASSERT_FAIL("open .../bpf_jit_harden returned %d (errno=%d)", fd, errno);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = read(fd, &amp;old_level, 1);</div><div class='add'>+	if (err != 1) {</div><div class='add'>+		ASSERT_FAIL("read from .../bpf_jit_harden returned %d (errno=%d)", err, errno);</div><div class='add'>+		err = -1;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lseek(fd, 0, SEEK_SET);</div><div class='add'>+</div><div class='add'>+	err = write(fd, level, 1);</div><div class='add'>+	if (err != 1) {</div><div class='add'>+		ASSERT_FAIL("write to .../bpf_jit_harden returned %d (errno=%d)", err, errno);</div><div class='add'>+		err = -1;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	*level = old_level;</div><div class='add'>+end:</div><div class='add'>+	if (fd &gt;= 0)</div><div class='add'>+		close(fd);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_blindness(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn insns[] = {</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 4),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 3),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 2),</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 1),</div><div class='add'>+		BPF_EXIT_INSN(),</div><div class='add'>+	};</div><div class='add'>+	int prog_fd = -1, map_fd;</div><div class='add'>+	struct bpf_insn_array_value val = {};</div><div class='add'>+	char bpf_jit_harden = '@'; /* non-exizsting value */</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	map_fd = map_create(BPF_MAP_TYPE_INSN_ARRAY, ARRAY_SIZE(insns));</div><div class='add'>+	if (!ASSERT_GE(map_fd, 0, "map_create"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(insns); i++) {</div><div class='add'>+		val.orig_off = i;</div><div class='add'>+		if (!ASSERT_EQ(bpf_map_update_elem(map_fd, &amp;i, &amp;val, 0), 0, "bpf_map_update_elem"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(bpf_map_freeze(map_fd), 0, "bpf_map_freeze"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	bpf_jit_harden = '2';</div><div class='add'>+	if (set_bpf_jit_harden(&amp;bpf_jit_harden)) {</div><div class='add'>+		bpf_jit_harden = '@'; /* open, read or write failed =&gt; no write was done */</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prog_fd = prog_load(insns, ARRAY_SIZE(insns), &amp;map_fd, 1);</div><div class='add'>+	if (!ASSERT_GE(prog_fd, 0, "bpf(BPF_PROG_LOAD)"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(insns); i++) {</div><div class='add'>+		char fmt[32];</div><div class='add'>+</div><div class='add'>+		if (!ASSERT_EQ(bpf_map_lookup_elem(map_fd, &amp;i, &amp;val), 0, "bpf_map_lookup_elem"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+</div><div class='add'>+		snprintf(fmt, sizeof(fmt), "val should be equal 3*%d", i);</div><div class='add'>+		ASSERT_EQ(val.xlated_off, i * 3, fmt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	/* restore the old one */</div><div class='add'>+	if (bpf_jit_harden != '@')</div><div class='add'>+		set_bpf_jit_harden(&amp;bpf_jit_harden);</div><div class='add'>+</div><div class='add'>+	close(prog_fd);</div><div class='add'>+	close(map_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Once map was initialized, it should be frozen */</div><div class='add'>+static void check_load_unfrozen_map(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn insns[] = {</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 0),</div><div class='add'>+		BPF_EXIT_INSN(),</div><div class='add'>+	};</div><div class='add'>+	int prog_fd = -1, map_fd;</div><div class='add'>+	struct bpf_insn_array_value val = {};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	map_fd = map_create(BPF_MAP_TYPE_INSN_ARRAY, ARRAY_SIZE(insns));</div><div class='add'>+	if (!ASSERT_GE(map_fd, 0, "map_create"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(insns); i++) {</div><div class='add'>+		val.orig_off = i;</div><div class='add'>+		if (!ASSERT_EQ(bpf_map_update_elem(map_fd, &amp;i, &amp;val, 0), 0, "bpf_map_update_elem"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prog_fd = prog_load(insns, ARRAY_SIZE(insns), &amp;map_fd, 1);</div><div class='add'>+	if (!ASSERT_EQ(prog_fd, -EINVAL, "program should have been rejected (prog_fd != -EINVAL)"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/* correctness: now freeze the map, the program should load fine */</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(bpf_map_freeze(map_fd), 0, "bpf_map_freeze"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	prog_fd = prog_load(insns, ARRAY_SIZE(insns), &amp;map_fd, 1);</div><div class='add'>+	if (!ASSERT_GE(prog_fd, 0, "bpf(BPF_PROG_LOAD)"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(insns); i++) {</div><div class='add'>+		if (!ASSERT_EQ(bpf_map_lookup_elem(map_fd, &amp;i, &amp;val), 0, "bpf_map_lookup_elem"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(val.xlated_off, i, "val should be equal i");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	close(prog_fd);</div><div class='add'>+	close(map_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Map can be used only by one BPF program */</div><div class='add'>+static void check_no_map_reuse(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn insns[] = {</div><div class='add'>+		BPF_MOV64_IMM(BPF_REG_0, 0),</div><div class='add'>+		BPF_EXIT_INSN(),</div><div class='add'>+	};</div><div class='add'>+	int prog_fd = -1, map_fd, extra_fd = -1;</div><div class='add'>+	struct bpf_insn_array_value val = {};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	map_fd = map_create(BPF_MAP_TYPE_INSN_ARRAY, ARRAY_SIZE(insns));</div><div class='add'>+	if (!ASSERT_GE(map_fd, 0, "map_create"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(insns); i++) {</div><div class='add'>+		val.orig_off = i;</div><div class='add'>+		if (!ASSERT_EQ(bpf_map_update_elem(map_fd, &amp;i, &amp;val, 0), 0, "bpf_map_update_elem"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(bpf_map_freeze(map_fd), 0, "bpf_map_freeze"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	prog_fd = prog_load(insns, ARRAY_SIZE(insns), &amp;map_fd, 1);</div><div class='add'>+	if (!ASSERT_GE(prog_fd, 0, "bpf(BPF_PROG_LOAD)"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(insns); i++) {</div><div class='add'>+		if (!ASSERT_EQ(bpf_map_lookup_elem(map_fd, &amp;i, &amp;val), 0, "bpf_map_lookup_elem"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(val.xlated_off, i, "val should be equal i");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	extra_fd = prog_load(insns, ARRAY_SIZE(insns), &amp;map_fd, 1);</div><div class='add'>+	if (!ASSERT_EQ(extra_fd, -EBUSY, "program should have been rejected (extra_fd != -EBUSY)"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/* correctness: check that prog is still loadable without fd_array */</div><div class='add'>+	extra_fd = prog_load(insns, ARRAY_SIZE(insns), NULL, 0);</div><div class='add'>+	if (!ASSERT_GE(extra_fd, 0, "bpf(BPF_PROG_LOAD): expected no error"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	close(extra_fd);</div><div class='add'>+	close(prog_fd);</div><div class='add'>+	close(map_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_bpf_no_lookup(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn insns[] = {</div><div class='add'>+		BPF_LD_MAP_FD(BPF_REG_1, 0),</div><div class='add'>+		BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),</div><div class='add'>+		BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),</div><div class='add'>+		BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),</div><div class='add'>+		BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),</div><div class='add'>+		BPF_EXIT_INSN(),</div><div class='add'>+	};</div><div class='add'>+	int prog_fd = -1, map_fd;</div><div class='add'>+</div><div class='add'>+	map_fd = map_create(BPF_MAP_TYPE_INSN_ARRAY, 1);</div><div class='add'>+	if (!ASSERT_GE(map_fd, 0, "map_create"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	insns[0].imm = map_fd;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(bpf_map_freeze(map_fd), 0, "bpf_map_freeze"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	prog_fd = prog_load(insns, ARRAY_SIZE(insns), NULL, 0);</div><div class='add'>+	if (!ASSERT_EQ(prog_fd, -EINVAL, "program should have been rejected (prog_fd != -EINVAL)"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/* correctness: check that prog is still loadable with normal map */</div><div class='add'>+	close(map_fd);</div><div class='add'>+	map_fd = map_create(BPF_MAP_TYPE_ARRAY, 1);</div><div class='add'>+	insns[0].imm = map_fd;</div><div class='add'>+	prog_fd = prog_load(insns, ARRAY_SIZE(insns), NULL, 0);</div><div class='add'>+	if (!ASSERT_GE(prog_fd, 0, "bpf(BPF_PROG_LOAD)"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	close(prog_fd);</div><div class='add'>+	close(map_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_bpf_side(void)</div><div class='add'>+{</div><div class='add'>+	check_bpf_no_lookup();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __test_bpf_insn_array(void)</div><div class='add'>+{</div><div class='add'>+	/* Test if offsets are adjusted properly */</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("one2one"))</div><div class='add'>+		check_one_to_one_mapping();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("simple"))</div><div class='add'>+		check_simple();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("deletions"))</div><div class='add'>+		check_deletions();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("deletions-with-functions"))</div><div class='add'>+		check_deletions_with_functions();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("blindness"))</div><div class='add'>+		check_blindness();</div><div class='add'>+</div><div class='add'>+	/* Check all kinds of operations and related restrictions */</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("incorrect-index"))</div><div class='add'>+		check_incorrect_index();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("load-unfrozen-map"))</div><div class='add'>+		check_load_unfrozen_map();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("no-map-reuse"))</div><div class='add'>+		check_no_map_reuse();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("bpf-side-ops"))</div><div class='add'>+		check_bpf_side();</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void __test_bpf_insn_array(void)</div><div class='add'>+{</div><div class='add'>+	test__skip();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void test_bpf_insn_array(void)</div><div class='add'>+{</div><div class='add'>+	__test_bpf_insn_array();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c<br/>index 6f1bfacd7375..5225d69bf79b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bpf_iter.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bpf_iter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bpf_iter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/bpf_iter.c</a></div><div class='hunk'>@@ -323,19 +323,87 @@ static void test_task_pidfd(void)</div><div class='ctx'> static void test_task_sleepable(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_iter_tasks *skel;</div><div class='add'>+	int pid, status, err, data_pipe[2], finish_pipe[2], c = 0;</div><div class='add'>+	char *test_data = NULL;</div><div class='add'>+	char *test_data_long = NULL;</div><div class='add'>+	char *data[2];</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(pipe(data_pipe), "data_pipe") ||</div><div class='add'>+	    !ASSERT_OK(pipe(finish_pipe), "finish_pipe"))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	skel = bpf_iter_tasks__open_and_load();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "bpf_iter_tasks__open_and_load"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	pid = fork();</div><div class='add'>+	if (!ASSERT_GE(pid, 0, "fork"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pid == 0) {</div><div class='add'>+		/* child */</div><div class='add'>+		close(data_pipe[0]);</div><div class='add'>+		close(finish_pipe[1]);</div><div class='add'>+</div><div class='add'>+		test_data = malloc(sizeof(char) * 10);</div><div class='add'>+		strncpy(test_data, "test_data", 10);</div><div class='add'>+		test_data[9] = '\0';</div><div class='add'>+</div><div class='add'>+		test_data_long = malloc(sizeof(char) * 5000);</div><div class='add'>+		for (int i = 0; i &lt; 5000; ++i) {</div><div class='add'>+			if (i % 2 == 0)</div><div class='add'>+				test_data_long[i] = 'b';</div><div class='add'>+			else</div><div class='add'>+				test_data_long[i] = 'a';</div><div class='add'>+		}</div><div class='add'>+		test_data_long[4999] = '\0';</div><div class='add'>+</div><div class='add'>+		data[0] = test_data;</div><div class='add'>+		data[1] = test_data_long;</div><div class='add'>+</div><div class='add'>+		write(data_pipe[1], &amp;data, sizeof(data));</div><div class='add'>+</div><div class='add'>+		/* keep child alive until after the test */</div><div class='add'>+		err = read(finish_pipe[0], &amp;c, 1);</div><div class='add'>+		if (err != 1)</div><div class='add'>+			exit(-1);</div><div class='add'>+</div><div class='add'>+		close(data_pipe[1]);</div><div class='add'>+		close(finish_pipe[0]);</div><div class='add'>+		_exit(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* parent */</div><div class='add'>+	close(data_pipe[1]);</div><div class='add'>+	close(finish_pipe[0]);</div><div class='add'>+</div><div class='add'>+	err = read(data_pipe[0], &amp;data, sizeof(data));</div><div class='add'>+	ASSERT_EQ(err, sizeof(data), "read_check");</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;user_ptr = data[0];</div><div class='add'>+	skel-&gt;bss-&gt;user_ptr_long = data[1];</div><div class='add'>+	skel-&gt;bss-&gt;pid = pid;</div><div class='add'>+</div><div class='ctx'> 	do_dummy_read(skel-&gt;progs.dump_task_sleepable);</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_GT(skel-&gt;bss-&gt;num_expected_failure_copy_from_user_task, 0,</div><div class='ctx'> 		  "num_expected_failure_copy_from_user_task");</div><div class='ctx'> 	ASSERT_GT(skel-&gt;bss-&gt;num_success_copy_from_user_task, 0,</div><div class='ctx'> 		  "num_success_copy_from_user_task");</div><div class='add'>+	ASSERT_GT(skel-&gt;bss-&gt;num_expected_failure_copy_from_user_task_str, 0,</div><div class='add'>+		  "num_expected_failure_copy_from_user_task_str");</div><div class='add'>+	ASSERT_GT(skel-&gt;bss-&gt;num_success_copy_from_user_task_str, 0,</div><div class='add'>+		  "num_success_copy_from_user_task_str");</div><div class='ctx'> </div><div class='ctx'> 	bpf_iter_tasks__destroy(skel);</div><div class='add'>+</div><div class='add'>+	write(finish_pipe[1], &amp;c, 1);</div><div class='add'>+	err = waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_EQ(err, pid, "waitpid");</div><div class='add'>+	ASSERT_EQ(status, 0, "zero_child_exit");</div><div class='add'>+</div><div class='add'>+	close(data_pipe[0]);</div><div class='add'>+	close(finish_pipe[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void test_task_stack(void)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c b/tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c<br/>index fe2c502e5089..ecc3d47919ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@ static int test_setup_uffd(void *fault_addr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	uffd_register.range.start = (unsigned long)fault_addr;</div><div class='del'>-	uffd_register.range.len = 4096;</div><div class='add'>+	uffd_register.range.len = getpagesize();</div><div class='ctx'> 	uffd_register.mode = UFFDIO_REGISTER_MODE_MISSING;</div><div class='ctx'> 	if (ioctl(uffd, UFFDIO_REGISTER, &amp;uffd_register)) {</div><div class='ctx'> 		close(uffd);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_nf.c b/tools/testing/selftests/bpf/prog_tests/bpf_nf.c<br/>index a4a1f93878d4..dd6512fa652b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bpf_nf.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/bpf_nf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bpf_nf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/bpf_nf.c</a></div><div class='hunk'>@@ -63,6 +63,12 @@ static void test_bpf_nf_ct(int mode)</div><div class='ctx'> 		.repeat = 1,</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='add'>+	if (SYS_NOFAIL("iptables-legacy --version")) {</div><div class='add'>+		fprintf(stdout, "Missing required iptables-legacy tool\n");</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	skel = test_bpf_nf__open_and_load();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "test_bpf_nf__open_and_load"))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -72,11 +78,14 @@ static void test_bpf_nf_ct(int mode)</div><div class='ctx'> 	if (!ASSERT_OK(system(cmd), cmd))</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='del'>-	srv_port = (mode == TEST_XDP) ? 5005 : 5006;</div><div class='del'>-	srv_fd = start_server(AF_INET, SOCK_STREAM, "127.0.0.1", srv_port, TIMEOUT_MS);</div><div class='add'>+	srv_fd = start_server(AF_INET, SOCK_STREAM, "127.0.0.1", 0, TIMEOUT_MS);</div><div class='ctx'> 	if (!ASSERT_GE(srv_fd, 0, "start_server"))</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='add'>+	srv_port = get_socket_local_port(srv_fd);</div><div class='add'>+	if (!ASSERT_GE(srv_port, 0, "get_sock_local_port"))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='ctx'> 	client_fd = connect_to_server(srv_fd);</div><div class='ctx'> 	if (!ASSERT_GE(client_fd, 0, "connect_to_server"))</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -91,7 +100,7 @@ static void test_bpf_nf_ct(int mode)</div><div class='ctx'> 	skel-&gt;bss-&gt;saddr = peer_addr.sin_addr.s_addr;</div><div class='ctx'> 	skel-&gt;bss-&gt;sport = peer_addr.sin_port;</div><div class='ctx'> 	skel-&gt;bss-&gt;daddr = peer_addr.sin_addr.s_addr;</div><div class='del'>-	skel-&gt;bss-&gt;dport = htons(srv_port);</div><div class='add'>+	skel-&gt;bss-&gt;dport = srv_port;</div><div class='ctx'> </div><div class='ctx'> 	if (mode == TEST_XDP)</div><div class='ctx'> 		prog_fd = bpf_program__fd(skel-&gt;progs.nf_xdp_ct_test);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c b/tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c<br/>new file mode 100644<br/>index 000000000000..730357cd0c9a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c</a></div><div class='hunk'>@@ -0,0 +1,231 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pkt_sched.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "network_helpers.h"</div><div class='add'>+#include "bpf_qdisc_fifo.skel.h"</div><div class='add'>+#include "bpf_qdisc_fq.skel.h"</div><div class='add'>+#include "bpf_qdisc_fail__incompl_ops.skel.h"</div><div class='add'>+</div><div class='add'>+#define LO_IFINDEX 1</div><div class='add'>+</div><div class='add'>+static const unsigned int total_bytes = 10 * 1024 * 1024;</div><div class='add'>+</div><div class='add'>+static void do_test(char *qdisc)</div><div class='add'>+{</div><div class='add'>+	DECLARE_LIBBPF_OPTS(bpf_tc_hook, hook, .ifindex = LO_IFINDEX,</div><div class='add'>+			    .attach_point = BPF_TC_QDISC,</div><div class='add'>+			    .parent = TC_H_ROOT,</div><div class='add'>+			    .handle = 0x8000000,</div><div class='add'>+			    .qdisc = qdisc);</div><div class='add'>+	int srv_fd = -1, cli_fd = -1;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bpf_tc_hook_create(&amp;hook);</div><div class='add'>+	if (!ASSERT_OK(err, "attach qdisc"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	srv_fd = start_server(AF_INET6, SOCK_STREAM, NULL, 0, 0);</div><div class='add'>+	if (!ASSERT_OK_FD(srv_fd, "start server"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	cli_fd = connect_to_fd(srv_fd, 0);</div><div class='add'>+	if (!ASSERT_OK_FD(cli_fd, "connect to client"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	err = send_recv_data(srv_fd, cli_fd, total_bytes);</div><div class='add'>+	ASSERT_OK(err, "send_recv_data");</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	if (srv_fd != -1)</div><div class='add'>+		close(srv_fd);</div><div class='add'>+	if (cli_fd != -1)</div><div class='add'>+		close(cli_fd);</div><div class='add'>+</div><div class='add'>+	bpf_tc_hook_destroy(&amp;hook);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_fifo(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_qdisc_fifo *fifo_skel;</div><div class='add'>+</div><div class='add'>+	fifo_skel = bpf_qdisc_fifo__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(fifo_skel, "bpf_qdisc_fifo__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(bpf_qdisc_fifo__attach(fifo_skel), "bpf_qdisc_fifo__attach"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	do_test("bpf_fifo");</div><div class='add'>+out:</div><div class='add'>+	bpf_qdisc_fifo__destroy(fifo_skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_fq(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_qdisc_fq *fq_skel;</div><div class='add'>+</div><div class='add'>+	fq_skel = bpf_qdisc_fq__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(fq_skel, "bpf_qdisc_fq__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(bpf_qdisc_fq__attach(fq_skel), "bpf_qdisc_fq__attach"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	do_test("bpf_fq");</div><div class='add'>+out:</div><div class='add'>+	bpf_qdisc_fq__destroy(fq_skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_qdisc_attach_to_mq(void)</div><div class='add'>+{</div><div class='add'>+	DECLARE_LIBBPF_OPTS(bpf_tc_hook, hook,</div><div class='add'>+			    .attach_point = BPF_TC_QDISC,</div><div class='add'>+			    .parent = TC_H_MAKE(1 &lt;&lt; 16, 1),</div><div class='add'>+			    .handle = 0x11 &lt;&lt; 16,</div><div class='add'>+			    .qdisc = "bpf_fifo");</div><div class='add'>+	struct bpf_qdisc_fifo *fifo_skel;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	fifo_skel = bpf_qdisc_fifo__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(fifo_skel, "bpf_qdisc_fifo__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(bpf_qdisc_fifo__attach(fifo_skel), "bpf_qdisc_fifo__attach"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	SYS(out, "ip link add veth0 type veth peer veth1");</div><div class='add'>+	hook.ifindex = if_nametoindex("veth0");</div><div class='add'>+	SYS(out, "tc qdisc add dev veth0 root handle 1: mq");</div><div class='add'>+</div><div class='add'>+	err = bpf_tc_hook_create(&amp;hook);</div><div class='add'>+	ASSERT_OK(err, "attach qdisc");</div><div class='add'>+</div><div class='add'>+	bpf_tc_hook_destroy(&amp;hook);</div><div class='add'>+</div><div class='add'>+	SYS(out, "tc qdisc delete dev veth0 root mq");</div><div class='add'>+out:</div><div class='add'>+	bpf_qdisc_fifo__destroy(fifo_skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_qdisc_attach_to_non_root(void)</div><div class='add'>+{</div><div class='add'>+	DECLARE_LIBBPF_OPTS(bpf_tc_hook, hook, .ifindex = LO_IFINDEX,</div><div class='add'>+			    .attach_point = BPF_TC_QDISC,</div><div class='add'>+			    .parent = TC_H_MAKE(1 &lt;&lt; 16, 1),</div><div class='add'>+			    .handle = 0x11 &lt;&lt; 16,</div><div class='add'>+			    .qdisc = "bpf_fifo");</div><div class='add'>+	struct bpf_qdisc_fifo *fifo_skel;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	fifo_skel = bpf_qdisc_fifo__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(fifo_skel, "bpf_qdisc_fifo__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(bpf_qdisc_fifo__attach(fifo_skel), "bpf_qdisc_fifo__attach"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	SYS(out, "tc qdisc add dev lo root handle 1: htb");</div><div class='add'>+	SYS(out_del_htb, "tc class add dev lo parent 1: classid 1:1 htb rate 75Kbit");</div><div class='add'>+</div><div class='add'>+	err = bpf_tc_hook_create(&amp;hook);</div><div class='add'>+	if (!ASSERT_ERR(err, "attach qdisc"))</div><div class='add'>+		bpf_tc_hook_destroy(&amp;hook);</div><div class='add'>+</div><div class='add'>+out_del_htb:</div><div class='add'>+	SYS(out, "tc qdisc delete dev lo root htb");</div><div class='add'>+out:</div><div class='add'>+	bpf_qdisc_fifo__destroy(fifo_skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_incompl_ops(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_qdisc_fail__incompl_ops *skel;</div><div class='add'>+	struct bpf_link *link;</div><div class='add'>+</div><div class='add'>+	skel = bpf_qdisc_fail__incompl_ops__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "bpf_qdisc_fifo__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link = bpf_map__attach_struct_ops(skel-&gt;maps.test);</div><div class='add'>+	if (!ASSERT_ERR_PTR(link, "bpf_map__attach_struct_ops"))</div><div class='add'>+		bpf_link__destroy(link);</div><div class='add'>+</div><div class='add'>+	bpf_qdisc_fail__incompl_ops__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_default_qdisc(char *qdisc_name)</div><div class='add'>+{</div><div class='add'>+	FILE *f;</div><div class='add'>+	int num;</div><div class='add'>+</div><div class='add'>+	f = fopen("/proc/sys/net/core/default_qdisc", "r");</div><div class='add'>+	if (!f)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	num = fscanf(f, "%s", qdisc_name);</div><div class='add'>+	fclose(f);</div><div class='add'>+</div><div class='add'>+	return num == 1 ? 0 : -EFAULT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_default_qdisc_attach_to_mq(void)</div><div class='add'>+{</div><div class='add'>+	char default_qdisc[IFNAMSIZ] = {};</div><div class='add'>+	struct bpf_qdisc_fifo *fifo_skel;</div><div class='add'>+	struct netns_obj *netns = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	fifo_skel = bpf_qdisc_fifo__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(fifo_skel, "bpf_qdisc_fifo__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(bpf_qdisc_fifo__attach(fifo_skel), "bpf_qdisc_fifo__attach"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = get_default_qdisc(default_qdisc);</div><div class='add'>+	if (!ASSERT_OK(err, "read sysctl net.core.default_qdisc"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = write_sysctl("/proc/sys/net/core/default_qdisc", "bpf_fifo");</div><div class='add'>+	if (!ASSERT_OK(err, "write sysctl net.core.default_qdisc"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	netns = netns_new("bpf_qdisc_ns", true);</div><div class='add'>+	if (!ASSERT_OK_PTR(netns, "netns_new"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	SYS(out, "ip link add veth0 type veth peer veth1");</div><div class='add'>+	SYS(out, "tc qdisc add dev veth0 root handle 1: mq");</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(fifo_skel-&gt;bss-&gt;init_called, true, "init_called");</div><div class='add'>+</div><div class='add'>+	SYS(out, "tc qdisc delete dev veth0 root mq");</div><div class='add'>+out:</div><div class='add'>+	netns_free(netns);</div><div class='add'>+	if (default_qdisc[0])</div><div class='add'>+		write_sysctl("/proc/sys/net/core/default_qdisc", default_qdisc);</div><div class='add'>+</div><div class='add'>+	bpf_qdisc_fifo__destroy(fifo_skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_ns_bpf_qdisc(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("fifo"))</div><div class='add'>+		test_fifo();</div><div class='add'>+	if (test__start_subtest("fq"))</div><div class='add'>+		test_fq();</div><div class='add'>+	if (test__start_subtest("attach to mq"))</div><div class='add'>+		test_qdisc_attach_to_mq();</div><div class='add'>+	if (test__start_subtest("attach to non root"))</div><div class='add'>+		test_qdisc_attach_to_non_root();</div><div class='add'>+	if (test__start_subtest("incompl_ops"))</div><div class='add'>+		test_incompl_ops();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void serial_test_bpf_qdisc_default(void)</div><div class='add'>+{</div><div class='add'>+	test_default_qdisc_attach_to_mq();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c<br/>index e63d74ce046f..054ecb6b1e9f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/btf.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/btf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/btf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/btf.c</a></div><div class='hunk'>@@ -3866,11 +3866,11 @@ static struct btf_raw_test raw_tests[] = {</div><div class='ctx'> 	.err_str = "vlen != 0",</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='del'>-	.descr = "decl_tag test #8, invalid kflag",</div><div class='add'>+	.descr = "decl_tag test #8, tag with kflag",</div><div class='ctx'> 	.raw_types = {</div><div class='ctx'> 		BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),	/* [1] */</div><div class='ctx'> 		BTF_VAR_ENC(NAME_TBD, 1, 0),			/* [2] */</div><div class='del'>-		BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_DECL_TAG, 1, 0), 2), (-1),</div><div class='add'>+		BTF_DECL_ATTR_ENC(NAME_TBD, 2, -1),</div><div class='ctx'> 		BTF_END_RAW,</div><div class='ctx'> 	},</div><div class='ctx'> 	BTF_STR_SEC("\0local\0tag1"),</div><div class='hunk'>@@ -3881,8 +3881,6 @@ static struct btf_raw_test raw_tests[] = {</div><div class='ctx'> 	.key_type_id = 1,</div><div class='ctx'> 	.value_type_id = 1,</div><div class='ctx'> 	.max_entries = 1,</div><div class='del'>-	.btf_load_err = true,</div><div class='del'>-	.err_str = "Invalid btf_info kind_flag",</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.descr = "decl_tag test #9, var, invalid component_idx",</div><div class='hunk'>@@ -4207,6 +4205,23 @@ static struct btf_raw_test raw_tests[] = {</div><div class='ctx'> 	.err_str = "Type tags don't precede modifiers",</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='add'>+	.descr = "type_tag test #7, tag with kflag",</div><div class='add'>+	.raw_types = {</div><div class='add'>+		BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),	/* [1] */</div><div class='add'>+		BTF_TYPE_ATTR_ENC(NAME_TBD, 1),			/* [2] */</div><div class='add'>+		BTF_PTR_ENC(2),					/* [3] */</div><div class='add'>+		BTF_END_RAW,</div><div class='add'>+	},</div><div class='add'>+	BTF_STR_SEC("\0tag"),</div><div class='add'>+	.map_type = BPF_MAP_TYPE_ARRAY,</div><div class='add'>+	.map_name = "tag_type_check_btf",</div><div class='add'>+	.key_size = sizeof(int),</div><div class='add'>+	.value_size = 4,</div><div class='add'>+	.key_type_id = 1,</div><div class='add'>+	.value_type_id = 1,</div><div class='add'>+	.max_entries = 1,</div><div class='add'>+},</div><div class='add'>+{</div><div class='ctx'> 	.descr = "enum64 test #1, unsigned, size 8",</div><div class='ctx'> 	.raw_types = {</div><div class='ctx'> 		BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),			/* [1] */</div><div class='hunk'>@@ -7481,6 +7496,71 @@ static struct btf_dedup_test dedup_tests[] = {</div><div class='ctx'> 	},</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='add'>+	.descr = "dedup: recursive typedef",</div><div class='add'>+	/*</div><div class='add'>+	 * This test simulates a recursive typedef, which in GO is defined as such:</div><div class='add'>+	 *</div><div class='add'>+	 *   type Foo func() Foo</div><div class='add'>+	 *</div><div class='add'>+	 * In BTF terms, this is represented as a TYPEDEF referencing</div><div class='add'>+	 * a FUNC_PROTO that returns the same TYPEDEF.</div><div class='add'>+	 */</div><div class='add'>+	.input = {</div><div class='add'>+		.raw_types = {</div><div class='add'>+			/*</div><div class='add'>+			 * [1] typedef Foo -&gt; func() Foo</div><div class='add'>+			 * [2] func_proto() -&gt; Foo</div><div class='add'>+			 * [3] typedef Foo -&gt; func() Foo</div><div class='add'>+			 * [4] func_proto() -&gt; Foo</div><div class='add'>+			 */</div><div class='add'>+			BTF_TYPEDEF_ENC(NAME_NTH(1), 2),	/* [1] */</div><div class='add'>+			BTF_FUNC_PROTO_ENC(1, 0),		/* [2] */</div><div class='add'>+			BTF_TYPEDEF_ENC(NAME_NTH(1), 4),	/* [3] */</div><div class='add'>+			BTF_FUNC_PROTO_ENC(3, 0),		/* [4] */</div><div class='add'>+			BTF_END_RAW,</div><div class='add'>+		},</div><div class='add'>+		BTF_STR_SEC("\0Foo"),</div><div class='add'>+	},</div><div class='add'>+	.expect = {</div><div class='add'>+		.raw_types = {</div><div class='add'>+			BTF_TYPEDEF_ENC(NAME_NTH(1), 2),	/* [1] */</div><div class='add'>+			BTF_FUNC_PROTO_ENC(1, 0),		/* [2] */</div><div class='add'>+			BTF_END_RAW,</div><div class='add'>+		},</div><div class='add'>+		BTF_STR_SEC("\0Foo"),</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+{</div><div class='add'>+	.descr = "dedup: typedef",</div><div class='add'>+    /*</div><div class='add'>+     * // CU 1:</div><div class='add'>+     * typedef int foo;</div><div class='add'>+     *</div><div class='add'>+     * // CU 2:</div><div class='add'>+     * typedef int foo;</div><div class='add'>+     */</div><div class='add'>+	.input = {</div><div class='add'>+		.raw_types = {</div><div class='add'>+			/* CU 1 */</div><div class='add'>+			BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),	/* [1] */</div><div class='add'>+			BTF_TYPEDEF_ENC(NAME_NTH(1), 1),		/* [2] */</div><div class='add'>+			/* CU 2 */</div><div class='add'>+			BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),	/* [3] */</div><div class='add'>+			BTF_TYPEDEF_ENC(NAME_NTH(1), 3),		/* [4] */</div><div class='add'>+			BTF_END_RAW,</div><div class='add'>+		},</div><div class='add'>+		BTF_STR_SEC("\0foo"),</div><div class='add'>+	},</div><div class='add'>+	.expect = {</div><div class='add'>+		.raw_types = {</div><div class='add'>+			BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),	/* [1] */</div><div class='add'>+			BTF_TYPEDEF_ENC(NAME_NTH(1), 1),		/* [2] */</div><div class='add'>+			BTF_END_RAW,</div><div class='add'>+		},</div><div class='add'>+		BTF_STR_SEC("\0foo"),</div><div class='add'>+	},</div><div class='add'>+},</div><div class='add'>+{</div><div class='ctx'> 	.descr = "dedup: typedef tags",</div><div class='ctx'> 	.input = {</div><div class='ctx'> 		.raw_types = {</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/btf_dedup_split.c b/tools/testing/selftests/bpf/prog_tests/btf_dedup_split.c<br/>index d9024c7a892a..5bc15bb6b7ce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/btf_dedup_split.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/btf_dedup_split.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/btf_dedup_split.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/btf_dedup_split.c</a></div><div class='hunk'>@@ -440,6 +440,105 @@ cleanup:</div><div class='ctx'> 	btf__free(btf1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Ensure module split BTF dedup worked correctly; when dedup fails badly</div><div class='add'>+ * core kernel types are in split BTF also, so ensure that references to</div><div class='add'>+ * such types point at base - not split - BTF.</div><div class='add'>+ *</div><div class='add'>+ * bpf_testmod_test_write() has multiple core kernel type parameters;</div><div class='add'>+ *</div><div class='add'>+ * ssize_t</div><div class='add'>+ * bpf_testmod_test_write(struct file *file, struct kobject *kobj,</div><div class='add'>+ *                        struct bin_attribute *bin_attr,</div><div class='add'>+ *                        char *buf, loff_t off, size_t len);</div><div class='add'>+ *</div><div class='add'>+ * Ensure each of the FUNC_PROTO params is a core kernel type.</div><div class='add'>+ *</div><div class='add'>+ * Do the same for</div><div class='add'>+ *</div><div class='add'>+ * __bpf_kfunc struct sock *bpf_kfunc_call_test3(struct sock *sk);</div><div class='add'>+ *</div><div class='add'>+ * ...and</div><div class='add'>+ *</div><div class='add'>+ * __bpf_kfunc void bpf_kfunc_call_test_pass_ctx(struct __sk_buff *skb);</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+const char *mod_funcs[] = {</div><div class='add'>+	"bpf_testmod_test_write",</div><div class='add'>+	"bpf_kfunc_call_test3",</div><div class='add'>+	"bpf_kfunc_call_test_pass_ctx"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void test_split_module(void)</div><div class='add'>+{</div><div class='add'>+	struct btf *vmlinux_btf, *btf1 = NULL;</div><div class='add'>+	int i, nr_base_types;</div><div class='add'>+</div><div class='add'>+	vmlinux_btf = btf__load_vmlinux_btf();</div><div class='add'>+	if (!ASSERT_OK_PTR(vmlinux_btf, "vmlinux_btf"))</div><div class='add'>+		return;</div><div class='add'>+	nr_base_types = btf__type_cnt(vmlinux_btf);</div><div class='add'>+	if (!ASSERT_GT(nr_base_types, 0, "nr_base_types"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	btf1 = btf__parse_split("/sys/kernel/btf/bpf_testmod", vmlinux_btf);</div><div class='add'>+	if (!ASSERT_OK_PTR(btf1, "split_btf"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mod_funcs); i++) {</div><div class='add'>+		const struct btf_param *p;</div><div class='add'>+		const struct btf_type *t;</div><div class='add'>+		__u16 vlen;</div><div class='add'>+		__u32 id;</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		id = btf__find_by_name_kind(btf1, mod_funcs[i], BTF_KIND_FUNC);</div><div class='add'>+		if (!ASSERT_GE(id, nr_base_types, "func_id"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+		t = btf__type_by_id(btf1, id);</div><div class='add'>+		if (!ASSERT_OK_PTR(t, "func_id_type"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+		t = btf__type_by_id(btf1, t-&gt;type);</div><div class='add'>+		if (!ASSERT_OK_PTR(t, "func_proto_id_type"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+		if (!ASSERT_EQ(btf_is_func_proto(t), true, "is_func_proto"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+		vlen = btf_vlen(t);</div><div class='add'>+</div><div class='add'>+		for (j = 0, p = btf_params(t); j &lt; vlen; j++, p++) {</div><div class='add'>+			/* bpf_testmod uses resilient split BTF, so any</div><div class='add'>+			 * reference types will be added to split BTF and their</div><div class='add'>+			 * associated targets will be base BTF types; for example</div><div class='add'>+			 * for a "struct sock *" the PTR will be in split BTF</div><div class='add'>+			 * while the "struct sock" will be in base.</div><div class='add'>+			 *</div><div class='add'>+			 * In some cases like loff_t we have to resolve</div><div class='add'>+			 * multiple typedefs hence the while() loop below.</div><div class='add'>+			 *</div><div class='add'>+			 * Note that resilient split BTF generation depends</div><div class='add'>+			 * on pahole version, so we do not assert that</div><div class='add'>+			 * reference types are in split BTF, as if pahole</div><div class='add'>+			 * does not support resilient split BTF they will</div><div class='add'>+			 * also be base BTF types.</div><div class='add'>+			 */</div><div class='add'>+			id = p-&gt;type;</div><div class='add'>+			do {</div><div class='add'>+				t = btf__type_by_id(btf1, id);</div><div class='add'>+				if (!ASSERT_OK_PTR(t, "param_ref_type"))</div><div class='add'>+					goto cleanup;</div><div class='add'>+				if (!btf_is_mod(t) &amp;&amp; !btf_is_ptr(t) &amp;&amp; !btf_is_typedef(t))</div><div class='add'>+					break;</div><div class='add'>+				id = t-&gt;type;</div><div class='add'>+			} while (true);</div><div class='add'>+</div><div class='add'>+			if (!ASSERT_LT(id, nr_base_types, "verify_base_type"))</div><div class='add'>+				goto cleanup;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+cleanup:</div><div class='add'>+	btf__free(btf1);</div><div class='add'>+	btf__free(vmlinux_btf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_btf_dedup_split()</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("split_simple"))</div><div class='hunk'>@@ -450,4 +549,6 @@ void test_btf_dedup_split()</div><div class='ctx'> 		test_split_fwd_resolve();</div><div class='ctx'> 	if (test__start_subtest("split_dup_struct_in_cu"))</div><div class='ctx'> 		test_split_dup_struct_in_cu();</div><div class='add'>+	if (test__start_subtest("split_module"))</div><div class='add'>+		test_split_module();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/btf_dump.c b/tools/testing/selftests/bpf/prog_tests/btf_dump.c<br/>index b293b8501fd6..10cba526d3e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/btf_dump.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/btf_dump.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/btf_dump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/btf_dump.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ static int test_btf_dump_case(int n, struct btf_dump_test_case *t)</div><div class='ctx'> </div><div class='ctx'> 	/* tests with t-&gt;known_ptr_sz have no "long" or "unsigned long" type,</div><div class='ctx'> 	 * so it's impossible to determine correct pointer size; but if they</div><div class='del'>-	 * do, it should be 8 regardless of host architecture, becaues BPF</div><div class='add'>+	 * do, it should be 8 regardless of host architecture, because BPF</div><div class='ctx'> 	 * target is always 64-bit</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!t-&gt;known_ptr_sz) {</div><div class='hunk'>@@ -126,26 +126,69 @@ done:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *dump_buf;</div><div class='del'>-static size_t dump_buf_sz;</div><div class='del'>-static FILE *dump_buf_file;</div><div class='add'>+struct test_ctx {</div><div class='add'>+	struct btf *btf;</div><div class='add'>+	struct btf_dump *d;</div><div class='add'>+	char *dump_buf;</div><div class='add'>+	size_t dump_buf_sz;</div><div class='add'>+	FILE *dump_buf_file;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void test_btf_dump_incremental(void)</div><div class='add'>+static void test_ctx__free(struct test_ctx *t)</div><div class='ctx'> {</div><div class='del'>-	struct btf *btf = NULL;</div><div class='del'>-	struct btf_dump *d = NULL;</div><div class='del'>-	int id, err, i;</div><div class='add'>+	fclose(t-&gt;dump_buf_file);</div><div class='add'>+	free(t-&gt;dump_buf);</div><div class='add'>+	btf_dump__free(t-&gt;d);</div><div class='add'>+	btf__free(t-&gt;btf);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	dump_buf_file = open_memstream(&amp;dump_buf, &amp;dump_buf_sz);</div><div class='del'>-	if (!ASSERT_OK_PTR(dump_buf_file, "dump_memstream"))</div><div class='del'>-		return;</div><div class='del'>-	btf = btf__new_empty();</div><div class='del'>-	if (!ASSERT_OK_PTR(btf, "new_empty"))</div><div class='add'>+static int test_ctx__init(struct test_ctx *t)</div><div class='add'>+{</div><div class='add'>+	t-&gt;dump_buf_file = open_memstream(&amp;t-&gt;dump_buf, &amp;t-&gt;dump_buf_sz);</div><div class='add'>+	if (!ASSERT_OK_PTR(t-&gt;dump_buf_file, "dump_memstream"))</div><div class='add'>+		return -1;</div><div class='add'>+	t-&gt;btf = btf__new_empty();</div><div class='add'>+	if (!ASSERT_OK_PTR(t-&gt;btf, "new_empty"))</div><div class='ctx'> 		goto err_out;</div><div class='del'>-	d = btf_dump__new(btf, btf_dump_printf, dump_buf_file, NULL);</div><div class='del'>-	if (!ASSERT_OK(libbpf_get_error(d), "btf_dump__new"))</div><div class='add'>+	t-&gt;d = btf_dump__new(t-&gt;btf, btf_dump_printf, t-&gt;dump_buf_file, NULL);</div><div class='add'>+	if (!ASSERT_OK(libbpf_get_error(t-&gt;d), "btf_dump__new"))</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	test_ctx__free(t);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_ctx__dump_and_compare(struct test_ctx *t,</div><div class='add'>+				       const char *expected_output,</div><div class='add'>+				       const char *message)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; btf__type_cnt(t-&gt;btf); i++) {</div><div class='add'>+		err = btf_dump__dump_type(t-&gt;d, i);</div><div class='add'>+		ASSERT_OK(err, "dump_type_ok");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fflush(t-&gt;dump_buf_file);</div><div class='add'>+	t-&gt;dump_buf[t-&gt;dump_buf_sz] = 0; /* some libc implementations don't do this */</div><div class='add'>+</div><div class='add'>+	ASSERT_STREQ(t-&gt;dump_buf, expected_output, message);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_btf_dump_incremental(void)</div><div class='add'>+{</div><div class='add'>+	struct test_ctx t = {};</div><div class='add'>+	struct btf *btf;</div><div class='add'>+	int id, err;</div><div class='add'>+</div><div class='add'>+	if (test_ctx__init(&amp;t))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	btf = t.btf;</div><div class='add'>+</div><div class='ctx'> 	/* First, generate BTF corresponding to the following C code:</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * enum x;</div><div class='hunk'>@@ -182,15 +225,7 @@ static void test_btf_dump_incremental(void)</div><div class='ctx'> 	err = btf__add_field(btf, "x", 4, 0, 0);</div><div class='ctx'> 	ASSERT_OK(err, "field_ok");</div><div class='ctx'> </div><div class='del'>-	for (i = 1; i &lt; btf__type_cnt(btf); i++) {</div><div class='del'>-		err = btf_dump__dump_type(d, i);</div><div class='del'>-		ASSERT_OK(err, "dump_type_ok");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fflush(dump_buf_file);</div><div class='del'>-	dump_buf[dump_buf_sz] = 0; /* some libc implementations don't do this */</div><div class='del'>-</div><div class='del'>-	ASSERT_STREQ(dump_buf,</div><div class='add'>+	test_ctx__dump_and_compare(&amp;t,</div><div class='ctx'> "enum x;\n"</div><div class='ctx'> "\n"</div><div class='ctx'> "enum x {\n"</div><div class='hunk'>@@ -221,7 +256,7 @@ static void test_btf_dump_incremental(void)</div><div class='ctx'> 	 * enum values don't conflict;</div><div class='ctx'> 	 *</div><div class='ctx'> 	 */</div><div class='del'>-	fseek(dump_buf_file, 0, SEEK_SET);</div><div class='add'>+	fseek(t.dump_buf_file, 0, SEEK_SET);</div><div class='ctx'> </div><div class='ctx'> 	id = btf__add_struct(btf, "s", 4);</div><div class='ctx'> 	ASSERT_EQ(id, 7, "struct_id");</div><div class='hunk'>@@ -232,14 +267,7 @@ static void test_btf_dump_incremental(void)</div><div class='ctx'> 	err = btf__add_field(btf, "s", 6, 64, 0);</div><div class='ctx'> 	ASSERT_OK(err, "field_ok");</div><div class='ctx'> </div><div class='del'>-	for (i = 1; i &lt; btf__type_cnt(btf); i++) {</div><div class='del'>-		err = btf_dump__dump_type(d, i);</div><div class='del'>-		ASSERT_OK(err, "dump_type_ok");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fflush(dump_buf_file);</div><div class='del'>-	dump_buf[dump_buf_sz] = 0; /* some libc implementations don't do this */</div><div class='del'>-	ASSERT_STREQ(dump_buf,</div><div class='add'>+	test_ctx__dump_and_compare(&amp;t,</div><div class='ctx'> "struct s___2 {\n"</div><div class='ctx'> "	enum x x;\n"</div><div class='ctx'> "	enum {\n"</div><div class='hunk'>@@ -248,11 +276,53 @@ static void test_btf_dump_incremental(void)</div><div class='ctx'> "	struct s s;\n"</div><div class='ctx'> "};\n\n" , "c_dump1");</div><div class='ctx'> </div><div class='del'>-err_out:</div><div class='del'>-	fclose(dump_buf_file);</div><div class='del'>-	free(dump_buf);</div><div class='del'>-	btf_dump__free(d);</div><div class='del'>-	btf__free(btf);</div><div class='add'>+	test_ctx__free(&amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_btf_dump_type_tags(void)</div><div class='add'>+{</div><div class='add'>+	struct test_ctx t = {};</div><div class='add'>+	struct btf *btf;</div><div class='add'>+	int id, err;</div><div class='add'>+</div><div class='add'>+	if (test_ctx__init(&amp;t))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	btf = t.btf;</div><div class='add'>+</div><div class='add'>+	/* Generate BTF corresponding to the following C code:</div><div class='add'>+	 *</div><div class='add'>+	 * struct s {</div><div class='add'>+	 *   void __attribute__((btf_type_tag(\"void_tag\"))) *p1;</div><div class='add'>+	 *   void __attribute__((void_attr)) *p2;</div><div class='add'>+	 * };</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	id = btf__add_type_tag(btf, "void_tag", 0);</div><div class='add'>+	ASSERT_EQ(id, 1, "type_tag_id");</div><div class='add'>+	id = btf__add_ptr(btf, id);</div><div class='add'>+	ASSERT_EQ(id, 2, "void_ptr_id1");</div><div class='add'>+</div><div class='add'>+	id = btf__add_type_attr(btf, "void_attr", 0);</div><div class='add'>+	ASSERT_EQ(id, 3, "type_attr_id");</div><div class='add'>+	id = btf__add_ptr(btf, id);</div><div class='add'>+	ASSERT_EQ(id, 4, "void_ptr_id2");</div><div class='add'>+</div><div class='add'>+	id = btf__add_struct(btf, "s", 8);</div><div class='add'>+	ASSERT_EQ(id, 5, "struct_id");</div><div class='add'>+	err = btf__add_field(btf, "p1", 2, 0, 0);</div><div class='add'>+	ASSERT_OK(err, "field_ok1");</div><div class='add'>+	err = btf__add_field(btf, "p2", 4, 0, 0);</div><div class='add'>+	ASSERT_OK(err, "field_ok2");</div><div class='add'>+</div><div class='add'>+	test_ctx__dump_and_compare(&amp;t,</div><div class='add'>+"struct s {\n"</div><div class='add'>+"	void __attribute__((btf_type_tag(\"void_tag\"))) *p1;\n"</div><div class='add'>+"	void __attribute__((void_attr)) *p2;\n"</div><div class='add'>+"};\n\n", "dump_and_compare");</div><div class='add'>+</div><div class='add'>+	test_ctx__free(&amp;t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define STRSIZE				4096</div><div class='hunk'>@@ -809,6 +879,122 @@ static void test_btf_dump_var_data(struct btf *btf, struct btf_dump *d,</div><div class='ctx'> 			  "static int bpf_cgrp_storage_busy = (int)2", 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct btf_dump_string_ctx {</div><div class='add'>+	struct btf *btf;</div><div class='add'>+	struct btf_dump *d;</div><div class='add'>+	char *str;</div><div class='add'>+	struct btf_dump_type_data_opts *opts;</div><div class='add'>+	int array_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int btf_dump_one_string(struct btf_dump_string_ctx *ctx,</div><div class='add'>+			       char *ptr, size_t ptr_sz,</div><div class='add'>+			       const char *expected_val)</div><div class='add'>+{</div><div class='add'>+	size_t type_sz;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;str[0] = '\0';</div><div class='add'>+	type_sz = btf__resolve_size(ctx-&gt;btf, ctx-&gt;array_id);</div><div class='add'>+	ret = btf_dump__dump_type_data(ctx-&gt;d, ctx-&gt;array_id, ptr, ptr_sz, ctx-&gt;opts);</div><div class='add'>+	if (type_sz &lt;= ptr_sz) {</div><div class='add'>+		if (!ASSERT_EQ(ret, type_sz, "failed/unexpected type_sz"))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!ASSERT_STREQ(ctx-&gt;str, expected_val, "ensure expected/actual match"))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void btf_dump_strings(struct btf_dump_string_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct btf_dump_type_data_opts *opts = ctx-&gt;opts;</div><div class='add'>+</div><div class='add'>+	opts-&gt;emit_strings = true;</div><div class='add'>+</div><div class='add'>+	opts-&gt;compact = true;</div><div class='add'>+	opts-&gt;emit_zeroes = false;</div><div class='add'>+</div><div class='add'>+	opts-&gt;skip_names = false;</div><div class='add'>+	btf_dump_one_string(ctx, "foo", 4, "(char[4])\"foo\"");</div><div class='add'>+</div><div class='add'>+	opts-&gt;skip_names = true;</div><div class='add'>+	btf_dump_one_string(ctx, "foo", 4, "\"foo\"");</div><div class='add'>+</div><div class='add'>+	/* This should have no effect. */</div><div class='add'>+	opts-&gt;emit_zeroes = false;</div><div class='add'>+	btf_dump_one_string(ctx, "foo", 4, "\"foo\"");</div><div class='add'>+</div><div class='add'>+	/* This should have no effect. */</div><div class='add'>+	opts-&gt;compact = false;</div><div class='add'>+	btf_dump_one_string(ctx, "foo", 4, "\"foo\"");</div><div class='add'>+</div><div class='add'>+	/* Non-printable characters come out as hex. */</div><div class='add'>+	btf_dump_one_string(ctx, "fo\xff", 4, "\"fo\\xff\"");</div><div class='add'>+	btf_dump_one_string(ctx, "fo\x7", 4, "\"fo\\x07\"");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Strings that are too long for the specified type ("char[4]")</div><div class='add'>+	 * should fall back to the current behavior.</div><div class='add'>+	 */</div><div class='add'>+	opts-&gt;compact = true;</div><div class='add'>+	btf_dump_one_string(ctx, "abcde", 6, "['a','b','c','d',]");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Strings that are too short for the specified type ("char[4]")</div><div class='add'>+	 * should work normally.</div><div class='add'>+	 */</div><div class='add'>+	btf_dump_one_string(ctx, "ab", 3, "\"ab\"");</div><div class='add'>+</div><div class='add'>+	/* Non-NUL-terminated arrays don't get printed as strings. */</div><div class='add'>+	char food[4] = { 'f', 'o', 'o', 'd' };</div><div class='add'>+	char bye[3] = { 'b', 'y', 'e' };</div><div class='add'>+</div><div class='add'>+	btf_dump_one_string(ctx, food, 4, "['f','o','o','d',]");</div><div class='add'>+	btf_dump_one_string(ctx, bye, 3, "['b','y','e',]");</div><div class='add'>+</div><div class='add'>+	/* The embedded NUL should terminate the string. */</div><div class='add'>+	char embed[4] = { 'f', 'o', '\0', 'd' };</div><div class='add'>+</div><div class='add'>+	btf_dump_one_string(ctx, embed, 4, "\"fo\"");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_btf_dump_string_data(void)</div><div class='add'>+{</div><div class='add'>+	struct test_ctx t = {};</div><div class='add'>+	char str[STRSIZE];</div><div class='add'>+	struct btf_dump *d;</div><div class='add'>+	DECLARE_LIBBPF_OPTS(btf_dump_type_data_opts, opts);</div><div class='add'>+	struct btf_dump_string_ctx ctx;</div><div class='add'>+	int char_id, int_id, array_id;</div><div class='add'>+</div><div class='add'>+	if (test_ctx__init(&amp;t))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	d = btf_dump__new(t.btf, btf_dump_snprintf, str, NULL);</div><div class='add'>+	if (!ASSERT_OK_PTR(d, "could not create BTF dump"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Generate BTF for a four-element char array. */</div><div class='add'>+	char_id = btf__add_int(t.btf, "char", 1, BTF_INT_CHAR);</div><div class='add'>+	ASSERT_EQ(char_id, 1, "char_id");</div><div class='add'>+	int_id = btf__add_int(t.btf, "int", 4, BTF_INT_SIGNED);</div><div class='add'>+	ASSERT_EQ(int_id, 2, "int_id");</div><div class='add'>+	array_id = btf__add_array(t.btf, int_id, char_id, 4);</div><div class='add'>+	ASSERT_EQ(array_id, 3, "array_id");</div><div class='add'>+</div><div class='add'>+	ctx.btf = t.btf;</div><div class='add'>+	ctx.d = d;</div><div class='add'>+	ctx.str = str;</div><div class='add'>+	ctx.opts = &amp;opts;</div><div class='add'>+	ctx.array_id = array_id;</div><div class='add'>+</div><div class='add'>+	btf_dump_strings(&amp;ctx);</div><div class='add'>+</div><div class='add'>+	btf_dump__free(d);</div><div class='add'>+	test_ctx__free(&amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void test_btf_datasec(struct btf *btf, struct btf_dump *d, char *str,</div><div class='ctx'> 			     const char *name, const char *expected_val,</div><div class='ctx'> 			     void *data, size_t data_sz)</div><div class='hunk'>@@ -874,6 +1060,9 @@ void test_btf_dump() {</div><div class='ctx'> 	if (test__start_subtest("btf_dump: incremental"))</div><div class='ctx'> 		test_btf_dump_incremental();</div><div class='ctx'> </div><div class='add'>+	if (test__start_subtest("btf_dump: type_tags"))</div><div class='add'>+		test_btf_dump_type_tags();</div><div class='add'>+</div><div class='ctx'> 	btf = libbpf_find_kernel_btf();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(btf, "no kernel BTF found"))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -897,6 +1086,8 @@ void test_btf_dump() {</div><div class='ctx'> 		test_btf_dump_struct_data(btf, d, str);</div><div class='ctx'> 	if (test__start_subtest("btf_dump: var_data"))</div><div class='ctx'> 		test_btf_dump_var_data(btf, d, str);</div><div class='add'>+	if (test__start_subtest("btf_dump: string_data"))</div><div class='add'>+		test_btf_dump_string_data();</div><div class='ctx'> 	btf_dump__free(d);</div><div class='ctx'> 	btf__free(btf);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/btf_split.c b/tools/testing/selftests/bpf/prog_tests/btf_split.c<br/>index eef1158676ed..2d47cad50a51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/btf_split.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/btf_split.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/btf_split.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/btf_split.c</a></div><div class='hunk'>@@ -12,10 +12,45 @@ static void btf_dump_printf(void *ctx, const char *fmt, va_list args)</div><div class='ctx'> 	vfprintf(ctx, fmt, args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void test_btf_split() {</div><div class='add'>+/* Write raw BTF to file, return number of bytes written or negative errno */</div><div class='add'>+static ssize_t btf_raw_write(struct btf *btf, char *file)</div><div class='add'>+{</div><div class='add'>+	ssize_t written = 0;</div><div class='add'>+	const void *data;</div><div class='add'>+	__u32 size = 0;</div><div class='add'>+	int fd, ret;</div><div class='add'>+</div><div class='add'>+	fd = mkstemp(file);</div><div class='add'>+	if (!ASSERT_GE(fd, 0, "create_file"))</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	data = btf__raw_data(btf, &amp;size);</div><div class='add'>+	if (!ASSERT_OK_PTR(data, "btf__raw_data")) {</div><div class='add'>+		close(fd);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	while (written &lt; size) {</div><div class='add'>+		ret = write(fd, data + written, size - written);</div><div class='add'>+		if (!ASSERT_GE(ret, 0, "write succeeded")) {</div><div class='add'>+			close(fd);</div><div class='add'>+			return -errno;</div><div class='add'>+		}</div><div class='add'>+		written += ret;</div><div class='add'>+	}</div><div class='add'>+	close(fd);</div><div class='add'>+	return written;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __test_btf_split(bool multi)</div><div class='add'>+{</div><div class='add'>+	char multisplit_btf_file[] = "/tmp/test_btf_multisplit.XXXXXX";</div><div class='add'>+	char split_btf_file[] = "/tmp/test_btf_split.XXXXXX";</div><div class='add'>+	char base_btf_file[] = "/tmp/test_btf_base.XXXXXX";</div><div class='add'>+	ssize_t multisplit_btf_sz = 0, split_btf_sz = 0, base_btf_sz = 0;</div><div class='ctx'> 	struct btf_dump *d = NULL;</div><div class='del'>-	const struct btf_type *t;</div><div class='del'>-	struct btf *btf1, *btf2;</div><div class='add'>+	const struct btf_type *t, *ot;</div><div class='add'>+	struct btf *btf1 = NULL, *btf2 = NULL, *btf3 = NULL;</div><div class='add'>+	struct btf *btf4 = NULL, *btf5 = NULL, *btf6 = NULL;</div><div class='ctx'> 	int str_off, i, err;</div><div class='ctx'> </div><div class='ctx'> 	btf1 = btf__new_empty();</div><div class='hunk'>@@ -63,14 +98,46 @@ void test_btf_split() {</div><div class='ctx'> 	ASSERT_EQ(btf_vlen(t), 3, "split_struct_vlen");</div><div class='ctx'> 	ASSERT_STREQ(btf__str_by_offset(btf2, t-&gt;name_off), "s2", "split_struct_name");</div><div class='ctx'> </div><div class='add'>+	if (multi) {</div><div class='add'>+		btf3 = btf__new_empty_split(btf2);</div><div class='add'>+		if (!ASSERT_OK_PTR(btf3, "multi_split_btf"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+	} else {</div><div class='add'>+		btf3 = btf2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	btf__add_union(btf3, "u1", 16);			/* [5] union u1 {	*/</div><div class='add'>+	btf__add_field(btf3, "f1", 4, 0, 0);		/*	struct s2 f1;	*/</div><div class='add'>+	btf__add_field(btf3, "uf2", 1, 0, 0);		/*	int f2;		*/</div><div class='add'>+							/* } */</div><div class='add'>+</div><div class='add'>+	if (multi) {</div><div class='add'>+		t = btf__type_by_id(btf2, 5);</div><div class='add'>+		ASSERT_NULL(t, "multisplit_type_in_first_split");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	t = btf__type_by_id(btf3, 5);</div><div class='add'>+	if (!ASSERT_OK_PTR(t, "split_union_type"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	ASSERT_EQ(btf_is_union(t), true, "split_union_kind");</div><div class='add'>+	ASSERT_EQ(btf_vlen(t), 2, "split_union_vlen");</div><div class='add'>+	ASSERT_STREQ(btf__str_by_offset(btf3, t-&gt;name_off), "u1", "split_union_name");</div><div class='add'>+	ASSERT_EQ(btf__type_cnt(btf3), 6, "split_type_cnt");</div><div class='add'>+</div><div class='add'>+	t = btf__type_by_id(btf3, 1);</div><div class='add'>+	if (!ASSERT_OK_PTR(t, "split_base_type"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	ASSERT_EQ(btf_is_int(t), true, "split_base_int");</div><div class='add'>+	ASSERT_STREQ(btf__str_by_offset(btf3, t-&gt;name_off), "int", "split_base_type_name");</div><div class='add'>+</div><div class='ctx'> 	/* BTF-to-C dump of split BTF */</div><div class='ctx'> 	dump_buf_file = open_memstream(&amp;dump_buf, &amp;dump_buf_sz);</div><div class='ctx'> 	if (!ASSERT_OK_PTR(dump_buf_file, "dump_memstream"))</div><div class='ctx'> 		return;</div><div class='del'>-	d = btf_dump__new(btf2, btf_dump_printf, dump_buf_file, NULL);</div><div class='add'>+	d = btf_dump__new(btf3, btf_dump_printf, dump_buf_file, NULL);</div><div class='ctx'> 	if (!ASSERT_OK_PTR(d, "btf_dump__new"))</div><div class='ctx'> 		goto cleanup;</div><div class='del'>-	for (i = 1; i &lt; btf__type_cnt(btf2); i++) {</div><div class='add'>+	for (i = 1; i &lt; btf__type_cnt(btf3); i++) {</div><div class='ctx'> 		err = btf_dump__dump_type(d, i);</div><div class='ctx'> 		ASSERT_OK(err, "dump_type_ok");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -79,14 +146,56 @@ void test_btf_split() {</div><div class='ctx'> 	ASSERT_STREQ(dump_buf,</div><div class='ctx'> "struct s1 {\n"</div><div class='ctx'> "	int f1;\n"</div><div class='del'>-"};\n"</div><div class='del'>-"\n"</div><div class='add'>+"};\n\n"</div><div class='ctx'> "struct s2 {\n"</div><div class='ctx'> "	struct s1 f1;\n"</div><div class='ctx'> "	int f2;\n"</div><div class='ctx'> "	int *f3;\n"</div><div class='add'>+"};\n\n"</div><div class='add'>+"union u1 {\n"</div><div class='add'>+"	struct s2 f1;\n"</div><div class='add'>+"	int uf2;\n"</div><div class='ctx'> "};\n\n", "c_dump");</div><div class='ctx'> </div><div class='add'>+	/* write base, split BTFs to files and ensure parsing succeeds */</div><div class='add'>+	base_btf_sz = btf_raw_write(btf1, base_btf_file);</div><div class='add'>+	if (base_btf_sz &lt; 0)</div><div class='add'>+		goto cleanup;</div><div class='add'>+	split_btf_sz = btf_raw_write(btf2, split_btf_file);</div><div class='add'>+	if (split_btf_sz &lt; 0)</div><div class='add'>+		goto cleanup;</div><div class='add'>+	btf4 = btf__parse(base_btf_file, NULL);</div><div class='add'>+	if (!ASSERT_OK_PTR(btf4, "parse_base"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	btf5 = btf__parse_split(split_btf_file, btf4);</div><div class='add'>+	if (!ASSERT_OK_PTR(btf5, "parse_split"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	if (multi) {</div><div class='add'>+		multisplit_btf_sz = btf_raw_write(btf3, multisplit_btf_file);</div><div class='add'>+		if (multisplit_btf_sz &lt; 0)</div><div class='add'>+			goto cleanup;</div><div class='add'>+		btf6 = btf__parse_split(multisplit_btf_file, btf5);</div><div class='add'>+		if (!ASSERT_OK_PTR(btf6, "parse_multisplit"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+	} else {</div><div class='add'>+		btf6 = btf5;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(btf__type_cnt(btf3), btf__type_cnt(btf6), "cmp_type_cnt"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/* compare parsed to original BTF */</div><div class='add'>+	for (i = 1; i &lt; btf__type_cnt(btf6); i++) {</div><div class='add'>+		t = btf__type_by_id(btf6, i);</div><div class='add'>+		if (!ASSERT_OK_PTR(t, "type_in_parsed_btf"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+		ot = btf__type_by_id(btf3, i);</div><div class='add'>+		if (!ASSERT_OK_PTR(ot, "type_in_orig_btf"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+		if (!ASSERT_EQ(memcmp(t, ot, sizeof(*ot)), 0, "cmp_parsed_orig_btf"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> cleanup:</div><div class='ctx'> 	if (dump_buf_file)</div><div class='ctx'> 		fclose(dump_buf_file);</div><div class='hunk'>@@ -94,4 +203,24 @@ cleanup:</div><div class='ctx'> 	btf_dump__free(d);</div><div class='ctx'> 	btf__free(btf1);</div><div class='ctx'> 	btf__free(btf2);</div><div class='add'>+	if (btf2 != btf3)</div><div class='add'>+		btf__free(btf3);</div><div class='add'>+	btf__free(btf4);</div><div class='add'>+	btf__free(btf5);</div><div class='add'>+	if (btf5 != btf6)</div><div class='add'>+		btf__free(btf6);</div><div class='add'>+	if (base_btf_sz &gt; 0)</div><div class='add'>+		unlink(base_btf_file);</div><div class='add'>+	if (split_btf_sz &gt; 0)</div><div class='add'>+		unlink(split_btf_file);</div><div class='add'>+	if (multisplit_btf_sz &gt; 0)</div><div class='add'>+		unlink(multisplit_btf_file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_btf_split(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("single_split"))</div><div class='add'>+		__test_btf_split(false);</div><div class='add'>+	if (test__start_subtest("multi_split"))</div><div class='add'>+		__test_btf_split(true);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/btf_sysfs.c b/tools/testing/selftests/bpf/prog_tests/btf_sysfs.c<br/>new file mode 100644<br/>index 000000000000..3923e64c4c1d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/btf_sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/btf_sysfs.c</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+/* Copyright (c) 2025 Isovalent */</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;bpf/btf.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+static void test_btf_mmap_sysfs(const char *path, struct btf *base)</div><div class='add'>+{</div><div class='add'>+	struct stat st;</div><div class='add'>+	__u64 btf_size, end;</div><div class='add'>+	void *raw_data = NULL;</div><div class='add'>+	int fd = -1;</div><div class='add'>+	long page_size;</div><div class='add'>+	struct btf *btf = NULL;</div><div class='add'>+</div><div class='add'>+	page_size = sysconf(_SC_PAGESIZE);</div><div class='add'>+	if (!ASSERT_GE(page_size, 0, "get_page_size"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(stat(path, &amp;st), "stat_btf"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	btf_size = st.st_size;</div><div class='add'>+	end = (btf_size + page_size - 1) / page_size * page_size;</div><div class='add'>+</div><div class='add'>+	fd = open(path, O_RDONLY);</div><div class='add'>+	if (!ASSERT_GE(fd, 0, "open_btf"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	raw_data = mmap(NULL, btf_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);</div><div class='add'>+	if (!ASSERT_EQ(raw_data, MAP_FAILED, "mmap_btf_writable"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	raw_data = mmap(NULL, btf_size, PROT_READ, MAP_SHARED, fd, 0);</div><div class='add'>+	if (!ASSERT_EQ(raw_data, MAP_FAILED, "mmap_btf_shared"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	raw_data = mmap(NULL, end + 1, PROT_READ, MAP_PRIVATE, fd, 0);</div><div class='add'>+	if (!ASSERT_EQ(raw_data, MAP_FAILED, "mmap_btf_invalid_size"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	raw_data = mmap(NULL, end, PROT_READ, MAP_PRIVATE, fd, 0);</div><div class='add'>+	if (!ASSERT_OK_PTR(raw_data, "mmap_btf"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(mprotect(raw_data, btf_size, PROT_READ | PROT_WRITE), -1,</div><div class='add'>+	    "mprotect_writable"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(mprotect(raw_data, btf_size, PROT_READ | PROT_EXEC), -1,</div><div class='add'>+	    "mprotect_executable"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/* Check padding is zeroed */</div><div class='add'>+	for (int i = btf_size; i &lt; end; i++) {</div><div class='add'>+		if (((__u8 *)raw_data)[i] != 0) {</div><div class='add'>+			PRINT_FAIL("tail of BTF is not zero at page offset %d\n", i);</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	btf = btf__new_split(raw_data, btf_size, base);</div><div class='add'>+	if (!ASSERT_OK_PTR(btf, "parse_btf"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	btf__free(btf);</div><div class='add'>+	if (raw_data &amp;&amp; raw_data != MAP_FAILED)</div><div class='add'>+		munmap(raw_data, btf_size);</div><div class='add'>+	if (fd &gt;= 0)</div><div class='add'>+		close(fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_btf_sysfs(void)</div><div class='add'>+{</div><div class='add'>+	test_btf_mmap_sysfs("/sys/kernel/btf/vmlinux", NULL);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_mprog_opts.c b/tools/testing/selftests/bpf/prog_tests/cgroup_mprog_opts.c<br/>new file mode 100644<br/>index 000000000000..bb60704a3ef9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cgroup_mprog_opts.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/cgroup_mprog_opts.c</a></div><div class='hunk'>@@ -0,0 +1,617 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "cgroup_helpers.h"</div><div class='add'>+#include "cgroup_mprog.skel.h"</div><div class='add'>+</div><div class='add'>+static void assert_mprog_count(int cg, int atype, int expected)</div><div class='add'>+{</div><div class='add'>+	__u32 count = 0, attach_flags = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_query(cg, atype, 0, &amp;attach_flags,</div><div class='add'>+			     NULL, &amp;count);</div><div class='add'>+	ASSERT_EQ(count, expected, "count");</div><div class='add'>+	ASSERT_EQ(err, 0, "prog_query");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_prog_attach_detach(int atype)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_attach_opts, opta);</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_detach_opts, optd);</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_query_opts, optq);</div><div class='add'>+	__u32 fd1, fd2, fd3, fd4, id1, id2, id3, id4;</div><div class='add'>+	struct cgroup_mprog *skel;</div><div class='add'>+	__u32 prog_ids[10];</div><div class='add'>+	int cg, err;</div><div class='add'>+</div><div class='add'>+	cg = test__join_cgroup("/prog_attach_detach");</div><div class='add'>+	if (!ASSERT_GE(cg, 0, "join_cgroup /prog_attach_detach"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel = cgroup_mprog__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_load"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	fd1 = bpf_program__fd(skel-&gt;progs.getsockopt_1);</div><div class='add'>+	fd2 = bpf_program__fd(skel-&gt;progs.getsockopt_2);</div><div class='add'>+	fd3 = bpf_program__fd(skel-&gt;progs.getsockopt_3);</div><div class='add'>+	fd4 = bpf_program__fd(skel-&gt;progs.getsockopt_4);</div><div class='add'>+</div><div class='add'>+	id1 = id_from_prog_fd(fd1);</div><div class='add'>+	id2 = id_from_prog_fd(fd2);</div><div class='add'>+	id3 = id_from_prog_fd(fd3);</div><div class='add'>+	id4 = id_from_prog_fd(fd4);</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_BEFORE | BPF_F_AFTER,</div><div class='add'>+		.expected_revision = 1,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd1] */</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "prog_attach"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 1);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_BEFORE,</div><div class='add'>+		.expected_revision = 2,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd2, fd1] */</div><div class='add'>+	err = bpf_prog_attach_opts(fd2, cg, atype, &amp;opta);</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "prog_attach"))</div><div class='add'>+		goto cleanup1;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 2);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_AFTER,</div><div class='add'>+		.relative_fd = fd2,</div><div class='add'>+		.expected_revision = 3,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd2, fd3, fd1] */</div><div class='add'>+	err = bpf_prog_attach_opts(fd3, cg, atype, &amp;opta);</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "prog_attach"))</div><div class='add'>+		goto cleanup2;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 3);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI,</div><div class='add'>+		.expected_revision = 4,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd2, fd3, fd1, fd4] */</div><div class='add'>+	err = bpf_prog_attach_opts(fd4, cg, atype, &amp;opta);</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "prog_attach"))</div><div class='add'>+		goto cleanup3;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 4);</div><div class='add'>+</div><div class='add'>+	/* retrieve optq.prog_cnt */</div><div class='add'>+	err = bpf_prog_query_opts(cg, atype, &amp;optq);</div><div class='add'>+	if (!ASSERT_OK(err, "prog_query"))</div><div class='add'>+		goto cleanup4;</div><div class='add'>+</div><div class='add'>+	/* optq.prog_cnt will be used in below query */</div><div class='add'>+	memset(prog_ids, 0, sizeof(prog_ids));</div><div class='add'>+	optq.prog_ids = prog_ids;</div><div class='add'>+	err = bpf_prog_query_opts(cg, atype, &amp;optq);</div><div class='add'>+	if (!ASSERT_OK(err, "prog_query"))</div><div class='add'>+		goto cleanup4;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(optq.count, 4, "count");</div><div class='add'>+	ASSERT_EQ(optq.revision, 5, "revision");</div><div class='add'>+	ASSERT_EQ(optq.prog_ids[0], id2, "prog_ids[0]");</div><div class='add'>+	ASSERT_EQ(optq.prog_ids[1], id3, "prog_ids[1]");</div><div class='add'>+	ASSERT_EQ(optq.prog_ids[2], id1, "prog_ids[2]");</div><div class='add'>+	ASSERT_EQ(optq.prog_ids[3], id4, "prog_ids[3]");</div><div class='add'>+	ASSERT_EQ(optq.prog_ids[4], 0, "prog_ids[4]");</div><div class='add'>+	ASSERT_EQ(optq.link_ids, NULL, "link_ids");</div><div class='add'>+</div><div class='add'>+cleanup4:</div><div class='add'>+	optd.expected_revision = 5;</div><div class='add'>+	err = bpf_prog_detach_opts(fd4, cg, atype, &amp;optd);</div><div class='add'>+	ASSERT_OK(err, "prog_detach");</div><div class='add'>+	assert_mprog_count(cg, atype, 3);</div><div class='add'>+</div><div class='add'>+cleanup3:</div><div class='add'>+	LIBBPF_OPTS_RESET(optd);</div><div class='add'>+	err = bpf_prog_detach_opts(fd3, cg, atype, &amp;optd);</div><div class='add'>+	ASSERT_OK(err, "prog_detach");</div><div class='add'>+	assert_mprog_count(cg, atype, 2);</div><div class='add'>+</div><div class='add'>+	/* Check revision after two detach operations */</div><div class='add'>+	err = bpf_prog_query_opts(cg, atype, &amp;optq);</div><div class='add'>+	ASSERT_OK(err, "prog_query");</div><div class='add'>+	ASSERT_EQ(optq.revision, 7, "revision");</div><div class='add'>+</div><div class='add'>+cleanup2:</div><div class='add'>+	err = bpf_prog_detach_opts(fd2, cg, atype, &amp;optd);</div><div class='add'>+	ASSERT_OK(err, "prog_detach");</div><div class='add'>+	assert_mprog_count(cg, atype, 1);</div><div class='add'>+</div><div class='add'>+cleanup1:</div><div class='add'>+	err = bpf_prog_detach_opts(fd1, cg, atype, &amp;optd);</div><div class='add'>+	ASSERT_OK(err, "prog_detach");</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	cgroup_mprog__destroy(skel);</div><div class='add'>+	close(cg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_link_attach_detach(int atype)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_cgroup_opts, opta);</div><div class='add'>+	LIBBPF_OPTS(bpf_cgroup_opts, optd);</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_query_opts, optq);</div><div class='add'>+	struct bpf_link *link1, *link2, *link3, *link4;</div><div class='add'>+	__u32 fd1, fd2, fd3, fd4, id1, id2, id3, id4;</div><div class='add'>+	struct cgroup_mprog *skel;</div><div class='add'>+	__u32 prog_ids[10];</div><div class='add'>+	int cg, err;</div><div class='add'>+</div><div class='add'>+	cg = test__join_cgroup("/link_attach_detach");</div><div class='add'>+	if (!ASSERT_GE(cg, 0, "join_cgroup /link_attach_detach"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel = cgroup_mprog__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_load"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	fd1 = bpf_program__fd(skel-&gt;progs.getsockopt_1);</div><div class='add'>+	fd2 = bpf_program__fd(skel-&gt;progs.getsockopt_2);</div><div class='add'>+	fd3 = bpf_program__fd(skel-&gt;progs.getsockopt_3);</div><div class='add'>+	fd4 = bpf_program__fd(skel-&gt;progs.getsockopt_4);</div><div class='add'>+</div><div class='add'>+	id1 = id_from_prog_fd(fd1);</div><div class='add'>+	id2 = id_from_prog_fd(fd2);</div><div class='add'>+	id3 = id_from_prog_fd(fd3);</div><div class='add'>+	id4 = id_from_prog_fd(fd4);</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.expected_revision = 1,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd1] */</div><div class='add'>+	link1 = bpf_program__attach_cgroup_opts(skel-&gt;progs.getsockopt_1, cg, &amp;opta);</div><div class='add'>+	if (!ASSERT_OK_PTR(link1, "link_attach"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 1);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_BEFORE | BPF_F_LINK,</div><div class='add'>+		.relative_id = id_from_link_fd(bpf_link__fd(link1)),</div><div class='add'>+		.expected_revision = 2,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd2, fd1] */</div><div class='add'>+	link2 = bpf_program__attach_cgroup_opts(skel-&gt;progs.getsockopt_2, cg, &amp;opta);</div><div class='add'>+	if (!ASSERT_OK_PTR(link2, "link_attach"))</div><div class='add'>+		goto cleanup1;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 2);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_AFTER | BPF_F_LINK,</div><div class='add'>+		.relative_fd = bpf_link__fd(link2),</div><div class='add'>+		.expected_revision = 3,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd2, fd3, fd1] */</div><div class='add'>+	link3 = bpf_program__attach_cgroup_opts(skel-&gt;progs.getsockopt_3, cg, &amp;opta);</div><div class='add'>+	if (!ASSERT_OK_PTR(link3, "link_attach"))</div><div class='add'>+		goto cleanup2;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 3);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.expected_revision = 4,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd2, fd3, fd1, fd4] */</div><div class='add'>+	link4 = bpf_program__attach_cgroup_opts(skel-&gt;progs.getsockopt_4, cg, &amp;opta);</div><div class='add'>+	if (!ASSERT_OK_PTR(link4, "link_attach"))</div><div class='add'>+		goto cleanup3;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 4);</div><div class='add'>+</div><div class='add'>+	/* retrieve optq.prog_cnt */</div><div class='add'>+	err = bpf_prog_query_opts(cg, atype, &amp;optq);</div><div class='add'>+	if (!ASSERT_OK(err, "prog_query"))</div><div class='add'>+		goto cleanup4;</div><div class='add'>+</div><div class='add'>+	/* optq.prog_cnt will be used in below query */</div><div class='add'>+	memset(prog_ids, 0, sizeof(prog_ids));</div><div class='add'>+	optq.prog_ids = prog_ids;</div><div class='add'>+	err = bpf_prog_query_opts(cg, atype, &amp;optq);</div><div class='add'>+	if (!ASSERT_OK(err, "prog_query"))</div><div class='add'>+		goto cleanup4;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(optq.count, 4, "count");</div><div class='add'>+	ASSERT_EQ(optq.revision, 5, "revision");</div><div class='add'>+	ASSERT_EQ(optq.prog_ids[0], id2, "prog_ids[0]");</div><div class='add'>+	ASSERT_EQ(optq.prog_ids[1], id3, "prog_ids[1]");</div><div class='add'>+	ASSERT_EQ(optq.prog_ids[2], id1, "prog_ids[2]");</div><div class='add'>+	ASSERT_EQ(optq.prog_ids[3], id4, "prog_ids[3]");</div><div class='add'>+	ASSERT_EQ(optq.prog_ids[4], 0, "prog_ids[4]");</div><div class='add'>+	ASSERT_EQ(optq.link_ids, NULL, "link_ids");</div><div class='add'>+</div><div class='add'>+cleanup4:</div><div class='add'>+	bpf_link__destroy(link4);</div><div class='add'>+	assert_mprog_count(cg, atype, 3);</div><div class='add'>+</div><div class='add'>+cleanup3:</div><div class='add'>+	bpf_link__destroy(link3);</div><div class='add'>+	assert_mprog_count(cg, atype, 2);</div><div class='add'>+</div><div class='add'>+	/* Check revision after two detach operations */</div><div class='add'>+	err = bpf_prog_query_opts(cg, atype, &amp;optq);</div><div class='add'>+	ASSERT_OK(err, "prog_query");</div><div class='add'>+	ASSERT_EQ(optq.revision, 7, "revision");</div><div class='add'>+</div><div class='add'>+cleanup2:</div><div class='add'>+	bpf_link__destroy(link2);</div><div class='add'>+	assert_mprog_count(cg, atype, 1);</div><div class='add'>+</div><div class='add'>+cleanup1:</div><div class='add'>+	bpf_link__destroy(link1);</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	cgroup_mprog__destroy(skel);</div><div class='add'>+	close(cg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_preorder_prog_attach_detach(int atype)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_attach_opts, opta);</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_detach_opts, optd);</div><div class='add'>+	__u32 fd1, fd2, fd3, fd4;</div><div class='add'>+	struct cgroup_mprog *skel;</div><div class='add'>+	int cg, err;</div><div class='add'>+</div><div class='add'>+	cg = test__join_cgroup("/preorder_prog_attach_detach");</div><div class='add'>+	if (!ASSERT_GE(cg, 0, "join_cgroup /preorder_prog_attach_detach"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel = cgroup_mprog__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_load"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	fd1 = bpf_program__fd(skel-&gt;progs.getsockopt_1);</div><div class='add'>+	fd2 = bpf_program__fd(skel-&gt;progs.getsockopt_2);</div><div class='add'>+	fd3 = bpf_program__fd(skel-&gt;progs.getsockopt_3);</div><div class='add'>+	fd4 = bpf_program__fd(skel-&gt;progs.getsockopt_4);</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI,</div><div class='add'>+		.expected_revision = 1,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd1] */</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "prog_attach"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 1);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_PREORDER,</div><div class='add'>+		.expected_revision = 2,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd1, fd2] */</div><div class='add'>+	err = bpf_prog_attach_opts(fd2, cg, atype, &amp;opta);</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "prog_attach"))</div><div class='add'>+		goto cleanup1;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 2);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_AFTER,</div><div class='add'>+		.relative_fd = fd2,</div><div class='add'>+		.expected_revision = 3,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd3, cg, atype, &amp;opta);</div><div class='add'>+	if (!ASSERT_EQ(err, -EINVAL, "prog_attach"))</div><div class='add'>+		goto cleanup2;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 2);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_AFTER | BPF_F_PREORDER,</div><div class='add'>+		.relative_fd = fd2,</div><div class='add'>+		.expected_revision = 3,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd1, fd2, fd3] */</div><div class='add'>+	err = bpf_prog_attach_opts(fd3, cg, atype, &amp;opta);</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "prog_attach"))</div><div class='add'>+		goto cleanup2;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 3);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI,</div><div class='add'>+		.expected_revision = 4,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd2, fd3, fd1, fd4] */</div><div class='add'>+	err = bpf_prog_attach_opts(fd4, cg, atype, &amp;opta);</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "prog_attach"))</div><div class='add'>+		goto cleanup3;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 4);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_detach_opts(fd4, cg, atype, &amp;optd);</div><div class='add'>+	ASSERT_OK(err, "prog_detach");</div><div class='add'>+	assert_mprog_count(cg, atype, 3);</div><div class='add'>+</div><div class='add'>+cleanup3:</div><div class='add'>+	err = bpf_prog_detach_opts(fd3, cg, atype, &amp;optd);</div><div class='add'>+	ASSERT_OK(err, "prog_detach");</div><div class='add'>+	assert_mprog_count(cg, atype, 2);</div><div class='add'>+</div><div class='add'>+cleanup2:</div><div class='add'>+	err = bpf_prog_detach_opts(fd2, cg, atype, &amp;optd);</div><div class='add'>+	ASSERT_OK(err, "prog_detach");</div><div class='add'>+	assert_mprog_count(cg, atype, 1);</div><div class='add'>+</div><div class='add'>+cleanup1:</div><div class='add'>+	err = bpf_prog_detach_opts(fd1, cg, atype, &amp;optd);</div><div class='add'>+	ASSERT_OK(err, "prog_detach");</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	cgroup_mprog__destroy(skel);</div><div class='add'>+	close(cg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_preorder_link_attach_detach(int atype)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_cgroup_opts, opta);</div><div class='add'>+	struct bpf_link *link1, *link2, *link3, *link4;</div><div class='add'>+	struct cgroup_mprog *skel;</div><div class='add'>+	__u32 fd2;</div><div class='add'>+	int cg;</div><div class='add'>+</div><div class='add'>+	cg = test__join_cgroup("/preorder_link_attach_detach");</div><div class='add'>+	if (!ASSERT_GE(cg, 0, "join_cgroup /preorder_link_attach_detach"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel = cgroup_mprog__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_load"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	fd2 = bpf_program__fd(skel-&gt;progs.getsockopt_2);</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.expected_revision = 1,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd1] */</div><div class='add'>+	link1 = bpf_program__attach_cgroup_opts(skel-&gt;progs.getsockopt_1, cg, &amp;opta);</div><div class='add'>+	if (!ASSERT_OK_PTR(link1, "link_attach"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 1);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_PREORDER,</div><div class='add'>+		.expected_revision = 2,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd1, fd2] */</div><div class='add'>+	link2 = bpf_program__attach_cgroup_opts(skel-&gt;progs.getsockopt_2, cg, &amp;opta);</div><div class='add'>+	if (!ASSERT_OK_PTR(link2, "link_attach"))</div><div class='add'>+		goto cleanup1;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 2);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_AFTER,</div><div class='add'>+		.relative_fd = fd2,</div><div class='add'>+		.expected_revision = 3,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	link3 = bpf_program__attach_cgroup_opts(skel-&gt;progs.getsockopt_3, cg, &amp;opta);</div><div class='add'>+	if (!ASSERT_ERR_PTR(link3, "link_attach"))</div><div class='add'>+		goto cleanup2;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 2);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_AFTER | BPF_F_PREORDER | BPF_F_LINK,</div><div class='add'>+		.relative_fd = bpf_link__fd(link2),</div><div class='add'>+		.expected_revision = 3,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd1, fd2, fd3] */</div><div class='add'>+	link3 = bpf_program__attach_cgroup_opts(skel-&gt;progs.getsockopt_3, cg, &amp;opta);</div><div class='add'>+	if (!ASSERT_OK_PTR(link3, "link_attach"))</div><div class='add'>+		goto cleanup2;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 3);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.expected_revision = 4,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* ordering: [fd2, fd3, fd1, fd4] */</div><div class='add'>+	link4 = bpf_program__attach_cgroup_opts(skel-&gt;progs.getsockopt_4, cg, &amp;opta);</div><div class='add'>+	if (!ASSERT_OK_PTR(link4, "prog_attach"))</div><div class='add'>+		goto cleanup3;</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 4);</div><div class='add'>+</div><div class='add'>+	bpf_link__destroy(link4);</div><div class='add'>+	assert_mprog_count(cg, atype, 3);</div><div class='add'>+</div><div class='add'>+cleanup3:</div><div class='add'>+	bpf_link__destroy(link3);</div><div class='add'>+	assert_mprog_count(cg, atype, 2);</div><div class='add'>+</div><div class='add'>+cleanup2:</div><div class='add'>+	bpf_link__destroy(link2);</div><div class='add'>+	assert_mprog_count(cg, atype, 1);</div><div class='add'>+</div><div class='add'>+cleanup1:</div><div class='add'>+	bpf_link__destroy(link1);</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	cgroup_mprog__destroy(skel);</div><div class='add'>+	close(cg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_invalid_attach_detach(int atype)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_attach_opts, opta);</div><div class='add'>+	__u32 fd1, fd2, id2;</div><div class='add'>+	struct cgroup_mprog *skel;</div><div class='add'>+	int cg, err;</div><div class='add'>+</div><div class='add'>+	cg = test__join_cgroup("/invalid_attach_detach");</div><div class='add'>+	if (!ASSERT_GE(cg, 0, "join_cgroup /invalid_attach_detach"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel = cgroup_mprog__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_load"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	fd1 = bpf_program__fd(skel-&gt;progs.getsockopt_1);</div><div class='add'>+	fd2 = bpf_program__fd(skel-&gt;progs.getsockopt_2);</div><div class='add'>+</div><div class='add'>+	id2 = id_from_prog_fd(fd2);</div><div class='add'>+</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_BEFORE | BPF_F_AFTER,</div><div class='add'>+		.relative_id = id2,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	ASSERT_EQ(err, -EINVAL, "prog_attach");</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_BEFORE | BPF_F_ID,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	ASSERT_EQ(err, -ENOENT, "prog_attach");</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_AFTER | BPF_F_ID,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	ASSERT_EQ(err, -ENOENT, "prog_attach");</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_BEFORE | BPF_F_AFTER,</div><div class='add'>+		.relative_id = id2,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	ASSERT_EQ(err, -EINVAL, "prog_attach");</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_LINK,</div><div class='add'>+		.relative_id = id2,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	ASSERT_EQ(err, -EINVAL, "prog_attach");</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI,</div><div class='add'>+		.relative_id = id2,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	ASSERT_EQ(err, -EINVAL, "prog_attach");</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_BEFORE,</div><div class='add'>+		.relative_fd = fd1,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	ASSERT_EQ(err, -ENOENT, "prog_attach");</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_AFTER,</div><div class='add'>+		.relative_fd = fd1,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	ASSERT_EQ(err, -ENOENT, "prog_attach");</div><div class='add'>+	assert_mprog_count(cg, atype, 0);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "prog_attach"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	assert_mprog_count(cg, atype, 1);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_AFTER,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	ASSERT_EQ(err, -EINVAL, "prog_attach");</div><div class='add'>+	assert_mprog_count(cg, atype, 1);</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opta,</div><div class='add'>+		.flags = BPF_F_ALLOW_MULTI | BPF_F_REPLACE | BPF_F_AFTER,</div><div class='add'>+		.replace_prog_fd = fd1,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach_opts(fd1, cg, atype, &amp;opta);</div><div class='add'>+	ASSERT_EQ(err, -EINVAL, "prog_attach");</div><div class='add'>+	assert_mprog_count(cg, atype, 1);</div><div class='add'>+cleanup:</div><div class='add'>+	cgroup_mprog__destroy(skel);</div><div class='add'>+	close(cg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_cgroup_mprog_opts(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("prog_attach_detach"))</div><div class='add'>+		test_prog_attach_detach(BPF_CGROUP_GETSOCKOPT);</div><div class='add'>+	if (test__start_subtest("link_attach_detach"))</div><div class='add'>+		test_link_attach_detach(BPF_CGROUP_GETSOCKOPT);</div><div class='add'>+	if (test__start_subtest("preorder_prog_attach_detach"))</div><div class='add'>+		test_preorder_prog_attach_detach(BPF_CGROUP_GETSOCKOPT);</div><div class='add'>+	if (test__start_subtest("preorder_link_attach_detach"))</div><div class='add'>+		test_preorder_link_attach_detach(BPF_CGROUP_GETSOCKOPT);</div><div class='add'>+	if (test__start_subtest("invalid_attach_detach"))</div><div class='add'>+		test_invalid_attach_detach(BPF_CGROUP_GETSOCKOPT);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_mprog_ordering.c b/tools/testing/selftests/bpf/prog_tests/cgroup_mprog_ordering.c<br/>new file mode 100644<br/>index 000000000000..a36d2e968bc5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cgroup_mprog_ordering.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/cgroup_mprog_ordering.c</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "cgroup_helpers.h"</div><div class='add'>+#include "cgroup_preorder.skel.h"</div><div class='add'>+</div><div class='add'>+static int run_getsockopt_test(int cg_parent, int sock_fd, bool has_relative_fd)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_attach_opts, opts);</div><div class='add'>+	enum bpf_attach_type prog_p_atype, prog_p2_atype;</div><div class='add'>+	int prog_p_fd, prog_p2_fd;</div><div class='add'>+	struct cgroup_preorder *skel = NULL;</div><div class='add'>+	struct bpf_program *prog;</div><div class='add'>+	__u8 *result, buf;</div><div class='add'>+	socklen_t optlen = 1;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	skel = cgroup_preorder__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "cgroup_preorder__open_and_load"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS_RESET(opts);</div><div class='add'>+	opts.flags = BPF_F_ALLOW_MULTI;</div><div class='add'>+	prog = skel-&gt;progs.parent;</div><div class='add'>+	prog_p_fd = bpf_program__fd(prog);</div><div class='add'>+	prog_p_atype = bpf_program__expected_attach_type(prog);</div><div class='add'>+	err = bpf_prog_attach_opts(prog_p_fd, cg_parent, prog_p_atype, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach_opts-parent"))</div><div class='add'>+		goto close_skel;</div><div class='add'>+</div><div class='add'>+	opts.flags = BPF_F_ALLOW_MULTI | BPF_F_BEFORE;</div><div class='add'>+	if (has_relative_fd)</div><div class='add'>+		opts.relative_fd = prog_p_fd;</div><div class='add'>+	prog = skel-&gt;progs.parent_2;</div><div class='add'>+	prog_p2_fd = bpf_program__fd(prog);</div><div class='add'>+	prog_p2_atype = bpf_program__expected_attach_type(prog);</div><div class='add'>+	err = bpf_prog_attach_opts(prog_p2_fd, cg_parent, prog_p2_atype, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach_opts-parent_2"))</div><div class='add'>+		goto detach_parent;</div><div class='add'>+</div><div class='add'>+	err = getsockopt(sock_fd, SOL_IP, IP_TOS, &amp;buf, &amp;optlen);</div><div class='add'>+	if (!ASSERT_OK(err, "getsockopt"))</div><div class='add'>+		goto detach_parent_2;</div><div class='add'>+</div><div class='add'>+	result = skel-&gt;bss-&gt;result;</div><div class='add'>+	ASSERT_TRUE(result[0] == 4 &amp;&amp; result[1] == 3, "result values");</div><div class='add'>+</div><div class='add'>+detach_parent_2:</div><div class='add'>+	ASSERT_OK(bpf_prog_detach2(prog_p2_fd, cg_parent, prog_p2_atype),</div><div class='add'>+		  "bpf_prog_detach2-parent_2");</div><div class='add'>+detach_parent:</div><div class='add'>+	ASSERT_OK(bpf_prog_detach2(prog_p_fd, cg_parent, prog_p_atype),</div><div class='add'>+		  "bpf_prog_detach2-parent");</div><div class='add'>+close_skel:</div><div class='add'>+	cgroup_preorder__destroy(skel);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_cgroup_mprog_ordering(void)</div><div class='add'>+{</div><div class='add'>+	int cg_parent = -1, sock_fd = -1;</div><div class='add'>+</div><div class='add'>+	cg_parent = test__join_cgroup("/parent");</div><div class='add'>+	if (!ASSERT_GE(cg_parent, 0, "join_cgroup /parent"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sock_fd = socket(AF_INET, SOCK_STREAM, 0);</div><div class='add'>+	if (!ASSERT_GE(sock_fd, 0, "socket"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ASSERT_OK(run_getsockopt_test(cg_parent, sock_fd, false), "getsockopt_test_1");</div><div class='add'>+	ASSERT_OK(run_getsockopt_test(cg_parent, sock_fd, true), "getsockopt_test_2");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	close(sock_fd);</div><div class='add'>+	close(cg_parent);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_preorder.c b/tools/testing/selftests/bpf/prog_tests/cgroup_preorder.c<br/>new file mode 100644<br/>index 000000000000..d4d583872fa2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cgroup_preorder.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/cgroup_preorder.c</a></div><div class='hunk'>@@ -0,0 +1,128 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "cgroup_helpers.h"</div><div class='add'>+#include "cgroup_preorder.skel.h"</div><div class='add'>+</div><div class='add'>+static int run_getsockopt_test(int cg_parent, int cg_child, int sock_fd, bool all_preorder)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_attach_opts, opts);</div><div class='add'>+	enum bpf_attach_type prog_c_atype, prog_c2_atype, prog_p_atype, prog_p2_atype;</div><div class='add'>+	int prog_c_fd, prog_c2_fd, prog_p_fd, prog_p2_fd;</div><div class='add'>+	struct cgroup_preorder *skel = NULL;</div><div class='add'>+	struct bpf_program *prog;</div><div class='add'>+	__u8 *result, buf;</div><div class='add'>+	socklen_t optlen;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	skel = cgroup_preorder__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "cgroup_preorder__open_and_load"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	buf = 0x00;</div><div class='add'>+	err = setsockopt(sock_fd, SOL_IP, IP_TOS, &amp;buf, 1);</div><div class='add'>+	if (!ASSERT_OK(err, "setsockopt"))</div><div class='add'>+		goto close_skel;</div><div class='add'>+</div><div class='add'>+	opts.flags = BPF_F_ALLOW_MULTI;</div><div class='add'>+	if (all_preorder)</div><div class='add'>+		opts.flags |= BPF_F_PREORDER;</div><div class='add'>+	prog = skel-&gt;progs.child;</div><div class='add'>+	prog_c_fd = bpf_program__fd(prog);</div><div class='add'>+	prog_c_atype = bpf_program__expected_attach_type(prog);</div><div class='add'>+	err = bpf_prog_attach_opts(prog_c_fd, cg_child, prog_c_atype, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach_opts-child"))</div><div class='add'>+		goto close_skel;</div><div class='add'>+</div><div class='add'>+	opts.flags = BPF_F_ALLOW_MULTI | BPF_F_PREORDER;</div><div class='add'>+	prog = skel-&gt;progs.child_2;</div><div class='add'>+	prog_c2_fd = bpf_program__fd(prog);</div><div class='add'>+	prog_c2_atype = bpf_program__expected_attach_type(prog);</div><div class='add'>+	err = bpf_prog_attach_opts(prog_c2_fd, cg_child, prog_c2_atype, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach_opts-child_2"))</div><div class='add'>+		goto detach_child;</div><div class='add'>+</div><div class='add'>+	optlen = 1;</div><div class='add'>+	err = getsockopt(sock_fd, SOL_IP, IP_TOS, &amp;buf, &amp;optlen);</div><div class='add'>+	if (!ASSERT_OK(err, "getsockopt"))</div><div class='add'>+		goto detach_child_2;</div><div class='add'>+</div><div class='add'>+	result = skel-&gt;bss-&gt;result;</div><div class='add'>+	if (all_preorder)</div><div class='add'>+		ASSERT_TRUE(result[0] == 1 &amp;&amp; result[1] == 2, "child only");</div><div class='add'>+	else</div><div class='add'>+		ASSERT_TRUE(result[0] == 2 &amp;&amp; result[1] == 1, "child only");</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;idx = 0;</div><div class='add'>+	memset(result, 0, 4);</div><div class='add'>+</div><div class='add'>+	opts.flags = BPF_F_ALLOW_MULTI;</div><div class='add'>+	if (all_preorder)</div><div class='add'>+		opts.flags |= BPF_F_PREORDER;</div><div class='add'>+	prog = skel-&gt;progs.parent;</div><div class='add'>+	prog_p_fd = bpf_program__fd(prog);</div><div class='add'>+	prog_p_atype = bpf_program__expected_attach_type(prog);</div><div class='add'>+	err = bpf_prog_attach_opts(prog_p_fd, cg_parent, prog_p_atype, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach_opts-parent"))</div><div class='add'>+		goto detach_child_2;</div><div class='add'>+</div><div class='add'>+	opts.flags = BPF_F_ALLOW_MULTI | BPF_F_PREORDER;</div><div class='add'>+	prog = skel-&gt;progs.parent_2;</div><div class='add'>+	prog_p2_fd = bpf_program__fd(prog);</div><div class='add'>+	prog_p2_atype = bpf_program__expected_attach_type(prog);</div><div class='add'>+	err = bpf_prog_attach_opts(prog_p2_fd, cg_parent, prog_p2_atype, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach_opts-parent_2"))</div><div class='add'>+		goto detach_parent;</div><div class='add'>+</div><div class='add'>+	err = getsockopt(sock_fd, SOL_IP, IP_TOS, &amp;buf, &amp;optlen);</div><div class='add'>+	if (!ASSERT_OK(err, "getsockopt"))</div><div class='add'>+		goto detach_parent_2;</div><div class='add'>+</div><div class='add'>+	if (all_preorder)</div><div class='add'>+		ASSERT_TRUE(result[0] == 3 &amp;&amp; result[1] == 4 &amp;&amp; result[2] == 1 &amp;&amp; result[3] == 2,</div><div class='add'>+			    "parent and child");</div><div class='add'>+	else</div><div class='add'>+		ASSERT_TRUE(result[0] == 4 &amp;&amp; result[1] == 2 &amp;&amp; result[2] == 1 &amp;&amp; result[3] == 3,</div><div class='add'>+			    "parent and child");</div><div class='add'>+</div><div class='add'>+detach_parent_2:</div><div class='add'>+	ASSERT_OK(bpf_prog_detach2(prog_p2_fd, cg_parent, prog_p2_atype),</div><div class='add'>+		  "bpf_prog_detach2-parent_2");</div><div class='add'>+detach_parent:</div><div class='add'>+	ASSERT_OK(bpf_prog_detach2(prog_p_fd, cg_parent, prog_p_atype),</div><div class='add'>+		  "bpf_prog_detach2-parent");</div><div class='add'>+detach_child_2:</div><div class='add'>+	ASSERT_OK(bpf_prog_detach2(prog_c2_fd, cg_child, prog_c2_atype),</div><div class='add'>+		  "bpf_prog_detach2-child_2");</div><div class='add'>+detach_child:</div><div class='add'>+	ASSERT_OK(bpf_prog_detach2(prog_c_fd, cg_child, prog_c_atype),</div><div class='add'>+		  "bpf_prog_detach2-child");</div><div class='add'>+close_skel:</div><div class='add'>+	cgroup_preorder__destroy(skel);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_cgroup_preorder(void)</div><div class='add'>+{</div><div class='add'>+	int cg_parent = -1, cg_child = -1, sock_fd = -1;</div><div class='add'>+</div><div class='add'>+	cg_parent = test__join_cgroup("/parent");</div><div class='add'>+	if (!ASSERT_GE(cg_parent, 0, "join_cgroup /parent"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	cg_child = test__join_cgroup("/parent/child");</div><div class='add'>+	if (!ASSERT_GE(cg_child, 0, "join_cgroup /parent/child"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sock_fd = socket(AF_INET, SOCK_STREAM, 0);</div><div class='add'>+	if (!ASSERT_GE(sock_fd, 0, "socket"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ASSERT_OK(run_getsockopt_test(cg_parent, cg_child, sock_fd, false), "getsockopt_test_1");</div><div class='add'>+	ASSERT_OK(run_getsockopt_test(cg_parent, cg_child, sock_fd, true), "getsockopt_test_2");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	close(sock_fd);</div><div class='add'>+	close(cg_child);</div><div class='add'>+	close(cg_parent);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c b/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c<br/>index 64abba72ac10..37c1cc52ed98 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c</a></div><div class='hunk'>@@ -10,12 +10,18 @@</div><div class='ctx'> static int run_test(int cgroup_fd, int server_fd, bool classid)</div><div class='ctx'> {</div><div class='ctx'> 	struct connect4_dropper *skel;</div><div class='del'>-	int fd, err = 0;</div><div class='add'>+	int fd, err = 0, port;</div><div class='ctx'> </div><div class='ctx'> 	skel = connect4_dropper__open_and_load();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "skel_open"))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='add'>+	port = get_socket_local_port(server_fd);</div><div class='add'>+	if (!ASSERT_GE(port, 0, "get_socket_local_port"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;port = ntohs(port);</div><div class='add'>+</div><div class='ctx'> 	skel-&gt;links.connect_v4_dropper =</div><div class='ctx'> 		bpf_program__attach_cgroup(skel-&gt;progs.connect_v4_dropper,</div><div class='ctx'> 					   cgroup_fd);</div><div class='hunk'>@@ -48,10 +54,9 @@ void test_cgroup_v1v2(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct network_helper_opts opts = {};</div><div class='ctx'> 	int server_fd, client_fd, cgroup_fd;</div><div class='del'>-	static const int port = 60120;</div><div class='ctx'> </div><div class='ctx'> 	/* Step 1: Check base connectivity works without any BPF. */</div><div class='del'>-	server_fd = start_server(AF_INET, SOCK_STREAM, NULL, port, 0);</div><div class='add'>+	server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);</div><div class='ctx'> 	if (!ASSERT_GE(server_fd, 0, "server_fd"))</div><div class='ctx'> 		return;</div><div class='ctx'> 	client_fd = connect_to_fd_opts(server_fd, &amp;opts);</div><div class='hunk'>@@ -66,7 +71,7 @@ void test_cgroup_v1v2(void)</div><div class='ctx'> 	cgroup_fd = test__join_cgroup("/connect_dropper");</div><div class='ctx'> 	if (!ASSERT_GE(cgroup_fd, 0, "cgroup_fd"))</div><div class='ctx'> 		return;</div><div class='del'>-	server_fd = start_server(AF_INET, SOCK_STREAM, NULL, port, 0);</div><div class='add'>+	server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);</div><div class='ctx'> 	if (!ASSERT_GE(server_fd, 0, "server_fd")) {</div><div class='ctx'> 		close(cgroup_fd);</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_xattr.c b/tools/testing/selftests/bpf/prog_tests/cgroup_xattr.c<br/>new file mode 100644<br/>index 000000000000..5ad904e9d15d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cgroup_xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/cgroup_xattr.c</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "cgroup_helpers.h"</div><div class='add'>+</div><div class='add'>+#include "read_cgroupfs_xattr.skel.h"</div><div class='add'>+#include "cgroup_read_xattr.skel.h"</div><div class='add'>+</div><div class='add'>+#define CGROUP_FS_PARENT "foo/"</div><div class='add'>+#define CGROUP_FS_CHILD CGROUP_FS_PARENT "bar/"</div><div class='add'>+#define TMP_FILE "/tmp/selftests_cgroup_xattr"</div><div class='add'>+</div><div class='add'>+static const char xattr_value_a[] = "bpf_selftest_value_a";</div><div class='add'>+static const char xattr_value_b[] = "bpf_selftest_value_b";</div><div class='add'>+static const char xattr_name[] = "user.bpf_test";</div><div class='add'>+</div><div class='add'>+static void test_read_cgroup_xattr(void)</div><div class='add'>+{</div><div class='add'>+	int tmp_fd, parent_cgroup_fd = -1, child_cgroup_fd = -1;</div><div class='add'>+	struct read_cgroupfs_xattr *skel = NULL;</div><div class='add'>+</div><div class='add'>+	parent_cgroup_fd = test__join_cgroup(CGROUP_FS_PARENT);</div><div class='add'>+	if (!ASSERT_OK_FD(parent_cgroup_fd, "create parent cgroup"))</div><div class='add'>+		return;</div><div class='add'>+	if (!ASSERT_OK(set_cgroup_xattr(CGROUP_FS_PARENT, xattr_name, xattr_value_a),</div><div class='add'>+		       "set parent xattr"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	child_cgroup_fd = test__join_cgroup(CGROUP_FS_CHILD);</div><div class='add'>+	if (!ASSERT_OK_FD(child_cgroup_fd, "create child cgroup"))</div><div class='add'>+		goto out;</div><div class='add'>+	if (!ASSERT_OK(set_cgroup_xattr(CGROUP_FS_CHILD, xattr_name, xattr_value_b),</div><div class='add'>+		       "set child xattr"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skel = read_cgroupfs_xattr__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "read_cgroupfs_xattr__open_and_load"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;target_pid = sys_gettid();</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(read_cgroupfs_xattr__attach(skel), "read_cgroupfs_xattr__attach"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	tmp_fd = open(TMP_FILE, O_RDONLY | O_CREAT);</div><div class='add'>+	ASSERT_OK_FD(tmp_fd, "open tmp file");</div><div class='add'>+	close(tmp_fd);</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(skel-&gt;bss-&gt;found_value_a, "found_value_a");</div><div class='add'>+	ASSERT_TRUE(skel-&gt;bss-&gt;found_value_b, "found_value_b");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	close(child_cgroup_fd);</div><div class='add'>+	close(parent_cgroup_fd);</div><div class='add'>+	read_cgroupfs_xattr__destroy(skel);</div><div class='add'>+	unlink(TMP_FILE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_cgroup_xattr(void)</div><div class='add'>+{</div><div class='add'>+	RUN_TESTS(cgroup_read_xattr);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("read_cgroupfs_xattr"))</div><div class='add'>+		test_read_cgroup_xattr();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/cgrp_kfunc.c b/tools/testing/selftests/bpf/prog_tests/cgrp_kfunc.c<br/>index adda85f97058..4b42fbc96efc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cgrp_kfunc.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cgrp_kfunc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cgrp_kfunc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/cgrp_kfunc.c</a></div><div class='hunk'>@@ -4,6 +4,8 @@</div><div class='ctx'> #define _GNU_SOURCE</div><div class='ctx'> #include &lt;cgroup_helpers.h&gt;</div><div class='ctx'> #include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;sched.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cgrp_kfunc_failure.skel.h"</div><div class='ctx'> #include "cgrp_kfunc_success.skel.h"</div><div class='hunk'>@@ -87,6 +89,72 @@ static const char * const success_tests[] = {</div><div class='ctx'> 	"test_cgrp_from_id",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void test_cgrp_from_id_ns(void)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, opts);</div><div class='add'>+	struct cgrp_kfunc_success *skel;</div><div class='add'>+	struct bpf_program *prog;</div><div class='add'>+	int pid, pipe_fd[2];</div><div class='add'>+</div><div class='add'>+	skel = open_load_cgrp_kfunc_skel();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "open_load_skel"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(skel-&gt;bss-&gt;err, "pre_mkdir_err"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	prog = skel-&gt;progs.test_cgrp_from_id_ns;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(pipe(pipe_fd), "pipe"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	if (!ASSERT_GE(pid, 0, "fork result")) {</div><div class='add'>+		close(pipe_fd[0]);</div><div class='add'>+		close(pipe_fd[1]);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pid == 0) {</div><div class='add'>+		int ret = 0;</div><div class='add'>+</div><div class='add'>+		close(pipe_fd[0]);</div><div class='add'>+</div><div class='add'>+		if (!ASSERT_GE(cgroup_setup_and_join("cgrp_from_id_ns"), 0, "join cgroup"))</div><div class='add'>+			exit(1);</div><div class='add'>+</div><div class='add'>+		if (!ASSERT_OK(unshare(CLONE_NEWCGROUP), "unshare cgns"))</div><div class='add'>+			exit(1);</div><div class='add'>+</div><div class='add'>+		ret = bpf_prog_test_run_opts(bpf_program__fd(prog), &amp;opts);</div><div class='add'>+		if (!ASSERT_OK(ret, "test run ret"))</div><div class='add'>+			exit(1);</div><div class='add'>+</div><div class='add'>+		if (!ASSERT_OK(opts.retval, "test run retval"))</div><div class='add'>+			exit(1);</div><div class='add'>+</div><div class='add'>+		if (!ASSERT_EQ(write(pipe_fd[1], &amp;ret, sizeof(ret)), sizeof(ret), "write pipe"))</div><div class='add'>+			exit(1);</div><div class='add'>+</div><div class='add'>+		exit(0);</div><div class='add'>+	} else {</div><div class='add'>+		int res;</div><div class='add'>+</div><div class='add'>+		close(pipe_fd[1]);</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(read(pipe_fd[0], &amp;res, sizeof(res)), sizeof(res), "read res");</div><div class='add'>+		ASSERT_EQ(waitpid(pid, NULL, 0), pid, "wait on child");</div><div class='add'>+</div><div class='add'>+		remove_cgroup_pid("cgrp_from_id_ns", pid);</div><div class='add'>+</div><div class='add'>+		ASSERT_OK(res, "result from run");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	close(pipe_fd[0]);</div><div class='add'>+cleanup:</div><div class='add'>+	cgrp_kfunc_success__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_cgrp_kfunc(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err;</div><div class='hunk'>@@ -102,6 +170,9 @@ void test_cgrp_kfunc(void)</div><div class='ctx'> 		run_success_test(success_tests[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (test__start_subtest("test_cgrp_from_id_ns"))</div><div class='add'>+		test_cgrp_from_id_ns();</div><div class='add'>+</div><div class='ctx'> 	RUN_TESTS(cgrp_kfunc_failure);</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c b/tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c<br/>deleted file mode 100644<br/>index 7526de379081..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,107 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include "bpf/libbpf.h"</div><div class='del'>-#include "changes_pkt_data_freplace.skel.h"</div><div class='del'>-#include "changes_pkt_data.skel.h"</div><div class='del'>-#include &lt;test_progs.h&gt;</div><div class='del'>-</div><div class='del'>-static void print_verifier_log(const char *log)</div><div class='del'>-{</div><div class='del'>-	if (env.verbosity &gt;= VERBOSE_VERY)</div><div class='del'>-		fprintf(stdout, "VERIFIER LOG:\n=============\n%s=============\n", log);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_aux(const char *main_prog_name,</div><div class='del'>-		     const char *to_be_replaced,</div><div class='del'>-		     const char *replacement,</div><div class='del'>-		     bool expect_load)</div><div class='del'>-{</div><div class='del'>-	struct changes_pkt_data_freplace *freplace = NULL;</div><div class='del'>-	struct bpf_program *freplace_prog = NULL;</div><div class='del'>-	struct bpf_program *main_prog = NULL;</div><div class='del'>-	LIBBPF_OPTS(bpf_object_open_opts, opts);</div><div class='del'>-	struct changes_pkt_data *main = NULL;</div><div class='del'>-	char log[16*1024];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	opts.kernel_log_buf = log;</div><div class='del'>-	opts.kernel_log_size = sizeof(log);</div><div class='del'>-	if (env.verbosity &gt;= VERBOSE_SUPER)</div><div class='del'>-		opts.kernel_log_level = 1 | 2 | 4;</div><div class='del'>-	main = changes_pkt_data__open_opts(&amp;opts);</div><div class='del'>-	if (!ASSERT_OK_PTR(main, "changes_pkt_data__open"))</div><div class='del'>-		goto out;</div><div class='del'>-	main_prog = bpf_object__find_program_by_name(main-&gt;obj, main_prog_name);</div><div class='del'>-	if (!ASSERT_OK_PTR(main_prog, "main_prog"))</div><div class='del'>-		goto out;</div><div class='del'>-	bpf_program__set_autoload(main_prog, true);</div><div class='del'>-	err = changes_pkt_data__load(main);</div><div class='del'>-	print_verifier_log(log);</div><div class='del'>-	if (!ASSERT_OK(err, "changes_pkt_data__load"))</div><div class='del'>-		goto out;</div><div class='del'>-	freplace = changes_pkt_data_freplace__open_opts(&amp;opts);</div><div class='del'>-	if (!ASSERT_OK_PTR(freplace, "changes_pkt_data_freplace__open"))</div><div class='del'>-		goto out;</div><div class='del'>-	freplace_prog = bpf_object__find_program_by_name(freplace-&gt;obj, replacement);</div><div class='del'>-	if (!ASSERT_OK_PTR(freplace_prog, "freplace_prog"))</div><div class='del'>-		goto out;</div><div class='del'>-	bpf_program__set_autoload(freplace_prog, true);</div><div class='del'>-	bpf_program__set_autoattach(freplace_prog, true);</div><div class='del'>-	bpf_program__set_attach_target(freplace_prog,</div><div class='del'>-				       bpf_program__fd(main_prog),</div><div class='del'>-				       to_be_replaced);</div><div class='del'>-	err = changes_pkt_data_freplace__load(freplace);</div><div class='del'>-	print_verifier_log(log);</div><div class='del'>-	if (expect_load) {</div><div class='del'>-		ASSERT_OK(err, "changes_pkt_data_freplace__load");</div><div class='del'>-	} else {</div><div class='del'>-		ASSERT_ERR(err, "changes_pkt_data_freplace__load");</div><div class='del'>-		ASSERT_HAS_SUBSTR(log, "Extension program changes packet data", "error log");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	changes_pkt_data_freplace__destroy(freplace);</div><div class='del'>-	changes_pkt_data__destroy(main);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* There are two global subprograms in both changes_pkt_data.skel.h:</div><div class='del'>- * - one changes packet data;</div><div class='del'>- * - another does not.</div><div class='del'>- * It is ok to freplace subprograms that change packet data with those</div><div class='del'>- * that either do or do not. It is only ok to freplace subprograms</div><div class='del'>- * that do not change packet data with those that do not as well.</div><div class='del'>- * The below tests check outcomes for each combination of such freplace.</div><div class='del'>- * Also test a case when main subprogram itself is replaced and is a single</div><div class='del'>- * subprogram in a program.</div><div class='del'>- */</div><div class='del'>-void test_changes_pkt_data_freplace(void)</div><div class='del'>-{</div><div class='del'>-	struct {</div><div class='del'>-		const char *main;</div><div class='del'>-		const char *to_be_replaced;</div><div class='del'>-		bool changes;</div><div class='del'>-	} mains[] = {</div><div class='del'>-		{ "main_with_subprogs",   "changes_pkt_data",         true },</div><div class='del'>-		{ "main_with_subprogs",   "does_not_change_pkt_data", false },</div><div class='del'>-		{ "main_changes",         "main_changes",             true },</div><div class='del'>-		{ "main_does_not_change", "main_does_not_change",     false },</div><div class='del'>-	};</div><div class='del'>-	struct {</div><div class='del'>-		const char *func;</div><div class='del'>-		bool changes;</div><div class='del'>-	} replacements[] = {</div><div class='del'>-		{ "changes_pkt_data",         true },</div><div class='del'>-		{ "does_not_change_pkt_data", false }</div><div class='del'>-	};</div><div class='del'>-	char buf[64];</div><div class='del'>-</div><div class='del'>-	for (int i = 0; i &lt; ARRAY_SIZE(mains); ++i) {</div><div class='del'>-		for (int j = 0; j &lt; ARRAY_SIZE(replacements); ++j) {</div><div class='del'>-			snprintf(buf, sizeof(buf), "%s_with_%s",</div><div class='del'>-				 mains[i].to_be_replaced, replacements[j].func);</div><div class='del'>-			if (!test__start_subtest(buf))</div><div class='del'>-				continue;</div><div class='del'>-			test_aux(mains[i].main, mains[i].to_be_replaced, replacements[j].func,</div><div class='del'>-				 mains[i].changes || !replacements[j].changes);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/check_mtu.c b/tools/testing/selftests/bpf/prog_tests/check_mtu.c<br/>index 2a9a30650350..65b4512967e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/check_mtu.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/check_mtu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/check_mtu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/check_mtu.c</a></div><div class='hunk'>@@ -153,6 +153,26 @@ static void test_check_mtu_run_tc(struct test_check_mtu *skel,</div><div class='ctx'> 	ASSERT_EQ(mtu_result, mtu_expect, "MTU-compare-user");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_chk_segs_flag(struct test_check_mtu *skel, __u32 mtu)</div><div class='add'>+{</div><div class='add'>+	int err, prog_fd = bpf_program__fd(skel-&gt;progs.tc_chk_segs_flag);</div><div class='add'>+	struct __sk_buff skb = {</div><div class='add'>+		.gso_size = 10,</div><div class='add'>+	};</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts,</div><div class='add'>+		    .data_in = &amp;pkt_v4,</div><div class='add'>+		    .data_size_in = sizeof(pkt_v4),</div><div class='add'>+		    .ctx_in = &amp;skb,</div><div class='add'>+		    .ctx_size_in = sizeof(skb),</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	/* Lower the mtu to test the BPF_MTU_CHK_SEGS */</div><div class='add'>+	SYS_NOFAIL("ip link set dev lo mtu 10");</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+	SYS_NOFAIL("ip link set dev lo mtu %u", mtu);</div><div class='add'>+	ASSERT_OK(err, "test_run");</div><div class='add'>+	ASSERT_EQ(topts.retval, BPF_OK, "retval");</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void test_check_mtu_tc(__u32 mtu, __u32 ifindex)</div><div class='ctx'> {</div><div class='hunk'>@@ -177,11 +197,12 @@ static void test_check_mtu_tc(__u32 mtu, __u32 ifindex)</div><div class='ctx'> 	test_check_mtu_run_tc(skel, skel-&gt;progs.tc_minus_delta, mtu);</div><div class='ctx'> 	test_check_mtu_run_tc(skel, skel-&gt;progs.tc_input_len, mtu);</div><div class='ctx'> 	test_check_mtu_run_tc(skel, skel-&gt;progs.tc_input_len_exceed, mtu);</div><div class='add'>+	test_chk_segs_flag(skel, mtu);</div><div class='ctx'> cleanup:</div><div class='ctx'> 	test_check_mtu__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_check_mtu(void)</div><div class='add'>+void test_ns_check_mtu(void)</div><div class='ctx'> {</div><div class='ctx'> 	int mtu_lo;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/cls_redirect.c b/tools/testing/selftests/bpf/prog_tests/cls_redirect.c<br/>index 34b59f6baca1..7488a7606e6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cls_redirect.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cls_redirect.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cls_redirect.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/cls_redirect.c</a></div><div class='hunk'>@@ -22,79 +22,37 @@</div><div class='ctx'> </div><div class='ctx'> static int duration = 0;</div><div class='ctx'> </div><div class='del'>-struct addr_port {</div><div class='del'>-	in_port_t port;</div><div class='del'>-	union {</div><div class='del'>-		struct in_addr in_addr;</div><div class='del'>-		struct in6_addr in6_addr;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct tuple {</div><div class='del'>-	int family;</div><div class='del'>-	struct addr_port src;</div><div class='del'>-	struct addr_port dst;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static bool fill_addr_port(const struct sockaddr *sa, struct addr_port *ap)</div><div class='del'>-{</div><div class='del'>-	const struct sockaddr_in6 *in6;</div><div class='del'>-	const struct sockaddr_in *in;</div><div class='del'>-</div><div class='del'>-	switch (sa-&gt;sa_family) {</div><div class='del'>-	case AF_INET:</div><div class='del'>-		in = (const struct sockaddr_in *)sa;</div><div class='del'>-		ap-&gt;in_addr = in-&gt;sin_addr;</div><div class='del'>-		ap-&gt;port = in-&gt;sin_port;</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	case AF_INET6:</div><div class='del'>-		in6 = (const struct sockaddr_in6 *)sa;</div><div class='del'>-		ap-&gt;in6_addr = in6-&gt;sin6_addr;</div><div class='del'>-		ap-&gt;port = in6-&gt;sin6_port;</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static bool set_up_conn(const struct sockaddr *addr, socklen_t len, int type,</div><div class='del'>-			int *server, int *conn, struct tuple *tuple)</div><div class='add'>+static bool set_up_conn(const struct sockaddr_storage *addr, socklen_t len, int type,</div><div class='add'>+			int *server, int *conn,</div><div class='add'>+			struct sockaddr_storage *src,</div><div class='add'>+			struct sockaddr_storage *dst)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_storage ss;</div><div class='ctx'> 	socklen_t slen = sizeof(ss);</div><div class='del'>-	struct sockaddr *sa = (struct sockaddr *)&amp;ss;</div><div class='ctx'> </div><div class='del'>-	*server = start_server_addr(type, (struct sockaddr_storage *)addr, len, NULL);</div><div class='add'>+	*server = start_server_addr(type, addr, len, NULL);</div><div class='ctx'> 	if (*server &lt; 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (CHECK_FAIL(getsockname(*server, sa, &amp;slen)))</div><div class='add'>+	if (CHECK_FAIL(getsockname(*server, (struct sockaddr *)&amp;ss, &amp;slen)))</div><div class='ctx'> 		goto close_server;</div><div class='ctx'> </div><div class='del'>-	*conn = connect_to_addr(type, (struct sockaddr_storage *)sa, slen, NULL);</div><div class='add'>+	*conn = connect_to_addr(type, &amp;ss, slen, NULL);</div><div class='ctx'> 	if (*conn &lt; 0)</div><div class='ctx'> 		goto close_server;</div><div class='ctx'> </div><div class='ctx'> 	/* We want to simulate packets arriving at conn, so we have to</div><div class='ctx'> 	 * swap src and dst.</div><div class='ctx'> 	 */</div><div class='del'>-	slen = sizeof(ss);</div><div class='del'>-	if (CHECK_FAIL(getsockname(*conn, sa, &amp;slen)))</div><div class='del'>-		goto close_conn;</div><div class='del'>-</div><div class='del'>-	if (CHECK_FAIL(!fill_addr_port(sa, &amp;tuple-&gt;dst)))</div><div class='add'>+	slen = sizeof(*dst);</div><div class='add'>+	if (CHECK_FAIL(getsockname(*conn, (struct sockaddr *)dst, &amp;slen)))</div><div class='ctx'> 		goto close_conn;</div><div class='ctx'> </div><div class='del'>-	slen = sizeof(ss);</div><div class='del'>-	if (CHECK_FAIL(getpeername(*conn, sa, &amp;slen)))</div><div class='add'>+	slen = sizeof(*src);</div><div class='add'>+	if (CHECK_FAIL(getpeername(*conn, (struct sockaddr *)src, &amp;slen)))</div><div class='ctx'> 		goto close_conn;</div><div class='ctx'> </div><div class='del'>-	if (CHECK_FAIL(!fill_addr_port(sa, &amp;tuple-&gt;src)))</div><div class='del'>-		goto close_conn;</div><div class='del'>-</div><div class='del'>-	tuple-&gt;family = ss.ss_family;</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='ctx'> close_conn:</div><div class='hunk'>@@ -110,17 +68,16 @@ static socklen_t prepare_addr(struct sockaddr_storage *addr, int family)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_in *addr4;</div><div class='ctx'> 	struct sockaddr_in6 *addr6;</div><div class='add'>+	memset(addr, 0, sizeof(*addr));</div><div class='ctx'> </div><div class='ctx'> 	switch (family) {</div><div class='ctx'> 	case AF_INET:</div><div class='ctx'> 		addr4 = (struct sockaddr_in *)addr;</div><div class='del'>-		memset(addr4, 0, sizeof(*addr4));</div><div class='ctx'> 		addr4-&gt;sin_family = family;</div><div class='ctx'> 		addr4-&gt;sin_addr.s_addr = htonl(INADDR_LOOPBACK);</div><div class='ctx'> 		return sizeof(*addr4);</div><div class='ctx'> 	case AF_INET6:</div><div class='ctx'> 		addr6 = (struct sockaddr_in6 *)addr;</div><div class='del'>-		memset(addr6, 0, sizeof(*addr6));</div><div class='ctx'> 		addr6-&gt;sin6_family = family;</div><div class='ctx'> 		addr6-&gt;sin6_addr = in6addr_loopback;</div><div class='ctx'> 		return sizeof(*addr6);</div><div class='hunk'>@@ -242,9 +199,15 @@ static void encap_init(encap_headers_t *encap, uint8_t hop_count, uint8_t proto)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static size_t build_input(const struct test_cfg *test, void *const buf,</div><div class='del'>-			  const struct tuple *tuple)</div><div class='add'>+			  const struct sockaddr_storage *src,</div><div class='add'>+			  const struct sockaddr_storage *dst)</div><div class='ctx'> {</div><div class='del'>-	in_port_t sport = tuple-&gt;src.port;</div><div class='add'>+	struct sockaddr_in6 *src_in6 = (struct sockaddr_in6 *)src;</div><div class='add'>+	struct sockaddr_in6 *dst_in6 = (struct sockaddr_in6 *)dst;</div><div class='add'>+	struct sockaddr_in *src_in = (struct sockaddr_in *)src;</div><div class='add'>+	struct sockaddr_in *dst_in = (struct sockaddr_in *)dst;</div><div class='add'>+	sa_family_t family = src-&gt;ss_family;</div><div class='add'>+	in_port_t sport, dport;</div><div class='ctx'> 	encap_headers_t encap;</div><div class='ctx'> 	struct iphdr ip;</div><div class='ctx'> 	struct ipv6hdr ipv6;</div><div class='hunk'>@@ -254,8 +217,11 @@ static size_t build_input(const struct test_cfg *test, void *const buf,</div><div class='ctx'> 	uint8_t *p = buf;</div><div class='ctx'> 	int proto;</div><div class='ctx'> </div><div class='add'>+	sport = (family == AF_INET) ? src_in-&gt;sin_port : src_in6-&gt;sin6_port;</div><div class='add'>+	dport = (family == AF_INET) ? dst_in-&gt;sin_port : dst_in6-&gt;sin6_port;</div><div class='add'>+</div><div class='ctx'> 	proto = IPPROTO_IPIP;</div><div class='del'>-	if (tuple-&gt;family == AF_INET6)</div><div class='add'>+	if (family == AF_INET6)</div><div class='ctx'> 		proto = IPPROTO_IPV6;</div><div class='ctx'> </div><div class='ctx'> 	encap_init(&amp;encap, test-&gt;hops == ONE_HOP ? 1 : 0, proto);</div><div class='hunk'>@@ -270,15 +236,15 @@ static size_t build_input(const struct test_cfg *test, void *const buf,</div><div class='ctx'> 	if (test-&gt;type == UDP)</div><div class='ctx'> 		proto = IPPROTO_UDP;</div><div class='ctx'> </div><div class='del'>-	switch (tuple-&gt;family) {</div><div class='add'>+	switch (family) {</div><div class='ctx'> 	case AF_INET:</div><div class='ctx'> 		ip = (struct iphdr){</div><div class='ctx'> 			.ihl = 5,</div><div class='ctx'> 			.version = 4,</div><div class='ctx'> 			.ttl = IPDEFTTL,</div><div class='ctx'> 			.protocol = proto,</div><div class='del'>-			.saddr = tuple-&gt;src.in_addr.s_addr,</div><div class='del'>-			.daddr = tuple-&gt;dst.in_addr.s_addr,</div><div class='add'>+			.saddr = src_in-&gt;sin_addr.s_addr,</div><div class='add'>+			.daddr = dst_in-&gt;sin_addr.s_addr,</div><div class='ctx'> 		};</div><div class='ctx'> 		p = mempcpy(p, &amp;ip, sizeof(ip));</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -287,8 +253,8 @@ static size_t build_input(const struct test_cfg *test, void *const buf,</div><div class='ctx'> 			.version = 6,</div><div class='ctx'> 			.hop_limit = IPDEFTTL,</div><div class='ctx'> 			.nexthdr = proto,</div><div class='del'>-			.saddr = tuple-&gt;src.in6_addr,</div><div class='del'>-			.daddr = tuple-&gt;dst.in6_addr,</div><div class='add'>+			.saddr = src_in6-&gt;sin6_addr,</div><div class='add'>+			.daddr = dst_in6-&gt;sin6_addr,</div><div class='ctx'> 		};</div><div class='ctx'> 		p = mempcpy(p, &amp;ipv6, sizeof(ipv6));</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -303,18 +269,16 @@ static size_t build_input(const struct test_cfg *test, void *const buf,</div><div class='ctx'> 	case TCP:</div><div class='ctx'> 		tcp = (struct tcphdr){</div><div class='ctx'> 			.source = sport,</div><div class='del'>-			.dest = tuple-&gt;dst.port,</div><div class='add'>+			.dest = dport,</div><div class='add'>+			.syn = (test-&gt;flags == SYN),</div><div class='add'>+			.ack = (test-&gt;flags == ACK),</div><div class='ctx'> 		};</div><div class='del'>-		if (test-&gt;flags == SYN)</div><div class='del'>-			tcp.syn = true;</div><div class='del'>-		if (test-&gt;flags == ACK)</div><div class='del'>-			tcp.ack = true;</div><div class='ctx'> 		p = mempcpy(p, &amp;tcp, sizeof(tcp));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case UDP:</div><div class='ctx'> 		udp = (struct udphdr){</div><div class='ctx'> 			.source = sport,</div><div class='del'>-			.dest = tuple-&gt;dst.port,</div><div class='add'>+			.dest = dport,</div><div class='ctx'> 		};</div><div class='ctx'> 		p = mempcpy(p, &amp;udp, sizeof(udp));</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -339,27 +303,26 @@ static void test_cls_redirect_common(struct bpf_program *prog)</div><div class='ctx'> 	LIBBPF_OPTS(bpf_test_run_opts, tattr);</div><div class='ctx'> 	int families[] = { AF_INET, AF_INET6 };</div><div class='ctx'> 	struct sockaddr_storage ss;</div><div class='del'>-	struct sockaddr *addr;</div><div class='ctx'> 	socklen_t slen;</div><div class='ctx'> 	int i, j, err, prog_fd;</div><div class='ctx'> 	int servers[__NR_KIND][ARRAY_SIZE(families)] = {};</div><div class='ctx'> 	int conns[__NR_KIND][ARRAY_SIZE(families)] = {};</div><div class='del'>-	struct tuple tuples[__NR_KIND][ARRAY_SIZE(families)];</div><div class='add'>+	struct sockaddr_storage srcs[__NR_KIND][ARRAY_SIZE(families)];</div><div class='add'>+	struct sockaddr_storage dsts[__NR_KIND][ARRAY_SIZE(families)];</div><div class='ctx'> </div><div class='del'>-	addr = (struct sockaddr *)&amp;ss;</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(families); i++) {</div><div class='ctx'> 		slen = prepare_addr(&amp;ss, families[i]);</div><div class='ctx'> 		if (CHECK_FAIL(!slen))</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> </div><div class='del'>-		if (CHECK_FAIL(!set_up_conn(addr, slen, SOCK_DGRAM,</div><div class='add'>+		if (CHECK_FAIL(!set_up_conn(&amp;ss, slen, SOCK_DGRAM,</div><div class='ctx'> 					    &amp;servers[UDP][i], &amp;conns[UDP][i],</div><div class='del'>-					    &amp;tuples[UDP][i])))</div><div class='add'>+					    &amp;srcs[UDP][i], &amp;dsts[UDP][i])))</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> </div><div class='del'>-		if (CHECK_FAIL(!set_up_conn(addr, slen, SOCK_STREAM,</div><div class='add'>+		if (CHECK_FAIL(!set_up_conn(&amp;ss, slen, SOCK_STREAM,</div><div class='ctx'> 					    &amp;servers[TCP][i], &amp;conns[TCP][i],</div><div class='del'>-					    &amp;tuples[TCP][i])))</div><div class='add'>+					    &amp;srcs[TCP][i], &amp;dsts[TCP][i])))</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -368,11 +331,12 @@ static void test_cls_redirect_common(struct bpf_program *prog)</div><div class='ctx'> 		struct test_cfg *test = &amp;tests[i];</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; ARRAY_SIZE(families); j++) {</div><div class='del'>-			struct tuple *tuple = &amp;tuples[test-&gt;type][j];</div><div class='add'>+			struct sockaddr_storage *src = &amp;srcs[test-&gt;type][j];</div><div class='add'>+			struct sockaddr_storage *dst = &amp;dsts[test-&gt;type][j];</div><div class='ctx'> 			char input[256];</div><div class='ctx'> 			char tmp[256];</div><div class='ctx'> </div><div class='del'>-			test_str(tmp, sizeof(tmp), test, tuple-&gt;family);</div><div class='add'>+			test_str(tmp, sizeof(tmp), test, families[j]);</div><div class='ctx'> 			if (!test__start_subtest(tmp))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='hunk'>@@ -380,7 +344,7 @@ static void test_cls_redirect_common(struct bpf_program *prog)</div><div class='ctx'> 			tattr.data_size_out = sizeof(tmp);</div><div class='ctx'> </div><div class='ctx'> 			tattr.data_in = input;</div><div class='del'>-			tattr.data_size_in = build_input(test, input, tuple);</div><div class='add'>+			tattr.data_size_in = build_input(test, input, src, dst);</div><div class='ctx'> 			if (CHECK_FAIL(!tattr.data_size_in))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/compute_live_registers.c b/tools/testing/selftests/bpf/prog_tests/compute_live_registers.c<br/>new file mode 100644<br/>index 000000000000..285f20241fe1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/compute_live_registers.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/compute_live_registers.c</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include "compute_live_registers.skel.h"</div><div class='add'>+#include "test_progs.h"</div><div class='add'>+</div><div class='add'>+void test_compute_live_registers(void)</div><div class='add'>+{</div><div class='add'>+	RUN_TESTS(compute_live_registers);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/core_reloc.c b/tools/testing/selftests/bpf/prog_tests/core_reloc.c<br/>index e10ea92c3fe2..08963c82f30b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/core_reloc.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/core_reloc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/core_reloc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/core_reloc.c</a></div><div class='hunk'>@@ -85,11 +85,11 @@ static int duration = 0;</div><div class='ctx'> #define NESTING_ERR_CASE(name) {					\</div><div class='ctx'> 	NESTING_CASE_COMMON(name),					\</div><div class='ctx'> 	.fails = true,							\</div><div class='del'>-	.run_btfgen_fails = true,							\</div><div class='add'>+	.run_btfgen_fails = true,					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define ARRAYS_DATA(struct_name) STRUCT_TO_CHAR_PTR(struct_name) {	\</div><div class='del'>-	.a = { [2] = 1 },						\</div><div class='add'>+	.a = { [2] = 1, [3] = 11 },					\</div><div class='ctx'> 	.b = { [1] = { [2] = { [3] = 2 } } },				\</div><div class='ctx'> 	.c = { [1] = { .c =  3 } },					\</div><div class='ctx'> 	.d = { [0] = { [0] = { .d = 4 } } },				\</div><div class='hunk'>@@ -108,6 +108,7 @@ static int duration = 0;</div><div class='ctx'> 	.input_len = sizeof(struct core_reloc_##name),			\</div><div class='ctx'> 	.output = STRUCT_TO_CHAR_PTR(core_reloc_arrays_output) {	\</div><div class='ctx'> 		.a2   = 1,						\</div><div class='add'>+		.a3   = 12,						\</div><div class='ctx'> 		.b123 = 2,						\</div><div class='ctx'> 		.c1c  = 3,						\</div><div class='ctx'> 		.d00d = 4,						\</div><div class='hunk'>@@ -602,6 +603,7 @@ static const struct core_reloc_test_case test_cases[] = {</div><div class='ctx'> 	ARRAYS_ERR_CASE(arrays___err_non_array),</div><div class='ctx'> 	ARRAYS_ERR_CASE(arrays___err_wrong_val_type),</div><div class='ctx'> 	ARRAYS_ERR_CASE(arrays___err_bad_zero_sz_arr),</div><div class='add'>+	ARRAYS_ERR_CASE(arrays___err_bad_signed_arr_elem_sz),</div><div class='ctx'> </div><div class='ctx'> 	/* enum/ptr/int handling scenarios */</div><div class='ctx'> 	PRIMITIVES_CASE(primitives),</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/cpumask.c b/tools/testing/selftests/bpf/prog_tests/cpumask.c<br/>index e58a04654238..6c45330a5ca3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cpumask.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/cpumask.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/cpumask.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/cpumask.c</a></div><div class='hunk'>@@ -25,6 +25,10 @@ static const char * const cpumask_success_testcases[] = {</div><div class='ctx'> 	"test_global_mask_nested_deep_rcu",</div><div class='ctx'> 	"test_global_mask_nested_deep_array_rcu",</div><div class='ctx'> 	"test_cpumask_weight",</div><div class='add'>+	"test_refcount_null_tracking",</div><div class='add'>+	"test_populate_reject_small_mask",</div><div class='add'>+	"test_populate_reject_unaligned",</div><div class='add'>+	"test_populate",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void verify_success(const char *prog_name)</div><div class='hunk'>@@ -78,6 +82,5 @@ void test_cpumask(void)</div><div class='ctx'> 		verify_success(cpumask_success_testcases[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	RUN_TESTS(cpumask_success);</div><div class='ctx'> 	RUN_TESTS(cpumask_failure);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c b/tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c<br/>new file mode 100644<br/>index 000000000000..6c2b0c3dbcd8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c</a></div><div class='hunk'>@@ -0,0 +1,285 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Google */</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;bpf/libbpf.h&gt;</div><div class='add'>+#include &lt;bpf/btf.h&gt;</div><div class='add'>+#include "dmabuf_iter.skel.h"</div><div class='add'>+</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-buf.h&gt;</div><div class='add'>+#include &lt;linux/dma-heap.h&gt;</div><div class='add'>+#include &lt;linux/udmabuf.h&gt;</div><div class='add'>+</div><div class='add'>+static int udmabuf = -1;</div><div class='add'>+static const char udmabuf_test_buffer_name[DMA_BUF_NAME_LEN] = "udmabuf_test_buffer_for_iter";</div><div class='add'>+static size_t udmabuf_test_buffer_size;</div><div class='add'>+static int sysheap_dmabuf = -1;</div><div class='add'>+static const char sysheap_test_buffer_name[DMA_BUF_NAME_LEN] = "sysheap_test_buffer_for_iter";</div><div class='add'>+static size_t sysheap_test_buffer_size;</div><div class='add'>+</div><div class='add'>+static int create_udmabuf(void)</div><div class='add'>+{</div><div class='add'>+	struct udmabuf_create create;</div><div class='add'>+	int dev_udmabuf, memfd, local_udmabuf;</div><div class='add'>+</div><div class='add'>+	udmabuf_test_buffer_size = 10 * getpagesize();</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_LE(sizeof(udmabuf_test_buffer_name), DMA_BUF_NAME_LEN, "NAMETOOLONG"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	memfd = memfd_create("memfd_test", MFD_ALLOW_SEALING);</div><div class='add'>+	if (!ASSERT_OK_FD(memfd, "memfd_create"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(ftruncate(memfd, udmabuf_test_buffer_size), "ftruncate"))</div><div class='add'>+		goto close_memfd;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(fcntl(memfd, F_ADD_SEALS, F_SEAL_SHRINK), "seal"))</div><div class='add'>+		goto close_memfd;</div><div class='add'>+</div><div class='add'>+	dev_udmabuf = open("/dev/udmabuf", O_RDONLY);</div><div class='add'>+	if (!ASSERT_OK_FD(dev_udmabuf, "open udmabuf"))</div><div class='add'>+		goto close_memfd;</div><div class='add'>+</div><div class='add'>+	memset(&amp;create, 0, sizeof(create));</div><div class='add'>+	create.memfd = memfd;</div><div class='add'>+	create.flags = UDMABUF_FLAGS_CLOEXEC;</div><div class='add'>+	create.offset = 0;</div><div class='add'>+	create.size = udmabuf_test_buffer_size;</div><div class='add'>+</div><div class='add'>+	local_udmabuf = ioctl(dev_udmabuf, UDMABUF_CREATE, &amp;create);</div><div class='add'>+	close(dev_udmabuf);</div><div class='add'>+	if (!ASSERT_OK_FD(local_udmabuf, "udmabuf_create"))</div><div class='add'>+		goto close_memfd;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(ioctl(local_udmabuf, DMA_BUF_SET_NAME_B, udmabuf_test_buffer_name), "name"))</div><div class='add'>+		goto close_udmabuf;</div><div class='add'>+</div><div class='add'>+	return local_udmabuf;</div><div class='add'>+</div><div class='add'>+close_udmabuf:</div><div class='add'>+	close(local_udmabuf);</div><div class='add'>+close_memfd:</div><div class='add'>+	close(memfd);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_sys_heap_dmabuf(void)</div><div class='add'>+{</div><div class='add'>+	sysheap_test_buffer_size = 20 * getpagesize();</div><div class='add'>+</div><div class='add'>+	struct dma_heap_allocation_data data = {</div><div class='add'>+		.len = sysheap_test_buffer_size,</div><div class='add'>+		.fd = 0,</div><div class='add'>+		.fd_flags = O_RDWR | O_CLOEXEC,</div><div class='add'>+		.heap_flags = 0,</div><div class='add'>+	};</div><div class='add'>+	int heap_fd, ret;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_LE(sizeof(sysheap_test_buffer_name), DMA_BUF_NAME_LEN, "NAMETOOLONG"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	heap_fd = open("/dev/dma_heap/system", O_RDONLY);</div><div class='add'>+	if (!ASSERT_OK_FD(heap_fd, "open dma heap"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	ret = ioctl(heap_fd, DMA_HEAP_IOCTL_ALLOC, &amp;data);</div><div class='add'>+	close(heap_fd);</div><div class='add'>+	if (!ASSERT_OK(ret, "syheap alloc"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(ioctl(data.fd, DMA_BUF_SET_NAME_B, sysheap_test_buffer_name), "name"))</div><div class='add'>+		goto close_sysheap_dmabuf;</div><div class='add'>+</div><div class='add'>+	return data.fd;</div><div class='add'>+</div><div class='add'>+close_sysheap_dmabuf:</div><div class='add'>+	close(data.fd);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_test_buffers(void)</div><div class='add'>+{</div><div class='add'>+	udmabuf = create_udmabuf();</div><div class='add'>+	sysheap_dmabuf = create_sys_heap_dmabuf();</div><div class='add'>+</div><div class='add'>+	if (udmabuf &lt; 0 || sysheap_dmabuf &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_test_buffers(void)</div><div class='add'>+{</div><div class='add'>+	close(udmabuf);</div><div class='add'>+	udmabuf = -1;</div><div class='add'>+</div><div class='add'>+	close(sysheap_dmabuf);</div><div class='add'>+	sysheap_dmabuf = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum Fields { INODE, SIZE, NAME, EXPORTER, FIELD_COUNT };</div><div class='add'>+struct DmabufInfo {</div><div class='add'>+	unsigned long inode;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	char name[DMA_BUF_NAME_LEN];</div><div class='add'>+	char exporter[32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool check_dmabuf_info(const struct DmabufInfo *bufinfo,</div><div class='add'>+			      unsigned long size,</div><div class='add'>+			      const char *name, const char *exporter)</div><div class='add'>+{</div><div class='add'>+	return size == bufinfo-&gt;size &amp;&amp;</div><div class='add'>+	       !strcmp(name, bufinfo-&gt;name) &amp;&amp;</div><div class='add'>+	       !strcmp(exporter, bufinfo-&gt;exporter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void subtest_dmabuf_iter_check_no_infinite_reads(struct dmabuf_iter *skel)</div><div class='add'>+{</div><div class='add'>+	int iter_fd;</div><div class='add'>+	char buf[256];</div><div class='add'>+</div><div class='add'>+	iter_fd = bpf_iter_create(bpf_link__fd(skel-&gt;links.dmabuf_collector));</div><div class='add'>+	if (!ASSERT_OK_FD(iter_fd, "iter_create"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while (read(iter_fd, buf, sizeof(buf)) &gt; 0)</div><div class='add'>+		; /* Read out all contents */</div><div class='add'>+</div><div class='add'>+	/* Next reads should return 0 */</div><div class='add'>+	ASSERT_EQ(read(iter_fd, buf, sizeof(buf)), 0, "read");</div><div class='add'>+</div><div class='add'>+	close(iter_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void subtest_dmabuf_iter_check_default_iter(struct dmabuf_iter *skel)</div><div class='add'>+{</div><div class='add'>+	bool found_test_sysheap_dmabuf = false;</div><div class='add'>+	bool found_test_udmabuf = false;</div><div class='add'>+	struct DmabufInfo bufinfo;</div><div class='add'>+	size_t linesize = 0;</div><div class='add'>+	char *line = NULL;</div><div class='add'>+	FILE *iter_file;</div><div class='add'>+	int iter_fd, f = INODE;</div><div class='add'>+</div><div class='add'>+	iter_fd = bpf_iter_create(bpf_link__fd(skel-&gt;links.dmabuf_collector));</div><div class='add'>+	if (!ASSERT_OK_FD(iter_fd, "iter_create"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iter_file = fdopen(iter_fd, "r");</div><div class='add'>+	if (!ASSERT_OK_PTR(iter_file, "fdopen"))</div><div class='add'>+		goto close_iter_fd;</div><div class='add'>+</div><div class='add'>+	while (getline(&amp;line, &amp;linesize, iter_file) != -1) {</div><div class='add'>+		if (f % FIELD_COUNT == INODE) {</div><div class='add'>+			ASSERT_EQ(sscanf(line, "%ld", &amp;bufinfo.inode), 1,</div><div class='add'>+				  "read inode");</div><div class='add'>+		} else if (f % FIELD_COUNT == SIZE) {</div><div class='add'>+			ASSERT_EQ(sscanf(line, "%ld", &amp;bufinfo.size), 1,</div><div class='add'>+				  "read size");</div><div class='add'>+		} else if (f % FIELD_COUNT == NAME) {</div><div class='add'>+			ASSERT_EQ(sscanf(line, "%s", bufinfo.name), 1,</div><div class='add'>+				  "read name");</div><div class='add'>+		} else if (f % FIELD_COUNT == EXPORTER) {</div><div class='add'>+			ASSERT_EQ(sscanf(line, "%31s", bufinfo.exporter), 1,</div><div class='add'>+				  "read exporter");</div><div class='add'>+</div><div class='add'>+			if (check_dmabuf_info(&amp;bufinfo,</div><div class='add'>+					      sysheap_test_buffer_size,</div><div class='add'>+					      sysheap_test_buffer_name,</div><div class='add'>+					      "system"))</div><div class='add'>+				found_test_sysheap_dmabuf = true;</div><div class='add'>+			else if (check_dmabuf_info(&amp;bufinfo,</div><div class='add'>+						   udmabuf_test_buffer_size,</div><div class='add'>+						   udmabuf_test_buffer_name,</div><div class='add'>+						   "udmabuf"))</div><div class='add'>+				found_test_udmabuf = true;</div><div class='add'>+		}</div><div class='add'>+		++f;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(f % FIELD_COUNT, INODE, "number of fields");</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(found_test_sysheap_dmabuf, "found_test_sysheap_dmabuf");</div><div class='add'>+	ASSERT_TRUE(found_test_udmabuf, "found_test_udmabuf");</div><div class='add'>+</div><div class='add'>+	free(line);</div><div class='add'>+	fclose(iter_file);</div><div class='add'>+close_iter_fd:</div><div class='add'>+	close(iter_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void subtest_dmabuf_iter_check_open_coded(struct dmabuf_iter *skel, int map_fd)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='add'>+	char key[DMA_BUF_NAME_LEN];</div><div class='add'>+	int err, fd;</div><div class='add'>+	bool found;</div><div class='add'>+</div><div class='add'>+	/* No need to attach it, just run it directly */</div><div class='add'>+	fd = bpf_program__fd(skel-&gt;progs.iter_dmabuf_for_each);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_test_run_opts(fd, &amp;topts);</div><div class='add'>+	if (!ASSERT_OK(err, "test_run_opts err"))</div><div class='add'>+		return;</div><div class='add'>+	if (!ASSERT_OK(topts.retval, "test_run_opts retval"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(bpf_map_get_next_key(map_fd, NULL, key), "get next key"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ASSERT_OK(bpf_map_lookup_elem(map_fd, key, &amp;found), "lookup");</div><div class='add'>+		ASSERT_TRUE(found, "found test buffer");</div><div class='add'>+	} while (bpf_map_get_next_key(map_fd, key, key));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_dmabuf_iter(void)</div><div class='add'>+{</div><div class='add'>+	struct dmabuf_iter *skel = NULL;</div><div class='add'>+	int map_fd;</div><div class='add'>+	const bool f = false;</div><div class='add'>+</div><div class='add'>+	skel = dmabuf_iter__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "dmabuf_iter__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	map_fd = bpf_map__fd(skel-&gt;maps.testbuf_hash);</div><div class='add'>+	if (!ASSERT_OK_FD(map_fd, "map_fd"))</div><div class='add'>+		goto destroy_skel;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(bpf_map_update_elem(map_fd, udmabuf_test_buffer_name, &amp;f, BPF_ANY),</div><div class='add'>+		       "insert udmabuf"))</div><div class='add'>+		goto destroy_skel;</div><div class='add'>+	if (!ASSERT_OK(bpf_map_update_elem(map_fd, sysheap_test_buffer_name, &amp;f, BPF_ANY),</div><div class='add'>+		       "insert sysheap buffer"))</div><div class='add'>+		goto destroy_skel;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(create_test_buffers(), "create_test_buffers"))</div><div class='add'>+		goto destroy;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(dmabuf_iter__attach(skel), "skel_attach"))</div><div class='add'>+		goto destroy;</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("no_infinite_reads"))</div><div class='add'>+		subtest_dmabuf_iter_check_no_infinite_reads(skel);</div><div class='add'>+	if (test__start_subtest("default_iter"))</div><div class='add'>+		subtest_dmabuf_iter_check_default_iter(skel);</div><div class='add'>+	if (test__start_subtest("open_coded"))</div><div class='add'>+		subtest_dmabuf_iter_check_open_coded(skel, map_fd);</div><div class='add'>+</div><div class='add'>+destroy:</div><div class='add'>+	destroy_test_buffers();</div><div class='add'>+destroy_skel:</div><div class='add'>+	dmabuf_iter__destroy(skel);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/dynptr.c b/tools/testing/selftests/bpf/prog_tests/dynptr.c<br/>index b614a5272dfd..b9f86cb91e81 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/dynptr.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/dynptr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/dynptr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/dynptr.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@ enum test_setup_type {</div><div class='ctx'> 	SETUP_SYSCALL_SLEEP,</div><div class='ctx'> 	SETUP_SKB_PROG,</div><div class='ctx'> 	SETUP_SKB_PROG_TP,</div><div class='add'>+	SETUP_XDP_PROG,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='hunk'>@@ -18,9 +19,21 @@ static struct {</div><div class='ctx'> } success_tests[] = {</div><div class='ctx'> 	{"test_read_write", SETUP_SYSCALL_SLEEP},</div><div class='ctx'> 	{"test_dynptr_data", SETUP_SYSCALL_SLEEP},</div><div class='add'>+	{"test_dynptr_copy", SETUP_SYSCALL_SLEEP},</div><div class='add'>+	{"test_dynptr_copy_xdp", SETUP_XDP_PROG},</div><div class='add'>+	{"test_dynptr_memset_zero", SETUP_SYSCALL_SLEEP},</div><div class='add'>+	{"test_dynptr_memset_notzero", SETUP_SYSCALL_SLEEP},</div><div class='add'>+	{"test_dynptr_memset_zero_offset", SETUP_SYSCALL_SLEEP},</div><div class='add'>+	{"test_dynptr_memset_zero_adjusted", SETUP_SYSCALL_SLEEP},</div><div class='add'>+	{"test_dynptr_memset_overflow", SETUP_SYSCALL_SLEEP},</div><div class='add'>+	{"test_dynptr_memset_overflow_offset", SETUP_SYSCALL_SLEEP},</div><div class='add'>+	{"test_dynptr_memset_readonly", SETUP_SKB_PROG},</div><div class='add'>+	{"test_dynptr_memset_xdp_chunks", SETUP_XDP_PROG},</div><div class='ctx'> 	{"test_ringbuf", SETUP_SYSCALL_SLEEP},</div><div class='ctx'> 	{"test_skb_readonly", SETUP_SKB_PROG},</div><div class='ctx'> 	{"test_dynptr_skb_data", SETUP_SKB_PROG},</div><div class='add'>+	{"test_dynptr_skb_meta_data", SETUP_SKB_PROG},</div><div class='add'>+	{"test_dynptr_skb_meta_flags", SETUP_SKB_PROG},</div><div class='ctx'> 	{"test_adjust", SETUP_SYSCALL_SLEEP},</div><div class='ctx'> 	{"test_adjust_err", SETUP_SYSCALL_SLEEP},</div><div class='ctx'> 	{"test_zero_size_dynptr", SETUP_SYSCALL_SLEEP},</div><div class='hunk'>@@ -30,10 +43,21 @@ static struct {</div><div class='ctx'> 	{"test_dynptr_skb_no_buff", SETUP_SKB_PROG},</div><div class='ctx'> 	{"test_dynptr_skb_strcmp", SETUP_SKB_PROG},</div><div class='ctx'> 	{"test_dynptr_skb_tp_btf", SETUP_SKB_PROG_TP},</div><div class='add'>+	{"test_probe_read_user_dynptr", SETUP_XDP_PROG},</div><div class='add'>+	{"test_probe_read_kernel_dynptr", SETUP_XDP_PROG},</div><div class='add'>+	{"test_probe_read_user_str_dynptr", SETUP_XDP_PROG},</div><div class='add'>+	{"test_probe_read_kernel_str_dynptr", SETUP_XDP_PROG},</div><div class='add'>+	{"test_copy_from_user_dynptr", SETUP_SYSCALL_SLEEP},</div><div class='add'>+	{"test_copy_from_user_str_dynptr", SETUP_SYSCALL_SLEEP},</div><div class='add'>+	{"test_copy_from_user_task_dynptr", SETUP_SYSCALL_SLEEP},</div><div class='add'>+	{"test_copy_from_user_task_str_dynptr", SETUP_SYSCALL_SLEEP},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define PAGE_SIZE_64K 65536</div><div class='add'>+</div><div class='ctx'> static void verify_success(const char *prog_name, enum test_setup_type setup_type)</div><div class='ctx'> {</div><div class='add'>+	char user_data[384] = {[0 ... 382] = 'a', '\0'};</div><div class='ctx'> 	struct dynptr_success *skel;</div><div class='ctx'> 	struct bpf_program *prog;</div><div class='ctx'> 	struct bpf_link *link;</div><div class='hunk'>@@ -55,6 +79,10 @@ static void verify_success(const char *prog_name, enum test_setup_type setup_typ</div><div class='ctx'> 	if (!ASSERT_OK(err, "dynptr_success__load"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='add'>+	skel-&gt;bss-&gt;user_ptr = user_data;</div><div class='add'>+	skel-&gt;data-&gt;test_len[0] = sizeof(user_data);</div><div class='add'>+	memcpy(skel-&gt;bss-&gt;expected_str, user_data, sizeof(user_data));</div><div class='add'>+</div><div class='ctx'> 	switch (setup_type) {</div><div class='ctx'> 	case SETUP_SYSCALL_SLEEP:</div><div class='ctx'> 		link = bpf_program__attach(prog);</div><div class='hunk'>@@ -120,6 +148,28 @@ static void verify_success(const char *prog_name, enum test_setup_type setup_typ</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case SETUP_XDP_PROG:</div><div class='add'>+	{</div><div class='add'>+		char data[90000];</div><div class='add'>+		int err, prog_fd;</div><div class='add'>+		LIBBPF_OPTS(bpf_test_run_opts, opts,</div><div class='add'>+			    .data_in = &amp;data,</div><div class='add'>+			    .repeat = 1,</div><div class='add'>+		);</div><div class='add'>+</div><div class='add'>+		if (getpagesize() == PAGE_SIZE_64K)</div><div class='add'>+			opts.data_size_in = sizeof(data);</div><div class='add'>+		else</div><div class='add'>+			opts.data_size_in = 5000;</div><div class='add'>+</div><div class='add'>+		prog_fd = bpf_program__fd(prog);</div><div class='add'>+		err = bpf_prog_test_run_opts(prog_fd, &amp;opts);</div><div class='add'>+</div><div class='add'>+		if (!ASSERT_OK(err, "test_run"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_EQ(skel-&gt;bss-&gt;err, 0, "err");</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/fd_array.c b/tools/testing/selftests/bpf/prog_tests/fd_array.c<br/>index a1d52e73fb16..c534b4d5f9da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fd_array.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fd_array.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fd_array.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/fd_array.c</a></div><div class='hunk'>@@ -83,8 +83,8 @@ static inline int bpf_prog_get_map_ids(int prog_fd, __u32 *nr_map_ids, __u32 *ma</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;info, 0, len);</div><div class='del'>-	info.nr_map_ids = *nr_map_ids,</div><div class='del'>-	info.map_ids = ptr_to_u64(map_ids),</div><div class='add'>+	info.nr_map_ids = *nr_map_ids;</div><div class='add'>+	info.map_ids = ptr_to_u64(map_ids);</div><div class='ctx'> </div><div class='ctx'> 	err = bpf_prog_get_info_by_fd(prog_fd, &amp;info, &amp;len);</div><div class='ctx'> 	if (!ASSERT_OK(err, "bpf_prog_get_info_by_fd"))</div><div class='hunk'>@@ -293,7 +293,7 @@ static int get_btf_id_by_fd(int btf_fd, __u32 *id)</div><div class='ctx'>  *  1) Create a new btf, it's referenced only by a file descriptor, so refcnt=1</div><div class='ctx'>  *  2) Load a BPF prog with fd_array[0] = btf_fd; now btf's refcnt=2</div><div class='ctx'>  *  3) Close the btf_fd, now refcnt=1</div><div class='del'>- * Wait and check that BTF stil exists.</div><div class='add'>+ * Wait and check that BTF still exists.</div><div class='ctx'>  */</div><div class='ctx'> static void check_fd_array_cnt__referenced_btfs(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -312,7 +312,7 @@ static void check_fd_array_cnt__referenced_btfs(void)</div><div class='ctx'> </div><div class='ctx'> 	/* btf should still exist when original file descriptor is closed */</div><div class='ctx'> 	err = get_btf_id_by_fd(extra_fds[0], &amp;btf_id);</div><div class='del'>-	if (!ASSERT_GE(err, 0, "get_btf_id_by_fd"))</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "get_btf_id_by_fd"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	Close(extra_fds[0]);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/fd_htab_lookup.c b/tools/testing/selftests/bpf/prog_tests/fd_htab_lookup.c<br/>new file mode 100644<br/>index 000000000000..ca46fdd6e1ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fd_htab_lookup.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/fd_htab_lookup.c</a></div><div class='hunk'>@@ -0,0 +1,192 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2025. Huawei Technologies Co., Ltd */</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "fd_htab_lookup.skel.h"</div><div class='add'>+</div><div class='add'>+struct htab_op_ctx {</div><div class='add'>+	int fd;</div><div class='add'>+	int loop;</div><div class='add'>+	unsigned int entries;</div><div class='add'>+	bool stop;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ERR_TO_RETVAL(where, err) ((void *)(long)(((where) &lt;&lt; 12) | (-err)))</div><div class='add'>+</div><div class='add'>+static void *htab_lookup_fn(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct htab_op_ctx *ctx = arg;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	while (i++ &lt; ctx-&gt;loop &amp;&amp; !ctx-&gt;stop) {</div><div class='add'>+		unsigned int j;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ctx-&gt;entries; j++) {</div><div class='add'>+			unsigned int key = j, zero = 0, value;</div><div class='add'>+			int inner_fd, err;</div><div class='add'>+</div><div class='add'>+			err = bpf_map_lookup_elem(ctx-&gt;fd, &amp;key, &amp;value);</div><div class='add'>+			if (err) {</div><div class='add'>+				ctx-&gt;stop = true;</div><div class='add'>+				return ERR_TO_RETVAL(1, err);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			inner_fd = bpf_map_get_fd_by_id(value);</div><div class='add'>+			if (inner_fd &lt; 0) {</div><div class='add'>+				/* The old map has been freed */</div><div class='add'>+				if (inner_fd == -ENOENT)</div><div class='add'>+					continue;</div><div class='add'>+				ctx-&gt;stop = true;</div><div class='add'>+				return ERR_TO_RETVAL(2, inner_fd);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			err = bpf_map_lookup_elem(inner_fd, &amp;zero, &amp;value);</div><div class='add'>+			if (err) {</div><div class='add'>+				close(inner_fd);</div><div class='add'>+				ctx-&gt;stop = true;</div><div class='add'>+				return ERR_TO_RETVAL(3, err);</div><div class='add'>+			}</div><div class='add'>+			close(inner_fd);</div><div class='add'>+</div><div class='add'>+			if (value != key) {</div><div class='add'>+				ctx-&gt;stop = true;</div><div class='add'>+				return ERR_TO_RETVAL(4, -EINVAL);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *htab_update_fn(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct htab_op_ctx *ctx = arg;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	while (i++ &lt; ctx-&gt;loop &amp;&amp; !ctx-&gt;stop) {</div><div class='add'>+		unsigned int j;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ctx-&gt;entries; j++) {</div><div class='add'>+			unsigned int key = j, zero = 0;</div><div class='add'>+			int inner_fd, err;</div><div class='add'>+</div><div class='add'>+			inner_fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, NULL, 4, 4, 1, NULL);</div><div class='add'>+			if (inner_fd &lt; 0) {</div><div class='add'>+				ctx-&gt;stop = true;</div><div class='add'>+				return ERR_TO_RETVAL(1, inner_fd);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			err = bpf_map_update_elem(inner_fd, &amp;zero, &amp;key, 0);</div><div class='add'>+			if (err) {</div><div class='add'>+				close(inner_fd);</div><div class='add'>+				ctx-&gt;stop = true;</div><div class='add'>+				return ERR_TO_RETVAL(2, err);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			err = bpf_map_update_elem(ctx-&gt;fd, &amp;key, &amp;inner_fd, BPF_EXIST);</div><div class='add'>+			if (err) {</div><div class='add'>+				close(inner_fd);</div><div class='add'>+				ctx-&gt;stop = true;</div><div class='add'>+				return ERR_TO_RETVAL(3, err);</div><div class='add'>+			}</div><div class='add'>+			close(inner_fd);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_htab(int fd, unsigned int entries)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; entries; i++) {</div><div class='add'>+		unsigned int key = i, zero = 0;</div><div class='add'>+		int inner_fd, err;</div><div class='add'>+</div><div class='add'>+		inner_fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, NULL, 4, 4, 1, NULL);</div><div class='add'>+		if (!ASSERT_OK_FD(inner_fd, "new array"))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		err = bpf_map_update_elem(inner_fd, &amp;zero, &amp;key, 0);</div><div class='add'>+		if (!ASSERT_OK(err, "init array")) {</div><div class='add'>+			close(inner_fd);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = bpf_map_update_elem(fd, &amp;key, &amp;inner_fd, 0);</div><div class='add'>+		if (!ASSERT_OK(err, "init outer")) {</div><div class='add'>+			close(inner_fd);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		close(inner_fd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_int_from_env(const char *name, int dft)</div><div class='add'>+{</div><div class='add'>+	const char *value;</div><div class='add'>+</div><div class='add'>+	value = getenv(name);</div><div class='add'>+	if (!value)</div><div class='add'>+		return dft;</div><div class='add'>+</div><div class='add'>+	return atoi(value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_fd_htab_lookup(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, wr_nr = 8, rd_nr = 16;</div><div class='add'>+	pthread_t tids[wr_nr + rd_nr];</div><div class='add'>+	struct fd_htab_lookup *skel;</div><div class='add'>+	struct htab_op_ctx ctx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = fd_htab_lookup__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "fd_htab_lookup__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ctx.fd = bpf_map__fd(skel-&gt;maps.outer_map);</div><div class='add'>+	ctx.loop = get_int_from_env("FD_HTAB_LOOP_NR", 5);</div><div class='add'>+	ctx.stop = false;</div><div class='add'>+	ctx.entries = 8;</div><div class='add'>+</div><div class='add'>+	err = setup_htab(ctx.fd, ctx.entries);</div><div class='add'>+	if (err)</div><div class='add'>+		goto destroy;</div><div class='add'>+</div><div class='add'>+	memset(tids, 0, sizeof(tids));</div><div class='add'>+	for (i = 0; i &lt; wr_nr; i++) {</div><div class='add'>+		err = pthread_create(&amp;tids[i], NULL, htab_update_fn, &amp;ctx);</div><div class='add'>+		if (!ASSERT_OK(err, "pthread_create")) {</div><div class='add'>+			ctx.stop = true;</div><div class='add'>+			goto reap;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; rd_nr; i++) {</div><div class='add'>+		err = pthread_create(&amp;tids[i + wr_nr], NULL, htab_lookup_fn, &amp;ctx);</div><div class='add'>+		if (!ASSERT_OK(err, "pthread_create")) {</div><div class='add'>+			ctx.stop = true;</div><div class='add'>+			goto reap;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+reap:</div><div class='add'>+	for (i = 0; i &lt; wr_nr + rd_nr; i++) {</div><div class='add'>+		void *ret = NULL;</div><div class='add'>+		char desc[32];</div><div class='add'>+</div><div class='add'>+		if (!tids[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		snprintf(desc, sizeof(desc), "thread %u", i + 1);</div><div class='add'>+		err = pthread_join(tids[i], &amp;ret);</div><div class='add'>+		ASSERT_OK(err, desc);</div><div class='add'>+		ASSERT_EQ(ret, NULL, desc);</div><div class='add'>+	}</div><div class='add'>+destroy:</div><div class='add'>+	fd_htab_lookup__destroy(skel);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/fentry_fexit.c b/tools/testing/selftests/bpf/prog_tests/fentry_fexit.c<br/>index 130f5b82d2e6..5ef1804e44df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fentry_fexit.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fentry_fexit.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fentry_fexit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/fentry_fexit.c</a></div><div class='hunk'>@@ -12,13 +12,24 @@ void test_fentry_fexit(void)</div><div class='ctx'> 	int err, prog_fd, i;</div><div class='ctx'> 	LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='ctx'> </div><div class='del'>-	fentry_skel = fentry_test_lskel__open_and_load();</div><div class='add'>+	fentry_skel = fentry_test_lskel__open();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(fentry_skel, "fentry_skel_load"))</div><div class='ctx'> 		goto close_prog;</div><div class='del'>-	fexit_skel = fexit_test_lskel__open_and_load();</div><div class='add'>+</div><div class='add'>+	fentry_skel-&gt;keyring_id	= KEY_SPEC_SESSION_KEYRING;</div><div class='add'>+	err = fentry_test_lskel__load(fentry_skel);</div><div class='add'>+	if (!ASSERT_OK(err, "fentry_skel_load"))</div><div class='add'>+		goto close_prog;</div><div class='add'>+</div><div class='add'>+	fexit_skel = fexit_test_lskel__open();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(fexit_skel, "fexit_skel_load"))</div><div class='ctx'> 		goto close_prog;</div><div class='ctx'> </div><div class='add'>+	fexit_skel-&gt;keyring_id	= KEY_SPEC_SESSION_KEYRING;</div><div class='add'>+	err = fexit_test_lskel__load(fexit_skel);</div><div class='add'>+	if (!ASSERT_OK(err, "fexit_skel_load"))</div><div class='add'>+		goto close_prog;</div><div class='add'>+</div><div class='ctx'> 	err = fentry_test_lskel__attach(fentry_skel);</div><div class='ctx'> 	if (!ASSERT_OK(err, "fentry_attach"))</div><div class='ctx'> 		goto close_prog;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/fentry_test.c b/tools/testing/selftests/bpf/prog_tests/fentry_test.c<br/>index aee1bc77a17f..ec882328eb59 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fentry_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fentry_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fentry_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/fentry_test.c</a></div><div class='hunk'>@@ -43,8 +43,13 @@ static void fentry_test(void)</div><div class='ctx'> 	struct fentry_test_lskel *fentry_skel = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	fentry_skel = fentry_test_lskel__open_and_load();</div><div class='del'>-	if (!ASSERT_OK_PTR(fentry_skel, "fentry_skel_load"))</div><div class='add'>+	fentry_skel = fentry_test_lskel__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(fentry_skel, "fentry_skel_open"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	fentry_skel-&gt;keyring_id	= KEY_SPEC_SESSION_KEYRING;</div><div class='add'>+	err = fentry_test_lskel__load(fentry_skel);</div><div class='add'>+	if (!ASSERT_OK(err, "fentry_skel_load"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	err = fentry_test_common(fentry_skel);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/fexit_test.c b/tools/testing/selftests/bpf/prog_tests/fexit_test.c<br/>index 1c13007e37dd..94eed753560c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fexit_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fexit_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fexit_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/fexit_test.c</a></div><div class='hunk'>@@ -43,8 +43,13 @@ static void fexit_test(void)</div><div class='ctx'> 	struct fexit_test_lskel *fexit_skel = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	fexit_skel = fexit_test_lskel__open_and_load();</div><div class='del'>-	if (!ASSERT_OK_PTR(fexit_skel, "fexit_skel_load"))</div><div class='add'>+	fexit_skel = fexit_test_lskel__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(fexit_skel, "fexit_skel_open"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	fexit_skel-&gt;keyring_id	= KEY_SPEC_SESSION_KEYRING;</div><div class='add'>+	err = fexit_test_lskel__load(fexit_skel);</div><div class='add'>+	if (!ASSERT_OK(err, "fexit_skel_load"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	err = fexit_test_common(fexit_skel);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/file_reader.c b/tools/testing/selftests/bpf/prog_tests/file_reader.c<br/>new file mode 100644<br/>index 000000000000..5cde32b35da4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/file_reader.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/file_reader.c</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;network_helpers.h&gt;</div><div class='add'>+#include "file_reader.skel.h"</div><div class='add'>+#include "file_reader_fail.skel.h"</div><div class='add'>+#include &lt;dlfcn.h&gt;</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+</div><div class='add'>+const char *user_ptr = "hello world";</div><div class='add'>+char file_contents[256000];</div><div class='add'>+</div><div class='add'>+void *get_executable_base_addr(void)</div><div class='add'>+{</div><div class='add'>+	Dl_info info;</div><div class='add'>+</div><div class='add'>+	if (!dladdr((void *)&amp;get_executable_base_addr, &amp;info)) {</div><div class='add'>+		fprintf(stderr, "dladdr failed\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return info.dli_fbase;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int initialize_file_contents(void)</div><div class='add'>+{</div><div class='add'>+	int fd, page_sz = sysconf(_SC_PAGESIZE);</div><div class='add'>+	ssize_t n = 0, cur, off;</div><div class='add'>+	void *addr;</div><div class='add'>+</div><div class='add'>+	fd = open("/proc/self/exe", O_RDONLY);</div><div class='add'>+	if (!ASSERT_OK_FD(fd, "Open /proc/self/exe\n"))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		cur = read(fd, file_contents + n, sizeof(file_contents) - n);</div><div class='add'>+		if (!ASSERT_GT(cur, 0, "read success"))</div><div class='add'>+			break;</div><div class='add'>+		n += cur;</div><div class='add'>+	} while (n &lt; sizeof(file_contents));</div><div class='add'>+</div><div class='add'>+	close(fd);</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(n, sizeof(file_contents), "Read /proc/self/exe\n"))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	addr = get_executable_base_addr();</div><div class='add'>+	if (!ASSERT_NEQ(addr, NULL, "get executable address"))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* page-align base file address */</div><div class='add'>+	addr = (void *)((unsigned long)addr &amp; ~(page_sz - 1));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Page out range 0..512K, use 0..256K for positive tests and</div><div class='add'>+	 * 256K..512K for negative tests expecting page faults</div><div class='add'>+	 */</div><div class='add'>+	for (off = 0; off &lt; sizeof(file_contents) * 2; off += page_sz) {</div><div class='add'>+		if (!ASSERT_OK(madvise(addr + off, page_sz, MADV_PAGEOUT),</div><div class='add'>+			       "madvise pageout"))</div><div class='add'>+			return errno;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void run_test(const char *prog_name)</div><div class='add'>+{</div><div class='add'>+	struct file_reader *skel;</div><div class='add'>+	struct bpf_program *prog;</div><div class='add'>+	int err, fd;</div><div class='add'>+</div><div class='add'>+	err = initialize_file_contents();</div><div class='add'>+	if (!ASSERT_OK(err, "initialize file contents"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel = file_reader__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "file_reader__open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bpf_object__for_each_program(prog, skel-&gt;obj) {</div><div class='add'>+		bpf_program__set_autoload(prog, strcmp(bpf_program__name(prog), prog_name) == 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(skel-&gt;bss-&gt;user_buf, file_contents, sizeof(file_contents));</div><div class='add'>+	skel-&gt;bss-&gt;pid = getpid();</div><div class='add'>+</div><div class='add'>+	err = file_reader__load(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "file_reader__load"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	err = file_reader__attach(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "file_reader__attach"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	fd = open("/proc/self/exe", O_RDONLY);</div><div class='add'>+	if (fd &gt;= 0)</div><div class='add'>+		close(fd);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;err, 0, "err");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;run_success, 1, "run_success");</div><div class='add'>+cleanup:</div><div class='add'>+	file_reader__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_file_reader(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("on_open_expect_fault"))</div><div class='add'>+		run_test("on_open_expect_fault");</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("on_open_validate_file_read"))</div><div class='add'>+		run_test("on_open_validate_file_read");</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("negative"))</div><div class='add'>+		RUN_TESTS(file_reader_fail);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c<br/>index e59af2aa6601..e40114620751 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fill_link_info.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fill_link_info.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fill_link_info.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/fill_link_info.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@ static noinline void uprobe_func(void)</div><div class='ctx'> static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long addr,</div><div class='ctx'> 				 ssize_t offset, ssize_t entry_offset)</div><div class='ctx'> {</div><div class='add'>+	ssize_t ref_ctr_offset = entry_offset /* ref_ctr_offset for uprobes */;</div><div class='ctx'> 	struct bpf_link_info info;</div><div class='ctx'> 	__u32 len = sizeof(info);</div><div class='ctx'> 	char buf[PATH_MAX];</div><div class='hunk'>@@ -97,6 +98,7 @@ again:</div><div class='ctx'> 	case BPF_PERF_EVENT_UPROBE:</div><div class='ctx'> 	case BPF_PERF_EVENT_URETPROBE:</div><div class='ctx'> 		ASSERT_EQ(info.perf_event.uprobe.offset, offset, "uprobe_offset");</div><div class='add'>+		ASSERT_EQ(info.perf_event.uprobe.ref_ctr_offset, ref_ctr_offset, "uprobe_ref_ctr_offset");</div><div class='ctx'> </div><div class='ctx'> 		ASSERT_EQ(info.perf_event.uprobe.name_len, strlen(UPROBE_FILE) + 1,</div><div class='ctx'> 				  "name_len");</div><div class='hunk'>@@ -241,20 +243,32 @@ static void test_uprobe_fill_link_info(struct test_fill_link_info *skel,</div><div class='ctx'> 		.retprobe = type == BPF_PERF_EVENT_URETPROBE,</div><div class='ctx'> 		.bpf_cookie = PERF_EVENT_COOKIE,</div><div class='ctx'> 	);</div><div class='add'>+	const char *sema[1] = {</div><div class='add'>+		"uprobe_link_info_sema_1",</div><div class='add'>+	};</div><div class='add'>+	__u64 *ref_ctr_offset;</div><div class='ctx'> 	struct bpf_link *link;</div><div class='ctx'> 	int link_fd, err;</div><div class='ctx'> </div><div class='add'>+	err = elf_resolve_syms_offsets("/proc/self/exe", 1, sema,</div><div class='add'>+				       (unsigned long **) &amp;ref_ctr_offset, STT_OBJECT);</div><div class='add'>+	if (!ASSERT_OK(err, "elf_resolve_syms_offsets_object"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	opts.ref_ctr_offset = *ref_ctr_offset;</div><div class='ctx'> 	link = bpf_program__attach_uprobe_opts(skel-&gt;progs.uprobe_run,</div><div class='ctx'> 					       0, /* self pid */</div><div class='ctx'> 					       UPROBE_FILE, uprobe_offset,</div><div class='ctx'> 					       &amp;opts);</div><div class='ctx'> 	if (!ASSERT_OK_PTR(link, "attach_uprobe"))</div><div class='del'>-		return;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	link_fd = bpf_link__fd(link);</div><div class='del'>-	err = verify_perf_link_info(link_fd, type, 0, uprobe_offset, 0);</div><div class='add'>+	err = verify_perf_link_info(link_fd, type, 0, uprobe_offset, *ref_ctr_offset);</div><div class='ctx'> 	ASSERT_OK(err, "verify_perf_link_info");</div><div class='ctx'> 	bpf_link__destroy(link);</div><div class='add'>+out:</div><div class='add'>+	free(ref_ctr_offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int verify_kmulti_link_info(int fd, bool retprobe, bool has_cookies)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector_classification.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector_classification.c<br/>index 3729fbfd3084..80b153d3ddec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/flow_dissector_classification.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/flow_dissector_classification.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/flow_dissector_classification.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/flow_dissector_classification.c</a></div><div class='hunk'>@@ -542,8 +542,12 @@ static void detach_program(struct bpf_flow *skel, int prog_fd)</div><div class='ctx'> </div><div class='ctx'> static int set_port_drop(int pf, bool multi_port)</div><div class='ctx'> {</div><div class='add'>+	char dst_port[16];</div><div class='add'>+</div><div class='add'>+	snprintf(dst_port, sizeof(dst_port), "%d", CFG_PORT_INNER);</div><div class='add'>+</div><div class='ctx'> 	SYS(fail, "tc qdisc add dev lo ingress");</div><div class='del'>-	SYS(fail_delete_qdisc, "tc filter add %s %s %s %s %s %s %s %s %s %s",</div><div class='add'>+	SYS(fail_delete_qdisc, "tc filter add %s %s %s %s %s %s %s %s %s %s %s %s",</div><div class='ctx'> 	    "dev lo",</div><div class='ctx'> 	    "parent FFFF:",</div><div class='ctx'> 	    "protocol", pf == PF_INET6 ? "ipv6" : "ip",</div><div class='hunk'>@@ -551,6 +555,7 @@ static int set_port_drop(int pf, bool multi_port)</div><div class='ctx'> 	    "flower",</div><div class='ctx'> 	    "ip_proto udp",</div><div class='ctx'> 	    "src_port", multi_port ? "8-10" : "9",</div><div class='add'>+	    "dst_port", dst_port,</div><div class='ctx'> 	    "action drop");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/for_each.c b/tools/testing/selftests/bpf/prog_tests/for_each.c<br/>index 09f6487f58b9..5fea3209566e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/for_each.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/for_each.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/for_each.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/for_each.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include "for_each_array_map_elem.skel.h"</div><div class='ctx'> #include "for_each_map_elem_write_key.skel.h"</div><div class='ctx'> #include "for_each_multi_maps.skel.h"</div><div class='add'>+#include "for_each_hash_modify.skel.h"</div><div class='ctx'> </div><div class='ctx'> static unsigned int duration;</div><div class='ctx'> </div><div class='hunk'>@@ -203,6 +204,40 @@ out:</div><div class='ctx'> 	for_each_multi_maps__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_hash_modify(void)</div><div class='add'>+{</div><div class='add'>+	struct for_each_hash_modify *skel;</div><div class='add'>+	int max_entries, i, err;</div><div class='add'>+	__u64 key, val;</div><div class='add'>+</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts,</div><div class='add'>+		.data_in = &amp;pkt_v4,</div><div class='add'>+		.data_size_in = sizeof(pkt_v4),</div><div class='add'>+		.repeat = 1</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	skel = for_each_hash_modify__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "for_each_hash_modify__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	max_entries = bpf_map__max_entries(skel-&gt;maps.hashmap);</div><div class='add'>+	for (i = 0; i &lt; max_entries; i++) {</div><div class='add'>+		key = i;</div><div class='add'>+		val = i;</div><div class='add'>+		err = bpf_map__update_elem(skel-&gt;maps.hashmap, &amp;key, sizeof(key),</div><div class='add'>+					   &amp;val, sizeof(val), BPF_ANY);</div><div class='add'>+		if (!ASSERT_OK(err, "map_update"))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_test_run_opts(bpf_program__fd(skel-&gt;progs.test_pkt_access), &amp;topts);</div><div class='add'>+	ASSERT_OK(err, "bpf_prog_test_run_opts");</div><div class='add'>+	ASSERT_OK(topts.retval, "retval");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	for_each_hash_modify__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_for_each(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("hash_map"))</div><div class='hunk'>@@ -213,4 +248,6 @@ void test_for_each(void)</div><div class='ctx'> 		test_write_map_key();</div><div class='ctx'> 	if (test__start_subtest("multi_maps"))</div><div class='ctx'> 		test_multi_maps();</div><div class='add'>+	if (test__start_subtest("hash_modify"))</div><div class='add'>+		test_hash_modify();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/free_timer.c b/tools/testing/selftests/bpf/prog_tests/free_timer.c<br/>index b7b77a6b2979..0de8facca4c5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/free_timer.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/free_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/free_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/free_timer.c</a></div><div class='hunk'>@@ -124,6 +124,10 @@ void test_free_timer(void)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	skel = free_timer__open_and_load();</div><div class='add'>+	if (!skel &amp;&amp; errno == EOPNOTSUPP) {</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "open_load"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c b/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c<br/>index 5a0b51157451..43a26ec69a8e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c</a></div><div class='hunk'>@@ -8,11 +8,12 @@</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;test_progs.h&gt;</div><div class='ctx'> #include "test_get_xattr.skel.h"</div><div class='add'>+#include "test_set_remove_xattr.skel.h"</div><div class='ctx'> #include "test_fsverity.skel.h"</div><div class='ctx'> </div><div class='ctx'> static const char testfile[] = "/tmp/test_progs_fs_kfuncs";</div><div class='ctx'> </div><div class='del'>-static void test_xattr(void)</div><div class='add'>+static void test_get_xattr(const char *name, const char *value, bool allow_access)</div><div class='ctx'> {</div><div class='ctx'> 	struct test_get_xattr *skel = NULL;</div><div class='ctx'> 	int fd = -1, err;</div><div class='hunk'>@@ -25,7 +26,7 @@ static void test_xattr(void)</div><div class='ctx'> 	close(fd);</div><div class='ctx'> 	fd = -1;</div><div class='ctx'> </div><div class='del'>-	err = setxattr(testfile, "user.kfuncs", "hello", sizeof("hello"), 0);</div><div class='add'>+	err = setxattr(testfile, name, value, strlen(value) + 1, 0);</div><div class='ctx'> 	if (err &amp;&amp; errno == EOPNOTSUPP) {</div><div class='ctx'> 		printf("%s:SKIP:local fs doesn't support xattr (%d)\n"</div><div class='ctx'> 		       "To run this test, make sure /tmp filesystem supports xattr.\n",</div><div class='hunk'>@@ -48,16 +49,23 @@ static void test_xattr(void)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	fd = open(testfile, O_RDONLY, 0644);</div><div class='add'>+</div><div class='ctx'> 	if (!ASSERT_GE(fd, 0, "open_file"))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ASSERT_EQ(skel-&gt;bss-&gt;found_xattr_from_file, 1, "found_xattr_from_file");</div><div class='del'>-</div><div class='ctx'> 	/* Trigger security_inode_getxattr */</div><div class='del'>-	err = getxattr(testfile, "user.kfuncs", v, sizeof(v));</div><div class='del'>-	ASSERT_EQ(err, -1, "getxattr_return");</div><div class='del'>-	ASSERT_EQ(errno, EINVAL, "getxattr_errno");</div><div class='del'>-	ASSERT_EQ(skel-&gt;bss-&gt;found_xattr_from_dentry, 1, "found_xattr_from_dentry");</div><div class='add'>+	err = getxattr(testfile, name, v, sizeof(v));</div><div class='add'>+</div><div class='add'>+	if (allow_access) {</div><div class='add'>+		ASSERT_EQ(err, -1, "getxattr_return");</div><div class='add'>+		ASSERT_EQ(errno, EINVAL, "getxattr_errno");</div><div class='add'>+		ASSERT_EQ(skel-&gt;bss-&gt;found_xattr_from_file, 1, "found_xattr_from_file");</div><div class='add'>+		ASSERT_EQ(skel-&gt;bss-&gt;found_xattr_from_dentry, 1, "found_xattr_from_dentry");</div><div class='add'>+	} else {</div><div class='add'>+		ASSERT_EQ(err, strlen(value) + 1, "getxattr_return");</div><div class='add'>+		ASSERT_EQ(skel-&gt;bss-&gt;found_xattr_from_file, 0, "found_xattr_from_file");</div><div class='add'>+		ASSERT_EQ(skel-&gt;bss-&gt;found_xattr_from_dentry, 0, "found_xattr_from_dentry");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	close(fd);</div><div class='hunk'>@@ -65,6 +73,127 @@ out:</div><div class='ctx'> 	remove(testfile);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* xattr value we will set to security.bpf.foo */</div><div class='add'>+static const char value_foo[] = "hello";</div><div class='add'>+</div><div class='add'>+static void read_and_validate_foo(struct test_set_remove_xattr *skel)</div><div class='add'>+{</div><div class='add'>+	char value_out[32];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = getxattr(testfile, skel-&gt;rodata-&gt;xattr_foo, value_out, sizeof(value_out));</div><div class='add'>+	ASSERT_EQ(err, sizeof(value_foo), "getxattr size foo");</div><div class='add'>+	ASSERT_EQ(strncmp(value_out, value_foo, sizeof(value_foo)), 0, "strncmp value_foo");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_foo(struct test_set_remove_xattr *skel)</div><div class='add'>+{</div><div class='add'>+	ASSERT_OK(setxattr(testfile, skel-&gt;rodata-&gt;xattr_foo, value_foo, strlen(value_foo) + 1, 0),</div><div class='add'>+		  "setxattr foo");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void validate_bar_match(struct test_set_remove_xattr *skel)</div><div class='add'>+{</div><div class='add'>+	char value_out[32];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = getxattr(testfile, skel-&gt;rodata-&gt;xattr_bar, value_out, sizeof(value_out));</div><div class='add'>+	ASSERT_EQ(err, sizeof(skel-&gt;data-&gt;value_bar), "getxattr size bar");</div><div class='add'>+	ASSERT_EQ(strncmp(value_out, skel-&gt;data-&gt;value_bar, sizeof(skel-&gt;data-&gt;value_bar)), 0,</div><div class='add'>+		  "strncmp value_bar");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void validate_bar_removed(struct test_set_remove_xattr *skel)</div><div class='add'>+{</div><div class='add'>+	char value_out[32];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = getxattr(testfile, skel-&gt;rodata-&gt;xattr_bar, value_out, sizeof(value_out));</div><div class='add'>+	ASSERT_LT(err, 0, "getxattr size bar should fail");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_set_remove_xattr(void)</div><div class='add'>+{</div><div class='add'>+	struct test_set_remove_xattr *skel = NULL;</div><div class='add'>+	int fd = -1, err;</div><div class='add'>+</div><div class='add'>+	fd = open(testfile, O_CREAT | O_RDONLY, 0644);</div><div class='add'>+	if (!ASSERT_GE(fd, 0, "create_file"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	close(fd);</div><div class='add'>+	fd = -1;</div><div class='add'>+</div><div class='add'>+	skel = test_set_remove_xattr__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "test_set_remove_xattr__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Set security.bpf.foo to "hello" */</div><div class='add'>+	err = setxattr(testfile, skel-&gt;rodata-&gt;xattr_foo, value_foo, strlen(value_foo) + 1, 0);</div><div class='add'>+	if (err &amp;&amp; errno == EOPNOTSUPP) {</div><div class='add'>+		printf("%s:SKIP:local fs doesn't support xattr (%d)\n"</div><div class='add'>+		       "To run this test, make sure /tmp filesystem supports xattr.\n",</div><div class='add'>+		       __func__, errno);</div><div class='add'>+		test__skip();</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(err, "setxattr"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;monitored_pid = getpid();</div><div class='add'>+	err = test_set_remove_xattr__attach(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "test_set_remove_xattr__attach"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* First, test not _locked version of the kfuncs with getxattr. */</div><div class='add'>+</div><div class='add'>+	/* Read security.bpf.foo and trigger test_inode_getxattr. This</div><div class='add'>+	 * bpf program will set security.bpf.bar to "world".</div><div class='add'>+	 */</div><div class='add'>+	read_and_validate_foo(skel);</div><div class='add'>+	validate_bar_match(skel);</div><div class='add'>+</div><div class='add'>+	/* Read security.bpf.foo and trigger test_inode_getxattr again.</div><div class='add'>+	 * This will remove xattr security.bpf.bar.</div><div class='add'>+	 */</div><div class='add'>+	read_and_validate_foo(skel);</div><div class='add'>+	validate_bar_removed(skel);</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(skel-&gt;bss-&gt;set_security_bpf_bar_success, "set_security_bpf_bar_success");</div><div class='add'>+	ASSERT_TRUE(skel-&gt;bss-&gt;remove_security_bpf_bar_success, "remove_security_bpf_bar_success");</div><div class='add'>+	ASSERT_TRUE(skel-&gt;bss-&gt;set_security_selinux_fail, "set_security_selinux_fail");</div><div class='add'>+	ASSERT_TRUE(skel-&gt;bss-&gt;remove_security_selinux_fail, "remove_security_selinux_fail");</div><div class='add'>+</div><div class='add'>+	/* Second, test _locked version of the kfuncs, with setxattr */</div><div class='add'>+</div><div class='add'>+	/* Set security.bpf.foo and trigger test_inode_setxattr. This</div><div class='add'>+	 * bpf program will set security.bpf.bar to "world".</div><div class='add'>+	 */</div><div class='add'>+	set_foo(skel);</div><div class='add'>+	validate_bar_match(skel);</div><div class='add'>+</div><div class='add'>+	/* Set security.bpf.foo and trigger test_inode_setxattr again.</div><div class='add'>+	 * This will remove xattr security.bpf.bar.</div><div class='add'>+	 */</div><div class='add'>+	set_foo(skel);</div><div class='add'>+	validate_bar_removed(skel);</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(skel-&gt;bss-&gt;locked_set_security_bpf_bar_success,</div><div class='add'>+		    "locked_set_security_bpf_bar_success");</div><div class='add'>+	ASSERT_TRUE(skel-&gt;bss-&gt;locked_remove_security_bpf_bar_success,</div><div class='add'>+		    "locked_remove_security_bpf_bar_success");</div><div class='add'>+	ASSERT_TRUE(skel-&gt;bss-&gt;locked_set_security_selinux_fail,</div><div class='add'>+		    "locked_set_security_selinux_fail");</div><div class='add'>+	ASSERT_TRUE(skel-&gt;bss-&gt;locked_remove_security_selinux_fail,</div><div class='add'>+		    "locked_remove_security_selinux_fail");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	close(fd);</div><div class='add'>+	test_set_remove_xattr__destroy(skel);</div><div class='add'>+	remove(testfile);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifndef SHA256_DIGEST_SIZE</div><div class='ctx'> #define SHA256_DIGEST_SIZE      32</div><div class='ctx'> #endif</div><div class='hunk'>@@ -141,8 +270,21 @@ out:</div><div class='ctx'> </div><div class='ctx'> void test_fs_kfuncs(void)</div><div class='ctx'> {</div><div class='del'>-	if (test__start_subtest("xattr"))</div><div class='del'>-		test_xattr();</div><div class='add'>+	/* Matches xattr_names in progs/test_get_xattr.c */</div><div class='add'>+	if (test__start_subtest("user_xattr"))</div><div class='add'>+		test_get_xattr("user.kfuncs", "hello", true);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("security_bpf_xattr"))</div><div class='add'>+		test_get_xattr("security.bpf.xxx", "hello", true);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("security_bpf_xattr_error"))</div><div class='add'>+		test_get_xattr("security.bpf", "hello", false);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("security_selinux_xattr_error"))</div><div class='add'>+		test_get_xattr("security.selinux", "hello", false);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("set_remove_xattr"))</div><div class='add'>+		test_set_remove_xattr();</div><div class='ctx'> </div><div class='ctx'> 	if (test__start_subtest("fsverity"))</div><div class='ctx'> 		test_fsverity();</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/htab_update.c b/tools/testing/selftests/bpf/prog_tests/htab_update.c<br/>index 2bc85f4814f4..d0b405eb2966 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/htab_update.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/htab_update.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/htab_update.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/htab_update.c</a></div><div class='hunk'>@@ -15,17 +15,17 @@ struct htab_update_ctx {</div><div class='ctx'> static void test_reenter_update(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct htab_update *skel;</div><div class='del'>-	unsigned int key, value;</div><div class='add'>+	void *value = NULL;</div><div class='add'>+	unsigned int key, value_size;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	skel = htab_update__open();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "htab_update__open"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* lookup_elem_raw() may be inlined and find_kernel_btf_id() will return -ESRCH */</div><div class='del'>-	bpf_program__set_autoload(skel-&gt;progs.lookup_elem_raw, true);</div><div class='add'>+	bpf_program__set_autoload(skel-&gt;progs.bpf_obj_free_fields, true);</div><div class='ctx'> 	err = htab_update__load(skel);</div><div class='del'>-	if (!ASSERT_TRUE(!err || err == -ESRCH, "htab_update__load") || err)</div><div class='add'>+	if (!ASSERT_TRUE(!err, "htab_update__load") || err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	skel-&gt;bss-&gt;pid = getpid();</div><div class='hunk'>@@ -33,14 +33,33 @@ static void test_reenter_update(void)</div><div class='ctx'> 	if (!ASSERT_OK(err, "htab_update__attach"))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Will trigger the reentrancy of bpf_map_update_elem() */</div><div class='add'>+	value_size = bpf_map__value_size(skel-&gt;maps.htab);</div><div class='add'>+</div><div class='add'>+	value = calloc(1, value_size);</div><div class='add'>+	if (!ASSERT_OK_PTR(value, "calloc value"))</div><div class='add'>+		goto out;</div><div class='add'>+	/*</div><div class='add'>+	 * First update: plain insert. This should NOT trigger the re-entrancy</div><div class='add'>+	 * path, because there is no old element to free yet.</div><div class='add'>+	 */</div><div class='ctx'> 	key = 0;</div><div class='del'>-	value = 0;</div><div class='del'>-	err = bpf_map_update_elem(bpf_map__fd(skel-&gt;maps.htab), &amp;key, &amp;value, 0);</div><div class='del'>-	if (!ASSERT_OK(err, "add element"))</div><div class='add'>+	err = bpf_map_update_elem(bpf_map__fd(skel-&gt;maps.htab), &amp;key, value, BPF_ANY);</div><div class='add'>+	if (!ASSERT_OK(err, "first update (insert)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Second update: replace existing element with same key and trigger</div><div class='add'>+	 * the reentrancy of bpf_map_update_elem().</div><div class='add'>+	 * check_and_free_fields() calls bpf_obj_free_fields() on the old</div><div class='add'>+	 * value, which is where fentry program runs and performs a nested</div><div class='add'>+	 * bpf_map_update_elem(), triggering -EDEADLK.</div><div class='add'>+	 */</div><div class='add'>+	memset(value, 0, value_size);</div><div class='add'>+	err = bpf_map_update_elem(bpf_map__fd(skel-&gt;maps.htab), &amp;key, value, BPF_ANY);</div><div class='add'>+	if (!ASSERT_OK(err, "second update (replace)"))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ASSERT_EQ(skel-&gt;bss-&gt;update_err, -EBUSY, "no reentrancy");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;update_err, -EDEADLK, "no reentrancy");</div><div class='ctx'> out:</div><div class='ctx'> 	htab_update__destroy(skel);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/kernel_flag.c b/tools/testing/selftests/bpf/prog_tests/kernel_flag.c<br/>new file mode 100644<br/>index 000000000000..97b00c7efe94<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/kernel_flag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/kernel_flag.c</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Microsoft */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "kfunc_call_test.skel.h"</div><div class='add'>+#include "kfunc_call_test.lskel.h"</div><div class='add'>+#include "test_kernel_flag.skel.h"</div><div class='add'>+</div><div class='add'>+void test_kernel_flag(void)</div><div class='add'>+{</div><div class='add'>+	struct test_kernel_flag *lsm_skel;</div><div class='add'>+	struct kfunc_call_test *skel = NULL;</div><div class='add'>+	struct kfunc_call_test_lskel *lskel = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lsm_skel = test_kernel_flag__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(lsm_skel, "lsm_skel"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lsm_skel-&gt;bss-&gt;monitored_tid = sys_gettid();</div><div class='add'>+</div><div class='add'>+	ret = test_kernel_flag__attach(lsm_skel);</div><div class='add'>+	if (!ASSERT_OK(ret, "test_kernel_flag__attach"))</div><div class='add'>+		goto close_prog;</div><div class='add'>+</div><div class='add'>+	/* Test with skel. This should pass the gatekeeper */</div><div class='add'>+	skel = kfunc_call_test__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel"))</div><div class='add'>+		goto close_prog;</div><div class='add'>+</div><div class='add'>+	/* Test with lskel. This should fail due to blocking kernel-based bpf() invocations */</div><div class='add'>+	lskel = kfunc_call_test_lskel__open_and_load();</div><div class='add'>+	if (!ASSERT_ERR_PTR(lskel, "lskel"))</div><div class='add'>+		goto close_prog;</div><div class='add'>+</div><div class='add'>+close_prog:</div><div class='add'>+	if (skel)</div><div class='add'>+		kfunc_call_test__destroy(skel);</div><div class='add'>+	if (lskel)</div><div class='add'>+		kfunc_call_test_lskel__destroy(lskel);</div><div class='add'>+</div><div class='add'>+	lsm_skel-&gt;bss-&gt;monitored_tid = 0;</div><div class='add'>+	test_kernel_flag__destroy(lsm_skel);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c b/tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c<br/>index 8e13a3416a21..6e35e13c2022 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c</a></div><div class='hunk'>@@ -57,7 +57,8 @@ static void subtest_kmem_cache_iter_check_slabinfo(struct kmem_cache_iter *skel)</div><div class='ctx'> 		if (!ASSERT_OK(ret, "kmem_cache_lookup"))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ASSERT_STREQ(r.name, name, "kmem_cache_name");</div><div class='add'>+		ASSERT_STRNEQ(r.name, name, sizeof(r.name) - 1,</div><div class='add'>+			      "kmem_cache_name");</div><div class='ctx'> 		ASSERT_EQ(r.obj_size, objsize, "kmem_cache_objsize");</div><div class='ctx'> </div><div class='ctx'> 		seen++;</div><div class='hunk'>@@ -104,7 +105,7 @@ void test_kmem_cache_iter(void)</div><div class='ctx'> 		goto destroy;</div><div class='ctx'> </div><div class='ctx'> 	memset(buf, 0, sizeof(buf));</div><div class='del'>-	while (read(iter_fd, buf, sizeof(buf) &gt; 0)) {</div><div class='add'>+	while (read(iter_fd, buf, sizeof(buf)) &gt; 0) {</div><div class='ctx'> 		/* Read out all contents */</div><div class='ctx'> 		printf("%s", buf);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c<br/>index e19ef509ebf8..6cfaa978bc9a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include "kprobe_multi_session.skel.h"</div><div class='ctx'> #include "kprobe_multi_session_cookie.skel.h"</div><div class='ctx'> #include "kprobe_multi_verifier.skel.h"</div><div class='add'>+#include "kprobe_write_ctx.skel.h"</div><div class='ctx'> #include "bpf/libbpf_internal.h"</div><div class='ctx'> #include "bpf/hashmap.h"</div><div class='ctx'> </div><div class='hunk'>@@ -422,220 +423,6 @@ static void test_unique_match(void)</div><div class='ctx'> 	kprobe_multi__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static size_t symbol_hash(long key, void *ctx __maybe_unused)</div><div class='del'>-{</div><div class='del'>-	return str_hash((const char *) key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool symbol_equal(long key1, long key2, void *ctx __maybe_unused)</div><div class='del'>-{</div><div class='del'>-	return strcmp((const char *) key1, (const char *) key2) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool is_invalid_entry(char *buf, bool kernel)</div><div class='del'>-{</div><div class='del'>-	if (kernel &amp;&amp; strchr(buf, '['))</div><div class='del'>-		return true;</div><div class='del'>-	if (!kernel &amp;&amp; !strchr(buf, '['))</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool skip_entry(char *name)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * We attach to almost all kernel functions and some of them</div><div class='del'>-	 * will cause 'suspicious RCU usage' when fprobe is attached</div><div class='del'>-	 * to them. Filter out the current culprits - arch_cpu_idle</div><div class='del'>-	 * default_idle and rcu_* functions.</div><div class='del'>-	 */</div><div class='del'>-	if (!strcmp(name, "arch_cpu_idle"))</div><div class='del'>-		return true;</div><div class='del'>-	if (!strcmp(name, "default_idle"))</div><div class='del'>-		return true;</div><div class='del'>-	if (!strncmp(name, "rcu_", 4))</div><div class='del'>-		return true;</div><div class='del'>-	if (!strcmp(name, "bpf_dispatcher_xdp_func"))</div><div class='del'>-		return true;</div><div class='del'>-	if (!strncmp(name, "__ftrace_invalid_address__",</div><div class='del'>-		     sizeof("__ftrace_invalid_address__") - 1))</div><div class='del'>-		return true;</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Do comparision by ignoring '.llvm.&lt;hash&gt;' suffixes. */</div><div class='del'>-static int compare_name(const char *name1, const char *name2)</div><div class='del'>-{</div><div class='del'>-	const char *res1, *res2;</div><div class='del'>-	int len1, len2;</div><div class='del'>-</div><div class='del'>-	res1 = strstr(name1, ".llvm.");</div><div class='del'>-	res2 = strstr(name2, ".llvm.");</div><div class='del'>-	len1 = res1 ? res1 - name1 : strlen(name1);</div><div class='del'>-	len2 = res2 ? res2 - name2 : strlen(name2);</div><div class='del'>-</div><div class='del'>-	if (len1 == len2)</div><div class='del'>-		return strncmp(name1, name2, len1);</div><div class='del'>-	if (len1 &lt; len2)</div><div class='del'>-		return strncmp(name1, name2, len1) &lt;= 0 ? -1 : 1;</div><div class='del'>-	return strncmp(name1, name2, len2) &gt;= 0 ? 1 : -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int load_kallsyms_compare(const void *p1, const void *p2)</div><div class='del'>-{</div><div class='del'>-	return compare_name(((const struct ksym *)p1)-&gt;name, ((const struct ksym *)p2)-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int search_kallsyms_compare(const void *p1, const struct ksym *p2)</div><div class='del'>-{</div><div class='del'>-	return compare_name(p1, p2-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_syms(char ***symsp, size_t *cntp, bool kernel)</div><div class='del'>-{</div><div class='del'>-	size_t cap = 0, cnt = 0;</div><div class='del'>-	char *name = NULL, *ksym_name, **syms = NULL;</div><div class='del'>-	struct hashmap *map;</div><div class='del'>-	struct ksyms *ksyms;</div><div class='del'>-	struct ksym *ks;</div><div class='del'>-	char buf[256];</div><div class='del'>-	FILE *f;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	ksyms = load_kallsyms_custom_local(load_kallsyms_compare);</div><div class='del'>-	if (!ASSERT_OK_PTR(ksyms, "load_kallsyms_custom_local"))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The available_filter_functions contains many duplicates,</div><div class='del'>-	 * but other than that all symbols are usable in kprobe multi</div><div class='del'>-	 * interface.</div><div class='del'>-	 * Filtering out duplicates by using hashmap__add, which won't</div><div class='del'>-	 * add existing entry.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (access("/sys/kernel/tracing/trace", F_OK) == 0)</div><div class='del'>-		f = fopen("/sys/kernel/tracing/available_filter_functions", "r");</div><div class='del'>-	else</div><div class='del'>-		f = fopen("/sys/kernel/debug/tracing/available_filter_functions", "r");</div><div class='del'>-</div><div class='del'>-	if (!f)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	map = hashmap__new(symbol_hash, symbol_equal, NULL);</div><div class='del'>-	if (IS_ERR(map)) {</div><div class='del'>-		err = libbpf_get_error(map);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (fgets(buf, sizeof(buf), f)) {</div><div class='del'>-		if (is_invalid_entry(buf, kernel))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		free(name);</div><div class='del'>-		if (sscanf(buf, "%ms$*[^\n]\n", &amp;name) != 1)</div><div class='del'>-			continue;</div><div class='del'>-		if (skip_entry(name))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ks = search_kallsyms_custom_local(ksyms, name, search_kallsyms_compare);</div><div class='del'>-		if (!ks) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ksym_name = ks-&gt;name;</div><div class='del'>-		err = hashmap__add(map, ksym_name, 0);</div><div class='del'>-		if (err == -EEXIST) {</div><div class='del'>-			err = 0;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (err)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='del'>-		err = libbpf_ensure_mem((void **) &amp;syms, &amp;cap,</div><div class='del'>-					sizeof(*syms), cnt + 1);</div><div class='del'>-		if (err)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='del'>-		syms[cnt++] = ksym_name;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*symsp = syms;</div><div class='del'>-	*cntp = cnt;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	free(name);</div><div class='del'>-	fclose(f);</div><div class='del'>-	hashmap__free(map);</div><div class='del'>-	if (err)</div><div class='del'>-		free(syms);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel)</div><div class='del'>-{</div><div class='del'>-	unsigned long *addr, *addrs, *tmp_addrs;</div><div class='del'>-	int err = 0, max_cnt, inc_cnt;</div><div class='del'>-	char *name = NULL;</div><div class='del'>-	size_t cnt = 0;</div><div class='del'>-	char buf[256];</div><div class='del'>-	FILE *f;</div><div class='del'>-</div><div class='del'>-	if (access("/sys/kernel/tracing/trace", F_OK) == 0)</div><div class='del'>-		f = fopen("/sys/kernel/tracing/available_filter_functions_addrs", "r");</div><div class='del'>-	else</div><div class='del'>-		f = fopen("/sys/kernel/debug/tracing/available_filter_functions_addrs", "r");</div><div class='del'>-</div><div class='del'>-	if (!f)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	/* In my local setup, the number of entries is 50k+ so Let us initially</div><div class='del'>-	 * allocate space to hold 64k entries. If 64k is not enough, incrementally</div><div class='del'>-	 * increase 1k each time.</div><div class='del'>-	 */</div><div class='del'>-	max_cnt = 65536;</div><div class='del'>-	inc_cnt = 1024;</div><div class='del'>-	addrs = malloc(max_cnt * sizeof(long));</div><div class='del'>-	if (addrs == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (fgets(buf, sizeof(buf), f)) {</div><div class='del'>-		if (is_invalid_entry(buf, kernel))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		free(name);</div><div class='del'>-		if (sscanf(buf, "%p %ms$*[^\n]\n", &amp;addr, &amp;name) != 2)</div><div class='del'>-			continue;</div><div class='del'>-		if (skip_entry(name))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (cnt == max_cnt) {</div><div class='del'>-			max_cnt += inc_cnt;</div><div class='del'>-			tmp_addrs = realloc(addrs, max_cnt);</div><div class='del'>-			if (!tmp_addrs) {</div><div class='del'>-				err = -ENOMEM;</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-			addrs = tmp_addrs;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		addrs[cnt++] = (unsigned long)addr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*addrsp = addrs;</div><div class='del'>-	*cntp = cnt;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	free(name);</div><div class='del'>-	fclose(f);</div><div class='del'>-	if (err)</div><div class='del'>-		free(addrs);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void do_bench_test(struct kprobe_multi_empty *skel, struct bpf_kprobe_multi_opts *opts)</div><div class='ctx'> {</div><div class='ctx'> 	long attach_start_ns, attach_end_ns;</div><div class='hunk'>@@ -670,7 +457,7 @@ static void test_kprobe_multi_bench_attach(bool kernel)</div><div class='ctx'> 	char **syms = NULL;</div><div class='ctx'> 	size_t cnt = 0;</div><div class='ctx'> </div><div class='del'>-	if (!ASSERT_OK(get_syms(&amp;syms, &amp;cnt, kernel), "get_syms"))</div><div class='add'>+	if (!ASSERT_OK(bpf_get_ksyms(&amp;syms, &amp;cnt, kernel), "bpf_get_ksyms"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skel = kprobe_multi_empty__open_and_load();</div><div class='hunk'>@@ -696,13 +483,13 @@ static void test_kprobe_multi_bench_attach_addr(bool kernel)</div><div class='ctx'> 	size_t cnt = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = get_addrs(&amp;addrs, &amp;cnt, kernel);</div><div class='add'>+	err = bpf_get_addrs(&amp;addrs, &amp;cnt, kernel);</div><div class='ctx'> 	if (err == -ENOENT) {</div><div class='ctx'> 		test__skip();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ASSERT_OK(err, "get_addrs"))</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_get_addrs"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skel = kprobe_multi_empty__open_and_load();</div><div class='hunk'>@@ -753,6 +540,30 @@ cleanup:</div><div class='ctx'> 	kprobe_multi_override__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+static void test_attach_write_ctx(void)</div><div class='add'>+{</div><div class='add'>+	struct kprobe_write_ctx *skel = NULL;</div><div class='add'>+	struct bpf_link *link = NULL;</div><div class='add'>+</div><div class='add'>+	skel = kprobe_write_ctx__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "kprobe_write_ctx__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach_kprobe_opts(skel-&gt;progs.kprobe_multi_write_ctx,</div><div class='add'>+						     "bpf_fentry_test1", NULL);</div><div class='add'>+	if (!ASSERT_ERR_PTR(link, "bpf_program__attach_kprobe_opts"))</div><div class='add'>+		bpf_link__destroy(link);</div><div class='add'>+</div><div class='add'>+	kprobe_write_ctx__destroy(skel);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void test_attach_write_ctx(void)</div><div class='add'>+{</div><div class='add'>+	test__skip();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void serial_test_kprobe_multi_bench_attach(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("kernel"))</div><div class='hunk'>@@ -792,5 +603,7 @@ void test_kprobe_multi_test(void)</div><div class='ctx'> 		test_session_cookie_skel_api();</div><div class='ctx'> 	if (test__start_subtest("unique_match"))</div><div class='ctx'> 		test_unique_match();</div><div class='add'>+	if (test__start_subtest("attach_write_ctx"))</div><div class='add'>+		test_attach_write_ctx();</div><div class='ctx'> 	RUN_TESTS(kprobe_multi_verifier);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/linked_list.c b/tools/testing/selftests/bpf/prog_tests/linked_list.c<br/>index 77d07e0a4a55..14c5a7ef0e87 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/linked_list.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/linked_list.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/linked_list.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/linked_list.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "linked_list.skel.h"</div><div class='ctx'> #include "linked_list_fail.skel.h"</div><div class='add'>+#include "linked_list_peek.skel.h"</div><div class='ctx'> </div><div class='ctx'> static char log_buf[1024 * 1024];</div><div class='ctx'> </div><div class='hunk'>@@ -71,7 +72,7 @@ static struct {</div><div class='ctx'> 	{ "new_null_ret", "R0 invalid mem access 'ptr_or_null_'" },</div><div class='ctx'> 	{ "obj_new_acq", "Unreleased reference id=" },</div><div class='ctx'> 	{ "use_after_drop", "invalid mem access 'scalar'" },</div><div class='del'>-	{ "ptr_walk_scalar", "type=scalar expected=percpu_ptr_" },</div><div class='add'>+	{ "ptr_walk_scalar", "type=rdonly_untrusted_mem expected=percpu_ptr_" },</div><div class='ctx'> 	{ "direct_read_lock", "direct access to bpf_spin_lock is disallowed" },</div><div class='ctx'> 	{ "direct_write_lock", "direct access to bpf_spin_lock is disallowed" },</div><div class='ctx'> 	{ "direct_read_head", "direct access to bpf_list_head is disallowed" },</div><div class='hunk'>@@ -805,3 +806,8 @@ void test_linked_list(void)</div><div class='ctx'> 	test_linked_list_success(LIST_IN_LIST, true);</div><div class='ctx'> 	test_linked_list_success(TEST_ALL, false);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void test_linked_list_peek(void)</div><div class='add'>+{</div><div class='add'>+	RUN_TESTS(linked_list_peek);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/livepatch_trampoline.c b/tools/testing/selftests/bpf/prog_tests/livepatch_trampoline.c<br/>new file mode 100644<br/>index 000000000000..72aa5376c30e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/livepatch_trampoline.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/livepatch_trampoline.c</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "testing_helpers.h"</div><div class='add'>+#include "livepatch_trampoline.skel.h"</div><div class='add'>+</div><div class='add'>+static int load_livepatch(void)</div><div class='add'>+{</div><div class='add'>+	char path[4096];</div><div class='add'>+</div><div class='add'>+	/* CI will set KBUILD_OUTPUT */</div><div class='add'>+	snprintf(path, sizeof(path), "%s/samples/livepatch/livepatch-sample.ko",</div><div class='add'>+		 getenv("KBUILD_OUTPUT") ? : "../../../..");</div><div class='add'>+</div><div class='add'>+	return load_module(path, env_verbosity &gt; VERBOSE_NONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unload_livepatch(void)</div><div class='add'>+{</div><div class='add'>+	/* Disable the livepatch before unloading the module */</div><div class='add'>+	system("echo 0 &gt; /sys/kernel/livepatch/livepatch_sample/enabled");</div><div class='add'>+</div><div class='add'>+	unload_module("livepatch_sample", env_verbosity &gt; VERBOSE_NONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void read_proc_cmdline(void)</div><div class='add'>+{</div><div class='add'>+	char buf[4096];</div><div class='add'>+	int fd, ret;</div><div class='add'>+</div><div class='add'>+	fd = open("/proc/cmdline", O_RDONLY);</div><div class='add'>+	if (!ASSERT_OK_FD(fd, "open /proc/cmdline"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = read(fd, buf, sizeof(buf));</div><div class='add'>+	if (!ASSERT_GT(ret, 0, "read /proc/cmdline"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ASSERT_OK(strncmp(buf, "this has been live patched", 26), "strncmp");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	close(fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __test_livepatch_trampoline(bool fexit_first)</div><div class='add'>+{</div><div class='add'>+	struct livepatch_trampoline *skel = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = livepatch_trampoline__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_open_and_load"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;my_pid = getpid();</div><div class='add'>+</div><div class='add'>+	if (!fexit_first) {</div><div class='add'>+		/* fentry program is loaded first by default */</div><div class='add'>+		err = livepatch_trampoline__attach(skel);</div><div class='add'>+		if (!ASSERT_OK(err, "skel_attach"))</div><div class='add'>+			goto out;</div><div class='add'>+	} else {</div><div class='add'>+		/* Manually load fexit program first. */</div><div class='add'>+		skel-&gt;links.fexit_cmdline = bpf_program__attach(skel-&gt;progs.fexit_cmdline);</div><div class='add'>+		if (!ASSERT_OK_PTR(skel-&gt;links.fexit_cmdline, "attach_fexit"))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		skel-&gt;links.fentry_cmdline = bpf_program__attach(skel-&gt;progs.fentry_cmdline);</div><div class='add'>+		if (!ASSERT_OK_PTR(skel-&gt;links.fentry_cmdline, "attach_fentry"))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read_proc_cmdline();</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;fentry_hit, 1, "fentry_hit");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;fexit_hit, 1, "fexit_hit");</div><div class='add'>+out:</div><div class='add'>+	livepatch_trampoline__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_livepatch_trampoline(void)</div><div class='add'>+{</div><div class='add'>+	int retry_cnt = 0;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	if (load_livepatch()) {</div><div class='add'>+		if (retry_cnt) {</div><div class='add'>+			ASSERT_OK(1, "load_livepatch");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Something else (previous run of the same test?) loaded</div><div class='add'>+		 * the KLP module. Unload the KLP module and retry.</div><div class='add'>+		 */</div><div class='add'>+		unload_livepatch();</div><div class='add'>+		retry_cnt++;</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("fentry_first"))</div><div class='add'>+		__test_livepatch_trampoline(false);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("fexit_first"))</div><div class='add'>+		__test_livepatch_trampoline(true);</div><div class='add'>+out:</div><div class='add'>+	unload_livepatch();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/log_buf.c b/tools/testing/selftests/bpf/prog_tests/log_buf.c<br/>index 169ce689b97c..d6f14a232002 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/log_buf.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/log_buf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/log_buf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/log_buf.c</a></div><div class='hunk'>@@ -7,6 +7,10 @@</div><div class='ctx'> #include "test_log_buf.skel.h"</div><div class='ctx'> #include "bpf_util.h"</div><div class='ctx'> </div><div class='add'>+#if !defined(__clang__)</div><div class='add'>+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static size_t libbpf_log_pos;</div><div class='ctx'> static char libbpf_log_buf[1024 * 1024];</div><div class='ctx'> static bool libbpf_log_error;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/lwt_helpers.h b/tools/testing/selftests/bpf/prog_tests/lwt_helpers.h<br/>index fb1eb8c67361..ccec0fcdabc1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/lwt_helpers.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/lwt_helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/lwt_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/lwt_helpers.h</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;time.h&gt;</div><div class='ctx'> #include &lt;net/if.h&gt;</div><div class='del'>-#include &lt;linux/if_tun.h&gt;</div><div class='ctx'> #include &lt;linux/icmp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "test_progs.h"</div><div class='hunk'>@@ -37,34 +36,6 @@ static inline int netns_delete(void)</div><div class='ctx'> 	return system("ip netns del " NETNS "&gt;/dev/null 2&gt;&amp;1");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int open_tuntap(const char *dev_name, bool need_mac)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct ifreq ifr;</div><div class='del'>-	int fd = open("/dev/net/tun", O_RDWR);</div><div class='del'>-</div><div class='del'>-	if (!ASSERT_GT(fd, 0, "open(/dev/net/tun)"))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	ifr.ifr_flags = IFF_NO_PI | (need_mac ? IFF_TAP : IFF_TUN);</div><div class='del'>-	strncpy(ifr.ifr_name, dev_name, IFNAMSIZ - 1);</div><div class='del'>-	ifr.ifr_name[IFNAMSIZ - 1] = '\0';</div><div class='del'>-</div><div class='del'>-	err = ioctl(fd, TUNSETIFF, &amp;ifr);</div><div class='del'>-	if (!ASSERT_OK(err, "ioctl(TUNSETIFF)")) {</div><div class='del'>-		close(fd);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = fcntl(fd, F_SETFL, O_NONBLOCK);</div><div class='del'>-	if (!ASSERT_OK(err, "fcntl(O_NONBLOCK)")) {</div><div class='del'>-		close(fd);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return fd;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define ICMP_PAYLOAD_SIZE     100</div><div class='ctx'> </div><div class='ctx'> /* Match an ICMP packet with payload len ICMP_PAYLOAD_SIZE */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/lwt_ip_encap.c b/tools/testing/selftests/bpf/prog_tests/lwt_ip_encap.c<br/>new file mode 100644<br/>index 000000000000..b6391af5f6f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/lwt_ip_encap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/lwt_ip_encap.c</a></div><div class='hunk'>@@ -0,0 +1,540 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+</div><div class='add'>+#include "network_helpers.h"</div><div class='add'>+#include "test_progs.h"</div><div class='add'>+</div><div class='add'>+#define BPF_FILE "test_lwt_ip_encap.bpf.o"</div><div class='add'>+</div><div class='add'>+#define NETNS_NAME_SIZE	32</div><div class='add'>+#define NETNS_BASE	"ns-lwt-ip-encap"</div><div class='add'>+</div><div class='add'>+#define IP4_ADDR_1 "172.16.1.100"</div><div class='add'>+#define IP4_ADDR_2 "172.16.2.100"</div><div class='add'>+#define IP4_ADDR_3 "172.16.3.100"</div><div class='add'>+#define IP4_ADDR_4 "172.16.4.100"</div><div class='add'>+#define IP4_ADDR_5 "172.16.5.100"</div><div class='add'>+#define IP4_ADDR_6 "172.16.6.100"</div><div class='add'>+#define IP4_ADDR_7 "172.16.7.100"</div><div class='add'>+#define IP4_ADDR_8 "172.16.8.100"</div><div class='add'>+#define IP4_ADDR_GRE "172.16.16.100"</div><div class='add'>+</div><div class='add'>+#define IP4_ADDR_SRC IP4_ADDR_1</div><div class='add'>+#define IP4_ADDR_DST IP4_ADDR_4</div><div class='add'>+</div><div class='add'>+#define IP6_ADDR_1 "fb01::1"</div><div class='add'>+#define IP6_ADDR_2 "fb02::1"</div><div class='add'>+#define IP6_ADDR_3 "fb03::1"</div><div class='add'>+#define IP6_ADDR_4 "fb04::1"</div><div class='add'>+#define IP6_ADDR_5 "fb05::1"</div><div class='add'>+#define IP6_ADDR_6 "fb06::1"</div><div class='add'>+#define IP6_ADDR_7 "fb07::1"</div><div class='add'>+#define IP6_ADDR_8 "fb08::1"</div><div class='add'>+#define IP6_ADDR_GRE "fb10::1"</div><div class='add'>+</div><div class='add'>+#define IP6_ADDR_SRC IP6_ADDR_1</div><div class='add'>+#define IP6_ADDR_DST IP6_ADDR_4</div><div class='add'>+</div><div class='add'>+/* Setup/topology:</div><div class='add'>+ *</div><div class='add'>+ *    NS1             NS2             NS3</div><div class='add'>+ *   veth1 &lt;---&gt; veth2   veth3 &lt;---&gt; veth4 (the top route)</div><div class='add'>+ *   veth5 &lt;---&gt; veth6   veth7 &lt;---&gt; veth8 (the bottom route)</div><div class='add'>+ *</div><div class='add'>+ *   Each vethN gets IP[4|6]_ADDR_N address.</div><div class='add'>+ *</div><div class='add'>+ *   IP*_ADDR_SRC = IP*_ADDR_1</div><div class='add'>+ *   IP*_ADDR_DST = IP*_ADDR_4</div><div class='add'>+ *</div><div class='add'>+ *   All tests test pings from IP*_ADDR__SRC to IP*_ADDR_DST.</div><div class='add'>+ *</div><div class='add'>+ *   By default, routes are configured to allow packets to go</div><div class='add'>+ *   IP*_ADDR_1 &lt;=&gt; IP*_ADDR_2 &lt;=&gt; IP*_ADDR_3 &lt;=&gt; IP*_ADDR_4 (the top route).</div><div class='add'>+ *</div><div class='add'>+ *   A GRE device is installed in NS3 with IP*_ADDR_GRE, and</div><div class='add'>+ *   NS1/NS2 are configured to route packets to IP*_ADDR_GRE via IP*_ADDR_8</div><div class='add'>+ *   (the bottom route).</div><div class='add'>+ *</div><div class='add'>+ * Tests:</div><div class='add'>+ *</div><div class='add'>+ *   1. Routes NS2-&gt;IP*_ADDR_DST are brought down, so the only way a ping</div><div class='add'>+ *      from IP*_ADDR_SRC to IP*_ADDR_DST can work is via IP*_ADDR_GRE.</div><div class='add'>+ *</div><div class='add'>+ *   2a. In an egress test, a bpf LWT_XMIT program is installed on veth1</div><div class='add'>+ *       that encaps the packets with an IP/GRE header to route to IP*_ADDR_GRE.</div><div class='add'>+ *</div><div class='add'>+ *       ping: SRC-&gt;[encap at veth1:egress]-&gt;GRE:decap-&gt;DST</div><div class='add'>+ *       ping replies go DST-&gt;SRC directly</div><div class='add'>+ *</div><div class='add'>+ *   2b. In an ingress test, a bpf LWT_IN program is installed on veth2</div><div class='add'>+ *       that encaps the packets with an IP/GRE header to route to IP*_ADDR_GRE.</div><div class='add'>+ *</div><div class='add'>+ *       ping: SRC-&gt;[encap at veth2:ingress]-&gt;GRE:decap-&gt;DST</div><div class='add'>+ *       ping replies go DST-&gt;SRC directly</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int create_ns(char *name, size_t name_sz)</div><div class='add'>+{</div><div class='add'>+	if (!name)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(append_tid(name, name_sz), "append TID"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip netns add %s", name);</div><div class='add'>+</div><div class='add'>+	/* rp_filter gets confused by what these tests are doing, so disable it */</div><div class='add'>+	SYS(fail, "ip netns exec %s sysctl -wq net.ipv4.conf.all.rp_filter=0", name);</div><div class='add'>+	SYS(fail, "ip netns exec %s sysctl -wq net.ipv4.conf.default.rp_filter=0", name);</div><div class='add'>+	/* Disable IPv6 DAD because it sometimes takes too long and fails tests */</div><div class='add'>+	SYS(fail, "ip netns exec %s sysctl -wq net.ipv6.conf.all.accept_dad=0", name);</div><div class='add'>+	SYS(fail, "ip netns exec %s sysctl -wq net.ipv6.conf.default.accept_dad=0", name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_top_addr(const char *ns1, const char *ns2, const char *ns3)</div><div class='add'>+{</div><div class='add'>+	SYS(fail, "ip -n %s    a add %s/24  dev veth1", ns1, IP4_ADDR_1);</div><div class='add'>+	SYS(fail, "ip -n %s    a add %s/24  dev veth2", ns2, IP4_ADDR_2);</div><div class='add'>+	SYS(fail, "ip -n %s    a add %s/24  dev veth3", ns2, IP4_ADDR_3);</div><div class='add'>+	SYS(fail, "ip -n %s    a add %s/24  dev veth4", ns3, IP4_ADDR_4);</div><div class='add'>+	SYS(fail, "ip -n %s -6 a add %s/128 dev veth1", ns1, IP6_ADDR_1);</div><div class='add'>+	SYS(fail, "ip -n %s -6 a add %s/128 dev veth2", ns2, IP6_ADDR_2);</div><div class='add'>+	SYS(fail, "ip -n %s -6 a add %s/128 dev veth3", ns2, IP6_ADDR_3);</div><div class='add'>+	SYS(fail, "ip -n %s -6 a add %s/128 dev veth4", ns3, IP6_ADDR_4);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s link set dev veth1 up", ns1);</div><div class='add'>+	SYS(fail, "ip -n %s link set dev veth2 up", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link set dev veth3 up", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link set dev veth4 up", ns3);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_bottom_addr(const char *ns1, const char *ns2, const char *ns3)</div><div class='add'>+{</div><div class='add'>+	SYS(fail, "ip -n %s    a add %s/24  dev veth5", ns1, IP4_ADDR_5);</div><div class='add'>+	SYS(fail, "ip -n %s    a add %s/24  dev veth6", ns2, IP4_ADDR_6);</div><div class='add'>+	SYS(fail, "ip -n %s    a add %s/24  dev veth7", ns2, IP4_ADDR_7);</div><div class='add'>+	SYS(fail, "ip -n %s    a add %s/24  dev veth8", ns3, IP4_ADDR_8);</div><div class='add'>+	SYS(fail, "ip -n %s -6 a add %s/128 dev veth5", ns1, IP6_ADDR_5);</div><div class='add'>+	SYS(fail, "ip -n %s -6 a add %s/128 dev veth6", ns2, IP6_ADDR_6);</div><div class='add'>+	SYS(fail, "ip -n %s -6 a add %s/128 dev veth7", ns2, IP6_ADDR_7);</div><div class='add'>+	SYS(fail, "ip -n %s -6 a add %s/128 dev veth8", ns3, IP6_ADDR_8);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s link set dev veth5 up", ns1);</div><div class='add'>+	SYS(fail, "ip -n %s link set dev veth6 up", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link set dev veth7 up", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link set dev veth8 up", ns3);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int configure_vrf(const char *ns1, const char *ns2)</div><div class='add'>+{</div><div class='add'>+	if (!ns1 || !ns2)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s link add red type vrf table 1001", ns1);</div><div class='add'>+	SYS(fail, "ip -n %s link set red up", ns1);</div><div class='add'>+	SYS(fail, "ip -n %s route add table 1001 unreachable default metric 8192", ns1);</div><div class='add'>+	SYS(fail, "ip -n %s -6 route add table 1001 unreachable default metric 8192", ns1);</div><div class='add'>+	SYS(fail, "ip -n %s link set veth1 vrf red", ns1);</div><div class='add'>+	SYS(fail, "ip -n %s link set veth5 vrf red", ns1);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s link add red type vrf table 1001", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link set red up", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s route add table 1001 unreachable default metric 8192", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s -6 route add table 1001 unreachable default metric 8192", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link set veth2 vrf red", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link set veth3 vrf red", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link set veth6 vrf red", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link set veth7 vrf red", ns2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int configure_ns1(const char *ns1, const char *vrf)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken = NULL;</div><div class='add'>+</div><div class='add'>+	if (!ns1 || !vrf)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(ns1);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open ns1"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* Top route */</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth1 %s", IP4_ADDR_2, vrf);</div><div class='add'>+	SYS(fail, "ip    route add default dev veth1 via %s %s", IP4_ADDR_2, vrf);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth1 %s", IP6_ADDR_2, vrf);</div><div class='add'>+	SYS(fail, "ip -6 route add default dev veth1 via %s %s", IP6_ADDR_2, vrf);</div><div class='add'>+	/* Bottom route */</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth5 %s", IP4_ADDR_6, vrf);</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth5 via  %s %s", IP4_ADDR_7, IP4_ADDR_6, vrf);</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth5 via  %s %s", IP4_ADDR_8, IP4_ADDR_6, vrf);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth5 %s", IP6_ADDR_6, vrf);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth5 via  %s %s", IP6_ADDR_7, IP6_ADDR_6, vrf);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth5 via  %s %s", IP6_ADDR_8, IP6_ADDR_6, vrf);</div><div class='add'>+</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int configure_ns2(const char *ns2, const char *vrf)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken = NULL;</div><div class='add'>+</div><div class='add'>+	if (!ns2 || !vrf)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(ns2);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open ns2"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip netns exec %s sysctl -wq net.ipv4.ip_forward=1", ns2);</div><div class='add'>+	SYS(fail, "ip netns exec %s sysctl -wq net.ipv6.conf.all.forwarding=1", ns2);</div><div class='add'>+</div><div class='add'>+	/* Top route */</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth2 %s", IP4_ADDR_1, vrf);</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth3 %s", IP4_ADDR_4, vrf);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth2 %s", IP6_ADDR_1, vrf);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth3 %s", IP6_ADDR_4, vrf);</div><div class='add'>+	/* Bottom route */</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth6 %s", IP4_ADDR_5, vrf);</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth7 %s", IP4_ADDR_8, vrf);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth6 %s", IP6_ADDR_5, vrf);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth7 %s", IP6_ADDR_8, vrf);</div><div class='add'>+</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int configure_ns3(const char *ns3)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken = NULL;</div><div class='add'>+</div><div class='add'>+	if (!ns3)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(ns3);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open ns3"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* Top route */</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth4", IP4_ADDR_3);</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth4 via  %s", IP4_ADDR_1, IP4_ADDR_3);</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth4 via  %s", IP4_ADDR_2, IP4_ADDR_3);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth4", IP6_ADDR_3);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth4 via  %s", IP6_ADDR_1, IP6_ADDR_3);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth4 via  %s", IP6_ADDR_2, IP6_ADDR_3);</div><div class='add'>+	/* Bottom route */</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth8", IP4_ADDR_7);</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth8 via  %s", IP4_ADDR_5, IP4_ADDR_7);</div><div class='add'>+	SYS(fail, "ip    route add %s/32  dev veth8 via  %s", IP4_ADDR_6, IP4_ADDR_7);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth8", IP6_ADDR_7);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth8 via  %s", IP6_ADDR_5, IP6_ADDR_7);</div><div class='add'>+	SYS(fail, "ip -6 route add %s/128 dev veth8 via  %s", IP6_ADDR_6, IP6_ADDR_7);</div><div class='add'>+</div><div class='add'>+	/* Configure IPv4 GRE device */</div><div class='add'>+	SYS(fail, "ip tunnel add gre_dev mode gre remote %s local %s ttl 255",</div><div class='add'>+	    IP4_ADDR_1, IP4_ADDR_GRE);</div><div class='add'>+	SYS(fail, "ip link set gre_dev up");</div><div class='add'>+	SYS(fail, "ip a add %s dev gre_dev", IP4_ADDR_GRE);</div><div class='add'>+</div><div class='add'>+	/* Configure IPv6 GRE device */</div><div class='add'>+	SYS(fail, "ip tunnel add gre6_dev mode ip6gre remote %s local %s ttl 255",</div><div class='add'>+	    IP6_ADDR_1, IP6_ADDR_GRE);</div><div class='add'>+	SYS(fail, "ip link set gre6_dev up");</div><div class='add'>+	SYS(fail, "ip a add %s dev gre6_dev", IP6_ADDR_GRE);</div><div class='add'>+</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_network(char *ns1, char *ns2, char *ns3, const char *vrf)</div><div class='add'>+{</div><div class='add'>+	if (!ns1 || !ns2 || !ns3 || !vrf)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s link add veth1 type veth peer name veth2 netns %s", ns1, ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link add veth3 type veth peer name veth4 netns %s", ns2, ns3);</div><div class='add'>+	SYS(fail, "ip -n %s link add veth5 type veth peer name veth6 netns %s", ns1, ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link add veth7 type veth peer name veth8 netns %s", ns2, ns3);</div><div class='add'>+</div><div class='add'>+	if (vrf[0]) {</div><div class='add'>+		if (!ASSERT_OK(configure_vrf(ns1, ns2), "configure vrf"))</div><div class='add'>+			goto fail;</div><div class='add'>+	}</div><div class='add'>+	if (!ASSERT_OK(set_top_addr(ns1, ns2, ns3), "set top addresses"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(set_bottom_addr(ns1, ns2, ns3), "set bottom addresses"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(configure_ns1(ns1, vrf), "configure ns1 routes"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(configure_ns2(ns2, vrf), "configure ns2 routes"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(configure_ns3(ns3), "configure ns3 routes"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* Link bottom route to the GRE tunnels */</div><div class='add'>+	SYS(fail, "ip -n %s route add %s/32 dev veth5 via %s %s",</div><div class='add'>+	    ns1, IP4_ADDR_GRE, IP4_ADDR_6, vrf);</div><div class='add'>+	SYS(fail, "ip -n %s route add %s/32 dev veth7 via %s %s",</div><div class='add'>+	    ns2, IP4_ADDR_GRE, IP4_ADDR_8, vrf);</div><div class='add'>+	SYS(fail, "ip -n %s -6 route add %s/128 dev veth5 via %s %s",</div><div class='add'>+	    ns1, IP6_ADDR_GRE, IP6_ADDR_6, vrf);</div><div class='add'>+	SYS(fail, "ip -n %s -6 route add %s/128 dev veth7 via %s %s",</div><div class='add'>+	    ns2, IP6_ADDR_GRE, IP6_ADDR_8, vrf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int remove_routes_to_gredev(const char *ns1, const char *ns2, const char *vrf)</div><div class='add'>+{</div><div class='add'>+	SYS(fail, "ip -n %s route del %s dev veth5 %s", ns1, IP4_ADDR_GRE, vrf);</div><div class='add'>+	SYS(fail, "ip -n %s route del %s dev veth7 %s", ns2, IP4_ADDR_GRE, vrf);</div><div class='add'>+	SYS(fail, "ip -n %s -6 route del %s/128 dev veth5 %s", ns1, IP6_ADDR_GRE, vrf);</div><div class='add'>+	SYS(fail, "ip -n %s -6 route del %s/128 dev veth7 %s", ns2, IP6_ADDR_GRE, vrf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_unreachable_routes_to_gredev(const char *ns1, const char *ns2, const char *vrf)</div><div class='add'>+{</div><div class='add'>+	SYS(fail, "ip -n %s route add unreachable %s/32 %s", ns1, IP4_ADDR_GRE, vrf);</div><div class='add'>+	SYS(fail, "ip -n %s route add unreachable %s/32 %s", ns2, IP4_ADDR_GRE, vrf);</div><div class='add'>+	SYS(fail, "ip -n %s -6 route add unreachable %s/128 %s", ns1, IP6_ADDR_GRE, vrf);</div><div class='add'>+	SYS(fail, "ip -n %s -6 route add unreachable %s/128 %s", ns2, IP6_ADDR_GRE, vrf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define GSO_SIZE 5000</div><div class='add'>+#define GSO_TCP_PORT 9000</div><div class='add'>+/* This tests the fix from commit ea0371f78799 ("net: fix GSO in bpf_lwt_push_ip_encap") */</div><div class='add'>+static int test_gso_fix(const char *ns1, const char *ns3, int family)</div><div class='add'>+{</div><div class='add'>+	const char *ip_addr = family == AF_INET ? IP4_ADDR_DST : IP6_ADDR_DST;</div><div class='add'>+	char gso_packet[GSO_SIZE] = {};</div><div class='add'>+	struct nstoken *nstoken = NULL;</div><div class='add'>+	int sfd, cfd, afd;</div><div class='add'>+	ssize_t bytes;</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	if (!ns1 || !ns3)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(ns3);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open ns3"))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	sfd = start_server_str(family, SOCK_STREAM, ip_addr, GSO_TCP_PORT, NULL);</div><div class='add'>+	if (!ASSERT_OK_FD(sfd, "start server"))</div><div class='add'>+		goto close_netns;</div><div class='add'>+</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(ns1);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open ns1"))</div><div class='add'>+		goto close_server;</div><div class='add'>+</div><div class='add'>+	cfd = connect_to_addr_str(family, SOCK_STREAM, ip_addr, GSO_TCP_PORT, NULL);</div><div class='add'>+	if (!ASSERT_OK_FD(cfd, "connect to server"))</div><div class='add'>+		goto close_server;</div><div class='add'>+</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	nstoken = NULL;</div><div class='add'>+</div><div class='add'>+	afd = accept(sfd, NULL, NULL);</div><div class='add'>+	if (!ASSERT_OK_FD(afd, "accept"))</div><div class='add'>+		goto close_client;</div><div class='add'>+</div><div class='add'>+	/* Send a packet larger than MTU */</div><div class='add'>+	bytes = send(cfd, gso_packet, GSO_SIZE, 0);</div><div class='add'>+	if (!ASSERT_EQ(bytes, GSO_SIZE, "send packet"))</div><div class='add'>+		goto close_accept;</div><div class='add'>+</div><div class='add'>+	/* Verify we received all expected bytes */</div><div class='add'>+	bytes = read(afd, gso_packet, GSO_SIZE);</div><div class='add'>+	if (!ASSERT_EQ(bytes, GSO_SIZE, "receive packet"))</div><div class='add'>+		goto close_accept;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+close_accept:</div><div class='add'>+	close(afd);</div><div class='add'>+close_client:</div><div class='add'>+	close(cfd);</div><div class='add'>+close_server:</div><div class='add'>+	close(sfd);</div><div class='add'>+close_netns:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_ping_ok(const char *ns1)</div><div class='add'>+{</div><div class='add'>+	SYS(fail, "ip netns exec %s ping -c 1 -W1 -I veth1 %s &gt; /dev/null", ns1, IP4_ADDR_DST);</div><div class='add'>+	SYS(fail, "ip netns exec %s ping6 -c 1 -W1 -I veth1 %s &gt; /dev/null", ns1, IP6_ADDR_DST);</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_ping_fails(const char *ns1)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = SYS_NOFAIL("ip netns exec %s ping -c 1 -W1 -I veth1 %s", ns1, IP4_ADDR_DST);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	ret = SYS_NOFAIL("ip netns exec %s ping6 -c 1 -W1 -I veth1 %s", ns1, IP6_ADDR_DST);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define EGRESS true</div><div class='add'>+#define INGRESS false</div><div class='add'>+#define IPV4_ENCAP true</div><div class='add'>+#define IPV6_ENCAP false</div><div class='add'>+static void lwt_ip_encap(bool ipv4_encap, bool egress, const char *vrf)</div><div class='add'>+{</div><div class='add'>+	char ns1[NETNS_NAME_SIZE] = NETNS_BASE "-1-";</div><div class='add'>+	char ns2[NETNS_NAME_SIZE] = NETNS_BASE "-2-";</div><div class='add'>+	char ns3[NETNS_NAME_SIZE] = NETNS_BASE "-3-";</div><div class='add'>+	char *sec = ipv4_encap ?  "encap_gre" : "encap_gre6";</div><div class='add'>+</div><div class='add'>+	if (!vrf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(create_ns(ns1, NETNS_NAME_SIZE), "create ns1"))</div><div class='add'>+		goto out;</div><div class='add'>+	if (!ASSERT_OK(create_ns(ns2, NETNS_NAME_SIZE), "create ns2"))</div><div class='add'>+		goto out;</div><div class='add'>+	if (!ASSERT_OK(create_ns(ns3, NETNS_NAME_SIZE), "create ns3"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(setup_network(ns1, ns2, ns3, vrf), "setup network"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* By default, pings work */</div><div class='add'>+	if (!ASSERT_OK(check_ping_ok(ns1), "ping OK"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Remove NS2-&gt;DST routes, ping fails */</div><div class='add'>+	SYS(out, "ip -n %s    route del %s/32  dev veth3 %s", ns2, IP4_ADDR_DST, vrf);</div><div class='add'>+	SYS(out, "ip -n %s -6 route del %s/128 dev veth3 %s", ns2, IP6_ADDR_DST, vrf);</div><div class='add'>+	if (!ASSERT_OK(check_ping_fails(ns1), "ping expected fail"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Install replacement routes (LWT/eBPF), pings succeed */</div><div class='add'>+	if (egress) {</div><div class='add'>+		SYS(out, "ip -n %s route add %s encap bpf xmit obj %s sec %s dev veth1 %s",</div><div class='add'>+		    ns1, IP4_ADDR_DST, BPF_FILE, sec, vrf);</div><div class='add'>+		SYS(out, "ip -n %s -6 route add %s encap bpf xmit obj %s sec %s dev veth1 %s",</div><div class='add'>+		    ns1, IP6_ADDR_DST, BPF_FILE, sec, vrf);</div><div class='add'>+	} else {</div><div class='add'>+		SYS(out, "ip -n %s route add %s encap bpf in obj %s sec %s dev veth2 %s",</div><div class='add'>+		    ns2, IP4_ADDR_DST, BPF_FILE, sec, vrf);</div><div class='add'>+		SYS(out, "ip -n %s -6 route add %s encap bpf in obj %s sec %s dev veth2 %s",</div><div class='add'>+		    ns2, IP6_ADDR_DST, BPF_FILE, sec, vrf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(check_ping_ok(ns1), "ping OK"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Skip GSO tests with VRF: VRF routing needs properly assigned</div><div class='add'>+	 * source IP/device, which is easy to do with ping but hard with TCP.</div><div class='add'>+	 */</div><div class='add'>+	if (egress &amp;&amp; !vrf[0]) {</div><div class='add'>+		if (!ASSERT_OK(test_gso_fix(ns1, ns3, AF_INET), "test GSO"))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Negative test: remove routes to GRE devices: ping fails */</div><div class='add'>+	if (!ASSERT_OK(remove_routes_to_gredev(ns1, ns2, vrf), "remove routes to gredev"))</div><div class='add'>+		goto out;</div><div class='add'>+	if (!ASSERT_OK(check_ping_fails(ns1), "ping expected fail"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Another negative test */</div><div class='add'>+	if (!ASSERT_OK(add_unreachable_routes_to_gredev(ns1, ns2, vrf),</div><div class='add'>+		       "add unreachable routes"))</div><div class='add'>+		goto out;</div><div class='add'>+	ASSERT_OK(check_ping_fails(ns1), "ping expected fail");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	SYS_NOFAIL("ip netns del %s", ns1);</div><div class='add'>+	SYS_NOFAIL("ip netns del %s", ns2);</div><div class='add'>+	SYS_NOFAIL("ip netns del %s", ns3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_lwt_ip_encap_vrf_ipv6(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("egress"))</div><div class='add'>+		lwt_ip_encap(IPV6_ENCAP, EGRESS, "vrf red");</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("ingress"))</div><div class='add'>+		lwt_ip_encap(IPV6_ENCAP, INGRESS, "vrf red");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_lwt_ip_encap_vrf_ipv4(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("egress"))</div><div class='add'>+		lwt_ip_encap(IPV4_ENCAP, EGRESS, "vrf red");</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("ingress"))</div><div class='add'>+		lwt_ip_encap(IPV4_ENCAP, INGRESS, "vrf red");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_lwt_ip_encap_ipv6(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("egress"))</div><div class='add'>+		lwt_ip_encap(IPV6_ENCAP, EGRESS, "");</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("ingress"))</div><div class='add'>+		lwt_ip_encap(IPV6_ENCAP, INGRESS, "");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_lwt_ip_encap_ipv4(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("egress"))</div><div class='add'>+		lwt_ip_encap(IPV4_ENCAP, EGRESS, "");</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("ingress"))</div><div class='add'>+		lwt_ip_encap(IPV4_ENCAP, INGRESS, "");</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/lwt_seg6local.c b/tools/testing/selftests/bpf/prog_tests/lwt_seg6local.c<br/>new file mode 100644<br/>index 000000000000..3bc730b7c7fa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/lwt_seg6local.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/lwt_seg6local.c</a></div><div class='hunk'>@@ -0,0 +1,176 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+/* Connects 6 network namespaces through veths.</div><div class='add'>+ * Each NS may have different IPv6 global scope addresses :</div><div class='add'>+ *</div><div class='add'>+ *          NS1            NS2             NS3              NS4               NS5             NS6</div><div class='add'>+ *      lo  veth1 &lt;-&gt; veth2 veth3 &lt;-&gt; veth4 veth5 &lt;-&gt; veth6 lo veth7 &lt;-&gt; veth8 veth9 &lt;-&gt; veth10 lo</div><div class='add'>+ * fb00 ::1  ::12      ::21  ::34      ::43  ::56      ::65     ::78      ::87  ::910     ::109  ::6</div><div class='add'>+ * fd00                                                                                          ::4</div><div class='add'>+ * fc42                                                     ::1</div><div class='add'>+ *</div><div class='add'>+ * All IPv6 packets going to fb00::/16 through NS2 will be encapsulated in a</div><div class='add'>+ * IPv6 header with a Segment Routing Header, with segments :</div><div class='add'>+ *	fd00::1 -&gt; fd00::2 -&gt; fd00::3 -&gt; fd00::4</div><div class='add'>+ *</div><div class='add'>+ * 3 fd00::/16 IPv6 addresses are binded to seg6local End.BPF actions :</div><div class='add'>+ * - fd00::1 : add a TLV, change the flags and apply a End.X action to fc42::1</div><div class='add'>+ * - fd00::2 : remove the TLV, change the flags, add a tag</div><div class='add'>+ * - fd00::3 : apply an End.T action to fd00::4, through routing table 117</div><div class='add'>+ *</div><div class='add'>+ * fd00::4 is a simple Segment Routing node decapsulating the inner IPv6 packet.</div><div class='add'>+ * Each End.BPF action will validate the operations applied on the SRH by the</div><div class='add'>+ * previous BPF program in the chain, otherwise the packet is dropped.</div><div class='add'>+ *</div><div class='add'>+ * An UDP datagram is sent from fb00::1 to fb00::6. The test succeeds if this</div><div class='add'>+ * datagram can be read on NS6 when binding to fb00::6.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "network_helpers.h"</div><div class='add'>+#include "test_progs.h"</div><div class='add'>+</div><div class='add'>+#define NETNS_BASE "lwt-seg6local-"</div><div class='add'>+#define BPF_FILE "test_lwt_seg6local.bpf.o"</div><div class='add'>+</div><div class='add'>+static void cleanup(void)</div><div class='add'>+{</div><div class='add'>+	int ns;</div><div class='add'>+</div><div class='add'>+	for (ns = 1; ns &lt; 7; ns++)</div><div class='add'>+		SYS_NOFAIL("ip netns del %s%d", NETNS_BASE, ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup(void)</div><div class='add'>+{</div><div class='add'>+	int ns;</div><div class='add'>+</div><div class='add'>+	for (ns = 1; ns &lt; 7; ns++)</div><div class='add'>+		SYS(fail, "ip netns add %s%d", NETNS_BASE, ns);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s6 link set dev lo up", NETNS_BASE);</div><div class='add'>+</div><div class='add'>+	for (ns = 1; ns &lt; 6; ns++) {</div><div class='add'>+		int local_id = ns * 2 - 1;</div><div class='add'>+		int peer_id = ns * 2;</div><div class='add'>+		int next_ns = ns + 1;</div><div class='add'>+</div><div class='add'>+		SYS(fail, "ip -n %s%d link add veth%d type veth peer name veth%d netns %s%d",</div><div class='add'>+		    NETNS_BASE, ns, local_id, peer_id, NETNS_BASE, next_ns);</div><div class='add'>+</div><div class='add'>+		SYS(fail, "ip -n %s%d link set dev veth%d up", NETNS_BASE, ns, local_id);</div><div class='add'>+		SYS(fail, "ip -n %s%d link set dev veth%d up", NETNS_BASE, next_ns, peer_id);</div><div class='add'>+</div><div class='add'>+		/* All link scope addresses to veths */</div><div class='add'>+		SYS(fail, "ip -n %s%d -6 addr add fb00::%d%d/16 dev veth%d scope link",</div><div class='add'>+		    NETNS_BASE, ns, local_id, peer_id, local_id);</div><div class='add'>+		SYS(fail, "ip -n %s%d -6 addr add fb00::%d%d/16 dev veth%d scope link",</div><div class='add'>+		    NETNS_BASE, next_ns, peer_id, local_id, peer_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s5 -6 route add fb00::109 table 117 dev veth9 scope link", NETNS_BASE);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s1 -6 addr add fb00::1/16 dev lo", NETNS_BASE);</div><div class='add'>+	SYS(fail, "ip -n %s1 -6 route add fb00::6 dev veth1 via fb00::21", NETNS_BASE);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s2 -6 route add fb00::6 encap bpf in obj %s sec encap_srh dev veth2",</div><div class='add'>+	    NETNS_BASE, BPF_FILE);</div><div class='add'>+	SYS(fail, "ip -n %s2 -6 route add fd00::1 dev veth3 via fb00::43 scope link", NETNS_BASE);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s3 -6 route add fc42::1 dev veth5 via fb00::65", NETNS_BASE);</div><div class='add'>+	SYS(fail,</div><div class='add'>+	    "ip -n %s3 -6 route add fd00::1 encap seg6local action End.BPF endpoint obj %s sec add_egr_x dev veth4",</div><div class='add'>+	    NETNS_BASE, BPF_FILE);</div><div class='add'>+</div><div class='add'>+	SYS(fail,</div><div class='add'>+	    "ip -n %s4 -6 route add fd00::2 encap seg6local action End.BPF endpoint obj %s sec pop_egr dev veth6",</div><div class='add'>+	    NETNS_BASE, BPF_FILE);</div><div class='add'>+	SYS(fail, "ip -n %s4 -6 addr add fc42::1 dev lo", NETNS_BASE);</div><div class='add'>+	SYS(fail, "ip -n %s4 -6 route add fd00::3 dev veth7 via fb00::87", NETNS_BASE);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s5 -6 route add fd00::4 table 117 dev veth9 via fb00::109", NETNS_BASE);</div><div class='add'>+	SYS(fail,</div><div class='add'>+	    "ip -n %s5 -6 route add fd00::3 encap seg6local action End.BPF endpoint obj %s sec inspect_t dev veth8",</div><div class='add'>+	    NETNS_BASE, BPF_FILE);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n %s6 -6 addr add fb00::6/16 dev lo", NETNS_BASE);</div><div class='add'>+	SYS(fail, "ip -n %s6 -6 addr add fd00::4/16 dev lo", NETNS_BASE);</div><div class='add'>+</div><div class='add'>+	for (ns = 1; ns &lt; 6; ns++)</div><div class='add'>+		SYS(fail, "ip netns exec %s%d sysctl -wq net.ipv6.conf.all.forwarding=1",</div><div class='add'>+		    NETNS_BASE, ns);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip netns exec %s6 sysctl -wq net.ipv6.conf.all.seg6_enabled=1", NETNS_BASE);</div><div class='add'>+	SYS(fail, "ip netns exec %s6 sysctl -wq net.ipv6.conf.lo.seg6_enabled=1", NETNS_BASE);</div><div class='add'>+	SYS(fail, "ip netns exec %s6 sysctl -wq net.ipv6.conf.veth10.seg6_enabled=1", NETNS_BASE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SERVER_PORT 7330</div><div class='add'>+#define CLIENT_PORT 2121</div><div class='add'>+void test_lwt_seg6local(void)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_in6 server_addr = {};</div><div class='add'>+	const char *ns1 = NETNS_BASE "1";</div><div class='add'>+	const char *ns6 = NETNS_BASE "6";</div><div class='add'>+	struct nstoken *nstoken = NULL;</div><div class='add'>+	const char *foobar = "foobar";</div><div class='add'>+	ssize_t bytes;</div><div class='add'>+	int sfd, cfd;</div><div class='add'>+	char buf[7];</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(setup(), "setup"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(ns6);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open ns6"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sfd = start_server_str(AF_INET6, SOCK_DGRAM, "fb00::6", SERVER_PORT, NULL);</div><div class='add'>+	if (!ASSERT_OK_FD(sfd, "start server"))</div><div class='add'>+		goto close_netns;</div><div class='add'>+</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(ns1);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open ns1"))</div><div class='add'>+		goto close_server;</div><div class='add'>+</div><div class='add'>+	cfd = start_server_str(AF_INET6, SOCK_DGRAM, "fb00::1", CLIENT_PORT, NULL);</div><div class='add'>+	if (!ASSERT_OK_FD(cfd, "start client"))</div><div class='add'>+		goto close_server;</div><div class='add'>+</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	nstoken = NULL;</div><div class='add'>+</div><div class='add'>+	/* Send a packet larger than MTU */</div><div class='add'>+	server_addr.sin6_family = AF_INET6;</div><div class='add'>+	server_addr.sin6_port = htons(SERVER_PORT);</div><div class='add'>+	if (!ASSERT_EQ(inet_pton(AF_INET6, "fb00::6", &amp;server_addr.sin6_addr), 1,</div><div class='add'>+		       "build target addr"))</div><div class='add'>+		goto close_client;</div><div class='add'>+</div><div class='add'>+	bytes = sendto(cfd, foobar, sizeof(foobar), 0,</div><div class='add'>+		       (struct sockaddr *)&amp;server_addr, sizeof(server_addr));</div><div class='add'>+	if (!ASSERT_EQ(bytes, sizeof(foobar), "send packet"))</div><div class='add'>+		goto close_client;</div><div class='add'>+</div><div class='add'>+	/* Verify we received all expected bytes */</div><div class='add'>+	bytes = read(sfd, buf, sizeof(buf));</div><div class='add'>+	if (!ASSERT_EQ(bytes, sizeof(buf), "receive packet"))</div><div class='add'>+		goto close_client;</div><div class='add'>+	ASSERT_STREQ(buf, foobar, "check udp packet");</div><div class='add'>+</div><div class='add'>+close_client:</div><div class='add'>+	close(cfd);</div><div class='add'>+close_server:</div><div class='add'>+	close(sfd);</div><div class='add'>+close_netns:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	cleanup();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/map_excl.c b/tools/testing/selftests/bpf/prog_tests/map_excl.c<br/>new file mode 100644<br/>index 000000000000..6bdc6d6de0da<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/map_excl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/map_excl.c</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2025 Google LLC. */</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;bpf/btf.h&gt;</div><div class='add'>+</div><div class='add'>+#include "map_excl.skel.h"</div><div class='add'>+</div><div class='add'>+static void test_map_excl_allowed(void)</div><div class='add'>+{</div><div class='add'>+	struct map_excl *skel = map_excl__open();</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bpf_map__set_exclusive_program(skel-&gt;maps.excl_map, skel-&gt;progs.should_have_access);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map__set_exclusive_program"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bpf_program__set_autoload(skel-&gt;progs.should_have_access, true);</div><div class='add'>+	bpf_program__set_autoload(skel-&gt;progs.should_not_have_access, false);</div><div class='add'>+</div><div class='add'>+	err = map_excl__load(skel);</div><div class='add'>+	ASSERT_OK(err, "map_excl__load");</div><div class='add'>+out:</div><div class='add'>+	map_excl__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_map_excl_denied(void)</div><div class='add'>+{</div><div class='add'>+	struct map_excl *skel = map_excl__open();</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bpf_map__set_exclusive_program(skel-&gt;maps.excl_map, skel-&gt;progs.should_have_access);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map__make_exclusive"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bpf_program__set_autoload(skel-&gt;progs.should_have_access, false);</div><div class='add'>+	bpf_program__set_autoload(skel-&gt;progs.should_not_have_access, true);</div><div class='add'>+</div><div class='add'>+	err = map_excl__load(skel);</div><div class='add'>+	ASSERT_EQ(err, -EACCES, "exclusive map access not denied\n");</div><div class='add'>+out:</div><div class='add'>+	map_excl__destroy(skel);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_map_excl(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("map_excl_allowed"))</div><div class='add'>+		test_map_excl_allowed();</div><div class='add'>+	if (test__start_subtest("map_excl_denied"))</div><div class='add'>+		test_map_excl_denied();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/mem_rdonly_untrusted.c b/tools/testing/selftests/bpf/prog_tests/mem_rdonly_untrusted.c<br/>new file mode 100644<br/>index 000000000000..40d4f687bd9c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/mem_rdonly_untrusted.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/mem_rdonly_untrusted.c</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "mem_rdonly_untrusted.skel.h"</div><div class='add'>+</div><div class='add'>+void test_mem_rdonly_untrusted(void)</div><div class='add'>+{</div><div class='add'>+	RUN_TESTS(mem_rdonly_untrusted);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/module_attach.c b/tools/testing/selftests/bpf/prog_tests/module_attach.c<br/>index 6d391d95f96e..70fa7ae93173 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/module_attach.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/module_attach.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/module_attach.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/module_attach.c</a></div><div class='hunk'>@@ -90,7 +90,7 @@ void test_module_attach(void)</div><div class='ctx'> </div><div class='ctx'> 	test_module_attach__detach(skel);</div><div class='ctx'> </div><div class='del'>-	/* attach fentry/fexit and make sure it get's module reference */</div><div class='add'>+	/* attach fentry/fexit and make sure it gets module reference */</div><div class='ctx'> 	link = bpf_program__attach(skel-&gt;progs.handle_fentry);</div><div class='ctx'> 	if (!ASSERT_OK_PTR(link, "attach_fentry"))</div><div class='ctx'> 		goto cleanup;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c<br/>index f8eb7f9d4fd2..8fade8bdc451 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/mptcp.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/mptcp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/mptcp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/mptcp.c</a></div><div class='hunk'>@@ -6,11 +6,13 @@</div><div class='ctx'> #include &lt;netinet/in.h&gt;</div><div class='ctx'> #include &lt;test_progs.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='ctx'> #include "cgroup_helpers.h"</div><div class='ctx'> #include "network_helpers.h"</div><div class='ctx'> #include "mptcp_sock.skel.h"</div><div class='ctx'> #include "mptcpify.skel.h"</div><div class='ctx'> #include "mptcp_subflow.skel.h"</div><div class='add'>+#include "mptcp_sockmap.skel.h"</div><div class='ctx'> </div><div class='ctx'> #define NS_TEST "mptcp_ns"</div><div class='ctx'> #define ADDR_1	"10.0.1.1"</div><div class='hunk'>@@ -436,6 +438,142 @@ close_cgroup:</div><div class='ctx'> 	close(cgroup_fd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Test sockmap on MPTCP server handling non-mp-capable clients. */</div><div class='add'>+static void test_sockmap_with_mptcp_fallback(struct mptcp_sockmap *skel)</div><div class='add'>+{</div><div class='add'>+	int listen_fd = -1, client_fd1 = -1, client_fd2 = -1;</div><div class='add'>+	int server_fd1 = -1, server_fd2 = -1, sent, recvd;</div><div class='add'>+	char snd[9] = "123456789";</div><div class='add'>+	char rcv[10];</div><div class='add'>+</div><div class='add'>+	/* start server with MPTCP enabled */</div><div class='add'>+	listen_fd = start_mptcp_server(AF_INET, NULL, 0, 0);</div><div class='add'>+	if (!ASSERT_OK_FD(listen_fd, "sockmap-fb:start_mptcp_server"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;trace_port = ntohs(get_socket_local_port(listen_fd));</div><div class='add'>+	skel-&gt;bss-&gt;sk_index = 0;</div><div class='add'>+	/* create client without MPTCP enabled */</div><div class='add'>+	client_fd1 = connect_to_fd_opts(listen_fd, NULL);</div><div class='add'>+	if (!ASSERT_OK_FD(client_fd1, "sockmap-fb:connect_to_fd"))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	server_fd1 = accept(listen_fd, NULL, 0);</div><div class='add'>+	skel-&gt;bss-&gt;sk_index = 1;</div><div class='add'>+	client_fd2 = connect_to_fd_opts(listen_fd, NULL);</div><div class='add'>+	if (!ASSERT_OK_FD(client_fd2, "sockmap-fb:connect_to_fd"))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	server_fd2 = accept(listen_fd, NULL, 0);</div><div class='add'>+	/* test normal redirect behavior: data sent by client_fd1 can be</div><div class='add'>+	 * received by client_fd2</div><div class='add'>+	 */</div><div class='add'>+	skel-&gt;bss-&gt;redirect_idx = 1;</div><div class='add'>+	sent = send(client_fd1, snd, sizeof(snd), 0);</div><div class='add'>+	if (!ASSERT_EQ(sent, sizeof(snd), "sockmap-fb:send(client_fd1)"))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* try to recv more bytes to avoid truncation check */</div><div class='add'>+	recvd = recv(client_fd2, rcv, sizeof(rcv), 0);</div><div class='add'>+	if (!ASSERT_EQ(recvd, sizeof(snd), "sockmap-fb:recv(client_fd2)"))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	if (client_fd1 &gt;= 0)</div><div class='add'>+		close(client_fd1);</div><div class='add'>+	if (client_fd2 &gt;= 0)</div><div class='add'>+		close(client_fd2);</div><div class='add'>+	if (server_fd1 &gt;= 0)</div><div class='add'>+		close(server_fd1);</div><div class='add'>+	if (server_fd2 &gt;= 0)</div><div class='add'>+		close(server_fd2);</div><div class='add'>+	close(listen_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test sockmap rejection of MPTCP sockets - both server and client sides. */</div><div class='add'>+static void test_sockmap_reject_mptcp(struct mptcp_sockmap *skel)</div><div class='add'>+{</div><div class='add'>+	int listen_fd = -1, server_fd = -1, client_fd1 = -1;</div><div class='add'>+	int err, zero = 0;</div><div class='add'>+</div><div class='add'>+	/* start server with MPTCP enabled */</div><div class='add'>+	listen_fd = start_mptcp_server(AF_INET, NULL, 0, 0);</div><div class='add'>+	if (!ASSERT_OK_FD(listen_fd, "start_mptcp_server"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;trace_port = ntohs(get_socket_local_port(listen_fd));</div><div class='add'>+	skel-&gt;bss-&gt;sk_index = 0;</div><div class='add'>+	/* create client with MPTCP enabled */</div><div class='add'>+	client_fd1 = connect_to_fd(listen_fd, 0);</div><div class='add'>+	if (!ASSERT_OK_FD(client_fd1, "connect_to_fd client_fd1"))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* bpf_sock_map_update() called from sockops should reject MPTCP sk */</div><div class='add'>+	if (!ASSERT_EQ(skel-&gt;bss-&gt;helper_ret, -EOPNOTSUPP, "should reject"))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	server_fd = accept(listen_fd, NULL, 0);</div><div class='add'>+	err = bpf_map_update_elem(bpf_map__fd(skel-&gt;maps.sock_map),</div><div class='add'>+				  &amp;zero, &amp;server_fd, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_EQ(err, -EOPNOTSUPP, "server should be disallowed"))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* MPTCP client should also be disallowed */</div><div class='add'>+	err = bpf_map_update_elem(bpf_map__fd(skel-&gt;maps.sock_map),</div><div class='add'>+				  &amp;zero, &amp;client_fd1, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_EQ(err, -EOPNOTSUPP, "client should be disallowed"))</div><div class='add'>+		goto end;</div><div class='add'>+end:</div><div class='add'>+	if (client_fd1 &gt;= 0)</div><div class='add'>+		close(client_fd1);</div><div class='add'>+	if (server_fd &gt;= 0)</div><div class='add'>+		close(server_fd);</div><div class='add'>+	close(listen_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_mptcp_sockmap(void)</div><div class='add'>+{</div><div class='add'>+	struct mptcp_sockmap *skel;</div><div class='add'>+	struct netns_obj *netns;</div><div class='add'>+	int cgroup_fd, err;</div><div class='add'>+</div><div class='add'>+	cgroup_fd = test__join_cgroup("/mptcp_sockmap");</div><div class='add'>+	if (!ASSERT_OK_FD(cgroup_fd, "join_cgroup: mptcp_sockmap"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel = mptcp_sockmap__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_open_load: mptcp_sockmap"))</div><div class='add'>+		goto close_cgroup;</div><div class='add'>+</div><div class='add'>+	skel-&gt;links.mptcp_sockmap_inject =</div><div class='add'>+		bpf_program__attach_cgroup(skel-&gt;progs.mptcp_sockmap_inject, cgroup_fd);</div><div class='add'>+	if (!ASSERT_OK_PTR(skel-&gt;links.mptcp_sockmap_inject, "attach sockmap"))</div><div class='add'>+		goto skel_destroy;</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach(bpf_program__fd(skel-&gt;progs.mptcp_sockmap_redirect),</div><div class='add'>+			      bpf_map__fd(skel-&gt;maps.sock_map),</div><div class='add'>+			      BPF_SK_SKB_STREAM_VERDICT, 0);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach stream verdict"))</div><div class='add'>+		goto skel_destroy;</div><div class='add'>+</div><div class='add'>+	netns = netns_new(NS_TEST, true);</div><div class='add'>+	if (!ASSERT_OK_PTR(netns, "netns_new: mptcp_sockmap"))</div><div class='add'>+		goto skel_destroy;</div><div class='add'>+</div><div class='add'>+	if (endpoint_init("subflow") &lt; 0)</div><div class='add'>+		goto close_netns;</div><div class='add'>+</div><div class='add'>+	test_sockmap_with_mptcp_fallback(skel);</div><div class='add'>+	test_sockmap_reject_mptcp(skel);</div><div class='add'>+</div><div class='add'>+close_netns:</div><div class='add'>+	netns_free(netns);</div><div class='add'>+skel_destroy:</div><div class='add'>+	mptcp_sockmap__destroy(skel);</div><div class='add'>+close_cgroup:</div><div class='add'>+	close(cgroup_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_mptcp(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("base"))</div><div class='hunk'>@@ -444,4 +582,6 @@ void test_mptcp(void)</div><div class='ctx'> 		test_mptcpify();</div><div class='ctx'> 	if (test__start_subtest("subflow"))</div><div class='ctx'> 		test_subflow();</div><div class='add'>+	if (test__start_subtest("sockmap"))</div><div class='add'>+		test_mptcp_sockmap();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/net_timestamping.c b/tools/testing/selftests/bpf/prog_tests/net_timestamping.c<br/>new file mode 100644<br/>index 000000000000..dbfd87499b6b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/net_timestamping.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/net_timestamping.c</a></div><div class='hunk'>@@ -0,0 +1,239 @@</div><div class='add'>+#include &lt;linux/net_tstamp.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;linux/errqueue.h&gt;</div><div class='add'>+#include "test_progs.h"</div><div class='add'>+#include "network_helpers.h"</div><div class='add'>+#include "net_timestamping.skel.h"</div><div class='add'>+</div><div class='add'>+#define CG_NAME "/net-timestamping-test"</div><div class='add'>+#define NSEC_PER_SEC    1000000000LL</div><div class='add'>+</div><div class='add'>+static const char addr4_str[] = "127.0.0.1";</div><div class='add'>+static const char addr6_str[] = "::1";</div><div class='add'>+static struct net_timestamping *skel;</div><div class='add'>+static const int cfg_payload_len = 30;</div><div class='add'>+static struct timespec usr_ts;</div><div class='add'>+static u64 delay_tolerance_nsec = 10000000000; /* 10 seconds */</div><div class='add'>+int SK_TS_SCHED;</div><div class='add'>+int SK_TS_TXSW;</div><div class='add'>+int SK_TS_ACK;</div><div class='add'>+</div><div class='add'>+static int64_t timespec_to_ns64(struct timespec *ts)</div><div class='add'>+{</div><div class='add'>+	return ts-&gt;tv_sec * NSEC_PER_SEC + ts-&gt;tv_nsec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void validate_key(int tskey, int tstype)</div><div class='add'>+{</div><div class='add'>+	static int expected_tskey = -1;</div><div class='add'>+</div><div class='add'>+	if (tstype == SCM_TSTAMP_SCHED)</div><div class='add'>+		expected_tskey = cfg_payload_len - 1;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(expected_tskey, tskey, "tskey mismatch");</div><div class='add'>+</div><div class='add'>+	expected_tskey = tskey;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void validate_timestamp(struct timespec *cur, struct timespec *prev)</div><div class='add'>+{</div><div class='add'>+	int64_t cur_ns, prev_ns;</div><div class='add'>+</div><div class='add'>+	cur_ns = timespec_to_ns64(cur);</div><div class='add'>+	prev_ns = timespec_to_ns64(prev);</div><div class='add'>+</div><div class='add'>+	ASSERT_LT(cur_ns - prev_ns, delay_tolerance_nsec, "latency");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_socket_timestamp(struct scm_timestamping *tss, int tstype,</div><div class='add'>+				  int tskey)</div><div class='add'>+{</div><div class='add'>+	static struct timespec prev_ts;</div><div class='add'>+</div><div class='add'>+	validate_key(tskey, tstype);</div><div class='add'>+</div><div class='add'>+	switch (tstype) {</div><div class='add'>+	case SCM_TSTAMP_SCHED:</div><div class='add'>+		validate_timestamp(&amp;tss-&gt;ts[0], &amp;usr_ts);</div><div class='add'>+		SK_TS_SCHED += 1;</div><div class='add'>+		break;</div><div class='add'>+	case SCM_TSTAMP_SND:</div><div class='add'>+		validate_timestamp(&amp;tss-&gt;ts[0], &amp;prev_ts);</div><div class='add'>+		SK_TS_TXSW += 1;</div><div class='add'>+		break;</div><div class='add'>+	case SCM_TSTAMP_ACK:</div><div class='add'>+		validate_timestamp(&amp;tss-&gt;ts[0], &amp;prev_ts);</div><div class='add'>+		SK_TS_ACK += 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prev_ts = tss-&gt;ts[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_recv_errmsg_cmsg(struct msghdr *msg)</div><div class='add'>+{</div><div class='add'>+	struct sock_extended_err *serr = NULL;</div><div class='add'>+	struct scm_timestamping *tss = NULL;</div><div class='add'>+	struct cmsghdr *cm;</div><div class='add'>+</div><div class='add'>+	for (cm = CMSG_FIRSTHDR(msg);</div><div class='add'>+	     cm &amp;&amp; cm-&gt;cmsg_len;</div><div class='add'>+	     cm = CMSG_NXTHDR(msg, cm)) {</div><div class='add'>+		if (cm-&gt;cmsg_level == SOL_SOCKET &amp;&amp;</div><div class='add'>+		    cm-&gt;cmsg_type == SCM_TIMESTAMPING) {</div><div class='add'>+			tss = (void *)CMSG_DATA(cm);</div><div class='add'>+		} else if ((cm-&gt;cmsg_level == SOL_IP &amp;&amp;</div><div class='add'>+			    cm-&gt;cmsg_type == IP_RECVERR) ||</div><div class='add'>+			   (cm-&gt;cmsg_level == SOL_IPV6 &amp;&amp;</div><div class='add'>+			    cm-&gt;cmsg_type == IPV6_RECVERR) ||</div><div class='add'>+			   (cm-&gt;cmsg_level == SOL_PACKET &amp;&amp;</div><div class='add'>+			    cm-&gt;cmsg_type == PACKET_TX_TIMESTAMP)) {</div><div class='add'>+			serr = (void *)CMSG_DATA(cm);</div><div class='add'>+			ASSERT_EQ(serr-&gt;ee_origin, SO_EE_ORIGIN_TIMESTAMPING,</div><div class='add'>+				  "cmsg type");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (serr &amp;&amp; tss)</div><div class='add'>+			test_socket_timestamp(tss, serr-&gt;ee_info,</div><div class='add'>+					      serr-&gt;ee_data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool socket_recv_errmsg(int fd)</div><div class='add'>+{</div><div class='add'>+	static char ctrl[1024 /* overprovision*/];</div><div class='add'>+	char data[cfg_payload_len];</div><div class='add'>+	static struct msghdr msg;</div><div class='add'>+	struct iovec entry;</div><div class='add'>+	int n = 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	memset(&amp;entry, 0, sizeof(entry));</div><div class='add'>+	memset(ctrl, 0, sizeof(ctrl));</div><div class='add'>+</div><div class='add'>+	entry.iov_base = data;</div><div class='add'>+	entry.iov_len = cfg_payload_len;</div><div class='add'>+	msg.msg_iov = &amp;entry;</div><div class='add'>+	msg.msg_iovlen = 1;</div><div class='add'>+	msg.msg_name = NULL;</div><div class='add'>+	msg.msg_namelen = 0;</div><div class='add'>+	msg.msg_control = ctrl;</div><div class='add'>+	msg.msg_controllen = sizeof(ctrl);</div><div class='add'>+</div><div class='add'>+	n = recvmsg(fd, &amp;msg, MSG_ERRQUEUE);</div><div class='add'>+	if (n == -1)</div><div class='add'>+		ASSERT_EQ(errno, EAGAIN, "recvmsg MSG_ERRQUEUE");</div><div class='add'>+</div><div class='add'>+	if (n &gt;= 0)</div><div class='add'>+		test_recv_errmsg_cmsg(&amp;msg);</div><div class='add'>+</div><div class='add'>+	return n == -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_socket_timestamping(int fd)</div><div class='add'>+{</div><div class='add'>+	while (!socket_recv_errmsg(fd));</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(SK_TS_SCHED, 1, "SCM_TSTAMP_SCHED");</div><div class='add'>+	ASSERT_EQ(SK_TS_TXSW, 1, "SCM_TSTAMP_SND");</div><div class='add'>+	ASSERT_EQ(SK_TS_ACK, 1, "SCM_TSTAMP_ACK");</div><div class='add'>+</div><div class='add'>+	SK_TS_SCHED = 0;</div><div class='add'>+	SK_TS_TXSW = 0;</div><div class='add'>+	SK_TS_ACK = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_tcp(int family, bool enable_socket_timestamping)</div><div class='add'>+{</div><div class='add'>+	struct net_timestamping__bss *bss;</div><div class='add'>+	char buf[cfg_payload_len];</div><div class='add'>+	int sfd = -1, cfd = -1;</div><div class='add'>+	unsigned int sock_opt;</div><div class='add'>+	struct netns_obj *ns;</div><div class='add'>+	int cg_fd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cg_fd = test__join_cgroup(CG_NAME);</div><div class='add'>+	if (!ASSERT_OK_FD(cg_fd, "join cgroup"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ns = netns_new("net_timestamping_ns", true);</div><div class='add'>+	if (!ASSERT_OK_PTR(ns, "create ns"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skel = net_timestamping__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "open and load skel"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(net_timestamping__attach(skel), "attach skel"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skel-&gt;links.skops_sockopt =</div><div class='add'>+		bpf_program__attach_cgroup(skel-&gt;progs.skops_sockopt, cg_fd);</div><div class='add'>+	if (!ASSERT_OK_PTR(skel-&gt;links.skops_sockopt, "attach cgroup"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bss = skel-&gt;bss;</div><div class='add'>+	memset(bss, 0, sizeof(*bss));</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;monitored_pid = getpid();</div><div class='add'>+</div><div class='add'>+	sfd = start_server(family, SOCK_STREAM,</div><div class='add'>+			   family == AF_INET6 ? addr6_str : addr4_str, 0, 0);</div><div class='add'>+	if (!ASSERT_OK_FD(sfd, "start_server"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	cfd = connect_to_fd(sfd, 0);</div><div class='add'>+	if (!ASSERT_OK_FD(cfd, "connect_to_fd_server"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (enable_socket_timestamping) {</div><div class='add'>+		sock_opt = SOF_TIMESTAMPING_SOFTWARE |</div><div class='add'>+			   SOF_TIMESTAMPING_OPT_ID |</div><div class='add'>+			   SOF_TIMESTAMPING_TX_SCHED |</div><div class='add'>+			   SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='add'>+			   SOF_TIMESTAMPING_TX_ACK;</div><div class='add'>+		ret = setsockopt(cfd, SOL_SOCKET, SO_TIMESTAMPING,</div><div class='add'>+				 (char *) &amp;sock_opt, sizeof(sock_opt));</div><div class='add'>+		if (!ASSERT_OK(ret, "setsockopt SO_TIMESTAMPING"))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		ret = clock_gettime(CLOCK_REALTIME, &amp;usr_ts);</div><div class='add'>+		if (!ASSERT_OK(ret, "get user time"))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = write(cfd, buf, sizeof(buf));</div><div class='add'>+	if (!ASSERT_EQ(ret, sizeof(buf), "send to server"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (enable_socket_timestamping)</div><div class='add'>+		test_socket_timestamping(cfd);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(bss-&gt;nr_active, 1, "nr_active");</div><div class='add'>+	ASSERT_EQ(bss-&gt;nr_snd, 2, "nr_snd");</div><div class='add'>+	ASSERT_EQ(bss-&gt;nr_sched, 1, "nr_sched");</div><div class='add'>+	ASSERT_EQ(bss-&gt;nr_txsw, 1, "nr_txsw");</div><div class='add'>+	ASSERT_EQ(bss-&gt;nr_ack, 1, "nr_ack");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (sfd &gt;= 0)</div><div class='add'>+		close(sfd);</div><div class='add'>+	if (cfd &gt;= 0)</div><div class='add'>+		close(cfd);</div><div class='add'>+	net_timestamping__destroy(skel);</div><div class='add'>+	netns_free(ns);</div><div class='add'>+	close(cg_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_net_timestamping(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("INET4: bpf timestamping"))</div><div class='add'>+		test_tcp(AF_INET, false);</div><div class='add'>+	if (test__start_subtest("INET4: bpf and socket timestamping"))</div><div class='add'>+		test_tcp(AF_INET, true);</div><div class='add'>+	if (test__start_subtest("INET6: bpf timestamping"))</div><div class='add'>+		test_tcp(AF_INET6, false);</div><div class='add'>+	if (test__start_subtest("INET6: bpf and socket timestamping"))</div><div class='add'>+		test_tcp(AF_INET6, true);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/netns_cookie.c b/tools/testing/selftests/bpf/prog_tests/netns_cookie.c<br/>index ac3c3c097c0e..e00cd34586dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/netns_cookie.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/netns_cookie.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/netns_cookie.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/netns_cookie.c</a></div><div class='hunk'>@@ -33,20 +33,25 @@ void test_netns_cookie(void)</div><div class='ctx'> </div><div class='ctx'> 	skel-&gt;links.get_netns_cookie_sockops = bpf_program__attach_cgroup(</div><div class='ctx'> 		skel-&gt;progs.get_netns_cookie_sockops, cgroup_fd);</div><div class='del'>-	if (!ASSERT_OK_PTR(skel-&gt;links.get_netns_cookie_sockops, "prog_attach"))</div><div class='add'>+	if (!ASSERT_OK_PTR(skel-&gt;links.get_netns_cookie_sockops, "prog_attach_sockops"))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	verdict = bpf_program__fd(skel-&gt;progs.get_netns_cookie_sk_msg);</div><div class='ctx'> 	map = bpf_map__fd(skel-&gt;maps.sock_map);</div><div class='ctx'> 	err = bpf_prog_attach(verdict, map, BPF_SK_MSG_VERDICT, 0);</div><div class='del'>-	if (!ASSERT_OK(err, "prog_attach"))</div><div class='add'>+	if (!ASSERT_OK(err, "prog_attach_sk_msg"))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	tc_fd = bpf_program__fd(skel-&gt;progs.get_netns_cookie_tcx);</div><div class='ctx'> 	err = bpf_prog_attach_opts(tc_fd, loopback, BPF_TCX_INGRESS, &amp;opta);</div><div class='del'>-	if (!ASSERT_OK(err, "prog_attach"))</div><div class='add'>+	if (!ASSERT_OK(err, "prog_attach_tcx"))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='add'>+	skel-&gt;links.get_netns_cookie_cgroup_skb = bpf_program__attach_cgroup(</div><div class='add'>+		skel-&gt;progs.get_netns_cookie_cgroup_skb, cgroup_fd);</div><div class='add'>+	if (!ASSERT_OK_PTR(skel-&gt;links.get_netns_cookie_cgroup_skb, "prog_attach_cgroup_skb"))</div><div class='add'>+		goto cleanup_tc;</div><div class='add'>+</div><div class='ctx'> 	server_fd = start_server(AF_INET6, SOCK_STREAM, "::1", 0, 0);</div><div class='ctx'> 	if (CHECK(server_fd &lt; 0, "start_server", "errno %d\n", errno))</div><div class='ctx'> 		goto cleanup_tc;</div><div class='hunk'>@@ -69,16 +74,18 @@ void test_netns_cookie(void)</div><div class='ctx'> 	if (!ASSERT_OK(err, "getsockopt"))</div><div class='ctx'> 		goto cleanup_tc;</div><div class='ctx'> </div><div class='del'>-	ASSERT_EQ(val, cookie_expected_value, "cookie_value");</div><div class='add'>+	ASSERT_EQ(val, cookie_expected_value, "cookie_value_sockops");</div><div class='ctx'> </div><div class='ctx'> 	err = bpf_map_lookup_elem(bpf_map__fd(skel-&gt;maps.sk_msg_netns_cookies),</div><div class='ctx'> 				  &amp;client_fd, &amp;val);</div><div class='ctx'> 	if (!ASSERT_OK(err, "map_lookup(sk_msg_netns_cookies)"))</div><div class='ctx'> 		goto cleanup_tc;</div><div class='ctx'> </div><div class='del'>-	ASSERT_EQ(val, cookie_expected_value, "cookie_value");</div><div class='del'>-	ASSERT_EQ(skel-&gt;bss-&gt;tcx_init_netns_cookie, cookie_expected_value, "cookie_value");</div><div class='del'>-	ASSERT_EQ(skel-&gt;bss-&gt;tcx_netns_cookie, cookie_expected_value, "cookie_value");</div><div class='add'>+	ASSERT_EQ(val, cookie_expected_value, "cookie_value_sk_msg");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;tcx_init_netns_cookie, cookie_expected_value, "cookie_value_init_tcx");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;tcx_netns_cookie, cookie_expected_value, "cookie_value_tcx");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;cgroup_skb_init_netns_cookie, cookie_expected_value, "cookie_value_init_cgroup_skb");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;cgroup_skb_netns_cookie, cookie_expected_value, "cookie_value_cgroup_skb");</div><div class='ctx'> </div><div class='ctx'> cleanup_tc:</div><div class='ctx'> 	err = bpf_prog_detach_opts(tc_fd, loopback, BPF_TCX_INGRESS, &amp;optd);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c<br/>index 761ce24bce38..99c953f2be21 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c</a></div><div class='hunk'>@@ -200,41 +200,28 @@ static void test_ns_current_pid_tgid_new_ns(int (*fn)(void *), void *arg)</div><div class='ctx'> 		return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_in_netns(int (*fn)(void *), void *arg)</div><div class='del'>-{</div><div class='del'>-	struct nstoken *nstoken = NULL;</div><div class='del'>-</div><div class='del'>-	SYS(cleanup, "ip netns add ns_current_pid_tgid");</div><div class='del'>-	SYS(cleanup, "ip -net ns_current_pid_tgid link set dev lo up");</div><div class='del'>-</div><div class='del'>-	nstoken = open_netns("ns_current_pid_tgid");</div><div class='del'>-	if (!ASSERT_OK_PTR(nstoken, "open_netns"))</div><div class='del'>-		goto cleanup;</div><div class='del'>-</div><div class='del'>-	test_ns_current_pid_tgid_new_ns(fn, arg);</div><div class='del'>-</div><div class='del'>-cleanup:</div><div class='del'>-	if (nstoken)</div><div class='del'>-		close_netns(nstoken);</div><div class='del'>-	SYS_NOFAIL("ip netns del ns_current_pid_tgid");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* TODO: use a different tracepoint */</div><div class='del'>-void serial_test_ns_current_pid_tgid(void)</div><div class='add'>+void serial_test_current_pid_tgid(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("root_ns_tp"))</div><div class='ctx'> 		test_current_pid_tgid_tp(NULL);</div><div class='ctx'> 	if (test__start_subtest("new_ns_tp"))</div><div class='ctx'> 		test_ns_current_pid_tgid_new_ns(test_current_pid_tgid_tp, NULL);</div><div class='del'>-	if (test__start_subtest("new_ns_cgrp")) {</div><div class='del'>-		int cgroup_fd = -1;</div><div class='del'>-</div><div class='del'>-		cgroup_fd = test__join_cgroup("/sock_addr");</div><div class='del'>-		if (ASSERT_GE(cgroup_fd, 0, "join_cgroup")) {</div><div class='del'>-			test_in_netns(test_current_pid_tgid_cgrp, &amp;cgroup_fd);</div><div class='del'>-			close(cgroup_fd);</div><div class='del'>-		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_ns_current_pid_tgid_cgrp(void)</div><div class='add'>+{</div><div class='add'>+	int cgroup_fd = test__join_cgroup("/sock_addr");</div><div class='add'>+</div><div class='add'>+	if (ASSERT_OK_FD(cgroup_fd, "join_cgroup")) {</div><div class='add'>+		test_ns_current_pid_tgid_new_ns(test_current_pid_tgid_cgrp, &amp;cgroup_fd);</div><div class='add'>+		close(cgroup_fd);</div><div class='ctx'> 	}</div><div class='del'>-	if (test__start_subtest("new_ns_sk_msg"))</div><div class='del'>-		test_in_netns(test_current_pid_tgid_sk_msg, NULL);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void test_ns_current_pid_tgid_sk_msg(void)</div><div class='add'>+{</div><div class='add'>+	test_ns_current_pid_tgid_new_ns(test_current_pid_tgid_sk_msg, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/perf_branches.c b/tools/testing/selftests/bpf/prog_tests/perf_branches.c<br/>index bc24f83339d6..0a7ef770c487 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/perf_branches.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/perf_branches.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/perf_branches.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/perf_branches.c</a></div><div class='hunk'>@@ -15,6 +15,10 @@ static void check_good_sample(struct test_perf_branches *skel)</div><div class='ctx'> 	int pbe_size = sizeof(struct perf_branch_entry);</div><div class='ctx'> 	int duration = 0;</div><div class='ctx'> </div><div class='add'>+	if (CHECK(!skel-&gt;bss-&gt;run_cnt, "invalid run_cnt",</div><div class='add'>+		  "checked sample validity before prog run"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (CHECK(!skel-&gt;bss-&gt;valid, "output not valid",</div><div class='ctx'> 		 "no valid sample from prog"))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -45,6 +49,10 @@ static void check_bad_sample(struct test_perf_branches *skel)</div><div class='ctx'> 	int written_stack = skel-&gt;bss-&gt;written_stack_out;</div><div class='ctx'> 	int duration = 0;</div><div class='ctx'> </div><div class='add'>+	if (CHECK(!skel-&gt;bss-&gt;run_cnt, "invalid run_cnt",</div><div class='add'>+		  "checked sample validity before prog run"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (CHECK(!skel-&gt;bss-&gt;valid, "output not valid",</div><div class='ctx'> 		 "no valid sample from prog"))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -83,8 +91,12 @@ static void test_perf_branches_common(int perf_fd,</div><div class='ctx'> 	err = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set), &amp;cpu_set);</div><div class='ctx'> 	if (CHECK(err, "set_affinity", "cpu #0, err %d\n", err))</div><div class='ctx'> 		goto out_destroy;</div><div class='del'>-	/* spin the loop for a while (random high number) */</div><div class='del'>-	for (i = 0; i &lt; 1000000; ++i)</div><div class='add'>+</div><div class='add'>+	/* Spin the loop for a while by using a high iteration count, and by</div><div class='add'>+	 * checking whether the specific run count marker has been explicitly</div><div class='add'>+	 * incremented at least once by the backing perf_event BPF program.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 100000000 &amp;&amp; !*(volatile int *)&amp;skel-&gt;bss-&gt;run_cnt; ++i)</div><div class='ctx'> 		++j;</div><div class='ctx'> </div><div class='ctx'> 	test_perf_branches__detach(skel);</div><div class='hunk'>@@ -116,11 +128,11 @@ static void test_perf_branches_hw(void)</div><div class='ctx'> 	pfd = syscall(__NR_perf_event_open, &amp;attr, -1, 0, -1, PERF_FLAG_FD_CLOEXEC);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Some setups don't support branch records (virtual machines, !x86),</div><div class='del'>-	 * so skip test in this case.</div><div class='add'>+	 * Some setups don't support LBR (virtual machines, !x86, AMD Milan Zen</div><div class='add'>+	 * 3 which only supports BRS), so skip test in this case.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pfd &lt; 0) {</div><div class='del'>-		if (errno == ENOENT || errno == EOPNOTSUPP) {</div><div class='add'>+		if (errno == ENOENT || errno == EOPNOTSUPP || errno == EINVAL) {</div><div class='ctx'> 			printf("%s:SKIP:no PERF_SAMPLE_BRANCH_STACK\n",</div><div class='ctx'> 			       __func__);</div><div class='ctx'> 			test__skip();</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/pinning_devmap_reuse.c b/tools/testing/selftests/bpf/prog_tests/pinning_devmap_reuse.c<br/>new file mode 100644<br/>index 000000000000..9ae49b587f3e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/pinning_devmap_reuse.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/pinning_devmap_reuse.c</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "test_pinning_devmap.skel.h"</div><div class='add'>+</div><div class='add'>+void test_pinning_devmap_reuse(void)</div><div class='add'>+{</div><div class='add'>+	const char *pinpath1 = "/sys/fs/bpf/pinmap1";</div><div class='add'>+	const char *pinpath2 = "/sys/fs/bpf/pinmap2";</div><div class='add'>+	struct test_pinning_devmap *skel1 = NULL, *skel2 = NULL;</div><div class='add'>+	int err;</div><div class='add'>+	DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts);</div><div class='add'>+</div><div class='add'>+	/* load the object a first time */</div><div class='add'>+	skel1 = test_pinning_devmap__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel1, "skel_load1"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* load the object a second time, re-using the pinned map */</div><div class='add'>+	skel2 = test_pinning_devmap__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel2, "skel_load2"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* we can close the reference safely without</div><div class='add'>+	 * the map's refcount falling to 0</div><div class='add'>+	 */</div><div class='add'>+	test_pinning_devmap__destroy(skel1);</div><div class='add'>+	skel1 = NULL;</div><div class='add'>+</div><div class='add'>+	/* now, swap the pins */</div><div class='add'>+	err = renameat2(0, pinpath1, 0, pinpath2, RENAME_EXCHANGE);</div><div class='add'>+	if (!ASSERT_OK(err, "swap pins"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* load the object again, this time the re-use should fail */</div><div class='add'>+	skel1 = test_pinning_devmap__open_and_load();</div><div class='add'>+	if (!ASSERT_ERR_PTR(skel1, "skel_load3"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	unlink(pinpath1);</div><div class='add'>+	unlink(pinpath2);</div><div class='add'>+	test_pinning_devmap__destroy(skel1);</div><div class='add'>+	test_pinning_devmap__destroy(skel2);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/pinning_htab.c b/tools/testing/selftests/bpf/prog_tests/pinning_htab.c<br/>new file mode 100644<br/>index 000000000000..16bd74be3dbe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/pinning_htab.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/pinning_htab.c</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "test_pinning_htab.skel.h"</div><div class='add'>+</div><div class='add'>+static void unpin_map(const char *map_name, const char *pin_path)</div><div class='add'>+{</div><div class='add'>+	struct test_pinning_htab *skel;</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = test_pinning_htab__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	map = bpf_object__find_map_by_name(skel-&gt;obj, map_name);</div><div class='add'>+	if (!ASSERT_OK_PTR(map, "bpf_object__find_map_by_name"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map__pin(map, pin_path);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map__pin"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map__unpin(map, pin_path);</div><div class='add'>+	ASSERT_OK(err, "bpf_map__unpin");</div><div class='add'>+out:</div><div class='add'>+	test_pinning_htab__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_pinning_htab(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("timer_prealloc"))</div><div class='add'>+		unpin_map("timer_prealloc", "/sys/fs/bpf/timer_prealloc");</div><div class='add'>+	if (test__start_subtest("timer_no_prealloc"))</div><div class='add'>+		unpin_map("timer_no_prealloc", "/sys/fs/bpf/timer_no_prealloc");</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/prepare.c b/tools/testing/selftests/bpf/prog_tests/prepare.c<br/>new file mode 100644<br/>index 000000000000..fb5cdad97116<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/prepare.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/prepare.c</a></div><div class='hunk'>@@ -0,0 +1,99 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta */</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;network_helpers.h&gt;</div><div class='add'>+#include "prepare.skel.h"</div><div class='add'>+</div><div class='add'>+static bool check_prepared(struct bpf_object *obj)</div><div class='add'>+{</div><div class='add'>+	bool is_prepared = true;</div><div class='add'>+	const struct bpf_map *map;</div><div class='add'>+</div><div class='add'>+	bpf_object__for_each_map(map, obj) {</div><div class='add'>+		if (bpf_map__fd(map) &lt; 0)</div><div class='add'>+			is_prepared = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return is_prepared;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_prepare_no_load(void)</div><div class='add'>+{</div><div class='add'>+	struct prepare *skel;</div><div class='add'>+	int err;</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts,</div><div class='add'>+		    .data_in = &amp;pkt_v4,</div><div class='add'>+		    .data_size_in = sizeof(pkt_v4),</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	skel = prepare__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "prepare__open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_FALSE(check_prepared(skel-&gt;obj), "not check_prepared"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	err = bpf_object__prepare(skel-&gt;obj);</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_TRUE(check_prepared(skel-&gt;obj), "check_prepared"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_object__prepare"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	prepare__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_prepare_load(void)</div><div class='add'>+{</div><div class='add'>+	struct prepare *skel;</div><div class='add'>+	int err, prog_fd;</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts,</div><div class='add'>+		    .data_in = &amp;pkt_v4,</div><div class='add'>+		    .data_size_in = sizeof(pkt_v4),</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	skel = prepare__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "prepare__open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_FALSE(check_prepared(skel-&gt;obj), "not check_prepared"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	err = bpf_object__prepare(skel-&gt;obj);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_object__prepare"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	err = prepare__load(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "prepare__load"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_TRUE(check_prepared(skel-&gt;obj), "check_prepared"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.program);</div><div class='add'>+	if (!ASSERT_GE(prog_fd, 0, "prog_fd"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+	if (!ASSERT_OK(err, "test_run_opts err"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(topts.retval, "test_run_opts retval"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;err, 0, "err");</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	prepare__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_prepare(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("prepare_load"))</div><div class='add'>+		test_prepare_load();</div><div class='add'>+	if (test__start_subtest("prepare_no_load"))</div><div class='add'>+		test_prepare_no_load();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/pro_epilogue.c b/tools/testing/selftests/bpf/prog_tests/pro_epilogue.c<br/>index 509883e6823a..5d3c00a08a88 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/pro_epilogue.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/pro_epilogue.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/pro_epilogue.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/pro_epilogue.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include "epilogue_tailcall.skel.h"</div><div class='ctx'> #include "pro_epilogue_goto_start.skel.h"</div><div class='ctx'> #include "epilogue_exit.skel.h"</div><div class='add'>+#include "pro_epilogue_with_kfunc.skel.h"</div><div class='ctx'> </div><div class='ctx'> struct st_ops_args {</div><div class='ctx'> 	__u64 a;</div><div class='hunk'>@@ -55,6 +56,7 @@ void test_pro_epilogue(void)</div><div class='ctx'> 	RUN_TESTS(pro_epilogue);</div><div class='ctx'> 	RUN_TESTS(pro_epilogue_goto_start);</div><div class='ctx'> 	RUN_TESTS(epilogue_exit);</div><div class='add'>+	RUN_TESTS(pro_epilogue_with_kfunc);</div><div class='ctx'> 	if (test__start_subtest("tailcall"))</div><div class='ctx'> 		test_tailcall();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/prog_tests_framework.c b/tools/testing/selftests/bpf/prog_tests/prog_tests_framework.c<br/>index 14f2796076e0..7607cfc2408c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/prog_tests_framework.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/prog_tests_framework.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/prog_tests_framework.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/prog_tests_framework.c</a></div><div class='hunk'>@@ -54,3 +54,128 @@ void test_prog_tests_framework(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	clear_test_state(state);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void dummy_emit(const char *buf, bool force) {}</div><div class='add'>+</div><div class='add'>+void test_prog_tests_framework_expected_msgs(void)</div><div class='add'>+{</div><div class='add'>+	struct expected_msgs msgs;</div><div class='add'>+	int i, j, error_cnt;</div><div class='add'>+	const struct {</div><div class='add'>+		const char *name;</div><div class='add'>+		const char *log;</div><div class='add'>+		const char *expected;</div><div class='add'>+		struct expect_msg *pats;</div><div class='add'>+	} cases[] = {</div><div class='add'>+		{</div><div class='add'>+			.name = "simple-ok",</div><div class='add'>+			.log = "aaabbbccc",</div><div class='add'>+			.pats = (struct expect_msg[]) {</div><div class='add'>+				{ .substr = "aaa" },</div><div class='add'>+				{ .substr = "ccc" },</div><div class='add'>+				{}</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "simple-fail",</div><div class='add'>+			.log = "aaabbbddd",</div><div class='add'>+			.expected = "MATCHED    SUBSTR: 'aaa'\n"</div><div class='add'>+				    "EXPECTED   SUBSTR: 'ccc'\n",</div><div class='add'>+			.pats = (struct expect_msg[]) {</div><div class='add'>+				{ .substr = "aaa" },</div><div class='add'>+				{ .substr = "ccc" },</div><div class='add'>+				{}</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "negative-ok-mid",</div><div class='add'>+			.log = "aaabbbccc",</div><div class='add'>+			.pats = (struct expect_msg[]) {</div><div class='add'>+				{ .substr = "aaa" },</div><div class='add'>+				{ .substr = "foo", .negative = true },</div><div class='add'>+				{ .substr = "bar", .negative = true },</div><div class='add'>+				{ .substr = "ccc" },</div><div class='add'>+				{}</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "negative-ok-tail",</div><div class='add'>+			.log = "aaabbbccc",</div><div class='add'>+			.pats = (struct expect_msg[]) {</div><div class='add'>+				{ .substr = "aaa" },</div><div class='add'>+				{ .substr = "foo", .negative = true },</div><div class='add'>+				{}</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "negative-ok-head",</div><div class='add'>+			.log = "aaabbbccc",</div><div class='add'>+			.pats = (struct expect_msg[]) {</div><div class='add'>+				{ .substr = "foo", .negative = true },</div><div class='add'>+				{ .substr = "ccc" },</div><div class='add'>+				{}</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "negative-fail-head",</div><div class='add'>+			.log = "aaabbbccc",</div><div class='add'>+			.expected = "UNEXPECTED SUBSTR: 'aaa'\n",</div><div class='add'>+			.pats = (struct expect_msg[]) {</div><div class='add'>+				{ .substr = "aaa", .negative = true },</div><div class='add'>+				{ .substr = "bbb" },</div><div class='add'>+				{}</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "negative-fail-tail",</div><div class='add'>+			.log = "aaabbbccc",</div><div class='add'>+			.expected = "UNEXPECTED SUBSTR: 'ccc'\n",</div><div class='add'>+			.pats = (struct expect_msg[]) {</div><div class='add'>+				{ .substr = "bbb" },</div><div class='add'>+				{ .substr = "ccc", .negative = true },</div><div class='add'>+				{}</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "negative-fail-mid-1",</div><div class='add'>+			.log = "aaabbbccc",</div><div class='add'>+			.expected = "UNEXPECTED SUBSTR: 'bbb'\n",</div><div class='add'>+			.pats = (struct expect_msg[]) {</div><div class='add'>+				{ .substr = "aaa" },</div><div class='add'>+				{ .substr = "bbb", .negative = true },</div><div class='add'>+				{ .substr = "ccc" },</div><div class='add'>+				{}</div><div class='add'>+			}</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.name = "negative-fail-mid-2",</div><div class='add'>+			.log = "aaabbb222ccc",</div><div class='add'>+			.expected = "UNEXPECTED SUBSTR: '222'\n",</div><div class='add'>+			.pats = (struct expect_msg[]) {</div><div class='add'>+				{ .substr = "aaa" },</div><div class='add'>+				{ .substr = "222", .negative = true },</div><div class='add'>+				{ .substr = "bbb", .negative = true },</div><div class='add'>+				{ .substr = "ccc" },</div><div class='add'>+				{}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cases); i++) {</div><div class='add'>+		if (test__start_subtest(cases[i].name)) {</div><div class='add'>+			error_cnt = env.subtest_state-&gt;error_cnt;</div><div class='add'>+			msgs.patterns = cases[i].pats;</div><div class='add'>+			msgs.cnt = 0;</div><div class='add'>+			for (j = 0; cases[i].pats[j].substr; j++)</div><div class='add'>+				msgs.cnt++;</div><div class='add'>+			validate_msgs(cases[i].log, &amp;msgs, dummy_emit);</div><div class='add'>+			fflush(stderr);</div><div class='add'>+			env.subtest_state-&gt;error_cnt = error_cnt;</div><div class='add'>+			if (cases[i].expected)</div><div class='add'>+				ASSERT_HAS_SUBSTR(env.subtest_state-&gt;log_buf, cases[i].expected, "expected output");</div><div class='add'>+			else</div><div class='add'>+				ASSERT_STREQ(env.subtest_state-&gt;log_buf, "", "expected no output");</div><div class='add'>+			test__end_subtest();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/rbtree.c b/tools/testing/selftests/bpf/prog_tests/rbtree.c<br/>index 9818f06c97c5..d8f3d7a45fe9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/rbtree.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/rbtree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/rbtree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/rbtree.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include "rbtree_fail.skel.h"</div><div class='ctx'> #include "rbtree_btf_fail__wrong_node_type.skel.h"</div><div class='ctx'> #include "rbtree_btf_fail__add_wrong_type.skel.h"</div><div class='add'>+#include "rbtree_search.skel.h"</div><div class='ctx'> </div><div class='ctx'> static void test_rbtree_add_nodes(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -187,3 +188,8 @@ void test_rbtree_fail(void)</div><div class='ctx'> {</div><div class='ctx'> 	RUN_TESTS(rbtree_fail);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void test_rbtree_search(void)</div><div class='add'>+{</div><div class='add'>+	RUN_TESTS(rbtree_search);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c b/tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c<br/>index ebe0c12b5536..246eb259c08a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@ static void test_success(void)</div><div class='ctx'> 	bpf_program__set_autoload(skel-&gt;progs.two_regions, true);</div><div class='ctx'> 	bpf_program__set_autoload(skel-&gt;progs.non_sleepable_1, true);</div><div class='ctx'> 	bpf_program__set_autoload(skel-&gt;progs.non_sleepable_2, true);</div><div class='add'>+	bpf_program__set_autoload(skel-&gt;progs.nested_rcu_region, true);</div><div class='ctx'> 	bpf_program__set_autoload(skel-&gt;progs.task_trusted_non_rcuptr, true);</div><div class='ctx'> 	bpf_program__set_autoload(skel-&gt;progs.rcu_read_lock_subprog, true);</div><div class='ctx'> 	bpf_program__set_autoload(skel-&gt;progs.rcu_read_lock_global_subprog, true);</div><div class='hunk'>@@ -78,9 +79,13 @@ static const char * const inproper_region_tests[] = {</div><div class='ctx'> 	"non_sleepable_rcu_mismatch",</div><div class='ctx'> 	"inproper_sleepable_helper",</div><div class='ctx'> 	"inproper_sleepable_kfunc",</div><div class='del'>-	"nested_rcu_region",</div><div class='add'>+	"nested_rcu_region_unbalanced_1",</div><div class='add'>+	"nested_rcu_region_unbalanced_2",</div><div class='ctx'> 	"rcu_read_lock_global_subprog_lock",</div><div class='ctx'> 	"rcu_read_lock_global_subprog_unlock",</div><div class='add'>+	"rcu_read_lock_sleepable_helper_global_subprog",</div><div class='add'>+	"rcu_read_lock_sleepable_kfunc_global_subprog",</div><div class='add'>+	"rcu_read_lock_sleepable_global_subprog_indirect",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void test_inproper_region(void)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c b/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c<br/>index c7b9ba8b1d06..a8d1eaa67020 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/read_vsyscall.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/read_vsyscall.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@ struct read_ret_desc {</div><div class='ctx'> 	{ .name = "copy_from_user", .ret = -EFAULT },</div><div class='ctx'> 	{ .name = "copy_from_user_task", .ret = -EFAULT },</div><div class='ctx'> 	{ .name = "copy_from_user_str", .ret = -EFAULT },</div><div class='add'>+	{ .name = "copy_from_user_task_str", .ret = -EFAULT },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void test_read_vsyscall(void)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/recursive_attach.c b/tools/testing/selftests/bpf/prog_tests/recursive_attach.c<br/>index 8100509e561b..0ffa01d54ce2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/recursive_attach.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/recursive_attach.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/recursive_attach.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/recursive_attach.c</a></div><div class='hunk'>@@ -149,3 +149,70 @@ close_prog:</div><div class='ctx'> 	fentry_recursive_target__destroy(target_skel);</div><div class='ctx'> 	fentry_recursive__destroy(tracing_skel);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void *fentry_target_test_run(void *arg)</div><div class='add'>+{</div><div class='add'>+	for (;;) {</div><div class='add'>+		int prog_fd = __atomic_load_n((int *)arg, __ATOMIC_SEQ_CST);</div><div class='add'>+		LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (prog_fd == -1)</div><div class='add'>+			break;</div><div class='add'>+		err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+		if (!ASSERT_OK(err, "fentry_target test_run"))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_fentry_attach_stress(void)</div><div class='add'>+{</div><div class='add'>+	struct fentry_recursive_target *target_skel = NULL;</div><div class='add'>+	struct fentry_recursive *tracing_skel = NULL;</div><div class='add'>+	struct bpf_program *prog;</div><div class='add'>+	int err, i, tgt_prog_fd;</div><div class='add'>+	pthread_t thread;</div><div class='add'>+</div><div class='add'>+	target_skel = fentry_recursive_target__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(target_skel,</div><div class='add'>+			   "fentry_recursive_target__open_and_load"))</div><div class='add'>+		goto close_prog;</div><div class='add'>+	tgt_prog_fd = bpf_program__fd(target_skel-&gt;progs.fentry_target);</div><div class='add'>+	err = pthread_create(&amp;thread, NULL,</div><div class='add'>+			     fentry_target_test_run, &amp;tgt_prog_fd);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_program__set_attach_target"))</div><div class='add'>+		goto close_prog;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 1000; i++) {</div><div class='add'>+		tracing_skel = fentry_recursive__open();</div><div class='add'>+		if (!ASSERT_OK_PTR(tracing_skel, "fentry_recursive__open"))</div><div class='add'>+			goto stop_thread;</div><div class='add'>+</div><div class='add'>+		prog = tracing_skel-&gt;progs.recursive_attach;</div><div class='add'>+		err = bpf_program__set_attach_target(prog, tgt_prog_fd,</div><div class='add'>+						     "fentry_target");</div><div class='add'>+		if (!ASSERT_OK(err, "bpf_program__set_attach_target"))</div><div class='add'>+			goto stop_thread;</div><div class='add'>+</div><div class='add'>+		err = fentry_recursive__load(tracing_skel);</div><div class='add'>+		if (!ASSERT_OK(err, "fentry_recursive__load"))</div><div class='add'>+			goto stop_thread;</div><div class='add'>+</div><div class='add'>+		err = fentry_recursive__attach(tracing_skel);</div><div class='add'>+		if (!ASSERT_OK(err, "fentry_recursive__attach"))</div><div class='add'>+			goto stop_thread;</div><div class='add'>+</div><div class='add'>+		fentry_recursive__destroy(tracing_skel);</div><div class='add'>+		tracing_skel = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+stop_thread:</div><div class='add'>+	__atomic_store_n(&amp;tgt_prog_fd, -1, __ATOMIC_SEQ_CST);</div><div class='add'>+	err = pthread_join(thread, NULL);</div><div class='add'>+	ASSERT_OK(err, "pthread_join");</div><div class='add'>+close_prog:</div><div class='add'>+	fentry_recursive__destroy(tracing_skel);</div><div class='add'>+	fentry_recursive_target__destroy(target_skel);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c b/tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c<br/>index d6bd5e16e637..d2c0542716a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c</a></div><div class='hunk'>@@ -44,3 +44,59 @@ void test_refcounted_kptr_wrong_owner(void)</div><div class='ctx'> 	ASSERT_OK(opts.retval, "rbtree_wrong_owner_remove_fail_a2 retval");</div><div class='ctx'> 	refcounted_kptr__destroy(skel);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void test_percpu_hash_refcounted_kptr_refcount_leak(void)</div><div class='add'>+{</div><div class='add'>+	struct refcounted_kptr *skel;</div><div class='add'>+	int cpu_nr, fd, err, key = 0;</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	size_t values_sz;</div><div class='add'>+	u64 *values;</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, opts,</div><div class='add'>+		    .data_in = &amp;pkt_v4,</div><div class='add'>+		    .data_size_in = sizeof(pkt_v4),</div><div class='add'>+		    .repeat = 1,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	cpu_nr = libbpf_num_possible_cpus();</div><div class='add'>+	if (!ASSERT_GT(cpu_nr, 0, "libbpf_num_possible_cpus"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	values = calloc(cpu_nr, sizeof(u64));</div><div class='add'>+	if (!ASSERT_OK_PTR(values, "calloc values"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel = refcounted_kptr__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "refcounted_kptr__open_and_load")) {</div><div class='add'>+		free(values);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	values_sz = cpu_nr * sizeof(u64);</div><div class='add'>+	memset(values, 0, values_sz);</div><div class='add'>+</div><div class='add'>+	map = skel-&gt;maps.percpu_hash;</div><div class='add'>+	err = bpf_map__update_elem(map, &amp;key, sizeof(key), values, values_sz, 0);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map__update_elem"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	fd = bpf_program__fd(skel-&gt;progs.percpu_hash_refcount_leak);</div><div class='add'>+	err = bpf_prog_test_run_opts(fd, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_test_run_opts"))</div><div class='add'>+		goto out;</div><div class='add'>+	if (!ASSERT_EQ(opts.retval, 2, "opts.retval"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map__update_elem(map, &amp;key, sizeof(key), values, values_sz, 0);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map__update_elem"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	fd = bpf_program__fd(skel-&gt;progs.check_percpu_hash_refcount);</div><div class='add'>+	err = bpf_prog_test_run_opts(fd, &amp;opts);</div><div class='add'>+	ASSERT_OK(err, "bpf_prog_test_run_opts");</div><div class='add'>+	ASSERT_EQ(opts.retval, 1, "opts.retval");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	refcounted_kptr__destroy(skel);</div><div class='add'>+	free(values);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/reg_bounds.c b/tools/testing/selftests/bpf/prog_tests/reg_bounds.c<br/>index 39d42271cc46..d93a0c7b1786 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/reg_bounds.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/reg_bounds.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/reg_bounds.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/reg_bounds.c</a></div><div class='hunk'>@@ -465,6 +465,20 @@ static struct range range_refine(enum num_t x_t, struct range x, enum num_t y_t,</div><div class='ctx'> 		return range_improve(x_t, x, x_swap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!t_is_32(x_t) &amp;&amp; !t_is_32(y_t) &amp;&amp; x_t != y_t) {</div><div class='add'>+		if (x_t == S64 &amp;&amp; x.a &gt; x.b) {</div><div class='add'>+			if (x.b &lt; y.a &amp;&amp; x.a &lt;= y.b)</div><div class='add'>+				return range(x_t, x.a, y.b);</div><div class='add'>+			if (x.a &gt; y.b &amp;&amp; x.b &gt;= y.a)</div><div class='add'>+				return range(x_t, y.a, x.b);</div><div class='add'>+		} else if (x_t == U64 &amp;&amp; y.a &gt; y.b) {</div><div class='add'>+			if (y.b &lt; x.a &amp;&amp; y.a &lt;= x.b)</div><div class='add'>+				return range(x_t, y.a, x.b);</div><div class='add'>+			if (y.a &gt; x.b &amp;&amp; y.b &gt;= x.a)</div><div class='add'>+				return range(x_t, x.a, y.b);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* otherwise, plain range cast and intersection works */</div><div class='ctx'> 	return range_improve(x_t, x, y_cast);</div><div class='ctx'> }</div><div class='hunk'>@@ -609,7 +623,7 @@ static void range_cond(enum num_t t, struct range x, struct range y,</div><div class='ctx'> 			*newx = range(t, x.a, x.b);</div><div class='ctx'> 			*newy = range(t, y.a + 1, y.b);</div><div class='ctx'> 		} else if (x.a == x.b &amp;&amp; x.b == y.b) {</div><div class='del'>-			/* X is a constant matching rigth side of Y */</div><div class='add'>+			/* X is a constant matching right side of Y */</div><div class='ctx'> 			*newx = range(t, x.a, x.b);</div><div class='ctx'> 			*newy = range(t, y.a, y.b - 1);</div><div class='ctx'> 		} else if (y.a == y.b &amp;&amp; x.a == y.a) {</div><div class='hunk'>@@ -617,7 +631,7 @@ static void range_cond(enum num_t t, struct range x, struct range y,</div><div class='ctx'> 			*newx = range(t, x.a + 1, x.b);</div><div class='ctx'> 			*newy = range(t, y.a, y.b);</div><div class='ctx'> 		} else if (y.a == y.b &amp;&amp; x.b == y.b) {</div><div class='del'>-			/* Y is a constant matching rigth side of X */</div><div class='add'>+			/* Y is a constant matching right side of X */</div><div class='ctx'> 			*newx = range(t, x.a, x.b - 1);</div><div class='ctx'> 			*newy = range(t, y.a, y.b);</div><div class='ctx'> 		} else {</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/res_spin_lock.c b/tools/testing/selftests/bpf/prog_tests/res_spin_lock.c<br/>new file mode 100644<br/>index 000000000000..f0a8c828f8f1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/res_spin_lock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/res_spin_lock.c</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2024-2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;network_helpers.h&gt;</div><div class='add'>+#include &lt;sys/sysinfo.h&gt;</div><div class='add'>+</div><div class='add'>+#include "res_spin_lock.skel.h"</div><div class='add'>+#include "res_spin_lock_fail.skel.h"</div><div class='add'>+</div><div class='add'>+void test_res_spin_lock_failure(void)</div><div class='add'>+{</div><div class='add'>+	RUN_TESTS(res_spin_lock_fail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static volatile int skip;</div><div class='add'>+</div><div class='add'>+static void *spin_lock_thread(void *arg)</div><div class='add'>+{</div><div class='add'>+	int err, prog_fd = *(u32 *) arg;</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts,</div><div class='add'>+		.data_in = &amp;pkt_v4,</div><div class='add'>+		.data_size_in = sizeof(pkt_v4),</div><div class='add'>+		.repeat = 10000,</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	while (!READ_ONCE(skip)) {</div><div class='add'>+		err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+		if (err || topts.retval) {</div><div class='add'>+			ASSERT_OK(err, "test_run");</div><div class='add'>+			ASSERT_OK(topts.retval, "test_run retval");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	pthread_exit(arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_res_spin_lock_success(void)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts,</div><div class='add'>+		.data_in = &amp;pkt_v4,</div><div class='add'>+		.data_size_in = sizeof(pkt_v4),</div><div class='add'>+		.repeat = 1,</div><div class='add'>+	);</div><div class='add'>+	struct res_spin_lock *skel;</div><div class='add'>+	pthread_t thread_id[16];</div><div class='add'>+	int prog_fd, i, err;</div><div class='add'>+	void *ret;</div><div class='add'>+</div><div class='add'>+	if (get_nprocs() &lt; 2) {</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skel = res_spin_lock__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "res_spin_lock__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+	/* AA deadlock */</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.res_spin_lock_test);</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+	ASSERT_OK(err, "error");</div><div class='add'>+	ASSERT_OK(topts.retval, "retval");</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.res_spin_lock_test_held_lock_max);</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+	ASSERT_OK(err, "error");</div><div class='add'>+	ASSERT_OK(topts.retval, "retval");</div><div class='add'>+</div><div class='add'>+	/* Multi-threaded ABBA deadlock. */</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.res_spin_lock_test_AB);</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = pthread_create(&amp;thread_id[i], NULL, &amp;spin_lock_thread, &amp;prog_fd);</div><div class='add'>+		if (!ASSERT_OK(err, "pthread_create"))</div><div class='add'>+			goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	topts.retval = 0;</div><div class='add'>+	topts.repeat = 1000;</div><div class='add'>+	int fd = bpf_program__fd(skel-&gt;progs.res_spin_lock_test_BA);</div><div class='add'>+	while (!topts.retval &amp;&amp; !err &amp;&amp; !READ_ONCE(skel-&gt;bss-&gt;err)) {</div><div class='add'>+		err = bpf_prog_test_run_opts(fd, &amp;topts);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(skip, true);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		if (!ASSERT_OK(pthread_join(thread_id[i], &amp;ret), "pthread_join"))</div><div class='add'>+			goto end;</div><div class='add'>+		if (!ASSERT_EQ(ret, &amp;prog_fd, "ret == prog_fd"))</div><div class='add'>+			goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(READ_ONCE(skel-&gt;bss-&gt;err), -EDEADLK, "timeout err");</div><div class='add'>+	ASSERT_OK(err, "err");</div><div class='add'>+	ASSERT_EQ(topts.retval, -EDEADLK, "timeout");</div><div class='add'>+end:</div><div class='add'>+	res_spin_lock__destroy(skel);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void serial_test_res_spin_lock_stress(void)</div><div class='add'>+{</div><div class='add'>+	if (libbpf_num_possible_cpus() &lt; 3) {</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_OK(load_module("bpf_test_rqspinlock.ko", false), "load module AA");</div><div class='add'>+	sleep(5);</div><div class='add'>+	unload_module("bpf_test_rqspinlock", false);</div><div class='add'>+	/*</div><div class='add'>+	 * Insert bpf_test_rqspinlock.ko manually with test_mode=[1|2] to test</div><div class='add'>+	 * other cases (ABBA, ABBCCA).</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/ringbuf.c b/tools/testing/selftests/bpf/prog_tests/ringbuf.c<br/>index da430df45aa4..64520684d2cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/ringbuf.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/ringbuf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/ringbuf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/ringbuf.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include "test_ringbuf_n.lskel.h"</div><div class='ctx'> #include "test_ringbuf_map_key.lskel.h"</div><div class='ctx'> #include "test_ringbuf_write.lskel.h"</div><div class='add'>+#include "test_ringbuf_overwrite.lskel.h"</div><div class='ctx'> </div><div class='ctx'> #define EDONE 7777</div><div class='ctx'> </div><div class='hunk'>@@ -97,7 +98,7 @@ static void ringbuf_write_subtest(void)</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "skel_open"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skel-&gt;maps.ringbuf.max_entries = 0x4000;</div><div class='add'>+	skel-&gt;maps.ringbuf.max_entries = 0x40000;</div><div class='ctx'> </div><div class='ctx'> 	err = test_ringbuf_write_lskel__load(skel);</div><div class='ctx'> 	if (!ASSERT_OK(err, "skel_load"))</div><div class='hunk'>@@ -108,7 +109,7 @@ static void ringbuf_write_subtest(void)</div><div class='ctx'> 	mmap_ptr = mmap(NULL, page_size, PROT_READ | PROT_WRITE, MAP_SHARED, rb_fd, 0);</div><div class='ctx'> 	if (!ASSERT_OK_PTR(mmap_ptr, "rw_cons_pos"))</div><div class='ctx'> 		goto cleanup;</div><div class='del'>-	*mmap_ptr = 0x3000;</div><div class='add'>+	*mmap_ptr = 0x30000;</div><div class='ctx'> 	ASSERT_OK(munmap(mmap_ptr, page_size), "unmap_rw");</div><div class='ctx'> </div><div class='ctx'> 	skel-&gt;bss-&gt;pid = getpid();</div><div class='hunk'>@@ -497,6 +498,68 @@ cleanup:</div><div class='ctx'> 	test_ringbuf_map_key_lskel__destroy(skel_map_key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ringbuf_overwrite_mode_subtest(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long size, len1, len2, len3, len4, len5;</div><div class='add'>+	unsigned long expect_avail_data, expect_prod_pos, expect_over_pos;</div><div class='add'>+	struct test_ringbuf_overwrite_lskel *skel;</div><div class='add'>+	int page_size = getpagesize();</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = test_ringbuf_overwrite_lskel__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	size = page_size;</div><div class='add'>+	len1 = page_size / 2;</div><div class='add'>+	len2 = page_size / 4;</div><div class='add'>+	len3 = size - len1 - len2 - BPF_RINGBUF_HDR_SZ * 3;</div><div class='add'>+	len4 = len3 - 8;</div><div class='add'>+	len5 = len3; /* retry with len3 */</div><div class='add'>+</div><div class='add'>+	skel-&gt;maps.ringbuf.max_entries = size;</div><div class='add'>+	skel-&gt;rodata-&gt;LEN1 = len1;</div><div class='add'>+	skel-&gt;rodata-&gt;LEN2 = len2;</div><div class='add'>+	skel-&gt;rodata-&gt;LEN3 = len3;</div><div class='add'>+	skel-&gt;rodata-&gt;LEN4 = len4;</div><div class='add'>+	skel-&gt;rodata-&gt;LEN5 = len5;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;pid = getpid();</div><div class='add'>+</div><div class='add'>+	err = test_ringbuf_overwrite_lskel__load(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "skel_load"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	err = test_ringbuf_overwrite_lskel__attach(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "skel_attach"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	syscall(__NR_getpgid);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;reserve1_fail, 0, "reserve 1");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;reserve2_fail, 0, "reserve 2");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;reserve3_fail, 1, "reserve 3");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;reserve4_fail, 0, "reserve 4");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;reserve5_fail, 0, "reserve 5");</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;ring_size, size, "check_ring_size");</div><div class='add'>+</div><div class='add'>+	expect_avail_data = len2 + len4 + len5 + 3 * BPF_RINGBUF_HDR_SZ;</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;avail_data, expect_avail_data, "check_avail_size");</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;cons_pos, 0, "check_cons_pos");</div><div class='add'>+</div><div class='add'>+	expect_prod_pos = len1 + len2 + len4 + len5 + 4 * BPF_RINGBUF_HDR_SZ;</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;prod_pos, expect_prod_pos, "check_prod_pos");</div><div class='add'>+</div><div class='add'>+	expect_over_pos = len1 + BPF_RINGBUF_HDR_SZ;</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;over_pos, expect_over_pos, "check_over_pos");</div><div class='add'>+</div><div class='add'>+	test_ringbuf_overwrite_lskel__detach(skel);</div><div class='add'>+cleanup:</div><div class='add'>+	test_ringbuf_overwrite_lskel__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_ringbuf(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("ringbuf"))</div><div class='hunk'>@@ -507,4 +570,6 @@ void test_ringbuf(void)</div><div class='ctx'> 		ringbuf_map_key_subtest();</div><div class='ctx'> 	if (test__start_subtest("ringbuf_write"))</div><div class='ctx'> 		ringbuf_write_subtest();</div><div class='add'>+	if (test__start_subtest("ringbuf_overwrite_mode"))</div><div class='add'>+		ringbuf_overwrite_mode_subtest();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c<br/>index 036d4760d2c1..3dbcc091f16c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/select_reuseport.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/select_reuseport.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/select_reuseport.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/select_reuseport.c</a></div><div class='hunk'>@@ -41,11 +41,7 @@ static struct bpf_object *obj;</div><div class='ctx'> static __u32 index_zero;</div><div class='ctx'> static int epfd;</div><div class='ctx'> </div><div class='del'>-static union sa46 {</div><div class='del'>-	struct sockaddr_in6 v6;</div><div class='del'>-	struct sockaddr_in v4;</div><div class='del'>-	sa_family_t family;</div><div class='del'>-} srv_sa;</div><div class='add'>+static struct sockaddr_storage srv_sa;</div><div class='ctx'> </div><div class='ctx'> #define RET_IF(condition, tag, format...) ({				\</div><div class='ctx'> 	if (CHECK_FAIL(condition)) {					\</div><div class='hunk'>@@ -135,24 +131,24 @@ static int prepare_bpf_obj(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sa46_init_loopback(union sa46 *sa, sa_family_t family)</div><div class='add'>+static void ss_init_loopback(struct sockaddr_storage *sa, sa_family_t family)</div><div class='ctx'> {</div><div class='ctx'> 	memset(sa, 0, sizeof(*sa));</div><div class='del'>-	sa-&gt;family = family;</div><div class='del'>-	if (sa-&gt;family == AF_INET6)</div><div class='del'>-		sa-&gt;v6.sin6_addr = in6addr_loopback;</div><div class='add'>+	sa-&gt;ss_family = family;</div><div class='add'>+	if (sa-&gt;ss_family == AF_INET6)</div><div class='add'>+		((struct sockaddr_in6 *)sa)-&gt;sin6_addr = in6addr_loopback;</div><div class='ctx'> 	else</div><div class='del'>-		sa-&gt;v4.sin_addr.s_addr = htonl(INADDR_LOOPBACK);</div><div class='add'>+		((struct sockaddr_in *)sa)-&gt;sin_addr.s_addr = htonl(INADDR_LOOPBACK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sa46_init_inany(union sa46 *sa, sa_family_t family)</div><div class='add'>+static void ss_init_inany(struct sockaddr_storage *sa, sa_family_t family)</div><div class='ctx'> {</div><div class='ctx'> 	memset(sa, 0, sizeof(*sa));</div><div class='del'>-	sa-&gt;family = family;</div><div class='del'>-	if (sa-&gt;family == AF_INET6)</div><div class='del'>-		sa-&gt;v6.sin6_addr = in6addr_any;</div><div class='add'>+	sa-&gt;ss_family = family;</div><div class='add'>+	if (sa-&gt;ss_family == AF_INET6)</div><div class='add'>+		((struct sockaddr_in6 *)sa)-&gt;sin6_addr = in6addr_any;</div><div class='ctx'> 	else</div><div class='del'>-		sa-&gt;v4.sin_addr.s_addr = INADDR_ANY;</div><div class='add'>+		((struct sockaddr_in *)sa)-&gt;sin_addr.s_addr = INADDR_ANY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int read_int_sysctl(const char *sysctl)</div><div class='hunk'>@@ -228,7 +224,7 @@ static void check_data(int type, sa_family_t family, const struct cmd *cmd,</div><div class='ctx'> 		       int cli_fd)</div><div class='ctx'> {</div><div class='ctx'> 	struct data_check expected = {}, result;</div><div class='del'>-	union sa46 cli_sa;</div><div class='add'>+	struct sockaddr_storage cli_sa;</div><div class='ctx'> 	socklen_t addrlen;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -251,26 +247,32 @@ static void check_data(int type, sa_family_t family, const struct cmd *cmd,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (family == AF_INET6) {</div><div class='add'>+		struct sockaddr_in6 *srv_v6 = (struct sockaddr_in6 *)&amp;srv_sa;</div><div class='add'>+		struct sockaddr_in6 *cli_v6 = (struct sockaddr_in6 *)&amp;cli_sa;</div><div class='add'>+</div><div class='ctx'> 		expected.eth_protocol = htons(ETH_P_IPV6);</div><div class='del'>-		expected.bind_inany = !srv_sa.v6.sin6_addr.s6_addr32[3] &amp;&amp;</div><div class='del'>-			!srv_sa.v6.sin6_addr.s6_addr32[2] &amp;&amp;</div><div class='del'>-			!srv_sa.v6.sin6_addr.s6_addr32[1] &amp;&amp;</div><div class='del'>-			!srv_sa.v6.sin6_addr.s6_addr32[0];</div><div class='add'>+		expected.bind_inany = !srv_v6-&gt;sin6_addr.s6_addr32[3] &amp;&amp;</div><div class='add'>+			!srv_v6-&gt;sin6_addr.s6_addr32[2] &amp;&amp;</div><div class='add'>+			!srv_v6-&gt;sin6_addr.s6_addr32[1] &amp;&amp;</div><div class='add'>+			!srv_v6-&gt;sin6_addr.s6_addr32[0];</div><div class='ctx'> </div><div class='del'>-		memcpy(&amp;expected.skb_addrs[0], cli_sa.v6.sin6_addr.s6_addr32,</div><div class='del'>-		       sizeof(cli_sa.v6.sin6_addr));</div><div class='add'>+		memcpy(&amp;expected.skb_addrs[0], cli_v6-&gt;sin6_addr.s6_addr32,</div><div class='add'>+		       sizeof(cli_v6-&gt;sin6_addr));</div><div class='ctx'> 		memcpy(&amp;expected.skb_addrs[4], &amp;in6addr_loopback,</div><div class='ctx'> 		       sizeof(in6addr_loopback));</div><div class='del'>-		expected.skb_ports[0] = cli_sa.v6.sin6_port;</div><div class='del'>-		expected.skb_ports[1] = srv_sa.v6.sin6_port;</div><div class='add'>+		expected.skb_ports[0] = cli_v6-&gt;sin6_port;</div><div class='add'>+		expected.skb_ports[1] = srv_v6-&gt;sin6_port;</div><div class='ctx'> 	} else {</div><div class='add'>+		struct sockaddr_in *srv_v4 = (struct sockaddr_in *)&amp;srv_sa;</div><div class='add'>+		struct sockaddr_in *cli_v4 = (struct sockaddr_in *)&amp;cli_sa;</div><div class='add'>+</div><div class='ctx'> 		expected.eth_protocol = htons(ETH_P_IP);</div><div class='del'>-		expected.bind_inany = !srv_sa.v4.sin_addr.s_addr;</div><div class='add'>+		expected.bind_inany = !srv_v4-&gt;sin_addr.s_addr;</div><div class='ctx'> </div><div class='del'>-		expected.skb_addrs[0] = cli_sa.v4.sin_addr.s_addr;</div><div class='add'>+		expected.skb_addrs[0] = cli_v4-&gt;sin_addr.s_addr;</div><div class='ctx'> 		expected.skb_addrs[1] = htonl(INADDR_LOOPBACK);</div><div class='del'>-		expected.skb_ports[0] = cli_sa.v4.sin_port;</div><div class='del'>-		expected.skb_ports[1] = srv_sa.v4.sin_port;</div><div class='add'>+		expected.skb_ports[0] = cli_v4-&gt;sin_port;</div><div class='add'>+		expected.skb_ports[1] = srv_v4-&gt;sin_port;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (memcmp(&amp;result, &amp;expected, offsetof(struct data_check,</div><div class='hunk'>@@ -364,16 +366,15 @@ static void check_results(void)</div><div class='ctx'> static int send_data(int type, sa_family_t family, void *data, size_t len,</div><div class='ctx'> 		     enum result expected)</div><div class='ctx'> {</div><div class='del'>-	union sa46 cli_sa;</div><div class='add'>+	struct sockaddr_storage cli_sa;</div><div class='ctx'> 	int fd, err;</div><div class='ctx'> </div><div class='ctx'> 	fd = socket(family, type, 0);</div><div class='ctx'> 	RET_ERR(fd == -1, "socket()", "fd:%d errno:%d\n", fd, errno);</div><div class='ctx'> </div><div class='del'>-	sa46_init_loopback(&amp;cli_sa, family);</div><div class='add'>+	ss_init_loopback(&amp;cli_sa, family);</div><div class='ctx'> 	err = bind(fd, (struct sockaddr *)&amp;cli_sa, sizeof(cli_sa));</div><div class='ctx'> 	RET_ERR(fd == -1, "bind(cli_sa)", "err:%d errno:%d\n", err, errno);</div><div class='del'>-</div><div class='ctx'> 	err = sendto(fd, data, len, MSG_FASTOPEN, (struct sockaddr *)&amp;srv_sa,</div><div class='ctx'> 		     sizeof(srv_sa));</div><div class='ctx'> 	RET_ERR(err != len &amp;&amp; expected &gt;= PASS,</div><div class='hunk'>@@ -589,9 +590,9 @@ static void prepare_sk_fds(int type, sa_family_t family, bool inany)</div><div class='ctx'> 	socklen_t addrlen;</div><div class='ctx'> </div><div class='ctx'> 	if (inany)</div><div class='del'>-		sa46_init_inany(&amp;srv_sa, family);</div><div class='add'>+		ss_init_inany(&amp;srv_sa, family);</div><div class='ctx'> 	else</div><div class='del'>-		sa46_init_loopback(&amp;srv_sa, family);</div><div class='add'>+		ss_init_loopback(&amp;srv_sa, family);</div><div class='ctx'> 	addrlen = sizeof(srv_sa);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/send_signal.c b/tools/testing/selftests/bpf/prog_tests/send_signal.c<br/>index 1702aa592c2c..7ac4d5a488aa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/send_signal.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/send_signal.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/send_signal.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/send_signal.c</a></div><div class='hunk'>@@ -206,6 +206,11 @@ destroy_skel:</div><div class='ctx'> skel_open_load_failure:</div><div class='ctx'> 	close(pipe_c2p[0]);</div><div class='ctx'> 	close(pipe_p2c[1]);</div><div class='add'>+	/*</div><div class='add'>+	 * Child is either about to exit cleanly or stuck in case of errors.</div><div class='add'>+	 * Nudge it to exit.</div><div class='add'>+	 */</div><div class='add'>+	kill(pid, SIGKILL);</div><div class='ctx'> 	wait(NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/setget_sockopt.c b/tools/testing/selftests/bpf/prog_tests/setget_sockopt.c<br/>index e12255121c15..e4dac529d424 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/setget_sockopt.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/setget_sockopt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/setget_sockopt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/setget_sockopt.c</a></div><div class='hunk'>@@ -202,7 +202,7 @@ err_out:</div><div class='ctx'> void test_setget_sockopt(void)</div><div class='ctx'> {</div><div class='ctx'> 	cg_fd = test__join_cgroup(CG_NAME);</div><div class='del'>-	if (cg_fd &lt; 0)</div><div class='add'>+	if (!ASSERT_OK_FD(cg_fd, "join cgroup"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (create_netns())</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/sha256.c b/tools/testing/selftests/bpf/prog_tests/sha256.c<br/>new file mode 100644<br/>index 000000000000..604a0b1423d5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sha256.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/sha256.c</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright 2025 Google LLC */</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "bpf/libbpf_internal.h"</div><div class='add'>+</div><div class='add'>+#define MAX_LEN 4096</div><div class='add'>+</div><div class='add'>+/* Test libbpf_sha256() for all lengths from 0 to MAX_LEN inclusively. */</div><div class='add'>+void test_sha256(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The correctness of this value was verified by running this test with</div><div class='add'>+	 * libbpf_sha256() replaced by OpenSSL's SHA256().</div><div class='add'>+	 */</div><div class='add'>+	static const __u8 expected_digest_of_digests[SHA256_DIGEST_LENGTH] = {</div><div class='add'>+		0x62, 0x30, 0x0e, 0x1d, 0xea, 0x7f, 0xc4, 0x74,</div><div class='add'>+		0xfd, 0x8e, 0x64, 0x0b, 0xd8, 0x5f, 0xea, 0x04,</div><div class='add'>+		0xf3, 0xef, 0x77, 0x42, 0xc2, 0x01, 0xb8, 0x90,</div><div class='add'>+		0x6e, 0x19, 0x91, 0x1b, 0xca, 0xb3, 0x28, 0x42,</div><div class='add'>+	};</div><div class='add'>+	__u64 seed = 0;</div><div class='add'>+	__u8 *data = NULL, *digests = NULL;</div><div class='add'>+	__u8 digest_of_digests[SHA256_DIGEST_LENGTH];</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	data = malloc(MAX_LEN);</div><div class='add'>+	if (!ASSERT_OK_PTR(data, "malloc"))</div><div class='add'>+		goto out;</div><div class='add'>+	digests = malloc((MAX_LEN + 1) * SHA256_DIGEST_LENGTH);</div><div class='add'>+	if (!ASSERT_OK_PTR(digests, "malloc"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Generate MAX_LEN bytes of "random" data deterministically. */</div><div class='add'>+	for (i = 0; i &lt; MAX_LEN; i++) {</div><div class='add'>+		seed = (seed * 25214903917 + 11) &amp; ((1ULL &lt;&lt; 48) - 1);</div><div class='add'>+		data[i] = (__u8)(seed &gt;&gt; 16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate a digest for each length 0 through MAX_LEN inclusively. */</div><div class='add'>+	for (i = 0; i &lt;= MAX_LEN; i++)</div><div class='add'>+		libbpf_sha256(data, i, &amp;digests[i * SHA256_DIGEST_LENGTH]);</div><div class='add'>+</div><div class='add'>+	/* Calculate and verify the digest of all the digests. */</div><div class='add'>+	libbpf_sha256(digests, (MAX_LEN + 1) * SHA256_DIGEST_LENGTH,</div><div class='add'>+		      digest_of_digests);</div><div class='add'>+	ASSERT_MEMEQ(digest_of_digests, expected_digest_of_digests,</div><div class='add'>+		     SHA256_DIGEST_LENGTH, "digest_of_digests");</div><div class='add'>+out:</div><div class='add'>+	free(data);</div><div class='add'>+	free(digests);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/sk_assign.c b/tools/testing/selftests/bpf/prog_tests/sk_assign.c<br/>index 0b9bd1d6f7cc..10a0ab954b8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sk_assign.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sk_assign.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sk_assign.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/sk_assign.c</a></div><div class='hunk'>@@ -37,8 +37,10 @@ configure_stack(void)</div><div class='ctx'> 	tc = popen("tc -V", "r");</div><div class='ctx'> 	if (CHECK_FAIL(!tc))</div><div class='ctx'> 		return false;</div><div class='del'>-	if (CHECK_FAIL(!fgets(tc_version, sizeof(tc_version), tc)))</div><div class='add'>+	if (CHECK_FAIL(!fgets(tc_version, sizeof(tc_version), tc))) {</div><div class='add'>+		pclose(tc);</div><div class='ctx'> 		return false;</div><div class='add'>+	}</div><div class='ctx'> 	if (strstr(tc_version, ", libbpf "))</div><div class='ctx'> 		prog = "test_sk_assign_libbpf.bpf.o";</div><div class='ctx'> 	else</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/sk_bypass_prot_mem.c b/tools/testing/selftests/bpf/prog_tests/sk_bypass_prot_mem.c<br/>new file mode 100644<br/>index 000000000000..e4940583924b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sk_bypass_prot_mem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/sk_bypass_prot_mem.c</a></div><div class='hunk'>@@ -0,0 +1,292 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright 2025 Google LLC */</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "sk_bypass_prot_mem.skel.h"</div><div class='add'>+#include "network_helpers.h"</div><div class='add'>+</div><div class='add'>+#define NR_PAGES	32</div><div class='add'>+#define NR_SOCKETS	2</div><div class='add'>+#define BUF_TOTAL	(NR_PAGES * 4096 / NR_SOCKETS)</div><div class='add'>+#define BUF_SINGLE	1024</div><div class='add'>+#define NR_SEND		(BUF_TOTAL / BUF_SINGLE)</div><div class='add'>+</div><div class='add'>+struct test_case {</div><div class='add'>+	char name[8];</div><div class='add'>+	int family;</div><div class='add'>+	int type;</div><div class='add'>+	int (*create_sockets)(struct test_case *test_case, int sk[], int len);</div><div class='add'>+	long (*get_memory_allocated)(struct test_case *test_case, struct sk_bypass_prot_mem *skel);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tcp_create_sockets(struct test_case *test_case, int sk[], int len)</div><div class='add'>+{</div><div class='add'>+	int server, i, err = 0;</div><div class='add'>+</div><div class='add'>+	server = start_server(test_case-&gt;family, test_case-&gt;type, NULL, 0, 0);</div><div class='add'>+	if (!ASSERT_GE(server, 0, "start_server_str"))</div><div class='add'>+		return server;</div><div class='add'>+</div><div class='add'>+	/* Keep for-loop so we can change NR_SOCKETS easily. */</div><div class='add'>+	for (i = 0; i &lt; len; i += 2) {</div><div class='add'>+		sk[i] = connect_to_fd(server, 0);</div><div class='add'>+		if (sk[i] &lt; 0) {</div><div class='add'>+			ASSERT_GE(sk[i], 0, "connect_to_fd");</div><div class='add'>+			err = sk[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sk[i + 1] = accept(server, NULL, NULL);</div><div class='add'>+		if (sk[i + 1] &lt; 0) {</div><div class='add'>+			ASSERT_GE(sk[i + 1], 0, "accept");</div><div class='add'>+			err = sk[i + 1];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	close(server);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int udp_create_sockets(struct test_case *test_case, int sk[], int len)</div><div class='add'>+{</div><div class='add'>+	int i, j, err, rcvbuf = BUF_TOTAL;</div><div class='add'>+</div><div class='add'>+	/* Keep for-loop so we can change NR_SOCKETS easily. */</div><div class='add'>+	for (i = 0; i &lt; len; i += 2) {</div><div class='add'>+		sk[i] = start_server(test_case-&gt;family, test_case-&gt;type, NULL, 0, 0);</div><div class='add'>+		if (sk[i] &lt; 0) {</div><div class='add'>+			ASSERT_GE(sk[i], 0, "start_server");</div><div class='add'>+			return sk[i];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sk[i + 1] = connect_to_fd(sk[i], 0);</div><div class='add'>+		if (sk[i + 1] &lt; 0) {</div><div class='add'>+			ASSERT_GE(sk[i + 1], 0, "connect_to_fd");</div><div class='add'>+			return sk[i + 1];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = connect_fd_to_fd(sk[i], sk[i + 1], 0);</div><div class='add'>+		if (err) {</div><div class='add'>+			ASSERT_EQ(err, 0, "connect_fd_to_fd");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; 2; j++) {</div><div class='add'>+			err = setsockopt(sk[i + j], SOL_SOCKET, SO_RCVBUF, &amp;rcvbuf, sizeof(int));</div><div class='add'>+			if (err) {</div><div class='add'>+				ASSERT_EQ(err, 0, "setsockopt(SO_RCVBUF)");</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long get_memory_allocated(struct test_case *test_case,</div><div class='add'>+				 bool *activated, long *memory_allocated)</div><div class='add'>+{</div><div class='add'>+	int sk;</div><div class='add'>+</div><div class='add'>+	*activated = true;</div><div class='add'>+</div><div class='add'>+	/* AF_INET and AF_INET6 share the same memory_allocated.</div><div class='add'>+	 * tcp_init_sock() is called by AF_INET and AF_INET6,</div><div class='add'>+	 * but udp_lib_init_sock() is inline.</div><div class='add'>+	 */</div><div class='add'>+	sk = socket(AF_INET, test_case-&gt;type, 0);</div><div class='add'>+	if (!ASSERT_GE(sk, 0, "get_memory_allocated"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	close(sk);</div><div class='add'>+</div><div class='add'>+	return *memory_allocated;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long tcp_get_memory_allocated(struct test_case *test_case, struct sk_bypass_prot_mem *skel)</div><div class='add'>+{</div><div class='add'>+	return get_memory_allocated(test_case,</div><div class='add'>+				    &amp;skel-&gt;bss-&gt;tcp_activated,</div><div class='add'>+				    &amp;skel-&gt;bss-&gt;tcp_memory_allocated);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long udp_get_memory_allocated(struct test_case *test_case, struct sk_bypass_prot_mem *skel)</div><div class='add'>+{</div><div class='add'>+	return get_memory_allocated(test_case,</div><div class='add'>+				    &amp;skel-&gt;bss-&gt;udp_activated,</div><div class='add'>+				    &amp;skel-&gt;bss-&gt;udp_memory_allocated);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_bypass(struct test_case *test_case,</div><div class='add'>+			struct sk_bypass_prot_mem *skel, bool bypass)</div><div class='add'>+{</div><div class='add'>+	char buf[BUF_SINGLE] = {};</div><div class='add'>+	long memory_allocated[2];</div><div class='add'>+	int sk[NR_SOCKETS];</div><div class='add'>+	int err, i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sk); i++)</div><div class='add'>+		sk[i] = -1;</div><div class='add'>+</div><div class='add'>+	err = test_case-&gt;create_sockets(test_case, sk, ARRAY_SIZE(sk));</div><div class='add'>+	if (err)</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	memory_allocated[0] = test_case-&gt;get_memory_allocated(test_case, skel);</div><div class='add'>+</div><div class='add'>+	/* allocate pages &gt;= NR_PAGES */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sk); i++) {</div><div class='add'>+		for (j = 0; j &lt; NR_SEND; j++) {</div><div class='add'>+			int bytes = send(sk[i], buf, sizeof(buf), 0);</div><div class='add'>+</div><div class='add'>+			/* Avoid too noisy logs when something failed. */</div><div class='add'>+			if (bytes != sizeof(buf)) {</div><div class='add'>+				ASSERT_EQ(bytes, sizeof(buf), "send");</div><div class='add'>+				if (bytes &lt; 0) {</div><div class='add'>+					err = bytes;</div><div class='add'>+					goto drain;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memory_allocated[1] = test_case-&gt;get_memory_allocated(test_case, skel);</div><div class='add'>+</div><div class='add'>+	if (bypass)</div><div class='add'>+		ASSERT_LE(memory_allocated[1], memory_allocated[0] + 10, "bypass");</div><div class='add'>+	else</div><div class='add'>+		ASSERT_GT(memory_allocated[1], memory_allocated[0] + NR_PAGES, "no bypass");</div><div class='add'>+</div><div class='add'>+drain:</div><div class='add'>+	if (test_case-&gt;type == SOCK_DGRAM) {</div><div class='add'>+		/* UDP starts purging sk-&gt;sk_receive_queue after one RCU</div><div class='add'>+		 * grace period, then udp_memory_allocated goes down,</div><div class='add'>+		 * so drain the queue before close().</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(sk); i++) {</div><div class='add'>+			for (j = 0; j &lt; NR_SEND; j++) {</div><div class='add'>+				int bytes = recv(sk[i], buf, 1, MSG_DONTWAIT | MSG_TRUNC);</div><div class='add'>+</div><div class='add'>+				if (bytes == sizeof(buf))</div><div class='add'>+					continue;</div><div class='add'>+				if (bytes != -1 || errno != EAGAIN)</div><div class='add'>+					PRINT_FAIL("bytes: %d, errno: %s\n", bytes, strerror(errno));</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+close:</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sk); i++) {</div><div class='add'>+		if (sk[i] &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		close(sk[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void run_test(struct test_case *test_case)</div><div class='add'>+{</div><div class='add'>+	struct sk_bypass_prot_mem *skel;</div><div class='add'>+	struct nstoken *nstoken;</div><div class='add'>+	int cgroup, err;</div><div class='add'>+</div><div class='add'>+	skel = sk_bypass_prot_mem__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;nr_cpus = libbpf_num_possible_cpus();</div><div class='add'>+</div><div class='add'>+	err = sk_bypass_prot_mem__attach(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "attach"))</div><div class='add'>+		goto destroy_skel;</div><div class='add'>+</div><div class='add'>+	cgroup = test__join_cgroup("/sk_bypass_prot_mem");</div><div class='add'>+	if (!ASSERT_GE(cgroup, 0, "join_cgroup"))</div><div class='add'>+		goto destroy_skel;</div><div class='add'>+</div><div class='add'>+	err = make_netns("sk_bypass_prot_mem");</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "make_netns"))</div><div class='add'>+		goto close_cgroup;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns("sk_bypass_prot_mem");</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open_netns"))</div><div class='add'>+		goto remove_netns;</div><div class='add'>+</div><div class='add'>+	err = check_bypass(test_case, skel, false);</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "test_bypass(false)"))</div><div class='add'>+		goto close_netns;</div><div class='add'>+</div><div class='add'>+	err = write_sysctl("/proc/sys/net/core/bypass_prot_mem", "1");</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "write_sysctl(1)"))</div><div class='add'>+		goto close_netns;</div><div class='add'>+</div><div class='add'>+	err = check_bypass(test_case, skel, true);</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "test_bypass(true by sysctl)"))</div><div class='add'>+		goto close_netns;</div><div class='add'>+</div><div class='add'>+	err = write_sysctl("/proc/sys/net/core/bypass_prot_mem", "0");</div><div class='add'>+	if (!ASSERT_EQ(err, 0, "write_sysctl(0)"))</div><div class='add'>+		goto close_netns;</div><div class='add'>+</div><div class='add'>+	skel-&gt;links.sock_create = bpf_program__attach_cgroup(skel-&gt;progs.sock_create, cgroup);</div><div class='add'>+	if (!ASSERT_OK_PTR(skel-&gt;links.sock_create, "attach_cgroup(sock_create)"))</div><div class='add'>+		goto close_netns;</div><div class='add'>+</div><div class='add'>+	err = check_bypass(test_case, skel, true);</div><div class='add'>+	ASSERT_EQ(err, 0, "test_bypass(true by bpf)");</div><div class='add'>+</div><div class='add'>+close_netns:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+remove_netns:</div><div class='add'>+	remove_netns("sk_bypass_prot_mem");</div><div class='add'>+close_cgroup:</div><div class='add'>+	close(cgroup);</div><div class='add'>+destroy_skel:</div><div class='add'>+	sk_bypass_prot_mem__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct test_case test_cases[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "TCP  ",</div><div class='add'>+		.family = AF_INET,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+		.create_sockets = tcp_create_sockets,</div><div class='add'>+		.get_memory_allocated = tcp_get_memory_allocated,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "UDP  ",</div><div class='add'>+		.family = AF_INET,</div><div class='add'>+		.type = SOCK_DGRAM,</div><div class='add'>+		.create_sockets = udp_create_sockets,</div><div class='add'>+		.get_memory_allocated = udp_get_memory_allocated,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "TCPv6",</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+		.create_sockets = tcp_create_sockets,</div><div class='add'>+		.get_memory_allocated = tcp_get_memory_allocated,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "UDPv6",</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.type = SOCK_DGRAM,</div><div class='add'>+		.create_sockets = udp_create_sockets,</div><div class='add'>+		.get_memory_allocated = udp_get_memory_allocated,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void serial_test_sk_bypass_prot_mem(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(test_cases); i++) {</div><div class='add'>+		if (test__start_subtest(test_cases[i].name))</div><div class='add'>+			run_test(&amp;test_cases[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/snprintf.c b/tools/testing/selftests/bpf/prog_tests/snprintf.c<br/>index 4be6fdb78c6a..594441acb707 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/snprintf.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/snprintf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/snprintf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/snprintf.c</a></div><div class='hunk'>@@ -116,6 +116,8 @@ static void test_snprintf_negative(void)</div><div class='ctx'> 	ASSERT_ERR(load_single_snprintf("%llc"), "invalid specifier 7");</div><div class='ctx'> 	ASSERT_ERR(load_single_snprintf("\x80"), "non ascii character");</div><div class='ctx'> 	ASSERT_ERR(load_single_snprintf("\x1"), "non printable character");</div><div class='add'>+	ASSERT_ERR(load_single_snprintf("%p%"), "invalid specifier 8");</div><div class='add'>+	ASSERT_ERR(load_single_snprintf("%s%"), "invalid specifier 9");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void test_snprintf(void)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c b/tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c<br/>index d56e18b25528..27781df8f2fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c</a></div><div class='hunk'>@@ -1,20 +1,875 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> // Copyright (c) 2024 Meta</div><div class='ctx'> </div><div class='add'>+#include &lt;poll.h&gt;</div><div class='ctx'> #include &lt;test_progs.h&gt;</div><div class='ctx'> #include "network_helpers.h"</div><div class='ctx'> #include "sock_iter_batch.skel.h"</div><div class='ctx'> </div><div class='ctx'> #define TEST_NS "sock_iter_batch_netns"</div><div class='add'>+#define TEST_CHILD_NS "sock_iter_batch_child_netns"</div><div class='ctx'> </div><div class='add'>+static const int init_batch_size = 16;</div><div class='ctx'> static const int nr_soreuse = 4;</div><div class='ctx'> </div><div class='add'>+struct iter_out {</div><div class='add'>+	int idx;</div><div class='add'>+	__u64 cookie;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct sock_count {</div><div class='add'>+	__u64 cookie;</div><div class='add'>+	int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int insert(__u64 cookie, struct sock_count counts[], int counts_len)</div><div class='add'>+{</div><div class='add'>+	int insert = -1;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	for (; i &lt; counts_len; i++) {</div><div class='add'>+		if (!counts[i].cookie) {</div><div class='add'>+			insert = i;</div><div class='add'>+		} else if (counts[i].cookie == cookie) {</div><div class='add'>+			insert = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (insert &lt; 0)</div><div class='add'>+		return insert;</div><div class='add'>+</div><div class='add'>+	counts[insert].cookie = cookie;</div><div class='add'>+	counts[insert].count++;</div><div class='add'>+</div><div class='add'>+	return counts[insert].count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_n(int iter_fd, int n, struct sock_count counts[],</div><div class='add'>+		  int counts_len)</div><div class='add'>+{</div><div class='add'>+	struct iter_out out;</div><div class='add'>+	int nread = 1;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	for (; nread &gt; 0 &amp;&amp; (n &lt; 0 || i &lt; n); i++) {</div><div class='add'>+		nread = read(iter_fd, &amp;out, sizeof(out));</div><div class='add'>+		if (!nread || !ASSERT_EQ(nread, sizeof(out), "nread"))</div><div class='add'>+			break;</div><div class='add'>+		ASSERT_GE(insert(out.cookie, counts, counts_len), 0, "insert");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(n &lt; 0 || i == n, "n &lt; 0 || i == n");</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __u64 socket_cookie(int fd)</div><div class='add'>+{</div><div class='add'>+	__u64 cookie;</div><div class='add'>+	socklen_t cookie_len = sizeof(cookie);</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(getsockopt(fd, SOL_SOCKET, SO_COOKIE, &amp;cookie,</div><div class='add'>+				  &amp;cookie_len), "getsockopt(SO_COOKIE)"))</div><div class='add'>+		return 0;</div><div class='add'>+	return cookie;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool was_seen(int fd, struct sock_count counts[], int counts_len)</div><div class='add'>+{</div><div class='add'>+	__u64 cookie = socket_cookie(fd);</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	for (; cookie &amp;&amp; i &lt; counts_len; i++)</div><div class='add'>+		if (cookie == counts[i].cookie)</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_seen_socket(int *fds, struct sock_count counts[], int n)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	for (; i &lt; n; i++)</div><div class='add'>+		if (was_seen(fds[i], counts, n))</div><div class='add'>+			return i;</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_nth_socket(int *fds, int fds_len, struct bpf_link *link, int n)</div><div class='add'>+{</div><div class='add'>+	int i, nread, iter_fd;</div><div class='add'>+	int nth_sock_idx = -1;</div><div class='add'>+	struct iter_out out;</div><div class='add'>+</div><div class='add'>+	iter_fd = bpf_iter_create(bpf_link__fd(link));</div><div class='add'>+	if (!ASSERT_OK_FD(iter_fd, "bpf_iter_create"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (; n &gt;= 0; n--) {</div><div class='add'>+		nread = read(iter_fd, &amp;out, sizeof(out));</div><div class='add'>+		if (!nread || !ASSERT_GE(nread, 1, "nread"))</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; fds_len &amp;&amp; nth_sock_idx &lt; 0; i++)</div><div class='add'>+		if (fds[i] &gt;= 0 &amp;&amp; socket_cookie(fds[i]) == out.cookie)</div><div class='add'>+			nth_sock_idx = i;</div><div class='add'>+done:</div><div class='add'>+	close(iter_fd);</div><div class='add'>+	return nth_sock_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy(int fd)</div><div class='add'>+{</div><div class='add'>+	struct sock_iter_batch *skel = NULL;</div><div class='add'>+	__u64 cookie = socket_cookie(fd);</div><div class='add'>+	struct bpf_link *link = NULL;</div><div class='add'>+	int iter_fd = -1;</div><div class='add'>+	int nread;</div><div class='add'>+	__u64 out;</div><div class='add'>+</div><div class='add'>+	skel = sock_iter_batch__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "sock_iter_batch__open"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	skel-&gt;rodata-&gt;destroy_cookie = cookie;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(sock_iter_batch__load(skel), "sock_iter_batch__load"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach_iter(skel-&gt;progs.iter_tcp_destroy, NULL);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "bpf_program__attach_iter"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	iter_fd = bpf_iter_create(bpf_link__fd(link));</div><div class='add'>+	if (!ASSERT_OK_FD(iter_fd, "bpf_iter_create"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Delete matching socket. */</div><div class='add'>+	nread = read(iter_fd, &amp;out, sizeof(out));</div><div class='add'>+	ASSERT_GE(nread, 0, "nread");</div><div class='add'>+	if (nread)</div><div class='add'>+		ASSERT_EQ(out, cookie, "cookie matches");</div><div class='add'>+done:</div><div class='add'>+	if (iter_fd &gt;= 0)</div><div class='add'>+		close(iter_fd);</div><div class='add'>+	bpf_link__destroy(link);</div><div class='add'>+	sock_iter_batch__destroy(skel);</div><div class='add'>+	close(fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_seen_count(int fd, struct sock_count counts[], int n)</div><div class='add'>+{</div><div class='add'>+	__u64 cookie = socket_cookie(fd);</div><div class='add'>+	int count = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	for (; cookie &amp;&amp; !count &amp;&amp; i &lt; n; i++)</div><div class='add'>+		if (cookie == counts[i].cookie)</div><div class='add'>+			count = counts[i].count;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_n_were_seen_once(int *fds, int fds_len, int n,</div><div class='add'>+				   struct sock_count counts[], int counts_len)</div><div class='add'>+{</div><div class='add'>+	int seen_once = 0;</div><div class='add'>+	int seen_cnt;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	for (; i &lt; fds_len; i++) {</div><div class='add'>+		/* Skip any sockets that were closed or that weren't seen</div><div class='add'>+		 * exactly once.</div><div class='add'>+		 */</div><div class='add'>+		if (fds[i] &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+		seen_cnt = get_seen_count(fds[i], counts, counts_len);</div><div class='add'>+		if (seen_cnt &amp;&amp; ASSERT_EQ(seen_cnt, 1, "seen_cnt"))</div><div class='add'>+			seen_once++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(seen_once, n, "seen_once");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int accept_from_one(struct pollfd *server_poll_fds,</div><div class='add'>+			   int server_poll_fds_len)</div><div class='add'>+{</div><div class='add'>+	static const int poll_timeout_ms = 5000; /* 5s */</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ret = poll(server_poll_fds, server_poll_fds_len, poll_timeout_ms);</div><div class='add'>+	if (!ASSERT_EQ(ret, 1, "poll"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; server_poll_fds_len; i++)</div><div class='add'>+		if (server_poll_fds[i].revents &amp; POLLIN)</div><div class='add'>+			return accept(server_poll_fds[i].fd, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int *connect_to_server(int family, int sock_type, const char *addr,</div><div class='add'>+			      __u16 port, int nr_connects, int *server_fds,</div><div class='add'>+			      int server_fds_len)</div><div class='add'>+{</div><div class='add'>+	struct pollfd *server_poll_fds = NULL;</div><div class='add'>+	int *established_socks = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	server_poll_fds = calloc(server_fds_len, sizeof(*server_poll_fds));</div><div class='add'>+	if (!ASSERT_OK_PTR(server_poll_fds, "server_poll_fds"))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; server_fds_len; i++) {</div><div class='add'>+		server_poll_fds[i].fd = server_fds[i];</div><div class='add'>+		server_poll_fds[i].events = POLLIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+</div><div class='add'>+	established_socks = malloc(sizeof(*established_socks) * nr_connects*2);</div><div class='add'>+	if (!ASSERT_OK_PTR(established_socks, "established_socks"))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	while (nr_connects--) {</div><div class='add'>+		established_socks[i] = connect_to_addr_str(family, sock_type,</div><div class='add'>+							   addr, port, NULL);</div><div class='add'>+		if (!ASSERT_OK_FD(established_socks[i], "connect_to_addr_str"))</div><div class='add'>+			goto error;</div><div class='add'>+		i++;</div><div class='add'>+		established_socks[i] = accept_from_one(server_poll_fds,</div><div class='add'>+						       server_fds_len);</div><div class='add'>+		if (!ASSERT_OK_FD(established_socks[i], "accept_from_one"))</div><div class='add'>+			goto error;</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	free(server_poll_fds);</div><div class='add'>+	return established_socks;</div><div class='add'>+error:</div><div class='add'>+	free_fds(established_socks, i);</div><div class='add'>+	free(server_poll_fds);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_seen(int family, int sock_type, const char *addr, __u16 port,</div><div class='add'>+			int *socks, int socks_len, int *established_socks,</div><div class='add'>+			int established_socks_len, struct sock_count *counts,</div><div class='add'>+			int counts_len, struct bpf_link *link, int iter_fd)</div><div class='add'>+{</div><div class='add'>+	int close_idx;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the first socks_len - 1 sockets. */</div><div class='add'>+	read_n(iter_fd, socks_len - 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure we saw socks_len - 1 sockets exactly once. */</div><div class='add'>+	check_n_were_seen_once(socks, socks_len, socks_len - 1, counts,</div><div class='add'>+			       counts_len);</div><div class='add'>+</div><div class='add'>+	/* Close a socket we've already seen to remove it from the bucket. */</div><div class='add'>+	close_idx = get_seen_socket(socks, counts, counts_len);</div><div class='add'>+	if (!ASSERT_GE(close_idx, 0, "close_idx"))</div><div class='add'>+		return;</div><div class='add'>+	close(socks[close_idx]);</div><div class='add'>+	socks[close_idx] = -1;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the rest of the sockets. */</div><div class='add'>+	read_n(iter_fd, -1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure the last socket wasn't skipped and that there were no</div><div class='add'>+	 * repeats.</div><div class='add'>+	 */</div><div class='add'>+	check_n_were_seen_once(socks, socks_len, socks_len - 1, counts,</div><div class='add'>+			       counts_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_seen_established(int family, int sock_type, const char *addr,</div><div class='add'>+				    __u16 port, int *listen_socks,</div><div class='add'>+				    int listen_socks_len, int *established_socks,</div><div class='add'>+				    int established_socks_len,</div><div class='add'>+				    struct sock_count *counts, int counts_len,</div><div class='add'>+				    struct bpf_link *link, int iter_fd)</div><div class='add'>+{</div><div class='add'>+	int close_idx;</div><div class='add'>+</div><div class='add'>+	/* Iterate through all listening sockets. */</div><div class='add'>+	read_n(iter_fd, listen_socks_len, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure we saw all listening sockets exactly once. */</div><div class='add'>+	check_n_were_seen_once(listen_socks, listen_socks_len, listen_socks_len,</div><div class='add'>+			       counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Leave one established socket. */</div><div class='add'>+	read_n(iter_fd, established_socks_len - 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Close a socket we've already seen to remove it from the bucket. */</div><div class='add'>+	close_idx = get_nth_socket(established_socks, established_socks_len,</div><div class='add'>+				   link, listen_socks_len + 1);</div><div class='add'>+	if (!ASSERT_GE(close_idx, 0, "close_idx"))</div><div class='add'>+		return;</div><div class='add'>+	destroy(established_socks[close_idx]);</div><div class='add'>+	established_socks[close_idx] = -1;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the rest of the sockets. */</div><div class='add'>+	read_n(iter_fd, -1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure the last socket wasn't skipped and that there were no</div><div class='add'>+	 * repeats.</div><div class='add'>+	 */</div><div class='add'>+	check_n_were_seen_once(established_socks, established_socks_len,</div><div class='add'>+			       established_socks_len - 1, counts, counts_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_unseen(int family, int sock_type, const char *addr,</div><div class='add'>+			  __u16 port, int *socks, int socks_len,</div><div class='add'>+			  int *established_socks, int established_socks_len,</div><div class='add'>+			  struct sock_count *counts, int counts_len,</div><div class='add'>+			  struct bpf_link *link, int iter_fd)</div><div class='add'>+{</div><div class='add'>+	int close_idx;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the first socket. */</div><div class='add'>+	read_n(iter_fd, 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure we saw a socket from fds. */</div><div class='add'>+	check_n_were_seen_once(socks, socks_len, 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Close what would be the next socket in the bucket to exercise the</div><div class='add'>+	 * condition where we need to skip past the first cookie we remembered.</div><div class='add'>+	 */</div><div class='add'>+	close_idx = get_nth_socket(socks, socks_len, link, 1);</div><div class='add'>+	if (!ASSERT_GE(close_idx, 0, "close_idx"))</div><div class='add'>+		return;</div><div class='add'>+	close(socks[close_idx]);</div><div class='add'>+	socks[close_idx] = -1;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the rest of the sockets. */</div><div class='add'>+	read_n(iter_fd, -1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure the remaining sockets were seen exactly once and that we</div><div class='add'>+	 * didn't repeat the socket that was already seen.</div><div class='add'>+	 */</div><div class='add'>+	check_n_were_seen_once(socks, socks_len, socks_len - 1, counts,</div><div class='add'>+			       counts_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_unseen_established(int family, int sock_type,</div><div class='add'>+				      const char *addr, __u16 port,</div><div class='add'>+				      int *listen_socks, int listen_socks_len,</div><div class='add'>+				      int *established_socks,</div><div class='add'>+				      int established_socks_len,</div><div class='add'>+				      struct sock_count *counts, int counts_len,</div><div class='add'>+				      struct bpf_link *link, int iter_fd)</div><div class='add'>+{</div><div class='add'>+	int close_idx;</div><div class='add'>+</div><div class='add'>+	/* Iterate through all listening sockets. */</div><div class='add'>+	read_n(iter_fd, listen_socks_len, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure we saw all listening sockets exactly once. */</div><div class='add'>+	check_n_were_seen_once(listen_socks, listen_socks_len, listen_socks_len,</div><div class='add'>+			       counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Iterate through the first established socket. */</div><div class='add'>+	read_n(iter_fd, 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure we saw one established socks. */</div><div class='add'>+	check_n_were_seen_once(established_socks, established_socks_len, 1,</div><div class='add'>+			       counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Close what would be the next socket in the bucket to exercise the</div><div class='add'>+	 * condition where we need to skip past the first cookie we remembered.</div><div class='add'>+	 */</div><div class='add'>+	close_idx = get_nth_socket(established_socks, established_socks_len,</div><div class='add'>+				   link, listen_socks_len + 1);</div><div class='add'>+	if (!ASSERT_GE(close_idx, 0, "close_idx"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	destroy(established_socks[close_idx]);</div><div class='add'>+	established_socks[close_idx] = -1;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the rest of the sockets. */</div><div class='add'>+	read_n(iter_fd, -1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure the remaining sockets were seen exactly once and that we</div><div class='add'>+	 * didn't repeat the socket that was already seen.</div><div class='add'>+	 */</div><div class='add'>+	check_n_were_seen_once(established_socks, established_socks_len,</div><div class='add'>+			       established_socks_len - 1, counts, counts_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_all(int family, int sock_type, const char *addr,</div><div class='add'>+		       __u16 port, int *socks, int socks_len,</div><div class='add'>+		       int *established_socks, int established_socks_len,</div><div class='add'>+		       struct sock_count *counts, int counts_len,</div><div class='add'>+		       struct bpf_link *link, int iter_fd)</div><div class='add'>+{</div><div class='add'>+	int close_idx, i;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the first socket. */</div><div class='add'>+	read_n(iter_fd, 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure we saw a socket from fds. */</div><div class='add'>+	check_n_were_seen_once(socks, socks_len, 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Close all remaining sockets to exhaust the list of saved cookies and</div><div class='add'>+	 * exit without putting any sockets into the batch on the next read.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; socks_len - 1; i++) {</div><div class='add'>+		close_idx = get_nth_socket(socks, socks_len, link, 1);</div><div class='add'>+		if (!ASSERT_GE(close_idx, 0, "close_idx"))</div><div class='add'>+			return;</div><div class='add'>+		close(socks[close_idx]);</div><div class='add'>+		socks[close_idx] = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure there are no more sockets returned */</div><div class='add'>+	ASSERT_EQ(read_n(iter_fd, -1, counts, counts_len), 0, "read_n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_all_established(int family, int sock_type, const char *addr,</div><div class='add'>+				   __u16 port, int *listen_socks,</div><div class='add'>+				   int listen_socks_len, int *established_socks,</div><div class='add'>+				   int established_socks_len,</div><div class='add'>+				   struct sock_count *counts, int counts_len,</div><div class='add'>+				   struct bpf_link *link, int iter_fd)</div><div class='add'>+{</div><div class='add'>+	int *close_idx = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Iterate through all listening sockets. */</div><div class='add'>+	read_n(iter_fd, listen_socks_len, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure we saw all listening sockets exactly once. */</div><div class='add'>+	check_n_were_seen_once(listen_socks, listen_socks_len, listen_socks_len,</div><div class='add'>+			       counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Iterate through the first established socket. */</div><div class='add'>+	read_n(iter_fd, 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure we saw one established socks. */</div><div class='add'>+	check_n_were_seen_once(established_socks, established_socks_len, 1,</div><div class='add'>+			       counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Close all remaining sockets to exhaust the list of saved cookies and</div><div class='add'>+	 * exit without putting any sockets into the batch on the next read.</div><div class='add'>+	 */</div><div class='add'>+	close_idx = malloc(sizeof(int) * (established_socks_len - 1));</div><div class='add'>+	if (!ASSERT_OK_PTR(close_idx, "close_idx malloc"))</div><div class='add'>+		return;</div><div class='add'>+	for (i = 0; i &lt; established_socks_len - 1; i++) {</div><div class='add'>+		close_idx[i] = get_nth_socket(established_socks,</div><div class='add'>+					      established_socks_len, link,</div><div class='add'>+					      listen_socks_len + i);</div><div class='add'>+		if (!ASSERT_GE(close_idx[i], 0, "close_idx"))</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; established_socks_len - 1; i++) {</div><div class='add'>+		destroy(established_socks[close_idx[i]]);</div><div class='add'>+		established_socks[close_idx[i]] = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure there are no more sockets returned */</div><div class='add'>+	ASSERT_EQ(read_n(iter_fd, -1, counts, counts_len), 0, "read_n");</div><div class='add'>+	free(close_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_some(int family, int sock_type, const char *addr, __u16 port,</div><div class='add'>+		     int *socks, int socks_len, int *established_socks,</div><div class='add'>+		     int established_socks_len, struct sock_count *counts,</div><div class='add'>+		     int counts_len, struct bpf_link *link, int iter_fd)</div><div class='add'>+{</div><div class='add'>+	int *new_socks = NULL;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the first socks_len - 1 sockets. */</div><div class='add'>+	read_n(iter_fd, socks_len - 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure we saw socks_len - 1 sockets exactly once. */</div><div class='add'>+	check_n_were_seen_once(socks, socks_len, socks_len - 1, counts,</div><div class='add'>+			       counts_len);</div><div class='add'>+</div><div class='add'>+	/* Double the number of sockets in the bucket. */</div><div class='add'>+	new_socks = start_reuseport_server(family, sock_type, addr, port, 0,</div><div class='add'>+					   socks_len);</div><div class='add'>+	if (!ASSERT_OK_PTR(new_socks, "start_reuseport_server"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the rest of the sockets. */</div><div class='add'>+	read_n(iter_fd, -1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure each of the original sockets was seen exactly once. */</div><div class='add'>+	check_n_were_seen_once(socks, socks_len, socks_len, counts,</div><div class='add'>+			       counts_len);</div><div class='add'>+done:</div><div class='add'>+	free_fds(new_socks, socks_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_some_established(int family, int sock_type, const char *addr,</div><div class='add'>+				 __u16 port, int *listen_socks,</div><div class='add'>+				 int listen_socks_len, int *established_socks,</div><div class='add'>+				 int established_socks_len,</div><div class='add'>+				 struct sock_count *counts,</div><div class='add'>+				 int counts_len, struct bpf_link *link,</div><div class='add'>+				 int iter_fd)</div><div class='add'>+{</div><div class='add'>+	int *new_socks = NULL;</div><div class='add'>+</div><div class='add'>+	/* Iterate through all listening sockets. */</div><div class='add'>+	read_n(iter_fd, listen_socks_len, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure we saw all listening sockets exactly once. */</div><div class='add'>+	check_n_were_seen_once(listen_socks, listen_socks_len, listen_socks_len,</div><div class='add'>+			       counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Iterate through the first established_socks_len - 1 sockets. */</div><div class='add'>+	read_n(iter_fd, established_socks_len - 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure we saw established_socks_len - 1 sockets exactly once. */</div><div class='add'>+	check_n_were_seen_once(established_socks, established_socks_len,</div><div class='add'>+			       established_socks_len - 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Double the number of established sockets in the bucket. */</div><div class='add'>+	new_socks = connect_to_server(family, sock_type, addr, port,</div><div class='add'>+				      established_socks_len / 2, listen_socks,</div><div class='add'>+				      listen_socks_len);</div><div class='add'>+	if (!ASSERT_OK_PTR(new_socks, "connect_to_server"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the rest of the sockets. */</div><div class='add'>+	read_n(iter_fd, -1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure each of the original sockets was seen exactly once. */</div><div class='add'>+	check_n_were_seen_once(listen_socks, listen_socks_len, listen_socks_len,</div><div class='add'>+			       counts, counts_len);</div><div class='add'>+	check_n_were_seen_once(established_socks, established_socks_len,</div><div class='add'>+			       established_socks_len, counts, counts_len);</div><div class='add'>+done:</div><div class='add'>+	free_fds(new_socks, established_socks_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void force_realloc(int family, int sock_type, const char *addr,</div><div class='add'>+			  __u16 port, int *socks, int socks_len,</div><div class='add'>+			  int *established_socks, int established_socks_len,</div><div class='add'>+			  struct sock_count *counts, int counts_len,</div><div class='add'>+			  struct bpf_link *link, int iter_fd)</div><div class='add'>+{</div><div class='add'>+	int *new_socks = NULL;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the first socket just to initialize the batch. */</div><div class='add'>+	read_n(iter_fd, 1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Double the number of sockets in the bucket to force a realloc on the</div><div class='add'>+	 * next read.</div><div class='add'>+	 */</div><div class='add'>+	new_socks = start_reuseport_server(family, sock_type, addr, port, 0,</div><div class='add'>+					   socks_len);</div><div class='add'>+	if (!ASSERT_OK_PTR(new_socks, "start_reuseport_server"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the rest of the sockets. */</div><div class='add'>+	read_n(iter_fd, -1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure each socket from the first set was seen exactly once. */</div><div class='add'>+	check_n_were_seen_once(socks, socks_len, socks_len, counts,</div><div class='add'>+			       counts_len);</div><div class='add'>+done:</div><div class='add'>+	free_fds(new_socks, socks_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void force_realloc_established(int family, int sock_type,</div><div class='add'>+				      const char *addr, __u16 port,</div><div class='add'>+				      int *listen_socks, int listen_socks_len,</div><div class='add'>+				      int *established_socks,</div><div class='add'>+				      int established_socks_len,</div><div class='add'>+				      struct sock_count *counts, int counts_len,</div><div class='add'>+				      struct bpf_link *link, int iter_fd)</div><div class='add'>+{</div><div class='add'>+	/* Iterate through all sockets to trigger a realloc. */</div><div class='add'>+	read_n(iter_fd, -1, counts, counts_len);</div><div class='add'>+</div><div class='add'>+	/* Make sure each socket was seen exactly once. */</div><div class='add'>+	check_n_were_seen_once(listen_socks, listen_socks_len, listen_socks_len,</div><div class='add'>+			       counts, counts_len);</div><div class='add'>+	check_n_were_seen_once(established_socks, established_socks_len,</div><div class='add'>+			       established_socks_len, counts, counts_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct test_case {</div><div class='add'>+	void (*test)(int family, int sock_type, const char *addr, __u16 port,</div><div class='add'>+		     int *socks, int socks_len, int *established_socks,</div><div class='add'>+		     int established_socks_len, struct sock_count *counts,</div><div class='add'>+		     int counts_len, struct bpf_link *link, int iter_fd);</div><div class='add'>+	const char *description;</div><div class='add'>+	int ehash_buckets;</div><div class='add'>+	int connections;</div><div class='add'>+	int init_socks;</div><div class='add'>+	int max_socks;</div><div class='add'>+	int sock_type;</div><div class='add'>+	int family;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct test_case resume_tests[] = {</div><div class='add'>+	{</div><div class='add'>+		.description = "udp: resume after removing a seen socket",</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		.max_socks = nr_soreuse,</div><div class='add'>+		.sock_type = SOCK_DGRAM,</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = remove_seen,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "udp: resume after removing one unseen socket",</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		.max_socks = nr_soreuse,</div><div class='add'>+		.sock_type = SOCK_DGRAM,</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = remove_unseen,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "udp: resume after removing all unseen sockets",</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		.max_socks = nr_soreuse,</div><div class='add'>+		.sock_type = SOCK_DGRAM,</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = remove_all,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "udp: resume after adding a few sockets",</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		.max_socks = nr_soreuse,</div><div class='add'>+		.sock_type = SOCK_DGRAM,</div><div class='add'>+		/* Use AF_INET so that new sockets are added to the head of the</div><div class='add'>+		 * bucket's list.</div><div class='add'>+		 */</div><div class='add'>+		.family = AF_INET,</div><div class='add'>+		.test = add_some,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "udp: force a realloc to occur",</div><div class='add'>+		.init_socks = init_batch_size,</div><div class='add'>+		.max_socks = init_batch_size * 2,</div><div class='add'>+		.sock_type = SOCK_DGRAM,</div><div class='add'>+		/* Use AF_INET6 so that new sockets are added to the tail of the</div><div class='add'>+		 * bucket's list, needing to be added to the next batch to force</div><div class='add'>+		 * a realloc.</div><div class='add'>+		 */</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = force_realloc,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "tcp: resume after removing a seen socket (listening)",</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		.max_socks = nr_soreuse,</div><div class='add'>+		.sock_type = SOCK_STREAM,</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = remove_seen,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "tcp: resume after removing one unseen socket (listening)",</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		.max_socks = nr_soreuse,</div><div class='add'>+		.sock_type = SOCK_STREAM,</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = remove_unseen,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "tcp: resume after removing all unseen sockets (listening)",</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		.max_socks = nr_soreuse,</div><div class='add'>+		.sock_type = SOCK_STREAM,</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = remove_all,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "tcp: resume after adding a few sockets (listening)",</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		.max_socks = nr_soreuse,</div><div class='add'>+		.sock_type = SOCK_STREAM,</div><div class='add'>+		/* Use AF_INET so that new sockets are added to the head of the</div><div class='add'>+		 * bucket's list.</div><div class='add'>+		 */</div><div class='add'>+		.family = AF_INET,</div><div class='add'>+		.test = add_some,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "tcp: force a realloc to occur (listening)",</div><div class='add'>+		.init_socks = init_batch_size,</div><div class='add'>+		.max_socks = init_batch_size * 2,</div><div class='add'>+		.sock_type = SOCK_STREAM,</div><div class='add'>+		/* Use AF_INET6 so that new sockets are added to the tail of the</div><div class='add'>+		 * bucket's list, needing to be added to the next batch to force</div><div class='add'>+		 * a realloc.</div><div class='add'>+		 */</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = force_realloc,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "tcp: resume after removing a seen socket (established)",</div><div class='add'>+		/* Force all established sockets into one bucket */</div><div class='add'>+		.ehash_buckets = 1,</div><div class='add'>+		.connections = nr_soreuse,</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		/* Room for connect()ed and accept()ed sockets */</div><div class='add'>+		.max_socks = nr_soreuse * 3,</div><div class='add'>+		.sock_type = SOCK_STREAM,</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = remove_seen_established,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "tcp: resume after removing one unseen socket (established)",</div><div class='add'>+		/* Force all established sockets into one bucket */</div><div class='add'>+		.ehash_buckets = 1,</div><div class='add'>+		.connections = nr_soreuse,</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		/* Room for connect()ed and accept()ed sockets */</div><div class='add'>+		.max_socks = nr_soreuse * 3,</div><div class='add'>+		.sock_type = SOCK_STREAM,</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = remove_unseen_established,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "tcp: resume after removing all unseen sockets (established)",</div><div class='add'>+		/* Force all established sockets into one bucket */</div><div class='add'>+		.ehash_buckets = 1,</div><div class='add'>+		.connections = nr_soreuse,</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		/* Room for connect()ed and accept()ed sockets */</div><div class='add'>+		.max_socks = nr_soreuse * 3,</div><div class='add'>+		.sock_type = SOCK_STREAM,</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = remove_all_established,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "tcp: resume after adding a few sockets (established)",</div><div class='add'>+		/* Force all established sockets into one bucket */</div><div class='add'>+		.ehash_buckets = 1,</div><div class='add'>+		.connections = nr_soreuse,</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		/* Room for connect()ed and accept()ed sockets */</div><div class='add'>+		.max_socks = nr_soreuse * 3,</div><div class='add'>+		.sock_type = SOCK_STREAM,</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = add_some_established,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.description = "tcp: force a realloc to occur (established)",</div><div class='add'>+		/* Force all established sockets into one bucket */</div><div class='add'>+		.ehash_buckets = 1,</div><div class='add'>+		/* Bucket size will need to double when going from listening to</div><div class='add'>+		 * established sockets.</div><div class='add'>+		 */</div><div class='add'>+		.connections = init_batch_size,</div><div class='add'>+		.init_socks = nr_soreuse,</div><div class='add'>+		/* Room for connect()ed and accept()ed sockets */</div><div class='add'>+		.max_socks = nr_soreuse + (init_batch_size * 2),</div><div class='add'>+		.sock_type = SOCK_STREAM,</div><div class='add'>+		.family = AF_INET6,</div><div class='add'>+		.test = force_realloc_established,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void do_resume_test(struct test_case *tc)</div><div class='add'>+{</div><div class='add'>+	struct sock_iter_batch *skel = NULL;</div><div class='add'>+	struct sock_count *counts = NULL;</div><div class='add'>+	static const __u16 port = 10001;</div><div class='add'>+	struct nstoken *nstoken = NULL;</div><div class='add'>+	struct bpf_link *link = NULL;</div><div class='add'>+	int *established_fds = NULL;</div><div class='add'>+	int err, iter_fd = -1;</div><div class='add'>+	const char *addr;</div><div class='add'>+	int *fds = NULL;</div><div class='add'>+</div><div class='add'>+	if (tc-&gt;ehash_buckets) {</div><div class='add'>+		SYS_NOFAIL("ip netns del " TEST_CHILD_NS);</div><div class='add'>+		SYS(done, "sysctl -wq net.ipv4.tcp_child_ehash_entries=%d",</div><div class='add'>+		    tc-&gt;ehash_buckets);</div><div class='add'>+		SYS(done, "ip netns add %s", TEST_CHILD_NS);</div><div class='add'>+		SYS(done, "ip -net %s link set dev lo up", TEST_CHILD_NS);</div><div class='add'>+		nstoken = open_netns(TEST_CHILD_NS);</div><div class='add'>+		if (!ASSERT_OK_PTR(nstoken, "open_child_netns"))</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	counts = calloc(tc-&gt;max_socks, sizeof(*counts));</div><div class='add'>+	if (!ASSERT_OK_PTR(counts, "counts"))</div><div class='add'>+		goto done;</div><div class='add'>+	skel = sock_iter_batch__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "sock_iter_batch__open"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Prepare a bucket of sockets in the kernel hashtable */</div><div class='add'>+	addr = tc-&gt;family == AF_INET6 ? "::1" : "127.0.0.1";</div><div class='add'>+	fds = start_reuseport_server(tc-&gt;family, tc-&gt;sock_type, addr, port, 0,</div><div class='add'>+				     tc-&gt;init_socks);</div><div class='add'>+	if (!ASSERT_OK_PTR(fds, "start_reuseport_server"))</div><div class='add'>+		goto done;</div><div class='add'>+	if (tc-&gt;connections) {</div><div class='add'>+		established_fds = connect_to_server(tc-&gt;family, tc-&gt;sock_type,</div><div class='add'>+						    addr, port,</div><div class='add'>+						    tc-&gt;connections, fds,</div><div class='add'>+						    tc-&gt;init_socks);</div><div class='add'>+		if (!ASSERT_OK_PTR(established_fds, "connect_to_server"))</div><div class='add'>+			goto done;</div><div class='add'>+	}</div><div class='add'>+	skel-&gt;rodata-&gt;ports[0] = 0;</div><div class='add'>+	skel-&gt;rodata-&gt;ports[1] = 0;</div><div class='add'>+	skel-&gt;rodata-&gt;sf = tc-&gt;family;</div><div class='add'>+	skel-&gt;rodata-&gt;ss = 0;</div><div class='add'>+</div><div class='add'>+	err = sock_iter_batch__load(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "sock_iter_batch__load"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach_iter(tc-&gt;sock_type == SOCK_STREAM ?</div><div class='add'>+					skel-&gt;progs.iter_tcp_soreuse :</div><div class='add'>+					skel-&gt;progs.iter_udp_soreuse,</div><div class='add'>+					NULL);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "bpf_program__attach_iter"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	iter_fd = bpf_iter_create(bpf_link__fd(link));</div><div class='add'>+	if (!ASSERT_OK_FD(iter_fd, "bpf_iter_create"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	tc-&gt;test(tc-&gt;family, tc-&gt;sock_type, addr, port, fds, tc-&gt;init_socks,</div><div class='add'>+		 established_fds, tc-&gt;connections*2, counts, tc-&gt;max_socks,</div><div class='add'>+		 link, iter_fd);</div><div class='add'>+done:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	SYS_NOFAIL("ip netns del " TEST_CHILD_NS);</div><div class='add'>+	SYS_NOFAIL("sysctl -w net.ipv4.tcp_child_ehash_entries=0");</div><div class='add'>+	free(counts);</div><div class='add'>+	free_fds(fds, tc-&gt;init_socks);</div><div class='add'>+	free_fds(established_fds, tc-&gt;connections*2);</div><div class='add'>+	if (iter_fd &gt;= 0)</div><div class='add'>+		close(iter_fd);</div><div class='add'>+	bpf_link__destroy(link);</div><div class='add'>+	sock_iter_batch__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_resume_tests(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(resume_tests); i++) {</div><div class='add'>+		if (test__start_subtest(resume_tests[i].description)) {</div><div class='add'>+			do_resume_test(&amp;resume_tests[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void do_test(int sock_type, bool onebyone)</div><div class='ctx'> {</div><div class='ctx'> 	int err, i, nread, to_read, total_read, iter_fd = -1;</div><div class='del'>-	int first_idx, second_idx, indices[nr_soreuse];</div><div class='add'>+	struct iter_out outputs[nr_soreuse];</div><div class='ctx'> 	struct bpf_link *link = NULL;</div><div class='ctx'> 	struct sock_iter_batch *skel;</div><div class='add'>+	int first_idx, second_idx;</div><div class='ctx'> 	int *fds[2] = {};</div><div class='ctx'> </div><div class='ctx'> 	skel = sock_iter_batch__open();</div><div class='hunk'>@@ -34,6 +889,9 @@ static void do_test(int sock_type, bool onebyone)</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		skel-&gt;rodata-&gt;ports[i] = ntohs(local_port);</div><div class='ctx'> 	}</div><div class='add'>+	skel-&gt;rodata-&gt;sf = AF_INET6;</div><div class='add'>+	if (sock_type == SOCK_STREAM)</div><div class='add'>+		skel-&gt;rodata-&gt;ss = TCP_LISTEN;</div><div class='ctx'> </div><div class='ctx'> 	err = sock_iter_batch__load(skel);</div><div class='ctx'> 	if (!ASSERT_OK(err, "sock_iter_batch__load"))</div><div class='hunk'>@@ -55,38 +913,38 @@ static void do_test(int sock_type, bool onebyone)</div><div class='ctx'> 	 * from a bucket and leave one socket out from</div><div class='ctx'> 	 * that bucket on purpose.</div><div class='ctx'> 	 */</div><div class='del'>-	to_read = (nr_soreuse - 1) * sizeof(*indices);</div><div class='add'>+	to_read = (nr_soreuse - 1) * sizeof(*outputs);</div><div class='ctx'> 	total_read = 0;</div><div class='ctx'> 	first_idx = -1;</div><div class='ctx'> 	do {</div><div class='del'>-		nread = read(iter_fd, indices, onebyone ? sizeof(*indices) : to_read);</div><div class='del'>-		if (nread &lt;= 0 || nread % sizeof(*indices))</div><div class='add'>+		nread = read(iter_fd, outputs, onebyone ? sizeof(*outputs) : to_read);</div><div class='add'>+		if (nread &lt;= 0 || nread % sizeof(*outputs))</div><div class='ctx'> 			break;</div><div class='ctx'> 		total_read += nread;</div><div class='ctx'> </div><div class='ctx'> 		if (first_idx == -1)</div><div class='del'>-			first_idx = indices[0];</div><div class='del'>-		for (i = 0; i &lt; nread / sizeof(*indices); i++)</div><div class='del'>-			ASSERT_EQ(indices[i], first_idx, "first_idx");</div><div class='add'>+			first_idx = outputs[0].idx;</div><div class='add'>+		for (i = 0; i &lt; nread / sizeof(*outputs); i++)</div><div class='add'>+			ASSERT_EQ(outputs[i].idx, first_idx, "first_idx");</div><div class='ctx'> 	} while (total_read &lt; to_read);</div><div class='del'>-	ASSERT_EQ(nread, onebyone ? sizeof(*indices) : to_read, "nread");</div><div class='add'>+	ASSERT_EQ(nread, onebyone ? sizeof(*outputs) : to_read, "nread");</div><div class='ctx'> 	ASSERT_EQ(total_read, to_read, "total_read");</div><div class='ctx'> </div><div class='ctx'> 	free_fds(fds[first_idx], nr_soreuse);</div><div class='ctx'> 	fds[first_idx] = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the "whole" second bucket */</div><div class='del'>-	to_read = nr_soreuse * sizeof(*indices);</div><div class='add'>+	to_read = nr_soreuse * sizeof(*outputs);</div><div class='ctx'> 	total_read = 0;</div><div class='ctx'> 	second_idx = !first_idx;</div><div class='ctx'> 	do {</div><div class='del'>-		nread = read(iter_fd, indices, onebyone ? sizeof(*indices) : to_read);</div><div class='del'>-		if (nread &lt;= 0 || nread % sizeof(*indices))</div><div class='add'>+		nread = read(iter_fd, outputs, onebyone ? sizeof(*outputs) : to_read);</div><div class='add'>+		if (nread &lt;= 0 || nread % sizeof(*outputs))</div><div class='ctx'> 			break;</div><div class='ctx'> 		total_read += nread;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; nread / sizeof(*indices); i++)</div><div class='del'>-			ASSERT_EQ(indices[i], second_idx, "second_idx");</div><div class='add'>+		for (i = 0; i &lt; nread / sizeof(*outputs); i++)</div><div class='add'>+			ASSERT_EQ(outputs[i].idx, second_idx, "second_idx");</div><div class='ctx'> 	} while (total_read &lt;= to_read);</div><div class='ctx'> 	ASSERT_EQ(nread, 0, "nread");</div><div class='ctx'> 	/* Both so_reuseport ports should be in different buckets, so</div><div class='hunk'>@@ -128,6 +986,7 @@ void test_sock_iter_batch(void)</div><div class='ctx'> 		do_test(SOCK_DGRAM, true);</div><div class='ctx'> 		do_test(SOCK_DGRAM, false);</div><div class='ctx'> 	}</div><div class='add'>+	do_resume_tests();</div><div class='ctx'> 	close_netns(nstoken);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/socket_helpers.h b/tools/testing/selftests/bpf/prog_tests/socket_helpers.h<br/>index 1bdfb79ef009..0d59503a0c73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/socket_helpers.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/socket_helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/socket_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/socket_helpers.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #ifndef __SOCKET_HELPERS__</div><div class='ctx'> #define __SOCKET_HELPERS__</div><div class='ctx'> </div><div class='add'>+#include &lt;sys/un.h&gt;</div><div class='ctx'> #include &lt;linux/vm_sockets.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* include/linux/net.h */</div><div class='hunk'>@@ -16,11 +17,16 @@</div><div class='ctx'> #define VMADDR_CID_LOCAL 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* include/linux/compiler_types.h */</div><div class='add'>+#if __STDC_VERSION__ &lt; 202311L &amp;&amp; !defined(auto)</div><div class='add'>+# define auto __auto_type</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* include/linux/cleanup.h */</div><div class='ctx'> #define __get_and_null(p, nullvalue)                                           \</div><div class='ctx'> 	({                                                                     \</div><div class='del'>-		__auto_type __ptr = &amp;(p);                                      \</div><div class='del'>-		__auto_type __val = *__ptr;                                    \</div><div class='add'>+		auto __ptr = &amp;(p);					       \</div><div class='add'>+		auto __val = *__ptr;                                           \</div><div class='ctx'> 		*__ptr = nullvalue;                                            \</div><div class='ctx'> 		__val;                                                         \</div><div class='ctx'> 	})</div><div class='hunk'>@@ -169,6 +175,15 @@ static inline void init_addr_loopback6(struct sockaddr_storage *ss,</div><div class='ctx'> 	*len = sizeof(*addr6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void init_addr_loopback_unix(struct sockaddr_storage *ss,</div><div class='add'>+					   socklen_t *len)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_un *addr = memset(ss, 0, sizeof(*ss));</div><div class='add'>+</div><div class='add'>+	addr-&gt;sun_family = AF_UNIX;</div><div class='add'>+	*len = sizeof(sa_family_t);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void init_addr_loopback_vsock(struct sockaddr_storage *ss,</div><div class='ctx'> 					    socklen_t *len)</div><div class='ctx'> {</div><div class='hunk'>@@ -190,6 +205,9 @@ static inline void init_addr_loopback(int family, struct sockaddr_storage *ss,</div><div class='ctx'> 	case AF_INET6:</div><div class='ctx'> 		init_addr_loopback6(ss, len);</div><div class='ctx'> 		return;</div><div class='add'>+	case AF_UNIX:</div><div class='add'>+		init_addr_loopback_unix(ss, len);</div><div class='add'>+		return;</div><div class='ctx'> 	case AF_VSOCK:</div><div class='ctx'> 		init_addr_loopback_vsock(ss, len);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -315,21 +333,27 @@ static inline int create_pair(int family, int sotype, int *p0, int *p1)</div><div class='ctx'> {</div><div class='ctx'> 	__close_fd int s, c = -1, p = -1;</div><div class='ctx'> 	struct sockaddr_storage addr;</div><div class='del'>-	socklen_t len = sizeof(addr);</div><div class='add'>+	socklen_t len;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	s = socket_loopback(family, sotype);</div><div class='ctx'> 	if (s &lt; 0)</div><div class='ctx'> 		return s;</div><div class='ctx'> </div><div class='del'>-	err = xgetsockname(s, sockaddr(&amp;addr), &amp;len);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	c = xsocket(family, sotype, 0);</div><div class='ctx'> 	if (c &lt; 0)</div><div class='ctx'> 		return c;</div><div class='ctx'> </div><div class='add'>+	init_addr_loopback(family, &amp;addr, &amp;len);</div><div class='add'>+	err = xbind(c, sockaddr(&amp;addr), len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	len = sizeof(addr);</div><div class='add'>+	err = xgetsockname(s, sockaddr(&amp;addr), &amp;len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	err = connect(c, sockaddr(&amp;addr), len);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (errno != EINPROGRESS) {</div><div class='hunk'>@@ -391,4 +415,59 @@ static inline int create_socket_pairs(int family, int sotype, int *c0, int *c1,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline const char *socket_kind_to_str(int sock_fd)</div><div class='add'>+{</div><div class='add'>+	socklen_t opt_len;</div><div class='add'>+	int domain, type;</div><div class='add'>+</div><div class='add'>+	opt_len = sizeof(domain);</div><div class='add'>+	if (getsockopt(sock_fd, SOL_SOCKET, SO_DOMAIN, &amp;domain, &amp;opt_len))</div><div class='add'>+		FAIL_ERRNO("getsockopt(SO_DOMAIN)");</div><div class='add'>+</div><div class='add'>+	opt_len = sizeof(type);</div><div class='add'>+	if (getsockopt(sock_fd, SOL_SOCKET, SO_TYPE, &amp;type, &amp;opt_len))</div><div class='add'>+		FAIL_ERRNO("getsockopt(SO_TYPE)");</div><div class='add'>+</div><div class='add'>+	switch (domain) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		switch (type) {</div><div class='add'>+		case SOCK_STREAM:</div><div class='add'>+			return "tcp4";</div><div class='add'>+		case SOCK_DGRAM:</div><div class='add'>+			return "udp4";</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		switch (type) {</div><div class='add'>+		case SOCK_STREAM:</div><div class='add'>+			return "tcp6";</div><div class='add'>+		case SOCK_DGRAM:</div><div class='add'>+			return "udp6";</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case AF_UNIX:</div><div class='add'>+		switch (type) {</div><div class='add'>+		case SOCK_STREAM:</div><div class='add'>+			return "u_str";</div><div class='add'>+		case SOCK_DGRAM:</div><div class='add'>+			return "u_dgr";</div><div class='add'>+		case SOCK_SEQPACKET:</div><div class='add'>+			return "u_seq";</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case AF_VSOCK:</div><div class='add'>+		switch (type) {</div><div class='add'>+		case SOCK_STREAM:</div><div class='add'>+			return "v_str";</div><div class='add'>+		case SOCK_DGRAM:</div><div class='add'>+			return "v_dgr";</div><div class='add'>+		case SOCK_SEQPACKET:</div><div class='add'>+			return "v_seq";</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "???";</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif // __SOCKET_HELPERS__</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c<br/>index 884ad87783d5..1e3e4392dcca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sockmap_basic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/sockmap_basic.c</a></div><div class='hunk'>@@ -111,31 +111,35 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void test_sockmap_vsock_delete_on_close(void)</div><div class='ctx'> {</div><div class='del'>-	int err, c, p, map;</div><div class='del'>-	const int zero = 0;</div><div class='del'>-</div><div class='del'>-	err = create_pair(AF_VSOCK, SOCK_STREAM, &amp;c, &amp;p);</div><div class='del'>-	if (!ASSERT_OK(err, "create_pair(AF_VSOCK)"))</div><div class='del'>-		return;</div><div class='add'>+	int map, c, p, err, zero = 0;</div><div class='ctx'> </div><div class='ctx'> 	map = bpf_map_create(BPF_MAP_TYPE_SOCKMAP, NULL, sizeof(int),</div><div class='ctx'> 			     sizeof(int), 1, NULL);</div><div class='del'>-	if (!ASSERT_GE(map, 0, "bpf_map_create")) {</div><div class='del'>-		close(c);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!ASSERT_OK_FD(map, "bpf_map_create"))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	err = bpf_map_update_elem(map, &amp;zero, &amp;c, BPF_NOEXIST);</div><div class='del'>-	close(c);</div><div class='del'>-	if (!ASSERT_OK(err, "bpf_map_update"))</div><div class='del'>-		goto out;</div><div class='add'>+	err = create_pair(AF_VSOCK, SOCK_STREAM, &amp;c, &amp;p);</div><div class='add'>+	if (!ASSERT_OK(err, "create_pair"))</div><div class='add'>+		goto close_map;</div><div class='add'>+</div><div class='add'>+	if (xbpf_map_update_elem(map, &amp;zero, &amp;c, BPF_NOEXIST))</div><div class='add'>+		goto close_socks;</div><div class='add'>+</div><div class='add'>+	xclose(c);</div><div class='add'>+	xclose(p);</div><div class='add'>+</div><div class='add'>+	err = create_pair(AF_VSOCK, SOCK_STREAM, &amp;c, &amp;p);</div><div class='add'>+	if (!ASSERT_OK(err, "create_pair"))</div><div class='add'>+		goto close_map;</div><div class='ctx'> </div><div class='del'>-	err = bpf_map_update_elem(map, &amp;zero, &amp;p, BPF_NOEXIST);</div><div class='add'>+	err = bpf_map_update_elem(map, &amp;zero, &amp;c, BPF_NOEXIST);</div><div class='ctx'> 	ASSERT_OK(err, "after close(), bpf_map_update");</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	close(p);</div><div class='del'>-	close(map);</div><div class='add'>+close_socks:</div><div class='add'>+	xclose(c);</div><div class='add'>+	xclose(p);</div><div class='add'>+close_map:</div><div class='add'>+	xclose(map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void test_skmsg_helpers(enum bpf_map_type map_type)</div><div class='hunk'>@@ -522,8 +526,8 @@ static void test_sockmap_skb_verdict_shutdown(void)</div><div class='ctx'> 	if (!ASSERT_EQ(err, 1, "epoll_wait(fd)"))</div><div class='ctx'> 		goto out_close;</div><div class='ctx'> </div><div class='del'>-	n = recv(c1, &amp;b, 1, SOCK_NONBLOCK);</div><div class='del'>-	ASSERT_EQ(n, 0, "recv_timeout(fin)");</div><div class='add'>+	n = recv(c1, &amp;b, 1, MSG_DONTWAIT);</div><div class='add'>+	ASSERT_EQ(n, 0, "recv(fin)");</div><div class='ctx'> out_close:</div><div class='ctx'> 	close(c1);</div><div class='ctx'> 	close(p1);</div><div class='hunk'>@@ -531,57 +535,6 @@ out:</div><div class='ctx'> 	test_sockmap_pass_prog__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_sockmap_stream_pass(void)</div><div class='del'>-{</div><div class='del'>-	int zero = 0, sent, recvd;</div><div class='del'>-	int verdict, parser;</div><div class='del'>-	int err, map;</div><div class='del'>-	int c = -1, p = -1;</div><div class='del'>-	struct test_sockmap_pass_prog *pass = NULL;</div><div class='del'>-	char snd[256] = "0123456789";</div><div class='del'>-	char rcv[256] = "0";</div><div class='del'>-</div><div class='del'>-	pass = test_sockmap_pass_prog__open_and_load();</div><div class='del'>-	verdict = bpf_program__fd(pass-&gt;progs.prog_skb_verdict);</div><div class='del'>-	parser = bpf_program__fd(pass-&gt;progs.prog_skb_parser);</div><div class='del'>-	map = bpf_map__fd(pass-&gt;maps.sock_map_rx);</div><div class='del'>-</div><div class='del'>-	err = bpf_prog_attach(parser, map, BPF_SK_SKB_STREAM_PARSER, 0);</div><div class='del'>-	if (!ASSERT_OK(err, "bpf_prog_attach stream parser"))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = bpf_prog_attach(verdict, map, BPF_SK_SKB_STREAM_VERDICT, 0);</div><div class='del'>-	if (!ASSERT_OK(err, "bpf_prog_attach stream verdict"))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = create_pair(AF_INET, SOCK_STREAM, &amp;c, &amp;p);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* sk_data_ready of 'p' will be replaced by strparser handler */</div><div class='del'>-	err = bpf_map_update_elem(map, &amp;zero, &amp;p, BPF_NOEXIST);</div><div class='del'>-	if (!ASSERT_OK(err, "bpf_map_update_elem(p)"))</div><div class='del'>-		goto out_close;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * as 'prog_skb_parser' return the original skb len and</div><div class='del'>-	 * 'prog_skb_verdict' return SK_PASS, the kernel will just</div><div class='del'>-	 * pass it through to original socket 'p'</div><div class='del'>-	 */</div><div class='del'>-	sent = xsend(c, snd, sizeof(snd), 0);</div><div class='del'>-	ASSERT_EQ(sent, sizeof(snd), "xsend(c)");</div><div class='del'>-</div><div class='del'>-	recvd = recv_timeout(p, rcv, sizeof(rcv), SOCK_NONBLOCK,</div><div class='del'>-			     IO_TIMEOUT_SEC);</div><div class='del'>-	ASSERT_EQ(recvd, sizeof(rcv), "recv_timeout(p)");</div><div class='del'>-</div><div class='del'>-out_close:</div><div class='del'>-	close(c);</div><div class='del'>-	close(p);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	test_sockmap_pass_prog__destroy(pass);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static void test_sockmap_skb_verdict_fionread(bool pass_prog)</div><div class='ctx'> {</div><div class='hunk'>@@ -628,7 +581,7 @@ static void test_sockmap_skb_verdict_fionread(bool pass_prog)</div><div class='ctx'> 	ASSERT_EQ(avail, expected, "ioctl(FIONREAD)");</div><div class='ctx'> 	/* On DROP test there will be no data to read */</div><div class='ctx'> 	if (pass_prog) {</div><div class='del'>-		recvd = recv_timeout(c1, &amp;buf, sizeof(buf), SOCK_NONBLOCK, IO_TIMEOUT_SEC);</div><div class='add'>+		recvd = recv_timeout(c1, &amp;buf, sizeof(buf), MSG_DONTWAIT, IO_TIMEOUT_SEC);</div><div class='ctx'> 		ASSERT_EQ(recvd, sizeof(buf), "recv_timeout(c0)");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1061,6 +1014,34 @@ destroy:</div><div class='ctx'> 	test_sockmap_pass_prog__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_sockmap_vsock_unconnected(void)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_storage addr;</div><div class='add'>+	int map, s, zero = 0;</div><div class='add'>+	socklen_t alen;</div><div class='add'>+</div><div class='add'>+	map = bpf_map_create(BPF_MAP_TYPE_SOCKMAP, NULL, sizeof(int),</div><div class='add'>+			     sizeof(int), 1, NULL);</div><div class='add'>+	if (!ASSERT_OK_FD(map, "bpf_map_create"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	s = xsocket(AF_VSOCK, SOCK_STREAM, 0);</div><div class='add'>+	if (s &lt; 0)</div><div class='add'>+		goto close_map;</div><div class='add'>+</div><div class='add'>+	/* Fail connect(), but trigger transport assignment. */</div><div class='add'>+	init_addr_loopback(AF_VSOCK, &amp;addr, &amp;alen);</div><div class='add'>+	if (!ASSERT_ERR(connect(s, sockaddr(&amp;addr), alen), "connect"))</div><div class='add'>+		goto close_sock;</div><div class='add'>+</div><div class='add'>+	ASSERT_ERR(bpf_map_update_elem(map, &amp;zero, &amp;s, BPF_ANY), "map_update");</div><div class='add'>+</div><div class='add'>+close_sock:</div><div class='add'>+	xclose(s);</div><div class='add'>+close_map:</div><div class='add'>+	xclose(map);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_sockmap_basic(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("sockmap create_update_free"))</div><div class='hunk'>@@ -1101,8 +1082,6 @@ void test_sockmap_basic(void)</div><div class='ctx'> 		test_sockmap_progs_query(BPF_SK_SKB_VERDICT);</div><div class='ctx'> 	if (test__start_subtest("sockmap skb_verdict shutdown"))</div><div class='ctx'> 		test_sockmap_skb_verdict_shutdown();</div><div class='del'>-	if (test__start_subtest("sockmap stream parser and verdict pass"))</div><div class='del'>-		test_sockmap_stream_pass();</div><div class='ctx'> 	if (test__start_subtest("sockmap skb_verdict fionread"))</div><div class='ctx'> 		test_sockmap_skb_verdict_fionread(true);</div><div class='ctx'> 	if (test__start_subtest("sockmap skb_verdict fionread on drop"))</div><div class='hunk'>@@ -1127,4 +1106,6 @@ void test_sockmap_basic(void)</div><div class='ctx'> 		test_skmsg_helpers_with_link(BPF_MAP_TYPE_SOCKHASH);</div><div class='ctx'> 	if (test__start_subtest("sockmap skb_verdict vsock poll"))</div><div class='ctx'> 		test_sockmap_skb_verdict_vsock_poll();</div><div class='add'>+	if (test__start_subtest("sockmap vsock unconnected"))</div><div class='add'>+		test_sockmap_vsock_unconnected();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_helpers.h b/tools/testing/selftests/bpf/prog_tests/sockmap_helpers.h<br/>index 3e5571dd578d..d815efac52fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_helpers.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sockmap_helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/sockmap_helpers.h</a></div><div class='hunk'>@@ -5,12 +5,15 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX_TEST_NAME 80</div><div class='ctx'> </div><div class='add'>+#define u32(v) ((u32){(v)})</div><div class='add'>+#define u64(v) ((u64){(v)})</div><div class='add'>+</div><div class='ctx'> #define __always_unused	__attribute__((__unused__))</div><div class='ctx'> </div><div class='ctx'> #define xbpf_map_delete_elem(fd, key)                                          \</div><div class='ctx'> 	({                                                                     \</div><div class='ctx'> 		int __ret = bpf_map_delete_elem((fd), (key));                  \</div><div class='del'>-		if (__ret &lt; 0)                                               \</div><div class='add'>+		if (__ret &lt; 0)                                                 \</div><div class='ctx'> 			FAIL_ERRNO("map_delete");                              \</div><div class='ctx'> 		__ret;                                                         \</div><div class='ctx'> 	})</div><div class='hunk'>@@ -18,7 +21,7 @@</div><div class='ctx'> #define xbpf_map_lookup_elem(fd, key, val)                                     \</div><div class='ctx'> 	({                                                                     \</div><div class='ctx'> 		int __ret = bpf_map_lookup_elem((fd), (key), (val));           \</div><div class='del'>-		if (__ret &lt; 0)                                               \</div><div class='add'>+		if (__ret &lt; 0)                                                 \</div><div class='ctx'> 			FAIL_ERRNO("map_lookup");                              \</div><div class='ctx'> 		__ret;                                                         \</div><div class='ctx'> 	})</div><div class='hunk'>@@ -26,7 +29,7 @@</div><div class='ctx'> #define xbpf_map_update_elem(fd, key, val, flags)                              \</div><div class='ctx'> 	({                                                                     \</div><div class='ctx'> 		int __ret = bpf_map_update_elem((fd), (key), (val), (flags));  \</div><div class='del'>-		if (__ret &lt; 0)                                               \</div><div class='add'>+		if (__ret &lt; 0)                                                 \</div><div class='ctx'> 			FAIL_ERRNO("map_update");                              \</div><div class='ctx'> 		__ret;                                                         \</div><div class='ctx'> 	})</div><div class='hunk'>@@ -35,7 +38,7 @@</div><div class='ctx'> 	({                                                                     \</div><div class='ctx'> 		int __ret =                                                    \</div><div class='ctx'> 			bpf_prog_attach((prog), (target), (type), (flags));    \</div><div class='del'>-		if (__ret &lt; 0)                                               \</div><div class='add'>+		if (__ret &lt; 0)                                                 \</div><div class='ctx'> 			FAIL_ERRNO("prog_attach(" #type ")");                  \</div><div class='ctx'> 		__ret;                                                         \</div><div class='ctx'> 	})</div><div class='hunk'>@@ -43,7 +46,7 @@</div><div class='ctx'> #define xbpf_prog_detach2(prog, target, type)                                  \</div><div class='ctx'> 	({                                                                     \</div><div class='ctx'> 		int __ret = bpf_prog_detach2((prog), (target), (type));        \</div><div class='del'>-		if (__ret &lt; 0)                                               \</div><div class='add'>+		if (__ret &lt; 0)                                                 \</div><div class='ctx'> 			FAIL_ERRNO("prog_detach2(" #type ")");                 \</div><div class='ctx'> 		__ret;                                                         \</div><div class='ctx'> 	})</div><div class='hunk'>@@ -66,21 +69,15 @@</div><div class='ctx'> 		__ret;                                                         \</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='del'>-static inline int add_to_sockmap(int sock_mapfd, int fd1, int fd2)</div><div class='add'>+static inline int add_to_sockmap(int mapfd, int fd1, int fd2)</div><div class='ctx'> {</div><div class='del'>-	u64 value;</div><div class='del'>-	u32 key;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	key = 0;</div><div class='del'>-	value = fd1;</div><div class='del'>-	err = xbpf_map_update_elem(sock_mapfd, &amp;key, &amp;value, BPF_NOEXIST);</div><div class='add'>+	err = xbpf_map_update_elem(mapfd, &amp;u32(0), &amp;u64(fd1), BPF_NOEXIST);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	key = 1;</div><div class='del'>-	value = fd2;</div><div class='del'>-	return xbpf_map_update_elem(sock_mapfd, &amp;key, &amp;value, BPF_NOEXIST);</div><div class='add'>+	return xbpf_map_update_elem(mapfd, &amp;u32(1), &amp;u64(fd2), BPF_NOEXIST);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif // __SOCKMAP_HELPERS__</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c<br/>index 2d0796314862..b87e7f39e15a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c</a></div><div class='hunk'>@@ -3,77 +3,62 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Tests for sockmap/sockhash holding kTLS sockets.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='add'>+#include &lt;error.h&gt;</div><div class='ctx'> #include &lt;netinet/tcp.h&gt;</div><div class='add'>+#include &lt;linux/tls.h&gt;</div><div class='ctx'> #include "test_progs.h"</div><div class='add'>+#include "sockmap_helpers.h"</div><div class='add'>+#include "test_skmsg_load_helpers.skel.h"</div><div class='add'>+#include "test_sockmap_ktls.skel.h"</div><div class='ctx'> </div><div class='ctx'> #define MAX_TEST_NAME 80</div><div class='ctx'> #define TCP_ULP 31</div><div class='ctx'> </div><div class='del'>-static int tcp_server(int family)</div><div class='add'>+static int init_ktls_pairs(int c, int p)</div><div class='ctx'> {</div><div class='del'>-	int err, s;</div><div class='del'>-</div><div class='del'>-	s = socket(family, SOCK_STREAM, 0);</div><div class='del'>-	if (!ASSERT_GE(s, 0, "socket"))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	err = listen(s, SOMAXCONN);</div><div class='del'>-	if (!ASSERT_OK(err, "listen"))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='add'>+	int err;</div><div class='add'>+	struct tls12_crypto_info_aes_gcm_128 crypto_rx;</div><div class='add'>+	struct tls12_crypto_info_aes_gcm_128 crypto_tx;</div><div class='ctx'> </div><div class='del'>-static int disconnect(int fd)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr unspec = { AF_UNSPEC };</div><div class='add'>+	err = setsockopt(c, IPPROTO_TCP, TCP_ULP, "tls", strlen("tls"));</div><div class='add'>+	if (!ASSERT_OK(err, "setsockopt(TCP_ULP)"))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	return connect(fd, &amp;unspec, sizeof(unspec));</div><div class='add'>+	err = setsockopt(p, IPPROTO_TCP, TCP_ULP, "tls", strlen("tls"));</div><div class='add'>+	if (!ASSERT_OK(err, "setsockopt(TCP_ULP)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	memset(&amp;crypto_rx, 0, sizeof(crypto_rx));</div><div class='add'>+	memset(&amp;crypto_tx, 0, sizeof(crypto_tx));</div><div class='add'>+	crypto_rx.info.version = TLS_1_2_VERSION;</div><div class='add'>+	crypto_tx.info.version = TLS_1_2_VERSION;</div><div class='add'>+	crypto_rx.info.cipher_type = TLS_CIPHER_AES_GCM_128;</div><div class='add'>+	crypto_tx.info.cipher_type = TLS_CIPHER_AES_GCM_128;</div><div class='add'>+</div><div class='add'>+	err = setsockopt(c, SOL_TLS, TLS_TX, &amp;crypto_tx, sizeof(crypto_tx));</div><div class='add'>+	if (!ASSERT_OK(err, "setsockopt(TLS_TX)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = setsockopt(p, SOL_TLS, TLS_RX, &amp;crypto_rx, sizeof(crypto_rx));</div><div class='add'>+	if (!ASSERT_OK(err, "setsockopt(TLS_RX)"))</div><div class='add'>+		goto out;</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Disconnect (unhash) a kTLS socket after removing it from sockmap. */</div><div class='del'>-static void test_sockmap_ktls_disconnect_after_delete(int family, int map)</div><div class='add'>+static int create_ktls_pairs(int family, int sotype, int *c, int *p)</div><div class='ctx'> {</div><div class='del'>-	struct sockaddr_storage addr = {0};</div><div class='del'>-	socklen_t len = sizeof(addr);</div><div class='del'>-	int err, cli, srv, zero = 0;</div><div class='del'>-</div><div class='del'>-	srv = tcp_server(family);</div><div class='del'>-	if (srv == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	err = getsockname(srv, (struct sockaddr *)&amp;addr, &amp;len);</div><div class='del'>-	if (!ASSERT_OK(err, "getsockopt"))</div><div class='del'>-		goto close_srv;</div><div class='del'>-</div><div class='del'>-	cli = socket(family, SOCK_STREAM, 0);</div><div class='del'>-	if (!ASSERT_GE(cli, 0, "socket"))</div><div class='del'>-		goto close_srv;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = connect(cli, (struct sockaddr *)&amp;addr, len);</div><div class='del'>-	if (!ASSERT_OK(err, "connect"))</div><div class='del'>-		goto close_cli;</div><div class='del'>-</div><div class='del'>-	err = bpf_map_update_elem(map, &amp;zero, &amp;cli, 0);</div><div class='del'>-	if (!ASSERT_OK(err, "bpf_map_update_elem"))</div><div class='del'>-		goto close_cli;</div><div class='del'>-</div><div class='del'>-	err = setsockopt(cli, IPPROTO_TCP, TCP_ULP, "tls", strlen("tls"));</div><div class='del'>-	if (!ASSERT_OK(err, "setsockopt(TCP_ULP)"))</div><div class='del'>-		goto close_cli;</div><div class='del'>-</div><div class='del'>-	err = bpf_map_delete_elem(map, &amp;zero);</div><div class='del'>-	if (!ASSERT_OK(err, "bpf_map_delete_elem"))</div><div class='del'>-		goto close_cli;</div><div class='del'>-</div><div class='del'>-	err = disconnect(cli);</div><div class='del'>-	ASSERT_OK(err, "disconnect");</div><div class='add'>+	err = create_pair(family, sotype, c, p);</div><div class='add'>+	if (!ASSERT_OK(err, "create_pair()"))</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='del'>-close_cli:</div><div class='del'>-	close(cli);</div><div class='del'>-close_srv:</div><div class='del'>-	close(srv);</div><div class='add'>+	err = init_ktls_pairs(*c, *p);</div><div class='add'>+	if (!ASSERT_OK(err, "init_ktls_pairs(c, p)"))</div><div class='add'>+		return -1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void test_sockmap_ktls_update_fails_when_sock_has_ulp(int family, int map)</div><div class='hunk'>@@ -146,6 +131,278 @@ static const char *fmt_test_name(const char *subtest_name, int family,</div><div class='ctx'> 	return test_name;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_sockmap_ktls_offload(int family, int sotype)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	int c = 0, p = 0, sent, recvd;</div><div class='add'>+	char msg[12] = "hello world\0";</div><div class='add'>+	char rcv[13];</div><div class='add'>+</div><div class='add'>+	err = create_ktls_pairs(family, sotype, &amp;c, &amp;p);</div><div class='add'>+	if (!ASSERT_OK(err, "create_ktls_pairs()"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sent = send(c, msg, sizeof(msg), 0);</div><div class='add'>+	if (!ASSERT_OK(err, "send(msg)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	recvd = recv(p, rcv, sizeof(rcv), 0);</div><div class='add'>+	if (!ASSERT_OK(err, "recv(msg)") ||</div><div class='add'>+	    !ASSERT_EQ(recvd, sent, "length mismatch"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ASSERT_OK(memcmp(msg, rcv, sizeof(msg)), "data mismatch");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (c)</div><div class='add'>+		close(c);</div><div class='add'>+	if (p)</div><div class='add'>+		close(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_sockmap_ktls_tx_cork(int family, int sotype, bool push)</div><div class='add'>+{</div><div class='add'>+	int err, off;</div><div class='add'>+	int i, j;</div><div class='add'>+	int start_push = 0, push_len = 0;</div><div class='add'>+	int c = 0, p = 0, one = 1, sent, recvd;</div><div class='add'>+	int prog_fd, map_fd;</div><div class='add'>+	char msg[12] = "hello world\0";</div><div class='add'>+	char rcv[20] = {0};</div><div class='add'>+	struct test_sockmap_ktls *skel;</div><div class='add'>+</div><div class='add'>+	skel = test_sockmap_ktls__open_and_load();</div><div class='add'>+	if (!ASSERT_TRUE(skel, "open ktls skel"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = create_pair(family, sotype, &amp;c, &amp;p);</div><div class='add'>+	if (!ASSERT_OK(err, "create_pair()"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.prog_sk_policy);</div><div class='add'>+	map_fd = bpf_map__fd(skel-&gt;maps.sock_map);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach(prog_fd, map_fd, BPF_SK_MSG_VERDICT, 0);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach sk msg"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(map_fd, &amp;one, &amp;c, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_update_elem(c)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = init_ktls_pairs(c, p);</div><div class='add'>+	if (!ASSERT_OK(err, "init_ktls_pairs(c, p)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;cork_byte = sizeof(msg);</div><div class='add'>+	if (push) {</div><div class='add'>+		start_push = 1;</div><div class='add'>+		push_len = 2;</div><div class='add'>+	}</div><div class='add'>+	skel-&gt;bss-&gt;push_start = start_push;</div><div class='add'>+	skel-&gt;bss-&gt;push_end = push_len;</div><div class='add'>+</div><div class='add'>+	off = sizeof(msg) / 2;</div><div class='add'>+	sent = send(c, msg, off, 0);</div><div class='add'>+	if (!ASSERT_EQ(sent, off, "send(msg)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	recvd = recv_timeout(p, rcv, sizeof(rcv), MSG_DONTWAIT, 1);</div><div class='add'>+	if (!ASSERT_EQ(-1, recvd, "expected no data"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* send remaining msg */</div><div class='add'>+	sent = send(c, msg + off, sizeof(msg) - off, 0);</div><div class='add'>+	if (!ASSERT_EQ(sent, sizeof(msg) - off, "send remaining data"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	recvd = recv_timeout(p, rcv, sizeof(rcv), MSG_DONTWAIT, 1);</div><div class='add'>+	if (!ASSERT_OK(err, "recv(msg)") ||</div><div class='add'>+	    !ASSERT_EQ(recvd, sizeof(msg) + push_len, "check length mismatch"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; recvd;) {</div><div class='add'>+		/* skip checking the data that has been pushed in */</div><div class='add'>+		if (i &gt;= start_push &amp;&amp; i &lt;= start_push + push_len - 1) {</div><div class='add'>+			i++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (!ASSERT_EQ(rcv[i], msg[j], "data mismatch"))</div><div class='add'>+			goto out;</div><div class='add'>+		i++;</div><div class='add'>+		j++;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	if (c)</div><div class='add'>+		close(c);</div><div class='add'>+	if (p)</div><div class='add'>+		close(p);</div><div class='add'>+	test_sockmap_ktls__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_sockmap_ktls_tx_no_buf(int family, int sotype, bool push)</div><div class='add'>+{</div><div class='add'>+	int c = -1, p = -1, one = 1, two = 2;</div><div class='add'>+	struct test_sockmap_ktls *skel;</div><div class='add'>+	unsigned char *data = NULL;</div><div class='add'>+	struct msghdr msg = {0};</div><div class='add'>+	struct iovec iov[2];</div><div class='add'>+	int prog_fd, map_fd;</div><div class='add'>+	int txrx_buf = 1024;</div><div class='add'>+	int iov_length = 8192;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = test_sockmap_ktls__open_and_load();</div><div class='add'>+	if (!ASSERT_TRUE(skel, "open ktls skel"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = create_pair(family, sotype, &amp;c, &amp;p);</div><div class='add'>+	if (!ASSERT_OK(err, "create_pair()"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = setsockopt(c, SOL_SOCKET, SO_RCVBUFFORCE, &amp;txrx_buf, sizeof(int));</div><div class='add'>+	err |= setsockopt(p, SOL_SOCKET, SO_SNDBUFFORCE, &amp;txrx_buf, sizeof(int));</div><div class='add'>+	if (!ASSERT_OK(err, "set buf limit"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.prog_sk_policy_redir);</div><div class='add'>+	map_fd = bpf_map__fd(skel-&gt;maps.sock_map);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach(prog_fd, map_fd, BPF_SK_MSG_VERDICT, 0);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach sk msg"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(map_fd, &amp;one, &amp;c, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_update_elem(c)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(map_fd, &amp;two, &amp;p, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_update_elem(p)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;apply_bytes = 1024;</div><div class='add'>+</div><div class='add'>+	err = init_ktls_pairs(c, p);</div><div class='add'>+	if (!ASSERT_OK(err, "init_ktls_pairs(c, p)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	data = calloc(iov_length, sizeof(char));</div><div class='add'>+	if (!data)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	iov[0].iov_base = data;</div><div class='add'>+	iov[0].iov_len = iov_length;</div><div class='add'>+	iov[1].iov_base = data;</div><div class='add'>+	iov[1].iov_len = iov_length;</div><div class='add'>+	msg.msg_iov = iov;</div><div class='add'>+	msg.msg_iovlen = 2;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		err = sendmsg(c, &amp;msg, MSG_DONTWAIT);</div><div class='add'>+		if (err &lt;= 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (data)</div><div class='add'>+		free(data);</div><div class='add'>+	if (c != -1)</div><div class='add'>+		close(c);</div><div class='add'>+	if (p != -1)</div><div class='add'>+		close(p);</div><div class='add'>+</div><div class='add'>+	test_sockmap_ktls__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_sockmap_ktls_tx_pop(int family, int sotype)</div><div class='add'>+{</div><div class='add'>+	char msg[37] = "0123456789abcdefghijklmnopqrstuvwxyz\0";</div><div class='add'>+	int c = 0, p = 0, one = 1, sent, recvd;</div><div class='add'>+	struct test_sockmap_ktls *skel;</div><div class='add'>+	int prog_fd, map_fd;</div><div class='add'>+	char rcv[50] = {0};</div><div class='add'>+	int err;</div><div class='add'>+	int i, m, r;</div><div class='add'>+</div><div class='add'>+	skel = test_sockmap_ktls__open_and_load();</div><div class='add'>+	if (!ASSERT_TRUE(skel, "open ktls skel"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = create_pair(family, sotype, &amp;c, &amp;p);</div><div class='add'>+	if (!ASSERT_OK(err, "create_pair()"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.prog_sk_policy);</div><div class='add'>+	map_fd = bpf_map__fd(skel-&gt;maps.sock_map);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach(prog_fd, map_fd, BPF_SK_MSG_VERDICT, 0);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach sk msg"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(map_fd, &amp;one, &amp;c, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_update_elem(c)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = init_ktls_pairs(c, p);</div><div class='add'>+	if (!ASSERT_OK(err, "init_ktls_pairs(c, p)"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		int	pop_start;</div><div class='add'>+		int	pop_len;</div><div class='add'>+	} pop_policy[] = {</div><div class='add'>+		/* trim the start */</div><div class='add'>+		{0, 2},</div><div class='add'>+		{0, 10},</div><div class='add'>+		{1, 2},</div><div class='add'>+		{1, 10},</div><div class='add'>+		/* trim the end */</div><div class='add'>+		{35, 2},</div><div class='add'>+		/* New entries should be added before this line */</div><div class='add'>+		{-1, -1},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	while (pop_policy[i].pop_start &gt;= 0) {</div><div class='add'>+		skel-&gt;bss-&gt;pop_start = pop_policy[i].pop_start;</div><div class='add'>+		skel-&gt;bss-&gt;pop_end =  pop_policy[i].pop_len;</div><div class='add'>+</div><div class='add'>+		sent = send(c, msg, sizeof(msg), 0);</div><div class='add'>+		if (!ASSERT_EQ(sent, sizeof(msg), "send(msg)"))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		recvd = recv_timeout(p, rcv, sizeof(rcv), MSG_DONTWAIT, 1);</div><div class='add'>+		if (!ASSERT_EQ(recvd, sizeof(msg) - pop_policy[i].pop_len, "pop len mismatch"))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		/* verify the data</div><div class='add'>+		 * msg: 0123456789a bcdefghij klmnopqrstuvwxyz</div><div class='add'>+		 *                  |       |</div><div class='add'>+		 *                  popped data</div><div class='add'>+		 */</div><div class='add'>+		for (m = 0, r = 0; m &lt; sizeof(msg);) {</div><div class='add'>+			/* skip checking the data that has been popped */</div><div class='add'>+			if (m &gt;= pop_policy[i].pop_start &amp;&amp;</div><div class='add'>+			    m &lt;= pop_policy[i].pop_start + pop_policy[i].pop_len - 1) {</div><div class='add'>+				m++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!ASSERT_EQ(msg[m], rcv[r], "data mismatch"))</div><div class='add'>+				goto out;</div><div class='add'>+			m++;</div><div class='add'>+			r++;</div><div class='add'>+		}</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	if (c)</div><div class='add'>+		close(c);</div><div class='add'>+	if (p)</div><div class='add'>+		close(p);</div><div class='add'>+	test_sockmap_ktls__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void run_tests(int family, enum bpf_map_type map_type)</div><div class='ctx'> {</div><div class='ctx'> 	int map;</div><div class='hunk'>@@ -154,18 +411,32 @@ static void run_tests(int family, enum bpf_map_type map_type)</div><div class='ctx'> 	if (!ASSERT_GE(map, 0, "bpf_map_create"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (test__start_subtest(fmt_test_name("disconnect_after_delete", family, map_type)))</div><div class='del'>-		test_sockmap_ktls_disconnect_after_delete(family, map);</div><div class='ctx'> 	if (test__start_subtest(fmt_test_name("update_fails_when_sock_has_ulp", family, map_type)))</div><div class='ctx'> 		test_sockmap_ktls_update_fails_when_sock_has_ulp(family, map);</div><div class='ctx'> </div><div class='ctx'> 	close(map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void run_ktls_test(int family, int sotype)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("tls simple offload"))</div><div class='add'>+		test_sockmap_ktls_offload(family, sotype);</div><div class='add'>+	if (test__start_subtest("tls tx cork"))</div><div class='add'>+		test_sockmap_ktls_tx_cork(family, sotype, false);</div><div class='add'>+	if (test__start_subtest("tls tx cork with push"))</div><div class='add'>+		test_sockmap_ktls_tx_cork(family, sotype, true);</div><div class='add'>+	if (test__start_subtest("tls tx egress with no buf"))</div><div class='add'>+		test_sockmap_ktls_tx_no_buf(family, sotype, true);</div><div class='add'>+	if (test__start_subtest("tls tx with pop"))</div><div class='add'>+		test_sockmap_ktls_tx_pop(family, sotype);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_sockmap_ktls(void)</div><div class='ctx'> {</div><div class='ctx'> 	run_tests(AF_INET, BPF_MAP_TYPE_SOCKMAP);</div><div class='ctx'> 	run_tests(AF_INET, BPF_MAP_TYPE_SOCKHASH);</div><div class='ctx'> 	run_tests(AF_INET6, BPF_MAP_TYPE_SOCKMAP);</div><div class='ctx'> 	run_tests(AF_INET6, BPF_MAP_TYPE_SOCKHASH);</div><div class='add'>+	run_ktls_test(AF_INET, SOCK_STREAM);</div><div class='add'>+	run_ktls_test(AF_INET6, SOCK_STREAM);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c<br/>index 4ee1148d22be..f1bdccc7e4e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/sockmap_listen.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/sockmap_listen.c</a></div><div class='hunk'>@@ -924,6 +924,8 @@ static void redir_partial(int family, int sotype, int sock_map, int parser_map)</div><div class='ctx'> 		goto close;</div><div class='ctx'> </div><div class='ctx'> 	n = xsend(c1, buf, sizeof(buf), 0);</div><div class='add'>+	if (n == -1)</div><div class='add'>+		goto close;</div><div class='ctx'> 	if (n &lt; sizeof(buf))</div><div class='ctx'> 		FAIL("incomplete write");</div><div class='ctx'> </div><div class='hunk'>@@ -1366,237 +1368,6 @@ static void test_redir(struct test_sockmap_listen *skel, struct bpf_map *map,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pairs_redir_to_connected(int cli0, int peer0, int cli1, int peer1,</div><div class='del'>-				     int sock_mapfd, int nop_mapfd,</div><div class='del'>-				     int verd_mapfd, enum redir_mode mode,</div><div class='del'>-				     int send_flags)</div><div class='del'>-{</div><div class='del'>-	const char *log_prefix = redir_mode_str(mode);</div><div class='del'>-	unsigned int pass;</div><div class='del'>-	int err, n;</div><div class='del'>-	u32 key;</div><div class='del'>-	char b;</div><div class='del'>-</div><div class='del'>-	zero_verdict_count(verd_mapfd);</div><div class='del'>-</div><div class='del'>-	err = add_to_sockmap(sock_mapfd, peer0, peer1);</div><div class='del'>-	if (err)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (nop_mapfd &gt;= 0) {</div><div class='del'>-		err = add_to_sockmap(nop_mapfd, cli0, cli1);</div><div class='del'>-		if (err)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Last byte is OOB data when send_flags has MSG_OOB bit set */</div><div class='del'>-	n = xsend(cli1, "ab", 2, send_flags);</div><div class='del'>-	if (n &gt;= 0 &amp;&amp; n &lt; 2)</div><div class='del'>-		FAIL("%s: incomplete send", log_prefix);</div><div class='del'>-	if (n &lt; 2)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	key = SK_PASS;</div><div class='del'>-	err = xbpf_map_lookup_elem(verd_mapfd, &amp;key, &amp;pass);</div><div class='del'>-	if (err)</div><div class='del'>-		return;</div><div class='del'>-	if (pass != 1)</div><div class='del'>-		FAIL("%s: want pass count 1, have %d", log_prefix, pass);</div><div class='del'>-</div><div class='del'>-	n = recv_timeout(mode == REDIR_INGRESS ? peer0 : cli0, &amp;b, 1, 0, IO_TIMEOUT_SEC);</div><div class='del'>-	if (n &lt; 0)</div><div class='del'>-		FAIL_ERRNO("%s: recv_timeout", log_prefix);</div><div class='del'>-	if (n == 0)</div><div class='del'>-		FAIL("%s: incomplete recv", log_prefix);</div><div class='del'>-</div><div class='del'>-	if (send_flags &amp; MSG_OOB) {</div><div class='del'>-		/* Check that we can't read OOB while in sockmap */</div><div class='del'>-		errno = 0;</div><div class='del'>-		n = recv(peer1, &amp;b, 1, MSG_OOB | MSG_DONTWAIT);</div><div class='del'>-		if (n != -1 || errno != EOPNOTSUPP)</div><div class='del'>-			FAIL("%s: recv(MSG_OOB): expected EOPNOTSUPP: retval=%d errno=%d",</div><div class='del'>-			     log_prefix, n, errno);</div><div class='del'>-</div><div class='del'>-		/* Remove peer1 from sockmap */</div><div class='del'>-		xbpf_map_delete_elem(sock_mapfd, &amp;(int){ 1 });</div><div class='del'>-</div><div class='del'>-		/* Check that OOB was dropped on redirect */</div><div class='del'>-		errno = 0;</div><div class='del'>-		n = recv(peer1, &amp;b, 1, MSG_OOB | MSG_DONTWAIT);</div><div class='del'>-		if (n != -1 || errno != EINVAL)</div><div class='del'>-			FAIL("%s: recv(MSG_OOB): expected EINVAL: retval=%d errno=%d",</div><div class='del'>-			     log_prefix, n, errno);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unix_redir_to_connected(int sotype, int sock_mapfd,</div><div class='del'>-			       int verd_mapfd, enum redir_mode mode)</div><div class='del'>-{</div><div class='del'>-	int c0, c1, p0, p1;</div><div class='del'>-	int sfd[2];</div><div class='del'>-</div><div class='del'>-	if (socketpair(AF_UNIX, sotype | SOCK_NONBLOCK, 0, sfd))</div><div class='del'>-		return;</div><div class='del'>-	c0 = sfd[0], p0 = sfd[1];</div><div class='del'>-</div><div class='del'>-	if (socketpair(AF_UNIX, sotype | SOCK_NONBLOCK, 0, sfd))</div><div class='del'>-		goto close0;</div><div class='del'>-	c1 = sfd[0], p1 = sfd[1];</div><div class='del'>-</div><div class='del'>-	pairs_redir_to_connected(c0, p0, c1, p1, sock_mapfd, -1, verd_mapfd,</div><div class='del'>-				 mode, NO_FLAGS);</div><div class='del'>-</div><div class='del'>-	xclose(c1);</div><div class='del'>-	xclose(p1);</div><div class='del'>-close0:</div><div class='del'>-	xclose(c0);</div><div class='del'>-	xclose(p0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unix_skb_redir_to_connected(struct test_sockmap_listen *skel,</div><div class='del'>-					struct bpf_map *inner_map, int sotype)</div><div class='del'>-{</div><div class='del'>-	int verdict = bpf_program__fd(skel-&gt;progs.prog_skb_verdict);</div><div class='del'>-	int verdict_map = bpf_map__fd(skel-&gt;maps.verdict_map);</div><div class='del'>-	int sock_map = bpf_map__fd(inner_map);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xbpf_prog_attach(verdict, sock_map, BPF_SK_SKB_VERDICT, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skel-&gt;bss-&gt;test_ingress = false;</div><div class='del'>-	unix_redir_to_connected(sotype, sock_map, verdict_map, REDIR_EGRESS);</div><div class='del'>-	skel-&gt;bss-&gt;test_ingress = true;</div><div class='del'>-	unix_redir_to_connected(sotype, sock_map, verdict_map, REDIR_INGRESS);</div><div class='del'>-</div><div class='del'>-	xbpf_prog_detach2(verdict, sock_map, BPF_SK_SKB_VERDICT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_unix_redir(struct test_sockmap_listen *skel, struct bpf_map *map,</div><div class='del'>-			    int sotype)</div><div class='del'>-{</div><div class='del'>-	const char *family_name, *map_name;</div><div class='del'>-	char s[MAX_TEST_NAME];</div><div class='del'>-</div><div class='del'>-	family_name = family_str(AF_UNIX);</div><div class='del'>-	map_name = map_type_str(map);</div><div class='del'>-	snprintf(s, sizeof(s), "%s %s %s", map_name, family_name, __func__);</div><div class='del'>-	if (!test__start_subtest(s))</div><div class='del'>-		return;</div><div class='del'>-	unix_skb_redir_to_connected(skel, map, sotype);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns two connected loopback vsock sockets */</div><div class='del'>-static int vsock_socketpair_connectible(int sotype, int *v0, int *v1)</div><div class='del'>-{</div><div class='del'>-	return create_pair(AF_VSOCK, sotype | SOCK_NONBLOCK, v0, v1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vsock_unix_redir_connectible(int sock_mapfd, int verd_mapfd,</div><div class='del'>-					 enum redir_mode mode, int sotype)</div><div class='del'>-{</div><div class='del'>-	const char *log_prefix = redir_mode_str(mode);</div><div class='del'>-	char a = 'a', b = 'b';</div><div class='del'>-	int u0, u1, v0, v1;</div><div class='del'>-	int sfd[2];</div><div class='del'>-	unsigned int pass;</div><div class='del'>-	int err, n;</div><div class='del'>-	u32 key;</div><div class='del'>-</div><div class='del'>-	zero_verdict_count(verd_mapfd);</div><div class='del'>-</div><div class='del'>-	if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, sfd))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	u0 = sfd[0];</div><div class='del'>-	u1 = sfd[1];</div><div class='del'>-</div><div class='del'>-	err = vsock_socketpair_connectible(sotype, &amp;v0, &amp;v1);</div><div class='del'>-	if (err) {</div><div class='del'>-		FAIL("vsock_socketpair_connectible() failed");</div><div class='del'>-		goto close_uds;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = add_to_sockmap(sock_mapfd, u0, v0);</div><div class='del'>-	if (err) {</div><div class='del'>-		FAIL("add_to_sockmap failed");</div><div class='del'>-		goto close_vsock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	n = write(v1, &amp;a, sizeof(a));</div><div class='del'>-	if (n &lt; 0)</div><div class='del'>-		FAIL_ERRNO("%s: write", log_prefix);</div><div class='del'>-	if (n == 0)</div><div class='del'>-		FAIL("%s: incomplete write", log_prefix);</div><div class='del'>-	if (n &lt; 1)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	n = xrecv_nonblock(mode == REDIR_INGRESS ? u0 : u1, &amp;b, sizeof(b), 0);</div><div class='del'>-	if (n &lt; 0)</div><div class='del'>-		FAIL("%s: recv() err, errno=%d", log_prefix, errno);</div><div class='del'>-	if (n == 0)</div><div class='del'>-		FAIL("%s: incomplete recv", log_prefix);</div><div class='del'>-	if (b != a)</div><div class='del'>-		FAIL("%s: vsock socket map failed, %c != %c", log_prefix, a, b);</div><div class='del'>-</div><div class='del'>-	key = SK_PASS;</div><div class='del'>-	err = xbpf_map_lookup_elem(verd_mapfd, &amp;key, &amp;pass);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	if (pass != 1)</div><div class='del'>-		FAIL("%s: want pass count 1, have %d", log_prefix, pass);</div><div class='del'>-out:</div><div class='del'>-	key = 0;</div><div class='del'>-	bpf_map_delete_elem(sock_mapfd, &amp;key);</div><div class='del'>-	key = 1;</div><div class='del'>-	bpf_map_delete_elem(sock_mapfd, &amp;key);</div><div class='del'>-</div><div class='del'>-close_vsock:</div><div class='del'>-	close(v0);</div><div class='del'>-	close(v1);</div><div class='del'>-</div><div class='del'>-close_uds:</div><div class='del'>-	close(u0);</div><div class='del'>-	close(u1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vsock_unix_skb_redir_connectible(struct test_sockmap_listen *skel,</div><div class='del'>-					     struct bpf_map *inner_map,</div><div class='del'>-					     int sotype)</div><div class='del'>-{</div><div class='del'>-	int verdict = bpf_program__fd(skel-&gt;progs.prog_skb_verdict);</div><div class='del'>-	int verdict_map = bpf_map__fd(skel-&gt;maps.verdict_map);</div><div class='del'>-	int sock_map = bpf_map__fd(inner_map);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xbpf_prog_attach(verdict, sock_map, BPF_SK_SKB_VERDICT, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skel-&gt;bss-&gt;test_ingress = false;</div><div class='del'>-	vsock_unix_redir_connectible(sock_map, verdict_map, REDIR_EGRESS, sotype);</div><div class='del'>-	skel-&gt;bss-&gt;test_ingress = true;</div><div class='del'>-	vsock_unix_redir_connectible(sock_map, verdict_map, REDIR_INGRESS, sotype);</div><div class='del'>-</div><div class='del'>-	xbpf_prog_detach2(verdict, sock_map, BPF_SK_SKB_VERDICT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_vsock_redir(struct test_sockmap_listen *skel, struct bpf_map *map)</div><div class='del'>-{</div><div class='del'>-	const char *family_name, *map_name;</div><div class='del'>-	char s[MAX_TEST_NAME];</div><div class='del'>-</div><div class='del'>-	family_name = family_str(AF_VSOCK);</div><div class='del'>-	map_name = map_type_str(map);</div><div class='del'>-	snprintf(s, sizeof(s), "%s %s %s", map_name, family_name, __func__);</div><div class='del'>-	if (!test__start_subtest(s))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	vsock_unix_skb_redir_connectible(skel, map, SOCK_STREAM);</div><div class='del'>-	vsock_unix_skb_redir_connectible(skel, map, SOCK_SEQPACKET);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void test_reuseport(struct test_sockmap_listen *skel,</div><div class='ctx'> 			   struct bpf_map *map, int family, int sotype)</div><div class='ctx'> {</div><div class='hunk'>@@ -1637,224 +1408,6 @@ static void test_reuseport(struct test_sockmap_listen *skel,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inet_socketpair(int family, int type, int *s, int *c)</div><div class='del'>-{</div><div class='del'>-	return create_pair(family, type | SOCK_NONBLOCK, s, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void udp_redir_to_connected(int family, int sock_mapfd, int verd_mapfd,</div><div class='del'>-				   enum redir_mode mode)</div><div class='del'>-{</div><div class='del'>-	int c0, c1, p0, p1;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = inet_socketpair(family, SOCK_DGRAM, &amp;p0, &amp;c0);</div><div class='del'>-	if (err)</div><div class='del'>-		return;</div><div class='del'>-	err = inet_socketpair(family, SOCK_DGRAM, &amp;p1, &amp;c1);</div><div class='del'>-	if (err)</div><div class='del'>-		goto close_cli0;</div><div class='del'>-</div><div class='del'>-	pairs_redir_to_connected(c0, p0, c1, p1, sock_mapfd, -1, verd_mapfd,</div><div class='del'>-				 mode, NO_FLAGS);</div><div class='del'>-</div><div class='del'>-	xclose(c1);</div><div class='del'>-	xclose(p1);</div><div class='del'>-close_cli0:</div><div class='del'>-	xclose(c0);</div><div class='del'>-	xclose(p0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void udp_skb_redir_to_connected(struct test_sockmap_listen *skel,</div><div class='del'>-				       struct bpf_map *inner_map, int family)</div><div class='del'>-{</div><div class='del'>-	int verdict = bpf_program__fd(skel-&gt;progs.prog_skb_verdict);</div><div class='del'>-	int verdict_map = bpf_map__fd(skel-&gt;maps.verdict_map);</div><div class='del'>-	int sock_map = bpf_map__fd(inner_map);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xbpf_prog_attach(verdict, sock_map, BPF_SK_SKB_VERDICT, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skel-&gt;bss-&gt;test_ingress = false;</div><div class='del'>-	udp_redir_to_connected(family, sock_map, verdict_map, REDIR_EGRESS);</div><div class='del'>-	skel-&gt;bss-&gt;test_ingress = true;</div><div class='del'>-	udp_redir_to_connected(family, sock_map, verdict_map, REDIR_INGRESS);</div><div class='del'>-</div><div class='del'>-	xbpf_prog_detach2(verdict, sock_map, BPF_SK_SKB_VERDICT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_udp_redir(struct test_sockmap_listen *skel, struct bpf_map *map,</div><div class='del'>-			   int family)</div><div class='del'>-{</div><div class='del'>-	const char *family_name, *map_name;</div><div class='del'>-	char s[MAX_TEST_NAME];</div><div class='del'>-</div><div class='del'>-	family_name = family_str(family);</div><div class='del'>-	map_name = map_type_str(map);</div><div class='del'>-	snprintf(s, sizeof(s), "%s %s %s", map_name, family_name, __func__);</div><div class='del'>-	if (!test__start_subtest(s))</div><div class='del'>-		return;</div><div class='del'>-	udp_skb_redir_to_connected(skel, map, family);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void inet_unix_redir_to_connected(int family, int type, int sock_mapfd,</div><div class='del'>-					int verd_mapfd, enum redir_mode mode)</div><div class='del'>-{</div><div class='del'>-	int c0, c1, p0, p1;</div><div class='del'>-	int sfd[2];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (socketpair(AF_UNIX, type | SOCK_NONBLOCK, 0, sfd))</div><div class='del'>-		return;</div><div class='del'>-	c0 = sfd[0], p0 = sfd[1];</div><div class='del'>-</div><div class='del'>-	err = inet_socketpair(family, type, &amp;p1, &amp;c1);</div><div class='del'>-	if (err)</div><div class='del'>-		goto close;</div><div class='del'>-</div><div class='del'>-	pairs_redir_to_connected(c0, p0, c1, p1, sock_mapfd, -1, verd_mapfd,</div><div class='del'>-				 mode, NO_FLAGS);</div><div class='del'>-</div><div class='del'>-	xclose(c1);</div><div class='del'>-	xclose(p1);</div><div class='del'>-close:</div><div class='del'>-	xclose(c0);</div><div class='del'>-	xclose(p0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void inet_unix_skb_redir_to_connected(struct test_sockmap_listen *skel,</div><div class='del'>-					    struct bpf_map *inner_map, int family)</div><div class='del'>-{</div><div class='del'>-	int verdict = bpf_program__fd(skel-&gt;progs.prog_skb_verdict);</div><div class='del'>-	int verdict_map = bpf_map__fd(skel-&gt;maps.verdict_map);</div><div class='del'>-	int sock_map = bpf_map__fd(inner_map);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xbpf_prog_attach(verdict, sock_map, BPF_SK_SKB_VERDICT, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skel-&gt;bss-&gt;test_ingress = false;</div><div class='del'>-	inet_unix_redir_to_connected(family, SOCK_DGRAM, sock_map, verdict_map,</div><div class='del'>-				    REDIR_EGRESS);</div><div class='del'>-	inet_unix_redir_to_connected(family, SOCK_STREAM, sock_map, verdict_map,</div><div class='del'>-				    REDIR_EGRESS);</div><div class='del'>-	skel-&gt;bss-&gt;test_ingress = true;</div><div class='del'>-	inet_unix_redir_to_connected(family, SOCK_DGRAM, sock_map, verdict_map,</div><div class='del'>-				    REDIR_INGRESS);</div><div class='del'>-	inet_unix_redir_to_connected(family, SOCK_STREAM, sock_map, verdict_map,</div><div class='del'>-				    REDIR_INGRESS);</div><div class='del'>-</div><div class='del'>-	xbpf_prog_detach2(verdict, sock_map, BPF_SK_SKB_VERDICT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unix_inet_redir_to_connected(int family, int type, int sock_mapfd,</div><div class='del'>-					 int nop_mapfd, int verd_mapfd,</div><div class='del'>-					 enum redir_mode mode, int send_flags)</div><div class='del'>-{</div><div class='del'>-	int c0, c1, p0, p1;</div><div class='del'>-	int sfd[2];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = inet_socketpair(family, type, &amp;p0, &amp;c0);</div><div class='del'>-	if (err)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (socketpair(AF_UNIX, type | SOCK_NONBLOCK, 0, sfd))</div><div class='del'>-		goto close_cli0;</div><div class='del'>-	c1 = sfd[0], p1 = sfd[1];</div><div class='del'>-</div><div class='del'>-	pairs_redir_to_connected(c0, p0, c1, p1, sock_mapfd, nop_mapfd,</div><div class='del'>-				 verd_mapfd, mode, send_flags);</div><div class='del'>-</div><div class='del'>-	xclose(c1);</div><div class='del'>-	xclose(p1);</div><div class='del'>-close_cli0:</div><div class='del'>-	xclose(c0);</div><div class='del'>-	xclose(p0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unix_inet_skb_redir_to_connected(struct test_sockmap_listen *skel,</div><div class='del'>-					    struct bpf_map *inner_map, int family)</div><div class='del'>-{</div><div class='del'>-	int verdict = bpf_program__fd(skel-&gt;progs.prog_skb_verdict);</div><div class='del'>-	int nop_map = bpf_map__fd(skel-&gt;maps.nop_map);</div><div class='del'>-	int verdict_map = bpf_map__fd(skel-&gt;maps.verdict_map);</div><div class='del'>-	int sock_map = bpf_map__fd(inner_map);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = xbpf_prog_attach(verdict, sock_map, BPF_SK_SKB_VERDICT, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skel-&gt;bss-&gt;test_ingress = false;</div><div class='del'>-	unix_inet_redir_to_connected(family, SOCK_DGRAM,</div><div class='del'>-				     sock_map, -1, verdict_map,</div><div class='del'>-				     REDIR_EGRESS, NO_FLAGS);</div><div class='del'>-	unix_inet_redir_to_connected(family, SOCK_STREAM,</div><div class='del'>-				     sock_map, -1, verdict_map,</div><div class='del'>-				     REDIR_EGRESS, NO_FLAGS);</div><div class='del'>-</div><div class='del'>-	unix_inet_redir_to_connected(family, SOCK_DGRAM,</div><div class='del'>-				     sock_map, nop_map, verdict_map,</div><div class='del'>-				     REDIR_EGRESS, NO_FLAGS);</div><div class='del'>-	unix_inet_redir_to_connected(family, SOCK_STREAM,</div><div class='del'>-				     sock_map, nop_map, verdict_map,</div><div class='del'>-				     REDIR_EGRESS, NO_FLAGS);</div><div class='del'>-</div><div class='del'>-	/* MSG_OOB not supported by AF_UNIX SOCK_DGRAM */</div><div class='del'>-	unix_inet_redir_to_connected(family, SOCK_STREAM,</div><div class='del'>-				     sock_map, nop_map, verdict_map,</div><div class='del'>-				     REDIR_EGRESS, MSG_OOB);</div><div class='del'>-</div><div class='del'>-	skel-&gt;bss-&gt;test_ingress = true;</div><div class='del'>-	unix_inet_redir_to_connected(family, SOCK_DGRAM,</div><div class='del'>-				     sock_map, -1, verdict_map,</div><div class='del'>-				     REDIR_INGRESS, NO_FLAGS);</div><div class='del'>-	unix_inet_redir_to_connected(family, SOCK_STREAM,</div><div class='del'>-				     sock_map, -1, verdict_map,</div><div class='del'>-				     REDIR_INGRESS, NO_FLAGS);</div><div class='del'>-</div><div class='del'>-	unix_inet_redir_to_connected(family, SOCK_DGRAM,</div><div class='del'>-				     sock_map, nop_map, verdict_map,</div><div class='del'>-				     REDIR_INGRESS, NO_FLAGS);</div><div class='del'>-	unix_inet_redir_to_connected(family, SOCK_STREAM,</div><div class='del'>-				     sock_map, nop_map, verdict_map,</div><div class='del'>-				     REDIR_INGRESS, NO_FLAGS);</div><div class='del'>-</div><div class='del'>-	/* MSG_OOB not supported by AF_UNIX SOCK_DGRAM */</div><div class='del'>-	unix_inet_redir_to_connected(family, SOCK_STREAM,</div><div class='del'>-				     sock_map, nop_map, verdict_map,</div><div class='del'>-				     REDIR_INGRESS, MSG_OOB);</div><div class='del'>-</div><div class='del'>-	xbpf_prog_detach2(verdict, sock_map, BPF_SK_SKB_VERDICT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_udp_unix_redir(struct test_sockmap_listen *skel, struct bpf_map *map,</div><div class='del'>-				int family)</div><div class='del'>-{</div><div class='del'>-	const char *family_name, *map_name;</div><div class='del'>-	struct netns_obj *netns;</div><div class='del'>-	char s[MAX_TEST_NAME];</div><div class='del'>-</div><div class='del'>-	family_name = family_str(family);</div><div class='del'>-	map_name = map_type_str(map);</div><div class='del'>-	snprintf(s, sizeof(s), "%s %s %s", map_name, family_name, __func__);</div><div class='del'>-	if (!test__start_subtest(s))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	netns = netns_new("sockmap_listen", true);</div><div class='del'>-	if (!ASSERT_OK_PTR(netns, "netns_new"))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	inet_unix_skb_redir_to_connected(skel, map, family);</div><div class='del'>-	unix_inet_skb_redir_to_connected(skel, map, family);</div><div class='del'>-</div><div class='del'>-	netns_free(netns);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void run_tests(struct test_sockmap_listen *skel, struct bpf_map *map,</div><div class='ctx'> 		      int family)</div><div class='ctx'> {</div><div class='hunk'>@@ -1863,8 +1416,6 @@ static void run_tests(struct test_sockmap_listen *skel, struct bpf_map *map,</div><div class='ctx'> 	test_redir(skel, map, family, SOCK_STREAM);</div><div class='ctx'> 	test_reuseport(skel, map, family, SOCK_STREAM);</div><div class='ctx'> 	test_reuseport(skel, map, family, SOCK_DGRAM);</div><div class='del'>-	test_udp_redir(skel, map, family);</div><div class='del'>-	test_udp_unix_redir(skel, map, family);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void serial_test_sockmap_listen(void)</div><div class='hunk'>@@ -1880,16 +1431,10 @@ void serial_test_sockmap_listen(void)</div><div class='ctx'> 	skel-&gt;bss-&gt;test_sockmap = true;</div><div class='ctx'> 	run_tests(skel, skel-&gt;maps.sock_map, AF_INET);</div><div class='ctx'> 	run_tests(skel, skel-&gt;maps.sock_map, AF_INET6);</div><div class='del'>-	test_unix_redir(skel, skel-&gt;maps.sock_map, SOCK_DGRAM);</div><div class='del'>-	test_unix_redir(skel, skel-&gt;maps.sock_map, SOCK_STREAM);</div><div class='del'>-	test_vsock_redir(skel, skel-&gt;maps.sock_map);</div><div class='ctx'> </div><div class='ctx'> 	skel-&gt;bss-&gt;test_sockmap = false;</div><div class='ctx'> 	run_tests(skel, skel-&gt;maps.sock_hash, AF_INET);</div><div class='ctx'> 	run_tests(skel, skel-&gt;maps.sock_hash, AF_INET6);</div><div class='del'>-	test_unix_redir(skel, skel-&gt;maps.sock_hash, SOCK_DGRAM);</div><div class='del'>-	test_unix_redir(skel, skel-&gt;maps.sock_hash, SOCK_STREAM);</div><div class='del'>-	test_vsock_redir(skel, skel-&gt;maps.sock_hash);</div><div class='ctx'> </div><div class='ctx'> 	test_sockmap_listen__destroy(skel);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_redir.c b/tools/testing/selftests/bpf/prog_tests/sockmap_redir.c<br/>new file mode 100644<br/>index 000000000000..9c461d93113d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_redir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/sockmap_redir.c</a></div><div class='hunk'>@@ -0,0 +1,465 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Test for sockmap/sockhash redirection.</div><div class='add'>+ *</div><div class='add'>+ * BPF_MAP_TYPE_SOCKMAP</div><div class='add'>+ * BPF_MAP_TYPE_SOCKHASH</div><div class='add'>+ *	x</div><div class='add'>+ * sk_msg-to-egress</div><div class='add'>+ * sk_msg-to-ingress</div><div class='add'>+ * sk_skb-to-egress</div><div class='add'>+ * sk_skb-to-ingress</div><div class='add'>+ *	x</div><div class='add'>+ * AF_INET, SOCK_STREAM</div><div class='add'>+ * AF_INET6, SOCK_STREAM</div><div class='add'>+ * AF_INET, SOCK_DGRAM</div><div class='add'>+ * AF_INET6, SOCK_DGRAM</div><div class='add'>+ * AF_UNIX, SOCK_STREAM</div><div class='add'>+ * AF_UNIX, SOCK_DGRAM</div><div class='add'>+ * AF_VSOCK, SOCK_STREAM</div><div class='add'>+ * AF_VSOCK, SOCK_SEQPACKET</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;error.h&gt;</div><div class='add'>+#include &lt;sched.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/un.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/vm_sockets.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;bpf/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/libbpf.h&gt;</div><div class='add'>+</div><div class='add'>+#include "linux/const.h"</div><div class='add'>+#include "test_progs.h"</div><div class='add'>+#include "sockmap_helpers.h"</div><div class='add'>+#include "test_sockmap_redir.skel.h"</div><div class='add'>+</div><div class='add'>+/* The meaning of SUPPORTED is "will redirect packet as expected".</div><div class='add'>+ */</div><div class='add'>+#define SUPPORTED		_BITUL(0)</div><div class='add'>+</div><div class='add'>+/* Note on sk_skb-to-ingress -&gt;af_vsock:</div><div class='add'>+ *</div><div class='add'>+ * Peer socket may receive the packet some time after the return from sendmsg().</div><div class='add'>+ * In a typical usage scenario, recvmsg() will block until the redirected packet</div><div class='add'>+ * appears in the destination queue, or timeout if the packet was dropped. By</div><div class='add'>+ * that point, the verdict map has already been updated to reflect what has</div><div class='add'>+ * happened.</div><div class='add'>+ *</div><div class='add'>+ * But sk_skb-to-ingress/af_vsock is an unsupported combination, so no recvmsg()</div><div class='add'>+ * takes place. Which means we may race the execution of the verdict logic and</div><div class='add'>+ * read map_verd before it has been updated, i.e. we might observe</div><div class='add'>+ * map_verd[SK_DROP]=0 instead of map_verd[SK_DROP]=1.</div><div class='add'>+ *</div><div class='add'>+ * This confuses the selftest logic: if there was no packet dropped, where's the</div><div class='add'>+ * packet? So here's a heuristic: on map_verd[SK_DROP]=map_verd[SK_PASS]=0</div><div class='add'>+ * (which implies the verdict program has not been ran) just re-read the verdict</div><div class='add'>+ * map again.</div><div class='add'>+ */</div><div class='add'>+#define UNSUPPORTED_RACY_VERD	_BITUL(1)</div><div class='add'>+</div><div class='add'>+enum prog_type {</div><div class='add'>+	SK_MSG_EGRESS,</div><div class='add'>+	SK_MSG_INGRESS,</div><div class='add'>+	SK_SKB_EGRESS,</div><div class='add'>+	SK_SKB_INGRESS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	SEND_INNER = 0,</div><div class='add'>+	SEND_OUTER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	RECV_INNER = 0,</div><div class='add'>+	RECV_OUTER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct maps {</div><div class='add'>+	int in;</div><div class='add'>+	int out;</div><div class='add'>+	int verd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct combo_spec {</div><div class='add'>+	enum prog_type prog_type;</div><div class='add'>+	const char *in, *out;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct redir_spec {</div><div class='add'>+	const char *name;</div><div class='add'>+	int idx_send;</div><div class='add'>+	int idx_recv;</div><div class='add'>+	enum prog_type prog_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct socket_spec {</div><div class='add'>+	int family;</div><div class='add'>+	int sotype;</div><div class='add'>+	int send_flags;</div><div class='add'>+	int in[2];</div><div class='add'>+	int out[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int socket_spec_pairs(struct socket_spec *s)</div><div class='add'>+{</div><div class='add'>+	return create_socket_pairs(s-&gt;family, s-&gt;sotype,</div><div class='add'>+				   &amp;s-&gt;in[0], &amp;s-&gt;out[0],</div><div class='add'>+				   &amp;s-&gt;in[1], &amp;s-&gt;out[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void socket_spec_close(struct socket_spec *s)</div><div class='add'>+{</div><div class='add'>+	xclose(s-&gt;in[0]);</div><div class='add'>+	xclose(s-&gt;in[1]);</div><div class='add'>+	xclose(s-&gt;out[0]);</div><div class='add'>+	xclose(s-&gt;out[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void get_redir_params(struct redir_spec *redir,</div><div class='add'>+			     struct test_sockmap_redir *skel, int *prog_fd,</div><div class='add'>+			     enum bpf_attach_type *attach_type,</div><div class='add'>+			     int *redirect_flags)</div><div class='add'>+{</div><div class='add'>+	enum prog_type type = redir-&gt;prog_type;</div><div class='add'>+	struct bpf_program *prog;</div><div class='add'>+	bool sk_msg;</div><div class='add'>+</div><div class='add'>+	sk_msg = type == SK_MSG_INGRESS || type == SK_MSG_EGRESS;</div><div class='add'>+	prog = sk_msg ? skel-&gt;progs.prog_msg_verdict : skel-&gt;progs.prog_skb_verdict;</div><div class='add'>+</div><div class='add'>+	*prog_fd = bpf_program__fd(prog);</div><div class='add'>+	*attach_type = sk_msg ? BPF_SK_MSG_VERDICT : BPF_SK_SKB_VERDICT;</div><div class='add'>+</div><div class='add'>+	if (type == SK_MSG_INGRESS || type == SK_SKB_INGRESS)</div><div class='add'>+		*redirect_flags = BPF_F_INGRESS;</div><div class='add'>+	else</div><div class='add'>+		*redirect_flags = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void try_recv(const char *prefix, int fd, int flags, bool expect_success)</div><div class='add'>+{</div><div class='add'>+	ssize_t n;</div><div class='add'>+	char buf;</div><div class='add'>+</div><div class='add'>+	errno = 0;</div><div class='add'>+	n = recv(fd, &amp;buf, 1, flags);</div><div class='add'>+	if (n &lt; 0 &amp;&amp; expect_success)</div><div class='add'>+		FAIL_ERRNO("%s: unexpected failure: retval=%zd", prefix, n);</div><div class='add'>+	if (!n &amp;&amp; !expect_success)</div><div class='add'>+		FAIL("%s: expected failure: retval=%zd", prefix, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_unsupported(int sd_send, int sd_peer, int sd_in, int sd_out,</div><div class='add'>+			       int sd_recv, int map_verd, int status)</div><div class='add'>+{</div><div class='add'>+	unsigned int drop, pass;</div><div class='add'>+	char recv_buf;</div><div class='add'>+	ssize_t n;</div><div class='add'>+</div><div class='add'>+get_verdict:</div><div class='add'>+	if (xbpf_map_lookup_elem(map_verd, &amp;u32(SK_DROP), &amp;drop) ||</div><div class='add'>+	    xbpf_map_lookup_elem(map_verd, &amp;u32(SK_PASS), &amp;pass))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pass == 0 &amp;&amp; drop == 0 &amp;&amp; (status &amp; UNSUPPORTED_RACY_VERD)) {</div><div class='add'>+		sched_yield();</div><div class='add'>+		goto get_verdict;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pass != 0) {</div><div class='add'>+		FAIL("unsupported: wanted verdict pass 0, have %u", pass);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If nothing was dropped, packet should have reached the peer */</div><div class='add'>+	if (drop == 0) {</div><div class='add'>+		errno = 0;</div><div class='add'>+		n = recv_timeout(sd_peer, &amp;recv_buf, 1, 0, IO_TIMEOUT_SEC);</div><div class='add'>+		if (n != 1)</div><div class='add'>+			FAIL_ERRNO("unsupported: packet missing, retval=%zd", n);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure queues are empty */</div><div class='add'>+	try_recv("bpf.recv(sd_send)", sd_send, MSG_DONTWAIT, false);</div><div class='add'>+	if (sd_in != sd_send)</div><div class='add'>+		try_recv("bpf.recv(sd_in)", sd_in, MSG_DONTWAIT, false);</div><div class='add'>+</div><div class='add'>+	try_recv("bpf.recv(sd_out)", sd_out, MSG_DONTWAIT, false);</div><div class='add'>+	if (sd_recv != sd_out)</div><div class='add'>+		try_recv("bpf.recv(sd_recv)", sd_recv, MSG_DONTWAIT, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_send_redir_recv(int sd_send, int send_flags, int sd_peer,</div><div class='add'>+				 int sd_in, int sd_out, int sd_recv,</div><div class='add'>+				 struct maps *maps, int status)</div><div class='add'>+{</div><div class='add'>+	unsigned int drop, pass;</div><div class='add'>+	char *send_buf = "ab";</div><div class='add'>+	char recv_buf = '\0';</div><div class='add'>+	ssize_t n, len = 1;</div><div class='add'>+</div><div class='add'>+	/* Zero out the verdict map */</div><div class='add'>+	if (xbpf_map_update_elem(maps-&gt;verd, &amp;u32(SK_DROP), &amp;u32(0), BPF_ANY) ||</div><div class='add'>+	    xbpf_map_update_elem(maps-&gt;verd, &amp;u32(SK_PASS), &amp;u32(0), BPF_ANY))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (xbpf_map_update_elem(maps-&gt;in, &amp;u32(0), &amp;u64(sd_in), BPF_NOEXIST))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (xbpf_map_update_elem(maps-&gt;out, &amp;u32(0), &amp;u64(sd_out), BPF_NOEXIST))</div><div class='add'>+		goto del_in;</div><div class='add'>+</div><div class='add'>+	/* Last byte is OOB data when send_flags has MSG_OOB bit set */</div><div class='add'>+	if (send_flags &amp; MSG_OOB)</div><div class='add'>+		len++;</div><div class='add'>+	n = send(sd_send, send_buf, len, send_flags);</div><div class='add'>+	if (n &gt;= 0 &amp;&amp; n &lt; len)</div><div class='add'>+		FAIL("incomplete send");</div><div class='add'>+	if (n &lt; 0) {</div><div class='add'>+		/* sk_msg redirect combo not supported? */</div><div class='add'>+		if (status &amp; SUPPORTED || errno != EACCES)</div><div class='add'>+			FAIL_ERRNO("send");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(status &amp; SUPPORTED)) {</div><div class='add'>+		handle_unsupported(sd_send, sd_peer, sd_in, sd_out, sd_recv,</div><div class='add'>+				   maps-&gt;verd, status);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	errno = 0;</div><div class='add'>+	n = recv_timeout(sd_recv, &amp;recv_buf, 1, 0, IO_TIMEOUT_SEC);</div><div class='add'>+	if (n != 1) {</div><div class='add'>+		FAIL_ERRNO("recv_timeout()");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check verdict _after_ recv(); af_vsock may need time to catch up */</div><div class='add'>+	if (xbpf_map_lookup_elem(maps-&gt;verd, &amp;u32(SK_DROP), &amp;drop) ||</div><div class='add'>+	    xbpf_map_lookup_elem(maps-&gt;verd, &amp;u32(SK_PASS), &amp;pass))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (drop != 0 || pass != 1)</div><div class='add'>+		FAIL("unexpected verdict drop/pass: wanted 0/1, have %u/%u",</div><div class='add'>+		     drop, pass);</div><div class='add'>+</div><div class='add'>+	if (recv_buf != send_buf[0])</div><div class='add'>+		FAIL("recv(): payload check, %02x != %02x", recv_buf, send_buf[0]);</div><div class='add'>+</div><div class='add'>+	if (send_flags &amp; MSG_OOB) {</div><div class='add'>+		/* Fail reading OOB while in sockmap */</div><div class='add'>+		try_recv("bpf.recv(sd_out, MSG_OOB)", sd_out,</div><div class='add'>+			 MSG_OOB | MSG_DONTWAIT, false);</div><div class='add'>+</div><div class='add'>+		/* Remove sd_out from sockmap */</div><div class='add'>+		xbpf_map_delete_elem(maps-&gt;out, &amp;u32(0));</div><div class='add'>+</div><div class='add'>+		/* Check that OOB was dropped on redirect */</div><div class='add'>+		try_recv("recv(sd_out, MSG_OOB)", sd_out,</div><div class='add'>+			 MSG_OOB | MSG_DONTWAIT, false);</div><div class='add'>+</div><div class='add'>+		goto del_in;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	xbpf_map_delete_elem(maps-&gt;out, &amp;u32(0));</div><div class='add'>+del_in:</div><div class='add'>+	xbpf_map_delete_elem(maps-&gt;in, &amp;u32(0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_redir_supported(enum prog_type type, const char *in,</div><div class='add'>+			      const char *out)</div><div class='add'>+{</div><div class='add'>+	/* Matching based on strings returned by socket_kind_to_str():</div><div class='add'>+	 * tcp4, udp4, tcp6, udp6, u_str, u_dgr, v_str, v_seq</div><div class='add'>+	 * Plus a wildcard: any</div><div class='add'>+	 * Not in use: u_seq, v_dgr</div><div class='add'>+	 */</div><div class='add'>+	struct combo_spec *c, combos[] = {</div><div class='add'>+		/* Send to local: TCP -&gt; any, but vsock */</div><div class='add'>+		{ SK_MSG_INGRESS,	"tcp",	"tcp"	},</div><div class='add'>+		{ SK_MSG_INGRESS,	"tcp",	"udp"	},</div><div class='add'>+		{ SK_MSG_INGRESS,	"tcp",	"u_str"	},</div><div class='add'>+		{ SK_MSG_INGRESS,	"tcp",	"u_dgr"	},</div><div class='add'>+</div><div class='add'>+		/* Send to egress: TCP -&gt; TCP */</div><div class='add'>+		{ SK_MSG_EGRESS,	"tcp",	"tcp"	},</div><div class='add'>+</div><div class='add'>+		/* Ingress to egress: any -&gt; any */</div><div class='add'>+		{ SK_SKB_EGRESS,	"any",	"any"	},</div><div class='add'>+</div><div class='add'>+		/* Ingress to local: any -&gt; any, but vsock */</div><div class='add'>+		{ SK_SKB_INGRESS,	"any",	"tcp"	},</div><div class='add'>+		{ SK_SKB_INGRESS,	"any",	"udp"	},</div><div class='add'>+		{ SK_SKB_INGRESS,	"any",	"u_str"	},</div><div class='add'>+		{ SK_SKB_INGRESS,	"any",	"u_dgr"	},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	for (c = combos; c &lt; combos + ARRAY_SIZE(combos); c++) {</div><div class='add'>+		if (c-&gt;prog_type == type &amp;&amp;</div><div class='add'>+		    (!strcmp(c-&gt;in, "any") || strstarts(in, c-&gt;in)) &amp;&amp;</div><div class='add'>+		    (!strcmp(c-&gt;out, "any") || strstarts(out, c-&gt;out)))</div><div class='add'>+			return SUPPORTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_support_status(enum prog_type type, const char *in,</div><div class='add'>+			      const char *out)</div><div class='add'>+{</div><div class='add'>+	int status = is_redir_supported(type, in, out);</div><div class='add'>+</div><div class='add'>+	if (type == SK_SKB_INGRESS &amp;&amp; strstarts(out, "v_"))</div><div class='add'>+		status |= UNSUPPORTED_RACY_VERD;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_socket(enum bpf_map_type type, struct redir_spec *redir,</div><div class='add'>+			struct maps *maps, struct socket_spec *s_in,</div><div class='add'>+			struct socket_spec *s_out)</div><div class='add'>+{</div><div class='add'>+	int fd_in, fd_out, fd_send, fd_peer, fd_recv, flags, status;</div><div class='add'>+	const char *in_str, *out_str;</div><div class='add'>+	char s[MAX_TEST_NAME];</div><div class='add'>+</div><div class='add'>+	fd_in = s_in-&gt;in[0];</div><div class='add'>+	fd_out = s_out-&gt;out[0];</div><div class='add'>+	fd_send = s_in-&gt;in[redir-&gt;idx_send];</div><div class='add'>+	fd_peer = s_in-&gt;in[redir-&gt;idx_send ^ 1];</div><div class='add'>+	fd_recv = s_out-&gt;out[redir-&gt;idx_recv];</div><div class='add'>+	flags = s_in-&gt;send_flags;</div><div class='add'>+</div><div class='add'>+	in_str = socket_kind_to_str(fd_in);</div><div class='add'>+	out_str = socket_kind_to_str(fd_out);</div><div class='add'>+	status = get_support_status(redir-&gt;prog_type, in_str, out_str);</div><div class='add'>+</div><div class='add'>+	snprintf(s, sizeof(s),</div><div class='add'>+		 "%-4s %-17s %-5s %s %-5s%6s",</div><div class='add'>+		 /* hash sk_skb-to-ingress u_str → v_str (OOB) */</div><div class='add'>+		 type == BPF_MAP_TYPE_SOCKMAP ? "map" : "hash",</div><div class='add'>+		 redir-&gt;name,</div><div class='add'>+		 in_str,</div><div class='add'>+		 status &amp; SUPPORTED ? "→" : " ",</div><div class='add'>+		 out_str,</div><div class='add'>+		 (flags &amp; MSG_OOB) ? "(OOB)" : "");</div><div class='add'>+</div><div class='add'>+	if (!test__start_subtest(s))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	test_send_redir_recv(fd_send, flags, fd_peer, fd_in, fd_out, fd_recv,</div><div class='add'>+			     maps, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_redir(enum bpf_map_type type, struct redir_spec *redir,</div><div class='add'>+		       struct maps *maps)</div><div class='add'>+{</div><div class='add'>+	struct socket_spec *s, sockets[] = {</div><div class='add'>+		{ AF_INET, SOCK_STREAM },</div><div class='add'>+		// { AF_INET, SOCK_STREAM, MSG_OOB }, /* Known to be broken */</div><div class='add'>+		{ AF_INET6, SOCK_STREAM },</div><div class='add'>+		{ AF_INET, SOCK_DGRAM },</div><div class='add'>+		{ AF_INET6, SOCK_DGRAM },</div><div class='add'>+		{ AF_UNIX, SOCK_STREAM },</div><div class='add'>+		{ AF_UNIX, SOCK_STREAM, MSG_OOB },</div><div class='add'>+		{ AF_UNIX, SOCK_DGRAM },</div><div class='add'>+		// { AF_UNIX, SOCK_SEQPACKET},	/* Unsupported BPF_MAP_UPDATE_ELEM */</div><div class='add'>+		{ AF_VSOCK, SOCK_STREAM },</div><div class='add'>+		// { AF_VSOCK, SOCK_DGRAM },	/* Unsupported socket() */</div><div class='add'>+		{ AF_VSOCK, SOCK_SEQPACKET },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	for (s = sockets; s &lt; sockets + ARRAY_SIZE(sockets); s++)</div><div class='add'>+		if (socket_spec_pairs(s))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+	/* Intra-proto */</div><div class='add'>+	for (s = sockets; s &lt; sockets + ARRAY_SIZE(sockets); s++)</div><div class='add'>+		test_socket(type, redir, maps, s, s);</div><div class='add'>+</div><div class='add'>+	/* Cross-proto */</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(sockets); i++) {</div><div class='add'>+		for (int j = 0; j &lt; ARRAY_SIZE(sockets); j++) {</div><div class='add'>+			struct socket_spec *out = &amp;sockets[j];</div><div class='add'>+			struct socket_spec *in = &amp;sockets[i];</div><div class='add'>+</div><div class='add'>+			/* Skip intra-proto and between variants */</div><div class='add'>+			if (out-&gt;send_flags ||</div><div class='add'>+			    (in-&gt;family == out-&gt;family &amp;&amp;</div><div class='add'>+			     in-&gt;sotype == out-&gt;sotype))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			test_socket(type, redir, maps, in, out);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	while (--s &gt;= sockets)</div><div class='add'>+		socket_spec_close(s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_map(enum bpf_map_type type)</div><div class='add'>+{</div><div class='add'>+	struct redir_spec *r, redirs[] = {</div><div class='add'>+		{ "sk_msg-to-ingress", SEND_INNER, RECV_INNER, SK_MSG_INGRESS },</div><div class='add'>+		{ "sk_msg-to-egress", SEND_INNER, RECV_OUTER, SK_MSG_EGRESS },</div><div class='add'>+		{ "sk_skb-to-egress", SEND_OUTER, RECV_OUTER, SK_SKB_EGRESS },</div><div class='add'>+		{ "sk_skb-to-ingress", SEND_OUTER, RECV_INNER, SK_SKB_INGRESS },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	for (r = redirs; r &lt; redirs + ARRAY_SIZE(redirs); r++) {</div><div class='add'>+		enum bpf_attach_type attach_type;</div><div class='add'>+		struct test_sockmap_redir *skel;</div><div class='add'>+		struct maps maps;</div><div class='add'>+		int prog_fd;</div><div class='add'>+</div><div class='add'>+		skel = test_sockmap_redir__open_and_load();</div><div class='add'>+		if (!skel) {</div><div class='add'>+			FAIL("open_and_load");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case BPF_MAP_TYPE_SOCKMAP:</div><div class='add'>+			maps.in = bpf_map__fd(skel-&gt;maps.nop_map);</div><div class='add'>+			maps.out = bpf_map__fd(skel-&gt;maps.sock_map);</div><div class='add'>+			break;</div><div class='add'>+		case BPF_MAP_TYPE_SOCKHASH:</div><div class='add'>+			maps.in = bpf_map__fd(skel-&gt;maps.nop_hash);</div><div class='add'>+			maps.out = bpf_map__fd(skel-&gt;maps.sock_hash);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			FAIL("Unsupported bpf_map_type");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skel-&gt;bss-&gt;redirect_type = type;</div><div class='add'>+		maps.verd = bpf_map__fd(skel-&gt;maps.verdict_map);</div><div class='add'>+		get_redir_params(r, skel, &amp;prog_fd, &amp;attach_type,</div><div class='add'>+				 &amp;skel-&gt;bss-&gt;redirect_flags);</div><div class='add'>+</div><div class='add'>+		if (xbpf_prog_attach(prog_fd, maps.in, attach_type, 0))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		test_redir(type, r, &amp;maps);</div><div class='add'>+</div><div class='add'>+		if (xbpf_prog_detach2(prog_fd, maps.in, attach_type))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		test_sockmap_redir__destroy(skel);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void serial_test_sockmap_redir(void)</div><div class='add'>+{</div><div class='add'>+	test_map(BPF_MAP_TYPE_SOCKMAP);</div><div class='add'>+	test_map(BPF_MAP_TYPE_SOCKHASH);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_strp.c b/tools/testing/selftests/bpf/prog_tests/sockmap_strp.c<br/>new file mode 100644<br/>index 000000000000..621b3b71888e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_strp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/sockmap_strp.c</a></div><div class='hunk'>@@ -0,0 +1,454 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;error.h&gt;</div><div class='add'>+#include &lt;netinet/tcp.h&gt;</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "sockmap_helpers.h"</div><div class='add'>+#include "test_skmsg_load_helpers.skel.h"</div><div class='add'>+#include "test_sockmap_strp.skel.h"</div><div class='add'>+</div><div class='add'>+#define STRP_PKT_HEAD_LEN 4</div><div class='add'>+#define STRP_PKT_BODY_LEN 6</div><div class='add'>+#define STRP_PKT_FULL_LEN (STRP_PKT_HEAD_LEN + STRP_PKT_BODY_LEN)</div><div class='add'>+</div><div class='add'>+static const char packet[STRP_PKT_FULL_LEN] = "head+body\0";</div><div class='add'>+static const int test_packet_num = 100;</div><div class='add'>+</div><div class='add'>+/* Current implementation of tcp_bpf_recvmsg_parser() invokes data_ready</div><div class='add'>+ * with sk held if an skb exists in sk_receive_queue. Then for the</div><div class='add'>+ * data_ready implementation of strparser, it will delay the read</div><div class='add'>+ * operation if sk is held and EAGAIN is returned.</div><div class='add'>+ */</div><div class='add'>+static int sockmap_strp_consume_pre_data(int p)</div><div class='add'>+{</div><div class='add'>+	int recvd;</div><div class='add'>+	bool retried = false;</div><div class='add'>+	char rcv[10];</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	errno = 0;</div><div class='add'>+	recvd = recv_timeout(p, rcv, sizeof(rcv), 0, 1);</div><div class='add'>+	if (recvd &lt; 0 &amp;&amp; errno == EAGAIN &amp;&amp; retried == false) {</div><div class='add'>+		/* On the first call, EAGAIN will certainly be returned.</div><div class='add'>+		 * A 1-second wait is enough for the workqueue to finish.</div><div class='add'>+		 */</div><div class='add'>+		sleep(1);</div><div class='add'>+		retried = true;</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(recvd, STRP_PKT_FULL_LEN, "recv error or truncated data") ||</div><div class='add'>+	    !ASSERT_OK(memcmp(packet, rcv, STRP_PKT_FULL_LEN),</div><div class='add'>+				"data mismatch"))</div><div class='add'>+		return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct test_sockmap_strp *sockmap_strp_init(int *out_map, bool pass,</div><div class='add'>+						   bool need_parser)</div><div class='add'>+{</div><div class='add'>+	struct test_sockmap_strp *strp = NULL;</div><div class='add'>+	int verdict, parser;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	strp = test_sockmap_strp__open_and_load();</div><div class='add'>+	*out_map = bpf_map__fd(strp-&gt;maps.sock_map);</div><div class='add'>+</div><div class='add'>+	if (need_parser)</div><div class='add'>+		parser = bpf_program__fd(strp-&gt;progs.prog_skb_parser_partial);</div><div class='add'>+	else</div><div class='add'>+		parser = bpf_program__fd(strp-&gt;progs.prog_skb_parser);</div><div class='add'>+</div><div class='add'>+	if (pass)</div><div class='add'>+		verdict = bpf_program__fd(strp-&gt;progs.prog_skb_verdict_pass);</div><div class='add'>+	else</div><div class='add'>+		verdict = bpf_program__fd(strp-&gt;progs.prog_skb_verdict);</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach(parser, *out_map, BPF_SK_SKB_STREAM_PARSER, 0);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach stream parser"))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	err = bpf_prog_attach(verdict, *out_map, BPF_SK_SKB_STREAM_VERDICT, 0);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_attach stream verdict"))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return strp;</div><div class='add'>+err:</div><div class='add'>+	test_sockmap_strp__destroy(strp);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Dispatch packets to different socket by packet size:</div><div class='add'>+ *</div><div class='add'>+ *                      ------  ------</div><div class='add'>+ *                     | pkt4 || pkt1 |... &gt; remote socket</div><div class='add'>+ *  ------ ------     / ------  ------</div><div class='add'>+ * | pkt8 | pkt7 |...</div><div class='add'>+ *  ------ ------     \ ------  ------</div><div class='add'>+ *                     | pkt3 || pkt2 |... &gt; local socket</div><div class='add'>+ *                      ------  ------</div><div class='add'>+ */</div><div class='add'>+static void test_sockmap_strp_dispatch_pkt(int family, int sotype)</div><div class='add'>+{</div><div class='add'>+	int i, j, zero = 0, one = 1, recvd;</div><div class='add'>+	int err, map;</div><div class='add'>+	int c0 = -1, p0 = -1, c1 = -1, p1 = -1;</div><div class='add'>+	struct test_sockmap_strp *strp = NULL;</div><div class='add'>+	int test_cnt = 6;</div><div class='add'>+	char rcv[10];</div><div class='add'>+	struct {</div><div class='add'>+		char	data[7];</div><div class='add'>+		int	data_len;</div><div class='add'>+		int	send_cnt;</div><div class='add'>+		int	*receiver;</div><div class='add'>+	} send_dir[2] = {</div><div class='add'>+		/* data expected to deliver to local */</div><div class='add'>+		{"llllll", 6, 0, &amp;p0},</div><div class='add'>+		/* data expected to deliver to remote */</div><div class='add'>+		{"rrrrr",  5, 0, &amp;c1}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	strp = sockmap_strp_init(&amp;map, false, false);</div><div class='add'>+	if (!ASSERT_TRUE(strp, "sockmap_strp_init"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = create_socket_pairs(family, sotype, &amp;c0, &amp;c1, &amp;p0, &amp;p1);</div><div class='add'>+	if (!ASSERT_OK(err, "create_socket_pairs()"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(map, &amp;zero, &amp;p0, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_update_elem(p0)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(map, &amp;one, &amp;p1, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_update_elem(p1)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	err = setsockopt(c1, IPPROTO_TCP, TCP_NODELAY, &amp;zero, sizeof(zero));</div><div class='add'>+	if (!ASSERT_OK(err, "setsockopt(TCP_NODELAY)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* deliver data with data size greater than 5 to local */</div><div class='add'>+	strp-&gt;data-&gt;verdict_max_size = 5;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; test_cnt; i++) {</div><div class='add'>+		int d = i % 2;</div><div class='add'>+</div><div class='add'>+		xsend(c0, send_dir[d].data, send_dir[d].data_len, 0);</div><div class='add'>+		send_dir[d].send_cnt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		for (j = 0; j &lt; send_dir[i].send_cnt; j++) {</div><div class='add'>+			int expected = send_dir[i].data_len;</div><div class='add'>+</div><div class='add'>+			recvd = recv_timeout(*send_dir[i].receiver, rcv,</div><div class='add'>+					     expected, MSG_DONTWAIT,</div><div class='add'>+					     IO_TIMEOUT_SEC);</div><div class='add'>+			if (!ASSERT_EQ(recvd, expected, "recv_timeout()"))</div><div class='add'>+				goto out_close;</div><div class='add'>+			if (!ASSERT_OK(memcmp(send_dir[i].data, rcv, recvd),</div><div class='add'>+				       "data mismatch"))</div><div class='add'>+				goto out_close;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out_close:</div><div class='add'>+	close(c0);</div><div class='add'>+	close(c1);</div><div class='add'>+	close(p0);</div><div class='add'>+	close(p1);</div><div class='add'>+out:</div><div class='add'>+	test_sockmap_strp__destroy(strp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We have multiple packets in one skb</div><div class='add'>+ * ------------ ------------ ------------</div><div class='add'>+ * |  packet1  |   packet2  |  ...</div><div class='add'>+ * ------------ ------------ ------------</div><div class='add'>+ */</div><div class='add'>+static void test_sockmap_strp_multiple_pkt(int family, int sotype)</div><div class='add'>+{</div><div class='add'>+	int i, zero = 0;</div><div class='add'>+	int sent, recvd, total;</div><div class='add'>+	int err, map;</div><div class='add'>+	int c = -1, p = -1;</div><div class='add'>+	struct test_sockmap_strp *strp = NULL;</div><div class='add'>+	char *snd = NULL, *rcv = NULL;</div><div class='add'>+</div><div class='add'>+	strp = sockmap_strp_init(&amp;map, true, true);</div><div class='add'>+	if (!ASSERT_TRUE(strp, "sockmap_strp_init"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = create_pair(family, sotype, &amp;c, &amp;p);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(map, &amp;zero, &amp;p, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_update_elem(zero, p)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* construct multiple packets in one buffer */</div><div class='add'>+	total = test_packet_num * STRP_PKT_FULL_LEN;</div><div class='add'>+	snd = malloc(total);</div><div class='add'>+	rcv = malloc(total + 1);</div><div class='add'>+	if (!ASSERT_TRUE(snd, "malloc(snd)") ||</div><div class='add'>+	    !ASSERT_TRUE(rcv, "malloc(rcv)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; test_packet_num; i++) {</div><div class='add'>+		memcpy(snd + i * STRP_PKT_FULL_LEN,</div><div class='add'>+		       packet, STRP_PKT_FULL_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sent = xsend(c, snd, total, 0);</div><div class='add'>+	if (!ASSERT_EQ(sent, total, "xsend(c)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* try to recv one more byte to avoid truncation check */</div><div class='add'>+	recvd = recv_timeout(p, rcv, total + 1, MSG_DONTWAIT, IO_TIMEOUT_SEC);</div><div class='add'>+	if (!ASSERT_EQ(recvd, total, "recv(rcv)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* we sent TCP segment with multiple encapsulation</div><div class='add'>+	 * then check whether packets are handled correctly</div><div class='add'>+	 */</div><div class='add'>+	if (!ASSERT_OK(memcmp(snd, rcv, total), "data mismatch"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+out_close:</div><div class='add'>+	close(c);</div><div class='add'>+	close(p);</div><div class='add'>+	if (snd)</div><div class='add'>+		free(snd);</div><div class='add'>+	if (rcv)</div><div class='add'>+		free(rcv);</div><div class='add'>+out:</div><div class='add'>+	test_sockmap_strp__destroy(strp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test strparser with partial read */</div><div class='add'>+static void test_sockmap_strp_partial_read(int family, int sotype)</div><div class='add'>+{</div><div class='add'>+	int zero = 0, recvd, off;</div><div class='add'>+	int err, map;</div><div class='add'>+	int c = -1, p = -1;</div><div class='add'>+	struct test_sockmap_strp *strp = NULL;</div><div class='add'>+	char rcv[STRP_PKT_FULL_LEN + 1] = "0";</div><div class='add'>+</div><div class='add'>+	strp = sockmap_strp_init(&amp;map, true, true);</div><div class='add'>+	if (!ASSERT_TRUE(strp, "sockmap_strp_init"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = create_pair(family, sotype, &amp;c, &amp;p);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* sk_data_ready of 'p' will be replaced by strparser handler */</div><div class='add'>+	err = bpf_map_update_elem(map, &amp;zero, &amp;p, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_update_elem(zero, p)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* 1.1 send partial head, 1 byte header left */</div><div class='add'>+	off = STRP_PKT_HEAD_LEN - 1;</div><div class='add'>+	xsend(c, packet, off, 0);</div><div class='add'>+	recvd = recv_timeout(p, rcv, sizeof(rcv), MSG_DONTWAIT, 1);</div><div class='add'>+	if (!ASSERT_EQ(-1, recvd, "partial head sent, expected no data"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* 1.2 send remaining head and body */</div><div class='add'>+	xsend(c, packet + off, STRP_PKT_FULL_LEN - off, 0);</div><div class='add'>+	recvd = recv_timeout(p, rcv, sizeof(rcv), MSG_DONTWAIT, IO_TIMEOUT_SEC);</div><div class='add'>+	if (!ASSERT_EQ(recvd, STRP_PKT_FULL_LEN, "expected full data"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* 2.1 send partial head, 1 byte header left */</div><div class='add'>+	off = STRP_PKT_HEAD_LEN - 1;</div><div class='add'>+	xsend(c, packet, off, 0);</div><div class='add'>+</div><div class='add'>+	/* 2.2 send remaining head and partial body, 1 byte body left */</div><div class='add'>+	xsend(c, packet + off, STRP_PKT_FULL_LEN - off - 1, 0);</div><div class='add'>+	off = STRP_PKT_FULL_LEN - 1;</div><div class='add'>+	recvd = recv_timeout(p, rcv, sizeof(rcv), MSG_DONTWAIT, 1);</div><div class='add'>+	if (!ASSERT_EQ(-1, recvd, "partial body sent, expected no data"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* 2.3 send remaining body */</div><div class='add'>+	xsend(c, packet + off, STRP_PKT_FULL_LEN - off, 0);</div><div class='add'>+	recvd = recv_timeout(p, rcv, sizeof(rcv), MSG_DONTWAIT, IO_TIMEOUT_SEC);</div><div class='add'>+	if (!ASSERT_EQ(recvd, STRP_PKT_FULL_LEN, "expected full data"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+out_close:</div><div class='add'>+	close(c);</div><div class='add'>+	close(p);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	test_sockmap_strp__destroy(strp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test simple socket read/write with strparser + FIONREAD */</div><div class='add'>+static void test_sockmap_strp_pass(int family, int sotype, bool fionread)</div><div class='add'>+{</div><div class='add'>+	int zero = 0, pkt_size = STRP_PKT_FULL_LEN, sent, recvd, avail;</div><div class='add'>+	int err, map;</div><div class='add'>+	int c = -1, p = -1;</div><div class='add'>+	int test_cnt = 10, i;</div><div class='add'>+	struct test_sockmap_strp *strp = NULL;</div><div class='add'>+	char rcv[STRP_PKT_FULL_LEN + 1] = "0";</div><div class='add'>+</div><div class='add'>+	strp = sockmap_strp_init(&amp;map, true, true);</div><div class='add'>+	if (!ASSERT_TRUE(strp, "sockmap_strp_init"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = create_pair(family, sotype, &amp;c, &amp;p);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* inject some data before bpf process, it should be read</div><div class='add'>+	 * correctly because we check sk_receive_queue in</div><div class='add'>+	 * tcp_bpf_recvmsg_parser().</div><div class='add'>+	 */</div><div class='add'>+	sent = xsend(c, packet, pkt_size, 0);</div><div class='add'>+	if (!ASSERT_EQ(sent, pkt_size, "xsend(pre-data)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* sk_data_ready of 'p' will be replaced by strparser handler */</div><div class='add'>+	err = bpf_map_update_elem(map, &amp;zero, &amp;p, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_update_elem(p)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* consume previous data we injected */</div><div class='add'>+	if (sockmap_strp_consume_pre_data(p))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* Previously, we encountered issues such as deadlocks and</div><div class='add'>+	 * sequence errors that resulted in the inability to read</div><div class='add'>+	 * continuously. Therefore, we perform multiple iterations</div><div class='add'>+	 * of testing here.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; test_cnt; i++) {</div><div class='add'>+		sent = xsend(c, packet, pkt_size, 0);</div><div class='add'>+		if (!ASSERT_EQ(sent, pkt_size, "xsend(c)"))</div><div class='add'>+			goto out_close;</div><div class='add'>+</div><div class='add'>+		recvd = recv_timeout(p, rcv, sizeof(rcv), MSG_DONTWAIT,</div><div class='add'>+				     IO_TIMEOUT_SEC);</div><div class='add'>+		if (!ASSERT_EQ(recvd, pkt_size, "recv_timeout(p)") ||</div><div class='add'>+		    !ASSERT_OK(memcmp(packet, rcv, pkt_size),</div><div class='add'>+				  "memcmp, data mismatch"))</div><div class='add'>+			goto out_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fionread) {</div><div class='add'>+		sent = xsend(c, packet, pkt_size, 0);</div><div class='add'>+		if (!ASSERT_EQ(sent, pkt_size, "second xsend(c)"))</div><div class='add'>+			goto out_close;</div><div class='add'>+</div><div class='add'>+		err = ioctl(p, FIONREAD, &amp;avail);</div><div class='add'>+		if (!ASSERT_OK(err, "ioctl(FIONREAD) error") ||</div><div class='add'>+		    !ASSERT_EQ(avail, pkt_size, "ioctl(FIONREAD)"))</div><div class='add'>+			goto out_close;</div><div class='add'>+</div><div class='add'>+		recvd = recv_timeout(p, rcv, sizeof(rcv), MSG_DONTWAIT,</div><div class='add'>+				     IO_TIMEOUT_SEC);</div><div class='add'>+		if (!ASSERT_EQ(recvd, pkt_size, "second recv_timeout(p)") ||</div><div class='add'>+		    !ASSERT_OK(memcmp(packet, rcv, pkt_size),</div><div class='add'>+			      "second memcmp, data mismatch"))</div><div class='add'>+			goto out_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_close:</div><div class='add'>+	close(c);</div><div class='add'>+	close(p);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	test_sockmap_strp__destroy(strp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test strparser with verdict mode */</div><div class='add'>+static void test_sockmap_strp_verdict(int family, int sotype)</div><div class='add'>+{</div><div class='add'>+	int zero = 0, one = 1, sent, recvd, off;</div><div class='add'>+	int err, map;</div><div class='add'>+	int c0 = -1, p0 = -1, c1 = -1, p1 = -1;</div><div class='add'>+	struct test_sockmap_strp *strp = NULL;</div><div class='add'>+	char rcv[STRP_PKT_FULL_LEN + 1] = "0";</div><div class='add'>+</div><div class='add'>+	strp = sockmap_strp_init(&amp;map, false, true);</div><div class='add'>+	if (!ASSERT_TRUE(strp, "sockmap_strp_init"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* We simulate a reverse proxy server.</div><div class='add'>+	 * When p0 receives data from c0, we forward it to c1.</div><div class='add'>+	 * From c1's perspective, it will consider this data</div><div class='add'>+	 * as being sent by p1.</div><div class='add'>+	 */</div><div class='add'>+	err = create_socket_pairs(family, sotype, &amp;c0, &amp;c1, &amp;p0, &amp;p1);</div><div class='add'>+	if (!ASSERT_OK(err, "create_socket_pairs()"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(map, &amp;zero, &amp;p0, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_update_elem(p0)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(map, &amp;one, &amp;p1, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_update_elem(p1)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	sent = xsend(c0, packet, STRP_PKT_FULL_LEN, 0);</div><div class='add'>+	if (!ASSERT_EQ(sent, STRP_PKT_FULL_LEN, "xsend(c0)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	recvd = recv_timeout(c1, rcv, sizeof(rcv), MSG_DONTWAIT,</div><div class='add'>+			     IO_TIMEOUT_SEC);</div><div class='add'>+	if (!ASSERT_EQ(recvd, STRP_PKT_FULL_LEN, "recv_timeout(c1)") ||</div><div class='add'>+	    !ASSERT_OK(memcmp(packet, rcv, STRP_PKT_FULL_LEN),</div><div class='add'>+			  "received data does not match the sent data"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* send again to ensure the stream is functioning correctly. */</div><div class='add'>+	sent = xsend(c0, packet, STRP_PKT_FULL_LEN, 0);</div><div class='add'>+	if (!ASSERT_EQ(sent, STRP_PKT_FULL_LEN, "second xsend(c0)"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+	/* partial read */</div><div class='add'>+	off = STRP_PKT_FULL_LEN / 2;</div><div class='add'>+	recvd = recv_timeout(c1, rcv, off, MSG_DONTWAIT,</div><div class='add'>+			     IO_TIMEOUT_SEC);</div><div class='add'>+	recvd += recv_timeout(c1, rcv + off, sizeof(rcv) - off, MSG_DONTWAIT,</div><div class='add'>+			      IO_TIMEOUT_SEC);</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(recvd, STRP_PKT_FULL_LEN, "partial recv_timeout(c1)") ||</div><div class='add'>+	    !ASSERT_OK(memcmp(packet, rcv, STRP_PKT_FULL_LEN),</div><div class='add'>+			  "partial received data does not match the sent data"))</div><div class='add'>+		goto out_close;</div><div class='add'>+</div><div class='add'>+out_close:</div><div class='add'>+	close(c0);</div><div class='add'>+	close(c1);</div><div class='add'>+	close(p0);</div><div class='add'>+	close(p1);</div><div class='add'>+out:</div><div class='add'>+	test_sockmap_strp__destroy(strp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_sockmap_strp(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("sockmap strp tcp pass"))</div><div class='add'>+		test_sockmap_strp_pass(AF_INET, SOCK_STREAM, false);</div><div class='add'>+	if (test__start_subtest("sockmap strp tcp v6 pass"))</div><div class='add'>+		test_sockmap_strp_pass(AF_INET6, SOCK_STREAM, false);</div><div class='add'>+	if (test__start_subtest("sockmap strp tcp pass fionread"))</div><div class='add'>+		test_sockmap_strp_pass(AF_INET, SOCK_STREAM, true);</div><div class='add'>+	if (test__start_subtest("sockmap strp tcp v6 pass fionread"))</div><div class='add'>+		test_sockmap_strp_pass(AF_INET6, SOCK_STREAM, true);</div><div class='add'>+	if (test__start_subtest("sockmap strp tcp verdict"))</div><div class='add'>+		test_sockmap_strp_verdict(AF_INET, SOCK_STREAM);</div><div class='add'>+	if (test__start_subtest("sockmap strp tcp v6 verdict"))</div><div class='add'>+		test_sockmap_strp_verdict(AF_INET6, SOCK_STREAM);</div><div class='add'>+	if (test__start_subtest("sockmap strp tcp partial read"))</div><div class='add'>+		test_sockmap_strp_partial_read(AF_INET, SOCK_STREAM);</div><div class='add'>+	if (test__start_subtest("sockmap strp tcp multiple packets"))</div><div class='add'>+		test_sockmap_strp_multiple_pkt(AF_INET, SOCK_STREAM);</div><div class='add'>+	if (test__start_subtest("sockmap strp tcp dispatch"))</div><div class='add'>+		test_sockmap_strp_dispatch_pkt(AF_INET, SOCK_STREAM);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/spin_lock.c b/tools/testing/selftests/bpf/prog_tests/spin_lock.c<br/>index 2b0068742ef9..254fbfeab06a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/spin_lock.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/spin_lock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/spin_lock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/spin_lock.c</a></div><div class='hunk'>@@ -13,22 +13,22 @@ static struct {</div><div class='ctx'> 	const char *err_msg;</div><div class='ctx'> } spin_lock_fail_tests[] = {</div><div class='ctx'> 	{ "lock_id_kptr_preserve",</div><div class='del'>-	  "5: (bf) r1 = r0                       ; R0_w=ptr_foo(id=2,ref_obj_id=2) "</div><div class='del'>-	  "R1_w=ptr_foo(id=2,ref_obj_id=2) refs=2\n6: (85) call bpf_this_cpu_ptr#154\n"</div><div class='add'>+	  "5: (bf) r1 = r0                       ; R0=ptr_foo(id=2,ref_obj_id=2) "</div><div class='add'>+	  "R1=ptr_foo(id=2,ref_obj_id=2) refs=2\n6: (85) call bpf_this_cpu_ptr#154\n"</div><div class='ctx'> 	  "R1 type=ptr_ expected=percpu_ptr_" },</div><div class='ctx'> 	{ "lock_id_global_zero",</div><div class='del'>-	  "; R1_w=map_value(map=.data.A,ks=4,vs=4)\n2: (85) call bpf_this_cpu_ptr#154\n"</div><div class='add'>+	  "; R1=map_value(map=.data.A,ks=4,vs=4)\n2: (85) call bpf_this_cpu_ptr#154\n"</div><div class='ctx'> 	  "R1 type=map_value expected=percpu_ptr_" },</div><div class='ctx'> 	{ "lock_id_mapval_preserve",</div><div class='ctx'> 	  "[0-9]\\+: (bf) r1 = r0                       ;"</div><div class='del'>-	  " R0_w=map_value(id=1,map=array_map,ks=4,vs=8)"</div><div class='del'>-	  " R1_w=map_value(id=1,map=array_map,ks=4,vs=8)\n"</div><div class='add'>+	  " R0=map_value(id=1,map=array_map,ks=4,vs=8)"</div><div class='add'>+	  " R1=map_value(id=1,map=array_map,ks=4,vs=8)\n"</div><div class='ctx'> 	  "[0-9]\\+: (85) call bpf_this_cpu_ptr#154\n"</div><div class='ctx'> 	  "R1 type=map_value expected=percpu_ptr_" },</div><div class='ctx'> 	{ "lock_id_innermapval_preserve",</div><div class='ctx'> 	  "[0-9]\\+: (bf) r1 = r0                      ;"</div><div class='ctx'> 	  " R0=map_value(id=2,ks=4,vs=8)"</div><div class='del'>-	  " R1_w=map_value(id=2,ks=4,vs=8)\n"</div><div class='add'>+	  " R1=map_value(id=2,ks=4,vs=8)\n"</div><div class='ctx'> 	  "[0-9]\\+: (85) call bpf_this_cpu_ptr#154\n"</div><div class='ctx'> 	  "R1 type=map_value expected=percpu_ptr_" },</div><div class='ctx'> 	{ "lock_id_mismatch_kptr_kptr", "bpf_spin_unlock of different lock" },</div><div class='hunk'>@@ -50,6 +50,9 @@ static struct {</div><div class='ctx'> 	{ "lock_id_mismatch_innermapval_mapval", "bpf_spin_unlock of different lock" },</div><div class='ctx'> 	{ "lock_global_subprog_call1", "global function calls are not allowed while holding a lock" },</div><div class='ctx'> 	{ "lock_global_subprog_call2", "global function calls are not allowed while holding a lock" },</div><div class='add'>+	{ "lock_global_sleepable_helper_subprog", "global function calls are not allowed while holding a lock" },</div><div class='add'>+	{ "lock_global_sleepable_kfunc_subprog", "global function calls are not allowed while holding a lock" },</div><div class='add'>+	{ "lock_global_sleepable_subprog_indirect", "global function calls are not allowed while holding a lock" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int match_regex(const char *pattern, const char *string)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c<br/>index b7ba5cd47d96..271b5cc9fc01 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@ retry:</div><div class='ctx'> 	bpf_map_update_elem(control_map_fd, &amp;key, &amp;val, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* for every element in stackid_hmap, we can find a corresponding one</div><div class='del'>-	 * in stackmap, and vise versa.</div><div class='add'>+	 * in stackmap, and vice versa.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = compare_map_keys(stackid_hmap_fd, stackmap_fd);</div><div class='ctx'> 	if (CHECK(err, "compare_map_keys stackid_hmap vs. stackmap",</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c<br/>index 0832fd787457..b277dddd5af7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ retry:</div><div class='ctx'> 	bpf_map_update_elem(control_map_fd, &amp;key, &amp;val, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* for every element in stackid_hmap, we can find a corresponding one</div><div class='del'>-	 * in stackmap, and vise versa.</div><div class='add'>+	 * in stackmap, and vice versa.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = compare_map_keys(stackid_hmap_fd, stackmap_fd);</div><div class='ctx'> 	if (CHECK(err, "compare_map_keys stackid_hmap vs. stackmap",</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c<br/>new file mode 100644<br/>index 000000000000..c9efdd2a5b18<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "stacktrace_ips.skel.h"</div><div class='add'>+</div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+static int check_stacktrace_ips(int fd, __u32 key, int cnt, ...)</div><div class='add'>+{</div><div class='add'>+	__u64 ips[PERF_MAX_STACK_DEPTH];</div><div class='add'>+	struct ksyms *ksyms = NULL;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	/* sorted by addr */</div><div class='add'>+	ksyms = load_kallsyms_local();</div><div class='add'>+	if (!ASSERT_OK_PTR(ksyms, "load_kallsyms_local"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* unlikely, but... */</div><div class='add'>+	if (!ASSERT_LT(cnt, PERF_MAX_STACK_DEPTH, "check_max"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_lookup_elem(fd, &amp;key, ips);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Compare all symbols provided via arguments with stacktrace ips,</div><div class='add'>+	 * and their related symbol addresses.t</div><div class='add'>+	 */</div><div class='add'>+	va_start(args, cnt);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cnt; i++) {</div><div class='add'>+		unsigned long val;</div><div class='add'>+		struct ksym *ksym;</div><div class='add'>+</div><div class='add'>+		val = va_arg(args, unsigned long);</div><div class='add'>+		ksym = ksym_search_local(ksyms, ips[i]);</div><div class='add'>+		if (!ASSERT_OK_PTR(ksym, "ksym_search_local"))</div><div class='add'>+			break;</div><div class='add'>+		ASSERT_EQ(ksym-&gt;addr, val, "stack_cmp");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	va_end(args);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	free_kallsyms_local(ksyms);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_stacktrace_ips_kprobe_multi(bool retprobe)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_kprobe_multi_opts, opts,</div><div class='add'>+		.retprobe = retprobe</div><div class='add'>+	);</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='add'>+	struct stacktrace_ips *skel;</div><div class='add'>+</div><div class='add'>+	skel = stacktrace_ips__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "stacktrace_ips__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!skel-&gt;kconfig-&gt;CONFIG_UNWINDER_ORC) {</div><div class='add'>+		test__skip();</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skel-&gt;links.kprobe_multi_test = bpf_program__attach_kprobe_multi_opts(</div><div class='add'>+							skel-&gt;progs.kprobe_multi_test,</div><div class='add'>+							"bpf_testmod_stacktrace_test", &amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(skel-&gt;links.kprobe_multi_test, "bpf_program__attach_kprobe_multi_opts"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	trigger_module_test_read(1);</div><div class='add'>+</div><div class='add'>+	load_kallsyms();</div><div class='add'>+</div><div class='add'>+	check_stacktrace_ips(bpf_map__fd(skel-&gt;maps.stackmap), skel-&gt;bss-&gt;stack_key, 4,</div><div class='add'>+			     ksym_get_addr("bpf_testmod_stacktrace_test_3"),</div><div class='add'>+			     ksym_get_addr("bpf_testmod_stacktrace_test_2"),</div><div class='add'>+			     ksym_get_addr("bpf_testmod_stacktrace_test_1"),</div><div class='add'>+			     ksym_get_addr("bpf_testmod_test_read"));</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	stacktrace_ips__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_stacktrace_ips_raw_tp(void)</div><div class='add'>+{</div><div class='add'>+	__u32 info_len = sizeof(struct bpf_prog_info);</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='add'>+	struct bpf_prog_info info = {};</div><div class='add'>+	struct stacktrace_ips *skel;</div><div class='add'>+	__u64 bpf_prog_ksym = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = stacktrace_ips__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "stacktrace_ips__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!skel-&gt;kconfig-&gt;CONFIG_UNWINDER_ORC) {</div><div class='add'>+		test__skip();</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skel-&gt;links.rawtp_test = bpf_program__attach_raw_tracepoint(</div><div class='add'>+							skel-&gt;progs.rawtp_test,</div><div class='add'>+							"bpf_testmod_test_read");</div><div class='add'>+	if (!ASSERT_OK_PTR(skel-&gt;links.rawtp_test, "bpf_program__attach_raw_tracepoint"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/* get bpf program address */</div><div class='add'>+	info.jited_ksyms = ptr_to_u64(&amp;bpf_prog_ksym);</div><div class='add'>+	info.nr_jited_ksyms = 1;</div><div class='add'>+	err = bpf_prog_get_info_by_fd(bpf_program__fd(skel-&gt;progs.rawtp_test),</div><div class='add'>+				      &amp;info, &amp;info_len);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_get_info_by_fd"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	trigger_module_test_read(1);</div><div class='add'>+</div><div class='add'>+	load_kallsyms();</div><div class='add'>+</div><div class='add'>+	check_stacktrace_ips(bpf_map__fd(skel-&gt;maps.stackmap), skel-&gt;bss-&gt;stack_key, 2,</div><div class='add'>+			     bpf_prog_ksym,</div><div class='add'>+			     ksym_get_addr("bpf_trace_run2"));</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	stacktrace_ips__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __test_stacktrace_ips(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("kprobe_multi"))</div><div class='add'>+		test_stacktrace_ips_kprobe_multi(false);</div><div class='add'>+	if (test__start_subtest("kretprobe_multi"))</div><div class='add'>+		test_stacktrace_ips_kprobe_multi(true);</div><div class='add'>+	if (test__start_subtest("raw_tp"))</div><div class='add'>+		test_stacktrace_ips_raw_tp();</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void __test_stacktrace_ips(void)</div><div class='add'>+{</div><div class='add'>+	test__skip();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void test_stacktrace_ips(void)</div><div class='add'>+{</div><div class='add'>+	__test_stacktrace_ips();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c<br/>index df59e4ae2951..c23b97414813 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stacktrace_map.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/stacktrace_map.c</a></div><div class='hunk'>@@ -1,46 +1,27 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include &lt;test_progs.h&gt;</div><div class='add'>+#include "stacktrace_map.skel.h"</div><div class='ctx'> </div><div class='ctx'> void test_stacktrace_map(void)</div><div class='ctx'> {</div><div class='add'>+	struct stacktrace_map *skel;</div><div class='ctx'> 	int control_map_fd, stackid_hmap_fd, stackmap_fd, stack_amap_fd;</div><div class='del'>-	const char *prog_name = "oncpu";</div><div class='del'>-	int err, prog_fd, stack_trace_len;</div><div class='del'>-	const char *file = "./test_stacktrace_map.bpf.o";</div><div class='del'>-	__u32 key, val, duration = 0;</div><div class='del'>-	struct bpf_program *prog;</div><div class='del'>-	struct bpf_object *obj;</div><div class='del'>-	struct bpf_link *link;</div><div class='add'>+	int err, stack_trace_len;</div><div class='add'>+	__u32 key, val, stack_id, duration = 0;</div><div class='add'>+	__u64 stack[PERF_MAX_STACK_DEPTH];</div><div class='ctx'> </div><div class='del'>-	err = bpf_prog_test_load(file, BPF_PROG_TYPE_TRACEPOINT, &amp;obj, &amp;prog_fd);</div><div class='del'>-	if (CHECK(err, "prog_load", "err %d errno %d\n", err, errno))</div><div class='add'>+	skel = stacktrace_map__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_open_and_load"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	prog = bpf_object__find_program_by_name(obj, prog_name);</div><div class='del'>-	if (CHECK(!prog, "find_prog", "prog '%s' not found\n", prog_name))</div><div class='del'>-		goto close_prog;</div><div class='del'>-</div><div class='del'>-	link = bpf_program__attach_tracepoint(prog, "sched", "sched_switch");</div><div class='del'>-	if (!ASSERT_OK_PTR(link, "attach_tp"))</div><div class='del'>-		goto close_prog;</div><div class='del'>-</div><div class='del'>-	/* find map fds */</div><div class='del'>-	control_map_fd = bpf_find_map(__func__, obj, "control_map");</div><div class='del'>-	if (CHECK_FAIL(control_map_fd &lt; 0))</div><div class='del'>-		goto disable_pmu;</div><div class='del'>-</div><div class='del'>-	stackid_hmap_fd = bpf_find_map(__func__, obj, "stackid_hmap");</div><div class='del'>-	if (CHECK_FAIL(stackid_hmap_fd &lt; 0))</div><div class='del'>-		goto disable_pmu;</div><div class='del'>-</div><div class='del'>-	stackmap_fd = bpf_find_map(__func__, obj, "stackmap");</div><div class='del'>-	if (CHECK_FAIL(stackmap_fd &lt; 0))</div><div class='del'>-		goto disable_pmu;</div><div class='del'>-</div><div class='del'>-	stack_amap_fd = bpf_find_map(__func__, obj, "stack_amap");</div><div class='del'>-	if (CHECK_FAIL(stack_amap_fd &lt; 0))</div><div class='del'>-		goto disable_pmu;</div><div class='add'>+	control_map_fd = bpf_map__fd(skel-&gt;maps.control_map);</div><div class='add'>+	stackid_hmap_fd = bpf_map__fd(skel-&gt;maps.stackid_hmap);</div><div class='add'>+	stackmap_fd = bpf_map__fd(skel-&gt;maps.stackmap);</div><div class='add'>+	stack_amap_fd = bpf_map__fd(skel-&gt;maps.stack_amap);</div><div class='ctx'> </div><div class='add'>+	err = stacktrace_map__attach(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "skel_attach"))</div><div class='add'>+		goto out;</div><div class='ctx'> 	/* give some time for bpf program run */</div><div class='ctx'> 	sleep(1);</div><div class='ctx'> </div><div class='hunk'>@@ -50,26 +31,32 @@ void test_stacktrace_map(void)</div><div class='ctx'> 	bpf_map_update_elem(control_map_fd, &amp;key, &amp;val, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* for every element in stackid_hmap, we can find a corresponding one</div><div class='del'>-	 * in stackmap, and vise versa.</div><div class='add'>+	 * in stackmap, and vice versa.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = compare_map_keys(stackid_hmap_fd, stackmap_fd);</div><div class='ctx'> 	if (CHECK(err, "compare_map_keys stackid_hmap vs. stackmap",</div><div class='ctx'> 		  "err %d errno %d\n", err, errno))</div><div class='del'>-		goto disable_pmu;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = compare_map_keys(stackmap_fd, stackid_hmap_fd);</div><div class='ctx'> 	if (CHECK(err, "compare_map_keys stackmap vs. stackid_hmap",</div><div class='ctx'> 		  "err %d errno %d\n", err, errno))</div><div class='del'>-		goto disable_pmu;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	stack_trace_len = PERF_MAX_STACK_DEPTH * sizeof(__u64);</div><div class='ctx'> 	err = compare_stack_ips(stackmap_fd, stack_amap_fd, stack_trace_len);</div><div class='ctx'> 	if (CHECK(err, "compare_stack_ips stackmap vs. stack_amap",</div><div class='ctx'> 		  "err %d errno %d\n", err, errno))</div><div class='del'>-		goto disable_pmu;</div><div class='del'>-</div><div class='del'>-disable_pmu:</div><div class='del'>-	bpf_link__destroy(link);</div><div class='del'>-close_prog:</div><div class='del'>-	bpf_object__close(obj);</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	stack_id = skel-&gt;bss-&gt;stack_id;</div><div class='add'>+	err = bpf_map_lookup_and_delete_elem(stackmap_fd, &amp;stack_id,  stack);</div><div class='add'>+	if (!ASSERT_OK(err, "lookup and delete target stack_id"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_lookup_elem(stackmap_fd, &amp;stack_id, stack);</div><div class='add'>+	if (!ASSERT_EQ(err, -ENOENT, "lookup deleted stack_id"))</div><div class='add'>+		goto out;</div><div class='add'>+out:</div><div class='add'>+	stacktrace_map__destroy(skel);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c<br/>index c6ef06f55cdb..e985d51d3d47 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@ void test_stacktrace_map_raw_tp(void)</div><div class='ctx'> {</div><div class='ctx'> 	const char *prog_name = "oncpu";</div><div class='ctx'> 	int control_map_fd, stackid_hmap_fd, stackmap_fd;</div><div class='del'>-	const char *file = "./test_stacktrace_map.bpf.o";</div><div class='add'>+	const char *file = "./stacktrace_map.bpf.o";</div><div class='ctx'> 	__u32 key, val, duration = 0;</div><div class='ctx'> 	int err, prog_fd;</div><div class='ctx'> 	struct bpf_program *prog;</div><div class='hunk'>@@ -46,7 +46,7 @@ void test_stacktrace_map_raw_tp(void)</div><div class='ctx'> 	bpf_map_update_elem(control_map_fd, &amp;key, &amp;val, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* for every element in stackid_hmap, we can find a corresponding one</div><div class='del'>-	 * in stackmap, and vise versa.</div><div class='add'>+	 * in stackmap, and vice versa.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = compare_map_keys(stackid_hmap_fd, stackmap_fd);</div><div class='ctx'> 	if (CHECK(err, "compare_map_keys stackid_hmap vs. stackmap",</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_map_skip.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_map_skip.c<br/>index 1932b1e0685c..dc2ccf6a14d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stacktrace_map_skip.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/stacktrace_map_skip.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stacktrace_map_skip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/stacktrace_map_skip.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ void test_stacktrace_map_skip(void)</div><div class='ctx'> 	skel-&gt;bss-&gt;control = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* for every element in stackid_hmap, we can find a corresponding one</div><div class='del'>-	 * in stackmap, and vise versa.</div><div class='add'>+	 * in stackmap, and vice versa.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = compare_map_keys(stackid_hmap_fd, stackmap_fd);</div><div class='ctx'> 	if (!ASSERT_OK(err, "compare_map_keys stackid_hmap vs. stackmap"))</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/stream.c b/tools/testing/selftests/bpf/prog_tests/stream.c<br/>new file mode 100644<br/>index 000000000000..c3cce5c292bd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/stream.c</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+</div><div class='add'>+#include "stream.skel.h"</div><div class='add'>+#include "stream_fail.skel.h"</div><div class='add'>+</div><div class='add'>+void test_stream_failure(void)</div><div class='add'>+{</div><div class='add'>+	RUN_TESTS(stream_fail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_stream_success(void)</div><div class='add'>+{</div><div class='add'>+	RUN_TESTS(stream);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_stream_syscall(void)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, opts);</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_stream_read_opts, ropts);</div><div class='add'>+	struct stream *skel;</div><div class='add'>+	int ret, prog_fd;</div><div class='add'>+	char buf[64];</div><div class='add'>+</div><div class='add'>+	skel = stream__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "stream__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.stream_syscall);</div><div class='add'>+	ret = bpf_prog_test_run_opts(prog_fd, &amp;opts);</div><div class='add'>+	ASSERT_OK(ret, "ret");</div><div class='add'>+	ASSERT_OK(opts.retval, "retval");</div><div class='add'>+</div><div class='add'>+	ASSERT_LT(bpf_prog_stream_read(0, BPF_STREAM_STDOUT, buf, sizeof(buf), &amp;ropts), 0, "error");</div><div class='add'>+	ret = -errno;</div><div class='add'>+	ASSERT_EQ(ret, -EINVAL, "bad prog_fd");</div><div class='add'>+</div><div class='add'>+	ASSERT_LT(bpf_prog_stream_read(prog_fd, 0, buf, sizeof(buf), &amp;ropts), 0, "error");</div><div class='add'>+	ret = -errno;</div><div class='add'>+	ASSERT_EQ(ret, -ENOENT, "bad stream id");</div><div class='add'>+</div><div class='add'>+	ASSERT_LT(bpf_prog_stream_read(prog_fd, BPF_STREAM_STDOUT, NULL, sizeof(buf), NULL), 0, "error");</div><div class='add'>+	ret = -errno;</div><div class='add'>+	ASSERT_EQ(ret, -EFAULT, "bad stream buf");</div><div class='add'>+</div><div class='add'>+	ret = bpf_prog_stream_read(prog_fd, BPF_STREAM_STDOUT, buf, 2, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 2, "bytes");</div><div class='add'>+	ret = bpf_prog_stream_read(prog_fd, BPF_STREAM_STDOUT, buf, 2, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 1, "bytes");</div><div class='add'>+	ret = bpf_prog_stream_read(prog_fd, BPF_STREAM_STDOUT, buf, 1, &amp;ropts);</div><div class='add'>+	ASSERT_EQ(ret, 0, "no bytes stdout");</div><div class='add'>+	ret = bpf_prog_stream_read(prog_fd, BPF_STREAM_STDERR, buf, 1, &amp;ropts);</div><div class='add'>+	ASSERT_EQ(ret, 0, "no bytes stderr");</div><div class='add'>+</div><div class='add'>+	stream__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_address(struct bpf_program *prog, unsigned long *fault_addr_p)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, opts);</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_stream_read_opts, ropts);</div><div class='add'>+	int ret, prog_fd;</div><div class='add'>+	char fault_addr[64];</div><div class='add'>+	char buf[1024];</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(prog);</div><div class='add'>+</div><div class='add'>+	ret = bpf_prog_test_run_opts(prog_fd, &amp;opts);</div><div class='add'>+	ASSERT_OK(ret, "ret");</div><div class='add'>+	ASSERT_OK(opts.retval, "retval");</div><div class='add'>+</div><div class='add'>+	sprintf(fault_addr, "0x%lx", *fault_addr_p);</div><div class='add'>+</div><div class='add'>+	ret = bpf_prog_stream_read(prog_fd, BPF_STREAM_STDERR, buf, sizeof(buf), &amp;ropts);</div><div class='add'>+	ASSERT_GT(ret, 0, "stream read");</div><div class='add'>+	ASSERT_LE(ret, 1023, "len for buf");</div><div class='add'>+	buf[ret] = '\0';</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_HAS_SUBSTR(buf, fault_addr, "fault_addr")) {</div><div class='add'>+		fprintf(stderr, "Output from stream:\n%s\n", buf);</div><div class='add'>+		fprintf(stderr, "Fault Addr: %s\n", fault_addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_stream_arena_fault_address(void)</div><div class='add'>+{</div><div class='add'>+	struct stream *skel;</div><div class='add'>+</div><div class='add'>+#if !defined(__x86_64__) &amp;&amp; !defined(__aarch64__)</div><div class='add'>+	printf("%s:SKIP: arena fault reporting not supported\n", __func__);</div><div class='add'>+	test__skip();</div><div class='add'>+	return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	skel = stream__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "stream__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("read_fault"))</div><div class='add'>+		test_address(skel-&gt;progs.stream_arena_read_fault, &amp;skel-&gt;bss-&gt;fault_addr);</div><div class='add'>+	if (test__start_subtest("write_fault"))</div><div class='add'>+		test_address(skel-&gt;progs.stream_arena_write_fault, &amp;skel-&gt;bss-&gt;fault_addr);</div><div class='add'>+</div><div class='add'>+	stream__destroy(skel);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/string_kfuncs.c b/tools/testing/selftests/bpf/prog_tests/string_kfuncs.c<br/>new file mode 100644<br/>index 000000000000..0f3bf594e7a5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/string_kfuncs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/string_kfuncs.c</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2025 Red Hat, Inc.*/</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "string_kfuncs_success.skel.h"</div><div class='add'>+#include "string_kfuncs_failure1.skel.h"</div><div class='add'>+#include "string_kfuncs_failure2.skel.h"</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+</div><div class='add'>+static const char * const test_cases[] = {</div><div class='add'>+	"strcmp",</div><div class='add'>+	"strcasecmp",</div><div class='add'>+	"strchr",</div><div class='add'>+	"strchrnul",</div><div class='add'>+	"strnchr",</div><div class='add'>+	"strrchr",</div><div class='add'>+	"strlen",</div><div class='add'>+	"strnlen",</div><div class='add'>+	"strspn_str",</div><div class='add'>+	"strspn_accept",</div><div class='add'>+	"strcspn_str",</div><div class='add'>+	"strcspn_reject",</div><div class='add'>+	"strstr",</div><div class='add'>+	"strcasestr",</div><div class='add'>+	"strnstr",</div><div class='add'>+	"strncasestr",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void run_too_long_tests(void)</div><div class='add'>+{</div><div class='add'>+	struct string_kfuncs_failure2 *skel;</div><div class='add'>+	struct bpf_program *prog;</div><div class='add'>+	char test_name[256];</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	skel = string_kfuncs_failure2__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "string_kfuncs_failure2__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(skel-&gt;bss-&gt;long_str, 'a', sizeof(skel-&gt;bss-&gt;long_str));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(test_cases); i++) {</div><div class='add'>+		sprintf(test_name, "test_%s_too_long", test_cases[i]);</div><div class='add'>+		if (!test__start_subtest(test_name))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		prog = bpf_object__find_program_by_name(skel-&gt;obj, test_name);</div><div class='add'>+		if (!ASSERT_OK_PTR(prog, "bpf_object__find_program_by_name"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+</div><div class='add'>+		LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='add'>+		err = bpf_prog_test_run_opts(bpf_program__fd(prog), &amp;topts);</div><div class='add'>+		if (!ASSERT_OK(err, "bpf_prog_test_run"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(topts.retval, -E2BIG, "reading too long string fails with -E2BIG");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	string_kfuncs_failure2__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_string_kfuncs(void)</div><div class='add'>+{</div><div class='add'>+	RUN_TESTS(string_kfuncs_success);</div><div class='add'>+	RUN_TESTS(string_kfuncs_failure1);</div><div class='add'>+</div><div class='add'>+	run_too_long_tests();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/summarization.c b/tools/testing/selftests/bpf/prog_tests/summarization.c<br/>new file mode 100644<br/>index 000000000000..5dd6c120a838<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/summarization.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/summarization.c</a></div><div class='hunk'>@@ -0,0 +1,144 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include "bpf/libbpf.h"</div><div class='add'>+#include "summarization_freplace.skel.h"</div><div class='add'>+#include "summarization.skel.h"</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+</div><div class='add'>+static void print_verifier_log(const char *log)</div><div class='add'>+{</div><div class='add'>+	if (env.verbosity &gt;= VERBOSE_VERY)</div><div class='add'>+		fprintf(stdout, "VERIFIER LOG:\n=============\n%s=============\n", log);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_aux(const char *main_prog_name,</div><div class='add'>+		     const char *to_be_replaced,</div><div class='add'>+		     const char *replacement,</div><div class='add'>+		     bool expect_load,</div><div class='add'>+		     const char *err_msg)</div><div class='add'>+{</div><div class='add'>+	struct summarization_freplace *freplace = NULL;</div><div class='add'>+	struct bpf_program *freplace_prog = NULL;</div><div class='add'>+	struct bpf_program *main_prog = NULL;</div><div class='add'>+	LIBBPF_OPTS(bpf_object_open_opts, opts);</div><div class='add'>+	struct summarization *main = NULL;</div><div class='add'>+	char log[16*1024];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	opts.kernel_log_buf = log;</div><div class='add'>+	opts.kernel_log_size = sizeof(log);</div><div class='add'>+	if (env.verbosity &gt;= VERBOSE_SUPER)</div><div class='add'>+		opts.kernel_log_level = 1 | 2 | 4;</div><div class='add'>+	main = summarization__open_opts(&amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(main, "summarization__open"))</div><div class='add'>+		goto out;</div><div class='add'>+	main_prog = bpf_object__find_program_by_name(main-&gt;obj, main_prog_name);</div><div class='add'>+	if (!ASSERT_OK_PTR(main_prog, "main_prog"))</div><div class='add'>+		goto out;</div><div class='add'>+	bpf_program__set_autoload(main_prog, true);</div><div class='add'>+	err = summarization__load(main);</div><div class='add'>+	print_verifier_log(log);</div><div class='add'>+	if (!ASSERT_OK(err, "summarization__load"))</div><div class='add'>+		goto out;</div><div class='add'>+	freplace = summarization_freplace__open_opts(&amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(freplace, "summarization_freplace__open"))</div><div class='add'>+		goto out;</div><div class='add'>+	freplace_prog = bpf_object__find_program_by_name(freplace-&gt;obj, replacement);</div><div class='add'>+	if (!ASSERT_OK_PTR(freplace_prog, "freplace_prog"))</div><div class='add'>+		goto out;</div><div class='add'>+	bpf_program__set_autoload(freplace_prog, true);</div><div class='add'>+	bpf_program__set_autoattach(freplace_prog, true);</div><div class='add'>+	bpf_program__set_attach_target(freplace_prog,</div><div class='add'>+				       bpf_program__fd(main_prog),</div><div class='add'>+				       to_be_replaced);</div><div class='add'>+	err = summarization_freplace__load(freplace);</div><div class='add'>+	print_verifier_log(log);</div><div class='add'>+</div><div class='add'>+	/* The might_sleep extension doesn't work yet as sleepable calls are not</div><div class='add'>+	 * allowed, but preserve the check in case it's supported later and then</div><div class='add'>+	 * this particular combination can be enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (!strcmp("might_sleep", replacement) &amp;&amp; err) {</div><div class='add'>+		ASSERT_HAS_SUBSTR(log, "helper call might sleep in a non-sleepable prog", "error log");</div><div class='add'>+		ASSERT_EQ(err, -EINVAL, "err");</div><div class='add'>+		test__skip();</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (expect_load) {</div><div class='add'>+		ASSERT_OK(err, "summarization_freplace__load");</div><div class='add'>+	} else {</div><div class='add'>+		ASSERT_ERR(err, "summarization_freplace__load");</div><div class='add'>+		ASSERT_HAS_SUBSTR(log, err_msg, "error log");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	summarization_freplace__destroy(freplace);</div><div class='add'>+	summarization__destroy(main);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* There are two global subprograms in both summarization.skel.h:</div><div class='add'>+ * - one changes packet data;</div><div class='add'>+ * - another does not.</div><div class='add'>+ * It is ok to freplace subprograms that change packet data with those</div><div class='add'>+ * that either do or do not. It is only ok to freplace subprograms</div><div class='add'>+ * that do not change packet data with those that do not as well.</div><div class='add'>+ * The below tests check outcomes for each combination of such freplace.</div><div class='add'>+ * Also test a case when main subprogram itself is replaced and is a single</div><div class='add'>+ * subprogram in a program.</div><div class='add'>+ *</div><div class='add'>+ * This holds for might_sleep programs. It is ok to replace might_sleep with</div><div class='add'>+ * might_sleep and with does_not_sleep, but does_not_sleep cannot be replaced</div><div class='add'>+ * with might_sleep.</div><div class='add'>+ */</div><div class='add'>+void test_summarization_freplace(void)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		const char *main;</div><div class='add'>+		const char *to_be_replaced;</div><div class='add'>+		bool has_side_effect;</div><div class='add'>+	} mains[2][4] = {</div><div class='add'>+		{</div><div class='add'>+			{ "main_changes_with_subprogs",		"changes_pkt_data",	    true },</div><div class='add'>+			{ "main_changes_with_subprogs",		"does_not_change_pkt_data", false },</div><div class='add'>+			{ "main_changes",			"main_changes",             true },</div><div class='add'>+			{ "main_does_not_change",		"main_does_not_change",     false },</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			{ "main_might_sleep_with_subprogs",	"might_sleep",		    true },</div><div class='add'>+			{ "main_might_sleep_with_subprogs",	"does_not_sleep",	    false },</div><div class='add'>+			{ "main_might_sleep",			"main_might_sleep",	    true },</div><div class='add'>+			{ "main_does_not_sleep",		"main_does_not_sleep",	    false },</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	const char *pkt_err = "Extension program changes packet data";</div><div class='add'>+	const char *slp_err = "Extension program may sleep";</div><div class='add'>+	struct {</div><div class='add'>+		const char *func;</div><div class='add'>+		bool has_side_effect;</div><div class='add'>+		const char *err_msg;</div><div class='add'>+	} replacements[2][2] = {</div><div class='add'>+		{</div><div class='add'>+			{ "changes_pkt_data",	      true,	pkt_err },</div><div class='add'>+			{ "does_not_change_pkt_data", false,	pkt_err },</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			{ "might_sleep",	      true,	slp_err },</div><div class='add'>+			{ "does_not_sleep",	      false,	slp_err },</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	char buf[64];</div><div class='add'>+</div><div class='add'>+	for (int t = 0; t &lt; 2; t++) {</div><div class='add'>+		for (int i = 0; i &lt; ARRAY_SIZE(mains); ++i) {</div><div class='add'>+			for (int j = 0; j &lt; ARRAY_SIZE(replacements); ++j) {</div><div class='add'>+				snprintf(buf, sizeof(buf), "%s_with_%s",</div><div class='add'>+					 mains[t][i].to_be_replaced, replacements[t][j].func);</div><div class='add'>+				if (!test__start_subtest(buf))</div><div class='add'>+					continue;</div><div class='add'>+				test_aux(mains[t][i].main, mains[t][i].to_be_replaced, replacements[t][j].func,</div><div class='add'>+					 mains[t][i].has_side_effect || !replacements[t][j].has_side_effect,</div><div class='add'>+					 replacements[t][j].err_msg);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/tailcalls.c b/tools/testing/selftests/bpf/prog_tests/tailcalls.c<br/>index 544144620ca6..0ab36503c3b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tailcalls.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tailcalls.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tailcalls.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/tailcalls.c</a></div><div class='hunk'>@@ -1195,7 +1195,7 @@ static void test_tailcall_hierarchy_count(const char *which, bool test_fentry,</div><div class='ctx'> 					  bool test_fexit,</div><div class='ctx'> 					  bool test_fentry_entry)</div><div class='ctx'> {</div><div class='del'>-	int err, map_fd, prog_fd, main_data_fd, fentry_data_fd, fexit_data_fd, i, val;</div><div class='add'>+	int err, map_fd, prog_fd, main_data_fd, fentry_data_fd = 0, fexit_data_fd = 0, i, val;</div><div class='ctx'> 	struct bpf_object *obj = NULL, *fentry_obj = NULL, *fexit_obj = NULL;</div><div class='ctx'> 	struct bpf_link *fentry_link = NULL, *fexit_link = NULL;</div><div class='ctx'> 	struct bpf_program *prog, *fentry_prog;</div><div class='hunk'>@@ -1600,6 +1600,7 @@ static void test_tailcall_bpf2bpf_freplace(void)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	err = bpf_link__destroy(freplace_link);</div><div class='add'>+	freplace_link = NULL;</div><div class='ctx'> 	if (!ASSERT_OK(err, "destroy link"))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/task_local_data.h b/tools/testing/selftests/bpf/prog_tests/task_local_data.h<br/>new file mode 100644<br/>index 000000000000..2de38776a2d4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/task_local_data.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/task_local_data.h</a></div><div class='hunk'>@@ -0,0 +1,386 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __TASK_LOCAL_DATA_H</div><div class='add'>+#define __TASK_LOCAL_DATA_H</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;sched.h&gt;</div><div class='add'>+#include &lt;stdatomic.h&gt;</div><div class='add'>+#include &lt;stddef.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef TLD_FREE_DATA_ON_THREAD_EXIT</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;bpf/bpf.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * OPTIONS</div><div class='add'>+ *</div><div class='add'>+ *   Define the option before including the header</div><div class='add'>+ *</div><div class='add'>+ *   TLD_FREE_DATA_ON_THREAD_EXIT - Frees memory on thread exit automatically</div><div class='add'>+ *</div><div class='add'>+ *   Thread-specific memory for storing TLD is allocated lazily on the first call to</div><div class='add'>+ *   tld_get_data(). The thread that calls it must also call tld_free() on thread exit</div><div class='add'>+ *   to prevent memory leak. Pthread will be included if the option is defined. A pthread</div><div class='add'>+ *   key will be registered with a destructor that calls tld_free().</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ *   TLD_DYN_DATA_SIZE - The maximum size of memory allocated for TLDs created dynamically</div><div class='add'>+ *   (default: 64 bytes)</div><div class='add'>+ *</div><div class='add'>+ *   A TLD can be defined statically using TLD_DEFINE_KEY() or created on the fly using</div><div class='add'>+ *   tld_create_key(). As the total size of TLDs created with tld_create_key() cannot be</div><div class='add'>+ *   possibly known statically, a memory area of size TLD_DYN_DATA_SIZE will be allocated</div><div class='add'>+ *   for these TLDs. This additional memory is allocated for every thread that calls</div><div class='add'>+ *   tld_get_data() even if no tld_create_key are actually called, so be mindful of</div><div class='add'>+ *   potential memory wastage. Use TLD_DEFINE_KEY() whenever possible as just enough memory</div><div class='add'>+ *   will be allocated for TLDs created with it.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ *   TLD_NAME_LEN - The maximum length of the name of a TLD (default: 62)</div><div class='add'>+ *</div><div class='add'>+ *   Setting TLD_NAME_LEN will affect the maximum number of TLDs a process can store,</div><div class='add'>+ *   TLD_MAX_DATA_CNT.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ *   TLD_DATA_USE_ALIGNED_ALLOC - Always use aligned_alloc() instead of malloc()</div><div class='add'>+ *</div><div class='add'>+ *   When allocating the memory for storing TLDs, we need to make sure there is a memory</div><div class='add'>+ *   region of the X bytes within a page. This is due to the limit posed by UPTR: memory</div><div class='add'>+ *   pinned to the kernel cannot exceed a page nor can it cross the page boundary. The</div><div class='add'>+ *   library normally calls malloc(2*X) given X bytes of total TLDs, and only uses</div><div class='add'>+ *   aligned_alloc(PAGE_SIZE, X) when X &gt;= PAGE_SIZE / 2. This is to reduce memory wastage</div><div class='add'>+ *   as not all memory allocator can use the exact amount of memory requested to fulfill</div><div class='add'>+ *   aligned_alloc(). For example, some may round the size up to the alignment. Enable the</div><div class='add'>+ *   option to always use aligned_alloc() if the implementation has low memory overhead.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define TLD_PAGE_SIZE getpagesize()</div><div class='add'>+#define TLD_PAGE_MASK (~(TLD_PAGE_SIZE - 1))</div><div class='add'>+</div><div class='add'>+#define TLD_ROUND_MASK(x, y) ((__typeof__(x))((y) - 1))</div><div class='add'>+#define TLD_ROUND_UP(x, y) ((((x) - 1) | TLD_ROUND_MASK(x, y)) + 1)</div><div class='add'>+</div><div class='add'>+#define TLD_READ_ONCE(x) (*(volatile typeof(x) *)&amp;(x))</div><div class='add'>+</div><div class='add'>+#ifndef TLD_DYN_DATA_SIZE</div><div class='add'>+#define TLD_DYN_DATA_SIZE 64</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define TLD_MAX_DATA_CNT (TLD_PAGE_SIZE / sizeof(struct tld_metadata) - 1)</div><div class='add'>+</div><div class='add'>+#ifndef TLD_NAME_LEN</div><div class='add'>+#define TLD_NAME_LEN 62</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef __cplusplus</div><div class='add'>+extern "C" {</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	__s16 off;</div><div class='add'>+} tld_key_t;</div><div class='add'>+</div><div class='add'>+struct tld_metadata {</div><div class='add'>+	char name[TLD_NAME_LEN];</div><div class='add'>+	_Atomic __u16 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tld_meta_u {</div><div class='add'>+	_Atomic __u8 cnt;</div><div class='add'>+	__u16 size;</div><div class='add'>+	struct tld_metadata metadata[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tld_data_u {</div><div class='add'>+	__u64 start; /* offset of tld_data_u-&gt;data in a page */</div><div class='add'>+	char data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tld_map_value {</div><div class='add'>+	void *data;</div><div class='add'>+	struct tld_meta_u *meta;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tld_meta_u * _Atomic tld_meta_p __attribute__((weak));</div><div class='add'>+__thread struct tld_data_u *tld_data_p __attribute__((weak));</div><div class='add'>+__thread void *tld_data_alloc_p __attribute__((weak));</div><div class='add'>+</div><div class='add'>+#ifdef TLD_FREE_DATA_ON_THREAD_EXIT</div><div class='add'>+pthread_key_t tld_pthread_key __attribute__((weak));</div><div class='add'>+</div><div class='add'>+static void tld_free(void);</div><div class='add'>+</div><div class='add'>+static void __tld_thread_exit_handler(void *unused)</div><div class='add'>+{</div><div class='add'>+	tld_free();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __tld_init_meta_p(void)</div><div class='add'>+{</div><div class='add'>+	struct tld_meta_u *meta, *uninit = NULL;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	meta = (struct tld_meta_u *)aligned_alloc(TLD_PAGE_SIZE, TLD_PAGE_SIZE);</div><div class='add'>+	if (!meta) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(meta, 0, TLD_PAGE_SIZE);</div><div class='add'>+	meta-&gt;size = TLD_DYN_DATA_SIZE;</div><div class='add'>+</div><div class='add'>+	if (!atomic_compare_exchange_strong(&amp;tld_meta_p, &amp;uninit, meta)) {</div><div class='add'>+		free(meta);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef TLD_FREE_DATA_ON_THREAD_EXIT</div><div class='add'>+	pthread_key_create(&amp;tld_pthread_key, __tld_thread_exit_handler);</div><div class='add'>+#endif</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __tld_init_data_p(int map_fd)</div><div class='add'>+{</div><div class='add'>+	bool use_aligned_alloc = false;</div><div class='add'>+	struct tld_map_value map_val;</div><div class='add'>+	struct tld_data_u *data;</div><div class='add'>+	void *data_alloc = NULL;</div><div class='add'>+	int err, tid_fd = -1;</div><div class='add'>+</div><div class='add'>+	tid_fd = syscall(SYS_pidfd_open, sys_gettid(), O_EXCL);</div><div class='add'>+	if (tid_fd &lt; 0) {</div><div class='add'>+		err = -errno;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef TLD_DATA_USE_ALIGNED_ALLOC</div><div class='add'>+	use_aligned_alloc = true;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * tld_meta_p-&gt;size = TLD_DYN_DATA_SIZE +</div><div class='add'>+	 *          total size of TLDs defined via TLD_DEFINE_KEY()</div><div class='add'>+	 */</div><div class='add'>+	data_alloc = (use_aligned_alloc || tld_meta_p-&gt;size * 2 &gt;= TLD_PAGE_SIZE) ?</div><div class='add'>+		aligned_alloc(TLD_PAGE_SIZE, tld_meta_p-&gt;size) :</div><div class='add'>+		malloc(tld_meta_p-&gt;size * 2);</div><div class='add'>+	if (!data_alloc) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Always pass a page-aligned address to UPTR since the size of tld_map_value::data</div><div class='add'>+	 * is a page in BTF. If data_alloc spans across two pages, use the page that contains large</div><div class='add'>+	 * enough memory.</div><div class='add'>+	 */</div><div class='add'>+	if (TLD_PAGE_SIZE - (~TLD_PAGE_MASK &amp; (intptr_t)data_alloc) &gt;= tld_meta_p-&gt;size) {</div><div class='add'>+		map_val.data = (void *)(TLD_PAGE_MASK &amp; (intptr_t)data_alloc);</div><div class='add'>+		data = data_alloc;</div><div class='add'>+		data-&gt;start = (~TLD_PAGE_MASK &amp; (intptr_t)data_alloc) +</div><div class='add'>+			      offsetof(struct tld_data_u, data);</div><div class='add'>+	} else {</div><div class='add'>+		map_val.data = (void *)(TLD_ROUND_UP((intptr_t)data_alloc, TLD_PAGE_SIZE));</div><div class='add'>+		data = (void *)(TLD_ROUND_UP((intptr_t)data_alloc, TLD_PAGE_SIZE));</div><div class='add'>+		data-&gt;start = offsetof(struct tld_data_u, data);</div><div class='add'>+	}</div><div class='add'>+	map_val.meta = TLD_READ_ONCE(tld_meta_p);</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(map_fd, &amp;tid_fd, &amp;map_val, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		free(data_alloc);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tld_data_p = data;</div><div class='add'>+	tld_data_alloc_p = data_alloc;</div><div class='add'>+#ifdef TLD_FREE_DATA_ON_THREAD_EXIT</div><div class='add'>+	pthread_setspecific(tld_pthread_key, (void *)1);</div><div class='add'>+#endif</div><div class='add'>+out:</div><div class='add'>+	if (tid_fd &gt;= 0)</div><div class='add'>+		close(tid_fd);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static tld_key_t __tld_create_key(const char *name, size_t size, bool dyn_data)</div><div class='add'>+{</div><div class='add'>+	int err, i, sz, off = 0;</div><div class='add'>+	__u8 cnt;</div><div class='add'>+</div><div class='add'>+	if (!TLD_READ_ONCE(tld_meta_p)) {</div><div class='add'>+		err = __tld_init_meta_p();</div><div class='add'>+		if (err)</div><div class='add'>+			return (tld_key_t){err};</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TLD_MAX_DATA_CNT; i++) {</div><div class='add'>+retry:</div><div class='add'>+		cnt = atomic_load(&amp;tld_meta_p-&gt;cnt);</div><div class='add'>+		if (i &lt; cnt) {</div><div class='add'>+			/* A metadata is not ready until size is updated with a non-zero value */</div><div class='add'>+			while (!(sz = atomic_load(&amp;tld_meta_p-&gt;metadata[i].size)))</div><div class='add'>+				sched_yield();</div><div class='add'>+</div><div class='add'>+			if (!strncmp(tld_meta_p-&gt;metadata[i].name, name, TLD_NAME_LEN))</div><div class='add'>+				return (tld_key_t){-EEXIST};</div><div class='add'>+</div><div class='add'>+			off += TLD_ROUND_UP(sz, 8);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * TLD_DEFINE_KEY() is given memory upto a page while at most</div><div class='add'>+		 * TLD_DYN_DATA_SIZE is allocated for tld_create_key()</div><div class='add'>+		 */</div><div class='add'>+		if (dyn_data) {</div><div class='add'>+			if (off + TLD_ROUND_UP(size, 8) &gt; tld_meta_p-&gt;size)</div><div class='add'>+				return (tld_key_t){-E2BIG};</div><div class='add'>+		} else {</div><div class='add'>+			if (off + TLD_ROUND_UP(size, 8) &gt; TLD_PAGE_SIZE - sizeof(struct tld_data_u))</div><div class='add'>+				return (tld_key_t){-E2BIG};</div><div class='add'>+			tld_meta_p-&gt;size += TLD_ROUND_UP(size, 8);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Only one tld_create_key() can increase the current cnt by one and</div><div class='add'>+		 * takes the latest available slot. Other threads will check again if a new</div><div class='add'>+		 * TLD can still be added, and then compete for the new slot after the</div><div class='add'>+		 * succeeding thread update the size.</div><div class='add'>+		 */</div><div class='add'>+		if (!atomic_compare_exchange_strong(&amp;tld_meta_p-&gt;cnt, &amp;cnt, cnt + 1))</div><div class='add'>+			goto retry;</div><div class='add'>+</div><div class='add'>+		strncpy(tld_meta_p-&gt;metadata[i].name, name, TLD_NAME_LEN);</div><div class='add'>+		atomic_store(&amp;tld_meta_p-&gt;metadata[i].size, size);</div><div class='add'>+		return (tld_key_t){(__s16)off};</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (tld_key_t){-ENOSPC};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * TLD_DEFINE_KEY() - Define a TLD and a global variable key associated with the TLD.</div><div class='add'>+ *</div><div class='add'>+ * @name: The name of the TLD</div><div class='add'>+ * @size: The size of the TLD</div><div class='add'>+ * @key: The variable name of the key. Cannot exceed TLD_NAME_LEN</div><div class='add'>+ *</div><div class='add'>+ * The macro can only be used in file scope.</div><div class='add'>+ *</div><div class='add'>+ * A global variable key of opaque type, tld_key_t, will be declared and initialized before</div><div class='add'>+ * main() starts. Use tld_key_is_err() or tld_key_err_or_zero() later to check if the key</div><div class='add'>+ * creation succeeded. Pass the key to tld_get_data() to get a pointer to the TLD.</div><div class='add'>+ * bpf programs can also fetch the same key by name.</div><div class='add'>+ *</div><div class='add'>+ * The total size of TLDs created using TLD_DEFINE_KEY() cannot exceed a page. Just</div><div class='add'>+ * enough memory will be allocated for each thread on the first call to tld_get_data().</div><div class='add'>+ */</div><div class='add'>+#define TLD_DEFINE_KEY(key, name, size)			\</div><div class='add'>+tld_key_t key;						\</div><div class='add'>+							\</div><div class='add'>+__attribute__((constructor))				\</div><div class='add'>+void __tld_define_key_##key(void)			\</div><div class='add'>+{							\</div><div class='add'>+	key = __tld_create_key(name, size, false);	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tld_create_key() - Create a TLD and return a key associated with the TLD.</div><div class='add'>+ *</div><div class='add'>+ * @name: The name the TLD</div><div class='add'>+ * @size: The size of the TLD</div><div class='add'>+ *</div><div class='add'>+ * Return an opaque object key. Use tld_key_is_err() or tld_key_err_or_zero() to check</div><div class='add'>+ * if the key creation succeeded. Pass the key to tld_get_data() to get a pointer to</div><div class='add'>+ * locate the TLD. bpf programs can also fetch the same key by name.</div><div class='add'>+ *</div><div class='add'>+ * Use tld_create_key() only when a TLD needs to be created dynamically (e.g., @name is</div><div class='add'>+ * not known statically or a TLD needs to be created conditionally)</div><div class='add'>+ *</div><div class='add'>+ * An additional TLD_DYN_DATA_SIZE bytes are allocated per-thread to accommodate TLDs</div><div class='add'>+ * created dynamically with tld_create_key(). Since only a user page is pinned to the</div><div class='add'>+ * kernel, when TLDs created with TLD_DEFINE_KEY() uses more than TLD_PAGE_SIZE -</div><div class='add'>+ * TLD_DYN_DATA_SIZE, the buffer size will be limited to the rest of the page.</div><div class='add'>+ */</div><div class='add'>+__attribute__((unused))</div><div class='add'>+static tld_key_t tld_create_key(const char *name, size_t size)</div><div class='add'>+{</div><div class='add'>+	return __tld_create_key(name, size, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__attribute__((unused))</div><div class='add'>+static inline bool tld_key_is_err(tld_key_t key)</div><div class='add'>+{</div><div class='add'>+	return key.off &lt; 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__attribute__((unused))</div><div class='add'>+static inline int tld_key_err_or_zero(tld_key_t key)</div><div class='add'>+{</div><div class='add'>+	return tld_key_is_err(key) ? key.off : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tld_get_data() - Get a pointer to the TLD associated with the given key of the</div><div class='add'>+ * calling thread.</div><div class='add'>+ *</div><div class='add'>+ * @map_fd: A file descriptor of tld_data_map, the underlying BPF task local storage map</div><div class='add'>+ * of task local data.</div><div class='add'>+ * @key: A key object created by TLD_DEFINE_KEY() or tld_create_key().</div><div class='add'>+ *</div><div class='add'>+ * Return a pointer to the TLD if the key is valid; NULL if not enough memory for TLD</div><div class='add'>+ * for this thread, or the key is invalid. The returned pointer is guaranteed to be 8-byte</div><div class='add'>+ * aligned.</div><div class='add'>+ *</div><div class='add'>+ * Threads that call tld_get_data() must call tld_free() on exit to prevent</div><div class='add'>+ * memory leak if TLD_FREE_DATA_ON_THREAD_EXIT is not defined.</div><div class='add'>+ */</div><div class='add'>+__attribute__((unused))</div><div class='add'>+static void *tld_get_data(int map_fd, tld_key_t key)</div><div class='add'>+{</div><div class='add'>+	if (!TLD_READ_ONCE(tld_meta_p))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* tld_data_p is allocated on the first invocation of tld_get_data() */</div><div class='add'>+	if (!tld_data_p &amp;&amp; __tld_init_data_p(map_fd))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return tld_data_p-&gt;data + key.off;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tld_free() - Free task local data memory of the calling thread</div><div class='add'>+ *</div><div class='add'>+ * For the calling thread, all pointers to TLDs acquired before will become invalid.</div><div class='add'>+ *</div><div class='add'>+ * Users must call tld_free() on thread exit to prevent memory leak. Alternatively,</div><div class='add'>+ * define TLD_FREE_DATA_ON_THREAD_EXIT and a thread exit handler will be registered</div><div class='add'>+ * to free the memory automatically.</div><div class='add'>+ */</div><div class='add'>+__attribute__((unused))</div><div class='add'>+static void tld_free(void)</div><div class='add'>+{</div><div class='add'>+	if (tld_data_alloc_p) {</div><div class='add'>+		free(tld_data_alloc_p);</div><div class='add'>+		tld_data_alloc_p = NULL;</div><div class='add'>+		tld_data_p = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef __cplusplus</div><div class='add'>+} /* extern "C" */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __TASK_LOCAL_DATA_H */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/task_work_stress.c b/tools/testing/selftests/bpf/prog_tests/task_work_stress.c<br/>new file mode 100644<br/>index 000000000000..450d17d91a56<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/task_work_stress.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/task_work_stress.c</a></div><div class='hunk'>@@ -0,0 +1,130 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include "task_work_stress.skel.h"</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;time.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;stdatomic.h&gt;</div><div class='add'>+</div><div class='add'>+struct test_data {</div><div class='add'>+	int prog_fd;</div><div class='add'>+	atomic_int exit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void *runner(void *test_data)</div><div class='add'>+{</div><div class='add'>+	struct test_data *td = test_data;</div><div class='add'>+	int err = 0;</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, opts);</div><div class='add'>+</div><div class='add'>+	while (!err &amp;&amp; !atomic_load(&amp;td-&gt;exit))</div><div class='add'>+		err = bpf_prog_test_run_opts(td-&gt;prog_fd, &amp;opts);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_env_int(const char *str, int def)</div><div class='add'>+{</div><div class='add'>+	const char *s = getenv(str);</div><div class='add'>+	char *end;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (!s || !*s)</div><div class='add'>+		return def;</div><div class='add'>+	errno = 0;</div><div class='add'>+	retval = strtol(s, &amp;end, 10);</div><div class='add'>+	if (errno || *end || retval &lt; 0)</div><div class='add'>+		return def;</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void task_work_run(bool enable_delete)</div><div class='add'>+{</div><div class='add'>+	struct task_work_stress *skel;</div><div class='add'>+	struct bpf_program *scheduler, *deleter;</div><div class='add'>+	int nthreads = 16;</div><div class='add'>+	int test_time_s = get_env_int("BPF_TASK_WORK_TEST_TIME", 1);</div><div class='add'>+	pthread_t tid[nthreads], tid_del;</div><div class='add'>+	bool started[nthreads], started_del = false;</div><div class='add'>+	struct test_data td_sched = { .exit = 0 }, td_del = { .exit = 1 };</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	skel = task_work_stress__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "task_work__open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	scheduler = bpf_object__find_program_by_name(skel-&gt;obj, "schedule_task_work");</div><div class='add'>+	bpf_program__set_autoload(scheduler, true);</div><div class='add'>+</div><div class='add'>+	deleter = bpf_object__find_program_by_name(skel-&gt;obj, "delete_task_work");</div><div class='add'>+	bpf_program__set_autoload(deleter, true);</div><div class='add'>+</div><div class='add'>+	err = task_work_stress__load(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "skel_load"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nthreads; ++i)</div><div class='add'>+		started[i] = false;</div><div class='add'>+</div><div class='add'>+	td_sched.prog_fd = bpf_program__fd(scheduler);</div><div class='add'>+	for (i = 0; i &lt; nthreads; ++i) {</div><div class='add'>+		if (pthread_create(&amp;tid[i], NULL, runner, &amp;td_sched) != 0) {</div><div class='add'>+			fprintf(stderr, "could not start thread");</div><div class='add'>+			goto cancel;</div><div class='add'>+		}</div><div class='add'>+		started[i] = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable_delete)</div><div class='add'>+		atomic_store(&amp;td_del.exit, 0);</div><div class='add'>+</div><div class='add'>+	td_del.prog_fd = bpf_program__fd(deleter);</div><div class='add'>+	if (pthread_create(&amp;tid_del, NULL, runner, &amp;td_del) != 0) {</div><div class='add'>+		fprintf(stderr, "could not start thread");</div><div class='add'>+		goto cancel;</div><div class='add'>+	}</div><div class='add'>+	started_del = true;</div><div class='add'>+</div><div class='add'>+	/* Run stress test for some time */</div><div class='add'>+	sleep(test_time_s);</div><div class='add'>+</div><div class='add'>+cancel:</div><div class='add'>+	atomic_store(&amp;td_sched.exit, 1);</div><div class='add'>+	atomic_store(&amp;td_del.exit, 1);</div><div class='add'>+	for (i = 0; i &lt; nthreads; ++i) {</div><div class='add'>+		if (started[i])</div><div class='add'>+			pthread_join(tid[i], NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (started_del)</div><div class='add'>+		pthread_join(tid_del, NULL);</div><div class='add'>+</div><div class='add'>+	ASSERT_GT(skel-&gt;bss-&gt;callback_scheduled, 0, "work scheduled");</div><div class='add'>+	/* Some scheduling attempts should have failed due to contention */</div><div class='add'>+	ASSERT_GT(skel-&gt;bss-&gt;schedule_error, 0, "schedule error");</div><div class='add'>+</div><div class='add'>+	if (enable_delete) {</div><div class='add'>+		/* If delete thread is enabled, it has cancelled some callbacks */</div><div class='add'>+		ASSERT_GT(skel-&gt;bss-&gt;delete_success, 0, "delete success");</div><div class='add'>+		ASSERT_LT(skel-&gt;bss-&gt;callback_success, skel-&gt;bss-&gt;callback_scheduled, "callbacks");</div><div class='add'>+	} else {</div><div class='add'>+		/* Without delete thread number of scheduled callbacks is the same as fired */</div><div class='add'>+		ASSERT_EQ(skel-&gt;bss-&gt;callback_success, skel-&gt;bss-&gt;callback_scheduled, "callbacks");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	task_work_stress__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_task_work_stress(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("no_delete"))</div><div class='add'>+		task_work_run(false);</div><div class='add'>+	if (test__start_subtest("with_delete"))</div><div class='add'>+		task_work_run(true);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/tc_helpers.h b/tools/testing/selftests/bpf/prog_tests/tc_helpers.h<br/>index 924d0e25320c..d52a62af77bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tc_helpers.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tc_helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tc_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/tc_helpers.h</a></div><div class='hunk'>@@ -8,34 +8,6 @@</div><div class='ctx'> # define loopback 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline __u32 id_from_prog_fd(int fd)</div><div class='del'>-{</div><div class='del'>-	struct bpf_prog_info prog_info = {};</div><div class='del'>-	__u32 prog_info_len = sizeof(prog_info);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = bpf_obj_get_info_by_fd(fd, &amp;prog_info, &amp;prog_info_len);</div><div class='del'>-	if (!ASSERT_OK(err, "id_from_prog_fd"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ASSERT_NEQ(prog_info.id, 0, "prog_info.id");</div><div class='del'>-	return prog_info.id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u32 id_from_link_fd(int fd)</div><div class='del'>-{</div><div class='del'>-	struct bpf_link_info link_info = {};</div><div class='del'>-	__u32 link_info_len = sizeof(link_info);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = bpf_link_get_info_by_fd(fd, &amp;link_info, &amp;link_info_len);</div><div class='del'>-	if (!ASSERT_OK(err, "id_from_link_fd"))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ASSERT_NEQ(link_info.id, 0, "link_info.id");</div><div class='del'>-	return link_info.id;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline __u32 ifindex_from_link_fd(int fd)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_link_info link_info = {};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/tc_links.c b/tools/testing/selftests/bpf/prog_tests/tc_links.c<br/>index 1af9ec1149aa..2186a24e7d8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tc_links.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tc_links.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tc_links.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/tc_links.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include "netlink_helpers.h"</div><div class='ctx'> #include "tc_helpers.h"</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_basic(void)</div><div class='add'>+void test_ns_tc_links_basic(void)</div><div class='ctx'> {</div><div class='ctx'> 	LIBBPF_OPTS(bpf_prog_query_opts, optq);</div><div class='ctx'> 	LIBBPF_OPTS(bpf_tcx_opts, optl);</div><div class='hunk'>@@ -260,7 +260,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_before(void)</div><div class='add'>+void test_ns_tc_links_before(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_links_before_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_links_before_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -414,7 +414,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_after(void)</div><div class='add'>+void test_ns_tc_links_after(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_links_after_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_links_after_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -514,7 +514,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_revision(void)</div><div class='add'>+void test_ns_tc_links_revision(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_links_revision_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_links_revision_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -618,7 +618,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_chain_classic(void)</div><div class='add'>+void test_ns_tc_links_chain_classic(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_chain_classic(BPF_TCX_INGRESS, false);</div><div class='ctx'> 	test_tc_chain_classic(BPF_TCX_EGRESS, false);</div><div class='hunk'>@@ -846,7 +846,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_replace(void)</div><div class='add'>+void test_ns_tc_links_replace(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_links_replace_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_links_replace_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1158,7 +1158,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_invalid(void)</div><div class='add'>+void test_ns_tc_links_invalid(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_links_invalid_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_links_invalid_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1314,7 +1314,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_prepend(void)</div><div class='add'>+void test_ns_tc_links_prepend(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_links_prepend_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_links_prepend_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1470,7 +1470,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_append(void)</div><div class='add'>+void test_ns_tc_links_append(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_links_append_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_links_append_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1568,7 +1568,7 @@ cleanup:</div><div class='ctx'> 	ASSERT_EQ(if_nametoindex("tcx_opts2"), 0, "dev2_removed");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_dev_cleanup(void)</div><div class='add'>+void test_ns_tc_links_dev_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_links_dev_cleanup_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_links_dev_cleanup_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1672,7 +1672,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_chain_mixed(void)</div><div class='add'>+void test_ns_tc_links_chain_mixed(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_chain_mixed(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_chain_mixed(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1782,7 +1782,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_ingress(void)</div><div class='add'>+void test_ns_tc_links_ingress(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_links_ingress(BPF_TCX_INGRESS, true, true);</div><div class='ctx'> 	test_tc_links_ingress(BPF_TCX_INGRESS, true, false);</div><div class='hunk'>@@ -1823,7 +1823,7 @@ static int qdisc_replace(int ifindex, const char *kind, bool block)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_dev_chain0(void)</div><div class='add'>+void test_ns_tc_links_dev_chain0(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err, ifindex;</div><div class='ctx'> </div><div class='hunk'>@@ -1955,7 +1955,7 @@ cleanup:</div><div class='ctx'> 	ASSERT_EQ(if_nametoindex("tcx_opts2"), 0, "dev2_removed");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_links_dev_mixed(void)</div><div class='add'>+void test_ns_tc_links_dev_mixed(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_links_dev_mixed(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_links_dev_mixed(BPF_TCX_EGRESS);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/tc_opts.c b/tools/testing/selftests/bpf/prog_tests/tc_opts.c<br/>index f77f604389aa..dd7a138d8c3d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tc_opts.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tc_opts.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tc_opts.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/tc_opts.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include "test_tc_link.skel.h"</div><div class='ctx'> #include "tc_helpers.h"</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_basic(void)</div><div class='add'>+void test_ns_tc_opts_basic(void)</div><div class='ctx'> {</div><div class='ctx'> 	LIBBPF_OPTS(bpf_prog_attach_opts, opta);</div><div class='ctx'> 	LIBBPF_OPTS(bpf_prog_detach_opts, optd);</div><div class='hunk'>@@ -254,7 +254,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_before(void)</div><div class='add'>+void test_ns_tc_opts_before(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_before_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_before_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -445,7 +445,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_after(void)</div><div class='add'>+void test_ns_tc_opts_after(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_after_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_after_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -554,7 +554,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_revision(void)</div><div class='add'>+void test_ns_tc_opts_revision(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_revision_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_revision_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -655,7 +655,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_chain_classic(void)</div><div class='add'>+void test_ns_tc_opts_chain_classic(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_chain_classic(BPF_TCX_INGRESS, false);</div><div class='ctx'> 	test_tc_chain_classic(BPF_TCX_EGRESS, false);</div><div class='hunk'>@@ -864,7 +864,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_replace(void)</div><div class='add'>+void test_ns_tc_opts_replace(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_replace_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_replace_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1017,7 +1017,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_invalid(void)</div><div class='add'>+void test_ns_tc_opts_invalid(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_invalid_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_invalid_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1157,7 +1157,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_prepend(void)</div><div class='add'>+void test_ns_tc_opts_prepend(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_prepend_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_prepend_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1297,7 +1297,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_append(void)</div><div class='add'>+void test_ns_tc_opts_append(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_append_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_append_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1387,7 +1387,7 @@ cleanup:</div><div class='ctx'> 	ASSERT_EQ(if_nametoindex("tcx_opts2"), 0, "dev2_removed");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_dev_cleanup(void)</div><div class='add'>+void test_ns_tc_opts_dev_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_dev_cleanup_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_dev_cleanup_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1563,7 +1563,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_mixed(void)</div><div class='add'>+void test_ns_tc_opts_mixed(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_mixed_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_mixed_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1642,7 +1642,7 @@ cleanup:</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_demixed(void)</div><div class='add'>+void test_ns_tc_opts_demixed(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_demixed_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_demixed_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -1813,7 +1813,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_detach(void)</div><div class='add'>+void test_ns_tc_opts_detach(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_detach_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_detach_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -2020,7 +2020,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_detach_before(void)</div><div class='add'>+void test_ns_tc_opts_detach_before(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_detach_before_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_detach_before_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -2236,7 +2236,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_detach_after(void)</div><div class='add'>+void test_ns_tc_opts_detach_after(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_detach_after_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_detach_after_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -2265,7 +2265,7 @@ static void test_tc_opts_delete_empty(int target, bool chain_tc_old)</div><div class='ctx'> 	assert_mprog_count(target, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_delete_empty(void)</div><div class='add'>+void test_ns_tc_opts_delete_empty(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_delete_empty(BPF_TCX_INGRESS, false);</div><div class='ctx'> 	test_tc_opts_delete_empty(BPF_TCX_EGRESS, false);</div><div class='hunk'>@@ -2372,7 +2372,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_chain_mixed(void)</div><div class='add'>+void test_ns_tc_opts_chain_mixed(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_chain_mixed(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_chain_mixed(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -2446,7 +2446,7 @@ cleanup:</div><div class='ctx'> 	ASSERT_EQ(if_nametoindex("tcx_opts2"), 0, "dev2_removed");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_max(void)</div><div class='add'>+void test_ns_tc_opts_max(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_max_target(BPF_TCX_INGRESS, 0, false);</div><div class='ctx'> 	test_tc_opts_max_target(BPF_TCX_EGRESS, 0, false);</div><div class='hunk'>@@ -2748,7 +2748,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_query(void)</div><div class='add'>+void test_ns_tc_opts_query(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_query_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_query_target(BPF_TCX_EGRESS);</div><div class='hunk'>@@ -2807,7 +2807,7 @@ cleanup:</div><div class='ctx'> 	test_tc_link__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void serial_test_tc_opts_query_attach(void)</div><div class='add'>+void test_ns_tc_opts_query_attach(void)</div><div class='ctx'> {</div><div class='ctx'> 	test_tc_opts_query_attach_target(BPF_TCX_INGRESS);</div><div class='ctx'> 	test_tc_opts_query_attach_target(BPF_TCX_EGRESS);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/tc_redirect.c b/tools/testing/selftests/bpf/prog_tests/tc_redirect.c<br/>index c85798966aec..76d72a59365e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tc_redirect.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tc_redirect.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tc_redirect.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/tc_redirect.c</a></div><div class='hunk'>@@ -56,6 +56,8 @@</div><div class='ctx'> </div><div class='ctx'> #define MAC_DST_FWD "00:11:22:33:44:55"</div><div class='ctx'> #define MAC_DST "00:22:33:44:55:66"</div><div class='add'>+#define MAC_SRC_FWD "00:33:44:55:66:77"</div><div class='add'>+#define MAC_SRC "00:44:55:66:77:88"</div><div class='ctx'> </div><div class='ctx'> #define IFADDR_STR_LEN 18</div><div class='ctx'> #define PING_ARGS "-i 0.2 -c 3 -w 10 -q"</div><div class='hunk'>@@ -207,11 +209,10 @@ static int netns_setup_links_and_routes(struct netns_setup_result *result)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (result-&gt;dev_mode == MODE_VETH) {</div><div class='del'>-		SYS(fail, "ip link add src type veth peer name src_fwd");</div><div class='del'>-		SYS(fail, "ip link add dst type veth peer name dst_fwd");</div><div class='del'>-</div><div class='del'>-		SYS(fail, "ip link set dst_fwd address " MAC_DST_FWD);</div><div class='del'>-		SYS(fail, "ip link set dst address " MAC_DST);</div><div class='add'>+		SYS(fail, "ip link add src address " MAC_SRC " type veth "</div><div class='add'>+			  "peer name src_fwd address " MAC_SRC_FWD);</div><div class='add'>+		SYS(fail, "ip link add dst address " MAC_DST " type veth "</div><div class='add'>+			  "peer name dst_fwd address " MAC_DST_FWD);</div><div class='ctx'> 	} else if (result-&gt;dev_mode == MODE_NETKIT) {</div><div class='ctx'> 		err = create_netkit(NETKIT_L3, "src", "src_fwd");</div><div class='ctx'> 		if (!ASSERT_OK(err, "create_ifindex_src"))</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_bpf_smc.c b/tools/testing/selftests/bpf/prog_tests/test_bpf_smc.c<br/>new file mode 100644<br/>index 000000000000..de22734abc4d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_bpf_smc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_bpf_smc.c</a></div><div class='hunk'>@@ -0,0 +1,390 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;linux/genetlink.h&gt;</div><div class='add'>+#include "network_helpers.h"</div><div class='add'>+#include "bpf_smc.skel.h"</div><div class='add'>+</div><div class='add'>+#ifndef IPPROTO_SMC</div><div class='add'>+#define IPPROTO_SMC 256</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define CLIENT_IP			"127.0.0.1"</div><div class='add'>+#define SERVER_IP			"127.0.1.0"</div><div class='add'>+#define SERVER_IP_VIA_RISK_PATH	"127.0.2.0"</div><div class='add'>+</div><div class='add'>+#define SERVICE_1	80</div><div class='add'>+#define SERVICE_2	443</div><div class='add'>+#define SERVICE_3	8443</div><div class='add'>+</div><div class='add'>+#define TEST_NS	"bpf_smc_netns"</div><div class='add'>+</div><div class='add'>+static struct netns_obj *test_netns;</div><div class='add'>+</div><div class='add'>+struct smc_policy_ip_key {</div><div class='add'>+	__u32  sip;</div><div class='add'>+	__u32  dip;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct smc_policy_ip_value {</div><div class='add'>+	__u8	mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if defined(__s390x__)</div><div class='add'>+/* s390x has default seid  */</div><div class='add'>+static bool setup_ueid(void) { return true; }</div><div class='add'>+static void cleanup_ueid(void) {}</div><div class='add'>+#else</div><div class='add'>+enum {</div><div class='add'>+	SMC_NETLINK_ADD_UEID = 10,</div><div class='add'>+	SMC_NETLINK_REMOVE_UEID</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	SMC_NLA_EID_TABLE_UNSPEC,</div><div class='add'>+	SMC_NLA_EID_TABLE_ENTRY,    /* string */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct msgtemplate {</div><div class='add'>+	struct nlmsghdr n;</div><div class='add'>+	struct genlmsghdr g;</div><div class='add'>+	char buf[1024];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GENLMSG_DATA(glh)	((void *)(NLMSG_DATA(glh) + GENL_HDRLEN))</div><div class='add'>+#define GENLMSG_PAYLOAD(glh)	(NLMSG_PAYLOAD(glh, 0) - GENL_HDRLEN)</div><div class='add'>+#define NLA_DATA(na)		((void *)((char *)(na) + NLA_HDRLEN))</div><div class='add'>+#define NLA_PAYLOAD(len)	((len) - NLA_HDRLEN)</div><div class='add'>+</div><div class='add'>+#define SMC_GENL_FAMILY_NAME	"SMC_GEN_NETLINK"</div><div class='add'>+#define SMC_BPFTEST_UEID	"SMC-BPFTEST-UEID"</div><div class='add'>+</div><div class='add'>+static uint16_t smc_nl_family_id = -1;</div><div class='add'>+</div><div class='add'>+static int send_cmd(int fd, __u16 nlmsg_type, __u32 nlmsg_pid,</div><div class='add'>+		    __u16 nlmsg_flags, __u8 genl_cmd, __u16 nla_type,</div><div class='add'>+		    void *nla_data, int nla_len)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *na;</div><div class='add'>+	struct sockaddr_nl nladdr;</div><div class='add'>+	int r, buflen;</div><div class='add'>+	char *buf;</div><div class='add'>+</div><div class='add'>+	struct msgtemplate msg = {0};</div><div class='add'>+</div><div class='add'>+	msg.n.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN);</div><div class='add'>+	msg.n.nlmsg_type = nlmsg_type;</div><div class='add'>+	msg.n.nlmsg_flags = nlmsg_flags;</div><div class='add'>+	msg.n.nlmsg_seq = 0;</div><div class='add'>+	msg.n.nlmsg_pid = nlmsg_pid;</div><div class='add'>+	msg.g.cmd = genl_cmd;</div><div class='add'>+	msg.g.version = 1;</div><div class='add'>+	na = (struct nlattr *)GENLMSG_DATA(&amp;msg);</div><div class='add'>+	na-&gt;nla_type = nla_type;</div><div class='add'>+	na-&gt;nla_len = nla_len + 1 + NLA_HDRLEN;</div><div class='add'>+	memcpy(NLA_DATA(na), nla_data, nla_len);</div><div class='add'>+	msg.n.nlmsg_len += NLMSG_ALIGN(na-&gt;nla_len);</div><div class='add'>+</div><div class='add'>+	buf = (char *)&amp;msg;</div><div class='add'>+	buflen = msg.n.nlmsg_len;</div><div class='add'>+	memset(&amp;nladdr, 0, sizeof(nladdr));</div><div class='add'>+	nladdr.nl_family = AF_NETLINK;</div><div class='add'>+</div><div class='add'>+	while ((r = sendto(fd, buf, buflen, 0, (struct sockaddr *)&amp;nladdr,</div><div class='add'>+			   sizeof(nladdr))) &lt; buflen) {</div><div class='add'>+		if (r &gt; 0) {</div><div class='add'>+			buf += r;</div><div class='add'>+			buflen -= r;</div><div class='add'>+		} else if (errno != EAGAIN) {</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool get_smc_nl_family_id(void)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_nl nl_src;</div><div class='add'>+	struct msgtemplate msg;</div><div class='add'>+	struct nlattr *nl;</div><div class='add'>+	int fd, ret;</div><div class='add'>+	pid_t pid;</div><div class='add'>+</div><div class='add'>+	fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_GENERIC);</div><div class='add'>+	if (!ASSERT_OK_FD(fd, "nl_family socket"))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	pid = getpid();</div><div class='add'>+</div><div class='add'>+	memset(&amp;nl_src, 0, sizeof(nl_src));</div><div class='add'>+	nl_src.nl_family = AF_NETLINK;</div><div class='add'>+	nl_src.nl_pid = pid;</div><div class='add'>+</div><div class='add'>+	ret = bind(fd, (struct sockaddr *)&amp;nl_src, sizeof(nl_src));</div><div class='add'>+	if (!ASSERT_OK(ret, "nl_family bind"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	ret = send_cmd(fd, GENL_ID_CTRL, pid,</div><div class='add'>+		       NLM_F_REQUEST, CTRL_CMD_GETFAMILY,</div><div class='add'>+		       CTRL_ATTR_FAMILY_NAME, (void *)SMC_GENL_FAMILY_NAME,</div><div class='add'>+		       strlen(SMC_GENL_FAMILY_NAME));</div><div class='add'>+	if (!ASSERT_OK(ret, "nl_family query"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	ret = recv(fd, &amp;msg, sizeof(msg), 0);</div><div class='add'>+	if (!ASSERT_FALSE(msg.n.nlmsg_type == NLMSG_ERROR || ret &lt; 0 ||</div><div class='add'>+			  !NLMSG_OK(&amp;msg.n, ret), "nl_family response"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	nl = (struct nlattr *)GENLMSG_DATA(&amp;msg);</div><div class='add'>+	nl = (struct nlattr *)((char *)nl + NLA_ALIGN(nl-&gt;nla_len));</div><div class='add'>+	if (!ASSERT_EQ(nl-&gt;nla_type, CTRL_ATTR_FAMILY_ID, "nl_family nla type"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	smc_nl_family_id = *(uint16_t *)NLA_DATA(nl);</div><div class='add'>+	close(fd);</div><div class='add'>+	return true;</div><div class='add'>+fail:</div><div class='add'>+	close(fd);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool smc_ueid(int op)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_nl nl_src;</div><div class='add'>+	struct msgtemplate msg;</div><div class='add'>+	struct nlmsgerr *err;</div><div class='add'>+	char test_ueid[32];</div><div class='add'>+	int fd, ret;</div><div class='add'>+	pid_t pid;</div><div class='add'>+</div><div class='add'>+	/* UEID required */</div><div class='add'>+	memset(test_ueid, '\x20', sizeof(test_ueid));</div><div class='add'>+	memcpy(test_ueid, SMC_BPFTEST_UEID, strlen(SMC_BPFTEST_UEID));</div><div class='add'>+	fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_GENERIC);</div><div class='add'>+	if (!ASSERT_OK_FD(fd, "ueid socket"))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	pid = getpid();</div><div class='add'>+	memset(&amp;nl_src, 0, sizeof(nl_src));</div><div class='add'>+	nl_src.nl_family = AF_NETLINK;</div><div class='add'>+	nl_src.nl_pid = pid;</div><div class='add'>+</div><div class='add'>+	ret = bind(fd, (struct sockaddr *)&amp;nl_src, sizeof(nl_src));</div><div class='add'>+	if (!ASSERT_OK(ret, "ueid bind"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	ret = send_cmd(fd, smc_nl_family_id, pid,</div><div class='add'>+		       NLM_F_REQUEST | NLM_F_ACK, op, SMC_NLA_EID_TABLE_ENTRY,</div><div class='add'>+		       (void *)test_ueid, sizeof(test_ueid));</div><div class='add'>+	if (!ASSERT_OK(ret, "ueid cmd"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	ret = recv(fd, &amp;msg, sizeof(msg), 0);</div><div class='add'>+	if (!ASSERT_FALSE(ret &lt; 0 ||</div><div class='add'>+			  !NLMSG_OK(&amp;msg.n, ret), "ueid response"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	if (msg.n.nlmsg_type == NLMSG_ERROR) {</div><div class='add'>+		err = NLMSG_DATA(&amp;msg);</div><div class='add'>+		switch (op) {</div><div class='add'>+		case SMC_NETLINK_REMOVE_UEID:</div><div class='add'>+			if (!ASSERT_FALSE((err-&gt;error &amp;&amp; err-&gt;error != -ENOENT),</div><div class='add'>+					  "ueid remove"))</div><div class='add'>+				goto fail;</div><div class='add'>+			break;</div><div class='add'>+		case SMC_NETLINK_ADD_UEID:</div><div class='add'>+			if (!ASSERT_OK(err-&gt;error, "ueid add"))</div><div class='add'>+				goto fail;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	close(fd);</div><div class='add'>+	return true;</div><div class='add'>+fail:</div><div class='add'>+	close(fd);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool setup_ueid(void)</div><div class='add'>+{</div><div class='add'>+	/* get smc nl id */</div><div class='add'>+	if (!get_smc_nl_family_id())</div><div class='add'>+		return false;</div><div class='add'>+	/* clear old ueid for bpftest */</div><div class='add'>+	smc_ueid(SMC_NETLINK_REMOVE_UEID);</div><div class='add'>+	/* smc-loopback required ueid */</div><div class='add'>+	return smc_ueid(SMC_NETLINK_ADD_UEID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup_ueid(void)</div><div class='add'>+{</div><div class='add'>+	smc_ueid(SMC_NETLINK_REMOVE_UEID);</div><div class='add'>+}</div><div class='add'>+#endif /* __s390x__ */</div><div class='add'>+</div><div class='add'>+static bool setup_netns(void)</div><div class='add'>+{</div><div class='add'>+	test_netns = netns_new(TEST_NS, true);</div><div class='add'>+	if (!ASSERT_OK_PTR(test_netns, "open net namespace"))</div><div class='add'>+		goto fail_netns;</div><div class='add'>+</div><div class='add'>+	SYS(fail_ip, "ip addr add 127.0.1.0/8 dev lo");</div><div class='add'>+	SYS(fail_ip, "ip addr add 127.0.2.0/8 dev lo");</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+fail_ip:</div><div class='add'>+	netns_free(test_netns);</div><div class='add'>+fail_netns:</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup_netns(void)</div><div class='add'>+{</div><div class='add'>+	netns_free(test_netns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool setup_smc(void)</div><div class='add'>+{</div><div class='add'>+	if (!setup_ueid())</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!setup_netns())</div><div class='add'>+		goto fail_netns;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+fail_netns:</div><div class='add'>+	cleanup_ueid();</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_client_addr_cb(int fd, void *opts)</div><div class='add'>+{</div><div class='add'>+	const char *src = (const char *)opts;</div><div class='add'>+	struct sockaddr_in localaddr;</div><div class='add'>+</div><div class='add'>+	localaddr.sin_family = AF_INET;</div><div class='add'>+	localaddr.sin_port = htons(0);</div><div class='add'>+	localaddr.sin_addr.s_addr = inet_addr(src);</div><div class='add'>+	return !ASSERT_OK(bind(fd, &amp;localaddr, sizeof(localaddr)), "client bind");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void run_link(const char *src, const char *dst, int port)</div><div class='add'>+{</div><div class='add'>+	struct network_helper_opts opts = {0};</div><div class='add'>+	int server, client;</div><div class='add'>+</div><div class='add'>+	server = start_server_str(AF_INET, SOCK_STREAM, dst, port, NULL);</div><div class='add'>+	if (!ASSERT_OK_FD(server, "start service_1"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	opts.proto = IPPROTO_TCP;</div><div class='add'>+	opts.post_socket_cb = set_client_addr_cb;</div><div class='add'>+	opts.cb_opts = (void *)src;</div><div class='add'>+</div><div class='add'>+	client = connect_to_fd_opts(server, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK_FD(client, "start connect"))</div><div class='add'>+		goto fail_client;</div><div class='add'>+</div><div class='add'>+	close(client);</div><div class='add'>+fail_client:</div><div class='add'>+	close(server);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void block_link(int map_fd, const char *src, const char *dst)</div><div class='add'>+{</div><div class='add'>+	struct smc_policy_ip_value val = { .mode = /* block */ 0 };</div><div class='add'>+	struct smc_policy_ip_key key = {</div><div class='add'>+		.sip = inet_addr(src),</div><div class='add'>+		.dip = inet_addr(dst),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bpf_map_update_elem(map_fd, &amp;key, &amp;val, BPF_ANY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This test describes a real-life service topology as follows:</div><div class='add'>+ *</div><div class='add'>+ *                             +-------------&gt; service_1</div><div class='add'>+ *            link 1           |                     |</div><div class='add'>+ *   +--------------------&gt; server                   |  link 2</div><div class='add'>+ *   |                         |                     V</div><div class='add'>+ *   |                         +-------------&gt; service_2</div><div class='add'>+ *   |        link 3</div><div class='add'>+ *  client -------------------&gt; server_via_unsafe_path -&gt; service_3</div><div class='add'>+ *</div><div class='add'>+ * Among them,</div><div class='add'>+ * 1. link-1 is very suitable for using SMC.</div><div class='add'>+ * 2. link-2 is not suitable for using SMC, because the mode of this link is</div><div class='add'>+ *    kind of short-link services.</div><div class='add'>+ * 3. link-3 is also not suitable for using SMC, because the RDMA link is</div><div class='add'>+ *    unavailable and needs to go through a long timeout before it can fallback</div><div class='add'>+ *    to TCP.</div><div class='add'>+ * To achieve this goal, we use a customized SMC ip strategy via smc_hs_ctrl.</div><div class='add'>+ */</div><div class='add'>+static void test_topo(void)</div><div class='add'>+{</div><div class='add'>+	struct bpf_smc *skel;</div><div class='add'>+	int rc, map_fd;</div><div class='add'>+</div><div class='add'>+	skel = bpf_smc__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "bpf_smc__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rc = bpf_smc__attach(skel);</div><div class='add'>+	if (!ASSERT_OK(rc, "bpf_smc__attach"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	map_fd = bpf_map__fd(skel-&gt;maps.smc_policy_ip);</div><div class='add'>+	if (!ASSERT_OK_FD(map_fd, "bpf_map__fd"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* Mock the process of transparent replacement, since we will modify</div><div class='add'>+	 * protocol to ipproto_smc accropding to it via</div><div class='add'>+	 * fmod_ret/update_socket_protocol.</div><div class='add'>+	 */</div><div class='add'>+	write_sysctl("/proc/sys/net/smc/hs_ctrl", "linkcheck");</div><div class='add'>+</div><div class='add'>+	/* Configure ip strat */</div><div class='add'>+	block_link(map_fd, CLIENT_IP, SERVER_IP_VIA_RISK_PATH);</div><div class='add'>+	block_link(map_fd, SERVER_IP, SERVER_IP);</div><div class='add'>+</div><div class='add'>+	/* should go with smc */</div><div class='add'>+	run_link(CLIENT_IP, SERVER_IP, SERVICE_1);</div><div class='add'>+	/* should go with smc fallback */</div><div class='add'>+	run_link(SERVER_IP, SERVER_IP, SERVICE_2);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;smc_cnt, 2, "smc count");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;fallback_cnt, 1, "fallback count");</div><div class='add'>+</div><div class='add'>+	/* should go with smc */</div><div class='add'>+	run_link(CLIENT_IP, SERVER_IP, SERVICE_2);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;smc_cnt, 3, "smc count");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;fallback_cnt, 1, "fallback count");</div><div class='add'>+</div><div class='add'>+	/* should go with smc fallback */</div><div class='add'>+	run_link(CLIENT_IP, SERVER_IP_VIA_RISK_PATH, SERVICE_3);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;smc_cnt, 4, "smc count");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;fallback_cnt, 2, "fallback count");</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	bpf_smc__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_bpf_smc(void)</div><div class='add'>+{</div><div class='add'>+	if (!setup_smc()) {</div><div class='add'>+		printf("setup for smc test failed, test SKIP:\n");</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("topo"))</div><div class='add'>+		test_topo();</div><div class='add'>+</div><div class='add'>+	cleanup_ueid();</div><div class='add'>+	cleanup_netns();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_btf_ext.c b/tools/testing/selftests/bpf/prog_tests/test_btf_ext.c<br/>new file mode 100644<br/>index 000000000000..7d1b478c99a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_btf_ext.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_btf_ext.c</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms Inc. */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "test_btf_ext.skel.h"</div><div class='add'>+#include "btf_helpers.h"</div><div class='add'>+</div><div class='add'>+static void subtest_line_func_info(void)</div><div class='add'>+{</div><div class='add'>+	struct test_btf_ext *skel;</div><div class='add'>+	struct bpf_prog_info info;</div><div class='add'>+	struct bpf_line_info line_info[128], *libbpf_line_info;</div><div class='add'>+	struct bpf_func_info func_info[128], *libbpf_func_info;</div><div class='add'>+	__u32 info_len = sizeof(info), libbbpf_line_info_cnt, libbbpf_func_info_cnt;</div><div class='add'>+	int err, fd;</div><div class='add'>+</div><div class='add'>+	skel = test_btf_ext__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fd = bpf_program__fd(skel-&gt;progs.global_func);</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.line_info = ptr_to_u64(&amp;line_info);</div><div class='add'>+	info.nr_line_info = sizeof(line_info);</div><div class='add'>+	info.line_info_rec_size = sizeof(*line_info);</div><div class='add'>+	err = bpf_prog_get_info_by_fd(fd, &amp;info, &amp;info_len);</div><div class='add'>+	if (!ASSERT_OK(err, "prog_line_info"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	libbpf_line_info = bpf_program__line_info(skel-&gt;progs.global_func);</div><div class='add'>+	libbbpf_line_info_cnt = bpf_program__line_info_cnt(skel-&gt;progs.global_func);</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.func_info = ptr_to_u64(&amp;func_info);</div><div class='add'>+	info.nr_func_info = sizeof(func_info);</div><div class='add'>+	info.func_info_rec_size = sizeof(*func_info);</div><div class='add'>+	err = bpf_prog_get_info_by_fd(fd, &amp;info, &amp;info_len);</div><div class='add'>+	if (!ASSERT_OK(err, "prog_func_info"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	libbpf_func_info = bpf_program__func_info(skel-&gt;progs.global_func);</div><div class='add'>+	libbbpf_func_info_cnt = bpf_program__func_info_cnt(skel-&gt;progs.global_func);</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK_PTR(libbpf_line_info, "bpf_program__line_info"))</div><div class='add'>+		goto out;</div><div class='add'>+	if (!ASSERT_EQ(libbbpf_line_info_cnt, info.nr_line_info, "line_info_cnt"))</div><div class='add'>+		goto out;</div><div class='add'>+	if (!ASSERT_OK_PTR(libbpf_func_info, "bpf_program__func_info"))</div><div class='add'>+		goto out;</div><div class='add'>+	if (!ASSERT_EQ(libbbpf_func_info_cnt, info.nr_func_info, "func_info_cnt"))</div><div class='add'>+		goto out;</div><div class='add'>+	ASSERT_MEMEQ(libbpf_line_info, line_info, libbbpf_line_info_cnt * sizeof(*line_info),</div><div class='add'>+		     "line_info");</div><div class='add'>+	ASSERT_MEMEQ(libbpf_func_info, func_info, libbbpf_func_info_cnt * sizeof(*func_info),</div><div class='add'>+		     "func_info");</div><div class='add'>+out:</div><div class='add'>+	test_btf_ext__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_btf_ext(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("line_func_info"))</div><div class='add'>+		subtest_line_func_info();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_lsm.c b/tools/testing/selftests/bpf/prog_tests/test_lsm.c<br/>index 2a27f3714f5c..bdc4fc06bc5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_lsm.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_lsm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_lsm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_lsm.c</a></div><div class='hunk'>@@ -139,7 +139,7 @@ static void test_lsm_tailcall(void)</div><div class='ctx'> 	if (CHECK_FAIL(!err))</div><div class='ctx'> 		goto close_prog;</div><div class='ctx'> </div><div class='del'>-	prog_fd = bpf_program__fd(skel-&gt;progs.lsm_file_alloc_security_prog);</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.lsm_kernfs_init_security_prog);</div><div class='ctx'> 	if (CHECK_FAIL(prog_fd &lt; 0))</div><div class='ctx'> 		goto close_prog;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_struct_ops_id_ops_mapping.c b/tools/testing/selftests/bpf/prog_tests/test_struct_ops_id_ops_mapping.c<br/>new file mode 100644<br/>index 000000000000..fd8762ba4b67<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_struct_ops_id_ops_mapping.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_struct_ops_id_ops_mapping.c</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include "struct_ops_id_ops_mapping1.skel.h"</div><div class='add'>+#include "struct_ops_id_ops_mapping2.skel.h"</div><div class='add'>+</div><div class='add'>+static void test_st_ops_id_ops_mapping(void)</div><div class='add'>+{</div><div class='add'>+	struct struct_ops_id_ops_mapping1 *skel1 = NULL;</div><div class='add'>+	struct struct_ops_id_ops_mapping2 *skel2 = NULL;</div><div class='add'>+	struct bpf_map_info info = {};</div><div class='add'>+	__u32 len = sizeof(info);</div><div class='add'>+	int err, pid, prog1_fd, prog2_fd;</div><div class='add'>+</div><div class='add'>+	skel1 = struct_ops_id_ops_mapping1__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel1, "struct_ops_id_ops_mapping1__open"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skel2 = struct_ops_id_ops_mapping2__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel2, "struct_ops_id_ops_mapping2__open"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_get_info_by_fd(bpf_map__fd(skel1-&gt;maps.st_ops_map),</div><div class='add'>+				     &amp;info, &amp;len);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_get_info_by_fd"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skel1-&gt;bss-&gt;st_ops_id = info.id;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_get_info_by_fd(bpf_map__fd(skel2-&gt;maps.st_ops_map),</div><div class='add'>+				     &amp;info, &amp;len);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_map_get_info_by_fd"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skel2-&gt;bss-&gt;st_ops_id = info.id;</div><div class='add'>+</div><div class='add'>+	err = struct_ops_id_ops_mapping1__attach(skel1);</div><div class='add'>+	if (!ASSERT_OK(err, "struct_ops_id_ops_mapping1__attach"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = struct_ops_id_ops_mapping2__attach(skel2);</div><div class='add'>+	if (!ASSERT_OK(err, "struct_ops_id_ops_mapping2__attach"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* run tracing prog that calls .test_1 and checks return */</div><div class='add'>+	pid = getpid();</div><div class='add'>+	skel1-&gt;bss-&gt;test_pid = pid;</div><div class='add'>+	skel2-&gt;bss-&gt;test_pid = pid;</div><div class='add'>+	sys_gettid();</div><div class='add'>+	skel1-&gt;bss-&gt;test_pid = 0;</div><div class='add'>+	skel2-&gt;bss-&gt;test_pid = 0;</div><div class='add'>+</div><div class='add'>+	/* run syscall_prog that calls .test_1 and checks return */</div><div class='add'>+	prog1_fd = bpf_program__fd(skel1-&gt;progs.syscall_prog);</div><div class='add'>+	err = bpf_prog_test_run_opts(prog1_fd, NULL);</div><div class='add'>+	ASSERT_OK(err, "bpf_prog_test_run_opts");</div><div class='add'>+</div><div class='add'>+	prog2_fd = bpf_program__fd(skel2-&gt;progs.syscall_prog);</div><div class='add'>+	err = bpf_prog_test_run_opts(prog2_fd, NULL);</div><div class='add'>+	ASSERT_OK(err, "bpf_prog_test_run_opts");</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel1-&gt;bss-&gt;test_err, 0, "skel1-&gt;bss-&gt;test_err");</div><div class='add'>+	ASSERT_EQ(skel2-&gt;bss-&gt;test_err, 0, "skel2-&gt;bss-&gt;test_err");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	struct_ops_id_ops_mapping1__destroy(skel1);</div><div class='add'>+	struct_ops_id_ops_mapping2__destroy(skel2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_struct_ops_id_ops_mapping(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("st_ops_id_ops_mapping"))</div><div class='add'>+		test_st_ops_id_ops_mapping();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_struct_ops_kptr_return.c b/tools/testing/selftests/bpf/prog_tests/test_struct_ops_kptr_return.c<br/>new file mode 100644<br/>index 000000000000..467cc72a3588<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_struct_ops_kptr_return.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_struct_ops_kptr_return.c</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "struct_ops_kptr_return.skel.h"</div><div class='add'>+#include "struct_ops_kptr_return_fail__wrong_type.skel.h"</div><div class='add'>+#include "struct_ops_kptr_return_fail__invalid_scalar.skel.h"</div><div class='add'>+#include "struct_ops_kptr_return_fail__nonzero_offset.skel.h"</div><div class='add'>+#include "struct_ops_kptr_return_fail__local_kptr.skel.h"</div><div class='add'>+</div><div class='add'>+void test_struct_ops_kptr_return(void)</div><div class='add'>+{</div><div class='add'>+	RUN_TESTS(struct_ops_kptr_return);</div><div class='add'>+	RUN_TESTS(struct_ops_kptr_return_fail__wrong_type);</div><div class='add'>+	RUN_TESTS(struct_ops_kptr_return_fail__invalid_scalar);</div><div class='add'>+	RUN_TESTS(struct_ops_kptr_return_fail__nonzero_offset);</div><div class='add'>+	RUN_TESTS(struct_ops_kptr_return_fail__local_kptr);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_struct_ops_refcounted.c b/tools/testing/selftests/bpf/prog_tests/test_struct_ops_refcounted.c<br/>new file mode 100644<br/>index 000000000000..da60c715fc59<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_struct_ops_refcounted.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_struct_ops_refcounted.c</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "struct_ops_refcounted.skel.h"</div><div class='add'>+#include "struct_ops_refcounted_fail__ref_leak.skel.h"</div><div class='add'>+#include "struct_ops_refcounted_fail__global_subprog.skel.h"</div><div class='add'>+#include "struct_ops_refcounted_fail__tail_call.skel.h"</div><div class='add'>+</div><div class='add'>+void test_struct_ops_refcounted(void)</div><div class='add'>+{</div><div class='add'>+	RUN_TESTS(struct_ops_refcounted);</div><div class='add'>+	RUN_TESTS(struct_ops_refcounted_fail__ref_leak);</div><div class='add'>+	RUN_TESTS(struct_ops_refcounted_fail__global_subprog);</div><div class='add'>+	RUN_TESTS(struct_ops_refcounted_fail__tail_call);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_sysctl.c b/tools/testing/selftests/bpf/prog_tests/test_sysctl.c<br/>index bcdbd27f22f0..273dd41ca09e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_sysctl.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_sysctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_sysctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_sysctl.c</a></div><div class='hunk'>@@ -1,22 +1,8 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> // Copyright (c) 2019 Facebook</div><div class='ctx'> </div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;stdint.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/filter.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bpf/bpf.h&gt;</div><div class='del'>-#include &lt;bpf/libbpf.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bpf/bpf_endian.h&gt;</div><div class='del'>-#include "bpf_util.h"</div><div class='add'>+#include "test_progs.h"</div><div class='ctx'> #include "cgroup_helpers.h"</div><div class='del'>-#include "testing_helpers.h"</div><div class='ctx'> </div><div class='ctx'> #define CG_PATH			"/foo"</div><div class='ctx'> #define MAX_INSNS		512</div><div class='hunk'>@@ -1608,26 +1594,19 @@ static int run_tests(int cgfd)</div><div class='ctx'> 	return fails ? -1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int main(int argc, char **argv)</div><div class='add'>+void test_sysctl(void)</div><div class='ctx'> {</div><div class='del'>-	int cgfd = -1;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int cgfd;</div><div class='ctx'> </div><div class='ctx'> 	cgfd = cgroup_setup_and_join(CG_PATH);</div><div class='del'>-	if (cgfd &lt; 0)</div><div class='del'>-		goto err;</div><div class='add'>+	if (!ASSERT_OK_FD(cgfd &lt; 0, "create_cgroup"))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Use libbpf 1.0 API mode */</div><div class='del'>-	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);</div><div class='add'>+	if (!ASSERT_OK(run_tests(cgfd), "run_tests"))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (run_tests(cgfd))</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	goto out;</div><div class='del'>-err:</div><div class='del'>-	err = -1;</div><div class='ctx'> out:</div><div class='ctx'> 	close(cgfd);</div><div class='ctx'> 	cleanup_cgroup_environment();</div><div class='del'>-	return err;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_task_local_data.c b/tools/testing/selftests/bpf/prog_tests/test_task_local_data.c<br/>new file mode 100644<br/>index 000000000000..9fd6306b455c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_task_local_data.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_task_local_data.c</a></div><div class='hunk'>@@ -0,0 +1,297 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;bpf/btf.h&gt;</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+</div><div class='add'>+#define TLD_FREE_DATA_ON_THREAD_EXIT</div><div class='add'>+#define TLD_DYN_DATA_SIZE 4096</div><div class='add'>+#include "task_local_data.h"</div><div class='add'>+</div><div class='add'>+struct test_tld_struct {</div><div class='add'>+	__u64 a;</div><div class='add'>+	__u64 b;</div><div class='add'>+	__u64 c;</div><div class='add'>+	__u64 d;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#include "test_task_local_data.skel.h"</div><div class='add'>+</div><div class='add'>+TLD_DEFINE_KEY(value0_key, "value0", sizeof(int));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset task local data between subtests by clearing metadata other</div><div class='add'>+ * than the statically defined value0. This is safe as subtests run</div><div class='add'>+ * sequentially. Users of task local data library should not touch</div><div class='add'>+ * library internal.</div><div class='add'>+ */</div><div class='add'>+static void reset_tld(void)</div><div class='add'>+{</div><div class='add'>+	if (TLD_READ_ONCE(tld_meta_p)) {</div><div class='add'>+		/* Remove TLDs created by tld_create_key() */</div><div class='add'>+		tld_meta_p-&gt;cnt = 1;</div><div class='add'>+		tld_meta_p-&gt;size = TLD_DYN_DATA_SIZE;</div><div class='add'>+		memset(&amp;tld_meta_p-&gt;metadata[1], 0,</div><div class='add'>+		       (TLD_MAX_DATA_CNT - 1) * sizeof(struct tld_metadata));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Serialize access to bpf program's global variables */</div><div class='add'>+static pthread_mutex_t global_mutex;</div><div class='add'>+</div><div class='add'>+static tld_key_t *tld_keys;</div><div class='add'>+</div><div class='add'>+#define TEST_BASIC_THREAD_NUM 32</div><div class='add'>+</div><div class='add'>+void *test_task_local_data_basic_thread(void *arg)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, opts);</div><div class='add'>+	struct test_task_local_data *skel = (struct test_task_local_data *)arg;</div><div class='add'>+	int fd, err, tid, *value0, *value1;</div><div class='add'>+	struct test_tld_struct *value2;</div><div class='add'>+</div><div class='add'>+	fd = bpf_map__fd(skel-&gt;maps.tld_data_map);</div><div class='add'>+</div><div class='add'>+	value0 = tld_get_data(fd, value0_key);</div><div class='add'>+	if (!ASSERT_OK_PTR(value0, "tld_get_data"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	value1 = tld_get_data(fd, tld_keys[1]);</div><div class='add'>+	if (!ASSERT_OK_PTR(value1, "tld_get_data"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	value2 = tld_get_data(fd, tld_keys[2]);</div><div class='add'>+	if (!ASSERT_OK_PTR(value2, "tld_get_data"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	tid = sys_gettid();</div><div class='add'>+</div><div class='add'>+	*value0 = tid + 0;</div><div class='add'>+	*value1 = tid + 1;</div><div class='add'>+	value2-&gt;a = tid + 2;</div><div class='add'>+	value2-&gt;b = tid + 3;</div><div class='add'>+	value2-&gt;c = tid + 4;</div><div class='add'>+	value2-&gt;d = tid + 5;</div><div class='add'>+</div><div class='add'>+	pthread_mutex_lock(&amp;global_mutex);</div><div class='add'>+	/* Run task_main that read task local data and save to global variables */</div><div class='add'>+	err = bpf_prog_test_run_opts(bpf_program__fd(skel-&gt;progs.task_main), &amp;opts);</div><div class='add'>+	ASSERT_OK(err, "run task_main");</div><div class='add'>+	ASSERT_OK(opts.retval, "task_main retval");</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value0, tid + 0, "tld_get_data value0");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value1, tid + 1, "tld_get_data value1");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value2.a, tid + 2, "tld_get_data value2.a");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value2.b, tid + 3, "tld_get_data value2.b");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value2.c, tid + 4, "tld_get_data value2.c");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value2.d, tid + 5, "tld_get_data value2.d");</div><div class='add'>+	pthread_mutex_unlock(&amp;global_mutex);</div><div class='add'>+</div><div class='add'>+	/* Make sure valueX are indeed local to threads */</div><div class='add'>+	ASSERT_EQ(*value0, tid + 0, "value0");</div><div class='add'>+	ASSERT_EQ(*value1, tid + 1, "value1");</div><div class='add'>+	ASSERT_EQ(value2-&gt;a, tid + 2, "value2.a");</div><div class='add'>+	ASSERT_EQ(value2-&gt;b, tid + 3, "value2.b");</div><div class='add'>+	ASSERT_EQ(value2-&gt;c, tid + 4, "value2.c");</div><div class='add'>+	ASSERT_EQ(value2-&gt;d, tid + 5, "value2.d");</div><div class='add'>+</div><div class='add'>+	*value0 = tid + 5;</div><div class='add'>+	*value1 = tid + 4;</div><div class='add'>+	value2-&gt;a = tid + 3;</div><div class='add'>+	value2-&gt;b = tid + 2;</div><div class='add'>+	value2-&gt;c = tid + 1;</div><div class='add'>+	value2-&gt;d = tid + 0;</div><div class='add'>+</div><div class='add'>+	/* Run task_main again */</div><div class='add'>+	pthread_mutex_lock(&amp;global_mutex);</div><div class='add'>+	err = bpf_prog_test_run_opts(bpf_program__fd(skel-&gt;progs.task_main), &amp;opts);</div><div class='add'>+	ASSERT_OK(err, "run task_main");</div><div class='add'>+	ASSERT_OK(opts.retval, "task_main retval");</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value0, tid + 5, "tld_get_data value0");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value1, tid + 4, "tld_get_data value1");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value2.a, tid + 3, "tld_get_data value2.a");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value2.b, tid + 2, "tld_get_data value2.b");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value2.c, tid + 1, "tld_get_data value2.c");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;test_value2.d, tid + 0, "tld_get_data value2.d");</div><div class='add'>+	pthread_mutex_unlock(&amp;global_mutex);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	pthread_exit(NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_task_local_data_basic(void)</div><div class='add'>+{</div><div class='add'>+	struct test_task_local_data *skel;</div><div class='add'>+	pthread_t thread[TEST_BASIC_THREAD_NUM];</div><div class='add'>+	char dummy_key_name[TLD_NAME_LEN];</div><div class='add'>+	tld_key_t key;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	reset_tld();</div><div class='add'>+</div><div class='add'>+	ASSERT_OK(pthread_mutex_init(&amp;global_mutex, NULL), "pthread_mutex_init");</div><div class='add'>+</div><div class='add'>+	skel = test_task_local_data__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tld_keys = calloc(TLD_MAX_DATA_CNT, sizeof(tld_key_t));</div><div class='add'>+	if (!ASSERT_OK_PTR(tld_keys, "calloc tld_keys"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ASSERT_FALSE(tld_key_is_err(value0_key), "TLD_DEFINE_KEY");</div><div class='add'>+	tld_keys[1] = tld_create_key("value1", sizeof(int));</div><div class='add'>+	ASSERT_FALSE(tld_key_is_err(tld_keys[1]), "tld_create_key");</div><div class='add'>+	tld_keys[2] = tld_create_key("value2", sizeof(struct test_tld_struct));</div><div class='add'>+	ASSERT_FALSE(tld_key_is_err(tld_keys[2]), "tld_create_key");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Shouldn't be able to store data exceed a page. Create a TLD just big</div><div class='add'>+	 * enough to exceed a page. TLDs already created are int value0, int</div><div class='add'>+	 * value1, and struct test_tld_struct value2.</div><div class='add'>+	 */</div><div class='add'>+	key = tld_create_key("value_not_exist",</div><div class='add'>+			     TLD_PAGE_SIZE - 2 * sizeof(int) - sizeof(struct test_tld_struct) + 1);</div><div class='add'>+	ASSERT_EQ(tld_key_err_or_zero(key), -E2BIG, "tld_create_key");</div><div class='add'>+</div><div class='add'>+	key = tld_create_key("value2", sizeof(struct test_tld_struct));</div><div class='add'>+	ASSERT_EQ(tld_key_err_or_zero(key), -EEXIST, "tld_create_key");</div><div class='add'>+</div><div class='add'>+	/* Shouldn't be able to create the (TLD_MAX_DATA_CNT+1)-th TLD */</div><div class='add'>+	for (i = 3; i &lt; TLD_MAX_DATA_CNT; i++) {</div><div class='add'>+		snprintf(dummy_key_name, TLD_NAME_LEN, "dummy_value%d", i);</div><div class='add'>+		tld_keys[i] = tld_create_key(dummy_key_name, sizeof(int));</div><div class='add'>+		ASSERT_FALSE(tld_key_is_err(tld_keys[i]), "tld_create_key");</div><div class='add'>+	}</div><div class='add'>+	key = tld_create_key("value_not_exist", sizeof(struct test_tld_struct));</div><div class='add'>+	ASSERT_EQ(tld_key_err_or_zero(key), -ENOSPC, "tld_create_key");</div><div class='add'>+</div><div class='add'>+	/* Access TLDs from multiple threads and check if they are thread-specific */</div><div class='add'>+	for (i = 0; i &lt; TEST_BASIC_THREAD_NUM; i++) {</div><div class='add'>+		err = pthread_create(&amp;thread[i], NULL, test_task_local_data_basic_thread, skel);</div><div class='add'>+		if (!ASSERT_OK(err, "pthread_create"))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	for (i = 0; i &lt; TEST_BASIC_THREAD_NUM; i++)</div><div class='add'>+		pthread_join(thread[i], NULL);</div><div class='add'>+</div><div class='add'>+	if (tld_keys) {</div><div class='add'>+		free(tld_keys);</div><div class='add'>+		tld_keys = NULL;</div><div class='add'>+	}</div><div class='add'>+	tld_free();</div><div class='add'>+	test_task_local_data__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TEST_RACE_THREAD_NUM (TLD_MAX_DATA_CNT - 3)</div><div class='add'>+</div><div class='add'>+void *test_task_local_data_race_thread(void *arg)</div><div class='add'>+{</div><div class='add'>+	int err = 0, id = (intptr_t)arg;</div><div class='add'>+	char key_name[32];</div><div class='add'>+	tld_key_t key;</div><div class='add'>+</div><div class='add'>+	key = tld_create_key("value_not_exist", TLD_PAGE_SIZE + 1);</div><div class='add'>+	if (tld_key_err_or_zero(key) != -E2BIG) {</div><div class='add'>+		err = 1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only one thread will succeed in creating value1 */</div><div class='add'>+	key = tld_create_key("value1", sizeof(int));</div><div class='add'>+	if (!tld_key_is_err(key))</div><div class='add'>+		tld_keys[1] = key;</div><div class='add'>+</div><div class='add'>+	/* Only one thread will succeed in creating value2 */</div><div class='add'>+	key = tld_create_key("value2", sizeof(struct test_tld_struct));</div><div class='add'>+	if (!tld_key_is_err(key))</div><div class='add'>+		tld_keys[2] = key;</div><div class='add'>+</div><div class='add'>+	snprintf(key_name, 32, "thread_%d", id);</div><div class='add'>+	tld_keys[id] = tld_create_key(key_name, sizeof(int));</div><div class='add'>+	if (tld_key_is_err(tld_keys[id]))</div><div class='add'>+		err = 2;</div><div class='add'>+out:</div><div class='add'>+	return (void *)(intptr_t)err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_task_local_data_race(void)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, opts);</div><div class='add'>+	pthread_t thread[TEST_RACE_THREAD_NUM];</div><div class='add'>+	struct test_task_local_data *skel;</div><div class='add'>+	int fd, i, j, err, *data;</div><div class='add'>+	void *ret = NULL;</div><div class='add'>+</div><div class='add'>+	skel = test_task_local_data__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tld_keys = calloc(TLD_MAX_DATA_CNT, sizeof(tld_key_t));</div><div class='add'>+	if (!ASSERT_OK_PTR(tld_keys, "calloc tld_keys"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	fd = bpf_map__fd(skel-&gt;maps.tld_data_map);</div><div class='add'>+</div><div class='add'>+	ASSERT_FALSE(tld_key_is_err(value0_key), "TLD_DEFINE_KEY");</div><div class='add'>+	tld_keys[0] = value0_key;</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; 100; j++) {</div><div class='add'>+		reset_tld();</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; TEST_RACE_THREAD_NUM; i++) {</div><div class='add'>+			/*</div><div class='add'>+			 * Try to make tld_create_key() race with each other. Call</div><div class='add'>+			 * tld_create_key(), both valid and invalid, from different threads.</div><div class='add'>+			 */</div><div class='add'>+			err = pthread_create(&amp;thread[i], NULL, test_task_local_data_race_thread,</div><div class='add'>+					     (void *)(intptr_t)(i + 3));</div><div class='add'>+			if (CHECK_FAIL(err))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Wait for all tld_create_key() to return */</div><div class='add'>+		for (i = 0; i &lt; TEST_RACE_THREAD_NUM; i++) {</div><div class='add'>+			pthread_join(thread[i], &amp;ret);</div><div class='add'>+			if (CHECK_FAIL(ret))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Write a unique number to each TLD */</div><div class='add'>+		for (i = 0; i &lt; TLD_MAX_DATA_CNT; i++) {</div><div class='add'>+			data = tld_get_data(fd, tld_keys[i]);</div><div class='add'>+			if (CHECK_FAIL(!data))</div><div class='add'>+				break;</div><div class='add'>+			*data = i;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Read TLDs and check the value to see if any address collides with another */</div><div class='add'>+		for (i = 0; i &lt; TLD_MAX_DATA_CNT; i++) {</div><div class='add'>+			data = tld_get_data(fd, tld_keys[i]);</div><div class='add'>+			if (CHECK_FAIL(*data != i))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Run task_main to make sure no invalid TLDs are added */</div><div class='add'>+		err = bpf_prog_test_run_opts(bpf_program__fd(skel-&gt;progs.task_main), &amp;opts);</div><div class='add'>+		ASSERT_OK(err, "run task_main");</div><div class='add'>+		ASSERT_OK(opts.retval, "task_main retval");</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	if (tld_keys) {</div><div class='add'>+		free(tld_keys);</div><div class='add'>+		tld_keys = NULL;</div><div class='add'>+	}</div><div class='add'>+	tld_free();</div><div class='add'>+	test_task_local_data__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_task_local_data(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("task_local_data_basic"))</div><div class='add'>+		test_task_local_data_basic();</div><div class='add'>+	if (test__start_subtest("task_local_data_race"))</div><div class='add'>+		test_task_local_data_race();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_task_work.c b/tools/testing/selftests/bpf/prog_tests/test_task_work.c<br/>new file mode 100644<br/>index 000000000000..774b31a5f6ca<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_task_work.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_task_work.c</a></div><div class='hunk'>@@ -0,0 +1,157 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include "task_work.skel.h"</div><div class='add'>+#include "task_work_fail.skel.h"</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;time.h&gt;</div><div class='add'>+</div><div class='add'>+static int perf_event_open(__u32 type, __u64 config, int pid)</div><div class='add'>+{</div><div class='add'>+	struct perf_event_attr attr = {</div><div class='add'>+		.type = type,</div><div class='add'>+		.config = config,</div><div class='add'>+		.size = sizeof(struct perf_event_attr),</div><div class='add'>+		.sample_period = 100000,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return syscall(__NR_perf_event_open, &amp;attr, pid, -1, -1, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct elem {</div><div class='add'>+	char data[128];</div><div class='add'>+	struct bpf_task_work tw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int verify_map(struct bpf_map *map, const char *expected_data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct elem value;</div><div class='add'>+	int processed_values = 0;</div><div class='add'>+	int k, sz;</div><div class='add'>+</div><div class='add'>+	sz = bpf_map__max_entries(map);</div><div class='add'>+	for (k = 0; k &lt; sz; ++k) {</div><div class='add'>+		err = bpf_map__lookup_elem(map, &amp;k, sizeof(int), &amp;value, sizeof(struct elem), 0);</div><div class='add'>+		if (err)</div><div class='add'>+			continue;</div><div class='add'>+		if (!ASSERT_EQ(strcmp(expected_data, value.data), 0, "map data")) {</div><div class='add'>+			fprintf(stderr, "expected '%s', found '%s' in %s map", expected_data,</div><div class='add'>+				value.data, bpf_map__name(map));</div><div class='add'>+			return 2;</div><div class='add'>+		}</div><div class='add'>+		processed_values++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return processed_values == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void task_work_run(const char *prog_name, const char *map_name)</div><div class='add'>+{</div><div class='add'>+	struct task_work *skel;</div><div class='add'>+	struct bpf_program *prog;</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	struct bpf_link *link = NULL;</div><div class='add'>+	int err, pe_fd = -1, pid, status, pipefd[2];</div><div class='add'>+	char user_string[] = "hello world";</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_NEQ(pipe(pipefd), -1, "pipe"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	if (pid == 0) {</div><div class='add'>+		__u64 num = 1;</div><div class='add'>+		int i;</div><div class='add'>+		char buf;</div><div class='add'>+</div><div class='add'>+		close(pipefd[1]);</div><div class='add'>+		read(pipefd[0], &amp;buf, sizeof(buf));</div><div class='add'>+		close(pipefd[0]);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 10000; ++i)</div><div class='add'>+			num *= time(0) % 7;</div><div class='add'>+		(void)num;</div><div class='add'>+		exit(0);</div><div class='add'>+	}</div><div class='add'>+	if (!ASSERT_GT(pid, 0, "fork() failed")) {</div><div class='add'>+		close(pipefd[0]);</div><div class='add'>+		close(pipefd[1]);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skel = task_work__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "task_work__open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bpf_object__for_each_program(prog, skel-&gt;obj) {</div><div class='add'>+		bpf_program__set_autoload(prog, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prog = bpf_object__find_program_by_name(skel-&gt;obj, prog_name);</div><div class='add'>+	if (!ASSERT_OK_PTR(prog, "prog_name"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	bpf_program__set_autoload(prog, true);</div><div class='add'>+	skel-&gt;bss-&gt;user_ptr = (char *)user_string;</div><div class='add'>+</div><div class='add'>+	err = task_work__load(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "skel_load"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	pe_fd = perf_event_open(PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES, pid);</div><div class='add'>+	if (pe_fd == -1 &amp;&amp; (errno == ENOENT || errno == EOPNOTSUPP)) {</div><div class='add'>+		printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", __func__);</div><div class='add'>+		test__skip();</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+	if (!ASSERT_NEQ(pe_fd, -1, "pe_fd")) {</div><div class='add'>+		fprintf(stderr, "perf_event_open errno: %d, pid: %d\n", errno, pid);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach_perf_event(prog, pe_fd);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "attach_perf_event"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/* perf event fd ownership is passed to bpf_link */</div><div class='add'>+	pe_fd = -1;</div><div class='add'>+	close(pipefd[0]);</div><div class='add'>+	write(pipefd[1], user_string, 1);</div><div class='add'>+	close(pipefd[1]);</div><div class='add'>+	/* Wait to collect some samples */</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	pid = 0;</div><div class='add'>+	map = bpf_object__find_map_by_name(skel-&gt;obj, map_name);</div><div class='add'>+	if (!ASSERT_OK_PTR(map, "find map_name"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	if (!ASSERT_OK(verify_map(map, user_string), "verify map"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+cleanup:</div><div class='add'>+	if (pe_fd &gt;= 0)</div><div class='add'>+		close(pe_fd);</div><div class='add'>+	bpf_link__destroy(link);</div><div class='add'>+	task_work__destroy(skel);</div><div class='add'>+	if (pid &gt; 0) {</div><div class='add'>+		close(pipefd[0]);</div><div class='add'>+		write(pipefd[1], user_string, 1);</div><div class='add'>+		close(pipefd[1]);</div><div class='add'>+		waitpid(pid, &amp;status, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_task_work(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("test_task_work_hash_map"))</div><div class='add'>+		task_work_run("oncpu_hash_map", "hmap");</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("test_task_work_array_map"))</div><div class='add'>+		task_work_run("oncpu_array_map", "arrmap");</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("test_task_work_lru_map"))</div><div class='add'>+		task_work_run("oncpu_lru_map", "lrumap");</div><div class='add'>+</div><div class='add'>+	RUN_TESTS(task_work_fail);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_tc_edt.c b/tools/testing/selftests/bpf/prog_tests/test_tc_edt.c<br/>new file mode 100644<br/>index 000000000000..462512fb191f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_tc_edt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_tc_edt.c</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * BPF-based flow shaping</div><div class='add'>+ *</div><div class='add'>+ * The test brings up two veth in two isolated namespaces, attach some flow</div><div class='add'>+ * shaping program onto it, and ensures that a manual speedtest maximum</div><div class='add'>+ * value matches the rate set in the BPF shapers.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm-generic/socket.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;math.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;bpf/libbpf.h&gt;</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include "test_progs.h"</div><div class='add'>+#include "network_helpers.h"</div><div class='add'>+#include "test_tc_edt.skel.h"</div><div class='add'>+</div><div class='add'>+#define SERVER_NS "tc-edt-server-ns"</div><div class='add'>+#define CLIENT_NS "tc-edt-client-ns"</div><div class='add'>+#define IP4_ADDR_VETH1 "192.168.1.1"</div><div class='add'>+#define IP4_ADDR_VETH2 "192.168.1.2"</div><div class='add'>+#define IP4_ADDR_VETH2_HEX 0xC0A80102</div><div class='add'>+</div><div class='add'>+#define TIMEOUT_MS		2000</div><div class='add'>+#define TEST_PORT		9000</div><div class='add'>+#define TARGET_RATE_MBPS	5.0</div><div class='add'>+#define TX_BYTES_COUNT		(1 * 1000 * 1000)</div><div class='add'>+#define RATE_ERROR_PERCENT	2.0</div><div class='add'>+</div><div class='add'>+struct connection {</div><div class='add'>+	int server_listen_fd;</div><div class='add'>+	int server_conn_fd;</div><div class='add'>+	int client_conn_fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int setup(struct test_tc_edt *skel)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken_client, *nstoken_server;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(make_netns(CLIENT_NS), "create client ns"))</div><div class='add'>+		goto fail;</div><div class='add'>+	if (!ASSERT_OK(make_netns(SERVER_NS), "create server ns"))</div><div class='add'>+		goto fail_delete_client_ns;</div><div class='add'>+</div><div class='add'>+	nstoken_client = open_netns(CLIENT_NS);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken_client, "open client ns"))</div><div class='add'>+		goto fail_delete_server_ns;</div><div class='add'>+	SYS(fail_close_client_ns, "ip link add veth1 type veth peer name %s",</div><div class='add'>+	    "veth2 netns " SERVER_NS);</div><div class='add'>+	SYS(fail_close_client_ns, "ip -4 addr add " IP4_ADDR_VETH1 "/24 dev veth1");</div><div class='add'>+	SYS(fail_close_client_ns, "ip link set veth1 up");</div><div class='add'>+</div><div class='add'>+	nstoken_server = open_netns(SERVER_NS);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken_server, "enter server ns"))</div><div class='add'>+		goto fail_close_client_ns;</div><div class='add'>+	SYS(fail_close_server_ns, "ip -4 addr add " IP4_ADDR_VETH2 "/24 dev veth2");</div><div class='add'>+	SYS(fail_close_server_ns, "ip link set veth2 up");</div><div class='add'>+	SYS(fail_close_server_ns, "tc qdisc add dev veth2 root fq");</div><div class='add'>+	ret = tc_prog_attach("veth2", -1, bpf_program__fd(skel-&gt;progs.tc_prog));</div><div class='add'>+	if (!ASSERT_OK(ret, "attach bpf prog"))</div><div class='add'>+		goto fail_close_server_ns;</div><div class='add'>+	skel-&gt;bss-&gt;target_rate = TARGET_RATE_MBPS * 1000 * 1000;</div><div class='add'>+	close_netns(nstoken_server);</div><div class='add'>+	close_netns(nstoken_client);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_close_server_ns:</div><div class='add'>+	close_netns(nstoken_server);</div><div class='add'>+fail_close_client_ns:</div><div class='add'>+	close_netns(nstoken_client);</div><div class='add'>+fail_delete_server_ns:</div><div class='add'>+	remove_netns(SERVER_NS);</div><div class='add'>+fail_delete_client_ns:</div><div class='add'>+	remove_netns(CLIENT_NS);</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup(void)</div><div class='add'>+{</div><div class='add'>+	remove_netns(CLIENT_NS);</div><div class='add'>+	remove_netns(SERVER_NS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void run_test(void)</div><div class='add'>+{</div><div class='add'>+	int server_fd, client_fd, err;</div><div class='add'>+	double rate_mbps, rate_error;</div><div class='add'>+	struct nstoken *nstoken;</div><div class='add'>+	__u64 ts_start, ts_end;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(SERVER_NS);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open server ns"))</div><div class='add'>+		return;</div><div class='add'>+	server_fd = start_server(AF_INET, SOCK_STREAM, IP4_ADDR_VETH2,</div><div class='add'>+			TEST_PORT, TIMEOUT_MS);</div><div class='add'>+	if (!ASSERT_OK_FD(server_fd, "start server"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	nstoken = open_netns(CLIENT_NS);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open client ns"))</div><div class='add'>+		return;</div><div class='add'>+	client_fd = connect_to_fd(server_fd, 0);</div><div class='add'>+	if (!ASSERT_OK_FD(client_fd, "connect client"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ts_start = get_time_ns();</div><div class='add'>+	err = send_recv_data(server_fd, client_fd, TX_BYTES_COUNT);</div><div class='add'>+	ts_end = get_time_ns();</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	ASSERT_OK(err, "send_recv_data");</div><div class='add'>+</div><div class='add'>+	rate_mbps = TX_BYTES_COUNT / ((ts_end - ts_start) / 1000.0);</div><div class='add'>+	rate_error =</div><div class='add'>+		fabs((rate_mbps - TARGET_RATE_MBPS) * 100.0 / TARGET_RATE_MBPS);</div><div class='add'>+</div><div class='add'>+	ASSERT_LE(rate_error, RATE_ERROR_PERCENT,</div><div class='add'>+		  "rate error is lower than threshold");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_tc_edt(void)</div><div class='add'>+{</div><div class='add'>+	struct test_tc_edt *skel;</div><div class='add'>+</div><div class='add'>+	skel = test_tc_edt__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel open and load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(setup(skel), "global setup"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	run_test();</div><div class='add'>+</div><div class='add'>+	cleanup();</div><div class='add'>+	test_tc_edt__destroy(skel);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_tc_tunnel.c b/tools/testing/selftests/bpf/prog_tests/test_tc_tunnel.c<br/>new file mode 100644<br/>index 000000000000..0fe0a8f62486<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_tc_tunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_tc_tunnel.c</a></div><div class='hunk'>@@ -0,0 +1,714 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * End-to-end eBPF tunnel test suite</div><div class='add'>+ *   The file tests BPF network tunnels implementation. For each tunnel</div><div class='add'>+ *   type, the test validates that:</div><div class='add'>+ *   - basic communication can first be established between the two veths</div><div class='add'>+ *   - when adding a BPF-based encapsulation on client egress, it now fails</div><div class='add'>+ *   to communicate with the server</div><div class='add'>+ *   - when adding a kernel-based decapsulation on server ingress, client</div><div class='add'>+ *   can now connect</div><div class='add'>+ *   - when replacing the kernel-based decapsulation with a BPF-based one,</div><div class='add'>+ *   the client can still connect</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;bpf/libbpf.h&gt;</div><div class='add'>+</div><div class='add'>+#include "test_progs.h"</div><div class='add'>+#include "network_helpers.h"</div><div class='add'>+#include "test_tc_tunnel.skel.h"</div><div class='add'>+</div><div class='add'>+#define SERVER_NS	"tc-tunnel-server-ns"</div><div class='add'>+#define CLIENT_NS	"tc-tunnel-client-ns"</div><div class='add'>+#define MAC_ADDR_VETH1	"00:11:22:33:44:55"</div><div class='add'>+#define IP4_ADDR_VETH1	"192.168.1.1"</div><div class='add'>+#define IP6_ADDR_VETH1	"fd::1"</div><div class='add'>+#define MAC_ADDR_VETH2	"66:77:88:99:AA:BB"</div><div class='add'>+#define IP4_ADDR_VETH2	"192.168.1.2"</div><div class='add'>+#define IP6_ADDR_VETH2	"fd::2"</div><div class='add'>+</div><div class='add'>+#define TEST_NAME_MAX_LEN	64</div><div class='add'>+#define PROG_NAME_MAX_LEN	64</div><div class='add'>+#define TUNNEL_ARGS_MAX_LEN	128</div><div class='add'>+#define BUFFER_LEN		2000</div><div class='add'>+#define DEFAULT_TEST_DATA_SIZE	100</div><div class='add'>+#define GSO_TEST_DATA_SIZE	BUFFER_LEN</div><div class='add'>+</div><div class='add'>+#define TIMEOUT_MS			1000</div><div class='add'>+#define TEST_PORT			8000</div><div class='add'>+#define UDP_PORT			5555</div><div class='add'>+#define MPLS_UDP_PORT			6635</div><div class='add'>+#define FOU_MPLS_PROTO			137</div><div class='add'>+#define VXLAN_ID			1</div><div class='add'>+#define VXLAN_PORT			8472</div><div class='add'>+#define MPLS_TABLE_ENTRIES_COUNT	65536</div><div class='add'>+</div><div class='add'>+static char tx_buffer[BUFFER_LEN], rx_buffer[BUFFER_LEN];</div><div class='add'>+</div><div class='add'>+struct subtest_cfg {</div><div class='add'>+	char *ebpf_tun_type;</div><div class='add'>+	char *iproute_tun_type;</div><div class='add'>+	char *mac_tun_type;</div><div class='add'>+	int ipproto;</div><div class='add'>+	void (*extra_decap_mod_args_cb)(struct subtest_cfg *cfg, char *dst);</div><div class='add'>+	bool tunnel_need_veth_mac;</div><div class='add'>+	bool configure_fou_rx_port;</div><div class='add'>+	char *tmode;</div><div class='add'>+	bool expect_kern_decap_failure;</div><div class='add'>+	bool configure_mpls;</div><div class='add'>+	bool test_gso;</div><div class='add'>+	char *tunnel_client_addr;</div><div class='add'>+	char *tunnel_server_addr;</div><div class='add'>+	char name[TEST_NAME_MAX_LEN];</div><div class='add'>+	char *server_addr;</div><div class='add'>+	int client_egress_prog_fd;</div><div class='add'>+	int server_ingress_prog_fd;</div><div class='add'>+	char extra_decap_mod_args[TUNNEL_ARGS_MAX_LEN];</div><div class='add'>+	int server_fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct connection {</div><div class='add'>+	int client_fd;</div><div class='add'>+	int server_fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int build_subtest_name(struct subtest_cfg *cfg, char *dst, size_t size)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = snprintf(dst, size, "%s_%s", cfg-&gt;ebpf_tun_type,</div><div class='add'>+		       cfg-&gt;mac_tun_type);</div><div class='add'>+</div><div class='add'>+	return ret &lt; 0 ? ret : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_subtest_progs(struct subtest_cfg *cfg, struct test_tc_tunnel *skel)</div><div class='add'>+{</div><div class='add'>+	char prog_name[PROG_NAME_MAX_LEN];</div><div class='add'>+	struct bpf_program *prog;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = snprintf(prog_name, PROG_NAME_MAX_LEN, "__encap_");</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = build_subtest_name(cfg, prog_name + ret, PROG_NAME_MAX_LEN - ret);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	prog = bpf_object__find_program_by_name(skel-&gt;obj, prog_name);</div><div class='add'>+	if (!prog)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;client_egress_prog_fd = bpf_program__fd(prog);</div><div class='add'>+	cfg-&gt;server_ingress_prog_fd = bpf_program__fd(skel-&gt;progs.decap_f);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_subtest_addresses(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	if (cfg-&gt;ipproto == 6)</div><div class='add'>+		cfg-&gt;server_addr = IP6_ADDR_VETH2;</div><div class='add'>+	else</div><div class='add'>+		cfg-&gt;server_addr = IP4_ADDR_VETH2;</div><div class='add'>+</div><div class='add'>+	/* Some specific tunnel types need specific addressing, it then</div><div class='add'>+	 * has been already set in the configuration table. Otherwise,</div><div class='add'>+	 * deduce the relevant addressing from the ipproto</div><div class='add'>+	 */</div><div class='add'>+	if (cfg-&gt;tunnel_client_addr &amp;&amp; cfg-&gt;tunnel_server_addr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;ipproto == 6) {</div><div class='add'>+		cfg-&gt;tunnel_client_addr = IP6_ADDR_VETH1;</div><div class='add'>+		cfg-&gt;tunnel_server_addr = IP6_ADDR_VETH2;</div><div class='add'>+	} else {</div><div class='add'>+		cfg-&gt;tunnel_client_addr = IP4_ADDR_VETH1;</div><div class='add'>+		cfg-&gt;tunnel_server_addr = IP4_ADDR_VETH2;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int run_server(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	int family = cfg-&gt;ipproto == 6 ? AF_INET6 : AF_INET;</div><div class='add'>+	struct nstoken *nstoken;</div><div class='add'>+	struct network_helper_opts opts = {</div><div class='add'>+		.timeout_ms = TIMEOUT_MS</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(SERVER_NS);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open server ns"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;server_fd = start_server_str(family, SOCK_STREAM, cfg-&gt;server_addr,</div><div class='add'>+					  TEST_PORT, &amp;opts);</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	if (!ASSERT_OK_FD(cfg-&gt;server_fd, "start server"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_server_rx_data(struct subtest_cfg *cfg,</div><div class='add'>+				struct connection *conn, int len)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(rx_buffer, 0, BUFFER_LEN);</div><div class='add'>+	err = recv(conn-&gt;server_fd, rx_buffer, len, 0);</div><div class='add'>+	if (!ASSERT_EQ(err, len, "check rx data len"))</div><div class='add'>+		return 1;</div><div class='add'>+	if (!ASSERT_MEMEQ(tx_buffer, rx_buffer, len, "check received data"))</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct connection *connect_client_to_server(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct network_helper_opts opts = {.timeout_ms = 500};</div><div class='add'>+	int family = cfg-&gt;ipproto == 6 ? AF_INET6 : AF_INET;</div><div class='add'>+	struct connection *conn = NULL;</div><div class='add'>+	int client_fd, server_fd;</div><div class='add'>+</div><div class='add'>+	conn = malloc(sizeof(struct connection));</div><div class='add'>+	if (!conn)</div><div class='add'>+		return conn;</div><div class='add'>+</div><div class='add'>+	client_fd = connect_to_addr_str(family, SOCK_STREAM, cfg-&gt;server_addr,</div><div class='add'>+					TEST_PORT, &amp;opts);</div><div class='add'>+</div><div class='add'>+	if (client_fd &lt; 0) {</div><div class='add'>+		free(conn);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	server_fd = accept(cfg-&gt;server_fd, NULL, NULL);</div><div class='add'>+	if (server_fd &lt; 0) {</div><div class='add'>+		close(client_fd);</div><div class='add'>+		free(conn);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn-&gt;server_fd = server_fd;</div><div class='add'>+	conn-&gt;client_fd = client_fd;</div><div class='add'>+</div><div class='add'>+	return conn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void disconnect_client_from_server(struct subtest_cfg *cfg,</div><div class='add'>+					  struct connection *conn)</div><div class='add'>+{</div><div class='add'>+	close(conn-&gt;server_fd);</div><div class='add'>+	close(conn-&gt;client_fd);</div><div class='add'>+	free(conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int send_and_test_data(struct subtest_cfg *cfg, bool must_succeed)</div><div class='add'>+{</div><div class='add'>+	struct connection *conn;</div><div class='add'>+	int err, res = -1;</div><div class='add'>+</div><div class='add'>+	conn = connect_client_to_server(cfg);</div><div class='add'>+	if (!must_succeed &amp;&amp; !ASSERT_ERR_PTR(conn, "connection that must fail"))</div><div class='add'>+		goto end;</div><div class='add'>+	else if (!must_succeed)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK_PTR(conn, "connection that must succeed"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	err = send(conn-&gt;client_fd, tx_buffer, DEFAULT_TEST_DATA_SIZE, 0);</div><div class='add'>+	if (!ASSERT_EQ(err, DEFAULT_TEST_DATA_SIZE, "send data from client"))</div><div class='add'>+		goto end;</div><div class='add'>+	if (check_server_rx_data(cfg, conn, DEFAULT_TEST_DATA_SIZE))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;test_gso) {</div><div class='add'>+		res = 0;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = send(conn-&gt;client_fd, tx_buffer, GSO_TEST_DATA_SIZE, 0);</div><div class='add'>+	if (!ASSERT_EQ(err, GSO_TEST_DATA_SIZE, "send (large) data from client"))</div><div class='add'>+		goto end;</div><div class='add'>+	if (check_server_rx_data(cfg, conn, DEFAULT_TEST_DATA_SIZE))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	res = 0;</div><div class='add'>+end:</div><div class='add'>+	disconnect_client_from_server(cfg, conn);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vxlan_decap_mod_args_cb(struct subtest_cfg *cfg, char *dst)</div><div class='add'>+{</div><div class='add'>+	snprintf(dst, TUNNEL_ARGS_MAX_LEN, "id %d dstport %d udp6zerocsumrx",</div><div class='add'>+		 VXLAN_ID, VXLAN_PORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void udp_decap_mod_args_cb(struct subtest_cfg *cfg, char *dst)</div><div class='add'>+{</div><div class='add'>+	bool is_mpls = !strcmp(cfg-&gt;mac_tun_type, "mpls");</div><div class='add'>+</div><div class='add'>+	snprintf(dst, TUNNEL_ARGS_MAX_LEN,</div><div class='add'>+		 "encap fou encap-sport auto encap-dport %d",</div><div class='add'>+		 is_mpls ? MPLS_UDP_PORT : UDP_PORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int configure_fou_rx_port(struct subtest_cfg *cfg, bool add)</div><div class='add'>+{</div><div class='add'>+	bool is_mpls = strcmp(cfg-&gt;mac_tun_type, "mpls") == 0;</div><div class='add'>+	int fou_proto;</div><div class='add'>+</div><div class='add'>+	if (is_mpls)</div><div class='add'>+		fou_proto = FOU_MPLS_PROTO;</div><div class='add'>+	else</div><div class='add'>+		fou_proto = cfg-&gt;ipproto == 6 ? 41 : 4;</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip fou %s port %d ipproto %d%s", add ? "add" : "del",</div><div class='add'>+	    is_mpls ? MPLS_UDP_PORT : UDP_PORT, fou_proto,</div><div class='add'>+	    cfg-&gt;ipproto == 6 ? " -6" : "");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_fou_rx_port(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	return configure_fou_rx_port(cfg, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int del_fou_rx_port(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	return configure_fou_rx_port(cfg, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update_tunnel_intf_addr(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	SYS(fail, "ip link set dev testtun0 address " MAC_ADDR_VETH2);</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int configure_kernel_for_mpls(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	SYS(fail, "sysctl -qw net.mpls.platform_labels=%d",</div><div class='add'>+	    MPLS_TABLE_ENTRIES_COUNT);</div><div class='add'>+	SYS(fail, "ip -f mpls route add 1000 dev lo");</div><div class='add'>+	SYS(fail, "ip link set lo up");</div><div class='add'>+	SYS(fail, "sysctl -qw net.mpls.conf.testtun0.input=1");</div><div class='add'>+	SYS(fail, "sysctl -qw net.ipv4.conf.lo.rp_filter=0");</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int configure_encapsulation(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = tc_prog_attach("veth1", -1, cfg-&gt;client_egress_prog_fd);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int configure_kernel_decapsulation(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken = open_netns(SERVER_NS);</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open server ns"))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;configure_fou_rx_port &amp;&amp;</div><div class='add'>+	    !ASSERT_OK(add_fou_rx_port(cfg), "configure FOU RX port"))</div><div class='add'>+		goto fail;</div><div class='add'>+	SYS(fail, "ip link add name testtun0 type %s %s remote %s local %s %s",</div><div class='add'>+	    cfg-&gt;iproute_tun_type, cfg-&gt;tmode ? cfg-&gt;tmode : "",</div><div class='add'>+	    cfg-&gt;tunnel_client_addr, cfg-&gt;tunnel_server_addr,</div><div class='add'>+	    cfg-&gt;extra_decap_mod_args);</div><div class='add'>+	if (cfg-&gt;tunnel_need_veth_mac &amp;&amp;</div><div class='add'>+	    !ASSERT_OK(update_tunnel_intf_addr(cfg), "update testtun0 mac"))</div><div class='add'>+		goto fail;</div><div class='add'>+	if (cfg-&gt;configure_mpls &amp;&amp;</div><div class='add'>+	    (!ASSERT_OK(configure_kernel_for_mpls(cfg),</div><div class='add'>+			"configure MPLS decap")))</div><div class='add'>+		goto fail;</div><div class='add'>+	SYS(fail, "sysctl -qw net.ipv4.conf.all.rp_filter=0");</div><div class='add'>+	SYS(fail, "sysctl -qw net.ipv4.conf.testtun0.rp_filter=0");</div><div class='add'>+	SYS(fail, "ip link set dev testtun0 up");</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+fail:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_kernel_decapsulation(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	SYS_NOFAIL("ip link del testtun0");</div><div class='add'>+	if (cfg-&gt;configure_mpls)</div><div class='add'>+		SYS_NOFAIL("ip -f mpls route del 1000 dev lo");</div><div class='add'>+	if (cfg-&gt;configure_fou_rx_port)</div><div class='add'>+		del_fou_rx_port(cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int configure_ebpf_decapsulation(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken = open_netns(SERVER_NS);</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open server ns"))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;expect_kern_decap_failure)</div><div class='add'>+		SYS(fail, "ip link del testtun0");</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(tc_prog_attach("veth2", cfg-&gt;server_ingress_prog_fd, -1),</div><div class='add'>+		       "attach_program"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+fail:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void run_test(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(run_server(cfg), "run server"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(CLIENT_NS);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open client ns"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* Basic communication must work */</div><div class='add'>+	if (!ASSERT_OK(send_and_test_data(cfg, true), "connect without any encap"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* Attach encapsulation program to client */</div><div class='add'>+	if (!ASSERT_OK(configure_encapsulation(cfg), "configure encapsulation"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* If supported, insert kernel decap module, connection must succeed */</div><div class='add'>+	if (!cfg-&gt;expect_kern_decap_failure) {</div><div class='add'>+		if (!ASSERT_OK(configure_kernel_decapsulation(cfg),</div><div class='add'>+					"configure kernel decapsulation"))</div><div class='add'>+			goto fail;</div><div class='add'>+		if (!ASSERT_OK(send_and_test_data(cfg, true),</div><div class='add'>+			       "connect with encap prog and kern decap"))</div><div class='add'>+			goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Replace kernel decapsulation with BPF decapsulation, test must pass */</div><div class='add'>+	if (!ASSERT_OK(configure_ebpf_decapsulation(cfg), "configure ebpf decapsulation"))</div><div class='add'>+		goto fail;</div><div class='add'>+	ASSERT_OK(send_and_test_data(cfg, true), "connect with encap and decap progs");</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	close(cfg-&gt;server_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup(void)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken_client, *nstoken_server;</div><div class='add'>+	int fd, err;</div><div class='add'>+</div><div class='add'>+	fd = open("/dev/urandom", O_RDONLY);</div><div class='add'>+	if (!ASSERT_OK_FD(fd, "open urandom"))</div><div class='add'>+		goto fail;</div><div class='add'>+	err = read(fd, tx_buffer, BUFFER_LEN);</div><div class='add'>+	close(fd);</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_EQ(err, BUFFER_LEN, "read random bytes"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* Configure the testing network */</div><div class='add'>+	if (!ASSERT_OK(make_netns(CLIENT_NS), "create client ns") ||</div><div class='add'>+	    !ASSERT_OK(make_netns(SERVER_NS), "create server ns"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	nstoken_client = open_netns(CLIENT_NS);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken_client, "open client ns"))</div><div class='add'>+		goto fail_delete_ns;</div><div class='add'>+	SYS(fail_close_ns_client, "ip link add %s type veth peer name %s",</div><div class='add'>+	    "veth1 mtu 1500 netns " CLIENT_NS " address " MAC_ADDR_VETH1,</div><div class='add'>+	    "veth2 mtu 1500 netns " SERVER_NS " address " MAC_ADDR_VETH2);</div><div class='add'>+	SYS(fail_close_ns_client, "ethtool -K veth1 tso off");</div><div class='add'>+	SYS(fail_close_ns_client, "ip link set veth1 up");</div><div class='add'>+	nstoken_server = open_netns(SERVER_NS);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken_server, "open server ns"))</div><div class='add'>+		goto fail_close_ns_client;</div><div class='add'>+	SYS(fail_close_ns_server, "ip link set veth2 up");</div><div class='add'>+</div><div class='add'>+	close_netns(nstoken_server);</div><div class='add'>+	close_netns(nstoken_client);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_close_ns_server:</div><div class='add'>+	close_netns(nstoken_server);</div><div class='add'>+fail_close_ns_client:</div><div class='add'>+	close_netns(nstoken_client);</div><div class='add'>+fail_delete_ns:</div><div class='add'>+	SYS_NOFAIL("ip netns del " CLIENT_NS);</div><div class='add'>+	SYS_NOFAIL("ip netns del " SERVER_NS);</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int subtest_setup(struct test_tc_tunnel *skel, struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken_client, *nstoken_server;</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	set_subtest_addresses(cfg);</div><div class='add'>+	if (!ASSERT_OK(set_subtest_progs(cfg, skel),</div><div class='add'>+		       "find subtest progs"))</div><div class='add'>+		goto fail;</div><div class='add'>+	if (cfg-&gt;extra_decap_mod_args_cb)</div><div class='add'>+		cfg-&gt;extra_decap_mod_args_cb(cfg, cfg-&gt;extra_decap_mod_args);</div><div class='add'>+</div><div class='add'>+	nstoken_client = open_netns(CLIENT_NS);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken_client, "open client ns"))</div><div class='add'>+		goto fail;</div><div class='add'>+	SYS(fail_close_client_ns,</div><div class='add'>+	    "ip -4 addr add " IP4_ADDR_VETH1 "/24 dev veth1");</div><div class='add'>+	SYS(fail_close_client_ns, "ip -4 route flush table main");</div><div class='add'>+	SYS(fail_close_client_ns,</div><div class='add'>+	    "ip -4 route add " IP4_ADDR_VETH2 " mtu 1450 dev veth1");</div><div class='add'>+	SYS(fail_close_client_ns,</div><div class='add'>+	    "ip -6 addr add " IP6_ADDR_VETH1 "/64 dev veth1 nodad");</div><div class='add'>+	SYS(fail_close_client_ns, "ip -6 route flush table main");</div><div class='add'>+	SYS(fail_close_client_ns,</div><div class='add'>+	    "ip -6 route add " IP6_ADDR_VETH2 " mtu 1430 dev veth1");</div><div class='add'>+	nstoken_server = open_netns(SERVER_NS);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken_server, "open server ns"))</div><div class='add'>+		goto fail_close_client_ns;</div><div class='add'>+	SYS(fail_close_server_ns,</div><div class='add'>+	    "ip -4 addr add " IP4_ADDR_VETH2 "/24 dev veth2");</div><div class='add'>+	SYS(fail_close_server_ns,</div><div class='add'>+	    "ip -6 addr add " IP6_ADDR_VETH2 "/64 dev veth2 nodad");</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+fail_close_server_ns:</div><div class='add'>+	close_netns(nstoken_server);</div><div class='add'>+fail_close_client_ns:</div><div class='add'>+	close_netns(nstoken_client);</div><div class='add'>+fail:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void subtest_cleanup(struct subtest_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(CLIENT_NS);</div><div class='add'>+	if (ASSERT_OK_PTR(nstoken, "open clien ns")) {</div><div class='add'>+		SYS_NOFAIL("tc qdisc delete dev veth1 parent ffff:fff1");</div><div class='add'>+		SYS_NOFAIL("ip a flush veth1");</div><div class='add'>+		close_netns(nstoken);</div><div class='add'>+	}</div><div class='add'>+	nstoken = open_netns(SERVER_NS);</div><div class='add'>+	if (ASSERT_OK_PTR(nstoken, "open clien ns")) {</div><div class='add'>+		SYS_NOFAIL("tc qdisc delete dev veth2 parent ffff:fff1");</div><div class='add'>+		SYS_NOFAIL("ip a flush veth2");</div><div class='add'>+		if (!cfg-&gt;expect_kern_decap_failure)</div><div class='add'>+			remove_kernel_decapsulation(cfg);</div><div class='add'>+		close_netns(nstoken);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup(void)</div><div class='add'>+{</div><div class='add'>+	remove_netns(CLIENT_NS);</div><div class='add'>+	remove_netns(SERVER_NS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct subtest_cfg subtests_cfg[] = {</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "ipip",</div><div class='add'>+		.mac_tun_type = "none",</div><div class='add'>+		.iproute_tun_type = "ipip",</div><div class='add'>+		.ipproto = 4,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "ipip6",</div><div class='add'>+		.mac_tun_type = "none",</div><div class='add'>+		.iproute_tun_type = "ip6tnl",</div><div class='add'>+		.ipproto = 4,</div><div class='add'>+		.tunnel_client_addr = IP6_ADDR_VETH1,</div><div class='add'>+		.tunnel_server_addr = IP6_ADDR_VETH2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "ip6tnl",</div><div class='add'>+		.iproute_tun_type = "ip6tnl",</div><div class='add'>+		.mac_tun_type = "none",</div><div class='add'>+		.ipproto = 6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.mac_tun_type = "none",</div><div class='add'>+		.ebpf_tun_type = "sit",</div><div class='add'>+		.iproute_tun_type = "sit",</div><div class='add'>+		.ipproto = 6,</div><div class='add'>+		.tunnel_client_addr = IP4_ADDR_VETH1,</div><div class='add'>+		.tunnel_server_addr = IP4_ADDR_VETH2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "vxlan",</div><div class='add'>+		.mac_tun_type = "eth",</div><div class='add'>+		.iproute_tun_type = "vxlan",</div><div class='add'>+		.ipproto = 4,</div><div class='add'>+		.extra_decap_mod_args_cb = vxlan_decap_mod_args_cb,</div><div class='add'>+		.tunnel_need_veth_mac = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "ip6vxlan",</div><div class='add'>+		.mac_tun_type = "eth",</div><div class='add'>+		.iproute_tun_type = "vxlan",</div><div class='add'>+		.ipproto = 6,</div><div class='add'>+		.extra_decap_mod_args_cb = vxlan_decap_mod_args_cb,</div><div class='add'>+		.tunnel_need_veth_mac = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "gre",</div><div class='add'>+		.mac_tun_type = "none",</div><div class='add'>+		.iproute_tun_type = "gre",</div><div class='add'>+		.ipproto = 4,</div><div class='add'>+		.test_gso = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "gre",</div><div class='add'>+		.mac_tun_type = "eth",</div><div class='add'>+		.iproute_tun_type = "gretap",</div><div class='add'>+		.ipproto = 4,</div><div class='add'>+		.tunnel_need_veth_mac = true,</div><div class='add'>+		.test_gso = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "gre",</div><div class='add'>+		.mac_tun_type = "mpls",</div><div class='add'>+		.iproute_tun_type = "gre",</div><div class='add'>+		.ipproto = 4,</div><div class='add'>+		.configure_mpls = true,</div><div class='add'>+		.test_gso = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "ip6gre",</div><div class='add'>+		.mac_tun_type = "none",</div><div class='add'>+		.iproute_tun_type = "ip6gre",</div><div class='add'>+		.ipproto = 6,</div><div class='add'>+		.test_gso = true,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "ip6gre",</div><div class='add'>+		.mac_tun_type = "eth",</div><div class='add'>+		.iproute_tun_type = "ip6gretap",</div><div class='add'>+		.ipproto = 6,</div><div class='add'>+		.tunnel_need_veth_mac = true,</div><div class='add'>+		.test_gso = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "ip6gre",</div><div class='add'>+		.mac_tun_type = "mpls",</div><div class='add'>+		.iproute_tun_type = "ip6gre",</div><div class='add'>+		.ipproto = 6,</div><div class='add'>+		.configure_mpls = true,</div><div class='add'>+		.test_gso = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "udp",</div><div class='add'>+		.mac_tun_type = "none",</div><div class='add'>+		.iproute_tun_type = "ipip",</div><div class='add'>+		.ipproto = 4,</div><div class='add'>+		.extra_decap_mod_args_cb = udp_decap_mod_args_cb,</div><div class='add'>+		.configure_fou_rx_port = true,</div><div class='add'>+		.test_gso = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "udp",</div><div class='add'>+		.mac_tun_type = "eth",</div><div class='add'>+		.iproute_tun_type = "ipip",</div><div class='add'>+		.ipproto = 4,</div><div class='add'>+		.extra_decap_mod_args_cb = udp_decap_mod_args_cb,</div><div class='add'>+		.configure_fou_rx_port = true,</div><div class='add'>+		.expect_kern_decap_failure = true,</div><div class='add'>+		.test_gso = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "udp",</div><div class='add'>+		.mac_tun_type = "mpls",</div><div class='add'>+		.iproute_tun_type = "ipip",</div><div class='add'>+		.ipproto = 4,</div><div class='add'>+		.extra_decap_mod_args_cb = udp_decap_mod_args_cb,</div><div class='add'>+		.configure_fou_rx_port = true,</div><div class='add'>+		.tmode = "mode any ttl 255",</div><div class='add'>+		.configure_mpls = true,</div><div class='add'>+		.test_gso = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "ip6udp",</div><div class='add'>+		.mac_tun_type = "none",</div><div class='add'>+		.iproute_tun_type = "ip6tnl",</div><div class='add'>+		.ipproto = 6,</div><div class='add'>+		.extra_decap_mod_args_cb = udp_decap_mod_args_cb,</div><div class='add'>+		.configure_fou_rx_port = true,</div><div class='add'>+		.test_gso = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "ip6udp",</div><div class='add'>+		.mac_tun_type = "eth",</div><div class='add'>+		.iproute_tun_type = "ip6tnl",</div><div class='add'>+		.ipproto = 6,</div><div class='add'>+		.extra_decap_mod_args_cb = udp_decap_mod_args_cb,</div><div class='add'>+		.configure_fou_rx_port = true,</div><div class='add'>+		.expect_kern_decap_failure = true,</div><div class='add'>+		.test_gso = true</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ebpf_tun_type = "ip6udp",</div><div class='add'>+		.mac_tun_type = "mpls",</div><div class='add'>+		.iproute_tun_type = "ip6tnl",</div><div class='add'>+		.ipproto = 6,</div><div class='add'>+		.extra_decap_mod_args_cb = udp_decap_mod_args_cb,</div><div class='add'>+		.configure_fou_rx_port = true,</div><div class='add'>+		.tmode = "mode any ttl 255",</div><div class='add'>+		.expect_kern_decap_failure = true,</div><div class='add'>+		.test_gso = true</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void test_tc_tunnel(void)</div><div class='add'>+{</div><div class='add'>+	struct test_tc_tunnel *skel;</div><div class='add'>+	struct subtest_cfg *cfg;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	skel = test_tc_tunnel__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel open and load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(setup(), "global setup"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(subtests_cfg); i++) {</div><div class='add'>+		cfg = &amp;subtests_cfg[i];</div><div class='add'>+		ret = build_subtest_name(cfg, cfg-&gt;name, TEST_NAME_MAX_LEN);</div><div class='add'>+		if (ret &lt; 0 || !test__start_subtest(cfg-&gt;name))</div><div class='add'>+			continue;</div><div class='add'>+		if (subtest_setup(skel, cfg) == 0)</div><div class='add'>+			run_test(cfg);</div><div class='add'>+		subtest_cleanup(cfg);</div><div class='add'>+	}</div><div class='add'>+	cleanup();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_tunnel.c b/tools/testing/selftests/bpf/prog_tests/test_tunnel.c<br/>index cec746e77cd3..eb9309931272 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_tunnel.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_tunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_tunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_tunnel.c</a></div><div class='hunk'>@@ -71,6 +71,8 @@</div><div class='ctx'> #define IP4_ADDR2_VETH1 "172.16.1.20"</div><div class='ctx'> #define IP4_ADDR_TUNL_DEV0 "10.1.1.100"</div><div class='ctx'> #define IP4_ADDR_TUNL_DEV1 "10.1.1.200"</div><div class='add'>+#define IP6_ADDR_TUNL_DEV0 "fc80::100"</div><div class='add'>+#define IP6_ADDR_TUNL_DEV1 "fc80::200"</div><div class='ctx'> </div><div class='ctx'> #define IP6_ADDR_VETH0 "::11"</div><div class='ctx'> #define IP6_ADDR1_VETH1 "::22"</div><div class='hunk'>@@ -98,6 +100,27 @@</div><div class='ctx'> #define XFRM_SPI_IN_TO_OUT 0x1</div><div class='ctx'> #define XFRM_SPI_OUT_TO_IN 0x2</div><div class='ctx'> </div><div class='add'>+#define GRE_TUNL_DEV0 "gre00"</div><div class='add'>+#define GRE_TUNL_DEV1 "gre11"</div><div class='add'>+</div><div class='add'>+#define IP6GRE_TUNL_DEV0 "ip6gre00"</div><div class='add'>+#define IP6GRE_TUNL_DEV1 "ip6gre11"</div><div class='add'>+</div><div class='add'>+#define ERSPAN_TUNL_DEV0 "erspan00"</div><div class='add'>+#define ERSPAN_TUNL_DEV1 "erspan11"</div><div class='add'>+</div><div class='add'>+#define IP6ERSPAN_TUNL_DEV0 "ip6erspan00"</div><div class='add'>+#define IP6ERSPAN_TUNL_DEV1 "ip6erspan11"</div><div class='add'>+</div><div class='add'>+#define GENEVE_TUNL_DEV0 "geneve00"</div><div class='add'>+#define GENEVE_TUNL_DEV1 "geneve11"</div><div class='add'>+</div><div class='add'>+#define IP6GENEVE_TUNL_DEV0 "ip6geneve00"</div><div class='add'>+#define IP6GENEVE_TUNL_DEV1 "ip6geneve11"</div><div class='add'>+</div><div class='add'>+#define IP6TNL_TUNL_DEV0 "ip6tnl00"</div><div class='add'>+#define IP6TNL_TUNL_DEV1 "ip6tnl11"</div><div class='add'>+</div><div class='ctx'> #define PING_ARGS "-i 0.01 -c 3 -w 10 -q"</div><div class='ctx'> </div><div class='ctx'> static int config_device(void)</div><div class='hunk'>@@ -216,6 +239,18 @@ fail:</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int set_ipv4_addr(const char *dev0, const char *dev1)</div><div class='add'>+{</div><div class='add'>+	SYS(fail, "ip -n at_ns0 link set dev %s up", dev0);</div><div class='add'>+	SYS(fail, "ip -n at_ns0 addr add dev %s %s/24", dev0, IP4_ADDR_TUNL_DEV0);</div><div class='add'>+	SYS(fail, "ip link set dev %s up", dev1);</div><div class='add'>+	SYS(fail, "ip addr add dev %s %s/24", dev1, IP4_ADDR_TUNL_DEV1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int add_ipip_tunnel(enum ipip_encap encap)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -356,6 +391,99 @@ static void delete_xfrm_tunnel(void)</div><div class='ctx'> 		   IP4_ADDR1_VETH1, IP4_ADDR_VETH0, XFRM_SPI_OUT_TO_IN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int add_ipv4_tunnel(const char *dev0, const char *dev1,</div><div class='add'>+			   const char *type, const char *opt)</div><div class='add'>+{</div><div class='add'>+	if (!type || !opt || !dev0 || !dev1)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n at_ns0 link add dev %s type %s %s local %s remote %s",</div><div class='add'>+	    dev0, type, opt, IP4_ADDR_VETH0, IP4_ADDR1_VETH1);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip link add dev %s type %s external", dev1, type);</div><div class='add'>+</div><div class='add'>+	return set_ipv4_addr(dev0, dev1);</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void delete_tunnel(const char *dev0, const char *dev1)</div><div class='add'>+{</div><div class='add'>+	if (!dev0 || !dev1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	SYS_NOFAIL("ip netns exec at_ns0 ip link delete dev %s", dev0);</div><div class='add'>+	SYS_NOFAIL("ip link delete dev %s", dev1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_ipv6_addr(const char *dev0, const char *dev1)</div><div class='add'>+{</div><div class='add'>+	/* disable IPv6 DAD because it might take too long and fail tests */</div><div class='add'>+	SYS(fail, "ip -n at_ns0 addr add %s/96 dev veth0 nodad", IP6_ADDR_VETH0);</div><div class='add'>+	SYS(fail, "ip -n at_ns0 link set dev veth0 up");</div><div class='add'>+	SYS(fail, "ip addr add %s/96 dev veth1 nodad", IP6_ADDR1_VETH1);</div><div class='add'>+	SYS(fail, "ip link set dev veth1 up");</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n at_ns0 addr add dev %s %s/24", dev0, IP4_ADDR_TUNL_DEV0);</div><div class='add'>+	SYS(fail, "ip -n at_ns0 addr add dev %s %s/96 nodad", dev0, IP6_ADDR_TUNL_DEV0);</div><div class='add'>+	SYS(fail, "ip -n at_ns0 link set dev %s up", dev0);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip addr add dev %s %s/24", dev1, IP4_ADDR_TUNL_DEV1);</div><div class='add'>+	SYS(fail, "ip addr add dev %s %s/96 nodad", dev1, IP6_ADDR_TUNL_DEV1);</div><div class='add'>+	SYS(fail, "ip link set dev %s up", dev1);</div><div class='add'>+	return 0;</div><div class='add'>+fail:</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_ipv6_tunnel(const char *dev0, const char *dev1,</div><div class='add'>+			   const char *type, const char *opt)</div><div class='add'>+{</div><div class='add'>+	if (!type || !opt || !dev0 || !dev1)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n at_ns0 link add dev %s type %s %s local %s remote %s",</div><div class='add'>+	    dev0, type, opt, IP6_ADDR_VETH0, IP6_ADDR1_VETH1);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip link add dev %s type %s external", dev1, type);</div><div class='add'>+</div><div class='add'>+	return set_ipv6_addr(dev0, dev1);</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_geneve_tunnel(const char *dev0, const char *dev1,</div><div class='add'>+			     const char *type, const char *opt)</div><div class='add'>+{</div><div class='add'>+	if (!type || !opt || !dev0 || !dev1)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n at_ns0 link add dev %s type %s id 2 %s remote %s",</div><div class='add'>+	    dev0, type, opt, IP4_ADDR1_VETH1);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip link add dev %s type %s %s external", dev1, type, opt);</div><div class='add'>+</div><div class='add'>+	return set_ipv4_addr(dev0, dev1);</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_ip6geneve_tunnel(const char *dev0, const char *dev1,</div><div class='add'>+			     const char *type, const char *opt)</div><div class='add'>+{</div><div class='add'>+	if (!type || !opt || !dev0 || !dev1)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip -n at_ns0 link add dev %s type %s id 22 %s remote %s",</div><div class='add'>+	    dev0, type, opt, IP6_ADDR1_VETH1);</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip link add dev %s type %s %s external", dev1, type, opt);</div><div class='add'>+</div><div class='add'>+	return set_ipv6_addr(dev0, dev1);</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int test_ping(int family, const char *addr)</div><div class='ctx'> {</div><div class='ctx'> 	SYS(fail, "%s %s %s &gt; /dev/null", ping_command(family), PING_ARGS, addr);</div><div class='hunk'>@@ -364,37 +492,46 @@ fail:</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int attach_tc_prog(struct bpf_tc_hook *hook, int igr_fd, int egr_fd)</div><div class='add'>+static void ping_dev0(void)</div><div class='ctx'> {</div><div class='del'>-	DECLARE_LIBBPF_OPTS(bpf_tc_opts, opts1, .handle = 1,</div><div class='del'>-			    .priority = 1, .prog_fd = igr_fd);</div><div class='del'>-	DECLARE_LIBBPF_OPTS(bpf_tc_opts, opts2, .handle = 1,</div><div class='del'>-			    .priority = 1, .prog_fd = egr_fd);</div><div class='del'>-	int ret;</div><div class='add'>+	/* ping from root namespace test */</div><div class='add'>+	test_ping(AF_INET, IP4_ADDR_TUNL_DEV0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ret = bpf_tc_hook_create(hook);</div><div class='del'>-	if (!ASSERT_OK(ret, "create tc hook"))</div><div class='del'>-		return ret;</div><div class='add'>+static void ping_dev1(void)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken;</div><div class='ctx'> </div><div class='del'>-	if (igr_fd &gt;= 0) {</div><div class='del'>-		hook-&gt;attach_point = BPF_TC_INGRESS;</div><div class='del'>-		ret = bpf_tc_attach(hook, &amp;opts1);</div><div class='del'>-		if (!ASSERT_OK(ret, "bpf_tc_attach")) {</div><div class='del'>-			bpf_tc_hook_destroy(hook);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* ping from at_ns0 namespace test */</div><div class='add'>+	nstoken = open_netns("at_ns0");</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "setns"))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (egr_fd &gt;= 0) {</div><div class='del'>-		hook-&gt;attach_point = BPF_TC_EGRESS;</div><div class='del'>-		ret = bpf_tc_attach(hook, &amp;opts2);</div><div class='del'>-		if (!ASSERT_OK(ret, "bpf_tc_attach")) {</div><div class='del'>-			bpf_tc_hook_destroy(hook);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	test_ping(AF_INET, IP4_ADDR_TUNL_DEV1);</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static void ping6_veth0(void)</div><div class='add'>+{</div><div class='add'>+	test_ping(AF_INET6, IP6_ADDR_VETH0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ping6_dev0(void)</div><div class='add'>+{</div><div class='add'>+	test_ping(AF_INET6, IP6_ADDR_TUNL_DEV0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ping6_dev1(void)</div><div class='add'>+{</div><div class='add'>+	struct nstoken *nstoken;</div><div class='add'>+</div><div class='add'>+	/* ping from at_ns0 namespace test */</div><div class='add'>+	nstoken = open_netns("at_ns0");</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "setns"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	test_ping(AF_INET, IP6_ADDR_TUNL_DEV1);</div><div class='add'>+	close_netns(nstoken);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void test_vxlan_tunnel(void)</div><div class='hunk'>@@ -404,11 +541,9 @@ static void test_vxlan_tunnel(void)</div><div class='ctx'> 	int local_ip_map_fd = -1;</div><div class='ctx'> 	int set_src_prog_fd, get_src_prog_fd;</div><div class='ctx'> 	int set_dst_prog_fd;</div><div class='del'>-	int key = 0, ifindex = -1;</div><div class='add'>+	int key = 0;</div><div class='ctx'> 	uint local_ip;</div><div class='ctx'> 	int err;</div><div class='del'>-	DECLARE_LIBBPF_OPTS(bpf_tc_hook, tc_hook,</div><div class='del'>-			    .attach_point = BPF_TC_INGRESS);</div><div class='ctx'> </div><div class='ctx'> 	/* add vxlan tunnel */</div><div class='ctx'> 	err = add_vxlan_tunnel();</div><div class='hunk'>@@ -419,42 +554,22 @@ static void test_vxlan_tunnel(void)</div><div class='ctx'> 	skel = test_tunnel_kern__open_and_load();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))</div><div class='ctx'> 		goto done;</div><div class='del'>-	ifindex = if_nametoindex(VXLAN_TUNL_DEV1);</div><div class='del'>-	if (!ASSERT_NEQ(ifindex, 0, "vxlan11 ifindex"))</div><div class='del'>-		goto done;</div><div class='del'>-	tc_hook.ifindex = ifindex;</div><div class='ctx'> 	get_src_prog_fd = bpf_program__fd(skel-&gt;progs.vxlan_get_tunnel_src);</div><div class='ctx'> 	set_src_prog_fd = bpf_program__fd(skel-&gt;progs.vxlan_set_tunnel_src);</div><div class='del'>-	if (!ASSERT_GE(get_src_prog_fd, 0, "bpf_program__fd"))</div><div class='del'>-		goto done;</div><div class='del'>-	if (!ASSERT_GE(set_src_prog_fd, 0, "bpf_program__fd"))</div><div class='del'>-		goto done;</div><div class='del'>-	if (attach_tc_prog(&amp;tc_hook, get_src_prog_fd, set_src_prog_fd))</div><div class='add'>+	if (tc_prog_attach(VXLAN_TUNL_DEV1, get_src_prog_fd, set_src_prog_fd))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* load and attach bpf prog to veth dev tc hook point */</div><div class='del'>-	ifindex = if_nametoindex("veth1");</div><div class='del'>-	if (!ASSERT_NEQ(ifindex, 0, "veth1 ifindex"))</div><div class='del'>-		goto done;</div><div class='del'>-	tc_hook.ifindex = ifindex;</div><div class='ctx'> 	set_dst_prog_fd = bpf_program__fd(skel-&gt;progs.veth_set_outer_dst);</div><div class='del'>-	if (!ASSERT_GE(set_dst_prog_fd, 0, "bpf_program__fd"))</div><div class='del'>-		goto done;</div><div class='del'>-	if (attach_tc_prog(&amp;tc_hook, set_dst_prog_fd, -1))</div><div class='add'>+	if (tc_prog_attach("veth1", set_dst_prog_fd, -1))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* load and attach prog set_md to tunnel dev tc hook point at_ns0 */</div><div class='ctx'> 	nstoken = open_netns("at_ns0");</div><div class='ctx'> 	if (!ASSERT_OK_PTR(nstoken, "setns src"))</div><div class='ctx'> 		goto done;</div><div class='del'>-	ifindex = if_nametoindex(VXLAN_TUNL_DEV0);</div><div class='del'>-	if (!ASSERT_NEQ(ifindex, 0, "vxlan00 ifindex"))</div><div class='del'>-		goto done;</div><div class='del'>-	tc_hook.ifindex = ifindex;</div><div class='ctx'> 	set_dst_prog_fd = bpf_program__fd(skel-&gt;progs.vxlan_set_tunnel_dst);</div><div class='del'>-	if (!ASSERT_GE(set_dst_prog_fd, 0, "bpf_program__fd"))</div><div class='del'>-		goto done;</div><div class='del'>-	if (attach_tc_prog(&amp;tc_hook, -1, set_dst_prog_fd))</div><div class='add'>+	if (tc_prog_attach(VXLAN_TUNL_DEV0, -1, set_dst_prog_fd))</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	close_netns(nstoken);</div><div class='ctx'> </div><div class='hunk'>@@ -468,9 +583,7 @@ static void test_vxlan_tunnel(void)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* ping test */</div><div class='del'>-	err = test_ping(AF_INET, IP4_ADDR_TUNL_DEV0);</div><div class='del'>-	if (!ASSERT_OK(err, "test_ping"))</div><div class='del'>-		goto done;</div><div class='add'>+	ping_dev0();</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	/* delete vxlan tunnel */</div><div class='hunk'>@@ -488,11 +601,9 @@ static void test_ip6vxlan_tunnel(void)</div><div class='ctx'> 	int local_ip_map_fd = -1;</div><div class='ctx'> 	int set_src_prog_fd, get_src_prog_fd;</div><div class='ctx'> 	int set_dst_prog_fd;</div><div class='del'>-	int key = 0, ifindex = -1;</div><div class='add'>+	int key = 0;</div><div class='ctx'> 	uint local_ip;</div><div class='ctx'> 	int err;</div><div class='del'>-	DECLARE_LIBBPF_OPTS(bpf_tc_hook, tc_hook,</div><div class='del'>-			    .attach_point = BPF_TC_INGRESS);</div><div class='ctx'> </div><div class='ctx'> 	/* add vxlan tunnel */</div><div class='ctx'> 	err = add_ip6vxlan_tunnel();</div><div class='hunk'>@@ -503,31 +614,17 @@ static void test_ip6vxlan_tunnel(void)</div><div class='ctx'> 	skel = test_tunnel_kern__open_and_load();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))</div><div class='ctx'> 		goto done;</div><div class='del'>-	ifindex = if_nametoindex(IP6VXLAN_TUNL_DEV1);</div><div class='del'>-	if (!ASSERT_NEQ(ifindex, 0, "ip6vxlan11 ifindex"))</div><div class='del'>-		goto done;</div><div class='del'>-	tc_hook.ifindex = ifindex;</div><div class='ctx'> 	get_src_prog_fd = bpf_program__fd(skel-&gt;progs.ip6vxlan_get_tunnel_src);</div><div class='ctx'> 	set_src_prog_fd = bpf_program__fd(skel-&gt;progs.ip6vxlan_set_tunnel_src);</div><div class='del'>-	if (!ASSERT_GE(set_src_prog_fd, 0, "bpf_program__fd"))</div><div class='del'>-		goto done;</div><div class='del'>-	if (!ASSERT_GE(get_src_prog_fd, 0, "bpf_program__fd"))</div><div class='del'>-		goto done;</div><div class='del'>-	if (attach_tc_prog(&amp;tc_hook, get_src_prog_fd, set_src_prog_fd))</div><div class='add'>+	if (tc_prog_attach(IP6VXLAN_TUNL_DEV1, get_src_prog_fd, set_src_prog_fd))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* load and attach prog set_md to tunnel dev tc hook point at_ns0 */</div><div class='ctx'> 	nstoken = open_netns("at_ns0");</div><div class='ctx'> 	if (!ASSERT_OK_PTR(nstoken, "setns src"))</div><div class='ctx'> 		goto done;</div><div class='del'>-	ifindex = if_nametoindex(IP6VXLAN_TUNL_DEV0);</div><div class='del'>-	if (!ASSERT_NEQ(ifindex, 0, "ip6vxlan00 ifindex"))</div><div class='del'>-		goto done;</div><div class='del'>-	tc_hook.ifindex = ifindex;</div><div class='ctx'> 	set_dst_prog_fd = bpf_program__fd(skel-&gt;progs.ip6vxlan_set_tunnel_dst);</div><div class='del'>-	if (!ASSERT_GE(set_dst_prog_fd, 0, "bpf_program__fd"))</div><div class='del'>-		goto done;</div><div class='del'>-	if (attach_tc_prog(&amp;tc_hook, -1, set_dst_prog_fd))</div><div class='add'>+	if (tc_prog_attach(IP6VXLAN_TUNL_DEV0, -1, set_dst_prog_fd))</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	close_netns(nstoken);</div><div class='ctx'> </div><div class='hunk'>@@ -541,9 +638,7 @@ static void test_ip6vxlan_tunnel(void)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* ping test */</div><div class='del'>-	err = test_ping(AF_INET, IP4_ADDR_TUNL_DEV0);</div><div class='del'>-	if (!ASSERT_OK(err, "test_ping"))</div><div class='del'>-		goto done;</div><div class='add'>+	ping_dev0();</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	/* delete ipv6 vxlan tunnel */</div><div class='hunk'>@@ -557,12 +652,8 @@ done:</div><div class='ctx'> static void test_ipip_tunnel(enum ipip_encap encap)</div><div class='ctx'> {</div><div class='ctx'> 	struct test_tunnel_kern *skel = NULL;</div><div class='del'>-	struct nstoken *nstoken;</div><div class='ctx'> 	int set_src_prog_fd, get_src_prog_fd;</div><div class='del'>-	int ifindex = -1;</div><div class='ctx'> 	int err;</div><div class='del'>-	DECLARE_LIBBPF_OPTS(bpf_tc_hook, tc_hook,</div><div class='del'>-			    .attach_point = BPF_TC_INGRESS);</div><div class='ctx'> </div><div class='ctx'> 	/* add ipip tunnel */</div><div class='ctx'> 	err = add_ipip_tunnel(encap);</div><div class='hunk'>@@ -573,10 +664,6 @@ static void test_ipip_tunnel(enum ipip_encap encap)</div><div class='ctx'> 	skel = test_tunnel_kern__open_and_load();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))</div><div class='ctx'> 		goto done;</div><div class='del'>-	ifindex = if_nametoindex(IPIP_TUNL_DEV1);</div><div class='del'>-	if (!ASSERT_NEQ(ifindex, 0, "ipip11 ifindex"))</div><div class='del'>-		goto done;</div><div class='del'>-	tc_hook.ifindex = ifindex;</div><div class='ctx'> </div><div class='ctx'> 	switch (encap) {</div><div class='ctx'> 	case FOU:</div><div class='hunk'>@@ -598,26 +685,11 @@ static void test_ipip_tunnel(enum ipip_encap encap)</div><div class='ctx'> 			skel-&gt;progs.ipip_set_tunnel);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ASSERT_GE(set_src_prog_fd, 0, "bpf_program__fd"))</div><div class='del'>-		goto done;</div><div class='del'>-	if (!ASSERT_GE(get_src_prog_fd, 0, "bpf_program__fd"))</div><div class='del'>-		goto done;</div><div class='del'>-	if (attach_tc_prog(&amp;tc_hook, get_src_prog_fd, set_src_prog_fd))</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	/* ping from root namespace test */</div><div class='del'>-	err = test_ping(AF_INET, IP4_ADDR_TUNL_DEV0);</div><div class='del'>-	if (!ASSERT_OK(err, "test_ping"))</div><div class='add'>+	if (tc_prog_attach(IPIP_TUNL_DEV1, get_src_prog_fd, set_src_prog_fd))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	/* ping from at_ns0 namespace test */</div><div class='del'>-	nstoken = open_netns("at_ns0");</div><div class='del'>-	if (!ASSERT_OK_PTR(nstoken, "setns"))</div><div class='del'>-		goto done;</div><div class='del'>-	err = test_ping(AF_INET, IP4_ADDR_TUNL_DEV1);</div><div class='del'>-	if (!ASSERT_OK(err, "test_ping"))</div><div class='del'>-		goto done;</div><div class='del'>-	close_netns(nstoken);</div><div class='add'>+	ping_dev0();</div><div class='add'>+	ping_dev1();</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	/* delete ipip tunnel */</div><div class='hunk'>@@ -628,11 +700,8 @@ done:</div><div class='ctx'> </div><div class='ctx'> static void test_xfrm_tunnel(void)</div><div class='ctx'> {</div><div class='del'>-	DECLARE_LIBBPF_OPTS(bpf_tc_hook, tc_hook,</div><div class='del'>-			    .attach_point = BPF_TC_INGRESS);</div><div class='ctx'> 	LIBBPF_OPTS(bpf_xdp_attach_opts, opts);</div><div class='ctx'> 	struct test_tunnel_kern *skel = NULL;</div><div class='del'>-	struct nstoken *nstoken;</div><div class='ctx'> 	int xdp_prog_fd;</div><div class='ctx'> 	int tc_prog_fd;</div><div class='ctx'> 	int ifindex;</div><div class='hunk'>@@ -646,19 +715,16 @@ static void test_xfrm_tunnel(void)</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	ifindex = if_nametoindex("veth1");</div><div class='del'>-	if (!ASSERT_NEQ(ifindex, 0, "veth1 ifindex"))</div><div class='del'>-		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* attach tc prog to tunnel dev */</div><div class='del'>-	tc_hook.ifindex = ifindex;</div><div class='ctx'> 	tc_prog_fd = bpf_program__fd(skel-&gt;progs.xfrm_get_state);</div><div class='del'>-	if (!ASSERT_GE(tc_prog_fd, 0, "bpf_program__fd"))</div><div class='del'>-		goto done;</div><div class='del'>-	if (attach_tc_prog(&amp;tc_hook, tc_prog_fd, -1))</div><div class='add'>+	if (tc_prog_attach("veth1", tc_prog_fd, -1))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* attach xdp prog to tunnel dev */</div><div class='add'>+	ifindex = if_nametoindex("veth1");</div><div class='add'>+	if (!ASSERT_NEQ(ifindex, 0, "veth1 ifindex"))</div><div class='add'>+		goto done;</div><div class='ctx'> 	xdp_prog_fd = bpf_program__fd(skel-&gt;progs.xfrm_get_state_xdp);</div><div class='ctx'> 	if (!ASSERT_GE(xdp_prog_fd, 0, "bpf_program__fd"))</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -666,14 +732,7 @@ static void test_xfrm_tunnel(void)</div><div class='ctx'> 	if (!ASSERT_OK(err, "bpf_xdp_attach"))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	/* ping from at_ns0 namespace test */</div><div class='del'>-	nstoken = open_netns("at_ns0");</div><div class='del'>-	if (!ASSERT_OK_PTR(nstoken, "setns"))</div><div class='del'>-		goto done;</div><div class='del'>-	err = test_ping(AF_INET, IP4_ADDR_TUNL_DEV1);</div><div class='del'>-	close_netns(nstoken);</div><div class='del'>-	if (!ASSERT_OK(err, "test_ping"))</div><div class='del'>-		goto done;</div><div class='add'>+	ping_dev1();</div><div class='ctx'> </div><div class='ctx'> 	if (!ASSERT_EQ(skel-&gt;bss-&gt;xfrm_reqid, 1, "req_id"))</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -690,6 +749,281 @@ done:</div><div class='ctx'> 		test_tunnel_kern__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum gre_test {</div><div class='add'>+	GRE,</div><div class='add'>+	GRE_NOKEY,</div><div class='add'>+	GRETAP,</div><div class='add'>+	GRETAP_NOKEY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void test_gre_tunnel(enum gre_test test)</div><div class='add'>+{</div><div class='add'>+	struct test_tunnel_kern *skel;</div><div class='add'>+	int set_fd, get_fd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = test_tunnel_kern__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (test) {</div><div class='add'>+	case GRE:</div><div class='add'>+		err = add_ipv4_tunnel(GRE_TUNL_DEV0, GRE_TUNL_DEV1, "gre", "seq");</div><div class='add'>+		set_fd = bpf_program__fd(skel-&gt;progs.gre_set_tunnel_no_key);</div><div class='add'>+		get_fd = bpf_program__fd(skel-&gt;progs.gre_get_tunnel);</div><div class='add'>+		break;</div><div class='add'>+	case GRE_NOKEY:</div><div class='add'>+		err = add_ipv4_tunnel(GRE_TUNL_DEV0, GRE_TUNL_DEV1, "gre", "seq key 2");</div><div class='add'>+		set_fd = bpf_program__fd(skel-&gt;progs.gre_set_tunnel);</div><div class='add'>+		get_fd = bpf_program__fd(skel-&gt;progs.gre_get_tunnel);</div><div class='add'>+		break;</div><div class='add'>+	case GRETAP:</div><div class='add'>+		err = add_ipv4_tunnel(GRE_TUNL_DEV0, GRE_TUNL_DEV1, "gretap", "seq");</div><div class='add'>+		set_fd = bpf_program__fd(skel-&gt;progs.gre_set_tunnel_no_key);</div><div class='add'>+		get_fd = bpf_program__fd(skel-&gt;progs.gre_get_tunnel);</div><div class='add'>+		break;</div><div class='add'>+	case GRETAP_NOKEY:</div><div class='add'>+		err = add_ipv4_tunnel(GRE_TUNL_DEV0, GRE_TUNL_DEV1, "gretap", "seq key 2");</div><div class='add'>+		set_fd = bpf_program__fd(skel-&gt;progs.gre_set_tunnel);</div><div class='add'>+		get_fd = bpf_program__fd(skel-&gt;progs.gre_get_tunnel);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (!ASSERT_OK(err, "add tunnel"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	if (tc_prog_attach(GRE_TUNL_DEV1, get_fd, set_fd))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ping_dev0();</div><div class='add'>+	ping_dev1();</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	delete_tunnel(GRE_TUNL_DEV0, GRE_TUNL_DEV1);</div><div class='add'>+	test_tunnel_kern__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum ip6gre_test {</div><div class='add'>+	IP6GRE,</div><div class='add'>+	IP6GRETAP</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void test_ip6gre_tunnel(enum ip6gre_test test)</div><div class='add'>+{</div><div class='add'>+	struct test_tunnel_kern *skel;</div><div class='add'>+	int set_fd, get_fd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = test_tunnel_kern__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (test) {</div><div class='add'>+	case IP6GRE:</div><div class='add'>+		err = add_ipv6_tunnel(IP6GRE_TUNL_DEV0, IP6GRE_TUNL_DEV1,</div><div class='add'>+				      "ip6gre", "flowlabel 0xbcdef key 2");</div><div class='add'>+		break;</div><div class='add'>+	case IP6GRETAP:</div><div class='add'>+		err = add_ipv6_tunnel(IP6GRE_TUNL_DEV0, IP6GRE_TUNL_DEV1,</div><div class='add'>+				      "ip6gretap", "flowlabel 0xbcdef key 2");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (!ASSERT_OK(err, "add tunnel"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	set_fd = bpf_program__fd(skel-&gt;progs.ip6gretap_set_tunnel);</div><div class='add'>+	get_fd = bpf_program__fd(skel-&gt;progs.ip6gretap_get_tunnel);</div><div class='add'>+	if (tc_prog_attach(IP6GRE_TUNL_DEV1, get_fd, set_fd))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ping6_veth0();</div><div class='add'>+	ping6_dev1();</div><div class='add'>+	ping_dev0();</div><div class='add'>+	ping_dev1();</div><div class='add'>+done:</div><div class='add'>+	delete_tunnel(IP6GRE_TUNL_DEV0, IP6GRE_TUNL_DEV1);</div><div class='add'>+	test_tunnel_kern__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum erspan_test {</div><div class='add'>+	V1,</div><div class='add'>+	V2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void test_erspan_tunnel(enum erspan_test test)</div><div class='add'>+{</div><div class='add'>+	struct test_tunnel_kern *skel;</div><div class='add'>+	int set_fd, get_fd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = test_tunnel_kern__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (test) {</div><div class='add'>+	case V1:</div><div class='add'>+		err = add_ipv4_tunnel(ERSPAN_TUNL_DEV0, ERSPAN_TUNL_DEV1,</div><div class='add'>+				      "erspan", "seq key 2 erspan_ver 1 erspan 123");</div><div class='add'>+		break;</div><div class='add'>+	case V2:</div><div class='add'>+		err = add_ipv4_tunnel(ERSPAN_TUNL_DEV0, ERSPAN_TUNL_DEV1,</div><div class='add'>+				      "erspan",</div><div class='add'>+				      "seq key 2 erspan_ver 2 erspan_dir egress erspan_hwid 3");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (!ASSERT_OK(err, "add tunnel"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	set_fd = bpf_program__fd(skel-&gt;progs.erspan_set_tunnel);</div><div class='add'>+	get_fd = bpf_program__fd(skel-&gt;progs.erspan_get_tunnel);</div><div class='add'>+	if (tc_prog_attach(ERSPAN_TUNL_DEV1, get_fd, set_fd))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ping_dev0();</div><div class='add'>+	ping_dev1();</div><div class='add'>+done:</div><div class='add'>+	delete_tunnel(ERSPAN_TUNL_DEV0, ERSPAN_TUNL_DEV1);</div><div class='add'>+	test_tunnel_kern__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_ip6erspan_tunnel(enum erspan_test test)</div><div class='add'>+{</div><div class='add'>+	struct test_tunnel_kern *skel;</div><div class='add'>+	int set_fd, get_fd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = test_tunnel_kern__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (test) {</div><div class='add'>+	case V1:</div><div class='add'>+		err = add_ipv6_tunnel(IP6ERSPAN_TUNL_DEV0, IP6ERSPAN_TUNL_DEV1,</div><div class='add'>+				      "ip6erspan", "seq key 2 erspan_ver 1 erspan 123");</div><div class='add'>+		break;</div><div class='add'>+	case V2:</div><div class='add'>+		err = add_ipv6_tunnel(IP6ERSPAN_TUNL_DEV0, IP6ERSPAN_TUNL_DEV1,</div><div class='add'>+				      "ip6erspan",</div><div class='add'>+				      "seq key 2 erspan_ver 2 erspan_dir egress erspan_hwid 7");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (!ASSERT_OK(err, "add tunnel"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	set_fd = bpf_program__fd(skel-&gt;progs.ip4ip6erspan_set_tunnel);</div><div class='add'>+	get_fd = bpf_program__fd(skel-&gt;progs.ip4ip6erspan_get_tunnel);</div><div class='add'>+	if (tc_prog_attach(IP6ERSPAN_TUNL_DEV1, get_fd, set_fd))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ping6_veth0();</div><div class='add'>+	ping_dev1();</div><div class='add'>+done:</div><div class='add'>+	delete_tunnel(IP6ERSPAN_TUNL_DEV0, IP6ERSPAN_TUNL_DEV1);</div><div class='add'>+	test_tunnel_kern__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_geneve_tunnel(void)</div><div class='add'>+{</div><div class='add'>+	struct test_tunnel_kern *skel;</div><div class='add'>+	int set_fd, get_fd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = test_tunnel_kern__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = add_geneve_tunnel(GENEVE_TUNL_DEV0, GENEVE_TUNL_DEV1,</div><div class='add'>+				"geneve", "dstport 6081");</div><div class='add'>+	if (!ASSERT_OK(err, "add tunnel"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	set_fd = bpf_program__fd(skel-&gt;progs.geneve_set_tunnel);</div><div class='add'>+	get_fd = bpf_program__fd(skel-&gt;progs.geneve_get_tunnel);</div><div class='add'>+	if (tc_prog_attach(GENEVE_TUNL_DEV1, get_fd, set_fd))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ping_dev0();</div><div class='add'>+	ping_dev1();</div><div class='add'>+done:</div><div class='add'>+	delete_tunnel(GENEVE_TUNL_DEV0, GENEVE_TUNL_DEV1);</div><div class='add'>+	test_tunnel_kern__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_ip6geneve_tunnel(void)</div><div class='add'>+{</div><div class='add'>+	struct test_tunnel_kern *skel;</div><div class='add'>+	int set_fd, get_fd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = test_tunnel_kern__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = add_ip6geneve_tunnel(IP6GENEVE_TUNL_DEV0, IP6GENEVE_TUNL_DEV1,</div><div class='add'>+				   "geneve", "");</div><div class='add'>+	if (!ASSERT_OK(err, "add tunnel"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	set_fd = bpf_program__fd(skel-&gt;progs.ip6geneve_set_tunnel);</div><div class='add'>+	get_fd = bpf_program__fd(skel-&gt;progs.ip6geneve_get_tunnel);</div><div class='add'>+	if (tc_prog_attach(IP6GENEVE_TUNL_DEV1, get_fd, set_fd))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ping_dev0();</div><div class='add'>+	ping_dev1();</div><div class='add'>+done:</div><div class='add'>+	delete_tunnel(IP6GENEVE_TUNL_DEV0, IP6GENEVE_TUNL_DEV1);</div><div class='add'>+	test_tunnel_kern__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum ip6tnl_test {</div><div class='add'>+	IPIP6,</div><div class='add'>+	IP6IP6</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void test_ip6tnl_tunnel(enum ip6tnl_test test)</div><div class='add'>+{</div><div class='add'>+	struct test_tunnel_kern *skel;</div><div class='add'>+	int set_fd, get_fd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = test_tunnel_kern__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = add_ipv6_tunnel(IP6TNL_TUNL_DEV0, IP6TNL_TUNL_DEV1, "ip6tnl", "");</div><div class='add'>+	if (!ASSERT_OK(err, "add tunnel"))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	switch (test) {</div><div class='add'>+	case IPIP6:</div><div class='add'>+		set_fd = bpf_program__fd(skel-&gt;progs.ipip6_set_tunnel);</div><div class='add'>+		get_fd = bpf_program__fd(skel-&gt;progs.ipip6_get_tunnel);</div><div class='add'>+		break;</div><div class='add'>+	case IP6IP6:</div><div class='add'>+		set_fd = bpf_program__fd(skel-&gt;progs.ip6ip6_set_tunnel);</div><div class='add'>+		get_fd = bpf_program__fd(skel-&gt;progs.ip6ip6_get_tunnel);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (tc_prog_attach(IP6TNL_TUNL_DEV1, get_fd, set_fd))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	ping6_veth0();</div><div class='add'>+	switch (test) {</div><div class='add'>+	case IPIP6:</div><div class='add'>+		ping_dev0();</div><div class='add'>+		ping_dev1();</div><div class='add'>+		break;</div><div class='add'>+	case IP6IP6:</div><div class='add'>+		ping6_dev0();</div><div class='add'>+		ping6_dev1();</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	delete_tunnel(IP6TNL_TUNL_DEV0, IP6TNL_TUNL_DEV1);</div><div class='add'>+	test_tunnel_kern__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define RUN_TEST(name, ...)						\</div><div class='ctx'> 	({								\</div><div class='ctx'> 		if (test__start_subtest(#name)) {			\</div><div class='hunk'>@@ -707,6 +1041,20 @@ static void *test_tunnel_run_tests(void *arg)</div><div class='ctx'> 	RUN_TEST(ipip_tunnel, FOU);</div><div class='ctx'> 	RUN_TEST(ipip_tunnel, GUE);</div><div class='ctx'> 	RUN_TEST(xfrm_tunnel);</div><div class='add'>+	RUN_TEST(gre_tunnel, GRE);</div><div class='add'>+	RUN_TEST(gre_tunnel, GRE_NOKEY);</div><div class='add'>+	RUN_TEST(gre_tunnel, GRETAP);</div><div class='add'>+	RUN_TEST(gre_tunnel, GRETAP_NOKEY);</div><div class='add'>+	RUN_TEST(ip6gre_tunnel, IP6GRE);</div><div class='add'>+	RUN_TEST(ip6gre_tunnel, IP6GRETAP);</div><div class='add'>+	RUN_TEST(erspan_tunnel, V1);</div><div class='add'>+	RUN_TEST(erspan_tunnel, V2);</div><div class='add'>+	RUN_TEST(ip6erspan_tunnel, V1);</div><div class='add'>+	RUN_TEST(ip6erspan_tunnel, V2);</div><div class='add'>+	RUN_TEST(geneve_tunnel);</div><div class='add'>+	RUN_TEST(ip6geneve_tunnel);</div><div class='add'>+	RUN_TEST(ip6tnl_tunnel, IPIP6);</div><div class='add'>+	RUN_TEST(ip6tnl_tunnel, IP6IP6);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_veristat.c b/tools/testing/selftests/bpf/prog_tests/test_veristat.c<br/>new file mode 100644<br/>index 000000000000..b38c16b4247f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_veristat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_veristat.c</a></div><div class='hunk'>@@ -0,0 +1,261 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+</div><div class='add'>+#define __CHECK_STR(str, name)					    \</div><div class='add'>+	do {							    \</div><div class='add'>+		if (!ASSERT_HAS_SUBSTR(fix-&gt;output, (str), (name))) \</div><div class='add'>+			goto out;				    \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+struct fixture {</div><div class='add'>+	char tmpfile[80];</div><div class='add'>+	int fd;</div><div class='add'>+	char *output;</div><div class='add'>+	size_t sz;</div><div class='add'>+	char veristat[80];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fixture *init_fixture(void)</div><div class='add'>+{</div><div class='add'>+	struct fixture *fix = malloc(sizeof(struct fixture));</div><div class='add'>+</div><div class='add'>+	/* for no_alu32 and cpuv4 veristat is in parent folder */</div><div class='add'>+	if (access("./veristat", F_OK) == 0)</div><div class='add'>+		strcpy(fix-&gt;veristat, "./veristat");</div><div class='add'>+	else if (access("../veristat", F_OK) == 0)</div><div class='add'>+		strcpy(fix-&gt;veristat, "../veristat");</div><div class='add'>+	else</div><div class='add'>+		PRINT_FAIL("Can't find veristat binary");</div><div class='add'>+</div><div class='add'>+	snprintf(fix-&gt;tmpfile, sizeof(fix-&gt;tmpfile), "/tmp/test_veristat.XXXXXX");</div><div class='add'>+	fix-&gt;fd = mkstemp(fix-&gt;tmpfile);</div><div class='add'>+	fix-&gt;sz = 1000000;</div><div class='add'>+	fix-&gt;output = malloc(fix-&gt;sz);</div><div class='add'>+	return fix;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void teardown_fixture(struct fixture *fix)</div><div class='add'>+{</div><div class='add'>+	free(fix-&gt;output);</div><div class='add'>+	close(fix-&gt;fd);</div><div class='add'>+	remove(fix-&gt;tmpfile);</div><div class='add'>+	free(fix);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_set_global_vars_succeeds(void)</div><div class='add'>+{</div><div class='add'>+	struct fixture *fix = init_fixture();</div><div class='add'>+</div><div class='add'>+	SYS(out,</div><div class='add'>+	    "%s set_global_vars.bpf.o"\</div><div class='add'>+	    " -G \"var_s64 = 0xf000000000000001\" "\</div><div class='add'>+	    " -G \"var_u64 = 0xfedcba9876543210\" "\</div><div class='add'>+	    " -G \"var_s32 = -0x80000000\" "\</div><div class='add'>+	    " -G \"var_u32 = 0x76543210\" "\</div><div class='add'>+	    " -G \"var_s16 = -32768\" "\</div><div class='add'>+	    " -G \"var_u16 = 60652\" "\</div><div class='add'>+	    " -G \"var_s8 = -128\" "\</div><div class='add'>+	    " -G \"var_u8 = 255\" "\</div><div class='add'>+	    " -G \"var_ea = EA2\" "\</div><div class='add'>+	    " -G \"var_eb  =  EB2\" "\</div><div class='add'>+	    " -G \"var_ec=EC2\" "\</div><div class='add'>+	    " -G \"var_b = 1\" "\</div><div class='add'>+	    " -G \"struct1[2].struct2[1][2].u.var_u8[2]=170\" "\</div><div class='add'>+	    " -G \"union1.struct3.var_u8_l = 0xaa\" "\</div><div class='add'>+	    " -G \"union1.struct3.var_u8_h = 0xaa\" "\</div><div class='add'>+	    " -G \"arr[3]= 171\" "	\</div><div class='add'>+	    " -G \"arr[EA2] =172\" "	\</div><div class='add'>+	    " -G \"enum_arr[EC2]=EA3\" " \</div><div class='add'>+	    " -G \"three_d[31][7][EA2]=173\"" \</div><div class='add'>+	    " -G \"struct1[2].struct2[1][2].u.mat[5][3]=174\" " \</div><div class='add'>+	    " -G \"struct11 [ 7 ] [ 5 ] .struct2[0][1].u.mat[3][0] = 175\" " \</div><div class='add'>+	    " -vl2 &gt; %s", fix-&gt;veristat, fix-&gt;tmpfile);</div><div class='add'>+</div><div class='add'>+	read(fix-&gt;fd, fix-&gt;output, fix-&gt;sz);</div><div class='add'>+	__CHECK_STR("=0xf000000000000001 ", "var_s64 = 0xf000000000000001");</div><div class='add'>+	__CHECK_STR("=0xfedcba9876543210 ", "var_u64 = 0xfedcba9876543210");</div><div class='add'>+	__CHECK_STR("=0x80000000 ", "var_s32 = -0x80000000");</div><div class='add'>+	__CHECK_STR("=0x76543210 ", "var_u32 = 0x76543210");</div><div class='add'>+	__CHECK_STR("=0x8000 ", "var_s16 = -32768");</div><div class='add'>+	__CHECK_STR("=0xecec ", "var_u16 = 60652");</div><div class='add'>+	__CHECK_STR("=128 ", "var_s8 = -128");</div><div class='add'>+	__CHECK_STR("=255 ", "var_u8 = 255");</div><div class='add'>+	__CHECK_STR("=11 ", "var_ea = EA2");</div><div class='add'>+	__CHECK_STR("=12 ", "var_eb = EB2");</div><div class='add'>+	__CHECK_STR("=13 ", "var_ec = EC2");</div><div class='add'>+	__CHECK_STR("=1 ", "var_b = 1");</div><div class='add'>+	__CHECK_STR("=170 ", "struct1[2].struct2[1][2].u.var_u8[2]=170");</div><div class='add'>+	__CHECK_STR("=0xaaaa ", "union1.var_u16 = 0xaaaa");</div><div class='add'>+	__CHECK_STR("=171 ", "arr[3]= 171");</div><div class='add'>+	__CHECK_STR("=172 ", "arr[EA2] =172");</div><div class='add'>+	__CHECK_STR("=10 ", "enum_arr[EC2]=EA3");</div><div class='add'>+	__CHECK_STR("=173 ", "matrix[31][7][11]=173");</div><div class='add'>+	__CHECK_STR("=174 ", "struct1[2].struct2[1][2].u.mat[5][3]=174");</div><div class='add'>+	__CHECK_STR("=175 ", "struct11[7][5].struct2[0][1].u.mat[3][0]=175");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	teardown_fixture(fix);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_set_global_vars_from_file_succeeds(void)</div><div class='add'>+{</div><div class='add'>+	struct fixture *fix = init_fixture();</div><div class='add'>+	char input_file[80];</div><div class='add'>+	const char *vars = "var_s16 = -32768\nvar_u16 = 60652";</div><div class='add'>+	int fd;</div><div class='add'>+</div><div class='add'>+	snprintf(input_file, sizeof(input_file), "/tmp/veristat_input.XXXXXX");</div><div class='add'>+	fd = mkstemp(input_file);</div><div class='add'>+	if (!ASSERT_GE(fd, 0, "valid fd"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	write(fd, vars, strlen(vars));</div><div class='add'>+	syncfs(fd);</div><div class='add'>+	SYS(out, "%s set_global_vars.bpf.o -G \"@%s\" -vl2 &gt; %s",</div><div class='add'>+	    fix-&gt;veristat, input_file, fix-&gt;tmpfile);</div><div class='add'>+	read(fix-&gt;fd, fix-&gt;output, fix-&gt;sz);</div><div class='add'>+	__CHECK_STR("=0x8000 ", "var_s16 = -32768");</div><div class='add'>+	__CHECK_STR("=0xecec ", "var_u16 = 60652");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	close(fd);</div><div class='add'>+	remove(input_file);</div><div class='add'>+	teardown_fixture(fix);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_set_global_vars_out_of_range(void)</div><div class='add'>+{</div><div class='add'>+	struct fixture *fix = init_fixture();</div><div class='add'>+</div><div class='add'>+	SYS_FAIL(out,</div><div class='add'>+		 "%s set_global_vars.bpf.o -G \"var_s32 = 2147483648\" -vl2 2&gt; %s",</div><div class='add'>+		 fix-&gt;veristat, fix-&gt;tmpfile);</div><div class='add'>+</div><div class='add'>+	read(fix-&gt;fd, fix-&gt;output, fix-&gt;sz);</div><div class='add'>+	__CHECK_STR("is out of range [-2147483648; 2147483647]", "out of range");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	teardown_fixture(fix);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_unsupported_ptr_array_type(void)</div><div class='add'>+{</div><div class='add'>+	struct fixture *fix = init_fixture();</div><div class='add'>+</div><div class='add'>+	SYS_FAIL(out,</div><div class='add'>+		 "%s set_global_vars.bpf.o -G \"ptr_arr[0] = 0\" -vl2 2&gt; %s",</div><div class='add'>+		 fix-&gt;veristat, fix-&gt;tmpfile);</div><div class='add'>+</div><div class='add'>+	read(fix-&gt;fd, fix-&gt;output, fix-&gt;sz);</div><div class='add'>+	__CHECK_STR("Can't set ptr_arr[0]. Only ints and enums are supported", "ptr_arr");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	teardown_fixture(fix);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_array_out_of_bounds(void)</div><div class='add'>+{</div><div class='add'>+	struct fixture *fix = init_fixture();</div><div class='add'>+</div><div class='add'>+	SYS_FAIL(out,</div><div class='add'>+		 "%s set_global_vars.bpf.o -G \"arr[99] = 0\" -vl2 2&gt; %s",</div><div class='add'>+		 fix-&gt;veristat, fix-&gt;tmpfile);</div><div class='add'>+</div><div class='add'>+	read(fix-&gt;fd, fix-&gt;output, fix-&gt;sz);</div><div class='add'>+	__CHECK_STR("Array index 99 is out of bounds", "arr[99]");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	teardown_fixture(fix);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_array_index_not_found(void)</div><div class='add'>+{</div><div class='add'>+	struct fixture *fix = init_fixture();</div><div class='add'>+</div><div class='add'>+	SYS_FAIL(out,</div><div class='add'>+		 "%s set_global_vars.bpf.o -G \"arr[EG2] = 0\" -vl2 2&gt; %s",</div><div class='add'>+		 fix-&gt;veristat, fix-&gt;tmpfile);</div><div class='add'>+</div><div class='add'>+	read(fix-&gt;fd, fix-&gt;output, fix-&gt;sz);</div><div class='add'>+	__CHECK_STR("Can't resolve enum value EG2", "arr[EG2]");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	teardown_fixture(fix);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_array_index_for_non_array(void)</div><div class='add'>+{</div><div class='add'>+	struct fixture *fix = init_fixture();</div><div class='add'>+</div><div class='add'>+	SYS_FAIL(out,</div><div class='add'>+		 "%s set_global_vars.bpf.o -G \"var_b[0] = 1\" -vl2 2&gt; %s",</div><div class='add'>+		 fix-&gt;veristat, fix-&gt;tmpfile);</div><div class='add'>+</div><div class='add'>+	pread(fix-&gt;fd, fix-&gt;output, fix-&gt;sz, 0);</div><div class='add'>+	__CHECK_STR("Array index is not expected for var_b", "var_b[0] = 1");</div><div class='add'>+</div><div class='add'>+	SYS_FAIL(out,</div><div class='add'>+		 "%s set_global_vars.bpf.o -G \"union1.struct3[0].var_u8_l=1\" -vl2 2&gt; %s",</div><div class='add'>+		 fix-&gt;veristat, fix-&gt;tmpfile);</div><div class='add'>+</div><div class='add'>+	pread(fix-&gt;fd, fix-&gt;output, fix-&gt;sz, 0);</div><div class='add'>+	__CHECK_STR("Array index is not expected for struct3", "union1.struct3[0].var_u8_l=1");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	teardown_fixture(fix);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_no_array_index_for_array(void)</div><div class='add'>+{</div><div class='add'>+	struct fixture *fix = init_fixture();</div><div class='add'>+</div><div class='add'>+	SYS_FAIL(out,</div><div class='add'>+		 "%s set_global_vars.bpf.o -G \"arr = 1\" -vl2 2&gt; %s",</div><div class='add'>+		 fix-&gt;veristat, fix-&gt;tmpfile);</div><div class='add'>+</div><div class='add'>+	pread(fix-&gt;fd, fix-&gt;output, fix-&gt;sz, 0);</div><div class='add'>+	__CHECK_STR("Can't set arr. Only ints and enums are supported", "arr = 1");</div><div class='add'>+</div><div class='add'>+	SYS_FAIL(out,</div><div class='add'>+		 "%s set_global_vars.bpf.o -G \"struct1[0].struct2.u.var_u8[2]=1\" -vl2 2&gt; %s",</div><div class='add'>+		 fix-&gt;veristat, fix-&gt;tmpfile);</div><div class='add'>+</div><div class='add'>+	pread(fix-&gt;fd, fix-&gt;output, fix-&gt;sz, 0);</div><div class='add'>+	__CHECK_STR("Can't resolve field u for non-composite type", "struct1[0].struct2.u.var_u8[2]=1");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	teardown_fixture(fix);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_veristat(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("set_global_vars_succeeds"))</div><div class='add'>+		test_set_global_vars_succeeds();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("set_global_vars_out_of_range"))</div><div class='add'>+		test_set_global_vars_out_of_range();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("set_global_vars_from_file_succeeds"))</div><div class='add'>+		test_set_global_vars_from_file_succeeds();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("test_unsupported_ptr_array_type"))</div><div class='add'>+		test_unsupported_ptr_array_type();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("test_array_out_of_bounds"))</div><div class='add'>+		test_array_out_of_bounds();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("test_array_index_not_found"))</div><div class='add'>+		test_array_index_not_found();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("test_array_index_for_non_array"))</div><div class='add'>+		test_array_index_for_non_array();</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("test_no_array_index_for_array"))</div><div class='add'>+		test_no_array_index_for_array();</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef __CHECK_STR</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c b/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c<br/>index 8d75424fe6bc..3e98a1665936 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c</a></div><div class='hunk'>@@ -3,17 +3,50 @@</div><div class='ctx'> /* Create 3 namespaces with 3 veth peers, and forward packets in-between using</div><div class='ctx'>  * native XDP</div><div class='ctx'>  *</div><div class='del'>- *                      XDP_TX</div><div class='del'>- * NS1(veth11)        NS2(veth22)        NS3(veth33)</div><div class='del'>- *      |                  |                  |</div><div class='del'>- *      |                  |                  |</div><div class='del'>- *   (veth1,            (veth2,            (veth3,</div><div class='del'>- *   id:111)            id:122)            id:133)</div><div class='del'>- *     ^ |                ^ |                ^ |</div><div class='del'>- *     | |  XDP_REDIRECT  | |  XDP_REDIRECT  | |</div><div class='del'>- *     | ------------------ ------------------ |</div><div class='del'>- *     -----------------------------------------</div><div class='del'>- *                    XDP_REDIRECT</div><div class='add'>+ * Network topology:</div><div class='add'>+ *  ----------        ----------       ----------</div><div class='add'>+ *  |  NS1   |        |  NS2   |       |  NS3   |</div><div class='add'>+ *  | veth11 |        | veth22 |       | veth33 |</div><div class='add'>+ *  ----|-----        -----|----       -----|----</div><div class='add'>+ *      |                  |                |</div><div class='add'>+ *  ----|------------------|----------------|----</div><div class='add'>+ *  | veth1              veth2            veth3 |</div><div class='add'>+ *  |                                           |</div><div class='add'>+ *  |                     NSO                   |</div><div class='add'>+ *  ---------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * Test cases:</div><div class='add'>+ *  - [test_xdp_veth_redirect] : ping veth33 from veth11</div><div class='add'>+ *</div><div class='add'>+ *    veth11             veth22              veth33</div><div class='add'>+ *  (XDP_PASS)          (XDP_TX)           (XDP_PASS)</div><div class='add'>+ *       |                  |                  |</div><div class='add'>+ *       |                  |                  |</div><div class='add'>+ *     veth1             veth2              veth3</div><div class='add'>+ * (XDP_REDIRECT)     (XDP_REDIRECT)     (XDP_REDIRECT)</div><div class='add'>+ *      ^ |                ^ |                ^ |</div><div class='add'>+ *      | |                | |                | |</div><div class='add'>+ *      | ------------------ ------------------ |</div><div class='add'>+ *      -----------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * - [test_xdp_veth_broadcast_redirect]: broadcast from veth11</div><div class='add'>+ *     - IPv4 ping : BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS</div><div class='add'>+ *          -&gt; echo request received by all except veth11</div><div class='add'>+ *     - IPv4 ping : BPF_F_BROADCAST</div><div class='add'>+ *          -&gt; echo request received by all veth</div><div class='add'>+ * - [test_xdp_veth_egress]:</div><div class='add'>+ *     - all src mac should be the magic mac</div><div class='add'>+ *</div><div class='add'>+ *    veth11             veth22              veth33</div><div class='add'>+ *  (XDP_PASS)         (XDP_PASS)          (XDP_PASS)</div><div class='add'>+ *       |                  |                  |</div><div class='add'>+ *       |                  |                  |</div><div class='add'>+ *     veth1		  veth2              veth3</div><div class='add'>+ * (XDP_REDIRECT)     (XDP_REDIRECT)     (XDP_REDIRECT)</div><div class='add'>+ *      |                   ^                  ^</div><div class='add'>+ *      |                   |                  |</div><div class='add'>+ *      ----------------------------------------</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define _GNU_SOURCE</div><div class='hunk'>@@ -22,192 +55,545 @@</div><div class='ctx'> #include "network_helpers.h"</div><div class='ctx'> #include "xdp_dummy.skel.h"</div><div class='ctx'> #include "xdp_redirect_map.skel.h"</div><div class='add'>+#include "xdp_redirect_multi_kern.skel.h"</div><div class='ctx'> #include "xdp_tx.skel.h"</div><div class='add'>+#include &lt;uapi/linux/if_link.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VETH_PAIRS_COUNT	3</div><div class='del'>-#define NS_SUFFIX_LEN		6</div><div class='del'>-#define VETH_NAME_MAX_LEN	16</div><div class='add'>+#define VETH_NAME_MAX_LEN	32</div><div class='add'>+#define IP_MAX_LEN		16</div><div class='ctx'> #define IP_SRC				"10.1.1.11"</div><div class='ctx'> #define IP_DST				"10.1.1.33"</div><div class='del'>-#define IP_CMD_MAX_LEN		128</div><div class='del'>-</div><div class='del'>-struct skeletons {</div><div class='del'>-	struct xdp_dummy *xdp_dummy;</div><div class='del'>-	struct xdp_tx *xdp_tx;</div><div class='del'>-	struct xdp_redirect_map *xdp_redirect_maps;</div><div class='del'>-};</div><div class='add'>+#define IP_NEIGH			"10.1.1.253"</div><div class='add'>+#define PROG_NAME_MAX_LEN	128</div><div class='add'>+#define NS_NAME_MAX_LEN		32</div><div class='ctx'> </div><div class='ctx'> struct veth_configuration {</div><div class='ctx'> 	char local_veth[VETH_NAME_MAX_LEN]; /* Interface in main namespace */</div><div class='ctx'> 	char remote_veth[VETH_NAME_MAX_LEN]; /* Peer interface in dedicated namespace*/</div><div class='del'>-	const char *namespace; /* Namespace for the remote veth */</div><div class='del'>-	char next_veth[VETH_NAME_MAX_LEN]; /* Local interface to redirect traffic to */</div><div class='del'>-	char *remote_addr; /* IP address of the remote veth */</div><div class='add'>+	char namespace[NS_NAME_MAX_LEN]; /* Namespace for the remote veth */</div><div class='add'>+	int next_veth; /* Local interface to redirect traffic to */</div><div class='add'>+	char remote_addr[IP_MAX_LEN]; /* IP address of the remote veth */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct veth_configuration config[VETH_PAIRS_COUNT] = {</div><div class='del'>-	{</div><div class='del'>-		.local_veth = "veth1",</div><div class='del'>-		.remote_veth = "veth11",</div><div class='del'>-		.next_veth = "veth2",</div><div class='del'>-		.remote_addr = IP_SRC,</div><div class='del'>-		.namespace = "ns-veth11"</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.local_veth = "veth2",</div><div class='del'>-		.remote_veth = "veth22",</div><div class='del'>-		.next_veth = "veth3",</div><div class='del'>-		.remote_addr = NULL,</div><div class='del'>-		.namespace = "ns-veth22"</div><div class='del'>-	},</div><div class='add'>+struct net_configuration {</div><div class='add'>+	char ns0_name[NS_NAME_MAX_LEN];</div><div class='add'>+	struct veth_configuration veth_cfg[VETH_PAIRS_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct net_configuration default_config = {</div><div class='add'>+	.ns0_name = "ns0-",</div><div class='ctx'> 	{</div><div class='del'>-		.local_veth = "veth3",</div><div class='del'>-		.remote_veth = "veth33",</div><div class='del'>-		.next_veth = "veth1",</div><div class='del'>-		.remote_addr = IP_DST,</div><div class='del'>-		.namespace = "ns-veth33"</div><div class='add'>+		{</div><div class='add'>+			.local_veth = "veth1-",</div><div class='add'>+			.remote_veth = "veth11",</div><div class='add'>+			.next_veth = 1,</div><div class='add'>+			.remote_addr = IP_SRC,</div><div class='add'>+			.namespace = "ns-veth11-"</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.local_veth = "veth2-",</div><div class='add'>+			.remote_veth = "veth22",</div><div class='add'>+			.next_veth = 2,</div><div class='add'>+			.remote_addr = "",</div><div class='add'>+			.namespace = "ns-veth22-"</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.local_veth = "veth3-",</div><div class='add'>+			.remote_veth = "veth33",</div><div class='add'>+			.next_veth = 0,</div><div class='add'>+			.remote_addr = IP_DST,</div><div class='add'>+			.namespace = "ns-veth33-"</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int attach_programs_to_veth_pair(struct skeletons *skeletons, int index)</div><div class='add'>+struct prog_configuration {</div><div class='add'>+	char local_name[PROG_NAME_MAX_LEN]; /* BPF prog to attach to local_veth */</div><div class='add'>+	char remote_name[PROG_NAME_MAX_LEN]; /* BPF prog to attach to remote_veth */</div><div class='add'>+	u32 local_flags; /* XDP flags to use on local_veth */</div><div class='add'>+	u32 remote_flags; /* XDP flags to use on remote_veth */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int attach_programs_to_veth_pair(struct bpf_object **objs, size_t nb_obj,</div><div class='add'>+					struct net_configuration *net_config,</div><div class='add'>+					struct prog_configuration *prog, int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_program *local_prog, *remote_prog;</div><div class='del'>-	struct bpf_link **local_link, **remote_link;</div><div class='ctx'> 	struct nstoken *nstoken;</div><div class='del'>-	struct bpf_link *link;</div><div class='del'>-	int interface;</div><div class='del'>-</div><div class='del'>-	switch (index) {</div><div class='del'>-	case 0:</div><div class='del'>-		local_prog = skeletons-&gt;xdp_redirect_maps-&gt;progs.xdp_redirect_map_0;</div><div class='del'>-		local_link = &amp;skeletons-&gt;xdp_redirect_maps-&gt;links.xdp_redirect_map_0;</div><div class='del'>-		remote_prog = skeletons-&gt;xdp_dummy-&gt;progs.xdp_dummy_prog;</div><div class='del'>-		remote_link = &amp;skeletons-&gt;xdp_dummy-&gt;links.xdp_dummy_prog;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		local_prog = skeletons-&gt;xdp_redirect_maps-&gt;progs.xdp_redirect_map_1;</div><div class='del'>-		local_link = &amp;skeletons-&gt;xdp_redirect_maps-&gt;links.xdp_redirect_map_1;</div><div class='del'>-		remote_prog = skeletons-&gt;xdp_tx-&gt;progs.xdp_tx;</div><div class='del'>-		remote_link = &amp;skeletons-&gt;xdp_tx-&gt;links.xdp_tx;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		local_prog = skeletons-&gt;xdp_redirect_maps-&gt;progs.xdp_redirect_map_2;</div><div class='del'>-		local_link = &amp;skeletons-&gt;xdp_redirect_maps-&gt;links.xdp_redirect_map_2;</div><div class='del'>-		remote_prog = skeletons-&gt;xdp_dummy-&gt;progs.xdp_dummy_prog;</div><div class='del'>-		remote_link = &amp;skeletons-&gt;xdp_dummy-&gt;links.xdp_dummy_prog;</div><div class='del'>-		break;</div><div class='add'>+	int interface, ret, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nb_obj; i++) {</div><div class='add'>+		local_prog = bpf_object__find_program_by_name(objs[i], prog[index].local_name);</div><div class='add'>+		if (local_prog)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='del'>-	interface = if_nametoindex(config[index].local_veth);</div><div class='add'>+	if (!ASSERT_OK_PTR(local_prog, "find local program"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nb_obj; i++) {</div><div class='add'>+		remote_prog = bpf_object__find_program_by_name(objs[i], prog[index].remote_name);</div><div class='add'>+		if (remote_prog)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (!ASSERT_OK_PTR(remote_prog, "find remote program"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	interface = if_nametoindex(net_config-&gt;veth_cfg[index].local_veth);</div><div class='ctx'> 	if (!ASSERT_NEQ(interface, 0, "non zero interface index"))</div><div class='ctx'> 		return -1;</div><div class='del'>-	link = bpf_program__attach_xdp(local_prog, interface);</div><div class='del'>-	if (!ASSERT_OK_PTR(link, "attach xdp program to local veth"))</div><div class='add'>+</div><div class='add'>+	ret = bpf_xdp_attach(interface, bpf_program__fd(local_prog),</div><div class='add'>+			     prog[index].local_flags, NULL);</div><div class='add'>+	if (!ASSERT_OK(ret, "attach xdp program to local veth"))</div><div class='ctx'> 		return -1;</div><div class='del'>-	*local_link = link;</div><div class='del'>-	nstoken = open_netns(config[index].namespace);</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(net_config-&gt;veth_cfg[index].namespace);</div><div class='ctx'> 	if (!ASSERT_OK_PTR(nstoken, "switch to remote veth namespace"))</div><div class='ctx'> 		return -1;</div><div class='del'>-	interface = if_nametoindex(config[index].remote_veth);</div><div class='add'>+</div><div class='add'>+	interface = if_nametoindex(net_config-&gt;veth_cfg[index].remote_veth);</div><div class='ctx'> 	if (!ASSERT_NEQ(interface, 0, "non zero interface index")) {</div><div class='ctx'> 		close_netns(nstoken);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	link = bpf_program__attach_xdp(remote_prog, interface);</div><div class='del'>-	*remote_link = link;</div><div class='del'>-	close_netns(nstoken);</div><div class='del'>-	if (!ASSERT_OK_PTR(link, "attach xdp program to remote veth"))</div><div class='add'>+</div><div class='add'>+	ret = bpf_xdp_attach(interface, bpf_program__fd(remote_prog),</div><div class='add'>+			     prog[index].remote_flags, NULL);</div><div class='add'>+	if (!ASSERT_OK(ret, "attach xdp program to remote veth")) {</div><div class='add'>+		close_netns(nstoken);</div><div class='ctx'> 		return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	close_netns(nstoken);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int configure_network(struct skeletons *skeletons)</div><div class='add'>+static int create_network(struct net_configuration *net_config)</div><div class='ctx'> {</div><div class='del'>-	int interface_id;</div><div class='del'>-	int map_fd;</div><div class='del'>-	int err;</div><div class='del'>-	int i = 0;</div><div class='add'>+	struct nstoken *nstoken = NULL;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	memcpy(net_config, &amp;default_config, sizeof(struct net_configuration));</div><div class='add'>+</div><div class='add'>+	/* Create unique namespaces */</div><div class='add'>+	err = append_tid(net_config-&gt;ns0_name, NS_NAME_MAX_LEN);</div><div class='add'>+	if (!ASSERT_OK(err, "append TID to ns0 name"))</div><div class='add'>+		goto fail;</div><div class='add'>+	SYS(fail, "ip netns add %s", net_config-&gt;ns0_name);</div><div class='ctx'> </div><div class='del'>-	/* First create and configure all interfaces */</div><div class='ctx'> 	for (i = 0; i &lt; VETH_PAIRS_COUNT; i++) {</div><div class='del'>-		SYS(fail, "ip netns add %s", config[i].namespace);</div><div class='del'>-		SYS(fail, "ip link add %s type veth peer name %s netns %s",</div><div class='del'>-		    config[i].local_veth, config[i].remote_veth, config[i].namespace);</div><div class='del'>-		SYS(fail, "ip link set dev %s up", config[i].local_veth);</div><div class='del'>-		if (config[i].remote_addr)</div><div class='del'>-			SYS(fail, "ip -n %s addr add %s/24 dev %s",	config[i].namespace,</div><div class='del'>-			    config[i].remote_addr, config[i].remote_veth);</div><div class='del'>-		SYS(fail, "ip -n %s link set dev %s up", config[i].namespace,</div><div class='del'>-		    config[i].remote_veth);</div><div class='add'>+		err = append_tid(net_config-&gt;veth_cfg[i].namespace, NS_NAME_MAX_LEN);</div><div class='add'>+		if (!ASSERT_OK(err, "append TID to ns name"))</div><div class='add'>+			goto fail;</div><div class='add'>+		SYS(fail, "ip netns add %s", net_config-&gt;veth_cfg[i].namespace);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Then configure the redirect map and attach programs to interfaces */</div><div class='del'>-	map_fd = bpf_map__fd(skeletons-&gt;xdp_redirect_maps-&gt;maps.tx_port);</div><div class='del'>-	if (!ASSERT_GE(map_fd, 0, "open redirect map"))</div><div class='add'>+	/* Create interfaces */</div><div class='add'>+	nstoken = open_netns(net_config-&gt;ns0_name);</div><div class='add'>+	if (!nstoken)</div><div class='ctx'> 		goto fail;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; VETH_PAIRS_COUNT; i++) {</div><div class='del'>-		interface_id = if_nametoindex(config[i].next_veth);</div><div class='del'>-		if (!ASSERT_NEQ(interface_id, 0, "non zero interface index"))</div><div class='del'>-			goto fail;</div><div class='del'>-		err = bpf_map_update_elem(map_fd, &amp;i, &amp;interface_id, BPF_ANY);</div><div class='del'>-		if (!ASSERT_OK(err, "configure interface redirection through map"))</div><div class='del'>-			goto fail;</div><div class='del'>-		if (attach_programs_to_veth_pair(skeletons, i))</div><div class='del'>-			goto fail;</div><div class='add'>+		SYS(fail, "ip link add %s type veth peer name %s netns %s",</div><div class='add'>+		    net_config-&gt;veth_cfg[i].local_veth, net_config-&gt;veth_cfg[i].remote_veth,</div><div class='add'>+		    net_config-&gt;veth_cfg[i].namespace);</div><div class='add'>+		SYS(fail, "ip link set dev %s up", net_config-&gt;veth_cfg[i].local_veth);</div><div class='add'>+		if (net_config-&gt;veth_cfg[i].remote_addr[0])</div><div class='add'>+			SYS(fail, "ip -n %s addr add %s/24 dev %s",</div><div class='add'>+			    net_config-&gt;veth_cfg[i].namespace,</div><div class='add'>+			    net_config-&gt;veth_cfg[i].remote_addr,</div><div class='add'>+			    net_config-&gt;veth_cfg[i].remote_veth);</div><div class='add'>+		SYS(fail, "ip -n %s link set dev %s up", net_config-&gt;veth_cfg[i].namespace,</div><div class='add'>+		    net_config-&gt;veth_cfg[i].remote_veth);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	close_netns(nstoken);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='add'>+	close_netns(nstoken);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cleanup_network(void)</div><div class='add'>+static void cleanup_network(struct net_configuration *net_config)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* Deleting namespaces is enough to automatically remove veth pairs as well</div><div class='del'>-	 */</div><div class='add'>+	SYS_NOFAIL("ip netns del %s", net_config-&gt;ns0_name);</div><div class='ctx'> 	for (i = 0; i &lt; VETH_PAIRS_COUNT; i++)</div><div class='del'>-		SYS_NOFAIL("ip netns del %s", config[i].namespace);</div><div class='add'>+		SYS_NOFAIL("ip netns del %s", net_config-&gt;veth_cfg[i].namespace);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int check_ping(struct skeletons *skeletons)</div><div class='add'>+#define VETH_REDIRECT_SKEL_NB	3</div><div class='add'>+static void xdp_veth_redirect(u32 flags)</div><div class='ctx'> {</div><div class='add'>+	struct prog_configuration ping_config[VETH_PAIRS_COUNT] = {</div><div class='add'>+		{</div><div class='add'>+			.local_name = "xdp_redirect_map_0",</div><div class='add'>+			.remote_name = "xdp_dummy_prog",</div><div class='add'>+			.local_flags = flags,</div><div class='add'>+			.remote_flags = flags,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.local_name = "xdp_redirect_map_1",</div><div class='add'>+			.remote_name = "xdp_tx",</div><div class='add'>+			.local_flags = flags,</div><div class='add'>+			.remote_flags = flags,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.local_name = "xdp_redirect_map_2",</div><div class='add'>+			.remote_name = "xdp_dummy_prog",</div><div class='add'>+			.local_flags = flags,</div><div class='add'>+			.remote_flags = flags,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+	struct bpf_object *bpf_objs[VETH_REDIRECT_SKEL_NB];</div><div class='add'>+	struct xdp_redirect_map *xdp_redirect_map;</div><div class='add'>+	struct net_configuration net_config;</div><div class='add'>+	struct nstoken *nstoken = NULL;</div><div class='add'>+	struct xdp_dummy *xdp_dummy;</div><div class='add'>+	struct xdp_tx *xdp_tx;</div><div class='add'>+	int map_fd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	xdp_dummy = xdp_dummy__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(xdp_dummy, "xdp_dummy__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	xdp_tx = xdp_tx__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(xdp_tx, "xdp_tx__open_and_load"))</div><div class='add'>+		goto destroy_xdp_dummy;</div><div class='add'>+</div><div class='add'>+	xdp_redirect_map = xdp_redirect_map__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(xdp_redirect_map, "xdp_redirect_map__open_and_load"))</div><div class='add'>+		goto destroy_xdp_tx;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(create_network(&amp;net_config), "create network"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	/* Then configure the redirect map and attach programs to interfaces */</div><div class='add'>+	map_fd = bpf_map__fd(xdp_redirect_map-&gt;maps.tx_port);</div><div class='add'>+	if (!ASSERT_OK_FD(map_fd, "open redirect map"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	bpf_objs[0] = xdp_dummy-&gt;obj;</div><div class='add'>+	bpf_objs[1] = xdp_tx-&gt;obj;</div><div class='add'>+	bpf_objs[2] = xdp_redirect_map-&gt;obj;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(net_config.ns0_name);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open NS0"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VETH_PAIRS_COUNT; i++) {</div><div class='add'>+		int next_veth = net_config.veth_cfg[i].next_veth;</div><div class='add'>+		int interface_id;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		interface_id = if_nametoindex(net_config.veth_cfg[next_veth].local_veth);</div><div class='add'>+		if (!ASSERT_NEQ(interface_id, 0, "non zero interface index"))</div><div class='add'>+			goto destroy_xdp_redirect_map;</div><div class='add'>+		err = bpf_map_update_elem(map_fd, &amp;i, &amp;interface_id, BPF_ANY);</div><div class='add'>+		if (!ASSERT_OK(err, "configure interface redirection through map"))</div><div class='add'>+			goto destroy_xdp_redirect_map;</div><div class='add'>+		if (attach_programs_to_veth_pair(bpf_objs, VETH_REDIRECT_SKEL_NB,</div><div class='add'>+						 &amp;net_config, ping_config, i))</div><div class='add'>+			goto destroy_xdp_redirect_map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Test: if all interfaces are properly configured, we must be able to ping</div><div class='ctx'> 	 * veth33 from veth11</div><div class='ctx'> 	 */</div><div class='del'>-	return SYS_NOFAIL("ip netns exec %s ping -c 1 -W 1 %s &gt; /dev/null",</div><div class='del'>-					  config[0].namespace, IP_DST);</div><div class='add'>+	ASSERT_OK(SYS_NOFAIL("ip netns exec %s ping -c 1 -W 1 %s &gt; /dev/null",</div><div class='add'>+			     net_config.veth_cfg[0].namespace, IP_DST), "ping");</div><div class='add'>+</div><div class='add'>+destroy_xdp_redirect_map:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	xdp_redirect_map__destroy(xdp_redirect_map);</div><div class='add'>+destroy_xdp_tx:</div><div class='add'>+	xdp_tx__destroy(xdp_tx);</div><div class='add'>+destroy_xdp_dummy:</div><div class='add'>+	xdp_dummy__destroy(xdp_dummy);</div><div class='add'>+</div><div class='add'>+	cleanup_network(&amp;net_config);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void test_xdp_veth_redirect(void)</div><div class='add'>+#define BROADCAST_REDIRECT_SKEL_NB	2</div><div class='add'>+static void xdp_veth_broadcast_redirect(u32 attach_flags, u64 redirect_flags)</div><div class='ctx'> {</div><div class='del'>-	struct skeletons skeletons = {};</div><div class='add'>+	struct prog_configuration prog_cfg[VETH_PAIRS_COUNT] = {</div><div class='add'>+		{</div><div class='add'>+			.local_name = "xdp_redirect_map_multi_prog",</div><div class='add'>+			.remote_name = "xdp_count_0",</div><div class='add'>+			.local_flags = attach_flags,</div><div class='add'>+			.remote_flags = attach_flags,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.local_name = "xdp_redirect_map_multi_prog",</div><div class='add'>+			.remote_name = "xdp_count_1",</div><div class='add'>+			.local_flags = attach_flags,</div><div class='add'>+			.remote_flags = attach_flags,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.local_name = "xdp_redirect_map_multi_prog",</div><div class='add'>+			.remote_name = "xdp_count_2",</div><div class='add'>+			.local_flags = attach_flags,</div><div class='add'>+			.remote_flags = attach_flags,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+	struct bpf_object *bpf_objs[BROADCAST_REDIRECT_SKEL_NB];</div><div class='add'>+	struct xdp_redirect_multi_kern *xdp_redirect_multi_kern;</div><div class='add'>+	struct xdp_redirect_map *xdp_redirect_map;</div><div class='add'>+	struct bpf_devmap_val devmap_val = {};</div><div class='add'>+	struct net_configuration net_config;</div><div class='add'>+	struct nstoken *nstoken = NULL;</div><div class='add'>+	u16 protocol = ETH_P_IP;</div><div class='add'>+	int group_map;</div><div class='add'>+	int flags_map;</div><div class='add'>+	int cnt_map;</div><div class='add'>+	u64 cnt = 0;</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='del'>-	skeletons.xdp_dummy = xdp_dummy__open_and_load();</div><div class='del'>-	if (!ASSERT_OK_PTR(skeletons.xdp_dummy, "xdp_dummy__open_and_load"))</div><div class='add'>+	xdp_redirect_multi_kern = xdp_redirect_multi_kern__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(xdp_redirect_multi_kern, "xdp_redirect_multi_kern__open_and_load"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	skeletons.xdp_tx = xdp_tx__open_and_load();</div><div class='del'>-	if (!ASSERT_OK_PTR(skeletons.xdp_tx, "xdp_tx__open_and_load"))</div><div class='add'>+	xdp_redirect_map = xdp_redirect_map__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(xdp_redirect_map, "xdp_redirect_map__open_and_load"))</div><div class='add'>+		goto destroy_xdp_redirect_multi_kern;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(create_network(&amp;net_config), "create network"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	group_map = bpf_map__fd(xdp_redirect_multi_kern-&gt;maps.map_all);</div><div class='add'>+	if (!ASSERT_OK_FD(group_map, "open map_all"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	flags_map = bpf_map__fd(xdp_redirect_multi_kern-&gt;maps.redirect_flags);</div><div class='add'>+	if (!ASSERT_OK_FD(group_map, "open map_all"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	err = bpf_map_update_elem(flags_map, &amp;protocol, &amp;redirect_flags, BPF_NOEXIST);</div><div class='add'>+	if (!ASSERT_OK(err, "init IP count"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	cnt_map = bpf_map__fd(xdp_redirect_map-&gt;maps.rxcnt);</div><div class='add'>+	if (!ASSERT_OK_FD(cnt_map, "open rxcnt map"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	bpf_objs[0] = xdp_redirect_multi_kern-&gt;obj;</div><div class='add'>+	bpf_objs[1] = xdp_redirect_map-&gt;obj;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(net_config.ns0_name);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open NS0"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VETH_PAIRS_COUNT; i++) {</div><div class='add'>+		int ifindex = if_nametoindex(net_config.veth_cfg[i].local_veth);</div><div class='add'>+</div><div class='add'>+		if (attach_programs_to_veth_pair(bpf_objs, BROADCAST_REDIRECT_SKEL_NB,</div><div class='add'>+						 &amp;net_config, prog_cfg, i))</div><div class='add'>+			goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+		SYS(destroy_xdp_redirect_map,</div><div class='add'>+		    "ip -n %s neigh add %s lladdr 00:00:00:00:00:01 dev %s",</div><div class='add'>+		    net_config.veth_cfg[i].namespace, IP_NEIGH, net_config.veth_cfg[i].remote_veth);</div><div class='add'>+</div><div class='add'>+		devmap_val.ifindex = ifindex;</div><div class='add'>+		err = bpf_map_update_elem(group_map, &amp;ifindex, &amp;devmap_val, 0);</div><div class='add'>+		if (!ASSERT_OK(err, "bpf_map_update_elem"))</div><div class='add'>+			goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SYS_NOFAIL("ip netns exec %s ping %s -i 0.1 -c 4 -W1 &gt; /dev/null ",</div><div class='add'>+		    net_config.veth_cfg[0].namespace, IP_NEIGH);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VETH_PAIRS_COUNT; i++) {</div><div class='add'>+		err =  bpf_map_lookup_elem(cnt_map, &amp;i, &amp;cnt);</div><div class='add'>+		if (!ASSERT_OK(err, "get IP cnt"))</div><div class='add'>+			goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+		if (redirect_flags &amp; BPF_F_EXCLUDE_INGRESS)</div><div class='add'>+			/* veth11 shouldn't receive the ICMP requests;</div><div class='add'>+			 * others should</div><div class='add'>+			 */</div><div class='add'>+			ASSERT_EQ(cnt, i ? 4 : 0, "compare IP cnt");</div><div class='add'>+		else</div><div class='add'>+			/* All remote veth should receive the ICMP requests */</div><div class='add'>+			ASSERT_EQ(cnt, 4, "compare IP cnt");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+destroy_xdp_redirect_map:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	xdp_redirect_map__destroy(xdp_redirect_map);</div><div class='add'>+destroy_xdp_redirect_multi_kern:</div><div class='add'>+	xdp_redirect_multi_kern__destroy(xdp_redirect_multi_kern);</div><div class='add'>+</div><div class='add'>+	cleanup_network(&amp;net_config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define VETH_EGRESS_SKEL_NB	3</div><div class='add'>+static void xdp_veth_egress(u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct prog_configuration prog_cfg[VETH_PAIRS_COUNT] = {</div><div class='add'>+		{</div><div class='add'>+			.local_name = "xdp_redirect_map_all_prog",</div><div class='add'>+			.remote_name = "xdp_dummy_prog",</div><div class='add'>+			.local_flags = flags,</div><div class='add'>+			.remote_flags = flags,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.local_name = "xdp_redirect_map_all_prog",</div><div class='add'>+			.remote_name = "store_mac_1",</div><div class='add'>+			.local_flags = flags,</div><div class='add'>+			.remote_flags = flags,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.local_name = "xdp_redirect_map_all_prog",</div><div class='add'>+			.remote_name = "store_mac_2",</div><div class='add'>+			.local_flags = flags,</div><div class='add'>+			.remote_flags = flags,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+	const char magic_mac[6] = { 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF};</div><div class='add'>+	struct xdp_redirect_multi_kern *xdp_redirect_multi_kern;</div><div class='add'>+	struct bpf_object *bpf_objs[VETH_EGRESS_SKEL_NB];</div><div class='add'>+	struct xdp_redirect_map *xdp_redirect_map;</div><div class='add'>+	struct bpf_devmap_val devmap_val = {};</div><div class='add'>+	struct net_configuration net_config;</div><div class='add'>+	int mac_map, egress_map, res_map;</div><div class='add'>+	struct nstoken *nstoken = NULL;</div><div class='add'>+	struct xdp_dummy *xdp_dummy;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	xdp_dummy = xdp_dummy__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(xdp_dummy, "xdp_dummy__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	xdp_redirect_multi_kern = xdp_redirect_multi_kern__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(xdp_redirect_multi_kern, "xdp_redirect_multi_kern__open_and_load"))</div><div class='ctx'> 		goto destroy_xdp_dummy;</div><div class='ctx'> </div><div class='del'>-	skeletons.xdp_redirect_maps = xdp_redirect_map__open_and_load();</div><div class='del'>-	if (!ASSERT_OK_PTR(skeletons.xdp_redirect_maps, "xdp_redirect_map__open_and_load"))</div><div class='del'>-		goto destroy_xdp_tx;</div><div class='add'>+	xdp_redirect_map = xdp_redirect_map__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(xdp_redirect_map, "xdp_redirect_map__open_and_load"))</div><div class='add'>+		goto destroy_xdp_redirect_multi_kern;</div><div class='ctx'> </div><div class='del'>-	if (configure_network(&amp;skeletons))</div><div class='add'>+	if (!ASSERT_OK(create_network(&amp;net_config), "create network"))</div><div class='ctx'> 		goto destroy_xdp_redirect_map;</div><div class='ctx'> </div><div class='del'>-	ASSERT_OK(check_ping(&amp;skeletons), "ping");</div><div class='add'>+	mac_map = bpf_map__fd(xdp_redirect_multi_kern-&gt;maps.mac_map);</div><div class='add'>+	if (!ASSERT_OK_FD(mac_map, "open mac_map"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	egress_map = bpf_map__fd(xdp_redirect_multi_kern-&gt;maps.map_egress);</div><div class='add'>+	if (!ASSERT_OK_FD(egress_map, "open map_egress"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	devmap_val.bpf_prog.fd = bpf_program__fd(xdp_redirect_multi_kern-&gt;progs.xdp_devmap_prog);</div><div class='add'>+</div><div class='add'>+	bpf_objs[0] = xdp_dummy-&gt;obj;</div><div class='add'>+	bpf_objs[1] = xdp_redirect_multi_kern-&gt;obj;</div><div class='add'>+	bpf_objs[2] = xdp_redirect_map-&gt;obj;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(net_config.ns0_name);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open NS0"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VETH_PAIRS_COUNT; i++) {</div><div class='add'>+		int ifindex = if_nametoindex(net_config.veth_cfg[i].local_veth);</div><div class='add'>+</div><div class='add'>+		SYS(destroy_xdp_redirect_map,</div><div class='add'>+		    "ip -n %s neigh add %s lladdr 00:00:00:00:00:01 dev %s",</div><div class='add'>+		    net_config.veth_cfg[i].namespace, IP_NEIGH, net_config.veth_cfg[i].remote_veth);</div><div class='add'>+</div><div class='add'>+		if (attach_programs_to_veth_pair(bpf_objs, VETH_REDIRECT_SKEL_NB,</div><div class='add'>+						 &amp;net_config, prog_cfg, i))</div><div class='add'>+			goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+		err = bpf_map_update_elem(mac_map, &amp;ifindex, magic_mac, 0);</div><div class='add'>+		if (!ASSERT_OK(err, "bpf_map_update_elem"))</div><div class='add'>+			goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+		devmap_val.ifindex = ifindex;</div><div class='add'>+		err = bpf_map_update_elem(egress_map, &amp;ifindex, &amp;devmap_val, 0);</div><div class='add'>+		if (!ASSERT_OK(err, "bpf_map_update_elem"))</div><div class='add'>+			goto destroy_xdp_redirect_map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SYS_NOFAIL("ip netns exec %s ping %s -i 0.1 -c 4 -W1 &gt; /dev/null ",</div><div class='add'>+		    net_config.veth_cfg[0].namespace, IP_NEIGH);</div><div class='add'>+</div><div class='add'>+	res_map = bpf_map__fd(xdp_redirect_map-&gt;maps.rx_mac);</div><div class='add'>+	if (!ASSERT_OK_FD(res_map, "open rx_map"))</div><div class='add'>+		goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		u32 key = i;</div><div class='add'>+		u64 res;</div><div class='add'>+</div><div class='add'>+		err = bpf_map_lookup_elem(res_map, &amp;key, &amp;res);</div><div class='add'>+		if (!ASSERT_OK(err, "get MAC res"))</div><div class='add'>+			goto destroy_xdp_redirect_map;</div><div class='add'>+</div><div class='add'>+		ASSERT_STRNEQ((const char *)&amp;res, magic_mac, ETH_ALEN, "compare mac");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> destroy_xdp_redirect_map:</div><div class='del'>-	xdp_redirect_map__destroy(skeletons.xdp_redirect_maps);</div><div class='del'>-destroy_xdp_tx:</div><div class='del'>-	xdp_tx__destroy(skeletons.xdp_tx);</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	xdp_redirect_map__destroy(xdp_redirect_map);</div><div class='add'>+destroy_xdp_redirect_multi_kern:</div><div class='add'>+	xdp_redirect_multi_kern__destroy(xdp_redirect_multi_kern);</div><div class='ctx'> destroy_xdp_dummy:</div><div class='del'>-	xdp_dummy__destroy(skeletons.xdp_dummy);</div><div class='add'>+	xdp_dummy__destroy(xdp_dummy);</div><div class='add'>+</div><div class='add'>+	cleanup_network(&amp;net_config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_xdp_veth_redirect(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("0"))</div><div class='add'>+		xdp_veth_redirect(0);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("DRV_MODE"))</div><div class='add'>+		xdp_veth_redirect(XDP_FLAGS_DRV_MODE);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("SKB_MODE"))</div><div class='add'>+		xdp_veth_redirect(XDP_FLAGS_SKB_MODE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_xdp_veth_broadcast_redirect(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("0/BROADCAST"))</div><div class='add'>+		xdp_veth_broadcast_redirect(0, BPF_F_BROADCAST);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("0/(BROADCAST | EXCLUDE_INGRESS)"))</div><div class='add'>+		xdp_veth_broadcast_redirect(0, BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("DRV_MODE/BROADCAST"))</div><div class='add'>+		xdp_veth_broadcast_redirect(XDP_FLAGS_DRV_MODE, BPF_F_BROADCAST);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("DRV_MODE/(BROADCAST | EXCLUDE_INGRESS)"))</div><div class='add'>+		xdp_veth_broadcast_redirect(XDP_FLAGS_DRV_MODE,</div><div class='add'>+					    BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("SKB_MODE/BROADCAST"))</div><div class='add'>+		xdp_veth_broadcast_redirect(XDP_FLAGS_SKB_MODE, BPF_F_BROADCAST);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("SKB_MODE/(BROADCAST | EXCLUDE_INGRESS)"))</div><div class='add'>+		xdp_veth_broadcast_redirect(XDP_FLAGS_SKB_MODE,</div><div class='add'>+					    BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_xdp_veth_egress(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("0/egress"))</div><div class='add'>+		xdp_veth_egress(0);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("DRV_MODE/egress"))</div><div class='add'>+		xdp_veth_egress(XDP_FLAGS_DRV_MODE);</div><div class='ctx'> </div><div class='del'>-	cleanup_network();</div><div class='add'>+	if (test__start_subtest("SKB_MODE/egress"))</div><div class='add'>+		xdp_veth_egress(XDP_FLAGS_SKB_MODE);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_xsk.c b/tools/testing/selftests/bpf/prog_tests/test_xsk.c<br/>new file mode 100644<br/>index 000000000000..5af28f359cfd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_xsk.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_xsk.c</a></div><div class='hunk'>@@ -0,0 +1,2596 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;bpf/bpf.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/if_link.h&gt;</div><div class='add'>+#include &lt;linux/mman.h&gt;</div><div class='add'>+#include &lt;linux/netdev.h&gt;</div><div class='add'>+#include &lt;poll.h&gt;</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include "network_helpers.h"</div><div class='add'>+#include "test_xsk.h"</div><div class='add'>+#include "xsk_xdp_common.h"</div><div class='add'>+#include "xsk_xdp_progs.skel.h"</div><div class='add'>+</div><div class='add'>+#define DEFAULT_BATCH_SIZE		64</div><div class='add'>+#define MIN_PKT_SIZE			64</div><div class='add'>+#define MAX_ETH_JUMBO_SIZE		9000</div><div class='add'>+#define MAX_INTERFACES			2</div><div class='add'>+#define MAX_TEARDOWN_ITER		10</div><div class='add'>+#define MAX_TX_BUDGET_DEFAULT		32</div><div class='add'>+#define PKT_DUMP_NB_TO_PRINT		16</div><div class='add'>+/* Just to align the data in the packet */</div><div class='add'>+#define PKT_HDR_SIZE			(sizeof(struct ethhdr) + 2)</div><div class='add'>+#define POLL_TMOUT			1000</div><div class='add'>+#define THREAD_TMOUT			3</div><div class='add'>+#define UMEM_HEADROOM_TEST_SIZE		128</div><div class='add'>+#define XSK_DESC__INVALID_OPTION	(0xffff)</div><div class='add'>+#define XSK_UMEM__INVALID_FRAME_SIZE	(MAX_ETH_JUMBO_SIZE + 1)</div><div class='add'>+#define XSK_UMEM__LARGE_FRAME_SIZE	(3 * 1024)</div><div class='add'>+#define XSK_UMEM__MAX_FRAME_SIZE	(4 * 1024)</div><div class='add'>+</div><div class='add'>+static const u8 g_mac[ETH_ALEN] = {0x55, 0x44, 0x33, 0x22, 0x11, 0x00};</div><div class='add'>+</div><div class='add'>+bool opt_verbose;</div><div class='add'>+pthread_barrier_t barr;</div><div class='add'>+pthread_mutex_t pacing_mutex = PTHREAD_MUTEX_INITIALIZER;</div><div class='add'>+</div><div class='add'>+int pkts_in_flight;</div><div class='add'>+</div><div class='add'>+/* The payload is a word consisting of a packet sequence number in the upper</div><div class='add'>+ * 16-bits and a intra packet data sequence number in the lower 16 bits. So the 3rd packet's</div><div class='add'>+ * 5th word of data will contain the number (2&lt;&lt;16) | 4 as they are numbered from 0.</div><div class='add'>+ */</div><div class='add'>+static void write_payload(void *dest, u32 pkt_nb, u32 start, u32 size)</div><div class='add'>+{</div><div class='add'>+	u32 *ptr = (u32 *)dest, i;</div><div class='add'>+</div><div class='add'>+	start /= sizeof(*ptr);</div><div class='add'>+	size /= sizeof(*ptr);</div><div class='add'>+	for (i = 0; i &lt; size; i++)</div><div class='add'>+		ptr[i] = htonl(pkt_nb &lt;&lt; 16 | (i + start));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gen_eth_hdr(struct xsk_socket_info *xsk, struct ethhdr *eth_hdr)</div><div class='add'>+{</div><div class='add'>+	memcpy(eth_hdr-&gt;h_dest, xsk-&gt;dst_mac, ETH_ALEN);</div><div class='add'>+	memcpy(eth_hdr-&gt;h_source, xsk-&gt;src_mac, ETH_ALEN);</div><div class='add'>+	eth_hdr-&gt;h_proto = htons(ETH_P_LOOPBACK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_umem_valid(struct ifobject *ifobj)</div><div class='add'>+{</div><div class='add'>+	return !!ifobj-&gt;umem-&gt;umem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 mode_to_xdp_flags(enum test_mode mode)</div><div class='add'>+{</div><div class='add'>+	return (mode == TEST_MODE_SKB) ? XDP_FLAGS_SKB_MODE : XDP_FLAGS_DRV_MODE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 umem_size(struct xsk_umem_info *umem)</div><div class='add'>+{</div><div class='add'>+	return umem-&gt;num_frames * umem-&gt;frame_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xsk_configure_umem(struct ifobject *ifobj, struct xsk_umem_info *umem, void *buffer,</div><div class='add'>+			      u64 size)</div><div class='add'>+{</div><div class='add'>+	struct xsk_umem_config cfg = {</div><div class='add'>+		.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,</div><div class='add'>+		.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,</div><div class='add'>+		.frame_size = umem-&gt;frame_size,</div><div class='add'>+		.frame_headroom = umem-&gt;frame_headroom,</div><div class='add'>+		.flags = XSK_UMEM__DEFAULT_FLAGS</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (umem-&gt;fill_size)</div><div class='add'>+		cfg.fill_size = umem-&gt;fill_size;</div><div class='add'>+</div><div class='add'>+	if (umem-&gt;comp_size)</div><div class='add'>+		cfg.comp_size = umem-&gt;comp_size;</div><div class='add'>+</div><div class='add'>+	if (umem-&gt;unaligned_mode)</div><div class='add'>+		cfg.flags |= XDP_UMEM_UNALIGNED_CHUNK_FLAG;</div><div class='add'>+</div><div class='add'>+	ret = xsk_umem__create(&amp;umem-&gt;umem, buffer, size,</div><div class='add'>+			       &amp;umem-&gt;fq, &amp;umem-&gt;cq, &amp;cfg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	umem-&gt;buffer = buffer;</div><div class='add'>+	if (ifobj-&gt;shared_umem &amp;&amp; ifobj-&gt;rx_on) {</div><div class='add'>+		umem-&gt;base_addr = umem_size(umem);</div><div class='add'>+		umem-&gt;next_buffer = umem_size(umem);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 umem_alloc_buffer(struct xsk_umem_info *umem)</div><div class='add'>+{</div><div class='add'>+	u64 addr;</div><div class='add'>+</div><div class='add'>+	addr = umem-&gt;next_buffer;</div><div class='add'>+	umem-&gt;next_buffer += umem-&gt;frame_size;</div><div class='add'>+	if (umem-&gt;next_buffer &gt;= umem-&gt;base_addr + umem_size(umem))</div><div class='add'>+		umem-&gt;next_buffer = umem-&gt;base_addr;</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void umem_reset_alloc(struct xsk_umem_info *umem)</div><div class='add'>+{</div><div class='add'>+	umem-&gt;next_buffer = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enable_busy_poll(struct xsk_socket_info *xsk)</div><div class='add'>+{</div><div class='add'>+	int sock_opt;</div><div class='add'>+</div><div class='add'>+	sock_opt = 1;</div><div class='add'>+	if (setsockopt(xsk_socket__fd(xsk-&gt;xsk), SOL_SOCKET, SO_PREFER_BUSY_POLL,</div><div class='add'>+		       (void *)&amp;sock_opt, sizeof(sock_opt)) &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	sock_opt = 20;</div><div class='add'>+	if (setsockopt(xsk_socket__fd(xsk-&gt;xsk), SOL_SOCKET, SO_BUSY_POLL,</div><div class='add'>+		       (void *)&amp;sock_opt, sizeof(sock_opt)) &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	sock_opt = xsk-&gt;batch_size;</div><div class='add'>+	if (setsockopt(xsk_socket__fd(xsk-&gt;xsk), SOL_SOCKET, SO_BUSY_POLL_BUDGET,</div><div class='add'>+		       (void *)&amp;sock_opt, sizeof(sock_opt)) &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xsk_configure_socket(struct xsk_socket_info *xsk, struct xsk_umem_info *umem,</div><div class='add'>+				  struct ifobject *ifobject, bool shared)</div><div class='add'>+{</div><div class='add'>+	struct xsk_socket_config cfg = {};</div><div class='add'>+	struct xsk_ring_cons *rxr;</div><div class='add'>+	struct xsk_ring_prod *txr;</div><div class='add'>+</div><div class='add'>+	xsk-&gt;umem = umem;</div><div class='add'>+	cfg.rx_size = xsk-&gt;rxqsize;</div><div class='add'>+	cfg.tx_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;</div><div class='add'>+	cfg.bind_flags = ifobject-&gt;bind_flags;</div><div class='add'>+	if (shared)</div><div class='add'>+		cfg.bind_flags |= XDP_SHARED_UMEM;</div><div class='add'>+	if (ifobject-&gt;mtu &gt; MAX_ETH_PKT_SIZE)</div><div class='add'>+		cfg.bind_flags |= XDP_USE_SG;</div><div class='add'>+	if (umem-&gt;comp_size)</div><div class='add'>+		cfg.tx_size = umem-&gt;comp_size;</div><div class='add'>+	if (umem-&gt;fill_size)</div><div class='add'>+		cfg.rx_size = umem-&gt;fill_size;</div><div class='add'>+</div><div class='add'>+	txr = ifobject-&gt;tx_on ? &amp;xsk-&gt;tx : NULL;</div><div class='add'>+	rxr = ifobject-&gt;rx_on ? &amp;xsk-&gt;rx : NULL;</div><div class='add'>+	return xsk_socket__create(&amp;xsk-&gt;xsk, ifobject-&gt;ifindex, 0, umem-&gt;umem, rxr, txr, &amp;cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_SKB_FRAGS_PATH "/proc/sys/net/core/max_skb_frags"</div><div class='add'>+static unsigned int get_max_skb_frags(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int max_skb_frags = 0;</div><div class='add'>+	FILE *file;</div><div class='add'>+</div><div class='add'>+	file = fopen(MAX_SKB_FRAGS_PATH, "r");</div><div class='add'>+	if (!file) {</div><div class='add'>+		ksft_print_msg("Error opening %s\n", MAX_SKB_FRAGS_PATH);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fscanf(file, "%u", &amp;max_skb_frags) != 1)</div><div class='add'>+		ksft_print_msg("Error reading %s\n", MAX_SKB_FRAGS_PATH);</div><div class='add'>+</div><div class='add'>+	fclose(file);</div><div class='add'>+	return max_skb_frags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_ring_size(struct ifobject *ifobj)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 ctr = 0;</div><div class='add'>+</div><div class='add'>+	while (ctr++ &lt; SOCK_RECONF_CTR) {</div><div class='add'>+		ret = set_hw_ring_size(ifobj-&gt;ifname, &amp;ifobj-&gt;ring);</div><div class='add'>+		if (!ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Retry if it fails */</div><div class='add'>+		if (ctr &gt;= SOCK_RECONF_CTR || errno != EBUSY)</div><div class='add'>+			return -errno;</div><div class='add'>+</div><div class='add'>+		usleep(USLEEP_MAX);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hw_ring_size_reset(struct ifobject *ifobj)</div><div class='add'>+{</div><div class='add'>+	ifobj-&gt;ring.tx_pending = ifobj-&gt;set_ring.default_tx;</div><div class='add'>+	ifobj-&gt;ring.rx_pending = ifobj-&gt;set_ring.default_rx;</div><div class='add'>+	return set_ring_size(ifobj);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __test_spec_init(struct test_spec *test, struct ifobject *ifobj_tx,</div><div class='add'>+			     struct ifobject *ifobj_rx)</div><div class='add'>+{</div><div class='add'>+	u32 i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_INTERFACES; i++) {</div><div class='add'>+		struct ifobject *ifobj = i ? ifobj_rx : ifobj_tx;</div><div class='add'>+</div><div class='add'>+		ifobj-&gt;xsk = &amp;ifobj-&gt;xsk_arr[0];</div><div class='add'>+		ifobj-&gt;use_poll = false;</div><div class='add'>+		ifobj-&gt;use_fill_ring = true;</div><div class='add'>+		ifobj-&gt;release_rx = true;</div><div class='add'>+		ifobj-&gt;validation_func = NULL;</div><div class='add'>+		ifobj-&gt;use_metadata = false;</div><div class='add'>+</div><div class='add'>+		if (i == 0) {</div><div class='add'>+			ifobj-&gt;rx_on = false;</div><div class='add'>+			ifobj-&gt;tx_on = true;</div><div class='add'>+		} else {</div><div class='add'>+			ifobj-&gt;rx_on = true;</div><div class='add'>+			ifobj-&gt;tx_on = false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memset(ifobj-&gt;umem, 0, sizeof(*ifobj-&gt;umem));</div><div class='add'>+		ifobj-&gt;umem-&gt;num_frames = DEFAULT_UMEM_BUFFERS;</div><div class='add'>+		ifobj-&gt;umem-&gt;frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; MAX_SOCKETS; j++) {</div><div class='add'>+			memset(&amp;ifobj-&gt;xsk_arr[j], 0, sizeof(ifobj-&gt;xsk_arr[j]));</div><div class='add'>+			ifobj-&gt;xsk_arr[j].rxqsize = XSK_RING_CONS__DEFAULT_NUM_DESCS;</div><div class='add'>+			ifobj-&gt;xsk_arr[j].batch_size = DEFAULT_BATCH_SIZE;</div><div class='add'>+			if (i == 0)</div><div class='add'>+				ifobj-&gt;xsk_arr[j].pkt_stream = test-&gt;tx_pkt_stream_default;</div><div class='add'>+			else</div><div class='add'>+				ifobj-&gt;xsk_arr[j].pkt_stream = test-&gt;rx_pkt_stream_default;</div><div class='add'>+</div><div class='add'>+			memcpy(ifobj-&gt;xsk_arr[j].src_mac, g_mac, ETH_ALEN);</div><div class='add'>+			memcpy(ifobj-&gt;xsk_arr[j].dst_mac, g_mac, ETH_ALEN);</div><div class='add'>+			ifobj-&gt;xsk_arr[j].src_mac[5] += ((j * 2) + 0);</div><div class='add'>+			ifobj-&gt;xsk_arr[j].dst_mac[5] += ((j * 2) + 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ifobj_tx-&gt;hw_ring_size_supp)</div><div class='add'>+		hw_ring_size_reset(ifobj_tx);</div><div class='add'>+</div><div class='add'>+	test-&gt;ifobj_tx = ifobj_tx;</div><div class='add'>+	test-&gt;ifobj_rx = ifobj_rx;</div><div class='add'>+	test-&gt;current_step = 0;</div><div class='add'>+	test-&gt;total_steps = 1;</div><div class='add'>+	test-&gt;nb_sockets = 1;</div><div class='add'>+	test-&gt;fail = false;</div><div class='add'>+	test-&gt;set_ring = false;</div><div class='add'>+	test-&gt;adjust_tail = false;</div><div class='add'>+	test-&gt;adjust_tail_support = false;</div><div class='add'>+	test-&gt;mtu = MAX_ETH_PKT_SIZE;</div><div class='add'>+	test-&gt;xdp_prog_rx = ifobj_rx-&gt;xdp_progs-&gt;progs.xsk_def_prog;</div><div class='add'>+	test-&gt;xskmap_rx = ifobj_rx-&gt;xdp_progs-&gt;maps.xsk;</div><div class='add'>+	test-&gt;xdp_prog_tx = ifobj_tx-&gt;xdp_progs-&gt;progs.xsk_def_prog;</div><div class='add'>+	test-&gt;xskmap_tx = ifobj_tx-&gt;xdp_progs-&gt;maps.xsk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_init(struct test_spec *test, struct ifobject *ifobj_tx,</div><div class='add'>+			   struct ifobject *ifobj_rx, enum test_mode mode,</div><div class='add'>+			   const struct test_spec *test_to_run)</div><div class='add'>+{</div><div class='add'>+	struct pkt_stream *tx_pkt_stream;</div><div class='add'>+	struct pkt_stream *rx_pkt_stream;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	tx_pkt_stream = test-&gt;tx_pkt_stream_default;</div><div class='add'>+	rx_pkt_stream = test-&gt;rx_pkt_stream_default;</div><div class='add'>+	memset(test, 0, sizeof(*test));</div><div class='add'>+	test-&gt;tx_pkt_stream_default = tx_pkt_stream;</div><div class='add'>+	test-&gt;rx_pkt_stream_default = rx_pkt_stream;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_INTERFACES; i++) {</div><div class='add'>+		struct ifobject *ifobj = i ? ifobj_rx : ifobj_tx;</div><div class='add'>+</div><div class='add'>+		ifobj-&gt;bind_flags = XDP_USE_NEED_WAKEUP;</div><div class='add'>+		if (mode == TEST_MODE_ZC)</div><div class='add'>+			ifobj-&gt;bind_flags |= XDP_ZEROCOPY;</div><div class='add'>+		else</div><div class='add'>+			ifobj-&gt;bind_flags |= XDP_COPY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(test-&gt;name, test_to_run-&gt;name, MAX_TEST_NAME_SIZE);</div><div class='add'>+	test-&gt;test_func = test_to_run-&gt;test_func;</div><div class='add'>+	test-&gt;mode = mode;</div><div class='add'>+	__test_spec_init(test, ifobj_tx, ifobj_rx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_spec_reset(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	__test_spec_init(test, test-&gt;ifobj_tx, test-&gt;ifobj_rx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_spec_set_xdp_prog(struct test_spec *test, struct bpf_program *xdp_prog_rx,</div><div class='add'>+				   struct bpf_program *xdp_prog_tx, struct bpf_map *xskmap_rx,</div><div class='add'>+				   struct bpf_map *xskmap_tx)</div><div class='add'>+{</div><div class='add'>+	test-&gt;xdp_prog_rx = xdp_prog_rx;</div><div class='add'>+	test-&gt;xdp_prog_tx = xdp_prog_tx;</div><div class='add'>+	test-&gt;xskmap_rx = xskmap_rx;</div><div class='add'>+	test-&gt;xskmap_tx = xskmap_tx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_spec_set_mtu(struct test_spec *test, int mtu)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (test-&gt;ifobj_rx-&gt;mtu != mtu) {</div><div class='add'>+		err = xsk_set_mtu(test-&gt;ifobj_rx-&gt;ifindex, mtu);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		test-&gt;ifobj_rx-&gt;mtu = mtu;</div><div class='add'>+	}</div><div class='add'>+	if (test-&gt;ifobj_tx-&gt;mtu != mtu) {</div><div class='add'>+		err = xsk_set_mtu(test-&gt;ifobj_tx-&gt;ifindex, mtu);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		test-&gt;ifobj_tx-&gt;mtu = mtu;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pkt_stream_reset(struct pkt_stream *pkt_stream)</div><div class='add'>+{</div><div class='add'>+	if (pkt_stream) {</div><div class='add'>+		pkt_stream-&gt;current_pkt_nb = 0;</div><div class='add'>+		pkt_stream-&gt;nb_rx_pkts = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pkt *pkt_stream_get_next_tx_pkt(struct pkt_stream *pkt_stream)</div><div class='add'>+{</div><div class='add'>+	if (pkt_stream-&gt;current_pkt_nb &gt;= pkt_stream-&gt;nb_pkts)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return &amp;pkt_stream-&gt;pkts[pkt_stream-&gt;current_pkt_nb++];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pkt *pkt_stream_get_next_rx_pkt(struct pkt_stream *pkt_stream, u32 *pkts_sent)</div><div class='add'>+{</div><div class='add'>+	while (pkt_stream-&gt;current_pkt_nb &lt; pkt_stream-&gt;nb_pkts) {</div><div class='add'>+		(*pkts_sent)++;</div><div class='add'>+		if (pkt_stream-&gt;pkts[pkt_stream-&gt;current_pkt_nb].valid)</div><div class='add'>+			return &amp;pkt_stream-&gt;pkts[pkt_stream-&gt;current_pkt_nb++];</div><div class='add'>+		pkt_stream-&gt;current_pkt_nb++;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pkt_stream_delete(struct pkt_stream *pkt_stream)</div><div class='add'>+{</div><div class='add'>+	free(pkt_stream-&gt;pkts);</div><div class='add'>+	free(pkt_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pkt_stream_restore_default(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct pkt_stream *tx_pkt_stream = test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream;</div><div class='add'>+	struct pkt_stream *rx_pkt_stream = test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream;</div><div class='add'>+</div><div class='add'>+	if (tx_pkt_stream != test-&gt;tx_pkt_stream_default) {</div><div class='add'>+		pkt_stream_delete(test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream);</div><div class='add'>+		test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream = test-&gt;tx_pkt_stream_default;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_pkt_stream != test-&gt;rx_pkt_stream_default) {</div><div class='add'>+		pkt_stream_delete(test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream);</div><div class='add'>+		test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream = test-&gt;rx_pkt_stream_default;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pkt_stream *__pkt_stream_alloc(u32 nb_pkts)</div><div class='add'>+{</div><div class='add'>+	struct pkt_stream *pkt_stream;</div><div class='add'>+</div><div class='add'>+	pkt_stream = calloc(1, sizeof(*pkt_stream));</div><div class='add'>+	if (!pkt_stream)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pkt_stream-&gt;pkts = calloc(nb_pkts, sizeof(*pkt_stream-&gt;pkts));</div><div class='add'>+	if (!pkt_stream-&gt;pkts) {</div><div class='add'>+		free(pkt_stream);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pkt_stream-&gt;nb_pkts = nb_pkts;</div><div class='add'>+	return pkt_stream;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 pkt_nb_frags(u32 frame_size, struct pkt_stream *pkt_stream, struct pkt *pkt)</div><div class='add'>+{</div><div class='add'>+	u32 nb_frags = 1, next_frag;</div><div class='add'>+</div><div class='add'>+	if (!pkt)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (!pkt_stream-&gt;verbatim) {</div><div class='add'>+		if (!pkt-&gt;valid || !pkt-&gt;len)</div><div class='add'>+			return 1;</div><div class='add'>+		return ceil_u32(pkt-&gt;len, frame_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Search for the end of the packet in verbatim mode */</div><div class='add'>+	if (!pkt_continues(pkt-&gt;options))</div><div class='add'>+		return nb_frags;</div><div class='add'>+</div><div class='add'>+	next_frag = pkt_stream-&gt;current_pkt_nb;</div><div class='add'>+	pkt++;</div><div class='add'>+	while (next_frag++ &lt; pkt_stream-&gt;nb_pkts) {</div><div class='add'>+		nb_frags++;</div><div class='add'>+		if (!pkt_continues(pkt-&gt;options) || !pkt-&gt;valid)</div><div class='add'>+			break;</div><div class='add'>+		pkt++;</div><div class='add'>+	}</div><div class='add'>+	return nb_frags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool set_pkt_valid(int offset, u32 len)</div><div class='add'>+{</div><div class='add'>+	return len &lt;= MAX_ETH_JUMBO_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pkt_set(struct pkt_stream *pkt_stream, struct pkt *pkt, int offset, u32 len)</div><div class='add'>+{</div><div class='add'>+	pkt-&gt;offset = offset;</div><div class='add'>+	pkt-&gt;len = len;</div><div class='add'>+	pkt-&gt;valid = set_pkt_valid(offset, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pkt_stream_pkt_set(struct pkt_stream *pkt_stream, struct pkt *pkt, int offset, u32 len)</div><div class='add'>+{</div><div class='add'>+	bool prev_pkt_valid = pkt-&gt;valid;</div><div class='add'>+</div><div class='add'>+	pkt_set(pkt_stream, pkt, offset, len);</div><div class='add'>+	pkt_stream-&gt;nb_valid_entries += pkt-&gt;valid - prev_pkt_valid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 pkt_get_buffer_len(struct xsk_umem_info *umem, u32 len)</div><div class='add'>+{</div><div class='add'>+	return ceil_u32(len, umem-&gt;frame_size) * umem-&gt;frame_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pkt_stream *__pkt_stream_generate(u32 nb_pkts, u32 pkt_len, u32 nb_start, u32 nb_off)</div><div class='add'>+{</div><div class='add'>+	struct pkt_stream *pkt_stream;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	pkt_stream = __pkt_stream_alloc(nb_pkts);</div><div class='add'>+	if (!pkt_stream)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pkt_stream-&gt;nb_pkts = nb_pkts;</div><div class='add'>+	pkt_stream-&gt;max_pkt_len = pkt_len;</div><div class='add'>+	for (i = 0; i &lt; nb_pkts; i++) {</div><div class='add'>+		struct pkt *pkt = &amp;pkt_stream-&gt;pkts[i];</div><div class='add'>+</div><div class='add'>+		pkt_stream_pkt_set(pkt_stream, pkt, 0, pkt_len);</div><div class='add'>+		pkt-&gt;pkt_nb = nb_start + i * nb_off;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pkt_stream;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pkt_stream *pkt_stream_generate(u32 nb_pkts, u32 pkt_len)</div><div class='add'>+{</div><div class='add'>+	return __pkt_stream_generate(nb_pkts, pkt_len, 0, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pkt_stream *pkt_stream_clone(struct pkt_stream *pkt_stream)</div><div class='add'>+{</div><div class='add'>+	return pkt_stream_generate(pkt_stream-&gt;nb_pkts, pkt_stream-&gt;pkts[0].len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pkt_stream_replace_ifobject(struct ifobject *ifobj, u32 nb_pkts, u32 pkt_len)</div><div class='add'>+{</div><div class='add'>+	ifobj-&gt;xsk-&gt;pkt_stream = pkt_stream_generate(nb_pkts, pkt_len);</div><div class='add'>+</div><div class='add'>+	if (!ifobj-&gt;xsk-&gt;pkt_stream)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pkt_stream_replace(struct test_spec *test, u32 nb_pkts, u32 pkt_len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pkt_stream_replace_ifobject(test-&gt;ifobj_tx, nb_pkts, pkt_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return pkt_stream_replace_ifobject(test-&gt;ifobj_rx, nb_pkts, pkt_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __pkt_stream_replace_half(struct ifobject *ifobj, u32 pkt_len,</div><div class='add'>+				      int offset)</div><div class='add'>+{</div><div class='add'>+	struct pkt_stream *pkt_stream;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	pkt_stream = pkt_stream_clone(ifobj-&gt;xsk-&gt;pkt_stream);</div><div class='add'>+	if (!pkt_stream)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; ifobj-&gt;xsk-&gt;pkt_stream-&gt;nb_pkts; i += 2)</div><div class='add'>+		pkt_stream_pkt_set(pkt_stream, &amp;pkt_stream-&gt;pkts[i], offset, pkt_len);</div><div class='add'>+</div><div class='add'>+	ifobj-&gt;xsk-&gt;pkt_stream = pkt_stream;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pkt_stream_replace_half(struct test_spec *test, u32 pkt_len, int offset)</div><div class='add'>+{</div><div class='add'>+	int ret = __pkt_stream_replace_half(test-&gt;ifobj_tx, pkt_len, offset);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return __pkt_stream_replace_half(test-&gt;ifobj_rx, pkt_len, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pkt_stream_receive_half(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct pkt_stream *pkt_stream = test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream != test-&gt;rx_pkt_stream_default)</div><div class='add'>+		/* Packet stream has already been replaced so we have to release this one.</div><div class='add'>+		 * The newly created one will be freed by the restore_default() at the</div><div class='add'>+		 * end of the test</div><div class='add'>+		 */</div><div class='add'>+		pkt_stream_delete(test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream);</div><div class='add'>+</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream = pkt_stream_generate(pkt_stream-&gt;nb_pkts,</div><div class='add'>+							      pkt_stream-&gt;pkts[0].len);</div><div class='add'>+	if (!test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pkt_stream = test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream;</div><div class='add'>+	for (i = 1; i &lt; pkt_stream-&gt;nb_pkts; i += 2)</div><div class='add'>+		pkt_stream-&gt;pkts[i].valid = false;</div><div class='add'>+</div><div class='add'>+	pkt_stream-&gt;nb_valid_entries /= 2;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pkt_stream_even_odd_sequence(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct pkt_stream *pkt_stream;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; test-&gt;nb_sockets; i++) {</div><div class='add'>+		pkt_stream = test-&gt;ifobj_tx-&gt;xsk_arr[i].pkt_stream;</div><div class='add'>+		pkt_stream = __pkt_stream_generate(pkt_stream-&gt;nb_pkts / 2,</div><div class='add'>+						   pkt_stream-&gt;pkts[0].len, i, 2);</div><div class='add'>+		if (!pkt_stream)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		test-&gt;ifobj_tx-&gt;xsk_arr[i].pkt_stream = pkt_stream;</div><div class='add'>+</div><div class='add'>+		pkt_stream = test-&gt;ifobj_rx-&gt;xsk_arr[i].pkt_stream;</div><div class='add'>+		pkt_stream = __pkt_stream_generate(pkt_stream-&gt;nb_pkts / 2,</div><div class='add'>+						   pkt_stream-&gt;pkts[0].len, i, 2);</div><div class='add'>+		if (!pkt_stream)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		test-&gt;ifobj_rx-&gt;xsk_arr[i].pkt_stream = pkt_stream;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void release_even_odd_sequence(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct pkt_stream *later_free_tx = test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream;</div><div class='add'>+	struct pkt_stream *later_free_rx = test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; test-&gt;nb_sockets; i++) {</div><div class='add'>+		/* later_free_{rx/tx} will be freed by restore_default() */</div><div class='add'>+		if (test-&gt;ifobj_tx-&gt;xsk_arr[i].pkt_stream != later_free_tx)</div><div class='add'>+			pkt_stream_delete(test-&gt;ifobj_tx-&gt;xsk_arr[i].pkt_stream);</div><div class='add'>+		if (test-&gt;ifobj_rx-&gt;xsk_arr[i].pkt_stream != later_free_rx)</div><div class='add'>+			pkt_stream_delete(test-&gt;ifobj_rx-&gt;xsk_arr[i].pkt_stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 pkt_get_addr(struct pkt *pkt, struct xsk_umem_info *umem)</div><div class='add'>+{</div><div class='add'>+	if (!pkt-&gt;valid)</div><div class='add'>+		return pkt-&gt;offset;</div><div class='add'>+	return pkt-&gt;offset + umem_alloc_buffer(umem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pkt_stream_cancel(struct pkt_stream *pkt_stream)</div><div class='add'>+{</div><div class='add'>+	pkt_stream-&gt;current_pkt_nb--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pkt_generate(struct xsk_socket_info *xsk, struct xsk_umem_info *umem, u64 addr, u32 len,</div><div class='add'>+			 u32 pkt_nb, u32 bytes_written)</div><div class='add'>+{</div><div class='add'>+	void *data = xsk_umem__get_data(umem-&gt;buffer, addr);</div><div class='add'>+</div><div class='add'>+	if (len &lt; MIN_PKT_SIZE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!bytes_written) {</div><div class='add'>+		gen_eth_hdr(xsk, data);</div><div class='add'>+</div><div class='add'>+		len -= PKT_HDR_SIZE;</div><div class='add'>+		data += PKT_HDR_SIZE;</div><div class='add'>+	} else {</div><div class='add'>+		bytes_written -= PKT_HDR_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	write_payload(data, pkt_nb, bytes_written, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pkt_stream *__pkt_stream_generate_custom(struct ifobject *ifobj, struct pkt *frames,</div><div class='add'>+						       u32 nb_frames, bool verbatim)</div><div class='add'>+{</div><div class='add'>+	u32 i, len = 0, pkt_nb = 0, payload = 0;</div><div class='add'>+	struct pkt_stream *pkt_stream;</div><div class='add'>+</div><div class='add'>+	pkt_stream = __pkt_stream_alloc(nb_frames);</div><div class='add'>+	if (!pkt_stream)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nb_frames; i++) {</div><div class='add'>+		struct pkt *pkt = &amp;pkt_stream-&gt;pkts[pkt_nb];</div><div class='add'>+		struct pkt *frame = &amp;frames[i];</div><div class='add'>+</div><div class='add'>+		pkt-&gt;offset = frame-&gt;offset;</div><div class='add'>+		if (verbatim) {</div><div class='add'>+			*pkt = *frame;</div><div class='add'>+			pkt-&gt;pkt_nb = payload;</div><div class='add'>+			if (!frame-&gt;valid || !pkt_continues(frame-&gt;options))</div><div class='add'>+				payload++;</div><div class='add'>+		} else {</div><div class='add'>+			if (frame-&gt;valid)</div><div class='add'>+				len += frame-&gt;len;</div><div class='add'>+			if (frame-&gt;valid &amp;&amp; pkt_continues(frame-&gt;options))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			pkt-&gt;pkt_nb = pkt_nb;</div><div class='add'>+			pkt-&gt;len = len;</div><div class='add'>+			pkt-&gt;valid = frame-&gt;valid;</div><div class='add'>+			pkt-&gt;options = 0;</div><div class='add'>+</div><div class='add'>+			len = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		print_verbose("offset: %d len: %u valid: %u options: %u pkt_nb: %u\n",</div><div class='add'>+			      pkt-&gt;offset, pkt-&gt;len, pkt-&gt;valid, pkt-&gt;options, pkt-&gt;pkt_nb);</div><div class='add'>+</div><div class='add'>+		if (pkt-&gt;valid &amp;&amp; pkt-&gt;len &gt; pkt_stream-&gt;max_pkt_len)</div><div class='add'>+			pkt_stream-&gt;max_pkt_len = pkt-&gt;len;</div><div class='add'>+</div><div class='add'>+		if (pkt-&gt;valid)</div><div class='add'>+			pkt_stream-&gt;nb_valid_entries++;</div><div class='add'>+</div><div class='add'>+		pkt_nb++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pkt_stream-&gt;nb_pkts = pkt_nb;</div><div class='add'>+	pkt_stream-&gt;verbatim = verbatim;</div><div class='add'>+	return pkt_stream;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pkt_stream_generate_custom(struct test_spec *test, struct pkt *pkts, u32 nb_pkts)</div><div class='add'>+{</div><div class='add'>+	struct pkt_stream *pkt_stream;</div><div class='add'>+</div><div class='add'>+	pkt_stream = __pkt_stream_generate_custom(test-&gt;ifobj_tx, pkts, nb_pkts, true);</div><div class='add'>+	if (!pkt_stream)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream = pkt_stream;</div><div class='add'>+</div><div class='add'>+	pkt_stream = __pkt_stream_generate_custom(test-&gt;ifobj_rx, pkts, nb_pkts, false);</div><div class='add'>+	if (!pkt_stream)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream = pkt_stream;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pkt_print_data(u32 *data, u32 cnt)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cnt; i++) {</div><div class='add'>+		u32 seqnum, pkt_nb;</div><div class='add'>+</div><div class='add'>+		seqnum = ntohl(*data) &amp; 0xffff;</div><div class='add'>+		pkt_nb = ntohl(*data) &gt;&gt; 16;</div><div class='add'>+		ksft_print_msg("%u:%u ", pkt_nb, seqnum);</div><div class='add'>+		data++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pkt_dump(void *pkt, u32 len, bool eth_header)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *ethhdr = pkt;</div><div class='add'>+	u32 i, *data;</div><div class='add'>+</div><div class='add'>+	if (eth_header) {</div><div class='add'>+		/*extract L2 frame */</div><div class='add'>+		ksft_print_msg("DEBUG&gt;&gt; L2: dst mac: ");</div><div class='add'>+		for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+			ksft_print_msg("%02X", ethhdr-&gt;h_dest[i]);</div><div class='add'>+</div><div class='add'>+		ksft_print_msg("\nDEBUG&gt;&gt; L2: src mac: ");</div><div class='add'>+		for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+			ksft_print_msg("%02X", ethhdr-&gt;h_source[i]);</div><div class='add'>+</div><div class='add'>+		data = pkt + PKT_HDR_SIZE;</div><div class='add'>+	} else {</div><div class='add'>+		data = pkt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*extract L5 frame */</div><div class='add'>+	ksft_print_msg("\nDEBUG&gt;&gt; L5: seqnum: ");</div><div class='add'>+	pkt_print_data(data, PKT_DUMP_NB_TO_PRINT);</div><div class='add'>+	ksft_print_msg("....");</div><div class='add'>+	if (len &gt; PKT_DUMP_NB_TO_PRINT * sizeof(u32)) {</div><div class='add'>+		ksft_print_msg("\n.... ");</div><div class='add'>+		pkt_print_data(data + len / sizeof(u32) - PKT_DUMP_NB_TO_PRINT,</div><div class='add'>+			       PKT_DUMP_NB_TO_PRINT);</div><div class='add'>+	}</div><div class='add'>+	ksft_print_msg("\n---------------------------------------\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_offset_correct(struct xsk_umem_info *umem, struct pkt *pkt, u64 addr)</div><div class='add'>+{</div><div class='add'>+	u32 headroom = umem-&gt;unaligned_mode ? 0 : umem-&gt;frame_headroom;</div><div class='add'>+	u32 offset = addr % umem-&gt;frame_size, expected_offset;</div><div class='add'>+	int pkt_offset = pkt-&gt;valid ? pkt-&gt;offset : 0;</div><div class='add'>+</div><div class='add'>+	if (!umem-&gt;unaligned_mode)</div><div class='add'>+		pkt_offset = 0;</div><div class='add'>+</div><div class='add'>+	expected_offset = (pkt_offset + headroom + XDP_PACKET_HEADROOM) % umem-&gt;frame_size;</div><div class='add'>+</div><div class='add'>+	if (offset == expected_offset)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[%s] expected [%u], got [%u]\n", __func__, expected_offset, offset);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_metadata_correct(struct pkt *pkt, void *buffer, u64 addr)</div><div class='add'>+{</div><div class='add'>+	void *data = xsk_umem__get_data(buffer, addr);</div><div class='add'>+	struct xdp_info *meta = data - sizeof(struct xdp_info);</div><div class='add'>+</div><div class='add'>+	if (meta-&gt;count != pkt-&gt;pkt_nb) {</div><div class='add'>+		ksft_print_msg("[%s] expected meta_count [%d], got meta_count [%llu]\n",</div><div class='add'>+			       __func__, pkt-&gt;pkt_nb,</div><div class='add'>+			       (unsigned long long)meta-&gt;count);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_adjust_tail_supported(struct xsk_xdp_progs *skel_rx, bool *supported)</div><div class='add'>+{</div><div class='add'>+	struct bpf_map *data_map;</div><div class='add'>+	int adjust_value = 0;</div><div class='add'>+	int key = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	data_map = bpf_object__find_map_by_name(skel_rx-&gt;obj, "xsk_xdp_.bss");</div><div class='add'>+	if (!data_map || !bpf_map__is_internal(data_map)) {</div><div class='add'>+		ksft_print_msg("Error: could not find bss section of XDP program\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = bpf_map_lookup_elem(bpf_map__fd(data_map), &amp;key, &amp;adjust_value);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ksft_print_msg("Error: bpf_map_lookup_elem failed with error %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the 'adjust_value' variable to -EOPNOTSUPP in the XDP program if the adjust_tail</div><div class='add'>+	 * helper is not supported. Skip the adjust_tail test case in this scenario.</div><div class='add'>+	 */</div><div class='add'>+	*supported = adjust_value != -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_frag_valid(struct xsk_umem_info *umem, u64 addr, u32 len, u32 expected_pkt_nb,</div><div class='add'>+			  u32 bytes_processed)</div><div class='add'>+{</div><div class='add'>+	u32 seqnum, pkt_nb, *pkt_data, words_to_end, expected_seqnum;</div><div class='add'>+	void *data = xsk_umem__get_data(umem-&gt;buffer, addr);</div><div class='add'>+</div><div class='add'>+	addr -= umem-&gt;base_addr;</div><div class='add'>+</div><div class='add'>+	if (addr &gt;= umem-&gt;num_frames * umem-&gt;frame_size ||</div><div class='add'>+	    addr + len &gt; umem-&gt;num_frames * umem-&gt;frame_size) {</div><div class='add'>+		ksft_print_msg("Frag invalid addr: %llx len: %u\n",</div><div class='add'>+			       (unsigned long long)addr, len);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (!umem-&gt;unaligned_mode &amp;&amp; addr % umem-&gt;frame_size + len &gt; umem-&gt;frame_size) {</div><div class='add'>+		ksft_print_msg("Frag crosses frame boundary addr: %llx len: %u\n",</div><div class='add'>+			       (unsigned long long)addr, len);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pkt_data = data;</div><div class='add'>+	if (!bytes_processed) {</div><div class='add'>+		pkt_data += PKT_HDR_SIZE / sizeof(*pkt_data);</div><div class='add'>+		len -= PKT_HDR_SIZE;</div><div class='add'>+	} else {</div><div class='add'>+		bytes_processed -= PKT_HDR_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	expected_seqnum = bytes_processed / sizeof(*pkt_data);</div><div class='add'>+	seqnum = ntohl(*pkt_data) &amp; 0xffff;</div><div class='add'>+	pkt_nb = ntohl(*pkt_data) &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+	if (expected_pkt_nb != pkt_nb) {</div><div class='add'>+		ksft_print_msg("[%s] expected pkt_nb [%u], got pkt_nb [%u]\n",</div><div class='add'>+			       __func__, expected_pkt_nb, pkt_nb);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	if (expected_seqnum != seqnum) {</div><div class='add'>+		ksft_print_msg("[%s] expected seqnum at start [%u], got seqnum [%u]\n",</div><div class='add'>+			       __func__, expected_seqnum, seqnum);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	words_to_end = len / sizeof(*pkt_data) - 1;</div><div class='add'>+	pkt_data += words_to_end;</div><div class='add'>+	seqnum = ntohl(*pkt_data) &amp; 0xffff;</div><div class='add'>+	expected_seqnum += words_to_end;</div><div class='add'>+	if (expected_seqnum != seqnum) {</div><div class='add'>+		ksft_print_msg("[%s] expected seqnum at end [%u], got seqnum [%u]\n",</div><div class='add'>+			       __func__, expected_seqnum, seqnum);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	pkt_dump(data, len, !bytes_processed);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_pkt_valid(struct pkt *pkt, void *buffer, u64 addr, u32 len)</div><div class='add'>+{</div><div class='add'>+	if (pkt-&gt;len != len) {</div><div class='add'>+		ksft_print_msg("[%s] expected packet length [%d], got length [%d]\n",</div><div class='add'>+			       __func__, pkt-&gt;len, len);</div><div class='add'>+		pkt_dump(xsk_umem__get_data(buffer, addr), len, true);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 load_value(u32 *counter)</div><div class='add'>+{</div><div class='add'>+	return __atomic_load_n(counter, __ATOMIC_ACQUIRE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool kick_tx_with_check(struct xsk_socket_info *xsk, int *ret)</div><div class='add'>+{</div><div class='add'>+	u32 max_budget = MAX_TX_BUDGET_DEFAULT;</div><div class='add'>+	u32 cons, ready_to_send;</div><div class='add'>+	int delta;</div><div class='add'>+</div><div class='add'>+	cons = load_value(xsk-&gt;tx.consumer);</div><div class='add'>+	ready_to_send = load_value(xsk-&gt;tx.producer) - cons;</div><div class='add'>+	*ret = sendto(xsk_socket__fd(xsk-&gt;xsk), NULL, 0, MSG_DONTWAIT, NULL, 0);</div><div class='add'>+</div><div class='add'>+	delta = load_value(xsk-&gt;tx.consumer) - cons;</div><div class='add'>+	/* By default, xsk should consume exact @max_budget descs at one</div><div class='add'>+	 * send in this case where hitting the max budget limit in while</div><div class='add'>+	 * loop is triggered in __xsk_generic_xmit(). Please make sure that</div><div class='add'>+	 * the number of descs to be sent is larger than @max_budget, or</div><div class='add'>+	 * else the tx.consumer will be updated in xskq_cons_peek_desc()</div><div class='add'>+	 * in time which hides the issue we try to verify.</div><div class='add'>+	 */</div><div class='add'>+	if (ready_to_send &gt; max_budget &amp;&amp; delta != max_budget)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kick_tx(struct xsk_socket_info *xsk)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (xsk-&gt;check_consumer) {</div><div class='add'>+		if (!kick_tx_with_check(xsk, &amp;ret))</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+	} else {</div><div class='add'>+		ret = sendto(xsk_socket__fd(xsk-&gt;xsk), NULL, 0, MSG_DONTWAIT, NULL, 0);</div><div class='add'>+	}</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		return TEST_PASS;</div><div class='add'>+	if (errno == ENOBUFS || errno == EAGAIN || errno == EBUSY || errno == ENETDOWN) {</div><div class='add'>+		usleep(100);</div><div class='add'>+		return TEST_PASS;</div><div class='add'>+	}</div><div class='add'>+	return TEST_FAILURE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int kick_rx(struct xsk_socket_info *xsk)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = recvfrom(xsk_socket__fd(xsk-&gt;xsk), NULL, 0, MSG_DONTWAIT, NULL, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	return TEST_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int complete_pkts(struct xsk_socket_info *xsk, int batch_size)</div><div class='add'>+{</div><div class='add'>+	unsigned int rcvd;</div><div class='add'>+	u32 idx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (xsk_ring_prod__needs_wakeup(&amp;xsk-&gt;tx)) {</div><div class='add'>+		ret = kick_tx(xsk);</div><div class='add'>+		if (ret)</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcvd = xsk_ring_cons__peek(&amp;xsk-&gt;umem-&gt;cq, batch_size, &amp;idx);</div><div class='add'>+	if (rcvd) {</div><div class='add'>+		if (rcvd &gt; xsk-&gt;outstanding_tx) {</div><div class='add'>+			u64 addr = *xsk_ring_cons__comp_addr(&amp;xsk-&gt;umem-&gt;cq, idx + rcvd - 1);</div><div class='add'>+</div><div class='add'>+			ksft_print_msg("[%s] Too many packets completed\n", __func__);</div><div class='add'>+			ksft_print_msg("Last completion address: %llx\n",</div><div class='add'>+				       (unsigned long long)addr);</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		xsk_ring_cons__release(&amp;xsk-&gt;umem-&gt;cq, rcvd);</div><div class='add'>+		xsk-&gt;outstanding_tx -= rcvd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TEST_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __receive_pkts(struct test_spec *test, struct xsk_socket_info *xsk)</div><div class='add'>+{</div><div class='add'>+	u32 frags_processed = 0, nb_frags = 0, pkt_len = 0;</div><div class='add'>+	u32 idx_rx = 0, idx_fq = 0, rcvd, pkts_sent = 0;</div><div class='add'>+	struct pkt_stream *pkt_stream = xsk-&gt;pkt_stream;</div><div class='add'>+	struct ifobject *ifobj = test-&gt;ifobj_rx;</div><div class='add'>+	struct xsk_umem_info *umem = xsk-&gt;umem;</div><div class='add'>+	struct pollfd fds = { };</div><div class='add'>+	struct pkt *pkt;</div><div class='add'>+	u64 first_addr = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	fds.fd = xsk_socket__fd(xsk-&gt;xsk);</div><div class='add'>+	fds.events = POLLIN;</div><div class='add'>+</div><div class='add'>+	ret = kick_rx(xsk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	if (ifobj-&gt;use_poll) {</div><div class='add'>+		ret = poll(&amp;fds, 1, POLL_TMOUT);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+		if (!ret) {</div><div class='add'>+			if (!is_umem_valid(test-&gt;ifobj_tx))</div><div class='add'>+				return TEST_PASS;</div><div class='add'>+</div><div class='add'>+			ksft_print_msg("ERROR: [%s] Poll timed out\n", __func__);</div><div class='add'>+			return TEST_CONTINUE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(fds.revents &amp; POLLIN))</div><div class='add'>+			return TEST_CONTINUE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcvd = xsk_ring_cons__peek(&amp;xsk-&gt;rx, xsk-&gt;batch_size, &amp;idx_rx);</div><div class='add'>+	if (!rcvd)</div><div class='add'>+		return TEST_CONTINUE;</div><div class='add'>+</div><div class='add'>+	if (ifobj-&gt;use_fill_ring) {</div><div class='add'>+		ret = xsk_ring_prod__reserve(&amp;umem-&gt;fq, rcvd, &amp;idx_fq);</div><div class='add'>+		while (ret != rcvd) {</div><div class='add'>+			if (xsk_ring_prod__needs_wakeup(&amp;umem-&gt;fq)) {</div><div class='add'>+				ret = poll(&amp;fds, 1, POLL_TMOUT);</div><div class='add'>+				if (ret &lt; 0)</div><div class='add'>+					return TEST_FAILURE;</div><div class='add'>+			}</div><div class='add'>+			ret = xsk_ring_prod__reserve(&amp;umem-&gt;fq, rcvd, &amp;idx_fq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (frags_processed &lt; rcvd) {</div><div class='add'>+		const struct xdp_desc *desc = xsk_ring_cons__rx_desc(&amp;xsk-&gt;rx, idx_rx++);</div><div class='add'>+		u64 addr = desc-&gt;addr, orig;</div><div class='add'>+</div><div class='add'>+		orig = xsk_umem__extract_addr(addr);</div><div class='add'>+		addr = xsk_umem__add_offset_to_addr(addr);</div><div class='add'>+</div><div class='add'>+		if (!nb_frags) {</div><div class='add'>+			pkt = pkt_stream_get_next_rx_pkt(pkt_stream, &amp;pkts_sent);</div><div class='add'>+			if (!pkt) {</div><div class='add'>+				ksft_print_msg("[%s] received too many packets addr: %lx len %u\n",</div><div class='add'>+					       __func__, addr, desc-&gt;len);</div><div class='add'>+				return TEST_FAILURE;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		print_verbose("Rx: addr: %lx len: %u options: %u pkt_nb: %u valid: %u\n",</div><div class='add'>+			      addr, desc-&gt;len, desc-&gt;options, pkt-&gt;pkt_nb, pkt-&gt;valid);</div><div class='add'>+</div><div class='add'>+		if (!is_frag_valid(umem, addr, desc-&gt;len, pkt-&gt;pkt_nb, pkt_len) ||</div><div class='add'>+		    !is_offset_correct(umem, pkt, addr) || (ifobj-&gt;use_metadata &amp;&amp;</div><div class='add'>+		    !is_metadata_correct(pkt, umem-&gt;buffer, addr)))</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+		if (!nb_frags++)</div><div class='add'>+			first_addr = addr;</div><div class='add'>+		frags_processed++;</div><div class='add'>+		pkt_len += desc-&gt;len;</div><div class='add'>+		if (ifobj-&gt;use_fill_ring)</div><div class='add'>+			*xsk_ring_prod__fill_addr(&amp;umem-&gt;fq, idx_fq++) = orig;</div><div class='add'>+</div><div class='add'>+		if (pkt_continues(desc-&gt;options))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* The complete packet has been received */</div><div class='add'>+		if (!is_pkt_valid(pkt, umem-&gt;buffer, first_addr, pkt_len) ||</div><div class='add'>+		    !is_offset_correct(umem, pkt, addr))</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+		pkt_stream-&gt;nb_rx_pkts++;</div><div class='add'>+		nb_frags = 0;</div><div class='add'>+		pkt_len = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nb_frags) {</div><div class='add'>+		/* In the middle of a packet. Start over from beginning of packet. */</div><div class='add'>+		idx_rx -= nb_frags;</div><div class='add'>+		xsk_ring_cons__cancel(&amp;xsk-&gt;rx, nb_frags);</div><div class='add'>+		if (ifobj-&gt;use_fill_ring) {</div><div class='add'>+			idx_fq -= nb_frags;</div><div class='add'>+			xsk_ring_prod__cancel(&amp;umem-&gt;fq, nb_frags);</div><div class='add'>+		}</div><div class='add'>+		frags_processed -= nb_frags;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ifobj-&gt;use_fill_ring)</div><div class='add'>+		xsk_ring_prod__submit(&amp;umem-&gt;fq, frags_processed);</div><div class='add'>+	if (ifobj-&gt;release_rx)</div><div class='add'>+		xsk_ring_cons__release(&amp;xsk-&gt;rx, frags_processed);</div><div class='add'>+</div><div class='add'>+	pthread_mutex_lock(&amp;pacing_mutex);</div><div class='add'>+	pkts_in_flight -= pkts_sent;</div><div class='add'>+	pthread_mutex_unlock(&amp;pacing_mutex);</div><div class='add'>+	pkts_sent = 0;</div><div class='add'>+</div><div class='add'>+	return TEST_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool all_packets_received(struct test_spec *test, struct xsk_socket_info *xsk, u32 sock_num,</div><div class='add'>+			  unsigned long *bitmap)</div><div class='add'>+{</div><div class='add'>+	struct pkt_stream *pkt_stream = xsk-&gt;pkt_stream;</div><div class='add'>+</div><div class='add'>+	if (!pkt_stream) {</div><div class='add'>+		__set_bit(sock_num, bitmap);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pkt_stream-&gt;nb_rx_pkts == pkt_stream-&gt;nb_valid_entries) {</div><div class='add'>+		__set_bit(sock_num, bitmap);</div><div class='add'>+		if (bitmap_full(bitmap, test-&gt;nb_sockets))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int receive_pkts(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct timeval tv_end, tv_now, tv_timeout = {THREAD_TMOUT, 0};</div><div class='add'>+	DECLARE_BITMAP(bitmap, test-&gt;nb_sockets);</div><div class='add'>+	struct xsk_socket_info *xsk;</div><div class='add'>+	u32 sock_num = 0;</div><div class='add'>+	int res, ret;</div><div class='add'>+</div><div class='add'>+	bitmap_zero(bitmap, test-&gt;nb_sockets);</div><div class='add'>+</div><div class='add'>+	ret = gettimeofday(&amp;tv_now, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	timeradd(&amp;tv_now, &amp;tv_timeout, &amp;tv_end);</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		xsk = &amp;test-&gt;ifobj_rx-&gt;xsk_arr[sock_num];</div><div class='add'>+</div><div class='add'>+		if ((all_packets_received(test, xsk, sock_num, bitmap)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		res = __receive_pkts(test, xsk);</div><div class='add'>+		if (!(res == TEST_PASS || res == TEST_CONTINUE))</div><div class='add'>+			return res;</div><div class='add'>+</div><div class='add'>+		ret = gettimeofday(&amp;tv_now, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+		if (timercmp(&amp;tv_now, &amp;tv_end, &gt;)) {</div><div class='add'>+			ksft_print_msg("ERROR: [%s] Receive loop timed out\n", __func__);</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+		}</div><div class='add'>+		sock_num = (sock_num + 1) % test-&gt;nb_sockets;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TEST_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __send_pkts(struct ifobject *ifobject, struct xsk_socket_info *xsk, bool timeout)</div><div class='add'>+{</div><div class='add'>+	u32 i, idx = 0, valid_pkts = 0, valid_frags = 0, buffer_len;</div><div class='add'>+	struct pkt_stream *pkt_stream = xsk-&gt;pkt_stream;</div><div class='add'>+	struct xsk_umem_info *umem = ifobject-&gt;umem;</div><div class='add'>+	bool use_poll = ifobject-&gt;use_poll;</div><div class='add'>+	struct pollfd fds = { };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buffer_len = pkt_get_buffer_len(umem, pkt_stream-&gt;max_pkt_len);</div><div class='add'>+	/* pkts_in_flight might be negative if many invalid packets are sent */</div><div class='add'>+	if (pkts_in_flight &gt;= (int)((umem_size(umem) - xsk-&gt;batch_size * buffer_len) /</div><div class='add'>+	    buffer_len)) {</div><div class='add'>+		ret = kick_tx(xsk);</div><div class='add'>+		if (ret)</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+		return TEST_CONTINUE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fds.fd = xsk_socket__fd(xsk-&gt;xsk);</div><div class='add'>+	fds.events = POLLOUT;</div><div class='add'>+</div><div class='add'>+	while (xsk_ring_prod__reserve(&amp;xsk-&gt;tx, xsk-&gt;batch_size, &amp;idx) &lt; xsk-&gt;batch_size) {</div><div class='add'>+		if (use_poll) {</div><div class='add'>+			ret = poll(&amp;fds, 1, POLL_TMOUT);</div><div class='add'>+			if (timeout) {</div><div class='add'>+				if (ret &lt; 0) {</div><div class='add'>+					ksft_print_msg("ERROR: [%s] Poll error %d\n",</div><div class='add'>+						       __func__, errno);</div><div class='add'>+					return TEST_FAILURE;</div><div class='add'>+				}</div><div class='add'>+				if (ret == 0)</div><div class='add'>+					return TEST_PASS;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (ret &lt;= 0) {</div><div class='add'>+				ksft_print_msg("ERROR: [%s] Poll error %d\n",</div><div class='add'>+					       __func__, errno);</div><div class='add'>+				return TEST_FAILURE;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		complete_pkts(xsk, xsk-&gt;batch_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; xsk-&gt;batch_size; i++) {</div><div class='add'>+		struct pkt *pkt = pkt_stream_get_next_tx_pkt(pkt_stream);</div><div class='add'>+		u32 nb_frags_left, nb_frags, bytes_written = 0;</div><div class='add'>+</div><div class='add'>+		if (!pkt)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		nb_frags = pkt_nb_frags(umem-&gt;frame_size, pkt_stream, pkt);</div><div class='add'>+		if (nb_frags &gt; xsk-&gt;batch_size - i) {</div><div class='add'>+			pkt_stream_cancel(pkt_stream);</div><div class='add'>+			xsk_ring_prod__cancel(&amp;xsk-&gt;tx, xsk-&gt;batch_size - i);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		nb_frags_left = nb_frags;</div><div class='add'>+</div><div class='add'>+		while (nb_frags_left--) {</div><div class='add'>+			struct xdp_desc *tx_desc = xsk_ring_prod__tx_desc(&amp;xsk-&gt;tx, idx + i);</div><div class='add'>+</div><div class='add'>+			tx_desc-&gt;addr = pkt_get_addr(pkt, ifobject-&gt;umem);</div><div class='add'>+			if (pkt_stream-&gt;verbatim) {</div><div class='add'>+				tx_desc-&gt;len = pkt-&gt;len;</div><div class='add'>+				tx_desc-&gt;options = pkt-&gt;options;</div><div class='add'>+			} else if (nb_frags_left) {</div><div class='add'>+				tx_desc-&gt;len = umem-&gt;frame_size;</div><div class='add'>+				tx_desc-&gt;options = XDP_PKT_CONTD;</div><div class='add'>+			} else {</div><div class='add'>+				tx_desc-&gt;len = pkt-&gt;len - bytes_written;</div><div class='add'>+				tx_desc-&gt;options = 0;</div><div class='add'>+			}</div><div class='add'>+			if (pkt-&gt;valid)</div><div class='add'>+				pkt_generate(xsk, umem, tx_desc-&gt;addr, tx_desc-&gt;len, pkt-&gt;pkt_nb,</div><div class='add'>+					     bytes_written);</div><div class='add'>+			bytes_written += tx_desc-&gt;len;</div><div class='add'>+</div><div class='add'>+			print_verbose("Tx addr: %llx len: %u options: %u pkt_nb: %u\n",</div><div class='add'>+				      tx_desc-&gt;addr, tx_desc-&gt;len, tx_desc-&gt;options, pkt-&gt;pkt_nb);</div><div class='add'>+</div><div class='add'>+			if (nb_frags_left) {</div><div class='add'>+				i++;</div><div class='add'>+				if (pkt_stream-&gt;verbatim)</div><div class='add'>+					pkt = pkt_stream_get_next_tx_pkt(pkt_stream);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pkt &amp;&amp; pkt-&gt;valid) {</div><div class='add'>+			valid_pkts++;</div><div class='add'>+			valid_frags += nb_frags;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pthread_mutex_lock(&amp;pacing_mutex);</div><div class='add'>+	pkts_in_flight += valid_pkts;</div><div class='add'>+	pthread_mutex_unlock(&amp;pacing_mutex);</div><div class='add'>+</div><div class='add'>+	xsk_ring_prod__submit(&amp;xsk-&gt;tx, i);</div><div class='add'>+	xsk-&gt;outstanding_tx += valid_frags;</div><div class='add'>+</div><div class='add'>+	if (use_poll) {</div><div class='add'>+		ret = poll(&amp;fds, 1, POLL_TMOUT);</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			if (ret == 0 &amp;&amp; timeout)</div><div class='add'>+				return TEST_PASS;</div><div class='add'>+</div><div class='add'>+			ksft_print_msg("ERROR: [%s] Poll error %d\n", __func__, ret);</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!timeout) {</div><div class='add'>+		if (complete_pkts(xsk, i))</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+		usleep(10);</div><div class='add'>+		return TEST_PASS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TEST_CONTINUE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wait_for_tx_completion(struct xsk_socket_info *xsk)</div><div class='add'>+{</div><div class='add'>+	struct timeval tv_end, tv_now, tv_timeout = {THREAD_TMOUT, 0};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = gettimeofday(&amp;tv_now, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	timeradd(&amp;tv_now, &amp;tv_timeout, &amp;tv_end);</div><div class='add'>+</div><div class='add'>+	while (xsk-&gt;outstanding_tx) {</div><div class='add'>+		ret = gettimeofday(&amp;tv_now, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+		if (timercmp(&amp;tv_now, &amp;tv_end, &gt;)) {</div><div class='add'>+			ksft_print_msg("ERROR: [%s] Transmission loop timed out\n", __func__);</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		complete_pkts(xsk, xsk-&gt;batch_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TEST_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool all_packets_sent(struct test_spec *test, unsigned long *bitmap)</div><div class='add'>+{</div><div class='add'>+	return bitmap_full(bitmap, test-&gt;nb_sockets);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int send_pkts(struct test_spec *test, struct ifobject *ifobject)</div><div class='add'>+{</div><div class='add'>+	bool timeout = !is_umem_valid(test-&gt;ifobj_rx);</div><div class='add'>+	DECLARE_BITMAP(bitmap, test-&gt;nb_sockets);</div><div class='add'>+	u32 i, ret;</div><div class='add'>+</div><div class='add'>+	bitmap_zero(bitmap, test-&gt;nb_sockets);</div><div class='add'>+</div><div class='add'>+	while (!(all_packets_sent(test, bitmap))) {</div><div class='add'>+		for (i = 0; i &lt; test-&gt;nb_sockets; i++) {</div><div class='add'>+			struct pkt_stream *pkt_stream;</div><div class='add'>+</div><div class='add'>+			pkt_stream = ifobject-&gt;xsk_arr[i].pkt_stream;</div><div class='add'>+			if (!pkt_stream || pkt_stream-&gt;current_pkt_nb &gt;= pkt_stream-&gt;nb_pkts) {</div><div class='add'>+				__set_bit(i, bitmap);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			ret = __send_pkts(ifobject, &amp;ifobject-&gt;xsk_arr[i], timeout);</div><div class='add'>+			if (ret == TEST_CONTINUE &amp;&amp; !test-&gt;fail)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if ((ret || test-&gt;fail) &amp;&amp; !timeout)</div><div class='add'>+				return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+			if (ret == TEST_PASS &amp;&amp; timeout)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			ret = wait_for_tx_completion(&amp;ifobject-&gt;xsk_arr[i]);</div><div class='add'>+			if (ret)</div><div class='add'>+				return TEST_FAILURE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TEST_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_xsk_stats(struct xsk_socket *xsk, struct xdp_statistics *stats)</div><div class='add'>+{</div><div class='add'>+	int fd = xsk_socket__fd(xsk), err;</div><div class='add'>+	socklen_t optlen, expected_len;</div><div class='add'>+</div><div class='add'>+	optlen = sizeof(*stats);</div><div class='add'>+	err = getsockopt(fd, SOL_XDP, XDP_STATISTICS, stats, &amp;optlen);</div><div class='add'>+	if (err) {</div><div class='add'>+		ksft_print_msg("[%s] getsockopt(XDP_STATISTICS) error %u %s\n",</div><div class='add'>+			       __func__, -err, strerror(-err));</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	expected_len = sizeof(struct xdp_statistics);</div><div class='add'>+	if (optlen != expected_len) {</div><div class='add'>+		ksft_print_msg("[%s] getsockopt optlen error. Expected: %u got: %u\n",</div><div class='add'>+			       __func__, expected_len, optlen);</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TEST_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int validate_rx_dropped(struct ifobject *ifobject)</div><div class='add'>+{</div><div class='add'>+	struct xsk_socket *xsk = ifobject-&gt;xsk-&gt;xsk;</div><div class='add'>+	struct xdp_statistics stats;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kick_rx(ifobject-&gt;xsk);</div><div class='add'>+	if (err)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	err = get_xsk_stats(xsk, &amp;stats);</div><div class='add'>+	if (err)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	/* The receiver calls getsockopt after receiving the last (valid)</div><div class='add'>+	 * packet which is not the final packet sent in this test (valid and</div><div class='add'>+	 * invalid packets are sent in alternating fashion with the final</div><div class='add'>+	 * packet being invalid). Since the last packet may or may not have</div><div class='add'>+	 * been dropped already, both outcomes must be allowed.</div><div class='add'>+	 */</div><div class='add'>+	if (stats.rx_dropped == ifobject-&gt;xsk-&gt;pkt_stream-&gt;nb_pkts / 2 ||</div><div class='add'>+	    stats.rx_dropped == ifobject-&gt;xsk-&gt;pkt_stream-&gt;nb_pkts / 2 - 1)</div><div class='add'>+		return TEST_PASS;</div><div class='add'>+</div><div class='add'>+	return TEST_FAILURE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int validate_rx_full(struct ifobject *ifobject)</div><div class='add'>+{</div><div class='add'>+	struct xsk_socket *xsk = ifobject-&gt;xsk-&gt;xsk;</div><div class='add'>+	struct xdp_statistics stats;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	usleep(1000);</div><div class='add'>+	err = kick_rx(ifobject-&gt;xsk);</div><div class='add'>+	if (err)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	err = get_xsk_stats(xsk, &amp;stats);</div><div class='add'>+	if (err)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	if (stats.rx_ring_full)</div><div class='add'>+		return TEST_PASS;</div><div class='add'>+</div><div class='add'>+	return TEST_FAILURE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int validate_fill_empty(struct ifobject *ifobject)</div><div class='add'>+{</div><div class='add'>+	struct xsk_socket *xsk = ifobject-&gt;xsk-&gt;xsk;</div><div class='add'>+	struct xdp_statistics stats;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	usleep(1000);</div><div class='add'>+	err = kick_rx(ifobject-&gt;xsk);</div><div class='add'>+	if (err)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	err = get_xsk_stats(xsk, &amp;stats);</div><div class='add'>+	if (err)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	if (stats.rx_fill_ring_empty_descs)</div><div class='add'>+		return TEST_PASS;</div><div class='add'>+</div><div class='add'>+	return TEST_FAILURE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int validate_tx_invalid_descs(struct ifobject *ifobject)</div><div class='add'>+{</div><div class='add'>+	struct xsk_socket *xsk = ifobject-&gt;xsk-&gt;xsk;</div><div class='add'>+	int fd = xsk_socket__fd(xsk);</div><div class='add'>+	struct xdp_statistics stats;</div><div class='add'>+	socklen_t optlen;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	optlen = sizeof(stats);</div><div class='add'>+	err = getsockopt(fd, SOL_XDP, XDP_STATISTICS, &amp;stats, &amp;optlen);</div><div class='add'>+	if (err) {</div><div class='add'>+		ksft_print_msg("[%s] getsockopt(XDP_STATISTICS) error %u %s\n",</div><div class='add'>+			       __func__, -err, strerror(-err));</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stats.tx_invalid_descs != ifobject-&gt;xsk-&gt;pkt_stream-&gt;nb_pkts / 2) {</div><div class='add'>+		ksft_print_msg("[%s] tx_invalid_descs incorrect. Got [%llu] expected [%u]\n",</div><div class='add'>+			       __func__,</div><div class='add'>+			       (unsigned long long)stats.tx_invalid_descs,</div><div class='add'>+			       ifobject-&gt;xsk-&gt;pkt_stream-&gt;nb_pkts);</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TEST_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xsk_configure(struct test_spec *test, struct ifobject *ifobject,</div><div class='add'>+			  struct xsk_umem_info *umem, bool tx)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; test-&gt;nb_sockets; i++) {</div><div class='add'>+		bool shared = (ifobject-&gt;shared_umem &amp;&amp; tx) ? true : !!i;</div><div class='add'>+		u32 ctr = 0;</div><div class='add'>+</div><div class='add'>+		while (ctr++ &lt; SOCK_RECONF_CTR) {</div><div class='add'>+			ret = xsk_configure_socket(&amp;ifobject-&gt;xsk_arr[i], umem,</div><div class='add'>+						     ifobject, shared);</div><div class='add'>+			if (!ret)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/* Retry if it fails as xsk_socket__create() is asynchronous */</div><div class='add'>+			if (ctr &gt;= SOCK_RECONF_CTR)</div><div class='add'>+				return ret;</div><div class='add'>+			usleep(USLEEP_MAX);</div><div class='add'>+		}</div><div class='add'>+		if (ifobject-&gt;busy_poll) {</div><div class='add'>+			ret = enable_busy_poll(&amp;ifobject-&gt;xsk_arr[i]);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int thread_common_ops_tx(struct test_spec *test, struct ifobject *ifobject)</div><div class='add'>+{</div><div class='add'>+	int ret = xsk_configure(test, ifobject, test-&gt;ifobj_rx-&gt;umem, true);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ifobject-&gt;xsk = &amp;ifobject-&gt;xsk_arr[0];</div><div class='add'>+	ifobject-&gt;xskmap = test-&gt;ifobj_rx-&gt;xskmap;</div><div class='add'>+	memcpy(ifobject-&gt;umem, test-&gt;ifobj_rx-&gt;umem, sizeof(struct xsk_umem_info));</div><div class='add'>+	ifobject-&gt;umem-&gt;base_addr = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xsk_populate_fill_ring(struct xsk_umem_info *umem, struct pkt_stream *pkt_stream,</div><div class='add'>+				   bool fill_up)</div><div class='add'>+{</div><div class='add'>+	u32 rx_frame_size = umem-&gt;frame_size - XDP_PACKET_HEADROOM;</div><div class='add'>+	u32 idx = 0, filled = 0, buffers_to_fill, nb_pkts;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (umem-&gt;num_frames &lt; XSK_RING_PROD__DEFAULT_NUM_DESCS)</div><div class='add'>+		buffers_to_fill = umem-&gt;num_frames;</div><div class='add'>+	else</div><div class='add'>+		buffers_to_fill = umem-&gt;fill_size;</div><div class='add'>+</div><div class='add'>+	ret = xsk_ring_prod__reserve(&amp;umem-&gt;fq, buffers_to_fill, &amp;idx);</div><div class='add'>+	if (ret != buffers_to_fill)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	while (filled &lt; buffers_to_fill) {</div><div class='add'>+		struct pkt *pkt = pkt_stream_get_next_rx_pkt(pkt_stream, &amp;nb_pkts);</div><div class='add'>+		u64 addr;</div><div class='add'>+		u32 i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; pkt_nb_frags(rx_frame_size, pkt_stream, pkt); i++) {</div><div class='add'>+			if (!pkt) {</div><div class='add'>+				if (!fill_up)</div><div class='add'>+					break;</div><div class='add'>+				addr = filled * umem-&gt;frame_size + umem-&gt;base_addr;</div><div class='add'>+			} else if (pkt-&gt;offset &gt;= 0) {</div><div class='add'>+				addr = pkt-&gt;offset % umem-&gt;frame_size + umem_alloc_buffer(umem);</div><div class='add'>+			} else {</div><div class='add'>+				addr = pkt-&gt;offset + umem_alloc_buffer(umem);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			*xsk_ring_prod__fill_addr(&amp;umem-&gt;fq, idx++) = addr;</div><div class='add'>+			if (++filled &gt;= buffers_to_fill)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	xsk_ring_prod__submit(&amp;umem-&gt;fq, filled);</div><div class='add'>+	xsk_ring_prod__cancel(&amp;umem-&gt;fq, buffers_to_fill - filled);</div><div class='add'>+</div><div class='add'>+	pkt_stream_reset(pkt_stream);</div><div class='add'>+	umem_reset_alloc(umem);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int thread_common_ops(struct test_spec *test, struct ifobject *ifobject)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_xdp_query_opts, opts);</div><div class='add'>+	int mmap_flags;</div><div class='add'>+	u64 umem_sz;</div><div class='add'>+	void *bufs;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	umem_sz = ifobject-&gt;umem-&gt;num_frames * ifobject-&gt;umem-&gt;frame_size;</div><div class='add'>+	mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE;</div><div class='add'>+</div><div class='add'>+	if (ifobject-&gt;umem-&gt;unaligned_mode)</div><div class='add'>+		mmap_flags |= MAP_HUGETLB | MAP_HUGE_2MB;</div><div class='add'>+</div><div class='add'>+	if (ifobject-&gt;shared_umem)</div><div class='add'>+		umem_sz *= 2;</div><div class='add'>+</div><div class='add'>+	bufs = mmap(NULL, umem_sz, PROT_READ | PROT_WRITE, mmap_flags, -1, 0);</div><div class='add'>+	if (bufs == MAP_FAILED)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	ret = xsk_configure_umem(ifobject, ifobject-&gt;umem, bufs, umem_sz);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = xsk_configure(test, ifobject, ifobject-&gt;umem, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ifobject-&gt;xsk = &amp;ifobject-&gt;xsk_arr[0];</div><div class='add'>+</div><div class='add'>+	if (!ifobject-&gt;rx_on)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = xsk_populate_fill_ring(ifobject-&gt;umem, ifobject-&gt;xsk-&gt;pkt_stream,</div><div class='add'>+				     ifobject-&gt;use_fill_ring);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; test-&gt;nb_sockets; i++) {</div><div class='add'>+		ifobject-&gt;xsk = &amp;ifobject-&gt;xsk_arr[i];</div><div class='add'>+		ret = xsk_update_xskmap(ifobject-&gt;xskmap, ifobject-&gt;xsk-&gt;xsk, i);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *worker_testapp_validate_tx(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct test_spec *test = (struct test_spec *)arg;</div><div class='add'>+	struct ifobject *ifobject = test-&gt;ifobj_tx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (test-&gt;current_step == 1) {</div><div class='add'>+		if (!ifobject-&gt;shared_umem) {</div><div class='add'>+			if (thread_common_ops(test, ifobject)) {</div><div class='add'>+				test-&gt;fail = true;</div><div class='add'>+				pthread_exit(NULL);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (thread_common_ops_tx(test, ifobject)) {</div><div class='add'>+				test-&gt;fail = true;</div><div class='add'>+				pthread_exit(NULL);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = send_pkts(test, ifobject);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; ifobject-&gt;validation_func)</div><div class='add'>+		err = ifobject-&gt;validation_func(ifobject);</div><div class='add'>+	if (err)</div><div class='add'>+		test-&gt;fail = true;</div><div class='add'>+</div><div class='add'>+	pthread_exit(NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *worker_testapp_validate_rx(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct test_spec *test = (struct test_spec *)arg;</div><div class='add'>+	struct ifobject *ifobject = test-&gt;ifobj_rx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (test-&gt;current_step == 1) {</div><div class='add'>+		err = thread_common_ops(test, ifobject);</div><div class='add'>+	} else {</div><div class='add'>+		xsk_clear_xskmap(ifobject-&gt;xskmap);</div><div class='add'>+		err = xsk_update_xskmap(ifobject-&gt;xskmap, ifobject-&gt;xsk-&gt;xsk, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			ksft_print_msg("Error: Failed to update xskmap, error %s\n",</div><div class='add'>+				       strerror(-err));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pthread_barrier_wait(&amp;barr);</div><div class='add'>+</div><div class='add'>+	/* We leave only now in case of error to avoid getting stuck in the barrier */</div><div class='add'>+	if (err) {</div><div class='add'>+		test-&gt;fail = true;</div><div class='add'>+		pthread_exit(NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = receive_pkts(test);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; ifobject-&gt;validation_func)</div><div class='add'>+		err = ifobject-&gt;validation_func(ifobject);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		if (!test-&gt;adjust_tail) {</div><div class='add'>+			test-&gt;fail = true;</div><div class='add'>+		} else {</div><div class='add'>+			bool supported;</div><div class='add'>+</div><div class='add'>+			if (is_adjust_tail_supported(ifobject-&gt;xdp_progs, &amp;supported))</div><div class='add'>+				test-&gt;fail = true;</div><div class='add'>+			else if (!supported)</div><div class='add'>+				test-&gt;adjust_tail_support = false;</div><div class='add'>+			else</div><div class='add'>+				test-&gt;fail = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pthread_exit(NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void testapp_clean_xsk_umem(struct ifobject *ifobj)</div><div class='add'>+{</div><div class='add'>+	u64 umem_sz = ifobj-&gt;umem-&gt;num_frames * ifobj-&gt;umem-&gt;frame_size;</div><div class='add'>+</div><div class='add'>+	if (ifobj-&gt;shared_umem)</div><div class='add'>+		umem_sz *= 2;</div><div class='add'>+</div><div class='add'>+	umem_sz = ceil_u64(umem_sz, HUGEPAGE_SIZE) * HUGEPAGE_SIZE;</div><div class='add'>+	xsk_umem__delete(ifobj-&gt;umem-&gt;umem);</div><div class='add'>+	munmap(ifobj-&gt;umem-&gt;buffer, umem_sz);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handler(int signum)</div><div class='add'>+{</div><div class='add'>+	pthread_exit(NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool xdp_prog_changed_rx(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct ifobject *ifobj = test-&gt;ifobj_rx;</div><div class='add'>+</div><div class='add'>+	return ifobj-&gt;xdp_prog != test-&gt;xdp_prog_rx || ifobj-&gt;mode != test-&gt;mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool xdp_prog_changed_tx(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct ifobject *ifobj = test-&gt;ifobj_tx;</div><div class='add'>+</div><div class='add'>+	return ifobj-&gt;xdp_prog != test-&gt;xdp_prog_tx || ifobj-&gt;mode != test-&gt;mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xsk_reattach_xdp(struct ifobject *ifobj, struct bpf_program *xdp_prog,</div><div class='add'>+			     struct bpf_map *xskmap, enum test_mode mode)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	xsk_detach_xdp_program(ifobj-&gt;ifindex, mode_to_xdp_flags(ifobj-&gt;mode));</div><div class='add'>+	err = xsk_attach_xdp_program(xdp_prog, ifobj-&gt;ifindex, mode_to_xdp_flags(mode));</div><div class='add'>+	if (err) {</div><div class='add'>+		ksft_print_msg("Error attaching XDP program\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ifobj-&gt;mode != mode &amp;&amp; (mode == TEST_MODE_DRV || mode == TEST_MODE_ZC))</div><div class='add'>+		if (!xsk_is_in_mode(ifobj-&gt;ifindex, XDP_FLAGS_DRV_MODE)) {</div><div class='add'>+			ksft_print_msg("ERROR: XDP prog not in DRV mode\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	ifobj-&gt;xdp_prog = xdp_prog;</div><div class='add'>+	ifobj-&gt;xskmap = xskmap;</div><div class='add'>+	ifobj-&gt;mode = mode;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xsk_attach_xdp_progs(struct test_spec *test, struct ifobject *ifobj_rx,</div><div class='add'>+				 struct ifobject *ifobj_tx)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (xdp_prog_changed_rx(test)) {</div><div class='add'>+		err = xsk_reattach_xdp(ifobj_rx, test-&gt;xdp_prog_rx, test-&gt;xskmap_rx, test-&gt;mode);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ifobj_tx || ifobj_tx-&gt;shared_umem)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (xdp_prog_changed_tx(test))</div><div class='add'>+		err = xsk_reattach_xdp(ifobj_tx, test-&gt;xdp_prog_tx, test-&gt;xskmap_tx, test-&gt;mode);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clean_sockets(struct test_spec *test, struct ifobject *ifobj)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	if (!ifobj || !test)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; test-&gt;nb_sockets; i++)</div><div class='add'>+		xsk_socket__delete(ifobj-&gt;xsk_arr[i].xsk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clean_umem(struct test_spec *test, struct ifobject *ifobj1, struct ifobject *ifobj2)</div><div class='add'>+{</div><div class='add'>+	if (!ifobj1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	testapp_clean_xsk_umem(ifobj1);</div><div class='add'>+	if (ifobj2 &amp;&amp; !ifobj2-&gt;shared_umem)</div><div class='add'>+		testapp_clean_xsk_umem(ifobj2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __testapp_validate_traffic(struct test_spec *test, struct ifobject *ifobj1,</div><div class='add'>+				      struct ifobject *ifobj2)</div><div class='add'>+{</div><div class='add'>+	pthread_t t0, t1;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (test-&gt;mtu &gt; MAX_ETH_PKT_SIZE) {</div><div class='add'>+		if (test-&gt;mode == TEST_MODE_ZC &amp;&amp; (!ifobj1-&gt;multi_buff_zc_supp ||</div><div class='add'>+						   (ifobj2 &amp;&amp; !ifobj2-&gt;multi_buff_zc_supp))) {</div><div class='add'>+			ksft_print_msg("Multi buffer for zero-copy not supported.\n");</div><div class='add'>+			return TEST_SKIP;</div><div class='add'>+		}</div><div class='add'>+		if (test-&gt;mode != TEST_MODE_ZC &amp;&amp; (!ifobj1-&gt;multi_buff_supp ||</div><div class='add'>+						   (ifobj2 &amp;&amp; !ifobj2-&gt;multi_buff_supp))) {</div><div class='add'>+			ksft_print_msg("Multi buffer not supported.\n");</div><div class='add'>+			return TEST_SKIP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	err = test_spec_set_mtu(test, test-&gt;mtu);</div><div class='add'>+	if (err) {</div><div class='add'>+		ksft_print_msg("Error, could not set mtu.\n");</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ifobj2) {</div><div class='add'>+		if (pthread_barrier_init(&amp;barr, NULL, 2))</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+		pkt_stream_reset(ifobj2-&gt;xsk-&gt;pkt_stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	test-&gt;current_step++;</div><div class='add'>+	pkt_stream_reset(ifobj1-&gt;xsk-&gt;pkt_stream);</div><div class='add'>+	pkts_in_flight = 0;</div><div class='add'>+</div><div class='add'>+	signal(SIGUSR1, handler);</div><div class='add'>+	/*Spawn RX thread */</div><div class='add'>+	pthread_create(&amp;t0, NULL, ifobj1-&gt;func_ptr, test);</div><div class='add'>+</div><div class='add'>+	if (ifobj2) {</div><div class='add'>+		pthread_barrier_wait(&amp;barr);</div><div class='add'>+		if (pthread_barrier_destroy(&amp;barr)) {</div><div class='add'>+			pthread_kill(t0, SIGUSR1);</div><div class='add'>+			clean_sockets(test, ifobj1);</div><div class='add'>+			clean_umem(test, ifobj1, NULL);</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*Spawn TX thread */</div><div class='add'>+		pthread_create(&amp;t1, NULL, ifobj2-&gt;func_ptr, test);</div><div class='add'>+</div><div class='add'>+		pthread_join(t1, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ifobj2)</div><div class='add'>+		pthread_kill(t0, SIGUSR1);</div><div class='add'>+	else</div><div class='add'>+		pthread_join(t0, NULL);</div><div class='add'>+</div><div class='add'>+	if (test-&gt;total_steps == test-&gt;current_step || test-&gt;fail) {</div><div class='add'>+		clean_sockets(test, ifobj1);</div><div class='add'>+		clean_sockets(test, ifobj2);</div><div class='add'>+		clean_umem(test, ifobj1, ifobj2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test-&gt;fail)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	return TEST_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int testapp_validate_traffic(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct ifobject *ifobj_rx = test-&gt;ifobj_rx;</div><div class='add'>+	struct ifobject *ifobj_tx = test-&gt;ifobj_tx;</div><div class='add'>+</div><div class='add'>+	if ((ifobj_rx-&gt;umem-&gt;unaligned_mode &amp;&amp; !ifobj_rx-&gt;unaligned_supp) ||</div><div class='add'>+	    (ifobj_tx-&gt;umem-&gt;unaligned_mode &amp;&amp; !ifobj_tx-&gt;unaligned_supp)) {</div><div class='add'>+		ksft_print_msg("No huge pages present.\n");</div><div class='add'>+		return TEST_SKIP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test-&gt;set_ring) {</div><div class='add'>+		if (ifobj_tx-&gt;hw_ring_size_supp) {</div><div class='add'>+			if (set_ring_size(ifobj_tx)) {</div><div class='add'>+				ksft_print_msg("Failed to change HW ring size.\n");</div><div class='add'>+				return TEST_FAILURE;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			ksft_print_msg("Changing HW ring size not supported.\n");</div><div class='add'>+			return TEST_SKIP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (xsk_attach_xdp_progs(test, ifobj_rx, ifobj_tx))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	return __testapp_validate_traffic(test, ifobj_rx, ifobj_tx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int testapp_validate_traffic_single_thread(struct test_spec *test, struct ifobject *ifobj)</div><div class='add'>+{</div><div class='add'>+	return __testapp_validate_traffic(test, ifobj, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_teardown(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_TEARDOWN_ITER; i++) {</div><div class='add'>+		if (testapp_validate_traffic(test))</div><div class='add'>+			return TEST_FAILURE;</div><div class='add'>+		test_spec_reset(test);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return TEST_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void swap_directions(struct ifobject **ifobj1, struct ifobject **ifobj2)</div><div class='add'>+{</div><div class='add'>+	thread_func_t tmp_func_ptr = (*ifobj1)-&gt;func_ptr;</div><div class='add'>+	struct ifobject *tmp_ifobj = (*ifobj1);</div><div class='add'>+</div><div class='add'>+	(*ifobj1)-&gt;func_ptr = (*ifobj2)-&gt;func_ptr;</div><div class='add'>+	(*ifobj2)-&gt;func_ptr = tmp_func_ptr;</div><div class='add'>+</div><div class='add'>+	*ifobj1 = *ifobj2;</div><div class='add'>+	*ifobj2 = tmp_ifobj;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_bidirectional(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	test-&gt;ifobj_tx-&gt;rx_on = true;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;tx_on = true;</div><div class='add'>+	test-&gt;total_steps = 2;</div><div class='add'>+	if (testapp_validate_traffic(test))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	print_verbose("Switching Tx/Rx direction\n");</div><div class='add'>+	swap_directions(&amp;test-&gt;ifobj_rx, &amp;test-&gt;ifobj_tx);</div><div class='add'>+	res = __testapp_validate_traffic(test, test-&gt;ifobj_rx, test-&gt;ifobj_tx);</div><div class='add'>+</div><div class='add'>+	swap_directions(&amp;test-&gt;ifobj_rx, &amp;test-&gt;ifobj_tx);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int swap_xsk_resources(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	test-&gt;ifobj_tx-&gt;xsk_arr[0].pkt_stream = NULL;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk_arr[0].pkt_stream = NULL;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;xsk_arr[1].pkt_stream = test-&gt;tx_pkt_stream_default;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk_arr[1].pkt_stream = test-&gt;rx_pkt_stream_default;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;xsk = &amp;test-&gt;ifobj_tx-&gt;xsk_arr[1];</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk = &amp;test-&gt;ifobj_rx-&gt;xsk_arr[1];</div><div class='add'>+</div><div class='add'>+	ret = xsk_update_xskmap(test-&gt;ifobj_rx-&gt;xskmap, test-&gt;ifobj_rx-&gt;xsk-&gt;xsk, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	return TEST_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_xdp_prog_cleanup(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;total_steps = 2;</div><div class='add'>+	test-&gt;nb_sockets = 2;</div><div class='add'>+	if (testapp_validate_traffic(test))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	if (swap_xsk_resources(test)) {</div><div class='add'>+		clean_sockets(test, test-&gt;ifobj_rx);</div><div class='add'>+		clean_sockets(test, test-&gt;ifobj_tx);</div><div class='add'>+		clean_umem(test, test-&gt;ifobj_rx, test-&gt;ifobj_tx);</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_headroom(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;frame_headroom = UMEM_HEADROOM_TEST_SIZE;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_stats_rx_dropped(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	if (test-&gt;mode == TEST_MODE_ZC) {</div><div class='add'>+		ksft_print_msg("Can not run RX_DROPPED test for ZC mode\n");</div><div class='add'>+		return TEST_SKIP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pkt_stream_replace_half(test, MIN_PKT_SIZE * 4, 0))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;frame_headroom = test-&gt;ifobj_rx-&gt;umem-&gt;frame_size -</div><div class='add'>+		XDP_PACKET_HEADROOM - MIN_PKT_SIZE * 3;</div><div class='add'>+	if (pkt_stream_receive_half(test))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;validation_func = validate_rx_dropped;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_stats_tx_invalid_descs(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	if (pkt_stream_replace_half(test, XSK_UMEM__INVALID_FRAME_SIZE, 0))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;validation_func = validate_tx_invalid_descs;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_stats_rx_full(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	if (pkt_stream_replace(test, DEFAULT_UMEM_BUFFERS + DEFAULT_UMEM_BUFFERS / 2, MIN_PKT_SIZE))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream = pkt_stream_generate(DEFAULT_UMEM_BUFFERS, MIN_PKT_SIZE);</div><div class='add'>+</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk-&gt;rxqsize = DEFAULT_UMEM_BUFFERS;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;release_rx = false;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;validation_func = validate_rx_full;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_stats_fill_empty(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	if (pkt_stream_replace(test, DEFAULT_UMEM_BUFFERS + DEFAULT_UMEM_BUFFERS / 2, MIN_PKT_SIZE))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream = pkt_stream_generate(DEFAULT_UMEM_BUFFERS, MIN_PKT_SIZE);</div><div class='add'>+</div><div class='add'>+	test-&gt;ifobj_rx-&gt;use_fill_ring = false;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;validation_func = validate_fill_empty;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_send_receive_unaligned(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;ifobj_tx-&gt;umem-&gt;unaligned_mode = true;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;unaligned_mode = true;</div><div class='add'>+	/* Let half of the packets straddle a 4K buffer boundary */</div><div class='add'>+	if (pkt_stream_replace_half(test, MIN_PKT_SIZE, -MIN_PKT_SIZE / 2))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_send_receive_unaligned_mb(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;umem-&gt;unaligned_mode = true;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;unaligned_mode = true;</div><div class='add'>+	if (pkt_stream_replace(test, DEFAULT_PKT_CNT, MAX_ETH_JUMBO_SIZE))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_single_pkt(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct pkt pkts[] = {{0, MIN_PKT_SIZE, 0, true}};</div><div class='add'>+</div><div class='add'>+	if (pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts)))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_send_receive_mb(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='add'>+	if (pkt_stream_replace(test, DEFAULT_PKT_CNT, MAX_ETH_JUMBO_SIZE))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_invalid_desc_mb(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct xsk_umem_info *umem = test-&gt;ifobj_tx-&gt;umem;</div><div class='add'>+	u64 umem_size = umem-&gt;num_frames * umem-&gt;frame_size;</div><div class='add'>+	struct pkt pkts[] = {</div><div class='add'>+		/* Valid packet for synch to start with */</div><div class='add'>+		{0, MIN_PKT_SIZE, 0, true, 0},</div><div class='add'>+		/* Zero frame len is not legal */</div><div class='add'>+		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='add'>+		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='add'>+		{0, 0, 0, false, 0},</div><div class='add'>+		/* Invalid address in the second frame */</div><div class='add'>+		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='add'>+		{umem_size, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='add'>+		/* Invalid len in the middle */</div><div class='add'>+		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='add'>+		{0, XSK_UMEM__INVALID_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='add'>+		/* Invalid options in the middle */</div><div class='add'>+		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='add'>+		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XSK_DESC__INVALID_OPTION},</div><div class='add'>+		/* Transmit 2 frags, receive 3 */</div><div class='add'>+		{0, XSK_UMEM__MAX_FRAME_SIZE, 0, true, XDP_PKT_CONTD},</div><div class='add'>+		{0, XSK_UMEM__MAX_FRAME_SIZE, 0, true, 0},</div><div class='add'>+		/* Middle frame crosses chunk boundary with small length */</div><div class='add'>+		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='add'>+		{-MIN_PKT_SIZE / 2, MIN_PKT_SIZE, 0, false, 0},</div><div class='add'>+		/* Valid packet for synch so that something is received */</div><div class='add'>+		{0, MIN_PKT_SIZE, 0, true, 0}};</div><div class='add'>+</div><div class='add'>+	if (umem-&gt;unaligned_mode) {</div><div class='add'>+		/* Crossing a chunk boundary allowed */</div><div class='add'>+		pkts[12].valid = true;</div><div class='add'>+		pkts[13].valid = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='add'>+	if (pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts)))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_invalid_desc(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct xsk_umem_info *umem = test-&gt;ifobj_tx-&gt;umem;</div><div class='add'>+	u64 umem_size = umem-&gt;num_frames * umem-&gt;frame_size;</div><div class='add'>+	struct pkt pkts[] = {</div><div class='add'>+		/* Zero packet address allowed */</div><div class='add'>+		{0, MIN_PKT_SIZE, 0, true},</div><div class='add'>+		/* Allowed packet */</div><div class='add'>+		{0, MIN_PKT_SIZE, 0, true},</div><div class='add'>+		/* Straddling the start of umem */</div><div class='add'>+		{-2, MIN_PKT_SIZE, 0, false},</div><div class='add'>+		/* Packet too large */</div><div class='add'>+		{0, XSK_UMEM__INVALID_FRAME_SIZE, 0, false},</div><div class='add'>+		/* Up to end of umem allowed */</div><div class='add'>+		{umem_size - MIN_PKT_SIZE - 2 * umem-&gt;frame_size, MIN_PKT_SIZE, 0, true},</div><div class='add'>+		/* After umem ends */</div><div class='add'>+		{umem_size, MIN_PKT_SIZE, 0, false},</div><div class='add'>+		/* Straddle the end of umem */</div><div class='add'>+		{umem_size - MIN_PKT_SIZE / 2, MIN_PKT_SIZE, 0, false},</div><div class='add'>+		/* Straddle a 4K boundary */</div><div class='add'>+		{0x1000 - MIN_PKT_SIZE / 2, MIN_PKT_SIZE, 0, false},</div><div class='add'>+		/* Straddle a 2K boundary */</div><div class='add'>+		{0x800 - MIN_PKT_SIZE / 2, MIN_PKT_SIZE, 0, true},</div><div class='add'>+		/* Valid packet for synch so that something is received */</div><div class='add'>+		{0, MIN_PKT_SIZE, 0, true}};</div><div class='add'>+</div><div class='add'>+	if (umem-&gt;unaligned_mode) {</div><div class='add'>+		/* Crossing a page boundary allowed */</div><div class='add'>+		pkts[7].valid = true;</div><div class='add'>+	}</div><div class='add'>+	if (umem-&gt;frame_size == XSK_UMEM__DEFAULT_FRAME_SIZE / 2) {</div><div class='add'>+		/* Crossing a 2K frame size boundary not allowed */</div><div class='add'>+		pkts[8].valid = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test-&gt;ifobj_tx-&gt;shared_umem) {</div><div class='add'>+		pkts[4].offset += umem_size;</div><div class='add'>+		pkts[5].offset += umem_size;</div><div class='add'>+		pkts[6].offset += umem_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts)))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_xdp_drop(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct xsk_xdp_progs *skel_rx = test-&gt;ifobj_rx-&gt;xdp_progs;</div><div class='add'>+	struct xsk_xdp_progs *skel_tx = test-&gt;ifobj_tx-&gt;xdp_progs;</div><div class='add'>+</div><div class='add'>+	test_spec_set_xdp_prog(test, skel_rx-&gt;progs.xsk_xdp_drop, skel_tx-&gt;progs.xsk_xdp_drop,</div><div class='add'>+			       skel_rx-&gt;maps.xsk, skel_tx-&gt;maps.xsk);</div><div class='add'>+</div><div class='add'>+	if (pkt_stream_receive_half(test))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_xdp_metadata_copy(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct xsk_xdp_progs *skel_rx = test-&gt;ifobj_rx-&gt;xdp_progs;</div><div class='add'>+	struct xsk_xdp_progs *skel_tx = test-&gt;ifobj_tx-&gt;xdp_progs;</div><div class='add'>+</div><div class='add'>+	test_spec_set_xdp_prog(test, skel_rx-&gt;progs.xsk_xdp_populate_metadata,</div><div class='add'>+			       skel_tx-&gt;progs.xsk_xdp_populate_metadata,</div><div class='add'>+			       skel_rx-&gt;maps.xsk, skel_tx-&gt;maps.xsk);</div><div class='add'>+	test-&gt;ifobj_rx-&gt;use_metadata = true;</div><div class='add'>+</div><div class='add'>+	skel_rx-&gt;bss-&gt;count = 0;</div><div class='add'>+</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_xdp_shared_umem(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct xsk_xdp_progs *skel_rx = test-&gt;ifobj_rx-&gt;xdp_progs;</div><div class='add'>+	struct xsk_xdp_progs *skel_tx = test-&gt;ifobj_tx-&gt;xdp_progs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	test-&gt;total_steps = 1;</div><div class='add'>+	test-&gt;nb_sockets = 2;</div><div class='add'>+</div><div class='add'>+	test_spec_set_xdp_prog(test, skel_rx-&gt;progs.xsk_xdp_shared_umem,</div><div class='add'>+			       skel_tx-&gt;progs.xsk_xdp_shared_umem,</div><div class='add'>+			       skel_rx-&gt;maps.xsk, skel_tx-&gt;maps.xsk);</div><div class='add'>+</div><div class='add'>+	if (pkt_stream_even_odd_sequence(test))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	ret = testapp_validate_traffic(test);</div><div class='add'>+</div><div class='add'>+	release_even_odd_sequence(test);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_poll_txq_tmout(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;ifobj_tx-&gt;use_poll = true;</div><div class='add'>+	/* create invalid frame by set umem frame_size and pkt length equal to 2048 */</div><div class='add'>+	test-&gt;ifobj_tx-&gt;umem-&gt;frame_size = 2048;</div><div class='add'>+	if (pkt_stream_replace(test, 2 * DEFAULT_PKT_CNT, 2048))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	return testapp_validate_traffic_single_thread(test, test-&gt;ifobj_tx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_poll_rxq_tmout(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;ifobj_rx-&gt;use_poll = true;</div><div class='add'>+	return testapp_validate_traffic_single_thread(test, test-&gt;ifobj_rx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_too_many_frags(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	struct pkt *pkts;</div><div class='add'>+	u32 max_frags, i;</div><div class='add'>+	int ret = TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	if (test-&gt;mode == TEST_MODE_ZC) {</div><div class='add'>+		max_frags = test-&gt;ifobj_tx-&gt;xdp_zc_max_segs;</div><div class='add'>+	} else {</div><div class='add'>+		max_frags = get_max_skb_frags();</div><div class='add'>+		if (!max_frags) {</div><div class='add'>+			ksft_print_msg("Can't get MAX_SKB_FRAGS from system, using default (17)\n");</div><div class='add'>+			max_frags = 17;</div><div class='add'>+		}</div><div class='add'>+		max_frags += 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pkts = calloc(2 * max_frags + 2, sizeof(struct pkt));</div><div class='add'>+	if (!pkts)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='add'>+</div><div class='add'>+	/* Valid packet for synch */</div><div class='add'>+	pkts[0].len = MIN_PKT_SIZE;</div><div class='add'>+	pkts[0].valid = true;</div><div class='add'>+</div><div class='add'>+	/* One valid packet with the max amount of frags */</div><div class='add'>+	for (i = 1; i &lt; max_frags + 1; i++) {</div><div class='add'>+		pkts[i].len = MIN_PKT_SIZE;</div><div class='add'>+		pkts[i].options = XDP_PKT_CONTD;</div><div class='add'>+		pkts[i].valid = true;</div><div class='add'>+	}</div><div class='add'>+	pkts[max_frags].options = 0;</div><div class='add'>+</div><div class='add'>+	/* An invalid packet with the max amount of frags but signals packet</div><div class='add'>+	 * continues on the last frag</div><div class='add'>+	 */</div><div class='add'>+	for (i = max_frags + 1; i &lt; 2 * max_frags + 1; i++) {</div><div class='add'>+		pkts[i].len = MIN_PKT_SIZE;</div><div class='add'>+		pkts[i].options = XDP_PKT_CONTD;</div><div class='add'>+		pkts[i].valid = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Valid packet for synch */</div><div class='add'>+	pkts[2 * max_frags + 1].len = MIN_PKT_SIZE;</div><div class='add'>+	pkts[2 * max_frags + 1].valid = true;</div><div class='add'>+</div><div class='add'>+	if (pkt_stream_generate_custom(test, pkts, 2 * max_frags + 2)) {</div><div class='add'>+		free(pkts);</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = testapp_validate_traffic(test);</div><div class='add'>+	free(pkts);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xsk_load_xdp_programs(struct ifobject *ifobj)</div><div class='add'>+{</div><div class='add'>+	ifobj-&gt;xdp_progs = xsk_xdp_progs__open_and_load();</div><div class='add'>+	if (libbpf_get_error(ifobj-&gt;xdp_progs))</div><div class='add'>+		return libbpf_get_error(ifobj-&gt;xdp_progs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Simple test */</div><div class='add'>+static bool hugepages_present(void)</div><div class='add'>+{</div><div class='add'>+	size_t mmap_sz = 2 * DEFAULT_UMEM_BUFFERS * XSK_UMEM__DEFAULT_FRAME_SIZE;</div><div class='add'>+	void *bufs;</div><div class='add'>+</div><div class='add'>+	bufs = mmap(NULL, mmap_sz, PROT_READ | PROT_WRITE,</div><div class='add'>+		    MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, MAP_HUGE_2MB);</div><div class='add'>+	if (bufs == MAP_FAILED)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	mmap_sz = ceil_u64(mmap_sz, HUGEPAGE_SIZE) * HUGEPAGE_SIZE;</div><div class='add'>+	munmap(bufs, mmap_sz);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int init_iface(struct ifobject *ifobj, thread_func_t func_ptr)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_xdp_query_opts, query_opts);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ifobj-&gt;func_ptr = func_ptr;</div><div class='add'>+</div><div class='add'>+	err = xsk_load_xdp_programs(ifobj);</div><div class='add'>+	if (err) {</div><div class='add'>+		ksft_print_msg("Error loading XDP program\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hugepages_present())</div><div class='add'>+		ifobj-&gt;unaligned_supp = true;</div><div class='add'>+</div><div class='add'>+	err = bpf_xdp_query(ifobj-&gt;ifindex, XDP_FLAGS_DRV_MODE, &amp;query_opts);</div><div class='add'>+	if (err) {</div><div class='add'>+		ksft_print_msg("Error querying XDP capabilities\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	if (query_opts.feature_flags &amp; NETDEV_XDP_ACT_RX_SG)</div><div class='add'>+		ifobj-&gt;multi_buff_supp = true;</div><div class='add'>+	if (query_opts.feature_flags &amp; NETDEV_XDP_ACT_XSK_ZEROCOPY) {</div><div class='add'>+		if (query_opts.xdp_zc_max_segs &gt; 1) {</div><div class='add'>+			ifobj-&gt;multi_buff_zc_supp = true;</div><div class='add'>+			ifobj-&gt;xdp_zc_max_segs = query_opts.xdp_zc_max_segs;</div><div class='add'>+		} else {</div><div class='add'>+			ifobj-&gt;xdp_zc_max_segs = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_send_receive(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_send_receive_2k_frame(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;ifobj_tx-&gt;umem-&gt;frame_size = 2048;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;frame_size = 2048;</div><div class='add'>+	if (pkt_stream_replace(test, DEFAULT_PKT_CNT, MIN_PKT_SIZE))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_poll_rx(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;ifobj_rx-&gt;use_poll = true;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_poll_tx(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;ifobj_tx-&gt;use_poll = true;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_aligned_inv_desc(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	return testapp_invalid_desc(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_aligned_inv_desc_2k_frame(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;ifobj_tx-&gt;umem-&gt;frame_size = 2048;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;frame_size = 2048;</div><div class='add'>+	return testapp_invalid_desc(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_unaligned_inv_desc(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;ifobj_tx-&gt;umem-&gt;unaligned_mode = true;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;unaligned_mode = true;</div><div class='add'>+	return testapp_invalid_desc(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_unaligned_inv_desc_4001_frame(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	u64 page_size, umem_size;</div><div class='add'>+</div><div class='add'>+	/* Odd frame size so the UMEM doesn't end near a page boundary. */</div><div class='add'>+	test-&gt;ifobj_tx-&gt;umem-&gt;frame_size = 4001;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;frame_size = 4001;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;umem-&gt;unaligned_mode = true;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;unaligned_mode = true;</div><div class='add'>+	/* This test exists to test descriptors that staddle the end of</div><div class='add'>+	 * the UMEM but not a page.</div><div class='add'>+	 */</div><div class='add'>+	page_size = sysconf(_SC_PAGESIZE);</div><div class='add'>+	umem_size = test-&gt;ifobj_tx-&gt;umem-&gt;num_frames * test-&gt;ifobj_tx-&gt;umem-&gt;frame_size;</div><div class='add'>+	assert(umem_size % page_size &gt; MIN_PKT_SIZE);</div><div class='add'>+	assert(umem_size % page_size &lt; page_size - MIN_PKT_SIZE);</div><div class='add'>+</div><div class='add'>+	return testapp_invalid_desc(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_aligned_inv_desc_mb(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	return testapp_invalid_desc_mb(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_unaligned_inv_desc_mb(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;ifobj_tx-&gt;umem-&gt;unaligned_mode = true;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;unaligned_mode = true;</div><div class='add'>+	return testapp_invalid_desc_mb(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_xdp_metadata(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	return testapp_xdp_metadata_copy(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_xdp_metadata_mb(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='add'>+	return testapp_xdp_metadata_copy(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_hw_sw_min_ring_size(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	test-&gt;set_ring = true;</div><div class='add'>+	test-&gt;total_steps = 2;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;ring.tx_pending = DEFAULT_BATCH_SIZE;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;ring.rx_pending = DEFAULT_BATCH_SIZE * 2;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;xsk-&gt;batch_size = 1;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk-&gt;batch_size = 1;</div><div class='add'>+	ret = testapp_validate_traffic(test);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set batch size to hw_ring_size - 1 */</div><div class='add'>+	test-&gt;ifobj_tx-&gt;xsk-&gt;batch_size = DEFAULT_BATCH_SIZE - 1;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk-&gt;batch_size = DEFAULT_BATCH_SIZE - 1;</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_hw_sw_max_ring_size(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	u32 max_descs = XSK_RING_PROD__DEFAULT_NUM_DESCS * 4;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	test-&gt;set_ring = true;</div><div class='add'>+	test-&gt;total_steps = 2;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;ring.tx_pending = test-&gt;ifobj_tx-&gt;ring.tx_max_pending;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;ring.rx_pending  = test-&gt;ifobj_tx-&gt;ring.rx_max_pending;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;num_frames = max_descs;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;fill_size = max_descs;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;umem-&gt;comp_size = max_descs;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;xsk-&gt;batch_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk-&gt;batch_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;</div><div class='add'>+</div><div class='add'>+	ret = testapp_validate_traffic(test);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set batch_size to 8152 for testing, as the ice HW ignores the 3 lowest bits when</div><div class='add'>+	 * updating the Rx HW tail register.</div><div class='add'>+	 */</div><div class='add'>+	test-&gt;ifobj_tx-&gt;xsk-&gt;batch_size = test-&gt;ifobj_tx-&gt;ring.tx_max_pending - 8;</div><div class='add'>+	test-&gt;ifobj_rx-&gt;xsk-&gt;batch_size = test-&gt;ifobj_tx-&gt;ring.tx_max_pending - 8;</div><div class='add'>+	if (pkt_stream_replace(test, max_descs, MIN_PKT_SIZE)) {</div><div class='add'>+		clean_sockets(test, test-&gt;ifobj_tx);</div><div class='add'>+		clean_sockets(test, test-&gt;ifobj_rx);</div><div class='add'>+		clean_umem(test, test-&gt;ifobj_rx, test-&gt;ifobj_tx);</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int testapp_xdp_adjust_tail(struct test_spec *test, int adjust_value)</div><div class='add'>+{</div><div class='add'>+	struct xsk_xdp_progs *skel_rx = test-&gt;ifobj_rx-&gt;xdp_progs;</div><div class='add'>+	struct xsk_xdp_progs *skel_tx = test-&gt;ifobj_tx-&gt;xdp_progs;</div><div class='add'>+</div><div class='add'>+	test_spec_set_xdp_prog(test, skel_rx-&gt;progs.xsk_xdp_adjust_tail,</div><div class='add'>+			       skel_tx-&gt;progs.xsk_xdp_adjust_tail,</div><div class='add'>+			       skel_rx-&gt;maps.xsk, skel_tx-&gt;maps.xsk);</div><div class='add'>+</div><div class='add'>+	skel_rx-&gt;bss-&gt;adjust_value = adjust_value;</div><div class='add'>+</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int testapp_adjust_tail(struct test_spec *test, u32 value, u32 pkt_len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	test-&gt;adjust_tail_support = true;</div><div class='add'>+	test-&gt;adjust_tail = true;</div><div class='add'>+	test-&gt;total_steps = 1;</div><div class='add'>+</div><div class='add'>+	ret = pkt_stream_replace_ifobject(test-&gt;ifobj_tx, DEFAULT_BATCH_SIZE, pkt_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	ret = pkt_stream_replace_ifobject(test-&gt;ifobj_rx, DEFAULT_BATCH_SIZE, pkt_len + value);</div><div class='add'>+	if (ret)</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+</div><div class='add'>+	ret = testapp_xdp_adjust_tail(test, value);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!test-&gt;adjust_tail_support) {</div><div class='add'>+		ksft_print_msg("%s %sResize pkt with bpf_xdp_adjust_tail() not supported\n",</div><div class='add'>+				      mode_string(test), busy_poll_string(test));</div><div class='add'>+		return TEST_SKIP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_adjust_tail_shrink(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	/* Shrink by 4 bytes for testing purpose */</div><div class='add'>+	return testapp_adjust_tail(test, -4, MIN_PKT_SIZE * 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_adjust_tail_shrink_mb(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='add'>+	/* Shrink by the frag size */</div><div class='add'>+	return testapp_adjust_tail(test, -XSK_UMEM__MAX_FRAME_SIZE, XSK_UMEM__LARGE_FRAME_SIZE * 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_adjust_tail_grow(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	/* Grow by 4 bytes for testing purpose */</div><div class='add'>+	return testapp_adjust_tail(test, 4, MIN_PKT_SIZE * 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_adjust_tail_grow_mb(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='add'>+	/* Grow by (frag_size - last_frag_Size) - 1 to stay inside the last fragment */</div><div class='add'>+	return testapp_adjust_tail(test, (XSK_UMEM__MAX_FRAME_SIZE / 2) - 1,</div><div class='add'>+				   XSK_UMEM__LARGE_FRAME_SIZE * 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int testapp_tx_queue_consumer(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	int nr_packets;</div><div class='add'>+</div><div class='add'>+	if (test-&gt;mode == TEST_MODE_ZC) {</div><div class='add'>+		ksft_print_msg("Can not run TX_QUEUE_CONSUMER test for ZC mode\n");</div><div class='add'>+		return TEST_SKIP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nr_packets = MAX_TX_BUDGET_DEFAULT + 1;</div><div class='add'>+	if (pkt_stream_replace(test, nr_packets, MIN_PKT_SIZE))</div><div class='add'>+		return TEST_FAILURE;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;xsk-&gt;batch_size = nr_packets;</div><div class='add'>+	test-&gt;ifobj_tx-&gt;xsk-&gt;check_consumer = true;</div><div class='add'>+</div><div class='add'>+	return testapp_validate_traffic(test);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ifobject *ifobject_create(void)</div><div class='add'>+{</div><div class='add'>+	struct ifobject *ifobj;</div><div class='add'>+</div><div class='add'>+	ifobj = calloc(1, sizeof(struct ifobject));</div><div class='add'>+	if (!ifobj)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ifobj-&gt;xsk_arr = calloc(MAX_SOCKETS, sizeof(*ifobj-&gt;xsk_arr));</div><div class='add'>+	if (!ifobj-&gt;xsk_arr)</div><div class='add'>+		goto out_xsk_arr;</div><div class='add'>+</div><div class='add'>+	ifobj-&gt;umem = calloc(1, sizeof(*ifobj-&gt;umem));</div><div class='add'>+	if (!ifobj-&gt;umem)</div><div class='add'>+		goto out_umem;</div><div class='add'>+</div><div class='add'>+	return ifobj;</div><div class='add'>+</div><div class='add'>+out_umem:</div><div class='add'>+	free(ifobj-&gt;xsk_arr);</div><div class='add'>+out_xsk_arr:</div><div class='add'>+	free(ifobj);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ifobject_delete(struct ifobject *ifobj)</div><div class='add'>+{</div><div class='add'>+	free(ifobj-&gt;umem);</div><div class='add'>+	free(ifobj-&gt;xsk_arr);</div><div class='add'>+	free(ifobj);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/test_xsk.h b/tools/testing/selftests/bpf/prog_tests/test_xsk.h<br/>new file mode 100644<br/>index 000000000000..8fc78a057de0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/test_xsk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/test_xsk.h</a></div><div class='hunk'>@@ -0,0 +1,298 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef TEST_XSK_H_</div><div class='add'>+#define TEST_XSK_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/if_xdp.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../kselftest.h"</div><div class='add'>+#include "xsk.h"</div><div class='add'>+</div><div class='add'>+#ifndef SO_PREFER_BUSY_POLL</div><div class='add'>+#define SO_PREFER_BUSY_POLL 69</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef SO_BUSY_POLL_BUDGET</div><div class='add'>+#define SO_BUSY_POLL_BUDGET 70</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define TEST_PASS 0</div><div class='add'>+#define TEST_FAILURE -1</div><div class='add'>+#define TEST_CONTINUE 1</div><div class='add'>+#define TEST_SKIP 2</div><div class='add'>+</div><div class='add'>+#define DEFAULT_PKT_CNT			(4 * 1024)</div><div class='add'>+#define DEFAULT_UMEM_BUFFERS		(DEFAULT_PKT_CNT / 4)</div><div class='add'>+#define HUGEPAGE_SIZE			(2 * 1024 * 1024)</div><div class='add'>+#define MIN_PKT_SIZE			64</div><div class='add'>+#define MAX_ETH_PKT_SIZE		1518</div><div class='add'>+#define MAX_INTERFACE_NAME_CHARS	16</div><div class='add'>+#define MAX_TEST_NAME_SIZE		48</div><div class='add'>+#define SOCK_RECONF_CTR			10</div><div class='add'>+#define USLEEP_MAX			10000</div><div class='add'>+</div><div class='add'>+extern bool opt_verbose;</div><div class='add'>+#define print_verbose(x...) do { if (opt_verbose) ksft_print_msg(x); } while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline u32 ceil_u32(u32 a, u32 b)</div><div class='add'>+{</div><div class='add'>+	return (a + b - 1) / b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 ceil_u64(u64 a, u64 b)</div><div class='add'>+{</div><div class='add'>+	return (a + b - 1) / b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Simple test */</div><div class='add'>+enum test_mode {</div><div class='add'>+	TEST_MODE_SKB,</div><div class='add'>+	TEST_MODE_DRV,</div><div class='add'>+	TEST_MODE_ZC,</div><div class='add'>+	TEST_MODE_ALL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ifobject;</div><div class='add'>+struct test_spec;</div><div class='add'>+typedef int (*validation_func_t)(struct ifobject *ifobj);</div><div class='add'>+typedef void *(*thread_func_t)(void *arg);</div><div class='add'>+typedef int (*test_func_t)(struct test_spec *test);</div><div class='add'>+</div><div class='add'>+struct xsk_socket_info {</div><div class='add'>+	struct xsk_ring_cons rx;</div><div class='add'>+	struct xsk_ring_prod tx;</div><div class='add'>+	struct xsk_umem_info *umem;</div><div class='add'>+	struct xsk_socket *xsk;</div><div class='add'>+	struct pkt_stream *pkt_stream;</div><div class='add'>+	u32 outstanding_tx;</div><div class='add'>+	u32 rxqsize;</div><div class='add'>+	u32 batch_size;</div><div class='add'>+	u8 dst_mac[ETH_ALEN];</div><div class='add'>+	u8 src_mac[ETH_ALEN];</div><div class='add'>+	bool check_consumer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int kick_rx(struct xsk_socket_info *xsk);</div><div class='add'>+int kick_tx(struct xsk_socket_info *xsk);</div><div class='add'>+</div><div class='add'>+struct xsk_umem_info {</div><div class='add'>+	struct xsk_ring_prod fq;</div><div class='add'>+	struct xsk_ring_cons cq;</div><div class='add'>+	struct xsk_umem *umem;</div><div class='add'>+	u64 next_buffer;</div><div class='add'>+	u32 num_frames;</div><div class='add'>+	u32 frame_headroom;</div><div class='add'>+	void *buffer;</div><div class='add'>+	u32 frame_size;</div><div class='add'>+	u32 base_addr;</div><div class='add'>+	u32 fill_size;</div><div class='add'>+	u32 comp_size;</div><div class='add'>+	bool unaligned_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct set_hw_ring {</div><div class='add'>+	u32 default_tx;</div><div class='add'>+	u32 default_rx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int hw_ring_size_reset(struct ifobject *ifobj);</div><div class='add'>+</div><div class='add'>+struct ifobject {</div><div class='add'>+	char ifname[MAX_INTERFACE_NAME_CHARS];</div><div class='add'>+	struct xsk_socket_info *xsk;</div><div class='add'>+	struct xsk_socket_info *xsk_arr;</div><div class='add'>+	struct xsk_umem_info *umem;</div><div class='add'>+	thread_func_t func_ptr;</div><div class='add'>+	validation_func_t validation_func;</div><div class='add'>+	struct xsk_xdp_progs *xdp_progs;</div><div class='add'>+	struct bpf_map *xskmap;</div><div class='add'>+	struct bpf_program *xdp_prog;</div><div class='add'>+	struct ethtool_ringparam ring;</div><div class='add'>+	struct set_hw_ring set_ring;</div><div class='add'>+	enum test_mode mode;</div><div class='add'>+	int ifindex;</div><div class='add'>+	int mtu;</div><div class='add'>+	u32 bind_flags;</div><div class='add'>+	u32 xdp_zc_max_segs;</div><div class='add'>+	bool tx_on;</div><div class='add'>+	bool rx_on;</div><div class='add'>+	bool use_poll;</div><div class='add'>+	bool busy_poll;</div><div class='add'>+	bool use_fill_ring;</div><div class='add'>+	bool release_rx;</div><div class='add'>+	bool shared_umem;</div><div class='add'>+	bool use_metadata;</div><div class='add'>+	bool unaligned_supp;</div><div class='add'>+	bool multi_buff_supp;</div><div class='add'>+	bool multi_buff_zc_supp;</div><div class='add'>+	bool hw_ring_size_supp;</div><div class='add'>+};</div><div class='add'>+struct ifobject *ifobject_create(void);</div><div class='add'>+void ifobject_delete(struct ifobject *ifobj);</div><div class='add'>+int init_iface(struct ifobject *ifobj, thread_func_t func_ptr);</div><div class='add'>+</div><div class='add'>+int xsk_configure_umem(struct ifobject *ifobj, struct xsk_umem_info *umem, void *buffer, u64 size);</div><div class='add'>+int xsk_configure_socket(struct xsk_socket_info *xsk, struct xsk_umem_info *umem,</div><div class='add'>+			 struct ifobject *ifobject, bool shared);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct pkt {</div><div class='add'>+	int offset;</div><div class='add'>+	u32 len;</div><div class='add'>+	u32 pkt_nb;</div><div class='add'>+	bool valid;</div><div class='add'>+	u16 options;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pkt_stream {</div><div class='add'>+	u32 nb_pkts;</div><div class='add'>+	u32 current_pkt_nb;</div><div class='add'>+	struct pkt *pkts;</div><div class='add'>+	u32 max_pkt_len;</div><div class='add'>+	u32 nb_rx_pkts;</div><div class='add'>+	u32 nb_valid_entries;</div><div class='add'>+	bool verbatim;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool pkt_continues(u32 options)</div><div class='add'>+{</div><div class='add'>+	return options &amp; XDP_PKT_CONTD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pkt_stream *pkt_stream_generate(u32 nb_pkts, u32 pkt_len);</div><div class='add'>+void pkt_stream_delete(struct pkt_stream *pkt_stream);</div><div class='add'>+void pkt_stream_reset(struct pkt_stream *pkt_stream);</div><div class='add'>+void pkt_stream_restore_default(struct test_spec *test);</div><div class='add'>+</div><div class='add'>+struct test_spec {</div><div class='add'>+	struct ifobject *ifobj_tx;</div><div class='add'>+	struct ifobject *ifobj_rx;</div><div class='add'>+	struct pkt_stream *tx_pkt_stream_default;</div><div class='add'>+	struct pkt_stream *rx_pkt_stream_default;</div><div class='add'>+	struct bpf_program *xdp_prog_rx;</div><div class='add'>+	struct bpf_program *xdp_prog_tx;</div><div class='add'>+	struct bpf_map *xskmap_rx;</div><div class='add'>+	struct bpf_map *xskmap_tx;</div><div class='add'>+	test_func_t test_func;</div><div class='add'>+	int mtu;</div><div class='add'>+	u16 total_steps;</div><div class='add'>+	u16 current_step;</div><div class='add'>+	u16 nb_sockets;</div><div class='add'>+	bool fail;</div><div class='add'>+	bool set_ring;</div><div class='add'>+	bool adjust_tail;</div><div class='add'>+	bool adjust_tail_support;</div><div class='add'>+	enum test_mode mode;</div><div class='add'>+	char name[MAX_TEST_NAME_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define busy_poll_string(test) (test)-&gt;ifobj_tx-&gt;busy_poll ? "BUSY-POLL " : ""</div><div class='add'>+static inline char *mode_string(struct test_spec *test)</div><div class='add'>+{</div><div class='add'>+	switch (test-&gt;mode) {</div><div class='add'>+	case TEST_MODE_SKB:</div><div class='add'>+		return "SKB";</div><div class='add'>+	case TEST_MODE_DRV:</div><div class='add'>+		return "DRV";</div><div class='add'>+	case TEST_MODE_ZC:</div><div class='add'>+		return "ZC";</div><div class='add'>+	default:</div><div class='add'>+		return "BOGUS";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_init(struct test_spec *test, struct ifobject *ifobj_tx,</div><div class='add'>+	       struct ifobject *ifobj_rx, enum test_mode mode,</div><div class='add'>+	       const struct test_spec *test_to_run);</div><div class='add'>+</div><div class='add'>+int testapp_adjust_tail_grow(struct test_spec *test);</div><div class='add'>+int testapp_adjust_tail_grow_mb(struct test_spec *test);</div><div class='add'>+int testapp_adjust_tail_shrink(struct test_spec *test);</div><div class='add'>+int testapp_adjust_tail_shrink_mb(struct test_spec *test);</div><div class='add'>+int testapp_aligned_inv_desc(struct test_spec *test);</div><div class='add'>+int testapp_aligned_inv_desc_2k_frame(struct test_spec *test);</div><div class='add'>+int testapp_aligned_inv_desc_mb(struct test_spec *test);</div><div class='add'>+int testapp_bidirectional(struct test_spec *test);</div><div class='add'>+int testapp_headroom(struct test_spec *test);</div><div class='add'>+int testapp_hw_sw_max_ring_size(struct test_spec *test);</div><div class='add'>+int testapp_hw_sw_min_ring_size(struct test_spec *test);</div><div class='add'>+int testapp_poll_rx(struct test_spec *test);</div><div class='add'>+int testapp_poll_rxq_tmout(struct test_spec *test);</div><div class='add'>+int testapp_poll_tx(struct test_spec *test);</div><div class='add'>+int testapp_poll_txq_tmout(struct test_spec *test);</div><div class='add'>+int testapp_send_receive(struct test_spec *test);</div><div class='add'>+int testapp_send_receive_2k_frame(struct test_spec *test);</div><div class='add'>+int testapp_send_receive_mb(struct test_spec *test);</div><div class='add'>+int testapp_send_receive_unaligned(struct test_spec *test);</div><div class='add'>+int testapp_send_receive_unaligned_mb(struct test_spec *test);</div><div class='add'>+int testapp_single_pkt(struct test_spec *test);</div><div class='add'>+int testapp_stats_fill_empty(struct test_spec *test);</div><div class='add'>+int testapp_stats_rx_dropped(struct test_spec *test);</div><div class='add'>+int testapp_stats_tx_invalid_descs(struct test_spec *test);</div><div class='add'>+int testapp_stats_rx_full(struct test_spec *test);</div><div class='add'>+int testapp_teardown(struct test_spec *test);</div><div class='add'>+int testapp_too_many_frags(struct test_spec *test);</div><div class='add'>+int testapp_tx_queue_consumer(struct test_spec *test);</div><div class='add'>+int testapp_unaligned_inv_desc(struct test_spec *test);</div><div class='add'>+int testapp_unaligned_inv_desc_4001_frame(struct test_spec *test);</div><div class='add'>+int testapp_unaligned_inv_desc_mb(struct test_spec *test);</div><div class='add'>+int testapp_xdp_drop(struct test_spec *test);</div><div class='add'>+int testapp_xdp_metadata(struct test_spec *test);</div><div class='add'>+int testapp_xdp_metadata_mb(struct test_spec *test);</div><div class='add'>+int testapp_xdp_prog_cleanup(struct test_spec *test);</div><div class='add'>+int testapp_xdp_shared_umem(struct test_spec *test);</div><div class='add'>+</div><div class='add'>+void *worker_testapp_validate_rx(void *arg);</div><div class='add'>+void *worker_testapp_validate_tx(void *arg);</div><div class='add'>+</div><div class='add'>+static const struct test_spec tests[] = {</div><div class='add'>+	{.name = "SEND_RECEIVE", .test_func = testapp_send_receive},</div><div class='add'>+	{.name = "SEND_RECEIVE_2K_FRAME", .test_func = testapp_send_receive_2k_frame},</div><div class='add'>+	{.name = "SEND_RECEIVE_SINGLE_PKT", .test_func = testapp_single_pkt},</div><div class='add'>+	{.name = "POLL_RX", .test_func = testapp_poll_rx},</div><div class='add'>+	{.name = "POLL_TX", .test_func = testapp_poll_tx},</div><div class='add'>+	{.name = "POLL_RXQ_FULL", .test_func = testapp_poll_rxq_tmout},</div><div class='add'>+	{.name = "POLL_TXQ_FULL", .test_func = testapp_poll_txq_tmout},</div><div class='add'>+	{.name = "ALIGNED_INV_DESC", .test_func = testapp_aligned_inv_desc},</div><div class='add'>+	{.name = "ALIGNED_INV_DESC_2K_FRAME_SIZE", .test_func = testapp_aligned_inv_desc_2k_frame},</div><div class='add'>+	{.name = "UMEM_HEADROOM", .test_func = testapp_headroom},</div><div class='add'>+	{.name = "BIDIRECTIONAL", .test_func = testapp_bidirectional},</div><div class='add'>+	{.name = "STAT_RX_DROPPED", .test_func = testapp_stats_rx_dropped},</div><div class='add'>+	{.name = "STAT_TX_INVALID", .test_func = testapp_stats_tx_invalid_descs},</div><div class='add'>+	{.name = "STAT_RX_FULL", .test_func = testapp_stats_rx_full},</div><div class='add'>+	{.name = "STAT_FILL_EMPTY", .test_func = testapp_stats_fill_empty},</div><div class='add'>+	{.name = "XDP_PROG_CLEANUP", .test_func = testapp_xdp_prog_cleanup},</div><div class='add'>+	{.name = "XDP_DROP_HALF", .test_func = testapp_xdp_drop},</div><div class='add'>+	{.name = "XDP_SHARED_UMEM", .test_func = testapp_xdp_shared_umem},</div><div class='add'>+	{.name = "XDP_METADATA_COPY", .test_func = testapp_xdp_metadata},</div><div class='add'>+	{.name = "XDP_METADATA_COPY_MULTI_BUFF", .test_func = testapp_xdp_metadata_mb},</div><div class='add'>+	{.name = "ALIGNED_INV_DESC_MULTI_BUFF", .test_func = testapp_aligned_inv_desc_mb},</div><div class='add'>+	{.name = "TOO_MANY_FRAGS", .test_func = testapp_too_many_frags},</div><div class='add'>+	{.name = "XDP_ADJUST_TAIL_SHRINK", .test_func = testapp_adjust_tail_shrink},</div><div class='add'>+	{.name = "TX_QUEUE_CONSUMER", .test_func = testapp_tx_queue_consumer},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+static const struct test_spec ci_skip_tests[] = {</div><div class='add'>+	/* Flaky tests */</div><div class='add'>+	{.name = "XDP_ADJUST_TAIL_SHRINK_MULTI_BUFF", .test_func = testapp_adjust_tail_shrink_mb},</div><div class='add'>+	{.name = "XDP_ADJUST_TAIL_GROW", .test_func = testapp_adjust_tail_grow},</div><div class='add'>+	{.name = "XDP_ADJUST_TAIL_GROW_MULTI_BUFF", .test_func = testapp_adjust_tail_grow_mb},</div><div class='add'>+	{.name = "SEND_RECEIVE_9K_PACKETS", .test_func = testapp_send_receive_mb},</div><div class='add'>+	/* Tests with huge page dependency */</div><div class='add'>+	{.name = "SEND_RECEIVE_UNALIGNED", .test_func = testapp_send_receive_unaligned},</div><div class='add'>+	{.name = "UNALIGNED_INV_DESC", .test_func = testapp_unaligned_inv_desc},</div><div class='add'>+	{.name = "UNALIGNED_INV_DESC_4001_FRAME_SIZE",</div><div class='add'>+	 .test_func = testapp_unaligned_inv_desc_4001_frame},</div><div class='add'>+	{.name = "SEND_RECEIVE_UNALIGNED_9K_PACKETS",</div><div class='add'>+	 .test_func = testapp_send_receive_unaligned_mb},</div><div class='add'>+	{.name = "UNALIGNED_INV_DESC_MULTI_BUFF", .test_func = testapp_unaligned_inv_desc_mb},</div><div class='add'>+	/* Test with HW ring size dependency */</div><div class='add'>+	{.name = "HW_SW_MIN_RING_SIZE", .test_func = testapp_hw_sw_min_ring_size},</div><div class='add'>+	{.name = "HW_SW_MAX_RING_SIZE", .test_func = testapp_hw_sw_max_ring_size},</div><div class='add'>+	/* Too long test */</div><div class='add'>+	{.name = "TEARDOWN", .test_func = testapp_teardown},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif				/* TEST_XSK_H_ */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/timer.c b/tools/testing/selftests/bpf/prog_tests/timer.c<br/>index d66687f1ee6a..34f9ccce2602 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/timer.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/timer.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #include &lt;test_progs.h&gt;</div><div class='ctx'> #include "timer.skel.h"</div><div class='ctx'> #include "timer_failure.skel.h"</div><div class='add'>+#include "timer_interrupt.skel.h"</div><div class='ctx'> </div><div class='ctx'> #define NUM_THR 8</div><div class='ctx'> </div><div class='hunk'>@@ -86,6 +87,10 @@ void serial_test_timer(void)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	timer_skel = timer__open_and_load();</div><div class='add'>+	if (!timer_skel &amp;&amp; errno == EOPNOTSUPP) {</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	if (!ASSERT_OK_PTR(timer_skel, "timer_skel_load"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -95,3 +100,36 @@ void serial_test_timer(void)</div><div class='ctx'> </div><div class='ctx'> 	RUN_TESTS(timer_failure);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void test_timer_interrupt(void)</div><div class='add'>+{</div><div class='add'>+	struct timer_interrupt *skel = NULL;</div><div class='add'>+	int err, prog_fd;</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, opts);</div><div class='add'>+</div><div class='add'>+	skel = timer_interrupt__open_and_load();</div><div class='add'>+	if (!skel &amp;&amp; errno == EOPNOTSUPP) {</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "timer_interrupt__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = timer_interrupt__attach(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "timer_interrupt__attach"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.test_timer_interrupt);</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK(err, "bpf_prog_test_run_opts"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	usleep(50);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;in_interrupt, 0, "in_interrupt");</div><div class='add'>+	if (skel-&gt;bss-&gt;preempt_count)</div><div class='add'>+		ASSERT_NEQ(skel-&gt;bss-&gt;in_interrupt_cb, 0, "in_interrupt_cb");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	timer_interrupt__destroy(skel);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/timer_crash.c b/tools/testing/selftests/bpf/prog_tests/timer_crash.c<br/>index f74b82305da8..b841597c8a3a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/timer_crash.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/timer_crash.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/timer_crash.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/timer_crash.c</a></div><div class='hunk'>@@ -12,6 +12,10 @@ static void test_timer_crash_mode(int mode)</div><div class='ctx'> 	struct timer_crash *skel;</div><div class='ctx'> </div><div class='ctx'> 	skel = timer_crash__open_and_load();</div><div class='add'>+	if (!skel &amp;&amp; errno == EOPNOTSUPP) {</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "timer_crash__open_and_load"))</div><div class='ctx'> 		return;</div><div class='ctx'> 	skel-&gt;bss-&gt;pid = getpid();</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/timer_lockup.c b/tools/testing/selftests/bpf/prog_tests/timer_lockup.c<br/>index 1a2f99596916..eb303fa1e09a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/timer_lockup.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/timer_lockup.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/timer_lockup.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/timer_lockup.c</a></div><div class='hunk'>@@ -59,6 +59,10 @@ void test_timer_lockup(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skel = timer_lockup__open_and_load();</div><div class='add'>+	if (!skel &amp;&amp; errno == EOPNOTSUPP) {</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "timer_lockup__open_and_load"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/timer_mim.c b/tools/testing/selftests/bpf/prog_tests/timer_mim.c<br/>index 9ff7843909e7..c930c7d7105b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/timer_mim.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/timer_mim.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/timer_mim.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/timer_mim.c</a></div><div class='hunk'>@@ -65,6 +65,10 @@ void serial_test_timer_mim(void)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	timer_skel = timer_mim__open_and_load();</div><div class='add'>+	if (!timer_skel &amp;&amp; errno == EOPNOTSUPP) {</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	if (!ASSERT_OK_PTR(timer_skel, "timer_skel_load"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/token.c b/tools/testing/selftests/bpf/prog_tests/token.c<br/>index c3ab9b6fb069..b81dde283052 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/token.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/token.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/token.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/token.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include "priv_prog.skel.h"</div><div class='ctx'> #include "dummy_st_ops_success.skel.h"</div><div class='ctx'> #include "token_lsm.skel.h"</div><div class='add'>+#include "priv_freplace_prog.skel.h"</div><div class='ctx'> </div><div class='ctx'> static inline int sys_mount(const char *dev_name, const char *dir_name,</div><div class='ctx'> 			    const char *type, unsigned long flags,</div><div class='hunk'>@@ -114,7 +115,7 @@ static int create_bpffs_fd(void)</div><div class='ctx'> </div><div class='ctx'> static int materialize_bpffs_fd(int fs_fd, struct bpffs_opts *opts)</div><div class='ctx'> {</div><div class='del'>-	int mnt_fd, err;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* set up token delegation mount options */</div><div class='ctx'> 	err = set_delegate_mask(fs_fd, "delegate_cmds", opts-&gt;cmds, opts-&gt;cmds_str);</div><div class='hunk'>@@ -135,12 +136,7 @@ static int materialize_bpffs_fd(int fs_fd, struct bpffs_opts *opts)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return -errno;</div><div class='ctx'> </div><div class='del'>-	/* create O_PATH fd for detached mount */</div><div class='del'>-	mnt_fd = sys_fsmount(fs_fd, 0, 0);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return -errno;</div><div class='del'>-</div><div class='del'>-	return mnt_fd;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* send FD over Unix domain (AF_UNIX) socket */</div><div class='hunk'>@@ -286,6 +282,7 @@ static void child(int sock_fd, struct bpffs_opts *opts, child_callback_fn callba</div><div class='ctx'> {</div><div class='ctx'> 	int mnt_fd = -1, fs_fd = -1, err = 0, bpffs_fd = -1, token_fd = -1;</div><div class='ctx'> 	struct token_lsm *lsm_skel = NULL;</div><div class='add'>+	char one;</div><div class='ctx'> </div><div class='ctx'> 	/* load and attach LSM "policy" before we go into unpriv userns */</div><div class='ctx'> 	lsm_skel = token_lsm__open_and_load();</div><div class='hunk'>@@ -332,13 +329,19 @@ static void child(int sock_fd, struct bpffs_opts *opts, child_callback_fn callba</div><div class='ctx'> 	err = sendfd(sock_fd, fs_fd);</div><div class='ctx'> 	if (!ASSERT_OK(err, "send_fs_fd"))</div><div class='ctx'> 		goto cleanup;</div><div class='del'>-	zclose(fs_fd);</div><div class='add'>+</div><div class='add'>+	/* wait that the parent reads the fd, does the fsconfig() calls</div><div class='add'>+	 * and send us a signal that it is done</div><div class='add'>+	 */</div><div class='add'>+	err = read(sock_fd, &amp;one, sizeof(one));</div><div class='add'>+	if (!ASSERT_GE(err, 0, "read_one"))</div><div class='add'>+		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	/* avoid mucking around with mount namespaces and mounting at</div><div class='del'>-	 * well-known path, just get detach-mounted BPF FS fd back from parent</div><div class='add'>+	 * well-known path, just create O_PATH fd for detached mount</div><div class='ctx'> 	 */</div><div class='del'>-	err = recvfd(sock_fd, &amp;mnt_fd);</div><div class='del'>-	if (!ASSERT_OK(err, "recv_mnt_fd"))</div><div class='add'>+	mnt_fd = sys_fsmount(fs_fd, 0, 0);</div><div class='add'>+	if (!ASSERT_OK_FD(mnt_fd, "mnt_fd"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	/* try to fspick() BPF FS and try to add some delegation options */</div><div class='hunk'>@@ -428,24 +431,24 @@ again:</div><div class='ctx'> </div><div class='ctx'> static void parent(int child_pid, struct bpffs_opts *bpffs_opts, int sock_fd)</div><div class='ctx'> {</div><div class='del'>-	int fs_fd = -1, mnt_fd = -1, token_fd = -1, err;</div><div class='add'>+	int fs_fd = -1, token_fd = -1, err;</div><div class='add'>+	char one = 1;</div><div class='ctx'> </div><div class='ctx'> 	err = recvfd(sock_fd, &amp;fs_fd);</div><div class='ctx'> 	if (!ASSERT_OK(err, "recv_bpffs_fd"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	mnt_fd = materialize_bpffs_fd(fs_fd, bpffs_opts);</div><div class='del'>-	if (!ASSERT_GE(mnt_fd, 0, "materialize_bpffs_fd")) {</div><div class='add'>+	err = materialize_bpffs_fd(fs_fd, bpffs_opts);</div><div class='add'>+	if (!ASSERT_GE(err, 0, "materialize_bpffs_fd")) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='del'>-	zclose(fs_fd);</div><div class='ctx'> </div><div class='del'>-	/* pass BPF FS context object to parent */</div><div class='del'>-	err = sendfd(sock_fd, mnt_fd);</div><div class='del'>-	if (!ASSERT_OK(err, "send_mnt_fd"))</div><div class='add'>+	/* notify the child that we did the fsconfig() calls and it can proceed. */</div><div class='add'>+	err = write(sock_fd, &amp;one, sizeof(one));</div><div class='add'>+	if (!ASSERT_EQ(err, sizeof(one), "send_one"))</div><div class='ctx'> 		goto cleanup;</div><div class='del'>-	zclose(mnt_fd);</div><div class='add'>+	zclose(fs_fd);</div><div class='ctx'> </div><div class='ctx'> 	/* receive BPF token FD back from child for some extra tests */</div><div class='ctx'> 	err = recvfd(sock_fd, &amp;token_fd);</div><div class='hunk'>@@ -458,7 +461,6 @@ static void parent(int child_pid, struct bpffs_opts *bpffs_opts, int sock_fd)</div><div class='ctx'> cleanup:</div><div class='ctx'> 	zclose(sock_fd);</div><div class='ctx'> 	zclose(fs_fd);</div><div class='del'>-	zclose(mnt_fd);</div><div class='ctx'> 	zclose(token_fd);</div><div class='ctx'> </div><div class='ctx'> 	if (child_pid &gt; 0)</div><div class='hunk'>@@ -788,6 +790,84 @@ static int userns_obj_priv_prog(int mnt_fd, struct token_lsm *lsm_skel)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int userns_obj_priv_freplace_setup(int mnt_fd, struct priv_freplace_prog **fr_skel,</div><div class='add'>+					  struct priv_prog **skel, int *tgt_fd)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_object_open_opts, opts);</div><div class='add'>+	int err;</div><div class='add'>+	char buf[256];</div><div class='add'>+</div><div class='add'>+	/* use bpf_token_path to provide BPF FS path */</div><div class='add'>+	snprintf(buf, sizeof(buf), "/proc/self/fd/%d", mnt_fd);</div><div class='add'>+	opts.bpf_token_path = buf;</div><div class='add'>+	*skel = priv_prog__open_opts(&amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(*skel, "priv_prog__open_opts"))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	err = priv_prog__load(*skel);</div><div class='add'>+	if (!ASSERT_OK(err, "priv_prog__load"))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*fr_skel = priv_freplace_prog__open_opts(&amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(*skel, "priv_freplace_prog__open_opts"))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*tgt_fd = bpf_program__fd((*skel)-&gt;progs.xdp_prog1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Verify that freplace works from user namespace, because bpf token is loaded</div><div class='add'>+ * in bpf_object__prepare</div><div class='add'>+ */</div><div class='add'>+static int userns_obj_priv_freplace_prog(int mnt_fd, struct token_lsm *lsm_skel)</div><div class='add'>+{</div><div class='add'>+	struct priv_freplace_prog *fr_skel = NULL;</div><div class='add'>+	struct priv_prog *skel = NULL;</div><div class='add'>+	int err, tgt_fd;</div><div class='add'>+</div><div class='add'>+	err = userns_obj_priv_freplace_setup(mnt_fd, &amp;fr_skel, &amp;skel, &amp;tgt_fd);</div><div class='add'>+	if (!ASSERT_OK(err, "setup"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_object__prepare(fr_skel-&gt;obj);</div><div class='add'>+	if (!ASSERT_OK(err, "freplace__prepare"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_program__set_attach_target(fr_skel-&gt;progs.new_xdp_prog2, tgt_fd, "xdp_prog1");</div><div class='add'>+	if (!ASSERT_OK(err, "set_attach_target"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = priv_freplace_prog__load(fr_skel);</div><div class='add'>+	ASSERT_OK(err, "priv_freplace_prog__load");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	priv_freplace_prog__destroy(fr_skel);</div><div class='add'>+	priv_prog__destroy(skel);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Verify that replace fails to set attach target from user namespace without bpf token */</div><div class='add'>+static int userns_obj_priv_freplace_prog_fail(int mnt_fd, struct token_lsm *lsm_skel)</div><div class='add'>+{</div><div class='add'>+	struct priv_freplace_prog *fr_skel = NULL;</div><div class='add'>+	struct priv_prog *skel = NULL;</div><div class='add'>+	int err, tgt_fd;</div><div class='add'>+</div><div class='add'>+	err = userns_obj_priv_freplace_setup(mnt_fd, &amp;fr_skel, &amp;skel, &amp;tgt_fd);</div><div class='add'>+	if (!ASSERT_OK(err, "setup"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_program__set_attach_target(fr_skel-&gt;progs.new_xdp_prog2, tgt_fd, "xdp_prog1");</div><div class='add'>+	if (ASSERT_ERR(err, "attach fails"))</div><div class='add'>+		err = 0;</div><div class='add'>+	else</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	priv_freplace_prog__destroy(fr_skel);</div><div class='add'>+	priv_prog__destroy(skel);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* this test is called with BPF FS that doesn't delegate BPF_BTF_LOAD command,</div><div class='ctx'>  * which should cause struct_ops application to fail, as BTF won't be uploaded</div><div class='ctx'>  * into the kernel, even if STRUCT_OPS programs themselves are allowed</div><div class='hunk'>@@ -967,6 +1047,41 @@ err_out:</div><div class='ctx'> </div><div class='ctx'> #define bit(n) (1ULL &lt;&lt; (n))</div><div class='ctx'> </div><div class='add'>+static int userns_bpf_token_info(int mnt_fd, struct token_lsm *lsm_skel)</div><div class='add'>+{</div><div class='add'>+	int err, token_fd = -1;</div><div class='add'>+	struct bpf_token_info info;</div><div class='add'>+	u32 len = sizeof(struct bpf_token_info);</div><div class='add'>+</div><div class='add'>+	/* create BPF token from BPF FS mount */</div><div class='add'>+	token_fd = bpf_token_create(mnt_fd, NULL);</div><div class='add'>+	if (!ASSERT_GT(token_fd, 0, "token_create")) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, len);</div><div class='add'>+	err = bpf_obj_get_info_by_fd(token_fd, &amp;info, &amp;len);</div><div class='add'>+	if (!ASSERT_ERR(err, "bpf_obj_get_token_info"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	if (!ASSERT_EQ(info.allowed_cmds, bit(BPF_MAP_CREATE), "token_info_cmds_map_create")) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+	if (!ASSERT_EQ(info.allowed_progs, bit(BPF_PROG_TYPE_XDP), "token_info_progs_xdp")) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The BPF_PROG_TYPE_EXT is not set in token */</div><div class='add'>+	if (ASSERT_EQ(info.allowed_progs, bit(BPF_PROG_TYPE_EXT), "token_info_progs_ext"))</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	zclose(token_fd);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_token(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("map_token")) {</div><div class='hunk'>@@ -1004,12 +1119,28 @@ void test_token(void)</div><div class='ctx'> 	if (test__start_subtest("obj_priv_prog")) {</div><div class='ctx'> 		struct bpffs_opts opts = {</div><div class='ctx'> 			.cmds = bit(BPF_PROG_LOAD),</div><div class='del'>-			.progs = bit(BPF_PROG_TYPE_KPROBE),</div><div class='add'>+			.progs = bit(BPF_PROG_TYPE_XDP),</div><div class='ctx'> 			.attachs = ~0ULL,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='ctx'> 		subtest_userns(&amp;opts, userns_obj_priv_prog);</div><div class='ctx'> 	}</div><div class='add'>+	if (test__start_subtest("obj_priv_freplace_prog")) {</div><div class='add'>+		struct bpffs_opts opts = {</div><div class='add'>+			.cmds = bit(BPF_BTF_LOAD) | bit(BPF_PROG_LOAD) | bit(BPF_BTF_GET_FD_BY_ID),</div><div class='add'>+			.progs = bit(BPF_PROG_TYPE_EXT) | bit(BPF_PROG_TYPE_XDP),</div><div class='add'>+			.attachs = ~0ULL,</div><div class='add'>+		};</div><div class='add'>+		subtest_userns(&amp;opts, userns_obj_priv_freplace_prog);</div><div class='add'>+	}</div><div class='add'>+	if (test__start_subtest("obj_priv_freplace_prog_fail")) {</div><div class='add'>+		struct bpffs_opts opts = {</div><div class='add'>+			.cmds = bit(BPF_BTF_LOAD) | bit(BPF_PROG_LOAD) | bit(BPF_BTF_GET_FD_BY_ID),</div><div class='add'>+			.progs = bit(BPF_PROG_TYPE_EXT) | bit(BPF_PROG_TYPE_XDP),</div><div class='add'>+			.attachs = ~0ULL,</div><div class='add'>+		};</div><div class='add'>+		subtest_userns(&amp;opts, userns_obj_priv_freplace_prog_fail);</div><div class='add'>+	}</div><div class='ctx'> 	if (test__start_subtest("obj_priv_btf_fail")) {</div><div class='ctx'> 		struct bpffs_opts opts = {</div><div class='ctx'> 			/* disallow BTF loading */</div><div class='hunk'>@@ -1054,4 +1185,13 @@ void test_token(void)</div><div class='ctx'> </div><div class='ctx'> 		subtest_userns(&amp;opts, userns_obj_priv_implicit_token_envvar);</div><div class='ctx'> 	}</div><div class='add'>+	if (test__start_subtest("bpf_token_info")) {</div><div class='add'>+		struct bpffs_opts opts = {</div><div class='add'>+			.cmds = bit(BPF_MAP_CREATE),</div><div class='add'>+			.progs = bit(BPF_PROG_TYPE_XDP),</div><div class='add'>+			.attachs = ~0ULL,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		subtest_userns(&amp;opts, userns_bpf_token_info);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/tracing_failure.c b/tools/testing/selftests/bpf/prog_tests/tracing_failure.c<br/>index a222df765bc3..10e231965589 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tracing_failure.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tracing_failure.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tracing_failure.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/tracing_failure.c</a></div><div class='hunk'>@@ -28,10 +28,62 @@ out:</div><div class='ctx'> 	tracing_failure__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_tracing_fail_prog(const char *prog_name, const char *exp_msg)</div><div class='add'>+{</div><div class='add'>+	struct tracing_failure *skel;</div><div class='add'>+	struct bpf_program *prog;</div><div class='add'>+	char log_buf[256];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = tracing_failure__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "tracing_failure__open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	prog = bpf_object__find_program_by_name(skel-&gt;obj, prog_name);</div><div class='add'>+	if (!ASSERT_OK_PTR(prog, "bpf_object__find_program_by_name"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bpf_program__set_autoload(prog, true);</div><div class='add'>+	bpf_program__set_log_buf(prog, log_buf, sizeof(log_buf));</div><div class='add'>+</div><div class='add'>+	err = tracing_failure__load(skel);</div><div class='add'>+	if (!ASSERT_ERR(err, "tracing_failure__load"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ASSERT_HAS_SUBSTR(log_buf, exp_msg, "log_buf");</div><div class='add'>+out:</div><div class='add'>+	tracing_failure__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_tracing_deny(void)</div><div class='add'>+{</div><div class='add'>+	int btf_id;</div><div class='add'>+</div><div class='add'>+	/* __rcu_read_lock depends on CONFIG_PREEMPT_RCU */</div><div class='add'>+	btf_id = libbpf_find_vmlinux_btf_id("__rcu_read_lock", BPF_TRACE_FENTRY);</div><div class='add'>+	if (btf_id &lt;= 0) {</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	test_tracing_fail_prog("tracing_deny",</div><div class='add'>+			       "Attaching tracing programs to function '__rcu_read_lock' is rejected.");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_fexit_noreturns(void)</div><div class='add'>+{</div><div class='add'>+	test_tracing_fail_prog("fexit_noreturns",</div><div class='add'>+			       "Attaching fexit/fmod_ret to __noreturn function 'do_exit' is rejected.");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_tracing_failure(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("bpf_spin_lock"))</div><div class='ctx'> 		test_bpf_spin_lock(true);</div><div class='ctx'> 	if (test__start_subtest("bpf_spin_unlock"))</div><div class='ctx'> 		test_bpf_spin_lock(false);</div><div class='add'>+	if (test__start_subtest("tracing_deny"))</div><div class='add'>+		test_tracing_deny();</div><div class='add'>+	if (test__start_subtest("fexit_noreturns"))</div><div class='add'>+		test_fexit_noreturns();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/tracing_struct.c b/tools/testing/selftests/bpf/prog_tests/tracing_struct.c<br/>index 19e68d4b3532..6f8c0bfb0415 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tracing_struct.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/tracing_struct.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/tracing_struct.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/tracing_struct.c</a></div><div class='hunk'>@@ -112,10 +112,39 @@ destroy_skel:</div><div class='ctx'> 	tracing_struct_many_args__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_union_args(void)</div><div class='add'>+{</div><div class='add'>+	struct tracing_struct *skel;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = tracing_struct__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "tracing_struct__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = tracing_struct__attach(skel);</div><div class='add'>+	if (!ASSERT_OK(err, "tracing_struct__attach"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ASSERT_OK(trigger_module_test_read(256), "trigger_read");</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;ut1_a_a, 1, "ut1:a.arg.a");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;ut1_b, 4, "ut1:b");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;ut1_c, 5, "ut1:c");</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;ut2_a, 6, "ut2:a");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;ut2_b_a, 2, "ut2:b.arg.a");</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;ut2_b_b, 3, "ut2:b.arg.b");</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	tracing_struct__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_tracing_struct(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("struct_args"))</div><div class='ctx'> 		test_struct_args();</div><div class='ctx'> 	if (test__start_subtest("struct_many_args"))</div><div class='ctx'> 		test_struct_many_args();</div><div class='add'>+	if (test__start_subtest("union_args"))</div><div class='add'>+		test_union_args();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe.c b/tools/testing/selftests/bpf/prog_tests/uprobe.c<br/>index cf3e0e7a64fa..86404476c1da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/uprobe.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/uprobe.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/uprobe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/uprobe.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /* Copyright (c) 2023 Hengqi Chen */</div><div class='ctx'> </div><div class='ctx'> #include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include "test_uprobe.skel.h"</div><div class='ctx'> </div><div class='ctx'> static FILE *urand_spawn(int *pid)</div><div class='hunk'>@@ -33,7 +34,7 @@ static int urand_trigger(FILE **urand_pipe)</div><div class='ctx'> 	return exit_code;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void test_uprobe(void)</div><div class='add'>+static void test_uprobe_attach(void)</div><div class='ctx'> {</div><div class='ctx'> 	LIBBPF_OPTS(bpf_uprobe_opts, uprobe_opts);</div><div class='ctx'> 	struct test_uprobe *skel;</div><div class='hunk'>@@ -93,3 +94,156 @@ cleanup:</div><div class='ctx'> 		pclose(urand_pipe);</div><div class='ctx'> 	test_uprobe__destroy(skel);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+__naked __maybe_unused unsigned long uprobe_regs_change_trigger(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"ret\n"</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __naked void uprobe_regs_change(struct pt_regs *before, struct pt_regs *after)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"movq %r11,  48(%rdi)\n"</div><div class='add'>+		"movq %r10,  56(%rdi)\n"</div><div class='add'>+		"movq  %r9,  64(%rdi)\n"</div><div class='add'>+		"movq  %r8,  72(%rdi)\n"</div><div class='add'>+		"movq %rax,  80(%rdi)\n"</div><div class='add'>+		"movq %rcx,  88(%rdi)\n"</div><div class='add'>+		"movq %rdx,  96(%rdi)\n"</div><div class='add'>+		"movq %rsi, 104(%rdi)\n"</div><div class='add'>+		"movq %rdi, 112(%rdi)\n"</div><div class='add'>+</div><div class='add'>+		/* save 2nd argument */</div><div class='add'>+		"pushq %rsi\n"</div><div class='add'>+		"call uprobe_regs_change_trigger\n"</div><div class='add'>+</div><div class='add'>+		/* save  return value and load 2nd argument pointer to rax */</div><div class='add'>+		"pushq %rax\n"</div><div class='add'>+		"movq 8(%rsp), %rax\n"</div><div class='add'>+</div><div class='add'>+		"movq %r11,  48(%rax)\n"</div><div class='add'>+		"movq %r10,  56(%rax)\n"</div><div class='add'>+		"movq  %r9,  64(%rax)\n"</div><div class='add'>+		"movq  %r8,  72(%rax)\n"</div><div class='add'>+		"movq %rcx,  88(%rax)\n"</div><div class='add'>+		"movq %rdx,  96(%rax)\n"</div><div class='add'>+		"movq %rsi, 104(%rax)\n"</div><div class='add'>+		"movq %rdi, 112(%rax)\n"</div><div class='add'>+</div><div class='add'>+		/* restore return value and 2nd argument */</div><div class='add'>+		"pop %rax\n"</div><div class='add'>+		"pop %rsi\n"</div><div class='add'>+</div><div class='add'>+		"movq %rax,  80(%rsi)\n"</div><div class='add'>+		"ret\n"</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void regs_common(void)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs before = {}, after = {}, expected = {</div><div class='add'>+		.rax = 0xc0ffe,</div><div class='add'>+		.rcx = 0xbad,</div><div class='add'>+		.rdx = 0xdead,</div><div class='add'>+		.r8  = 0x8,</div><div class='add'>+		.r9  = 0x9,</div><div class='add'>+		.r10 = 0x10,</div><div class='add'>+		.r11 = 0x11,</div><div class='add'>+		.rdi = 0x12,</div><div class='add'>+		.rsi = 0x13,</div><div class='add'>+	};</div><div class='add'>+	LIBBPF_OPTS(bpf_uprobe_opts, uprobe_opts);</div><div class='add'>+	struct test_uprobe *skel;</div><div class='add'>+</div><div class='add'>+	skel = test_uprobe__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;my_pid = getpid();</div><div class='add'>+	skel-&gt;bss-&gt;regs = expected;</div><div class='add'>+</div><div class='add'>+	uprobe_opts.func_name = "uprobe_regs_change_trigger";</div><div class='add'>+	skel-&gt;links.test_regs_change = bpf_program__attach_uprobe_opts(skel-&gt;progs.test_regs_change,</div><div class='add'>+							    -1,</div><div class='add'>+							    "/proc/self/exe",</div><div class='add'>+							    0 /* offset */,</div><div class='add'>+							    &amp;uprobe_opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(skel-&gt;links.test_regs_change, "bpf_program__attach_uprobe_opts"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	uprobe_regs_change(&amp;before, &amp;after);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(after.rax, expected.rax, "ax");</div><div class='add'>+	ASSERT_EQ(after.rcx, expected.rcx, "cx");</div><div class='add'>+	ASSERT_EQ(after.rdx, expected.rdx, "dx");</div><div class='add'>+	ASSERT_EQ(after.r8,  expected.r8,  "r8");</div><div class='add'>+	ASSERT_EQ(after.r9,  expected.r9,  "r9");</div><div class='add'>+	ASSERT_EQ(after.r10, expected.r10, "r10");</div><div class='add'>+	ASSERT_EQ(after.r11, expected.r11, "r11");</div><div class='add'>+	ASSERT_EQ(after.rdi, expected.rdi, "rdi");</div><div class='add'>+	ASSERT_EQ(after.rsi, expected.rsi, "rsi");</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	test_uprobe__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline unsigned long uprobe_regs_change_ip_1(void)</div><div class='add'>+{</div><div class='add'>+	return 0xc0ffee;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline unsigned long uprobe_regs_change_ip_2(void)</div><div class='add'>+{</div><div class='add'>+	return 0xdeadbeef;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void regs_ip(void)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_uprobe_opts, uprobe_opts);</div><div class='add'>+	struct test_uprobe *skel;</div><div class='add'>+	unsigned long ret;</div><div class='add'>+</div><div class='add'>+	skel = test_uprobe__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;my_pid = getpid();</div><div class='add'>+	skel-&gt;bss-&gt;ip = (unsigned long) uprobe_regs_change_ip_2;</div><div class='add'>+</div><div class='add'>+	uprobe_opts.func_name = "uprobe_regs_change_ip_1";</div><div class='add'>+	skel-&gt;links.test_regs_change_ip = bpf_program__attach_uprobe_opts(</div><div class='add'>+						skel-&gt;progs.test_regs_change_ip,</div><div class='add'>+						-1,</div><div class='add'>+						"/proc/self/exe",</div><div class='add'>+						0 /* offset */,</div><div class='add'>+						&amp;uprobe_opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(skel-&gt;links.test_regs_change_ip, "bpf_program__attach_uprobe_opts"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	ret = uprobe_regs_change_ip_1();</div><div class='add'>+	ASSERT_EQ(ret, 0xdeadbeef, "ret");</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	test_uprobe__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_uprobe_regs_change(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("regs_change_common"))</div><div class='add'>+		regs_common();</div><div class='add'>+	if (test__start_subtest("regs_change_ip"))</div><div class='add'>+		regs_ip();</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void test_uprobe_regs_change(void) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void test_uprobe(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("attach"))</div><div class='add'>+		test_uprobe_attach();</div><div class='add'>+	test_uprobe_regs_change();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c<br/>index c397336fe1ed..955a37751b52 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c</a></div><div class='hunk'>@@ -8,22 +8,31 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;sys/syscall.h&gt;</div><div class='ctx'> #include &lt;sys/prctl.h&gt;</div><div class='ctx'> #include &lt;asm/prctl.h&gt;</div><div class='ctx'> #include "uprobe_syscall.skel.h"</div><div class='ctx'> #include "uprobe_syscall_executed.skel.h"</div><div class='add'>+#include "bpf/libbpf_internal.h"</div><div class='ctx'> </div><div class='del'>-__naked unsigned long uretprobe_regs_trigger(void)</div><div class='add'>+#define USDT_NOP .byte 0x0f, 0x1f, 0x44, 0x00, 0x00</div><div class='add'>+#include "usdt.h"</div><div class='add'>+</div><div class='add'>+#pragma GCC diagnostic ignored "-Wattributes"</div><div class='add'>+</div><div class='add'>+__attribute__((aligned(16)))</div><div class='add'>+__nocf_check __weak __naked unsigned long uprobe_regs_trigger(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='add'>+		".byte 0x0f, 0x1f, 0x44, 0x00, 0x00\n" /* nop5 */</div><div class='ctx'> 		"movq $0xdeadbeef, %rax\n"</div><div class='ctx'> 		"ret\n"</div><div class='ctx'> 	);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__naked void uretprobe_regs(struct pt_regs *before, struct pt_regs *after)</div><div class='add'>+__naked void uprobe_regs(struct pt_regs *before, struct pt_regs *after)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='ctx'> 		"movq %r15,   0(%rdi)\n"</div><div class='hunk'>@@ -44,15 +53,17 @@ __naked void uretprobe_regs(struct pt_regs *before, struct pt_regs *after)</div><div class='ctx'> 		"movq   $0, 120(%rdi)\n" /* orig_rax */</div><div class='ctx'> 		"movq   $0, 128(%rdi)\n" /* rip      */</div><div class='ctx'> 		"movq   $0, 136(%rdi)\n" /* cs       */</div><div class='add'>+		"pushq %rax\n"</div><div class='ctx'> 		"pushf\n"</div><div class='ctx'> 		"pop %rax\n"</div><div class='ctx'> 		"movq %rax, 144(%rdi)\n" /* eflags   */</div><div class='add'>+		"pop %rax\n"</div><div class='ctx'> 		"movq %rsp, 152(%rdi)\n" /* rsp      */</div><div class='ctx'> 		"movq   $0, 160(%rdi)\n" /* ss       */</div><div class='ctx'> </div><div class='ctx'> 		/* save 2nd argument */</div><div class='ctx'> 		"pushq %rsi\n"</div><div class='del'>-		"call uretprobe_regs_trigger\n"</div><div class='add'>+		"call uprobe_regs_trigger\n"</div><div class='ctx'> </div><div class='ctx'> 		/* save  return value and load 2nd argument pointer to rax */</div><div class='ctx'> 		"pushq %rax\n"</div><div class='hunk'>@@ -92,25 +103,37 @@ __naked void uretprobe_regs(struct pt_regs *before, struct pt_regs *after)</div><div class='ctx'> );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_uretprobe_regs_equal(void)</div><div class='add'>+static void test_uprobe_regs_equal(bool retprobe)</div><div class='ctx'> {</div><div class='add'>+	LIBBPF_OPTS(bpf_uprobe_opts, opts,</div><div class='add'>+		.retprobe = retprobe,</div><div class='add'>+	);</div><div class='ctx'> 	struct uprobe_syscall *skel = NULL;</div><div class='ctx'> 	struct pt_regs before = {}, after = {};</div><div class='ctx'> 	unsigned long *pb = (unsigned long *) &amp;before;</div><div class='ctx'> 	unsigned long *pa = (unsigned long *) &amp;after;</div><div class='ctx'> 	unsigned long *pp;</div><div class='add'>+	unsigned long offset;</div><div class='ctx'> 	unsigned int i, cnt;</div><div class='del'>-	int err;</div><div class='add'>+</div><div class='add'>+	offset = get_uprobe_offset(&amp;uprobe_regs_trigger);</div><div class='add'>+	if (!ASSERT_GE(offset, 0, "get_uprobe_offset"))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	skel = uprobe_syscall__open_and_load();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "uprobe_syscall__open_and_load"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	err = uprobe_syscall__attach(skel);</div><div class='del'>-	if (!ASSERT_OK(err, "uprobe_syscall__attach"))</div><div class='add'>+	skel-&gt;links.probe = bpf_program__attach_uprobe_opts(skel-&gt;progs.probe,</div><div class='add'>+				0, "/proc/self/exe", offset, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(skel-&gt;links.probe, "bpf_program__attach_uprobe_opts"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	uretprobe_regs(&amp;before, &amp;after);</div><div class='add'>+	/* make sure uprobe gets optimized */</div><div class='add'>+	if (!retprobe)</div><div class='add'>+		uprobe_regs_trigger();</div><div class='add'>+</div><div class='add'>+	uprobe_regs(&amp;before, &amp;after);</div><div class='ctx'> </div><div class='ctx'> 	pp = (unsigned long *) &amp;skel-&gt;bss-&gt;regs;</div><div class='ctx'> 	cnt = sizeof(before)/sizeof(*pb);</div><div class='hunk'>@@ -119,7 +142,7 @@ static void test_uretprobe_regs_equal(void)</div><div class='ctx'> 		unsigned int offset = i * sizeof(unsigned long);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Check register before and after uretprobe_regs_trigger call</div><div class='add'>+		 * Check register before and after uprobe_regs_trigger call</div><div class='ctx'> 		 * that triggers the uretprobe.</div><div class='ctx'> 		 */</div><div class='ctx'> 		switch (offset) {</div><div class='hunk'>@@ -133,7 +156,7 @@ static void test_uretprobe_regs_equal(void)</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Check register seen from bpf program and register after</div><div class='del'>-		 * uretprobe_regs_trigger call</div><div class='add'>+		 * uprobe_regs_trigger call (with rax exception, check below).</div><div class='ctx'> 		 */</div><div class='ctx'> 		switch (offset) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -146,6 +169,15 @@ static void test_uretprobe_regs_equal(void)</div><div class='ctx'> 		case offsetof(struct pt_regs, rsp):</div><div class='ctx'> 		case offsetof(struct pt_regs, ss):</div><div class='ctx'> 			break;</div><div class='add'>+		/*</div><div class='add'>+		 * uprobe does not see return value in rax, it needs to see the</div><div class='add'>+		 * original (before) rax value</div><div class='add'>+		 */</div><div class='add'>+		case offsetof(struct pt_regs, rax):</div><div class='add'>+			if (!retprobe) {</div><div class='add'>+				ASSERT_EQ(pp[i], pb[i], "uprobe rax prog-before value check");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		default:</div><div class='ctx'> 			if (!ASSERT_EQ(pp[i], pa[i], "register prog-after value check"))</div><div class='ctx'> 				fprintf(stdout, "failed register offset %u\n", offset);</div><div class='hunk'>@@ -175,7 +207,7 @@ static int write_bpf_testmod_uprobe(unsigned long offset)</div><div class='ctx'> 	return ret != n ? (int) ret : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_uretprobe_regs_change(void)</div><div class='add'>+static void test_regs_change(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pt_regs before = {}, after = {};</div><div class='ctx'> 	unsigned long *pb = (unsigned long *) &amp;before;</div><div class='hunk'>@@ -183,13 +215,16 @@ static void test_uretprobe_regs_change(void)</div><div class='ctx'> 	unsigned long cnt = sizeof(before)/sizeof(*pb);</div><div class='ctx'> 	unsigned int i, err, offset;</div><div class='ctx'> </div><div class='del'>-	offset = get_uprobe_offset(uretprobe_regs_trigger);</div><div class='add'>+	offset = get_uprobe_offset(uprobe_regs_trigger);</div><div class='ctx'> </div><div class='ctx'> 	err = write_bpf_testmod_uprobe(offset);</div><div class='ctx'> 	if (!ASSERT_OK(err, "register_uprobe"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	uretprobe_regs(&amp;before, &amp;after);</div><div class='add'>+	/* make sure uprobe gets optimized */</div><div class='add'>+	uprobe_regs_trigger();</div><div class='add'>+</div><div class='add'>+	uprobe_regs(&amp;before, &amp;after);</div><div class='ctx'> </div><div class='ctx'> 	err = write_bpf_testmod_uprobe(0);</div><div class='ctx'> 	if (!ASSERT_OK(err, "unregister_uprobe"))</div><div class='hunk'>@@ -251,7 +286,8 @@ static void test_uretprobe_syscall_call(void)</div><div class='ctx'> 		.retprobe = true,</div><div class='ctx'> 	);</div><div class='ctx'> 	struct uprobe_syscall_executed *skel;</div><div class='del'>-	int pid, status, err, go[2], c;</div><div class='add'>+	int pid, status, err, go[2], c = 0;</div><div class='add'>+	struct bpf_link *link;</div><div class='ctx'> </div><div class='ctx'> 	if (!ASSERT_OK(pipe(go), "pipe"))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -277,11 +313,14 @@ static void test_uretprobe_syscall_call(void)</div><div class='ctx'> 		_exit(0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skel-&gt;links.test = bpf_program__attach_uprobe_multi(skel-&gt;progs.test, pid,</div><div class='del'>-							    "/proc/self/exe",</div><div class='del'>-							    "uretprobe_syscall_call", &amp;opts);</div><div class='del'>-	if (!ASSERT_OK_PTR(skel-&gt;links.test, "bpf_program__attach_uprobe_multi"))</div><div class='add'>+	skel-&gt;bss-&gt;pid = pid;</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach_uprobe_multi(skel-&gt;progs.test_uretprobe_multi,</div><div class='add'>+						pid, "/proc/self/exe",</div><div class='add'>+						"uretprobe_syscall_call", &amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "bpf_program__attach_uprobe_multi"))</div><div class='ctx'> 		goto cleanup;</div><div class='add'>+	skel-&gt;links.test_uretprobe_multi = link;</div><div class='ctx'> </div><div class='ctx'> 	/* kick the child */</div><div class='ctx'> 	write(go[1], &amp;c, 1);</div><div class='hunk'>@@ -301,6 +340,256 @@ cleanup:</div><div class='ctx'> 	close(go[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define TRAMP "[uprobes-trampoline]"</div><div class='add'>+</div><div class='add'>+__attribute__((aligned(16)))</div><div class='add'>+__nocf_check __weak __naked void uprobe_test(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\n"</div><div class='add'>+		".byte 0x0f, 0x1f, 0x44, 0x00, 0x00	\n"</div><div class='add'>+		"ret					\n"</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__attribute__((aligned(16)))</div><div class='add'>+__nocf_check __weak void usdt_test(void)</div><div class='add'>+{</div><div class='add'>+	USDT(optimized_uprobe, usdt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int find_uprobes_trampoline(void *tramp_addr)</div><div class='add'>+{</div><div class='add'>+	void *start, *end;</div><div class='add'>+	char line[128];</div><div class='add'>+	int ret = -1;</div><div class='add'>+	FILE *maps;</div><div class='add'>+</div><div class='add'>+	maps = fopen("/proc/self/maps", "r");</div><div class='add'>+	if (!maps) {</div><div class='add'>+		fprintf(stderr, "cannot open maps\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (fgets(line, sizeof(line), maps)) {</div><div class='add'>+		int m = -1;</div><div class='add'>+</div><div class='add'>+		/* We care only about private r-x mappings. */</div><div class='add'>+		if (sscanf(line, "%p-%p r-xp %*x %*x:%*x %*u %n", &amp;start, &amp;end, &amp;m) != 2)</div><div class='add'>+			continue;</div><div class='add'>+		if (m &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+		if (!strncmp(&amp;line[m], TRAMP, sizeof(TRAMP)-1) &amp;&amp; (start == tramp_addr)) {</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fclose(maps);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char nop5[5] = { 0x0f, 0x1f, 0x44, 0x00, 0x00 };</div><div class='add'>+</div><div class='add'>+static void *find_nop5(void *fn)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		if (!memcmp(nop5, fn + i, 5))</div><div class='add'>+			return fn + i;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef void (__attribute__((nocf_check)) *trigger_t)(void);</div><div class='add'>+</div><div class='add'>+static void *check_attach(struct uprobe_syscall_executed *skel, trigger_t trigger,</div><div class='add'>+			  void *addr, int executed)</div><div class='add'>+{</div><div class='add'>+	struct __arch_relative_insn {</div><div class='add'>+		__u8 op;</div><div class='add'>+		__s32 raddr;</div><div class='add'>+	} __packed *call;</div><div class='add'>+	void *tramp = NULL;</div><div class='add'>+</div><div class='add'>+	/* Uprobe gets optimized after first trigger, so let's press twice. */</div><div class='add'>+	trigger();</div><div class='add'>+	trigger();</div><div class='add'>+</div><div class='add'>+	/* Make sure bpf program got executed.. */</div><div class='add'>+	ASSERT_EQ(skel-&gt;bss-&gt;executed, executed, "executed");</div><div class='add'>+</div><div class='add'>+	/* .. and check the trampoline is as expected. */</div><div class='add'>+	call = (struct __arch_relative_insn *) addr;</div><div class='add'>+	tramp = (void *) (call + 1) + call-&gt;raddr;</div><div class='add'>+	ASSERT_EQ(call-&gt;op, 0xe8, "call");</div><div class='add'>+	ASSERT_OK(find_uprobes_trampoline(tramp), "uprobes_trampoline");</div><div class='add'>+</div><div class='add'>+	return tramp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_detach(void *addr, void *tramp)</div><div class='add'>+{</div><div class='add'>+	/* [uprobes_trampoline] stays after detach */</div><div class='add'>+	ASSERT_OK(find_uprobes_trampoline(tramp), "uprobes_trampoline");</div><div class='add'>+	ASSERT_OK(memcmp(addr, nop5, 5), "nop5");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check(struct uprobe_syscall_executed *skel, struct bpf_link *link,</div><div class='add'>+		  trigger_t trigger, void *addr, int executed)</div><div class='add'>+{</div><div class='add'>+	void *tramp;</div><div class='add'>+</div><div class='add'>+	tramp = check_attach(skel, trigger, addr, executed);</div><div class='add'>+	bpf_link__destroy(link);</div><div class='add'>+	check_detach(addr, tramp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_uprobe_legacy(void)</div><div class='add'>+{</div><div class='add'>+	struct uprobe_syscall_executed *skel = NULL;</div><div class='add'>+	LIBBPF_OPTS(bpf_uprobe_opts, opts,</div><div class='add'>+		.retprobe = true,</div><div class='add'>+	);</div><div class='add'>+	struct bpf_link *link;</div><div class='add'>+	unsigned long offset;</div><div class='add'>+</div><div class='add'>+	offset = get_uprobe_offset(&amp;uprobe_test);</div><div class='add'>+	if (!ASSERT_GE(offset, 0, "get_uprobe_offset"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/* uprobe */</div><div class='add'>+	skel = uprobe_syscall_executed__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "uprobe_syscall_executed__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;pid = getpid();</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach_uprobe_opts(skel-&gt;progs.test_uprobe,</div><div class='add'>+				0, "/proc/self/exe", offset, NULL);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "bpf_program__attach_uprobe_opts"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	check(skel, link, uprobe_test, uprobe_test, 2);</div><div class='add'>+</div><div class='add'>+	/* uretprobe */</div><div class='add'>+	skel-&gt;bss-&gt;executed = 0;</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach_uprobe_opts(skel-&gt;progs.test_uretprobe,</div><div class='add'>+				0, "/proc/self/exe", offset, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "bpf_program__attach_uprobe_opts"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	check(skel, link, uprobe_test, uprobe_test, 2);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	uprobe_syscall_executed__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_uprobe_multi(void)</div><div class='add'>+{</div><div class='add'>+	struct uprobe_syscall_executed *skel = NULL;</div><div class='add'>+	LIBBPF_OPTS(bpf_uprobe_multi_opts, opts);</div><div class='add'>+	struct bpf_link *link;</div><div class='add'>+	unsigned long offset;</div><div class='add'>+</div><div class='add'>+	offset = get_uprobe_offset(&amp;uprobe_test);</div><div class='add'>+	if (!ASSERT_GE(offset, 0, "get_uprobe_offset"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	opts.offsets = &amp;offset;</div><div class='add'>+	opts.cnt = 1;</div><div class='add'>+</div><div class='add'>+	skel = uprobe_syscall_executed__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "uprobe_syscall_executed__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;pid = getpid();</div><div class='add'>+</div><div class='add'>+	/* uprobe.multi */</div><div class='add'>+	link = bpf_program__attach_uprobe_multi(skel-&gt;progs.test_uprobe_multi,</div><div class='add'>+				0, "/proc/self/exe", NULL, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "bpf_program__attach_uprobe_multi"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	check(skel, link, uprobe_test, uprobe_test, 2);</div><div class='add'>+</div><div class='add'>+	/* uretprobe.multi */</div><div class='add'>+	skel-&gt;bss-&gt;executed = 0;</div><div class='add'>+	opts.retprobe = true;</div><div class='add'>+	link = bpf_program__attach_uprobe_multi(skel-&gt;progs.test_uretprobe_multi,</div><div class='add'>+				0, "/proc/self/exe", NULL, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "bpf_program__attach_uprobe_multi"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	check(skel, link, uprobe_test, uprobe_test, 2);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	uprobe_syscall_executed__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_uprobe_session(void)</div><div class='add'>+{</div><div class='add'>+	struct uprobe_syscall_executed *skel = NULL;</div><div class='add'>+	LIBBPF_OPTS(bpf_uprobe_multi_opts, opts,</div><div class='add'>+		.session = true,</div><div class='add'>+	);</div><div class='add'>+	struct bpf_link *link;</div><div class='add'>+	unsigned long offset;</div><div class='add'>+</div><div class='add'>+	offset = get_uprobe_offset(&amp;uprobe_test);</div><div class='add'>+	if (!ASSERT_GE(offset, 0, "get_uprobe_offset"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	opts.offsets = &amp;offset;</div><div class='add'>+	opts.cnt = 1;</div><div class='add'>+</div><div class='add'>+	skel = uprobe_syscall_executed__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "uprobe_syscall_executed__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;pid = getpid();</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach_uprobe_multi(skel-&gt;progs.test_uprobe_session,</div><div class='add'>+				0, "/proc/self/exe", NULL, &amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "bpf_program__attach_uprobe_multi"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	check(skel, link, uprobe_test, uprobe_test, 4);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	uprobe_syscall_executed__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_uprobe_usdt(void)</div><div class='add'>+{</div><div class='add'>+	struct uprobe_syscall_executed *skel;</div><div class='add'>+	struct bpf_link *link;</div><div class='add'>+	void *addr;</div><div class='add'>+</div><div class='add'>+	errno = 0;</div><div class='add'>+	addr = find_nop5(usdt_test);</div><div class='add'>+	if (!ASSERT_OK_PTR(addr, "find_nop5"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel = uprobe_syscall_executed__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "uprobe_syscall_executed__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;pid = getpid();</div><div class='add'>+</div><div class='add'>+	link = bpf_program__attach_usdt(skel-&gt;progs.test_usdt,</div><div class='add'>+				-1 /* all PIDs */, "/proc/self/exe",</div><div class='add'>+				"optimized_uprobe", "usdt", NULL);</div><div class='add'>+	if (!ASSERT_OK_PTR(link, "bpf_program__attach_usdt"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	check(skel, link, usdt_test, addr, 2);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	uprobe_syscall_executed__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Borrowed from tools/testing/selftests/x86/test_shadow_stack.c.</div><div class='ctx'>  *</div><div class='hunk'>@@ -343,43 +632,172 @@ static void test_uretprobe_shadow_stack(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Run all of the uretprobe tests. */</div><div class='del'>-	test_uretprobe_regs_equal();</div><div class='del'>-	test_uretprobe_regs_change();</div><div class='add'>+	/* Run all the tests with shadow stack in place. */</div><div class='add'>+</div><div class='add'>+	test_uprobe_regs_equal(false);</div><div class='add'>+	test_uprobe_regs_equal(true);</div><div class='ctx'> 	test_uretprobe_syscall_call();</div><div class='ctx'> </div><div class='add'>+	test_uprobe_legacy();</div><div class='add'>+	test_uprobe_multi();</div><div class='add'>+	test_uprobe_session();</div><div class='add'>+	test_uprobe_usdt();</div><div class='add'>+</div><div class='add'>+	test_regs_change();</div><div class='add'>+</div><div class='ctx'> 	ARCH_PRCTL(ARCH_SHSTK_DISABLE, ARCH_SHSTK_SHSTK);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-static void test_uretprobe_regs_equal(void)</div><div class='add'>+</div><div class='add'>+static volatile bool race_stop;</div><div class='add'>+</div><div class='add'>+static USDT_DEFINE_SEMA(race);</div><div class='add'>+</div><div class='add'>+static void *worker_trigger(void *arg)</div><div class='ctx'> {</div><div class='del'>-	test__skip();</div><div class='add'>+	unsigned long rounds = 0;</div><div class='add'>+</div><div class='add'>+	while (!race_stop) {</div><div class='add'>+		uprobe_test();</div><div class='add'>+		rounds++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printf("tid %ld trigger rounds: %lu\n", sys_gettid(), rounds);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_uretprobe_regs_change(void)</div><div class='add'>+static void *worker_attach(void *arg)</div><div class='ctx'> {</div><div class='del'>-	test__skip();</div><div class='add'>+	LIBBPF_OPTS(bpf_uprobe_opts, opts);</div><div class='add'>+	struct uprobe_syscall_executed *skel;</div><div class='add'>+	unsigned long rounds = 0, offset;</div><div class='add'>+	const char *sema[2] = {</div><div class='add'>+		__stringify(USDT_SEMA(race)),</div><div class='add'>+		NULL,</div><div class='add'>+	};</div><div class='add'>+	unsigned long *ref;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	offset = get_uprobe_offset(&amp;uprobe_test);</div><div class='add'>+	if (!ASSERT_GE(offset, 0, "get_uprobe_offset"))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	err = elf_resolve_syms_offsets("/proc/self/exe", 1, (const char **) &amp;sema, &amp;ref, STT_OBJECT);</div><div class='add'>+	if (!ASSERT_OK(err, "elf_resolve_syms_offsets_sema"))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	opts.ref_ctr_offset = *ref;</div><div class='add'>+</div><div class='add'>+	skel = uprobe_syscall_executed__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "uprobe_syscall_executed__open_and_load"))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;pid = getpid();</div><div class='add'>+</div><div class='add'>+	while (!race_stop) {</div><div class='add'>+		skel-&gt;links.test_uprobe = bpf_program__attach_uprobe_opts(skel-&gt;progs.test_uprobe,</div><div class='add'>+					0, "/proc/self/exe", offset, &amp;opts);</div><div class='add'>+		if (!ASSERT_OK_PTR(skel-&gt;links.test_uprobe, "bpf_program__attach_uprobe_opts"))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		bpf_link__destroy(skel-&gt;links.test_uprobe);</div><div class='add'>+		skel-&gt;links.test_uprobe = NULL;</div><div class='add'>+		rounds++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printf("tid %ld attach rounds: %lu hits: %d\n", sys_gettid(), rounds, skel-&gt;bss-&gt;executed);</div><div class='add'>+	uprobe_syscall_executed__destroy(skel);</div><div class='add'>+	free(ref);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_uretprobe_syscall_call(void)</div><div class='add'>+static useconds_t race_msec(void)</div><div class='ctx'> {</div><div class='del'>-	test__skip();</div><div class='add'>+	char *env;</div><div class='add'>+</div><div class='add'>+	env = getenv("BPF_SELFTESTS_UPROBE_SYSCALL_RACE_MSEC");</div><div class='add'>+	if (env)</div><div class='add'>+		return atoi(env);</div><div class='add'>+</div><div class='add'>+	/* default duration is 500ms */</div><div class='add'>+	return 500;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_uretprobe_shadow_stack(void)</div><div class='add'>+static void test_uprobe_race(void)</div><div class='ctx'> {</div><div class='del'>-	test__skip();</div><div class='add'>+	int err, i, nr_threads;</div><div class='add'>+	pthread_t *threads;</div><div class='add'>+</div><div class='add'>+	nr_threads = libbpf_num_possible_cpus();</div><div class='add'>+	if (!ASSERT_GT(nr_threads, 0, "libbpf_num_possible_cpus"))</div><div class='add'>+		return;</div><div class='add'>+	nr_threads = max(2, nr_threads);</div><div class='add'>+</div><div class='add'>+	threads = alloca(sizeof(*threads) * nr_threads);</div><div class='add'>+	if (!ASSERT_OK_PTR(threads, "malloc"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr_threads; i++) {</div><div class='add'>+		err = pthread_create(&amp;threads[i], NULL, i % 2 ? worker_trigger : worker_attach,</div><div class='add'>+				     NULL);</div><div class='add'>+		if (!ASSERT_OK(err, "pthread_create"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usleep(race_msec() * 1000);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	race_stop = true;</div><div class='add'>+	for (nr_threads = i, i = 0; i &lt; nr_threads; i++)</div><div class='add'>+		pthread_join(threads[i], NULL);</div><div class='add'>+</div><div class='add'>+	ASSERT_FALSE(USDT_SEMA_IS_ACTIVE(race), "race_semaphore");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifndef __NR_uprobe</div><div class='add'>+#define __NR_uprobe 336</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void test_uprobe_syscall(void)</div><div class='add'>+static void test_uprobe_error(void)</div><div class='add'>+{</div><div class='add'>+	long err = syscall(__NR_uprobe);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(err, -1, "error");</div><div class='add'>+	ASSERT_EQ(errno, ENXIO, "errno");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __test_uprobe_syscall(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("uretprobe_regs_equal"))</div><div class='del'>-		test_uretprobe_regs_equal();</div><div class='del'>-	if (test__start_subtest("uretprobe_regs_change"))</div><div class='del'>-		test_uretprobe_regs_change();</div><div class='add'>+		test_uprobe_regs_equal(true);</div><div class='ctx'> 	if (test__start_subtest("uretprobe_syscall_call"))</div><div class='ctx'> 		test_uretprobe_syscall_call();</div><div class='ctx'> 	if (test__start_subtest("uretprobe_shadow_stack"))</div><div class='ctx'> 		test_uretprobe_shadow_stack();</div><div class='add'>+	if (test__start_subtest("uprobe_legacy"))</div><div class='add'>+		test_uprobe_legacy();</div><div class='add'>+	if (test__start_subtest("uprobe_multi"))</div><div class='add'>+		test_uprobe_multi();</div><div class='add'>+	if (test__start_subtest("uprobe_session"))</div><div class='add'>+		test_uprobe_session();</div><div class='add'>+	if (test__start_subtest("uprobe_usdt"))</div><div class='add'>+		test_uprobe_usdt();</div><div class='add'>+	if (test__start_subtest("uprobe_race"))</div><div class='add'>+		test_uprobe_race();</div><div class='add'>+	if (test__start_subtest("uprobe_error"))</div><div class='add'>+		test_uprobe_error();</div><div class='add'>+	if (test__start_subtest("uprobe_regs_equal"))</div><div class='add'>+		test_uprobe_regs_equal(false);</div><div class='add'>+	if (test__start_subtest("regs_change"))</div><div class='add'>+		test_regs_change();</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void __test_uprobe_syscall(void)</div><div class='add'>+{</div><div class='add'>+	test__skip();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void test_uprobe_syscall(void)</div><div class='add'>+{</div><div class='add'>+	__test_uprobe_syscall();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/usdt.c b/tools/testing/selftests/bpf/prog_tests/usdt.c<br/>index 56ed1eb9b527..f4be5269fa90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/usdt.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/usdt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/usdt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/usdt.c</a></div><div class='hunk'>@@ -40,12 +40,79 @@ static void __always_inline trigger_func(int x) {</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void subtest_basic_usdt(void)</div><div class='add'>+#if defined(__x86_64__) || defined(__i386__)</div><div class='add'>+/*</div><div class='add'>+ * SIB (Scale-Index-Base) addressing format: "size@(base_reg, index_reg, scale)"</div><div class='add'>+ * - 'size' is the size in bytes of the array element, and its sign indicates</div><div class='add'>+ *   whether the type is signed (negative) or unsigned (positive).</div><div class='add'>+ * - 'base_reg' is the register holding the base address, normally rdx or edx</div><div class='add'>+ * - 'index_reg' is the register holding the index, normally rax or eax</div><div class='add'>+ * - 'scale' is the scaling factor (typically 1, 2, 4, or 8), which matches the</div><div class='add'>+ *    size of the element type.</div><div class='add'>+ *</div><div class='add'>+ * For example, for an array of 'short' (signed 2-byte elements), the SIB spec would be:</div><div class='add'>+ * - size: -2 (negative because 'short' is signed)</div><div class='add'>+ * - scale: 2 (since sizeof(short) == 2)</div><div class='add'>+ *</div><div class='add'>+ * The resulting SIB format: "-2@(%%rdx,%%rax,2)" for x86_64, "-2@(%%edx,%%eax,2)" for i386</div><div class='add'>+ */</div><div class='add'>+static volatile short array[] = {-1, -2, -3, -4};</div><div class='add'>+</div><div class='add'>+#if defined(__x86_64__)</div><div class='add'>+#define USDT_SIB_ARG_SPEC -2@(%%rdx,%%rax,2)</div><div class='add'>+#else</div><div class='add'>+#define USDT_SIB_ARG_SPEC -2@(%%edx,%%eax,2)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+unsigned short test_usdt_sib_semaphore SEC(".probes");</div><div class='add'>+</div><div class='add'>+static void trigger_sib_spec(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Force SIB addressing with inline assembly.</div><div class='add'>+	 *</div><div class='add'>+	 * You must compile with -std=gnu99 or -std=c99 to use the</div><div class='add'>+	 * STAP_PROBE_ASM macro.</div><div class='add'>+	 *</div><div class='add'>+	 * The STAP_PROBE_ASM macro generates a quoted string that gets</div><div class='add'>+	 * inserted between the surrounding assembly instructions. In this</div><div class='add'>+	 * case, USDT_SIB_ARG_SPEC is embedded directly into the instruction</div><div class='add'>+	 * stream, creating a probe point between the asm statement boundaries.</div><div class='add'>+	 * It works fine with gcc/clang.</div><div class='add'>+	 *</div><div class='add'>+	 * Register constraints:</div><div class='add'>+	 * - "d"(array): Binds the 'array' variable to %rdx or %edx register</div><div class='add'>+	 * - "a"(0): Binds the constant 0 to %rax or %eax register</div><div class='add'>+	 * These ensure that when USDT_SIB_ARG_SPEC references %%rdx(%edx) and</div><div class='add'>+	 * %%rax(%eax), they contain the expected values for SIB addressing.</div><div class='add'>+	 *</div><div class='add'>+	 * The "memory" clobber prevents the compiler from reordering memory</div><div class='add'>+	 * accesses around the probe point, ensuring that the probe behavior</div><div class='add'>+	 * is predictable and consistent.</div><div class='add'>+	 */</div><div class='add'>+	asm volatile(</div><div class='add'>+		STAP_PROBE_ASM(test, usdt_sib, USDT_SIB_ARG_SPEC)</div><div class='add'>+		:</div><div class='add'>+		: "d"(array), "a"(0)</div><div class='add'>+		: "memory"</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void subtest_basic_usdt(bool optimized)</div><div class='ctx'> {</div><div class='ctx'> 	LIBBPF_OPTS(bpf_usdt_opts, opts);</div><div class='ctx'> 	struct test_usdt *skel;</div><div class='ctx'> 	struct test_usdt__bss *bss;</div><div class='del'>-	int err;</div><div class='add'>+	int err, i, called;</div><div class='add'>+	const __u64 expected_cookie = 0xcafedeadbeeffeed;</div><div class='add'>+</div><div class='add'>+#define TRIGGER(x) ({			\</div><div class='add'>+	trigger_func(x);		\</div><div class='add'>+	if (optimized)			\</div><div class='add'>+		trigger_func(x);	\</div><div class='add'>+	optimized ? 2 : 1;		\</div><div class='add'>+	})</div><div class='ctx'> </div><div class='ctx'> 	skel = test_usdt__open_and_load();</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel, "skel_open"))</div><div class='hunk'>@@ -59,22 +126,32 @@ static void subtest_basic_usdt(void)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	/* usdt0 won't be auto-attached */</div><div class='del'>-	opts.usdt_cookie = 0xcafedeadbeeffeed;</div><div class='add'>+	opts.usdt_cookie = expected_cookie;</div><div class='ctx'> 	skel-&gt;links.usdt0 = bpf_program__attach_usdt(skel-&gt;progs.usdt0,</div><div class='ctx'> 						     0 /*self*/, "/proc/self/exe",</div><div class='ctx'> 						     "test", "usdt0", &amp;opts);</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel-&gt;links.usdt0, "usdt0_link"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	trigger_func(1);</div><div class='add'>+#if defined(__x86_64__) || defined(__i386__)</div><div class='add'>+	opts.usdt_cookie = expected_cookie;</div><div class='add'>+	skel-&gt;links.usdt_sib = bpf_program__attach_usdt(skel-&gt;progs.usdt_sib,</div><div class='add'>+							 0 /*self*/, "/proc/self/exe",</div><div class='add'>+							 "test", "usdt_sib", &amp;opts);</div><div class='add'>+	if (!ASSERT_OK_PTR(skel-&gt;links.usdt_sib, "usdt_sib_link"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	called = TRIGGER(1);</div><div class='ctx'> </div><div class='del'>-	ASSERT_EQ(bss-&gt;usdt0_called, 1, "usdt0_called");</div><div class='del'>-	ASSERT_EQ(bss-&gt;usdt3_called, 1, "usdt3_called");</div><div class='del'>-	ASSERT_EQ(bss-&gt;usdt12_called, 1, "usdt12_called");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt0_called, called, "usdt0_called");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt3_called, called, "usdt3_called");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt12_called, called, "usdt12_called");</div><div class='ctx'> </div><div class='del'>-	ASSERT_EQ(bss-&gt;usdt0_cookie, 0xcafedeadbeeffeed, "usdt0_cookie");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt0_cookie, expected_cookie, "usdt0_cookie");</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt0_arg_cnt, 0, "usdt0_arg_cnt");</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt0_arg_ret, -ENOENT, "usdt0_arg_ret");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt0_arg_size, -ENOENT, "usdt0_arg_size");</div><div class='ctx'> </div><div class='ctx'> 	/* auto-attached usdt3 gets default zero cookie value */</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt3_cookie, 0, "usdt3_cookie");</div><div class='hunk'>@@ -86,6 +163,9 @@ static void subtest_basic_usdt(void)</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt3_args[0], 1, "usdt3_arg1");</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt3_args[1], 42, "usdt3_arg2");</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt3_args[2], (uintptr_t)&amp;bla, "usdt3_arg3");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt3_arg_sizes[0], 4, "usdt3_arg1_size");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt3_arg_sizes[1], 8, "usdt3_arg2_size");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt3_arg_sizes[2], 8, "usdt3_arg3_size");</div><div class='ctx'> </div><div class='ctx'> 	/* auto-attached usdt12 gets default zero cookie value */</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt12_cookie, 0, "usdt12_cookie");</div><div class='hunk'>@@ -104,17 +184,22 @@ static void subtest_basic_usdt(void)</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt12_args[10], nums[idx], "usdt12_arg11");</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt12_args[11], t1.y, "usdt12_arg12");</div><div class='ctx'> </div><div class='add'>+	int usdt12_expected_arg_sizes[12] = { 4, 4, 8, 8, 4, 8, 8, 8, 4, 2, 2, 1 };</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 12; i++)</div><div class='add'>+		ASSERT_EQ(bss-&gt;usdt12_arg_sizes[i], usdt12_expected_arg_sizes[i], "usdt12_arg_size");</div><div class='add'>+</div><div class='ctx'> 	/* trigger_func() is marked __always_inline, so USDT invocations will be</div><div class='ctx'> 	 * inlined in two different places, meaning that each USDT will have</div><div class='ctx'> 	 * at least 2 different places to be attached to. This verifies that</div><div class='ctx'> 	 * bpf_program__attach_usdt() handles this properly and attaches to</div><div class='ctx'> 	 * all possible places of USDT invocation.</div><div class='ctx'> 	 */</div><div class='del'>-	trigger_func(2);</div><div class='add'>+	called += TRIGGER(2);</div><div class='ctx'> </div><div class='del'>-	ASSERT_EQ(bss-&gt;usdt0_called, 2, "usdt0_called");</div><div class='del'>-	ASSERT_EQ(bss-&gt;usdt3_called, 2, "usdt3_called");</div><div class='del'>-	ASSERT_EQ(bss-&gt;usdt12_called, 2, "usdt12_called");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt0_called, called, "usdt0_called");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt3_called, called, "usdt3_called");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt12_called, called, "usdt12_called");</div><div class='ctx'> </div><div class='ctx'> 	/* only check values that depend on trigger_func()'s input value */</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt3_args[0], 2, "usdt3_arg1");</div><div class='hunk'>@@ -133,9 +218,9 @@ static void subtest_basic_usdt(void)</div><div class='ctx'> 	if (!ASSERT_OK_PTR(skel-&gt;links.usdt3, "usdt3_reattach"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	trigger_func(3);</div><div class='add'>+	called += TRIGGER(3);</div><div class='ctx'> </div><div class='del'>-	ASSERT_EQ(bss-&gt;usdt3_called, 3, "usdt3_called");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt3_called, called, "usdt3_called");</div><div class='ctx'> 	/* this time usdt3 has custom cookie */</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt3_cookie, 0xBADC00C51E, "usdt3_cookie");</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt3_arg_cnt, 3, "usdt3_arg_cnt");</div><div class='hunk'>@@ -147,8 +232,19 @@ static void subtest_basic_usdt(void)</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt3_args[1], 42, "usdt3_arg2");</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt3_args[2], (uintptr_t)&amp;bla, "usdt3_arg3");</div><div class='ctx'> </div><div class='add'>+#if defined(__x86_64__) || defined(__i386__)</div><div class='add'>+	trigger_sib_spec();</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt_sib_called, 1, "usdt_sib_called");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt_sib_cookie, expected_cookie, "usdt_sib_cookie");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt_sib_arg_cnt, 1, "usdt_sib_arg_cnt");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt_sib_arg, nums[0], "usdt_sib_arg");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt_sib_arg_ret, 0, "usdt_sib_arg_ret");</div><div class='add'>+	ASSERT_EQ(bss-&gt;usdt_sib_arg_size, sizeof(nums[0]), "usdt_sib_arg_size");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> cleanup:</div><div class='ctx'> 	test_usdt__destroy(skel);</div><div class='add'>+#undef TRIGGER</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned short test_usdt_100_semaphore SEC(".probes");</div><div class='hunk'>@@ -261,8 +357,16 @@ static void subtest_multispec_usdt(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	trigger_300_usdts();</div><div class='ctx'> </div><div class='del'>-	/* we'll reuse usdt_100 BPF program for usdt_300 test */</div><div class='ctx'> 	bpf_link__destroy(skel-&gt;links.usdt_100);</div><div class='add'>+</div><div class='add'>+	bss-&gt;usdt_100_called = 0;</div><div class='add'>+	bss-&gt;usdt_100_sum = 0;</div><div class='add'>+</div><div class='add'>+	/* If built with arm64/clang, there will be much less number of specs</div><div class='add'>+	 * for usdt_300 call sites.</div><div class='add'>+	 */</div><div class='add'>+#if !defined(__aarch64__) || !defined(__clang__)</div><div class='add'>+	/* we'll reuse usdt_100 BPF program for usdt_300 test */</div><div class='ctx'> 	skel-&gt;links.usdt_100 = bpf_program__attach_usdt(skel-&gt;progs.usdt_100, -1, "/proc/self/exe",</div><div class='ctx'> 							"test", "usdt_300", NULL);</div><div class='ctx'> 	err = -errno;</div><div class='hunk'>@@ -273,13 +377,11 @@ static void subtest_multispec_usdt(void)</div><div class='ctx'> 	/* let's check that there are no "dangling" BPF programs attached due</div><div class='ctx'> 	 * to partial success of the above test:usdt_300 attachment</div><div class='ctx'> 	 */</div><div class='del'>-	bss-&gt;usdt_100_called = 0;</div><div class='del'>-	bss-&gt;usdt_100_sum = 0;</div><div class='del'>-</div><div class='ctx'> 	f300(777); /* this is 301st instance of usdt_300 */</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt_100_called, 0, "usdt_301_called");</div><div class='ctx'> 	ASSERT_EQ(bss-&gt;usdt_100_sum, 0, "usdt_301_sum");</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* This time we have USDT with 400 inlined invocations, but arg specs</div><div class='ctx'> 	 * should be the same across all sites, so libbpf will only need to</div><div class='hunk'>@@ -410,7 +512,11 @@ cleanup:</div><div class='ctx'> void test_usdt(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (test__start_subtest("basic"))</div><div class='del'>-		subtest_basic_usdt();</div><div class='add'>+		subtest_basic_usdt(false);</div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+	if (test__start_subtest("basic_optimized"))</div><div class='add'>+		subtest_basic_usdt(true);</div><div class='add'>+#endif</div><div class='ctx'> 	if (test__start_subtest("multispec"))</div><div class='ctx'> 		subtest_multispec_usdt();</div><div class='ctx'> 	if (test__start_subtest("urand_auto_attach"))</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/user_ringbuf.c b/tools/testing/selftests/bpf/prog_tests/user_ringbuf.c<br/>index d424e7ecbd12..9fd3ae987321 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/user_ringbuf.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/user_ringbuf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/user_ringbuf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/user_ringbuf.c</a></div><div class='hunk'>@@ -21,8 +21,7 @@</div><div class='ctx'> #include "../progs/test_user_ringbuf.h"</div><div class='ctx'> </div><div class='ctx'> static const long c_sample_size = sizeof(struct sample) + BPF_RINGBUF_HDR_SZ;</div><div class='del'>-static const long c_ringbuf_size = 1 &lt;&lt; 12; /* 1 small page */</div><div class='del'>-static const long c_max_entries = c_ringbuf_size / c_sample_size;</div><div class='add'>+static long c_ringbuf_size, c_max_entries;</div><div class='ctx'> </div><div class='ctx'> static void drain_current_samples(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -424,7 +423,9 @@ static void test_user_ringbuf_loop(void)</div><div class='ctx'> 	uint32_t remaining_samples = total_samples;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BUILD_BUG_ON(total_samples &lt;= c_max_entries);</div><div class='add'>+	if (!ASSERT_LT(c_max_entries, total_samples, "compare_c_max_entries"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	err = load_skel_create_user_ringbuf(&amp;skel, &amp;ringbuf);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -686,6 +687,9 @@ void test_user_ringbuf(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	c_ringbuf_size = getpagesize(); /* 1 page */</div><div class='add'>+	c_max_entries = c_ringbuf_size / c_sample_size;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(success_tests); i++) {</div><div class='ctx'> 		if (!test__start_subtest(success_tests[i].test_name))</div><div class='ctx'> 			continue;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/verifier.c b/tools/testing/selftests/bpf/prog_tests/verifier.c<br/>index 8a0e1ff8a2dc..4b4b081b46cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/verifier.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/verifier.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/verifier.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/verifier.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include "verifier_arena.skel.h"</div><div class='ctx'> #include "verifier_arena_large.skel.h"</div><div class='ctx'> #include "verifier_array_access.skel.h"</div><div class='add'>+#include "verifier_async_cb_context.skel.h"</div><div class='ctx'> #include "verifier_basic_stack.skel.h"</div><div class='ctx'> #include "verifier_bitfield_write.skel.h"</div><div class='ctx'> #include "verifier_bounds.skel.h"</div><div class='hunk'>@@ -14,6 +15,7 @@</div><div class='ctx'> #include "verifier_bounds_deduction_non_const.skel.h"</div><div class='ctx'> #include "verifier_bounds_mix_sign_unsign.skel.h"</div><div class='ctx'> #include "verifier_bpf_get_stack.skel.h"</div><div class='add'>+#include "verifier_bpf_trap.skel.h"</div><div class='ctx'> #include "verifier_bswap.skel.h"</div><div class='ctx'> #include "verifier_btf_ctx_access.skel.h"</div><div class='ctx'> #include "verifier_btf_unreliable_prog.skel.h"</div><div class='hunk'>@@ -33,6 +35,7 @@</div><div class='ctx'> #include "verifier_global_subprogs.skel.h"</div><div class='ctx'> #include "verifier_global_ptr_args.skel.h"</div><div class='ctx'> #include "verifier_gotol.skel.h"</div><div class='add'>+#include "verifier_gotox.skel.h"</div><div class='ctx'> #include "verifier_helper_access_var_len.skel.h"</div><div class='ctx'> #include "verifier_helper_packet_access.skel.h"</div><div class='ctx'> #include "verifier_helper_restricted.skel.h"</div><div class='hunk'>@@ -45,6 +48,8 @@</div><div class='ctx'> #include "verifier_ldsx.skel.h"</div><div class='ctx'> #include "verifier_leak_ptr.skel.h"</div><div class='ctx'> #include "verifier_linked_scalars.skel.h"</div><div class='add'>+#include "verifier_live_stack.skel.h"</div><div class='add'>+#include "verifier_load_acquire.skel.h"</div><div class='ctx'> #include "verifier_loops1.skel.h"</div><div class='ctx'> #include "verifier_lwt.skel.h"</div><div class='ctx'> #include "verifier_map_in_map.skel.h"</div><div class='hunk'>@@ -57,6 +62,7 @@</div><div class='ctx'> #include "verifier_meta_access.skel.h"</div><div class='ctx'> #include "verifier_movsx.skel.h"</div><div class='ctx'> #include "verifier_mtu.skel.h"</div><div class='add'>+#include "verifier_mul.skel.h"</div><div class='ctx'> #include "verifier_netfilter_ctx.skel.h"</div><div class='ctx'> #include "verifier_netfilter_retcode.skel.h"</div><div class='ctx'> #include "verifier_bpf_fastcall.skel.h"</div><div class='hunk'>@@ -80,8 +86,10 @@</div><div class='ctx'> #include "verifier_spill_fill.skel.h"</div><div class='ctx'> #include "verifier_spin_lock.skel.h"</div><div class='ctx'> #include "verifier_stack_ptr.skel.h"</div><div class='add'>+#include "verifier_store_release.skel.h"</div><div class='ctx'> #include "verifier_subprog_precision.skel.h"</div><div class='ctx'> #include "verifier_subreg.skel.h"</div><div class='add'>+#include "verifier_tailcall.skel.h"</div><div class='ctx'> #include "verifier_tailcall_jit.skel.h"</div><div class='ctx'> #include "verifier_typedef.skel.h"</div><div class='ctx'> #include "verifier_uninit.skel.h"</div><div class='hunk'>@@ -121,7 +129,7 @@ static void run_tests_aux(const char *skel_name,</div><div class='ctx'> 	/* test_verifier tests are executed w/o CAP_SYS_ADMIN, do the same here */</div><div class='ctx'> 	err = cap_disable_effective(1ULL &lt;&lt; CAP_SYS_ADMIN, &amp;old_caps);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		PRINT_FAIL("failed to drop CAP_SYS_ADMIN: %i, %s\n", err, strerror(err));</div><div class='add'>+		PRINT_FAIL("failed to drop CAP_SYS_ADMIN: %i, %s\n", err, strerror(-err));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -131,7 +139,7 @@ static void run_tests_aux(const char *skel_name,</div><div class='ctx'> </div><div class='ctx'> 	err = cap_enable_effective(old_caps, NULL);</div><div class='ctx'> 	if (err)</div><div class='del'>-		PRINT_FAIL("failed to restore CAP_SYS_ADMIN: %i, %s\n", err, strerror(err));</div><div class='add'>+		PRINT_FAIL("failed to restore CAP_SYS_ADMIN: %i, %s\n", err, strerror(-err));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define RUN(skel) run_tests_aux(#skel, skel##__elf_bytes, NULL)</div><div class='hunk'>@@ -146,6 +154,7 @@ void test_verifier_bounds_deduction(void)     { RUN(verifier_bounds_deduction);</div><div class='ctx'> void test_verifier_bounds_deduction_non_const(void)     { RUN(verifier_bounds_deduction_non_const); }</div><div class='ctx'> void test_verifier_bounds_mix_sign_unsign(void) { RUN(verifier_bounds_mix_sign_unsign); }</div><div class='ctx'> void test_verifier_bpf_get_stack(void)        { RUN(verifier_bpf_get_stack); }</div><div class='add'>+void test_verifier_bpf_trap(void)             { RUN(verifier_bpf_trap); }</div><div class='ctx'> void test_verifier_bswap(void)                { RUN(verifier_bswap); }</div><div class='ctx'> void test_verifier_btf_ctx_access(void)       { RUN(verifier_btf_ctx_access); }</div><div class='ctx'> void test_verifier_btf_unreliable_prog(void)  { RUN(verifier_btf_unreliable_prog); }</div><div class='hunk'>@@ -165,6 +174,7 @@ void test_verifier_div_overflow(void)         { RUN(verifier_div_overflow); }</div><div class='ctx'> void test_verifier_global_subprogs(void)      { RUN(verifier_global_subprogs); }</div><div class='ctx'> void test_verifier_global_ptr_args(void)      { RUN(verifier_global_ptr_args); }</div><div class='ctx'> void test_verifier_gotol(void)                { RUN(verifier_gotol); }</div><div class='add'>+void test_verifier_gotox(void)                { RUN(verifier_gotox); }</div><div class='ctx'> void test_verifier_helper_access_var_len(void) { RUN(verifier_helper_access_var_len); }</div><div class='ctx'> void test_verifier_helper_packet_access(void) { RUN(verifier_helper_packet_access); }</div><div class='ctx'> void test_verifier_helper_restricted(void)    { RUN(verifier_helper_restricted); }</div><div class='hunk'>@@ -173,10 +183,12 @@ void test_verifier_int_ptr(void)              { RUN(verifier_int_ptr); }</div><div class='ctx'> void test_verifier_iterating_callbacks(void)  { RUN(verifier_iterating_callbacks); }</div><div class='ctx'> void test_verifier_jeq_infer_not_null(void)   { RUN(verifier_jeq_infer_not_null); }</div><div class='ctx'> void test_verifier_jit_convergence(void)      { RUN(verifier_jit_convergence); }</div><div class='add'>+void test_verifier_load_acquire(void)         { RUN(verifier_load_acquire); }</div><div class='ctx'> void test_verifier_ld_ind(void)               { RUN(verifier_ld_ind); }</div><div class='ctx'> void test_verifier_ldsx(void)                  { RUN(verifier_ldsx); }</div><div class='ctx'> void test_verifier_leak_ptr(void)             { RUN(verifier_leak_ptr); }</div><div class='ctx'> void test_verifier_linked_scalars(void)       { RUN(verifier_linked_scalars); }</div><div class='add'>+void test_verifier_live_stack(void)           { RUN(verifier_live_stack); }</div><div class='ctx'> void test_verifier_loops1(void)               { RUN(verifier_loops1); }</div><div class='ctx'> void test_verifier_lwt(void)                  { RUN(verifier_lwt); }</div><div class='ctx'> void test_verifier_map_in_map(void)           { RUN(verifier_map_in_map); }</div><div class='hunk'>@@ -188,6 +200,7 @@ void test_verifier_may_goto_1(void)           { RUN(verifier_may_goto_1); }</div><div class='ctx'> void test_verifier_may_goto_2(void)           { RUN(verifier_may_goto_2); }</div><div class='ctx'> void test_verifier_meta_access(void)          { RUN(verifier_meta_access); }</div><div class='ctx'> void test_verifier_movsx(void)                 { RUN(verifier_movsx); }</div><div class='add'>+void test_verifier_mul(void)                  { RUN(verifier_mul); }</div><div class='ctx'> void test_verifier_netfilter_ctx(void)        { RUN(verifier_netfilter_ctx); }</div><div class='ctx'> void test_verifier_netfilter_retcode(void)    { RUN(verifier_netfilter_retcode); }</div><div class='ctx'> void test_verifier_bpf_fastcall(void)         { RUN(verifier_bpf_fastcall); }</div><div class='hunk'>@@ -211,8 +224,10 @@ void test_verifier_sockmap_mutate(void)       { RUN(verifier_sockmap_mutate); }</div><div class='ctx'> void test_verifier_spill_fill(void)           { RUN(verifier_spill_fill); }</div><div class='ctx'> void test_verifier_spin_lock(void)            { RUN(verifier_spin_lock); }</div><div class='ctx'> void test_verifier_stack_ptr(void)            { RUN(verifier_stack_ptr); }</div><div class='add'>+void test_verifier_store_release(void)        { RUN(verifier_store_release); }</div><div class='ctx'> void test_verifier_subprog_precision(void)    { RUN(verifier_subprog_precision); }</div><div class='ctx'> void test_verifier_subreg(void)               { RUN(verifier_subreg); }</div><div class='add'>+void test_verifier_tailcall(void)             { RUN(verifier_tailcall); }</div><div class='ctx'> void test_verifier_tailcall_jit(void)         { RUN(verifier_tailcall_jit); }</div><div class='ctx'> void test_verifier_typedef(void)              { RUN(verifier_typedef); }</div><div class='ctx'> void test_verifier_uninit(void)               { RUN(verifier_uninit); }</div><div class='hunk'>@@ -268,6 +283,7 @@ void test_verifier_array_access(void)</div><div class='ctx'> 		      verifier_array_access__elf_bytes,</div><div class='ctx'> 		      init_array_access_maps);</div><div class='ctx'> }</div><div class='add'>+void test_verifier_async_cb_context(void)    { RUN(verifier_async_cb_context); }</div><div class='ctx'> </div><div class='ctx'> static int init_value_ptr_arith_maps(struct bpf_object *obj)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/verify_pkcs7_sig.c b/tools/testing/selftests/bpf/prog_tests/verify_pkcs7_sig.c<br/>index ab0f02faa80c..4d69d9d55e17 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/verify_pkcs7_sig.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/verify_pkcs7_sig.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/verify_pkcs7_sig.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/verify_pkcs7_sig.c</a></div><div class='hunk'>@@ -268,7 +268,7 @@ static void test_verify_pkcs7_sig_from_map(void)</div><div class='ctx'> 	char *tmp_dir;</div><div class='ctx'> 	struct test_verify_pkcs7_sig *skel = NULL;</div><div class='ctx'> 	struct bpf_map *map;</div><div class='del'>-	struct data data;</div><div class='add'>+	struct data data = {};</div><div class='ctx'> 	int ret, zero = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Trigger creation of session keyring. */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/wq.c b/tools/testing/selftests/bpf/prog_tests/wq.c<br/>index 99e438fe12ac..15c67d23128b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/wq.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/wq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/wq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/wq.c</a></div><div class='hunk'>@@ -38,3 +38,59 @@ void serial_test_failures_wq(void)</div><div class='ctx'> {</div><div class='ctx'> 	RUN_TESTS(wq_failures);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void test_failure_map_no_btf(void)</div><div class='add'>+{</div><div class='add'>+	struct wq *skel = NULL;</div><div class='add'>+	char log[8192];</div><div class='add'>+	const struct bpf_insn *insns;</div><div class='add'>+	size_t insn_cnt;</div><div class='add'>+	int ret, err, map_fd;</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_load_opts, opts, .log_size = sizeof(log), .log_buf = log,</div><div class='add'>+		    .log_level = 2);</div><div class='add'>+</div><div class='add'>+	skel = wq__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "skel_open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = bpf_object__prepare(skel-&gt;obj);</div><div class='add'>+	if (!ASSERT_OK(err, "skel__prepare"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	map_fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, "map_no_btf", sizeof(__u32), sizeof(__u64), 100,</div><div class='add'>+				NULL);</div><div class='add'>+	if (!ASSERT_GT(map_fd, -1, "map create"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_map__reuse_fd(skel-&gt;maps.array, map_fd);</div><div class='add'>+	if (!ASSERT_OK(err, "map reuse fd")) {</div><div class='add'>+		close(map_fd);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	insns = bpf_program__insns(skel-&gt;progs.test_map_no_btf);</div><div class='add'>+	if (!ASSERT_OK_PTR(insns, "insns ptr"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	insn_cnt = bpf_program__insn_cnt(skel-&gt;progs.test_map_no_btf);</div><div class='add'>+	if (!ASSERT_GT(insn_cnt, 0u, "insn cnt"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = bpf_prog_load(BPF_PROG_TYPE_TRACEPOINT, NULL, "GPL", insns, insn_cnt, &amp;opts);</div><div class='add'>+	if (!ASSERT_LT(ret, 0, "prog load failed")) {</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			close(ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_HAS_SUBSTR(log, "map 'map_no_btf' has to have BTF in order to use bpf_wq",</div><div class='add'>+			  "log complains no map BTF");</div><div class='add'>+out:</div><div class='add'>+	wq__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_wq_custom(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("test_failure_map_no_btf"))</div><div class='add'>+		test_failure_map_no_btf();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c<br/>index b2b2d85dbb1b..43264347e7d7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c</a></div><div class='hunk'>@@ -37,21 +37,26 @@ static void test_xdp_adjust_tail_shrink(void)</div><div class='ctx'> 	bpf_object__close(obj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_xdp_adjust_tail_grow(void)</div><div class='add'>+static void test_xdp_adjust_tail_grow(bool is_64k_pagesize)</div><div class='ctx'> {</div><div class='ctx'> 	const char *file = "./test_xdp_adjust_tail_grow.bpf.o";</div><div class='ctx'> 	struct bpf_object *obj;</div><div class='del'>-	char buf[4096]; /* avoid segfault: large buf to hold grow results */</div><div class='add'>+	char buf[8192]; /* avoid segfault: large buf to hold grow results */</div><div class='ctx'> 	__u32 expect_sz;</div><div class='ctx'> 	int err, prog_fd;</div><div class='ctx'> 	LIBBPF_OPTS(bpf_test_run_opts, topts,</div><div class='ctx'> 		.data_in = &amp;pkt_v4,</div><div class='del'>-		.data_size_in = sizeof(pkt_v4),</div><div class='ctx'> 		.data_out = buf,</div><div class='ctx'> 		.data_size_out = sizeof(buf),</div><div class='ctx'> 		.repeat = 1,</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='add'>+	/* topts.data_size_in as a special signal to bpf prog */</div><div class='add'>+	if (is_64k_pagesize)</div><div class='add'>+		topts.data_size_in = sizeof(pkt_v4) - 1;</div><div class='add'>+	else</div><div class='add'>+		topts.data_size_in = sizeof(pkt_v4);</div><div class='add'>+</div><div class='ctx'> 	err = bpf_prog_test_load(file, BPF_PROG_TYPE_XDP, &amp;obj, &amp;prog_fd);</div><div class='ctx'> 	if (!ASSERT_OK(err, "test_xdp_adjust_tail_grow"))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -208,7 +213,7 @@ out:</div><div class='ctx'> 	bpf_object__close(obj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_xdp_adjust_frags_tail_grow(void)</div><div class='add'>+static void test_xdp_adjust_frags_tail_grow_4k(void)</div><div class='ctx'> {</div><div class='ctx'> 	const char *file = "./test_xdp_adjust_tail_grow.bpf.o";</div><div class='ctx'> 	__u32 exp_size;</div><div class='hunk'>@@ -246,14 +251,20 @@ static void test_xdp_adjust_frags_tail_grow(void)</div><div class='ctx'> 	ASSERT_EQ(topts.retval, XDP_TX, "9Kb+10b retval");</div><div class='ctx'> 	ASSERT_EQ(topts.data_size_out, exp_size, "9Kb+10b size");</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 9000; i++)</div><div class='del'>-		ASSERT_EQ(buf[i], 1, "9Kb+10b-old");</div><div class='add'>+	for (i = 0; i &lt; 9000; i++) {</div><div class='add'>+		if (buf[i] != 1)</div><div class='add'>+			ASSERT_EQ(buf[i], 1, "9Kb+10b-old");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (i = 9000; i &lt; 9010; i++)</div><div class='del'>-		ASSERT_EQ(buf[i], 0, "9Kb+10b-new");</div><div class='add'>+	for (i = 9000; i &lt; 9010; i++) {</div><div class='add'>+		if (buf[i] != 0)</div><div class='add'>+			ASSERT_EQ(buf[i], 0, "9Kb+10b-new");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (i = 9010; i &lt; 16384; i++)</div><div class='del'>-		ASSERT_EQ(buf[i], 1, "9Kb+10b-untouched");</div><div class='add'>+	for (i = 9010; i &lt; 16384; i++) {</div><div class='add'>+		if (buf[i] != 1)</div><div class='add'>+			ASSERT_EQ(buf[i], 1, "9Kb+10b-untouched");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Test a too large grow */</div><div class='ctx'> 	memset(buf, 1, 16384);</div><div class='hunk'>@@ -273,16 +284,93 @@ out:</div><div class='ctx'> 	bpf_object__close(obj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_xdp_adjust_frags_tail_grow_64k(void)</div><div class='add'>+{</div><div class='add'>+	const char *file = "./test_xdp_adjust_tail_grow.bpf.o";</div><div class='add'>+	__u32 exp_size;</div><div class='add'>+	struct bpf_program *prog;</div><div class='add'>+	struct bpf_object *obj;</div><div class='add'>+	int err, i, prog_fd;</div><div class='add'>+	__u8 *buf;</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='add'>+</div><div class='add'>+	obj = bpf_object__open(file);</div><div class='add'>+	if (libbpf_get_error(obj))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	prog = bpf_object__next_program(obj, NULL);</div><div class='add'>+	if (bpf_object__load(obj))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(prog);</div><div class='add'>+</div><div class='add'>+	buf = malloc(262144);</div><div class='add'>+	if (!ASSERT_OK_PTR(buf, "alloc buf 256Kb"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Test case add 10 bytes to last frag */</div><div class='add'>+	memset(buf, 1, 262144);</div><div class='add'>+	exp_size = 90000 + 10;</div><div class='add'>+</div><div class='add'>+	topts.data_in = buf;</div><div class='add'>+	topts.data_out = buf;</div><div class='add'>+	topts.data_size_in = 90000;</div><div class='add'>+	topts.data_size_out = 262144;</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+</div><div class='add'>+	ASSERT_OK(err, "90Kb+10b");</div><div class='add'>+	ASSERT_EQ(topts.retval, XDP_TX, "90Kb+10b retval");</div><div class='add'>+	ASSERT_EQ(topts.data_size_out, exp_size, "90Kb+10b size");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 90000; i++) {</div><div class='add'>+		if (buf[i] != 1)</div><div class='add'>+			ASSERT_EQ(buf[i], 1, "90Kb+10b-old");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 90000; i &lt; 90010; i++) {</div><div class='add'>+		if (buf[i] != 0)</div><div class='add'>+			ASSERT_EQ(buf[i], 0, "90Kb+10b-new");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 90010; i &lt; 262144; i++) {</div><div class='add'>+		if (buf[i] != 1)</div><div class='add'>+			ASSERT_EQ(buf[i], 1, "90Kb+10b-untouched");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Test a too large grow */</div><div class='add'>+	memset(buf, 1, 262144);</div><div class='add'>+	exp_size = 90001;</div><div class='add'>+</div><div class='add'>+	topts.data_in = topts.data_out = buf;</div><div class='add'>+	topts.data_size_in = 90001;</div><div class='add'>+	topts.data_size_out = 262144;</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+</div><div class='add'>+	ASSERT_OK(err, "90Kb+10b");</div><div class='add'>+	ASSERT_EQ(topts.retval, XDP_DROP, "90Kb+10b retval");</div><div class='add'>+	ASSERT_EQ(topts.data_size_out, exp_size, "90Kb+10b size");</div><div class='add'>+</div><div class='add'>+	free(buf);</div><div class='add'>+out:</div><div class='add'>+	bpf_object__close(obj);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void test_xdp_adjust_tail(void)</div><div class='ctx'> {</div><div class='add'>+	int page_size = getpagesize();</div><div class='add'>+</div><div class='ctx'> 	if (test__start_subtest("xdp_adjust_tail_shrink"))</div><div class='ctx'> 		test_xdp_adjust_tail_shrink();</div><div class='ctx'> 	if (test__start_subtest("xdp_adjust_tail_grow"))</div><div class='del'>-		test_xdp_adjust_tail_grow();</div><div class='add'>+		test_xdp_adjust_tail_grow(page_size == 65536);</div><div class='ctx'> 	if (test__start_subtest("xdp_adjust_tail_grow2"))</div><div class='ctx'> 		test_xdp_adjust_tail_grow2();</div><div class='ctx'> 	if (test__start_subtest("xdp_adjust_frags_tail_shrink"))</div><div class='ctx'> 		test_xdp_adjust_frags_tail_shrink();</div><div class='del'>-	if (test__start_subtest("xdp_adjust_frags_tail_grow"))</div><div class='del'>-		test_xdp_adjust_frags_tail_grow();</div><div class='add'>+	if (test__start_subtest("xdp_adjust_frags_tail_grow")) {</div><div class='add'>+		if (page_size == 65536)</div><div class='add'>+			test_xdp_adjust_frags_tail_grow_64k();</div><div class='add'>+		else</div><div class='add'>+			test_xdp_adjust_frags_tail_grow_4k();</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c b/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c<br/>index 937da9b7532a..ee94c281888a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c</a></div><div class='hunk'>@@ -4,12 +4,21 @@</div><div class='ctx'> #include "test_xdp_context_test_run.skel.h"</div><div class='ctx'> #include "test_xdp_meta.skel.h"</div><div class='ctx'> </div><div class='del'>-#define TX_ADDR "10.0.0.1"</div><div class='del'>-#define RX_ADDR "10.0.0.2"</div><div class='ctx'> #define RX_NAME "veth0"</div><div class='ctx'> #define TX_NAME "veth1"</div><div class='ctx'> #define TX_NETNS "xdp_context_tx"</div><div class='ctx'> #define RX_NETNS "xdp_context_rx"</div><div class='add'>+#define TAP_NAME "tap0"</div><div class='add'>+#define DUMMY_NAME "dum0"</div><div class='add'>+#define TAP_NETNS "xdp_context_tuntap"</div><div class='add'>+</div><div class='add'>+#define TEST_PAYLOAD_LEN 32</div><div class='add'>+static const __u8 test_payload[TEST_PAYLOAD_LEN] = {</div><div class='add'>+	0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,</div><div class='add'>+	0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,</div><div class='add'>+	0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,</div><div class='add'>+	0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> void test_xdp_context_error(int prog_fd, struct bpf_test_run_opts opts,</div><div class='ctx'> 			    __u32 data_meta, __u32 data, __u32 data_end,</div><div class='hunk'>@@ -88,9 +97,7 @@ void test_xdp_context_test_run(void)</div><div class='ctx'> 	/* Meta data must be 255 bytes or smaller */</div><div class='ctx'> 	test_xdp_context_error(prog_fd, opts, 0, 256, sizeof(data), 0, 0, 0);</div><div class='ctx'> </div><div class='del'>-	/* Total size of data must match data_end - data_meta */</div><div class='del'>-	test_xdp_context_error(prog_fd, opts, 0, sizeof(__u32),</div><div class='del'>-			       sizeof(data) - 1, 0, 0, 0);</div><div class='add'>+	/* Total size of data must be data_end - data_meta or larger */</div><div class='ctx'> 	test_xdp_context_error(prog_fd, opts, 0, sizeof(__u32),</div><div class='ctx'> 			       sizeof(data) + 1, 0, 0, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +119,82 @@ void test_xdp_context_test_run(void)</div><div class='ctx'> 	test_xdp_context_test_run__destroy(skel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void test_xdp_context_functional(void)</div><div class='add'>+static int send_test_packet(int ifindex)</div><div class='add'>+{</div><div class='add'>+	int n, sock = -1;</div><div class='add'>+	__u8 packet[sizeof(struct ethhdr) + TEST_PAYLOAD_LEN];</div><div class='add'>+</div><div class='add'>+	/* We use the Ethernet header only to identify the test packet */</div><div class='add'>+	struct ethhdr eth = {</div><div class='add'>+		.h_source = { 0x12, 0x34, 0xDE, 0xAD, 0xBE, 0xEF },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memcpy(packet, &amp;eth, sizeof(eth));</div><div class='add'>+	memcpy(packet + sizeof(eth), test_payload, TEST_PAYLOAD_LEN);</div><div class='add'>+</div><div class='add'>+	sock = socket(AF_PACKET, SOCK_RAW, IPPROTO_RAW);</div><div class='add'>+	if (!ASSERT_GE(sock, 0, "socket"))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	struct sockaddr_ll saddr = {</div><div class='add'>+		.sll_family = PF_PACKET,</div><div class='add'>+		.sll_ifindex = ifindex,</div><div class='add'>+		.sll_halen = ETH_ALEN</div><div class='add'>+	};</div><div class='add'>+	n = sendto(sock, packet, sizeof(packet), 0, (struct sockaddr *)&amp;saddr,</div><div class='add'>+		   sizeof(saddr));</div><div class='add'>+	if (!ASSERT_EQ(n, sizeof(packet), "sendto"))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	close(sock);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (sock &gt;= 0)</div><div class='add'>+		close(sock);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_test_packet(int tap_fd)</div><div class='add'>+{</div><div class='add'>+	__u8 packet[sizeof(struct ethhdr) + TEST_PAYLOAD_LEN];</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	/* The Ethernet header is mostly not relevant. We use it to identify the</div><div class='add'>+	 * test packet and some BPF helpers we exercise expect to operate on</div><div class='add'>+	 * Ethernet frames carrying IP packets. Pretend that's the case.</div><div class='add'>+	 */</div><div class='add'>+	struct ethhdr eth = {</div><div class='add'>+		.h_source = { 0x12, 0x34, 0xDE, 0xAD, 0xBE, 0xEF },</div><div class='add'>+		.h_proto = htons(ETH_P_IP),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memcpy(packet, &amp;eth, sizeof(eth));</div><div class='add'>+	memcpy(packet + sizeof(struct ethhdr), test_payload, TEST_PAYLOAD_LEN);</div><div class='add'>+</div><div class='add'>+	n = write(tap_fd, packet, sizeof(packet));</div><div class='add'>+	if (!ASSERT_EQ(n, sizeof(packet), "write packet"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dump_err_stream(const struct bpf_program *prog)</div><div class='add'>+{</div><div class='add'>+	char buf[512];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	do {</div><div class='add'>+		ret = bpf_prog_stream_read(bpf_program__fd(prog),</div><div class='add'>+					   BPF_STREAM_STDERR, buf, sizeof(buf),</div><div class='add'>+					   NULL);</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			fwrite(buf, sizeof(buf[0]), ret, stderr);</div><div class='add'>+	} while (ret &gt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_xdp_context_veth(void)</div><div class='ctx'> {</div><div class='ctx'> 	LIBBPF_OPTS(bpf_tc_hook, tc_hook, .attach_point = BPF_TC_INGRESS);</div><div class='ctx'> 	LIBBPF_OPTS(bpf_tc_opts, tc_opts, .handle = 1, .priority = 1);</div><div class='hunk'>@@ -120,7 +202,7 @@ void test_xdp_context_functional(void)</div><div class='ctx'> 	struct bpf_program *tc_prog, *xdp_prog;</div><div class='ctx'> 	struct test_xdp_meta *skel = NULL;</div><div class='ctx'> 	struct nstoken *nstoken = NULL;</div><div class='del'>-	int rx_ifindex;</div><div class='add'>+	int rx_ifindex, tx_ifindex;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	tx_ns = netns_new(TX_NETNS, false);</div><div class='hunk'>@@ -138,7 +220,6 @@ void test_xdp_context_functional(void)</div><div class='ctx'> 	if (!ASSERT_OK_PTR(nstoken, "setns rx_ns"))</div><div class='ctx'> 		goto close;</div><div class='ctx'> </div><div class='del'>-	SYS(close, "ip addr add " RX_ADDR "/24 dev " RX_NAME);</div><div class='ctx'> 	SYS(close, "ip link set dev " RX_NAME " up");</div><div class='ctx'> </div><div class='ctx'> 	skel = test_xdp_meta__open_and_load();</div><div class='hunk'>@@ -179,9 +260,20 @@ void test_xdp_context_functional(void)</div><div class='ctx'> 	if (!ASSERT_OK_PTR(nstoken, "setns tx_ns"))</div><div class='ctx'> 		goto close;</div><div class='ctx'> </div><div class='del'>-	SYS(close, "ip addr add " TX_ADDR "/24 dev " TX_NAME);</div><div class='ctx'> 	SYS(close, "ip link set dev " TX_NAME " up");</div><div class='del'>-	ASSERT_OK(SYS_NOFAIL("ping -c 1 " RX_ADDR), "ping");</div><div class='add'>+</div><div class='add'>+	tx_ifindex = if_nametoindex(TX_NAME);</div><div class='add'>+	if (!ASSERT_GE(tx_ifindex, 0, "if_nametoindex tx"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;test_pass = false;</div><div class='add'>+</div><div class='add'>+	ret = send_test_packet(tx_ifindex);</div><div class='add'>+	if (!ASSERT_OK(ret, "send_test_packet"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_TRUE(skel-&gt;bss-&gt;test_pass, "test_pass"))</div><div class='add'>+		dump_err_stream(tc_prog);</div><div class='ctx'> </div><div class='ctx'> close:</div><div class='ctx'> 	close_netns(nstoken);</div><div class='hunk'>@@ -190,3 +282,231 @@ close:</div><div class='ctx'> 	netns_free(tx_ns);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_tuntap(struct bpf_program *xdp_prog,</div><div class='add'>+			struct bpf_program *tc_prio_1_prog,</div><div class='add'>+			struct bpf_program *tc_prio_2_prog,</div><div class='add'>+			bool *test_pass)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_tc_hook, tc_hook, .attach_point = BPF_TC_INGRESS);</div><div class='add'>+	LIBBPF_OPTS(bpf_tc_opts, tc_opts, .handle = 1, .priority = 1);</div><div class='add'>+	struct netns_obj *ns = NULL;</div><div class='add'>+	int tap_fd = -1;</div><div class='add'>+	int tap_ifindex;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	*test_pass = false;</div><div class='add'>+</div><div class='add'>+	ns = netns_new(TAP_NETNS, true);</div><div class='add'>+	if (!ASSERT_OK_PTR(ns, "create and open ns"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tap_fd = open_tuntap(TAP_NAME, true);</div><div class='add'>+	if (!ASSERT_GE(tap_fd, 0, "open_tuntap"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	SYS(close, "ip link set dev " TAP_NAME " up");</div><div class='add'>+</div><div class='add'>+	tap_ifindex = if_nametoindex(TAP_NAME);</div><div class='add'>+	if (!ASSERT_GE(tap_ifindex, 0, "if_nametoindex"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	tc_hook.ifindex = tap_ifindex;</div><div class='add'>+	ret = bpf_tc_hook_create(&amp;tc_hook);</div><div class='add'>+	if (!ASSERT_OK(ret, "bpf_tc_hook_create"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	tc_opts.prog_fd = bpf_program__fd(tc_prio_1_prog);</div><div class='add'>+	ret = bpf_tc_attach(&amp;tc_hook, &amp;tc_opts);</div><div class='add'>+	if (!ASSERT_OK(ret, "bpf_tc_attach"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	if (tc_prio_2_prog) {</div><div class='add'>+		LIBBPF_OPTS(bpf_tc_opts, tc_opts, .handle = 1, .priority = 2,</div><div class='add'>+			    .prog_fd = bpf_program__fd(tc_prio_2_prog));</div><div class='add'>+</div><div class='add'>+		ret = bpf_tc_attach(&amp;tc_hook, &amp;tc_opts);</div><div class='add'>+		if (!ASSERT_OK(ret, "bpf_tc_attach"))</div><div class='add'>+			goto close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = bpf_xdp_attach(tap_ifindex, bpf_program__fd(xdp_prog),</div><div class='add'>+			     0, NULL);</div><div class='add'>+	if (!ASSERT_GE(ret, 0, "bpf_xdp_attach"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	ret = write_test_packet(tap_fd);</div><div class='add'>+	if (!ASSERT_OK(ret, "write_test_packet"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_TRUE(*test_pass, "test_pass"))</div><div class='add'>+		dump_err_stream(tc_prio_2_prog ? : tc_prio_1_prog);</div><div class='add'>+</div><div class='add'>+close:</div><div class='add'>+	if (tap_fd &gt;= 0)</div><div class='add'>+		close(tap_fd);</div><div class='add'>+	netns_free(ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write a packet to a tap dev and copy it to ingress of a dummy dev */</div><div class='add'>+static void test_tuntap_mirred(struct bpf_program *xdp_prog,</div><div class='add'>+			       struct bpf_program *tc_prog,</div><div class='add'>+			       bool *test_pass)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_tc_hook, tc_hook, .attach_point = BPF_TC_INGRESS);</div><div class='add'>+	LIBBPF_OPTS(bpf_tc_opts, tc_opts, .handle = 1, .priority = 1);</div><div class='add'>+	struct netns_obj *ns = NULL;</div><div class='add'>+	int dummy_ifindex;</div><div class='add'>+	int tap_fd = -1;</div><div class='add'>+	int tap_ifindex;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	*test_pass = false;</div><div class='add'>+</div><div class='add'>+	ns = netns_new(TAP_NETNS, true);</div><div class='add'>+	if (!ASSERT_OK_PTR(ns, "netns_new"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Setup dummy interface */</div><div class='add'>+	SYS(close, "ip link add name " DUMMY_NAME " type dummy");</div><div class='add'>+	SYS(close, "ip link set dev " DUMMY_NAME " up");</div><div class='add'>+</div><div class='add'>+	dummy_ifindex = if_nametoindex(DUMMY_NAME);</div><div class='add'>+	if (!ASSERT_GE(dummy_ifindex, 0, "if_nametoindex"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	tc_hook.ifindex = dummy_ifindex;</div><div class='add'>+	ret = bpf_tc_hook_create(&amp;tc_hook);</div><div class='add'>+	if (!ASSERT_OK(ret, "bpf_tc_hook_create"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	tc_opts.prog_fd = bpf_program__fd(tc_prog);</div><div class='add'>+	ret = bpf_tc_attach(&amp;tc_hook, &amp;tc_opts);</div><div class='add'>+	if (!ASSERT_OK(ret, "bpf_tc_attach"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	/* Setup TAP interface */</div><div class='add'>+	tap_fd = open_tuntap(TAP_NAME, true);</div><div class='add'>+	if (!ASSERT_GE(tap_fd, 0, "open_tuntap"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	SYS(close, "ip link set dev " TAP_NAME " up");</div><div class='add'>+</div><div class='add'>+	tap_ifindex = if_nametoindex(TAP_NAME);</div><div class='add'>+	if (!ASSERT_GE(tap_ifindex, 0, "if_nametoindex"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	ret = bpf_xdp_attach(tap_ifindex, bpf_program__fd(xdp_prog), 0, NULL);</div><div class='add'>+	if (!ASSERT_GE(ret, 0, "bpf_xdp_attach"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	/* Copy all packets received from TAP to dummy ingress */</div><div class='add'>+	SYS(close, "tc qdisc add dev " TAP_NAME " clsact");</div><div class='add'>+	SYS(close, "tc filter add dev " TAP_NAME " ingress "</div><div class='add'>+		   "protocol all matchall "</div><div class='add'>+		   "action mirred ingress mirror dev " DUMMY_NAME);</div><div class='add'>+</div><div class='add'>+	/* Receive a packet on TAP */</div><div class='add'>+	ret = write_test_packet(tap_fd);</div><div class='add'>+	if (!ASSERT_OK(ret, "write_test_packet"))</div><div class='add'>+		goto close;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_TRUE(*test_pass, "test_pass"))</div><div class='add'>+		dump_err_stream(tc_prog);</div><div class='add'>+</div><div class='add'>+close:</div><div class='add'>+	if (tap_fd &gt;= 0)</div><div class='add'>+		close(tap_fd);</div><div class='add'>+	netns_free(ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_xdp_context_tuntap(void)</div><div class='add'>+{</div><div class='add'>+	struct test_xdp_meta *skel = NULL;</div><div class='add'>+</div><div class='add'>+	skel = test_xdp_meta__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "open and load skeleton"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("data_meta"))</div><div class='add'>+		test_tuntap(skel-&gt;progs.ing_xdp,</div><div class='add'>+			    skel-&gt;progs.ing_cls,</div><div class='add'>+			    NULL, /* tc prio 2 */</div><div class='add'>+			    &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("dynptr_read"))</div><div class='add'>+		test_tuntap(skel-&gt;progs.ing_xdp,</div><div class='add'>+			    skel-&gt;progs.ing_cls_dynptr_read,</div><div class='add'>+			    NULL, /* tc prio 2 */</div><div class='add'>+			    &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("dynptr_slice"))</div><div class='add'>+		test_tuntap(skel-&gt;progs.ing_xdp,</div><div class='add'>+			    skel-&gt;progs.ing_cls_dynptr_slice,</div><div class='add'>+			    NULL, /* tc prio 2 */</div><div class='add'>+			    &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("dynptr_write"))</div><div class='add'>+		test_tuntap(skel-&gt;progs.ing_xdp_zalloc_meta,</div><div class='add'>+			    skel-&gt;progs.ing_cls_dynptr_write,</div><div class='add'>+			    skel-&gt;progs.ing_cls_dynptr_read,</div><div class='add'>+			    &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("dynptr_slice_rdwr"))</div><div class='add'>+		test_tuntap(skel-&gt;progs.ing_xdp_zalloc_meta,</div><div class='add'>+			    skel-&gt;progs.ing_cls_dynptr_slice_rdwr,</div><div class='add'>+			    skel-&gt;progs.ing_cls_dynptr_slice,</div><div class='add'>+			    &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("dynptr_offset"))</div><div class='add'>+		test_tuntap(skel-&gt;progs.ing_xdp_zalloc_meta,</div><div class='add'>+			    skel-&gt;progs.ing_cls_dynptr_offset_wr,</div><div class='add'>+			    skel-&gt;progs.ing_cls_dynptr_offset_rd,</div><div class='add'>+			    &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("dynptr_offset_oob"))</div><div class='add'>+		test_tuntap(skel-&gt;progs.ing_xdp,</div><div class='add'>+			    skel-&gt;progs.ing_cls_dynptr_offset_oob,</div><div class='add'>+			    skel-&gt;progs.ing_cls,</div><div class='add'>+			    &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("clone_data_meta_survives_data_write"))</div><div class='add'>+		test_tuntap_mirred(skel-&gt;progs.ing_xdp,</div><div class='add'>+				   skel-&gt;progs.clone_data_meta_survives_data_write,</div><div class='add'>+				   &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("clone_data_meta_survives_meta_write"))</div><div class='add'>+		test_tuntap_mirred(skel-&gt;progs.ing_xdp,</div><div class='add'>+				   skel-&gt;progs.clone_data_meta_survives_meta_write,</div><div class='add'>+				   &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("clone_meta_dynptr_survives_data_slice_write"))</div><div class='add'>+		test_tuntap_mirred(skel-&gt;progs.ing_xdp,</div><div class='add'>+				   skel-&gt;progs.clone_meta_dynptr_survives_data_slice_write,</div><div class='add'>+				   &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("clone_meta_dynptr_survives_meta_slice_write"))</div><div class='add'>+		test_tuntap_mirred(skel-&gt;progs.ing_xdp,</div><div class='add'>+				   skel-&gt;progs.clone_meta_dynptr_survives_meta_slice_write,</div><div class='add'>+				   &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("clone_meta_dynptr_rw_before_data_dynptr_write"))</div><div class='add'>+		test_tuntap_mirred(skel-&gt;progs.ing_xdp,</div><div class='add'>+				   skel-&gt;progs.clone_meta_dynptr_rw_before_data_dynptr_write,</div><div class='add'>+				   &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("clone_meta_dynptr_rw_before_meta_dynptr_write"))</div><div class='add'>+		test_tuntap_mirred(skel-&gt;progs.ing_xdp,</div><div class='add'>+				   skel-&gt;progs.clone_meta_dynptr_rw_before_meta_dynptr_write,</div><div class='add'>+				   &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	/* Tests for BPF helpers which touch headroom */</div><div class='add'>+	if (test__start_subtest("helper_skb_vlan_push_pop"))</div><div class='add'>+		test_tuntap(skel-&gt;progs.ing_xdp,</div><div class='add'>+			    skel-&gt;progs.helper_skb_vlan_push_pop,</div><div class='add'>+			    NULL, /* tc prio 2 */</div><div class='add'>+			    &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("helper_skb_adjust_room"))</div><div class='add'>+		test_tuntap(skel-&gt;progs.ing_xdp,</div><div class='add'>+			    skel-&gt;progs.helper_skb_adjust_room,</div><div class='add'>+			    NULL, /* tc prio 2 */</div><div class='add'>+			    &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("helper_skb_change_head_tail"))</div><div class='add'>+		test_tuntap(skel-&gt;progs.ing_xdp,</div><div class='add'>+			    skel-&gt;progs.helper_skb_change_head_tail,</div><div class='add'>+			    NULL, /* tc prio 2 */</div><div class='add'>+			    &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+	if (test__start_subtest("helper_skb_change_proto"))</div><div class='add'>+		test_tuntap(skel-&gt;progs.ing_xdp,</div><div class='add'>+			    skel-&gt;progs.helper_skb_change_proto,</div><div class='add'>+			    NULL, /* tc prio 2 */</div><div class='add'>+			    &amp;skel-&gt;bss-&gt;test_pass);</div><div class='add'>+</div><div class='add'>+	test_xdp_meta__destroy(skel);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c<br/>index c7f74f068e78..df27535995af 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c</a></div><div class='hunk'>@@ -52,10 +52,10 @@ static void test_xdp_with_cpumap_helpers(void)</div><div class='ctx'> 	ASSERT_EQ(info.id, val.bpf_prog.id, "Match program id to cpumap entry prog_id");</div><div class='ctx'> </div><div class='ctx'> 	/* send a packet to trigger any potential bugs in there */</div><div class='del'>-	char data[10] = {};</div><div class='add'>+	char data[ETH_HLEN] = {};</div><div class='ctx'> 	DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,</div><div class='ctx'> 			    .data_in = &amp;data,</div><div class='del'>-			    .data_size_in = 10,</div><div class='add'>+			    .data_size_in = sizeof(data),</div><div class='ctx'> 			    .flags = BPF_F_TEST_XDP_LIVE_FRAMES,</div><div class='ctx'> 			    .repeat = 1,</div><div class='ctx'> 		);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c<br/>index 27ffed17d4be..a8ab05216c38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;test_progs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "test_xdp_devmap_helpers.skel.h"</div><div class='add'>+#include "test_xdp_devmap_tailcall.skel.h"</div><div class='ctx'> #include "test_xdp_with_devmap_frags_helpers.skel.h"</div><div class='ctx'> #include "test_xdp_with_devmap_helpers.skel.h"</div><div class='ctx'> </div><div class='hunk'>@@ -23,7 +24,7 @@ static void test_xdp_with_devmap_helpers(void)</div><div class='ctx'> 	__u32 len = sizeof(info);</div><div class='ctx'> 	int err, dm_fd, dm_fd_redir, map_fd;</div><div class='ctx'> 	struct nstoken *nstoken = NULL;</div><div class='del'>-	char data[10] = {};</div><div class='add'>+	char data[ETH_HLEN] = {};</div><div class='ctx'> 	__u32 idx = 0;</div><div class='ctx'> </div><div class='ctx'> 	SYS(out_close, "ip netns add %s", TEST_NS);</div><div class='hunk'>@@ -58,7 +59,7 @@ static void test_xdp_with_devmap_helpers(void)</div><div class='ctx'> 	/* send a packet to trigger any potential bugs in there */</div><div class='ctx'> 	DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,</div><div class='ctx'> 			    .data_in = &amp;data,</div><div class='del'>-			    .data_size_in = 10,</div><div class='add'>+			    .data_size_in = sizeof(data),</div><div class='ctx'> 			    .flags = BPF_F_TEST_XDP_LIVE_FRAMES,</div><div class='ctx'> 			    .repeat = 1,</div><div class='ctx'> 		);</div><div class='hunk'>@@ -107,6 +108,29 @@ static void test_neg_xdp_devmap_helpers(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_xdp_devmap_tailcall(enum bpf_attach_type prog_dev,</div><div class='add'>+				     enum bpf_attach_type prog_tail,</div><div class='add'>+				     bool expect_reject)</div><div class='add'>+{</div><div class='add'>+	struct test_xdp_devmap_tailcall *skel;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skel = test_xdp_devmap_tailcall__open();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "test_xdp_devmap_tailcall__open"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bpf_program__set_expected_attach_type(skel-&gt;progs.xdp_devmap, prog_dev);</div><div class='add'>+	bpf_program__set_expected_attach_type(skel-&gt;progs.xdp_entry, prog_tail);</div><div class='add'>+</div><div class='add'>+	err = test_xdp_devmap_tailcall__load(skel);</div><div class='add'>+	if (expect_reject)</div><div class='add'>+		ASSERT_ERR(err, "test_xdp_devmap_tailcall__load");</div><div class='add'>+	else</div><div class='add'>+		ASSERT_OK(err, "test_xdp_devmap_tailcall__load");</div><div class='add'>+</div><div class='add'>+	test_xdp_devmap_tailcall__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void test_xdp_with_devmap_frags_helpers(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct test_xdp_with_devmap_frags_helpers *skel;</div><div class='hunk'>@@ -158,7 +182,7 @@ static void test_xdp_with_devmap_helpers_veth(void)</div><div class='ctx'> 	struct nstoken *nstoken = NULL;</div><div class='ctx'> 	__u32 len = sizeof(info);</div><div class='ctx'> 	int err, dm_fd, dm_fd_redir, map_fd, ifindex_dst;</div><div class='del'>-	char data[10] = {};</div><div class='add'>+	char data[ETH_HLEN] = {};</div><div class='ctx'> 	__u32 idx = 0;</div><div class='ctx'> </div><div class='ctx'> 	SYS(out_close, "ip netns add %s", TEST_NS);</div><div class='hunk'>@@ -208,7 +232,7 @@ static void test_xdp_with_devmap_helpers_veth(void)</div><div class='ctx'> 	/* send a packet to trigger any potential bugs in there */</div><div class='ctx'> 	DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,</div><div class='ctx'> 			    .data_in = &amp;data,</div><div class='del'>-			    .data_size_in = 10,</div><div class='add'>+			    .data_size_in = sizeof(data),</div><div class='ctx'> 			    .flags = BPF_F_TEST_XDP_LIVE_FRAMES,</div><div class='ctx'> 			    .repeat = 1,</div><div class='ctx'> 		);</div><div class='hunk'>@@ -238,8 +262,13 @@ void serial_test_xdp_devmap_attach(void)</div><div class='ctx'> 	if (test__start_subtest("DEVMAP with frags programs in entries"))</div><div class='ctx'> 		test_xdp_with_devmap_frags_helpers();</div><div class='ctx'> </div><div class='del'>-	if (test__start_subtest("Verifier check of DEVMAP programs"))</div><div class='add'>+	if (test__start_subtest("Verifier check of DEVMAP programs")) {</div><div class='ctx'> 		test_neg_xdp_devmap_helpers();</div><div class='add'>+		test_xdp_devmap_tailcall(BPF_XDP_DEVMAP, BPF_XDP_DEVMAP, false);</div><div class='add'>+		test_xdp_devmap_tailcall(0, 0, true);</div><div class='add'>+		test_xdp_devmap_tailcall(BPF_XDP_DEVMAP, 0, true);</div><div class='add'>+		test_xdp_devmap_tailcall(0, BPF_XDP_DEVMAP, true);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (test__start_subtest("DEVMAP with programs in entries on veth"))</div><div class='ctx'> 		test_xdp_with_devmap_helpers_veth();</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c b/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c<br/>index 7dac044664ac..dd34b0cc4b4e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c</a></div><div class='hunk'>@@ -66,16 +66,25 @@ static int attach_tc_prog(struct bpf_tc_hook *hook, int fd)</div><div class='ctx'> #else</div><div class='ctx'> #define MAX_PKT_SIZE 3408</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+#define PAGE_SIZE_4K  4096</div><div class='add'>+#define PAGE_SIZE_64K 65536</div><div class='add'>+</div><div class='ctx'> static void test_max_pkt_size(int fd)</div><div class='ctx'> {</div><div class='del'>-	char data[MAX_PKT_SIZE + 1] = {};</div><div class='add'>+	char data[PAGE_SIZE_64K + 1] = {};</div><div class='ctx'> 	int err;</div><div class='ctx'> 	DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,</div><div class='ctx'> 			    .data_in = &amp;data,</div><div class='del'>-			    .data_size_in = MAX_PKT_SIZE,</div><div class='ctx'> 			    .flags = BPF_F_TEST_XDP_LIVE_FRAMES,</div><div class='ctx'> 			    .repeat = 1,</div><div class='ctx'> 		);</div><div class='add'>+</div><div class='add'>+	if (getpagesize() == PAGE_SIZE_64K)</div><div class='add'>+		opts.data_size_in = MAX_PKT_SIZE + PAGE_SIZE_64K - PAGE_SIZE_4K;</div><div class='add'>+	else</div><div class='add'>+		opts.data_size_in = MAX_PKT_SIZE;</div><div class='add'>+</div><div class='ctx'> 	err = bpf_prog_test_run_opts(fd, &amp;opts);</div><div class='ctx'> 	ASSERT_OK(err, "prog_run_max_size");</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c<br/>index 3d47878ef6bf..19f92affc2da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/prog_tests/xdp_metadata.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/xdp_metadata.c</a></div><div class='hunk'>@@ -351,9 +351,10 @@ void test_xdp_metadata(void)</div><div class='ctx'> 	struct xdp_metadata2 *bpf_obj2 = NULL;</div><div class='ctx'> 	struct xdp_metadata *bpf_obj = NULL;</div><div class='ctx'> 	struct bpf_program *new_prog, *prog;</div><div class='add'>+	struct bpf_devmap_val devmap_e = {};</div><div class='add'>+	struct bpf_map *prog_arr, *devmap;</div><div class='ctx'> 	struct nstoken *tok = NULL;</div><div class='ctx'> 	__u32 queue_id = QUEUE_ID;</div><div class='del'>-	struct bpf_map *prog_arr;</div><div class='ctx'> 	struct xsk tx_xsk = {};</div><div class='ctx'> 	struct xsk rx_xsk = {};</div><div class='ctx'> 	__u32 val, key = 0;</div><div class='hunk'>@@ -409,6 +410,13 @@ void test_xdp_metadata(void)</div><div class='ctx'> 	bpf_program__set_ifindex(prog, rx_ifindex);</div><div class='ctx'> 	bpf_program__set_flags(prog, BPF_F_XDP_DEV_BOUND_ONLY);</div><div class='ctx'> </div><div class='add'>+	/* Make sure we can load a dev-bound program that performs</div><div class='add'>+	 * XDP_REDIRECT into a devmap.</div><div class='add'>+	 */</div><div class='add'>+	new_prog = bpf_object__find_program_by_name(bpf_obj-&gt;obj, "redirect");</div><div class='add'>+	bpf_program__set_ifindex(new_prog, rx_ifindex);</div><div class='add'>+	bpf_program__set_flags(new_prog, BPF_F_XDP_DEV_BOUND_ONLY);</div><div class='add'>+</div><div class='ctx'> 	if (!ASSERT_OK(xdp_metadata__load(bpf_obj), "load skeleton"))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -423,6 +431,18 @@ void test_xdp_metadata(void)</div><div class='ctx'> 			"update prog_arr"))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/* Make sure we can't add dev-bound programs to devmaps. */</div><div class='add'>+	devmap = bpf_object__find_map_by_name(bpf_obj-&gt;obj, "dev_map");</div><div class='add'>+	if (!ASSERT_OK_PTR(devmap, "no dev_map found"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	devmap_e.bpf_prog.fd = val;</div><div class='add'>+	if (!ASSERT_ERR(bpf_map__update_elem(devmap, &amp;key, sizeof(key),</div><div class='add'>+					     &amp;devmap_e, sizeof(devmap_e),</div><div class='add'>+					     BPF_ANY),</div><div class='add'>+			"update dev_map"))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/* Attach BPF program to RX interface. */</div><div class='ctx'> </div><div class='ctx'> 	ret = bpf_xdp_attach(rx_ifindex,</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_pull_data.c b/tools/testing/selftests/bpf/prog_tests/xdp_pull_data.c<br/>new file mode 100644<br/>index 000000000000..efa350d04ec5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_pull_data.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/xdp_pull_data.c</a></div><div class='hunk'>@@ -0,0 +1,179 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;test_progs.h&gt;</div><div class='add'>+#include &lt;network_helpers.h&gt;</div><div class='add'>+#include "test_xdp_pull_data.skel.h"</div><div class='add'>+</div><div class='add'>+#define PULL_MAX	(1 &lt;&lt; 31)</div><div class='add'>+#define PULL_PLUS_ONE	(1 &lt;&lt; 30)</div><div class='add'>+</div><div class='add'>+#define XDP_PACKET_HEADROOM 256</div><div class='add'>+</div><div class='add'>+/* Find headroom and tailroom occupied by struct xdp_frame and struct</div><div class='add'>+ * skb_shared_info so that we can calculate the maximum pull lengths for</div><div class='add'>+ * test cases. They might not be the real size of the structures due to</div><div class='add'>+ * cache alignment.</div><div class='add'>+ */</div><div class='add'>+static int find_xdp_sizes(struct test_xdp_pull_data *skel, int frame_sz)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='add'>+	struct xdp_md ctx = {};</div><div class='add'>+	int prog_fd, err;</div><div class='add'>+	__u8 *buf;</div><div class='add'>+</div><div class='add'>+	buf = calloc(frame_sz, sizeof(__u8));</div><div class='add'>+	if (!ASSERT_OK_PTR(buf, "calloc buf"))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	topts.data_in = buf;</div><div class='add'>+	topts.data_out = buf;</div><div class='add'>+	topts.data_size_in = frame_sz;</div><div class='add'>+	topts.data_size_out = frame_sz;</div><div class='add'>+	/* Pass a data_end larger than the linear space available to make sure</div><div class='add'>+	 * bpf_prog_test_run_xdp() will fill the linear data area so that</div><div class='add'>+	 * xdp_find_sizes can infer the size of struct skb_shared_info</div><div class='add'>+	 */</div><div class='add'>+	ctx.data_end = frame_sz;</div><div class='add'>+	topts.ctx_in = &amp;ctx;</div><div class='add'>+	topts.ctx_out = &amp;ctx;</div><div class='add'>+	topts.ctx_size_in = sizeof(ctx);</div><div class='add'>+	topts.ctx_size_out = sizeof(ctx);</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.xdp_find_sizes);</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+	ASSERT_OK(err, "bpf_prog_test_run_opts");</div><div class='add'>+</div><div class='add'>+	free(buf);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* xdp_pull_data_prog will directly read a marker 0xbb stored at buf[1024]</div><div class='add'>+ * so caller expecting XDP_PASS should always pass pull_len no less than 1024</div><div class='add'>+ */</div><div class='add'>+static void run_test(struct test_xdp_pull_data *skel, int retval,</div><div class='add'>+		     int frame_sz, int buff_len, int meta_len, int data_len,</div><div class='add'>+		     int pull_len)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_test_run_opts, topts);</div><div class='add'>+	struct xdp_md ctx = {};</div><div class='add'>+	int prog_fd, err;</div><div class='add'>+	__u8 *buf;</div><div class='add'>+</div><div class='add'>+	buf = calloc(buff_len, sizeof(__u8));</div><div class='add'>+	if (!ASSERT_OK_PTR(buf, "calloc buf"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	buf[meta_len + 1023] = 0xaa;</div><div class='add'>+	buf[meta_len + 1024] = 0xbb;</div><div class='add'>+	buf[meta_len + 1025] = 0xcc;</div><div class='add'>+</div><div class='add'>+	topts.data_in = buf;</div><div class='add'>+	topts.data_out = buf;</div><div class='add'>+	topts.data_size_in = buff_len;</div><div class='add'>+	topts.data_size_out = buff_len;</div><div class='add'>+	ctx.data = meta_len;</div><div class='add'>+	ctx.data_end = meta_len + data_len;</div><div class='add'>+	topts.ctx_in = &amp;ctx;</div><div class='add'>+	topts.ctx_out = &amp;ctx;</div><div class='add'>+	topts.ctx_size_in = sizeof(ctx);</div><div class='add'>+	topts.ctx_size_out = sizeof(ctx);</div><div class='add'>+</div><div class='add'>+	skel-&gt;bss-&gt;data_len = data_len;</div><div class='add'>+	if (pull_len &amp; PULL_MAX) {</div><div class='add'>+		int headroom = XDP_PACKET_HEADROOM - meta_len - skel-&gt;bss-&gt;xdpf_sz;</div><div class='add'>+		int tailroom = frame_sz - XDP_PACKET_HEADROOM -</div><div class='add'>+			       data_len - skel-&gt;bss-&gt;sinfo_sz;</div><div class='add'>+</div><div class='add'>+		pull_len = pull_len &amp; PULL_PLUS_ONE ? 1 : 0;</div><div class='add'>+		pull_len += headroom + tailroom + data_len;</div><div class='add'>+	}</div><div class='add'>+	skel-&gt;bss-&gt;pull_len = pull_len;</div><div class='add'>+</div><div class='add'>+	prog_fd = bpf_program__fd(skel-&gt;progs.xdp_pull_data_prog);</div><div class='add'>+	err = bpf_prog_test_run_opts(prog_fd, &amp;topts);</div><div class='add'>+	ASSERT_OK(err, "bpf_prog_test_run_opts");</div><div class='add'>+	ASSERT_EQ(topts.retval, retval, "xdp_pull_data_prog retval");</div><div class='add'>+</div><div class='add'>+	if (retval == XDP_DROP)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(ctx.data_end, meta_len + pull_len, "linear data size");</div><div class='add'>+	ASSERT_EQ(topts.data_size_out, buff_len, "linear + non-linear data size");</div><div class='add'>+	/* Make sure data around xdp-&gt;data_end was not messed up by</div><div class='add'>+	 * bpf_xdp_pull_data()</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(buf[meta_len + 1023], 0xaa, "data[1023]");</div><div class='add'>+	ASSERT_EQ(buf[meta_len + 1024], 0xbb, "data[1024]");</div><div class='add'>+	ASSERT_EQ(buf[meta_len + 1025], 0xcc, "data[1025]");</div><div class='add'>+out:</div><div class='add'>+	free(buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_xdp_pull_data_basic(void)</div><div class='add'>+{</div><div class='add'>+	u32 pg_sz, max_meta_len, max_data_len;</div><div class='add'>+	struct test_xdp_pull_data *skel;</div><div class='add'>+</div><div class='add'>+	skel = test_xdp_pull_data__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "test_xdp_pull_data__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pg_sz = sysconf(_SC_PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	if (find_xdp_sizes(skel, pg_sz))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	max_meta_len = XDP_PACKET_HEADROOM - skel-&gt;bss-&gt;xdpf_sz;</div><div class='add'>+	max_data_len = pg_sz - XDP_PACKET_HEADROOM - skel-&gt;bss-&gt;sinfo_sz;</div><div class='add'>+</div><div class='add'>+	/* linear xdp pkt, pull 0 byte */</div><div class='add'>+	run_test(skel, XDP_PASS, pg_sz, 2048, 0, 2048, 2048);</div><div class='add'>+</div><div class='add'>+	/* multi-buf pkt, pull results in linear xdp pkt */</div><div class='add'>+	run_test(skel, XDP_PASS, pg_sz, 2048, 0, 1024, 2048);</div><div class='add'>+</div><div class='add'>+	/* multi-buf pkt, pull 1 byte to linear data area */</div><div class='add'>+	run_test(skel, XDP_PASS, pg_sz, 9000, 0, 1024, 1025);</div><div class='add'>+</div><div class='add'>+	/* multi-buf pkt, pull 0 byte to linear data area */</div><div class='add'>+	run_test(skel, XDP_PASS, pg_sz, 9000, 0, 1025, 1025);</div><div class='add'>+</div><div class='add'>+	/* multi-buf pkt, empty linear data area, pull requires memmove */</div><div class='add'>+	run_test(skel, XDP_PASS, pg_sz, 9000, 0, 0, PULL_MAX);</div><div class='add'>+</div><div class='add'>+	/* multi-buf pkt, no headroom */</div><div class='add'>+	run_test(skel, XDP_PASS, pg_sz, 9000, max_meta_len, 1024, PULL_MAX);</div><div class='add'>+</div><div class='add'>+	/* multi-buf pkt, no tailroom, pull requires memmove */</div><div class='add'>+	run_test(skel, XDP_PASS, pg_sz, 9000, 0, max_data_len, PULL_MAX);</div><div class='add'>+</div><div class='add'>+	/* Test cases with invalid pull length */</div><div class='add'>+</div><div class='add'>+	/* linear xdp pkt, pull more than total data len */</div><div class='add'>+	run_test(skel, XDP_DROP, pg_sz, 2048, 0, 2048, 2049);</div><div class='add'>+</div><div class='add'>+	/* multi-buf pkt with no space left in linear data area */</div><div class='add'>+	run_test(skel, XDP_DROP, pg_sz, 9000, max_meta_len, max_data_len,</div><div class='add'>+		 PULL_MAX | PULL_PLUS_ONE);</div><div class='add'>+</div><div class='add'>+	/* multi-buf pkt, empty linear data area */</div><div class='add'>+	run_test(skel, XDP_DROP, pg_sz, 9000, 0, 0, PULL_MAX | PULL_PLUS_ONE);</div><div class='add'>+</div><div class='add'>+	/* multi-buf pkt, no headroom */</div><div class='add'>+	run_test(skel, XDP_DROP, pg_sz, 9000, max_meta_len, 1024,</div><div class='add'>+		 PULL_MAX | PULL_PLUS_ONE);</div><div class='add'>+</div><div class='add'>+	/* multi-buf pkt, no tailroom */</div><div class='add'>+	run_test(skel, XDP_DROP, pg_sz, 9000, 0, max_data_len,</div><div class='add'>+		 PULL_MAX | PULL_PLUS_ONE);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	test_xdp_pull_data__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_xdp_pull_data(void)</div><div class='add'>+{</div><div class='add'>+	if (test__start_subtest("xdp_pull_data"))</div><div class='add'>+		test_xdp_pull_data_basic();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_vlan.c b/tools/testing/selftests/bpf/prog_tests/xdp_vlan.c<br/>new file mode 100644<br/>index 000000000000..18dd25344de7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_vlan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/xdp_vlan.c</a></div><div class='hunk'>@@ -0,0 +1,175 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Network topology:</div><div class='add'>+ *  -----------        -----------</div><div class='add'>+ *  |  NS1    |        |   NS2   |</div><div class='add'>+ *  | veth0  -|--------|- veth0  |</div><div class='add'>+ *  -----------        -----------</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#include &lt;net/if.h&gt;</div><div class='add'>+#include &lt;uapi/linux/if_link.h&gt;</div><div class='add'>+</div><div class='add'>+#include "network_helpers.h"</div><div class='add'>+#include "test_progs.h"</div><div class='add'>+#include "test_xdp_vlan.skel.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define VETH_NAME	"veth0"</div><div class='add'>+#define NS_MAX_SIZE	32</div><div class='add'>+#define NS1_NAME	"ns-xdp-vlan-1-"</div><div class='add'>+#define NS2_NAME	"ns-xdp-vlan-2-"</div><div class='add'>+#define NS1_IP_ADDR	"100.64.10.1"</div><div class='add'>+#define NS2_IP_ADDR	"100.64.10.2"</div><div class='add'>+#define VLAN_ID		4011</div><div class='add'>+</div><div class='add'>+static int setup_network(char *ns1, char *ns2)</div><div class='add'>+{</div><div class='add'>+	if (!ASSERT_OK(append_tid(ns1, NS_MAX_SIZE), "create ns1 name"))</div><div class='add'>+		goto fail;</div><div class='add'>+	if (!ASSERT_OK(append_tid(ns2, NS_MAX_SIZE), "create ns2 name"))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip netns add %s", ns1);</div><div class='add'>+	SYS(fail, "ip netns add %s", ns2);</div><div class='add'>+	SYS(fail, "ip -n %s link add %s type veth peer name %s netns %s",</div><div class='add'>+	    ns1, VETH_NAME, VETH_NAME, ns2);</div><div class='add'>+</div><div class='add'>+	/* NOTICE: XDP require VLAN header inside packet payload</div><div class='add'>+	 *  - Thus, disable VLAN offloading driver features</div><div class='add'>+	 */</div><div class='add'>+	SYS(fail, "ip netns exec %s ethtool -K %s rxvlan off txvlan off", ns1, VETH_NAME);</div><div class='add'>+	SYS(fail, "ip netns exec %s ethtool -K %s rxvlan off txvlan off", ns2, VETH_NAME);</div><div class='add'>+</div><div class='add'>+	/* NS1 configuration */</div><div class='add'>+	SYS(fail, "ip -n %s addr add %s/24 dev %s", ns1, NS1_IP_ADDR, VETH_NAME);</div><div class='add'>+	SYS(fail, "ip -n %s link set %s up", ns1, VETH_NAME);</div><div class='add'>+</div><div class='add'>+	/* NS2 configuration */</div><div class='add'>+	SYS(fail, "ip -n %s link add link %s name %s.%d type vlan id %d",</div><div class='add'>+	    ns2, VETH_NAME, VETH_NAME, VLAN_ID, VLAN_ID);</div><div class='add'>+	SYS(fail, "ip -n %s addr add %s/24 dev %s.%d", ns2, NS2_IP_ADDR, VETH_NAME, VLAN_ID);</div><div class='add'>+	SYS(fail, "ip -n %s link set %s up", ns2, VETH_NAME);</div><div class='add'>+	SYS(fail, "ip -n %s link set %s.%d up", ns2, VETH_NAME, VLAN_ID);</div><div class='add'>+</div><div class='add'>+	/* At this point ping should fail because VLAN tags are only used by NS2 */</div><div class='add'>+	return !SYS_NOFAIL("ip netns exec %s ping -W 1 -c1 %s", ns2, NS1_IP_ADDR);</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup_network(const char *ns1, const char *ns2)</div><div class='add'>+{</div><div class='add'>+	SYS_NOFAIL("ip netns del %s", ns1);</div><div class='add'>+	SYS_NOFAIL("ip netns del %s", ns2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xdp_vlan(struct bpf_program *xdp, struct bpf_program *tc, u32 flags)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_tc_hook, tc_hook, .attach_point = BPF_TC_EGRESS);</div><div class='add'>+	LIBBPF_OPTS(bpf_tc_opts, tc_opts, .handle = 1, .priority = 1);</div><div class='add'>+	char ns1[NS_MAX_SIZE] = NS1_NAME;</div><div class='add'>+	char ns2[NS_MAX_SIZE] = NS2_NAME;</div><div class='add'>+	struct nstoken *nstoken = NULL;</div><div class='add'>+	int interface;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(setup_network(ns1, ns2), "setup network"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	nstoken = open_netns(ns1);</div><div class='add'>+	if (!ASSERT_OK_PTR(nstoken, "open NS1"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	interface = if_nametoindex(VETH_NAME);</div><div class='add'>+	if (!ASSERT_NEQ(interface, 0, "get interface index"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	ret = bpf_xdp_attach(interface, bpf_program__fd(xdp), flags, NULL);</div><div class='add'>+	if (!ASSERT_OK(ret, "attach xdp_vlan_change"))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	tc_hook.ifindex = interface;</div><div class='add'>+	ret = bpf_tc_hook_create(&amp;tc_hook);</div><div class='add'>+	if (!ASSERT_OK(ret, "bpf_tc_hook_create"))</div><div class='add'>+		goto detach_xdp;</div><div class='add'>+</div><div class='add'>+	/* Now we'll use BPF programs to pop/push the VLAN tags */</div><div class='add'>+	tc_opts.prog_fd = bpf_program__fd(tc);</div><div class='add'>+	ret = bpf_tc_attach(&amp;tc_hook, &amp;tc_opts);</div><div class='add'>+	if (!ASSERT_OK(ret, "bpf_tc_attach"))</div><div class='add'>+		goto detach_xdp;</div><div class='add'>+</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	nstoken = NULL;</div><div class='add'>+</div><div class='add'>+	/* Now the namespaces can reach each-other, test with pings */</div><div class='add'>+	SYS(detach_tc, "ip netns exec %s ping -i 0.2 -W 2 -c 2 %s &gt; /dev/null", ns1, NS2_IP_ADDR);</div><div class='add'>+	SYS(detach_tc, "ip netns exec %s ping -i 0.2 -W 2 -c 2 %s &gt; /dev/null", ns2, NS1_IP_ADDR);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+detach_tc:</div><div class='add'>+	bpf_tc_detach(&amp;tc_hook, &amp;tc_opts);</div><div class='add'>+detach_xdp:</div><div class='add'>+	bpf_xdp_detach(interface, flags, NULL);</div><div class='add'>+cleanup:</div><div class='add'>+	close_netns(nstoken);</div><div class='add'>+	cleanup_network(ns1, ns2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* First test: Remove VLAN by setting VLAN ID 0, using "xdp_vlan_change"</div><div class='add'>+ * egress use TC to add back VLAN tag 4011</div><div class='add'>+ */</div><div class='add'>+void test_xdp_vlan_change(void)</div><div class='add'>+{</div><div class='add'>+	struct test_xdp_vlan *skel;</div><div class='add'>+</div><div class='add'>+	skel = test_xdp_vlan__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "xdp_vlan__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("0"))</div><div class='add'>+		xdp_vlan(skel-&gt;progs.xdp_vlan_change, skel-&gt;progs.tc_vlan_push, 0);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("DRV_MODE"))</div><div class='add'>+		xdp_vlan(skel-&gt;progs.xdp_vlan_change, skel-&gt;progs.tc_vlan_push,</div><div class='add'>+			 XDP_FLAGS_DRV_MODE);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("SKB_MODE"))</div><div class='add'>+		xdp_vlan(skel-&gt;progs.xdp_vlan_change, skel-&gt;progs.tc_vlan_push,</div><div class='add'>+			 XDP_FLAGS_SKB_MODE);</div><div class='add'>+</div><div class='add'>+	test_xdp_vlan__destroy(skel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Second test: XDP prog fully remove vlan header</div><div class='add'>+ *</div><div class='add'>+ * Catch kernel bug for generic-XDP, that doesn't allow us to</div><div class='add'>+ * remove a VLAN header, because skb-&gt;protocol still contain VLAN</div><div class='add'>+ * ETH_P_8021Q indication, and this cause overwriting of our changes.</div><div class='add'>+ */</div><div class='add'>+void test_xdp_vlan_remove(void)</div><div class='add'>+{</div><div class='add'>+	struct test_xdp_vlan *skel;</div><div class='add'>+</div><div class='add'>+	skel = test_xdp_vlan__open_and_load();</div><div class='add'>+	if (!ASSERT_OK_PTR(skel, "xdp_vlan__open_and_load"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("0"))</div><div class='add'>+		xdp_vlan(skel-&gt;progs.xdp_vlan_remove_outer2, skel-&gt;progs.tc_vlan_push, 0);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("DRV_MODE"))</div><div class='add'>+		xdp_vlan(skel-&gt;progs.xdp_vlan_remove_outer2, skel-&gt;progs.tc_vlan_push,</div><div class='add'>+			 XDP_FLAGS_DRV_MODE);</div><div class='add'>+</div><div class='add'>+	if (test__start_subtest("SKB_MODE"))</div><div class='add'>+		xdp_vlan(skel-&gt;progs.xdp_vlan_remove_outer2, skel-&gt;progs.tc_vlan_push,</div><div class='add'>+			 XDP_FLAGS_SKB_MODE);</div><div class='add'>+</div><div class='add'>+	test_xdp_vlan__destroy(skel);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/prog_tests/xsk.c b/tools/testing/selftests/bpf/prog_tests/xsk.c<br/>new file mode 100644<br/>index 000000000000..dd4c35c0e428<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/prog_tests/xsk.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/prog_tests/xsk.c</a></div><div class='hunk'>@@ -0,0 +1,151 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;net/if.h&gt;</div><div class='add'>+#include &lt;stdarg.h&gt;</div><div class='add'>+</div><div class='add'>+#include "network_helpers.h"</div><div class='add'>+#include "test_progs.h"</div><div class='add'>+#include "test_xsk.h"</div><div class='add'>+#include "xsk_xdp_progs.skel.h"</div><div class='add'>+</div><div class='add'>+#define VETH_RX "veth0"</div><div class='add'>+#define VETH_TX "veth1"</div><div class='add'>+#define MTU	1500</div><div class='add'>+</div><div class='add'>+int setup_veth(bool busy_poll)</div><div class='add'>+{</div><div class='add'>+	SYS(fail,</div><div class='add'>+	"ip link add %s numtxqueues 4 numrxqueues 4 type veth peer name %s numtxqueues 4 numrxqueues 4",</div><div class='add'>+	VETH_RX, VETH_TX);</div><div class='add'>+	SYS(fail, "sysctl -wq net.ipv6.conf.%s.disable_ipv6=1", VETH_RX);</div><div class='add'>+	SYS(fail, "sysctl -wq net.ipv6.conf.%s.disable_ipv6=1", VETH_TX);</div><div class='add'>+</div><div class='add'>+	if (busy_poll) {</div><div class='add'>+		SYS(fail, "echo 2 &gt; /sys/class/net/%s/napi_defer_hard_irqs", VETH_RX);</div><div class='add'>+		SYS(fail, "echo 200000 &gt; /sys/class/net/%s/gro_flush_timeout", VETH_RX);</div><div class='add'>+		SYS(fail, "echo 2 &gt; /sys/class/net/%s/napi_defer_hard_irqs", VETH_TX);</div><div class='add'>+		SYS(fail, "echo 200000 &gt; /sys/class/net/%s/gro_flush_timeout", VETH_TX);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SYS(fail, "ip link set %s mtu %d", VETH_RX, MTU);</div><div class='add'>+	SYS(fail, "ip link set %s mtu %d", VETH_TX, MTU);</div><div class='add'>+	SYS(fail, "ip link set %s up", VETH_RX);</div><div class='add'>+	SYS(fail, "ip link set %s up", VETH_TX);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void delete_veth(void)</div><div class='add'>+{</div><div class='add'>+	SYS_NOFAIL("ip link del %s", VETH_RX);</div><div class='add'>+	SYS_NOFAIL("ip link del %s", VETH_TX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int configure_ifobj(struct ifobject *tx, struct ifobject *rx)</div><div class='add'>+{</div><div class='add'>+	rx-&gt;ifindex = if_nametoindex(VETH_RX);</div><div class='add'>+	if (!ASSERT_OK_FD(rx-&gt;ifindex, "get RX ifindex"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	tx-&gt;ifindex = if_nametoindex(VETH_TX);</div><div class='add'>+	if (!ASSERT_OK_FD(tx-&gt;ifindex, "get TX ifindex"))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	tx-&gt;shared_umem = false;</div><div class='add'>+	rx-&gt;shared_umem = false;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_xsk(const struct test_spec *test_to_run, enum test_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct ifobject *ifobj_tx, *ifobj_rx;</div><div class='add'>+	struct test_spec test;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ifobj_tx = ifobject_create();</div><div class='add'>+	if (!ASSERT_OK_PTR(ifobj_tx, "create ifobj_tx"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ifobj_rx = ifobject_create();</div><div class='add'>+	if (!ASSERT_OK_PTR(ifobj_rx, "create ifobj_rx"))</div><div class='add'>+		goto delete_tx;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(configure_ifobj(ifobj_tx, ifobj_rx), "conigure ifobj"))</div><div class='add'>+		goto delete_rx;</div><div class='add'>+</div><div class='add'>+	ret = get_hw_ring_size(ifobj_tx-&gt;ifname, &amp;ifobj_tx-&gt;ring);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ifobj_tx-&gt;hw_ring_size_supp = true;</div><div class='add'>+		ifobj_tx-&gt;set_ring.default_tx = ifobj_tx-&gt;ring.tx_pending;</div><div class='add'>+		ifobj_tx-&gt;set_ring.default_rx = ifobj_tx-&gt;ring.rx_pending;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(init_iface(ifobj_rx, worker_testapp_validate_rx), "init RX"))</div><div class='add'>+		goto delete_rx;</div><div class='add'>+	if (!ASSERT_OK(init_iface(ifobj_tx, worker_testapp_validate_tx), "init TX"))</div><div class='add'>+		goto delete_rx;</div><div class='add'>+</div><div class='add'>+	test_init(&amp;test, ifobj_tx, ifobj_rx, 0, &amp;tests[0]);</div><div class='add'>+</div><div class='add'>+	test.tx_pkt_stream_default = pkt_stream_generate(DEFAULT_PKT_CNT, MIN_PKT_SIZE);</div><div class='add'>+	if (!ASSERT_OK_PTR(test.tx_pkt_stream_default, "TX pkt generation"))</div><div class='add'>+		goto delete_rx;</div><div class='add'>+	test.rx_pkt_stream_default = pkt_stream_generate(DEFAULT_PKT_CNT, MIN_PKT_SIZE);</div><div class='add'>+	if (!ASSERT_OK_PTR(test.rx_pkt_stream_default, "RX pkt generation"))</div><div class='add'>+		goto delete_rx;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	test_init(&amp;test, ifobj_tx, ifobj_rx, mode, test_to_run);</div><div class='add'>+	ret = test.test_func(&amp;test);</div><div class='add'>+	if (ret != TEST_SKIP)</div><div class='add'>+		ASSERT_OK(ret, "Run test");</div><div class='add'>+	pkt_stream_restore_default(&amp;test);</div><div class='add'>+</div><div class='add'>+	if (ifobj_tx-&gt;hw_ring_size_supp)</div><div class='add'>+		hw_ring_size_reset(ifobj_tx);</div><div class='add'>+</div><div class='add'>+	pkt_stream_delete(test.tx_pkt_stream_default);</div><div class='add'>+	pkt_stream_delete(test.rx_pkt_stream_default);</div><div class='add'>+	xsk_xdp_progs__destroy(ifobj_tx-&gt;xdp_progs);</div><div class='add'>+	xsk_xdp_progs__destroy(ifobj_rx-&gt;xdp_progs);</div><div class='add'>+</div><div class='add'>+delete_rx:</div><div class='add'>+	ifobject_delete(ifobj_rx);</div><div class='add'>+delete_tx:</div><div class='add'>+	ifobject_delete(ifobj_tx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_ns_xsk_skb(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(setup_veth(false), "setup veth"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tests); i++) {</div><div class='add'>+		if (test__start_subtest(tests[i].name))</div><div class='add'>+			test_xsk(&amp;tests[i], TEST_MODE_SKB);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delete_veth();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_ns_xsk_drv(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ASSERT_OK(setup_veth(false), "setup veth"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tests); i++) {</div><div class='add'>+		if (test__start_subtest(tests[i].name))</div><div class='add'>+			test_xsk(&amp;tests[i], TEST_MODE_DRV);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delete_veth();</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/arena_atomics.c b/tools/testing/selftests/bpf/progs/arena_atomics.c<br/>index 40dd57fca5cc..d1841aac94a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/arena_atomics.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/arena_atomics.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/arena_atomics.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/arena_atomics.c</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #include &lt;stdbool.h&gt;</div><div class='ctx'> #include &lt;stdatomic.h&gt;</div><div class='ctx'> #include "bpf_arena_common.h"</div><div class='add'>+#include "../../../include/linux/filter.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='ctx'> </div><div class='ctx'> struct {</div><div class='ctx'> 	__uint(type, BPF_MAP_TYPE_ARENA);</div><div class='hunk'>@@ -19,9 +21,18 @@ struct {</div><div class='ctx'> } arena SEC(".maps");</div><div class='ctx'> </div><div class='ctx'> #if defined(ENABLE_ATOMICS_TESTS) &amp;&amp; defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='del'>-bool skip_tests __attribute((__section__(".data"))) = false;</div><div class='add'>+bool skip_all_tests __attribute((__section__(".data"))) = false;</div><div class='ctx'> #else</div><div class='del'>-bool skip_tests = true;</div><div class='add'>+bool skip_all_tests = true;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(ENABLE_ATOMICS_TESTS) &amp;&amp;		  \</div><div class='add'>+	defined(__BPF_FEATURE_ADDR_SPACE_CAST) &amp;&amp; \</div><div class='add'>+	(defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \</div><div class='add'>+	 (defined(__TARGET_ARCH_riscv) &amp;&amp; __riscv_xlen == 64))</div><div class='add'>+bool skip_lacq_srel_tests __attribute((__section__(".data"))) = false;</div><div class='add'>+#else</div><div class='add'>+bool skip_lacq_srel_tests = true;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> __u32 pid = 0;</div><div class='hunk'>@@ -274,4 +285,113 @@ int uaf(const void *ctx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if __clang_major__ &gt;= 18</div><div class='add'>+__u8 __arena_global load_acquire8_value = 0x12;</div><div class='add'>+__u16 __arena_global load_acquire16_value = 0x1234;</div><div class='add'>+__u32 __arena_global load_acquire32_value = 0x12345678;</div><div class='add'>+__u64 __arena_global load_acquire64_value = 0x1234567890abcdef;</div><div class='add'>+</div><div class='add'>+__u8 __arena_global load_acquire8_result = 0;</div><div class='add'>+__u16 __arena_global load_acquire16_result = 0;</div><div class='add'>+__u32 __arena_global load_acquire32_result = 0;</div><div class='add'>+__u64 __arena_global load_acquire64_result = 0;</div><div class='add'>+#else</div><div class='add'>+/* clang-17 crashes if the .addr_space.1 ELF section has holes. Work around</div><div class='add'>+ * this issue by defining the below variables as 64-bit.</div><div class='add'>+ */</div><div class='add'>+__u64 __arena_global load_acquire8_value;</div><div class='add'>+__u64 __arena_global load_acquire16_value;</div><div class='add'>+__u64 __arena_global load_acquire32_value;</div><div class='add'>+__u64 __arena_global load_acquire64_value;</div><div class='add'>+</div><div class='add'>+__u64 __arena_global load_acquire8_result;</div><div class='add'>+__u64 __arena_global load_acquire16_result;</div><div class='add'>+__u64 __arena_global load_acquire32_result;</div><div class='add'>+__u64 __arena_global load_acquire64_result;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+SEC("raw_tp/sys_enter")</div><div class='add'>+int load_acquire(const void *ctx)</div><div class='add'>+{</div><div class='add'>+#if defined(ENABLE_ATOMICS_TESTS) &amp;&amp;		  \</div><div class='add'>+	defined(__BPF_FEATURE_ADDR_SPACE_CAST) &amp;&amp; \</div><div class='add'>+	(defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \</div><div class='add'>+	 (defined(__TARGET_ARCH_riscv) &amp;&amp; __riscv_xlen == 64))</div><div class='add'>+</div><div class='add'>+#define LOAD_ACQUIRE_ARENA(SIZEOP, SIZE, SRC, DST)	\</div><div class='add'>+	{ asm volatile (				\</div><div class='add'>+	"r1 = %[" #SRC "] ll;"				\</div><div class='add'>+	"r1 = addr_space_cast(r1, 0x0, 0x1);"		\</div><div class='add'>+	".8byte %[load_acquire_insn];"			\</div><div class='add'>+	"r3 = %[" #DST "] ll;"				\</div><div class='add'>+	"r3 = addr_space_cast(r3, 0x0, 0x1);"		\</div><div class='add'>+	"*(" #SIZE " *)(r3 + 0) = r2;"			\</div><div class='add'>+	:						\</div><div class='add'>+	: __imm_addr(SRC),				\</div><div class='add'>+	  __imm_insn(load_acquire_insn,			\</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_##SIZEOP, BPF_LOAD_ACQ,	\</div><div class='add'>+				   BPF_REG_2, BPF_REG_1, 0)),	\</div><div class='add'>+	  __imm_addr(DST)				\</div><div class='add'>+	: __clobber_all); }				\</div><div class='add'>+</div><div class='add'>+	LOAD_ACQUIRE_ARENA(B, u8, load_acquire8_value, load_acquire8_result)</div><div class='add'>+	LOAD_ACQUIRE_ARENA(H, u16, load_acquire16_value,</div><div class='add'>+			   load_acquire16_result)</div><div class='add'>+	LOAD_ACQUIRE_ARENA(W, u32, load_acquire32_value,</div><div class='add'>+			   load_acquire32_result)</div><div class='add'>+	LOAD_ACQUIRE_ARENA(DW, u64, load_acquire64_value,</div><div class='add'>+			   load_acquire64_result)</div><div class='add'>+#undef LOAD_ACQUIRE_ARENA</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if __clang_major__ &gt;= 18</div><div class='add'>+__u8 __arena_global store_release8_result = 0;</div><div class='add'>+__u16 __arena_global store_release16_result = 0;</div><div class='add'>+__u32 __arena_global store_release32_result = 0;</div><div class='add'>+__u64 __arena_global store_release64_result = 0;</div><div class='add'>+#else</div><div class='add'>+/* clang-17 crashes if the .addr_space.1 ELF section has holes. Work around</div><div class='add'>+ * this issue by defining the below variables as 64-bit.</div><div class='add'>+ */</div><div class='add'>+__u64 __arena_global store_release8_result;</div><div class='add'>+__u64 __arena_global store_release16_result;</div><div class='add'>+__u64 __arena_global store_release32_result;</div><div class='add'>+__u64 __arena_global store_release64_result;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+SEC("raw_tp/sys_enter")</div><div class='add'>+int store_release(const void *ctx)</div><div class='add'>+{</div><div class='add'>+#if defined(ENABLE_ATOMICS_TESTS) &amp;&amp;		  \</div><div class='add'>+	defined(__BPF_FEATURE_ADDR_SPACE_CAST) &amp;&amp; \</div><div class='add'>+	(defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \</div><div class='add'>+	 (defined(__TARGET_ARCH_riscv) &amp;&amp; __riscv_xlen == 64))</div><div class='add'>+</div><div class='add'>+#define STORE_RELEASE_ARENA(SIZEOP, DST, VAL)	\</div><div class='add'>+	{ asm volatile (			\</div><div class='add'>+	"r1 = " VAL ";"				\</div><div class='add'>+	"r2 = %[" #DST "] ll;"			\</div><div class='add'>+	"r2 = addr_space_cast(r2, 0x0, 0x1);"	\</div><div class='add'>+	".8byte %[store_release_insn];"		\</div><div class='add'>+	:					\</div><div class='add'>+	: __imm_addr(DST),			\</div><div class='add'>+	  __imm_insn(store_release_insn,	\</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_##SIZEOP, BPF_STORE_REL,	\</div><div class='add'>+				   BPF_REG_2, BPF_REG_1, 0))	\</div><div class='add'>+	: __clobber_all); }			\</div><div class='add'>+</div><div class='add'>+	STORE_RELEASE_ARENA(B, store_release8_result, "0x12")</div><div class='add'>+	STORE_RELEASE_ARENA(H, store_release16_result, "0x1234")</div><div class='add'>+	STORE_RELEASE_ARENA(W, store_release32_result, "0x12345678")</div><div class='add'>+	STORE_RELEASE_ARENA(DW, store_release64_result,</div><div class='add'>+			    "0x1234567890abcdef ll")</div><div class='add'>+#undef STORE_RELEASE_ARENA</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/arena_spin_lock.c b/tools/testing/selftests/bpf/progs/arena_spin_lock.c<br/>new file mode 100644<br/>index 000000000000..086b57a426cf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/arena_spin_lock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/arena_spin_lock.c</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "bpf_arena_spin_lock.h"</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARENA);</div><div class='add'>+	__uint(map_flags, BPF_F_MMAPABLE);</div><div class='add'>+	__uint(max_entries, 100); /* number of pages */</div><div class='add'>+#ifdef __TARGET_ARCH_arm64</div><div class='add'>+	__ulong(map_extra, 0x1ull &lt;&lt; 32); /* start of mmap() region */</div><div class='add'>+#else</div><div class='add'>+	__ulong(map_extra, 0x1ull &lt;&lt; 44); /* start of mmap() region */</div><div class='add'>+#endif</div><div class='add'>+} arena SEC(".maps");</div><div class='add'>+</div><div class='add'>+int cs_count;</div><div class='add'>+</div><div class='add'>+#if defined(ENABLE_ATOMICS_TESTS) &amp;&amp; defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='add'>+arena_spinlock_t __arena lock;</div><div class='add'>+int test_skip = 1;</div><div class='add'>+#else</div><div class='add'>+int test_skip = 2;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int counter;</div><div class='add'>+int limit;</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int prog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	int ret = -2;</div><div class='add'>+</div><div class='add'>+#if defined(ENABLE_ATOMICS_TESTS) &amp;&amp; defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if ((ret = arena_spin_lock_irqsave(&amp;lock, flags))) {</div><div class='add'>+		if (ret == -EOPNOTSUPP)</div><div class='add'>+			test_skip = 3;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (counter != limit)</div><div class='add'>+		counter++;</div><div class='add'>+	bpf_repeat(cs_count);</div><div class='add'>+	ret = 0;</div><div class='add'>+	arena_spin_unlock_irqrestore(&amp;lock, flags);</div><div class='add'>+#endif</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/arena_strsearch.c b/tools/testing/selftests/bpf/progs/arena_strsearch.c<br/>new file mode 100644<br/>index 000000000000..ef6b76658f7f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/arena_strsearch.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/arena_strsearch.c</a></div><div class='hunk'>@@ -0,0 +1,146 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARENA);</div><div class='add'>+	__uint(map_flags, BPF_F_MMAPABLE);</div><div class='add'>+	__uint(max_entries, 100); /* number of pages */</div><div class='add'>+} arena SEC(".maps");</div><div class='add'>+</div><div class='add'>+#include "bpf_arena_strsearch.h"</div><div class='add'>+</div><div class='add'>+struct glob_test {</div><div class='add'>+	char const __arena *pat, *str;</div><div class='add'>+	bool expected;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool test(char const __arena *pat, char const __arena *str, bool expected)</div><div class='add'>+{</div><div class='add'>+	bool match = glob_match(pat, str);</div><div class='add'>+	bool success = match == expected;</div><div class='add'>+</div><div class='add'>+	/* bpf_printk("glob_match %s %s res %d ok %d", pat, str, match, success); */</div><div class='add'>+	return success;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The tests are all jammed together in one array to make it simpler</div><div class='add'>+ * to place that array in the .init.rodata section.  The obvious</div><div class='add'>+ * "array of structures containing char *" has no way to force the</div><div class='add'>+ * pointed-to strings to be in a particular section.</div><div class='add'>+ *</div><div class='add'>+ * Anyway, a test consists of:</div><div class='add'>+ * 1. Expected glob_match result: '1' or '0'.</div><div class='add'>+ * 2. Pattern to match: null-terminated string</div><div class='add'>+ * 3. String to match against: null-terminated string</div><div class='add'>+ *</div><div class='add'>+ * The list of tests is terminated with a final '\0' instead of</div><div class='add'>+ * a glob_match result character.</div><div class='add'>+ */</div><div class='add'>+static const char __arena glob_tests[] =</div><div class='add'>+	/* Some basic tests */</div><div class='add'>+	"1" "a\0" "a\0"</div><div class='add'>+	"0" "a\0" "b\0"</div><div class='add'>+	"0" "a\0" "aa\0"</div><div class='add'>+	"0" "a\0" "\0"</div><div class='add'>+	"1" "\0" "\0"</div><div class='add'>+	"0" "\0" "a\0"</div><div class='add'>+	/* Simple character class tests */</div><div class='add'>+	"1" "[a]\0" "a\0"</div><div class='add'>+	"0" "[a]\0" "b\0"</div><div class='add'>+	"0" "[!a]\0" "a\0"</div><div class='add'>+	"1" "[!a]\0" "b\0"</div><div class='add'>+	"1" "[ab]\0" "a\0"</div><div class='add'>+	"1" "[ab]\0" "b\0"</div><div class='add'>+	"0" "[ab]\0" "c\0"</div><div class='add'>+	"1" "[!ab]\0" "c\0"</div><div class='add'>+	"1" "[a-c]\0" "b\0"</div><div class='add'>+	"0" "[a-c]\0" "d\0"</div><div class='add'>+	/* Corner cases in character class parsing */</div><div class='add'>+	"1" "[a-c-e-g]\0" "-\0"</div><div class='add'>+	"0" "[a-c-e-g]\0" "d\0"</div><div class='add'>+	"1" "[a-c-e-g]\0" "f\0"</div><div class='add'>+	"1" "[]a-ceg-ik[]\0" "a\0"</div><div class='add'>+	"1" "[]a-ceg-ik[]\0" "]\0"</div><div class='add'>+	"1" "[]a-ceg-ik[]\0" "[\0"</div><div class='add'>+	"1" "[]a-ceg-ik[]\0" "h\0"</div><div class='add'>+	"0" "[]a-ceg-ik[]\0" "f\0"</div><div class='add'>+	"0" "[!]a-ceg-ik[]\0" "h\0"</div><div class='add'>+	"0" "[!]a-ceg-ik[]\0" "]\0"</div><div class='add'>+	"1" "[!]a-ceg-ik[]\0" "f\0"</div><div class='add'>+	/* Simple wild cards */</div><div class='add'>+	"1" "?\0" "a\0"</div><div class='add'>+	"0" "?\0" "aa\0"</div><div class='add'>+	"0" "??\0" "a\0"</div><div class='add'>+	"1" "?x?\0" "axb\0"</div><div class='add'>+	"0" "?x?\0" "abx\0"</div><div class='add'>+	"0" "?x?\0" "xab\0"</div><div class='add'>+	/* Asterisk wild cards (backtracking) */</div><div class='add'>+	"0" "*??\0" "a\0"</div><div class='add'>+	"1" "*??\0" "ab\0"</div><div class='add'>+	"1" "*??\0" "abc\0"</div><div class='add'>+	"1" "*??\0" "abcd\0"</div><div class='add'>+	"0" "??*\0" "a\0"</div><div class='add'>+	"1" "??*\0" "ab\0"</div><div class='add'>+	"1" "??*\0" "abc\0"</div><div class='add'>+	"1" "??*\0" "abcd\0"</div><div class='add'>+	"0" "?*?\0" "a\0"</div><div class='add'>+	"1" "?*?\0" "ab\0"</div><div class='add'>+	"1" "?*?\0" "abc\0"</div><div class='add'>+	"1" "?*?\0" "abcd\0"</div><div class='add'>+	"1" "*b\0" "b\0"</div><div class='add'>+	"1" "*b\0" "ab\0"</div><div class='add'>+	"0" "*b\0" "ba\0"</div><div class='add'>+	"1" "*b\0" "bb\0"</div><div class='add'>+	"1" "*b\0" "abb\0"</div><div class='add'>+	"1" "*b\0" "bab\0"</div><div class='add'>+	"1" "*bc\0" "abbc\0"</div><div class='add'>+	"1" "*bc\0" "bc\0"</div><div class='add'>+	"1" "*bc\0" "bbc\0"</div><div class='add'>+	"1" "*bc\0" "bcbc\0"</div><div class='add'>+	/* Multiple asterisks (complex backtracking) */</div><div class='add'>+	"1" "*ac*\0" "abacadaeafag\0"</div><div class='add'>+	"1" "*ac*ae*ag*\0" "abacadaeafag\0"</div><div class='add'>+	"1" "*a*b*[bc]*[ef]*g*\0" "abacadaeafag\0"</div><div class='add'>+	"0" "*a*b*[ef]*[cd]*g*\0" "abacadaeafag\0"</div><div class='add'>+	"1" "*abcd*\0" "abcabcabcabcdefg\0"</div><div class='add'>+	"1" "*ab*cd*\0" "abcabcabcabcdefg\0"</div><div class='add'>+	"1" "*abcd*abcdef*\0" "abcabcdabcdeabcdefg\0"</div><div class='add'>+	"0" "*abcd*\0" "abcabcabcabcefg\0"</div><div class='add'>+	"0" "*ab*cd*\0" "abcabcabcabcefg\0";</div><div class='add'>+</div><div class='add'>+bool skip = false;</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int arena_strsearch(void *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned successes = 0;</div><div class='add'>+	unsigned n = 0;</div><div class='add'>+	char const __arena *p = glob_tests;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Tests are jammed together in a string.  The first byte is '1'</div><div class='add'>+	 * or '0' to indicate the expected outcome, or '\0' to indicate the</div><div class='add'>+	 * end of the tests.  Then come two null-terminated strings: the</div><div class='add'>+	 * pattern and the string to match it against.</div><div class='add'>+	 */</div><div class='add'>+	while (*p) {</div><div class='add'>+		bool expected = *p++ &amp; 1;</div><div class='add'>+		char const __arena *pat = p;</div><div class='add'>+</div><div class='add'>+		cond_break;</div><div class='add'>+		p += bpf_arena_strlen(p) + 1;</div><div class='add'>+		successes += test(pat, p, expected);</div><div class='add'>+		p += bpf_arena_strlen(p) + 1;</div><div class='add'>+		n++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n -= successes;</div><div class='add'>+	/* bpf_printk("glob: %u self-tests passed, %u failed\n", successes, n); */</div><div class='add'>+</div><div class='add'>+	return n ? -1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bench_sockmap_prog.c b/tools/testing/selftests/bpf/progs/bench_sockmap_prog.c<br/>new file mode 100644<br/>index 000000000000..079bf3794b3a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bench_sockmap_prog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bench_sockmap_prog.c</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_endian.h&gt;</div><div class='add'>+</div><div class='add'>+long process_byte = 0;</div><div class='add'>+int  verdict_dir = 0;</div><div class='add'>+int  dropped = 0;</div><div class='add'>+int  pkt_size = 0;</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_SOCKMAP);</div><div class='add'>+	__uint(max_entries, 20);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, int);</div><div class='add'>+} sock_map_rx SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_SOCKMAP);</div><div class='add'>+	__uint(max_entries, 20);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, int);</div><div class='add'>+} sock_map_tx SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("sk_skb/stream_parser")</div><div class='add'>+int prog_skb_parser(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return pkt_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sk_skb/stream_verdict")</div><div class='add'>+int prog_skb_verdict(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int one = 1;</div><div class='add'>+	int ret =  bpf_sk_redirect_map(skb, &amp;sock_map_rx, one, verdict_dir);</div><div class='add'>+</div><div class='add'>+	if (ret == SK_DROP)</div><div class='add'>+		dropped++;</div><div class='add'>+	__sync_fetch_and_add(&amp;process_byte, skb-&gt;len);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sk_skb/stream_verdict")</div><div class='add'>+int prog_skb_pass(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	__sync_fetch_and_add(&amp;process_byte, skb-&gt;len);</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sk_msg")</div><div class='add'>+int prog_skmsg_verdict(struct sk_msg_md *msg)</div><div class='add'>+{</div><div class='add'>+	int one = 1;</div><div class='add'>+</div><div class='add'>+	__sync_fetch_and_add(&amp;process_byte, msg-&gt;size);</div><div class='add'>+	return bpf_msg_redirect_map(msg, &amp;sock_map_tx, one, verdict_dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sk_msg")</div><div class='add'>+int prog_skmsg_pass(struct sk_msg_md *msg)</div><div class='add'>+{</div><div class='add'>+	__sync_fetch_and_add(&amp;process_byte, msg-&gt;size);</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_arena_spin_lock.h b/tools/testing/selftests/bpf/progs/bpf_arena_spin_lock.h<br/>new file mode 100644<br/>index 000000000000..f90531cf3ee5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_arena_spin_lock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_arena_spin_lock.h</a></div><div class='hunk'>@@ -0,0 +1,542 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#ifndef BPF_ARENA_SPIN_LOCK_H</div><div class='add'>+#define BPF_ARENA_SPIN_LOCK_H</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_atomic.h"</div><div class='add'>+</div><div class='add'>+#define arch_mcs_spin_lock_contended_label(l, label) smp_cond_load_acquire_label(l, VAL, label)</div><div class='add'>+#define arch_mcs_spin_unlock_contended(l) smp_store_release((l), 1)</div><div class='add'>+</div><div class='add'>+#if defined(ENABLE_ATOMICS_TESTS) &amp;&amp; defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='add'>+</div><div class='add'>+#define EBUSY 16</div><div class='add'>+#define EOPNOTSUPP 95</div><div class='add'>+#define ETIMEDOUT 110</div><div class='add'>+</div><div class='add'>+#ifndef __arena</div><div class='add'>+#define __arena __attribute__((address_space(1)))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern unsigned long CONFIG_NR_CPUS __kconfig;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Typically, we'd just rely on the definition in vmlinux.h for qspinlock, but</div><div class='add'>+ * PowerPC overrides the definition to define lock-&gt;val as u32 instead of</div><div class='add'>+ * atomic_t, leading to compilation errors.  Import a local definition below so</div><div class='add'>+ * that we don't depend on the vmlinux.h version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct __qspinlock {</div><div class='add'>+	union {</div><div class='add'>+		atomic_t val;</div><div class='add'>+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='add'>+		struct {</div><div class='add'>+			u8 locked;</div><div class='add'>+			u8 pending;</div><div class='add'>+		};</div><div class='add'>+		struct {</div><div class='add'>+			u16 locked_pending;</div><div class='add'>+			u16 tail;</div><div class='add'>+		};</div><div class='add'>+#else</div><div class='add'>+		struct {</div><div class='add'>+			u16 tail;</div><div class='add'>+			u16 locked_pending;</div><div class='add'>+		};</div><div class='add'>+		struct {</div><div class='add'>+			u8 reserved[2];</div><div class='add'>+			u8 pending;</div><div class='add'>+			u8 locked;</div><div class='add'>+		};</div><div class='add'>+#endif</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define arena_spinlock_t struct __qspinlock</div><div class='add'>+/* FIXME: Using typedef causes CO-RE relocation error */</div><div class='add'>+/* typedef struct qspinlock arena_spinlock_t; */</div><div class='add'>+</div><div class='add'>+struct arena_mcs_spinlock {</div><div class='add'>+	struct arena_mcs_spinlock __arena *next;</div><div class='add'>+	int locked;</div><div class='add'>+	int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct arena_qnode {</div><div class='add'>+	struct arena_mcs_spinlock mcs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define _Q_MAX_NODES		4</div><div class='add'>+#define _Q_PENDING_LOOPS	1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bitfields in the atomic value:</div><div class='add'>+ *</div><div class='add'>+ *  0- 7: locked byte</div><div class='add'>+ *     8: pending</div><div class='add'>+ *  9-15: not used</div><div class='add'>+ * 16-17: tail index</div><div class='add'>+ * 18-31: tail cpu (+1)</div><div class='add'>+ */</div><div class='add'>+#define _Q_MAX_CPUS		1024</div><div class='add'>+</div><div class='add'>+#define	_Q_SET_MASK(type)	(((1U &lt;&lt; _Q_ ## type ## _BITS) - 1)\</div><div class='add'>+				      &lt;&lt; _Q_ ## type ## _OFFSET)</div><div class='add'>+#define _Q_LOCKED_OFFSET	0</div><div class='add'>+#define _Q_LOCKED_BITS		8</div><div class='add'>+#define _Q_LOCKED_MASK		_Q_SET_MASK(LOCKED)</div><div class='add'>+</div><div class='add'>+#define _Q_PENDING_OFFSET	(_Q_LOCKED_OFFSET + _Q_LOCKED_BITS)</div><div class='add'>+#define _Q_PENDING_BITS		8</div><div class='add'>+#define _Q_PENDING_MASK		_Q_SET_MASK(PENDING)</div><div class='add'>+</div><div class='add'>+#define _Q_TAIL_IDX_OFFSET	(_Q_PENDING_OFFSET + _Q_PENDING_BITS)</div><div class='add'>+#define _Q_TAIL_IDX_BITS	2</div><div class='add'>+#define _Q_TAIL_IDX_MASK	_Q_SET_MASK(TAIL_IDX)</div><div class='add'>+</div><div class='add'>+#define _Q_TAIL_CPU_OFFSET	(_Q_TAIL_IDX_OFFSET + _Q_TAIL_IDX_BITS)</div><div class='add'>+#define _Q_TAIL_CPU_BITS	(32 - _Q_TAIL_CPU_OFFSET)</div><div class='add'>+#define _Q_TAIL_CPU_MASK	_Q_SET_MASK(TAIL_CPU)</div><div class='add'>+</div><div class='add'>+#define _Q_TAIL_OFFSET		_Q_TAIL_IDX_OFFSET</div><div class='add'>+#define _Q_TAIL_MASK		(_Q_TAIL_IDX_MASK | _Q_TAIL_CPU_MASK)</div><div class='add'>+</div><div class='add'>+#define _Q_LOCKED_VAL		(1U &lt;&lt; _Q_LOCKED_OFFSET)</div><div class='add'>+#define _Q_PENDING_VAL		(1U &lt;&lt; _Q_PENDING_OFFSET)</div><div class='add'>+</div><div class='add'>+struct arena_qnode __arena qnodes[_Q_MAX_CPUS][_Q_MAX_NODES];</div><div class='add'>+</div><div class='add'>+static inline u32 encode_tail(int cpu, int idx)</div><div class='add'>+{</div><div class='add'>+	u32 tail;</div><div class='add'>+</div><div class='add'>+	tail  = (cpu + 1) &lt;&lt; _Q_TAIL_CPU_OFFSET;</div><div class='add'>+	tail |= idx &lt;&lt; _Q_TAIL_IDX_OFFSET; /* assume &lt; 4 */</div><div class='add'>+</div><div class='add'>+	return tail;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct arena_mcs_spinlock __arena *decode_tail(u32 tail)</div><div class='add'>+{</div><div class='add'>+	u32 cpu = (tail &gt;&gt; _Q_TAIL_CPU_OFFSET) - 1;</div><div class='add'>+	u32 idx = (tail &amp;  _Q_TAIL_IDX_MASK) &gt;&gt; _Q_TAIL_IDX_OFFSET;</div><div class='add'>+</div><div class='add'>+	return &amp;qnodes[cpu][idx].mcs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+struct arena_mcs_spinlock __arena *grab_mcs_node(struct arena_mcs_spinlock __arena *base, int idx)</div><div class='add'>+{</div><div class='add'>+	return &amp;((struct arena_qnode __arena *)base + idx)-&gt;mcs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define _Q_LOCKED_PENDING_MASK (_Q_LOCKED_MASK | _Q_PENDING_MASK)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xchg_tail - Put in the new queue tail code word &amp; retrieve previous one</div><div class='add'>+ * @lock : Pointer to queued spinlock structure</div><div class='add'>+ * @tail : The new queue tail code word</div><div class='add'>+ * Return: The previous queue tail code word</div><div class='add'>+ *</div><div class='add'>+ * xchg(lock, tail)</div><div class='add'>+ *</div><div class='add'>+ * p,*,* -&gt; n,*,* ; prev = xchg(lock, node)</div><div class='add'>+ */</div><div class='add'>+static __always_inline u32 xchg_tail(arena_spinlock_t __arena *lock, u32 tail)</div><div class='add'>+{</div><div class='add'>+	u32 old, new;</div><div class='add'>+</div><div class='add'>+	old = atomic_read(&amp;lock-&gt;val);</div><div class='add'>+	do {</div><div class='add'>+		new = (old &amp; _Q_LOCKED_PENDING_MASK) | tail;</div><div class='add'>+		/*</div><div class='add'>+		 * We can use relaxed semantics since the caller ensures that</div><div class='add'>+		 * the MCS node is properly initialized before updating the</div><div class='add'>+		 * tail.</div><div class='add'>+		 */</div><div class='add'>+		/* These loops are not expected to stall, but we still need to</div><div class='add'>+		 * prove to the verifier they will terminate eventually.</div><div class='add'>+		 */</div><div class='add'>+		cond_break_label(out);</div><div class='add'>+	} while (!atomic_try_cmpxchg_relaxed(&amp;lock-&gt;val, &amp;old, new));</div><div class='add'>+</div><div class='add'>+	return old;</div><div class='add'>+out:</div><div class='add'>+	bpf_printk("RUNTIME ERROR: %s unexpected cond_break exit!!!", __func__);</div><div class='add'>+	return old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * clear_pending - clear the pending bit.</div><div class='add'>+ * @lock: Pointer to queued spinlock structure</div><div class='add'>+ *</div><div class='add'>+ * *,1,* -&gt; *,0,*</div><div class='add'>+ */</div><div class='add'>+static __always_inline void clear_pending(arena_spinlock_t __arena *lock)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(lock-&gt;pending, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * clear_pending_set_locked - take ownership and clear the pending bit.</div><div class='add'>+ * @lock: Pointer to queued spinlock structure</div><div class='add'>+ *</div><div class='add'>+ * *,1,0 -&gt; *,0,1</div><div class='add'>+ *</div><div class='add'>+ * Lock stealing is not allowed if this function is used.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void clear_pending_set_locked(arena_spinlock_t __arena *lock)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(lock-&gt;locked_pending, _Q_LOCKED_VAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * set_locked - Set the lock bit and own the lock</div><div class='add'>+ * @lock: Pointer to queued spinlock structure</div><div class='add'>+ *</div><div class='add'>+ * *,*,0 -&gt; *,0,1</div><div class='add'>+ */</div><div class='add'>+static __always_inline void set_locked(arena_spinlock_t __arena *lock)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(lock-&gt;locked, _Q_LOCKED_VAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline</div><div class='add'>+u32 arena_fetch_set_pending_acquire(arena_spinlock_t __arena *lock)</div><div class='add'>+{</div><div class='add'>+	u32 old, new;</div><div class='add'>+</div><div class='add'>+	old = atomic_read(&amp;lock-&gt;val);</div><div class='add'>+	do {</div><div class='add'>+		new = old | _Q_PENDING_VAL;</div><div class='add'>+		/*</div><div class='add'>+		 * These loops are not expected to stall, but we still need to</div><div class='add'>+		 * prove to the verifier they will terminate eventually.</div><div class='add'>+		 */</div><div class='add'>+		cond_break_label(out);</div><div class='add'>+	} while (!atomic_try_cmpxchg_acquire(&amp;lock-&gt;val, &amp;old, new));</div><div class='add'>+</div><div class='add'>+	return old;</div><div class='add'>+out:</div><div class='add'>+	bpf_printk("RUNTIME ERROR: %s unexpected cond_break exit!!!", __func__);</div><div class='add'>+	return old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * arena_spin_trylock - try to acquire the queued spinlock</div><div class='add'>+ * @lock : Pointer to queued spinlock structure</div><div class='add'>+ * Return: 1 if lock acquired, 0 if failed</div><div class='add'>+ */</div><div class='add'>+static __always_inline int arena_spin_trylock(arena_spinlock_t __arena *lock)</div><div class='add'>+{</div><div class='add'>+	int val = atomic_read(&amp;lock-&gt;val);</div><div class='add'>+</div><div class='add'>+	if (unlikely(val))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return likely(atomic_try_cmpxchg_acquire(&amp;lock-&gt;val, &amp;val, _Q_LOCKED_VAL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__noinline</div><div class='add'>+int arena_spin_lock_slowpath(arena_spinlock_t __arena __arg_arena *lock, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct arena_mcs_spinlock __arena *prev, *next, *node0, *node;</div><div class='add'>+	int ret = -ETIMEDOUT;</div><div class='add'>+	u32 old, tail;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for in-progress pending-&gt;locked hand-overs with a bounded</div><div class='add'>+	 * number of spins so that we guarantee forward progress.</div><div class='add'>+	 *</div><div class='add'>+	 * 0,1,0 -&gt; 0,0,1</div><div class='add'>+	 */</div><div class='add'>+	if (val == _Q_PENDING_VAL) {</div><div class='add'>+		int cnt = _Q_PENDING_LOOPS;</div><div class='add'>+		val = atomic_cond_read_relaxed_label(&amp;lock-&gt;val,</div><div class='add'>+						     (VAL != _Q_PENDING_VAL) || !cnt--,</div><div class='add'>+						     release_err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we observe any contention; queue.</div><div class='add'>+	 */</div><div class='add'>+	if (val &amp; ~_Q_LOCKED_MASK)</div><div class='add'>+		goto queue;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * trylock || pending</div><div class='add'>+	 *</div><div class='add'>+	 * 0,0,* -&gt; 0,1,* -&gt; 0,0,1 pending, trylock</div><div class='add'>+	 */</div><div class='add'>+	val = arena_fetch_set_pending_acquire(lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we observe contention, there is a concurrent locker.</div><div class='add'>+	 *</div><div class='add'>+	 * Undo and queue; our setting of PENDING might have made the</div><div class='add'>+	 * n,0,0 -&gt; 0,0,0 transition fail and it will now be waiting</div><div class='add'>+	 * on @next to become !NULL.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(val &amp; ~_Q_LOCKED_MASK)) {</div><div class='add'>+</div><div class='add'>+		/* Undo PENDING if we set it. */</div><div class='add'>+		if (!(val &amp; _Q_PENDING_MASK))</div><div class='add'>+			clear_pending(lock);</div><div class='add'>+</div><div class='add'>+		goto queue;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We're pending, wait for the owner to go away.</div><div class='add'>+	 *</div><div class='add'>+	 * 0,1,1 -&gt; *,1,0</div><div class='add'>+	 *</div><div class='add'>+	 * this wait loop must be a load-acquire such that we match the</div><div class='add'>+	 * store-release that clears the locked bit and create lock</div><div class='add'>+	 * sequentiality; this is because not all</div><div class='add'>+	 * clear_pending_set_locked() implementations imply full</div><div class='add'>+	 * barriers.</div><div class='add'>+	 */</div><div class='add'>+	if (val &amp; _Q_LOCKED_MASK)</div><div class='add'>+		(void)smp_cond_load_acquire_label(&amp;lock-&gt;locked, !VAL, release_err);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * take ownership and clear the pending bit.</div><div class='add'>+	 *</div><div class='add'>+	 * 0,1,0 -&gt; 0,0,1</div><div class='add'>+	 */</div><div class='add'>+	clear_pending_set_locked(lock);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * End of pending bit optimistic spinning and beginning of MCS</div><div class='add'>+	 * queuing.</div><div class='add'>+	 */</div><div class='add'>+queue:</div><div class='add'>+	node0 = &amp;(qnodes[bpf_get_smp_processor_id()])[0].mcs;</div><div class='add'>+	idx = node0-&gt;count++;</div><div class='add'>+	tail = encode_tail(bpf_get_smp_processor_id(), idx);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 4 nodes are allocated based on the assumption that there will not be</div><div class='add'>+	 * nested NMIs taking spinlocks. That may not be true in some</div><div class='add'>+	 * architectures even though the chance of needing more than 4 nodes</div><div class='add'>+	 * will still be extremely unlikely. When that happens, we simply return</div><div class='add'>+	 * an error. Original qspinlock has a trylock fallback in this case.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(idx &gt;= _Q_MAX_NODES)) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto release_node_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node = grab_mcs_node(node0, idx);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure that we increment the head node-&gt;count before initialising</div><div class='add'>+	 * the actual node. If the compiler is kind enough to reorder these</div><div class='add'>+	 * stores, then an IRQ could overwrite our assignments.</div><div class='add'>+	 */</div><div class='add'>+	barrier();</div><div class='add'>+</div><div class='add'>+	node-&gt;locked = 0;</div><div class='add'>+	node-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We touched a (possibly) cold cacheline in the per-cpu queue node;</div><div class='add'>+	 * attempt the trylock once more in the hope someone let go while we</div><div class='add'>+	 * weren't watching.</div><div class='add'>+	 */</div><div class='add'>+	if (arena_spin_trylock(lock))</div><div class='add'>+		goto release;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure that the initialisation of @node is complete before we</div><div class='add'>+	 * publish the updated tail via xchg_tail() and potentially link</div><div class='add'>+	 * @node into the waitqueue via WRITE_ONCE(prev-&gt;next, node) below.</div><div class='add'>+	 */</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Publish the updated tail.</div><div class='add'>+	 * We have already touched the queueing cacheline; don't bother with</div><div class='add'>+	 * pending stuff.</div><div class='add'>+	 *</div><div class='add'>+	 * p,*,* -&gt; n,*,*</div><div class='add'>+	 */</div><div class='add'>+	old = xchg_tail(lock, tail);</div><div class='add'>+	next = NULL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if there was a previous node; link it and wait until reaching the</div><div class='add'>+	 * head of the waitqueue.</div><div class='add'>+	 */</div><div class='add'>+	if (old &amp; _Q_TAIL_MASK) {</div><div class='add'>+		prev = decode_tail(old);</div><div class='add'>+</div><div class='add'>+		/* Link @node into the waitqueue. */</div><div class='add'>+		WRITE_ONCE(prev-&gt;next, node);</div><div class='add'>+</div><div class='add'>+		(void)arch_mcs_spin_lock_contended_label(&amp;node-&gt;locked, release_node_err);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * While waiting for the MCS lock, the next pointer may have</div><div class='add'>+		 * been set by another lock waiter. We cannot prefetch here</div><div class='add'>+		 * due to lack of equivalent instruction in BPF ISA.</div><div class='add'>+		 */</div><div class='add'>+		next = READ_ONCE(node-&gt;next);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * we're at the head of the waitqueue, wait for the owner &amp; pending to</div><div class='add'>+	 * go away.</div><div class='add'>+	 *</div><div class='add'>+	 * *,x,y -&gt; *,0,0</div><div class='add'>+	 *</div><div class='add'>+	 * this wait loop must use a load-acquire such that we match the</div><div class='add'>+	 * store-release that clears the locked bit and create lock</div><div class='add'>+	 * sequentiality; this is because the set_locked() function below</div><div class='add'>+	 * does not imply a full barrier.</div><div class='add'>+	 */</div><div class='add'>+	val = atomic_cond_read_acquire_label(&amp;lock-&gt;val, !(VAL &amp; _Q_LOCKED_PENDING_MASK),</div><div class='add'>+					     release_node_err);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * claim the lock:</div><div class='add'>+	 *</div><div class='add'>+	 * n,0,0 -&gt; 0,0,1 : lock, uncontended</div><div class='add'>+	 * *,*,0 -&gt; *,*,1 : lock, contended</div><div class='add'>+	 *</div><div class='add'>+	 * If the queue head is the only one in the queue (lock value == tail)</div><div class='add'>+	 * and nobody is pending, clear the tail code and grab the lock.</div><div class='add'>+	 * Otherwise, we only need to grab the lock.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In the PV case we might already have _Q_LOCKED_VAL set, because</div><div class='add'>+	 * of lock stealing; therefore we must also allow:</div><div class='add'>+	 *</div><div class='add'>+	 * n,0,1 -&gt; 0,0,1</div><div class='add'>+	 *</div><div class='add'>+	 * Note: at this point: (val &amp; _Q_PENDING_MASK) == 0, because of the</div><div class='add'>+	 *       above wait condition, therefore any concurrent setting of</div><div class='add'>+	 *       PENDING will make the uncontended transition fail.</div><div class='add'>+	 */</div><div class='add'>+	if ((val &amp; _Q_TAIL_MASK) == tail) {</div><div class='add'>+		if (atomic_try_cmpxchg_relaxed(&amp;lock-&gt;val, &amp;val, _Q_LOCKED_VAL))</div><div class='add'>+			goto release; /* No contention */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Either somebody is queued behind us or _Q_PENDING_VAL got set</div><div class='add'>+	 * which will then detect the remaining tail and queue behind us</div><div class='add'>+	 * ensuring we'll see a @next.</div><div class='add'>+	 */</div><div class='add'>+	set_locked(lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * contended path; wait for next if not observed yet, release.</div><div class='add'>+	 */</div><div class='add'>+	if (!next)</div><div class='add'>+		next = smp_cond_load_relaxed_label(&amp;node-&gt;next, (VAL), release_node_err);</div><div class='add'>+</div><div class='add'>+	arch_mcs_spin_unlock_contended(&amp;next-&gt;locked);</div><div class='add'>+</div><div class='add'>+release:;</div><div class='add'>+	/*</div><div class='add'>+	 * release the node</div><div class='add'>+	 *</div><div class='add'>+	 * Doing a normal dec vs this_cpu_dec is fine. An upper context always</div><div class='add'>+	 * decrements count it incremented before returning, thus we're fine.</div><div class='add'>+	 * For contexts interrupting us, they either observe our dec or not.</div><div class='add'>+	 * Just ensure the compiler doesn't reorder this statement, as a</div><div class='add'>+	 * this_cpu_dec implicitly implied that.</div><div class='add'>+	 */</div><div class='add'>+	barrier();</div><div class='add'>+	node0-&gt;count--;</div><div class='add'>+	return 0;</div><div class='add'>+release_node_err:</div><div class='add'>+	barrier();</div><div class='add'>+	node0-&gt;count--;</div><div class='add'>+	goto release_err;</div><div class='add'>+release_err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * arena_spin_lock - acquire a queued spinlock</div><div class='add'>+ * @lock: Pointer to queued spinlock structure</div><div class='add'>+ *</div><div class='add'>+ * On error, returned value will be negative.</div><div class='add'>+ * On success, zero is returned.</div><div class='add'>+ *</div><div class='add'>+ * The return value _must_ be tested against zero for success,</div><div class='add'>+ * instead of checking it against negative, for passing the</div><div class='add'>+ * BPF verifier.</div><div class='add'>+ *</div><div class='add'>+ * The user should do:</div><div class='add'>+ *	if (arena_spin_lock(...) != 0) // failure</div><div class='add'>+ *		or</div><div class='add'>+ *	if (arena_spin_lock(...) == 0) // success</div><div class='add'>+ *		or</div><div class='add'>+ *	if (arena_spin_lock(...)) // failure</div><div class='add'>+ *		or</div><div class='add'>+ *	if (!arena_spin_lock(...)) // success</div><div class='add'>+ * instead of:</div><div class='add'>+ *	if (arena_spin_lock(...) &lt; 0) // failure</div><div class='add'>+ *</div><div class='add'>+ * The return value can still be inspected later.</div><div class='add'>+ */</div><div class='add'>+static __always_inline int arena_spin_lock(arena_spinlock_t __arena *lock)</div><div class='add'>+{</div><div class='add'>+	int val = 0;</div><div class='add'>+</div><div class='add'>+	if (CONFIG_NR_CPUS &gt; 1024)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	bpf_preempt_disable();</div><div class='add'>+	if (likely(atomic_try_cmpxchg_acquire(&amp;lock-&gt;val, &amp;val, _Q_LOCKED_VAL)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	val = arena_spin_lock_slowpath(lock, val);</div><div class='add'>+	/* FIXME: bpf_assert_range(-MAX_ERRNO, 0) once we have it working for all cases. */</div><div class='add'>+	if (val)</div><div class='add'>+		bpf_preempt_enable();</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * arena_spin_unlock - release a queued spinlock</div><div class='add'>+ * @lock : Pointer to queued spinlock structure</div><div class='add'>+ */</div><div class='add'>+static __always_inline void arena_spin_unlock(arena_spinlock_t __arena *lock)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * unlock() needs release semantics:</div><div class='add'>+	 */</div><div class='add'>+	smp_store_release(&amp;lock-&gt;locked, 0);</div><div class='add'>+	bpf_preempt_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define arena_spin_lock_irqsave(lock, flags)             \</div><div class='add'>+	({                                               \</div><div class='add'>+		int __ret;                               \</div><div class='add'>+		bpf_local_irq_save(&amp;(flags));            \</div><div class='add'>+		__ret = arena_spin_lock((lock));         \</div><div class='add'>+		if (__ret)                               \</div><div class='add'>+			bpf_local_irq_restore(&amp;(flags)); \</div><div class='add'>+		(__ret);                                 \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define arena_spin_unlock_irqrestore(lock, flags) \</div><div class='add'>+	({                                        \</div><div class='add'>+		arena_spin_unlock((lock));        \</div><div class='add'>+		bpf_local_irq_restore(&amp;(flags));  \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* BPF_ARENA_SPIN_LOCK_H */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_cc_cubic.c b/tools/testing/selftests/bpf/progs/bpf_cc_cubic.c<br/>index 1654a530aa3d..9af19dfe4e80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_cc_cubic.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_cc_cubic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_cc_cubic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_cc_cubic.c</a></div><div class='hunk'>@@ -22,10 +22,6 @@</div><div class='ctx'> #define TCP_PACING_CA_RATIO (120)</div><div class='ctx'> #define TCP_REORDERING (12)</div><div class='ctx'> </div><div class='del'>-#define min(a, b) ((a) &lt; (b) ? (a) : (b))</div><div class='del'>-#define max(a, b) ((a) &gt; (b) ? (a) : (b))</div><div class='del'>-#define after(seq2, seq1) before(seq1, seq2)</div><div class='del'>-</div><div class='ctx'> extern void cubictcp_init(struct sock *sk) __ksym;</div><div class='ctx'> extern void cubictcp_cwnd_event(struct sock *sk, enum tcp_ca_event event) __ksym;</div><div class='ctx'> extern __u32 cubictcp_recalc_ssthresh(struct sock *sk) __ksym;</div><div class='hunk'>@@ -34,11 +30,6 @@ extern __u32 tcp_reno_undo_cwnd(struct sock *sk) __ksym;</div><div class='ctx'> extern void cubictcp_acked(struct sock *sk, const struct ack_sample *sample) __ksym;</div><div class='ctx'> extern void cubictcp_cong_avoid(struct sock *sk, __u32 ack, __u32 acked) __ksym;</div><div class='ctx'> </div><div class='del'>-static bool before(__u32 seq1, __u32 seq2)</div><div class='del'>-{</div><div class='del'>-	return (__s32)(seq1-seq2) &lt; 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static __u64 div64_u64(__u64 dividend, __u64 divisor)</div><div class='ctx'> {</div><div class='ctx'> 	return dividend / divisor;</div><div class='hunk'>@@ -101,7 +92,7 @@ static void tcp_cwnd_reduction(struct sock *sk, int newly_acked_sacked,</div><div class='ctx'> 	tp-&gt;snd_cwnd = pkts_in_flight + sndcnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Decide wheather to run the increase function of congestion control. */</div><div class='add'>+/* Decide whether to run the increase function of congestion control. */</div><div class='ctx'> static bool tcp_may_raise_cwnd(const struct sock *sk, const int flag)</div><div class='ctx'> {</div><div class='ctx'> 	if (tcp_sk(sk)-&gt;reordering &gt; TCP_REORDERING)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_cubic.c b/tools/testing/selftests/bpf/progs/bpf_cubic.c<br/>index f089faa97ae6..46fb2b37d3a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_cubic.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_cubic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_cubic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_cubic.c</a></div><div class='hunk'>@@ -20,13 +20,6 @@</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='ctx'> #define clamp(val, lo, hi) min((typeof(val))max(val, lo), hi)</div><div class='del'>-#define min(a, b) ((a) &lt; (b) ? (a) : (b))</div><div class='del'>-#define max(a, b) ((a) &gt; (b) ? (a) : (b))</div><div class='del'>-static bool before(__u32 seq1, __u32 seq2)</div><div class='del'>-{</div><div class='del'>-	return (__s32)(seq1-seq2) &lt; 0;</div><div class='del'>-}</div><div class='del'>-#define after(seq2, seq1) 	before(seq1, seq2)</div><div class='ctx'> </div><div class='ctx'> extern __u32 tcp_slow_start(struct tcp_sock *tp, __u32 acked) __ksym;</div><div class='ctx'> extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_dctcp.c b/tools/testing/selftests/bpf/progs/bpf_dctcp.c<br/>index 7cd73e75f52a..1cc83140849f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_dctcp.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_dctcp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_dctcp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_dctcp.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Copyright (c) 2019 Facebook */</div><div class='ctx'> </div><div class='del'>-/* WARNING: This implemenation is not necessarily the same</div><div class='add'>+/* WARNING: This implementation is not necessarily the same</div><div class='ctx'>  * as the tcp_dctcp.c.  The purpose is mainly for testing</div><div class='ctx'>  * the kernel BPF logic.</div><div class='ctx'>  */</div><div class='hunk'>@@ -13,16 +13,10 @@</div><div class='ctx'> #ifndef EBUSY</div><div class='ctx'> #define EBUSY 16</div><div class='ctx'> #endif</div><div class='del'>-#define min(a, b) ((a) &lt; (b) ? (a) : (b))</div><div class='del'>-#define max(a, b) ((a) &gt; (b) ? (a) : (b))</div><div class='ctx'> #define min_not_zero(x, y) ({			\</div><div class='ctx'> 	typeof(x) __x = (x);			\</div><div class='ctx'> 	typeof(y) __y = (y);			\</div><div class='ctx'> 	__x == 0 ? __y : ((__y == 0) ? __x : min(__x, __y)); })</div><div class='del'>-static bool before(__u32 seq1, __u32 seq2)</div><div class='del'>-{</div><div class='del'>-	return (__s32)(seq1-seq2) &lt; 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_gotox.c b/tools/testing/selftests/bpf/progs/bpf_gotox.c<br/>new file mode 100644<br/>index 000000000000..216c71b94c64<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_gotox.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_gotox.c</a></div><div class='hunk'>@@ -0,0 +1,448 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_core_read.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+__u64 in_user;</div><div class='add'>+__u64 ret_user;</div><div class='add'>+</div><div class='add'>+int pid;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Skip all the tests if compiler doesn't support indirect jumps.</div><div class='add'>+ *</div><div class='add'>+ * If tests are skipped, then all functions below are compiled as</div><div class='add'>+ * dummy, such that the skeleton looks the same, and the userspace</div><div class='add'>+ * program can avoid any checks rather than if data-&gt;skip is set.</div><div class='add'>+ */</div><div class='add'>+#ifdef __BPF_FEATURE_GOTOX</div><div class='add'>+__u64 skip SEC(".data") = 0;</div><div class='add'>+#else</div><div class='add'>+__u64 skip = 1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct simple_ctx {</div><div class='add'>+	__u64 x;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef __BPF_FEATURE_GOTOX</div><div class='add'>+__u64 some_var;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function adds code which will be replaced by a different</div><div class='add'>+ * number of instructions by the verifier. This adds additional</div><div class='add'>+ * stress on testing the insn_array maps corresponding to indirect jumps.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void adjust_insns(__u64 x)</div><div class='add'>+{</div><div class='add'>+	some_var ^= x + bpf_jiffies64();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int one_switch(struct simple_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	switch (ctx-&gt;x) {</div><div class='add'>+	case 0:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 1);</div><div class='add'>+		ret_user = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 7);</div><div class='add'>+		ret_user = 3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 9);</div><div class='add'>+		ret_user = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 11);</div><div class='add'>+		ret_user = 5;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 17);</div><div class='add'>+		ret_user = 7;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 177);</div><div class='add'>+		ret_user = 19;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int one_switch_non_zero_sec_off(struct simple_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	switch (ctx-&gt;x) {</div><div class='add'>+	case 0:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 1);</div><div class='add'>+		ret_user = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 7);</div><div class='add'>+		ret_user = 3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 9);</div><div class='add'>+		ret_user = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 11);</div><div class='add'>+		ret_user = 5;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 17);</div><div class='add'>+		ret_user = 7;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 177);</div><div class='add'>+		ret_user = 19;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry/" SYS_PREFIX "sys_nanosleep")</div><div class='add'>+int simple_test_other_sec(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	__u64 x = in_user;</div><div class='add'>+</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (x) {</div><div class='add'>+	case 0:</div><div class='add'>+		adjust_insns(x + 1);</div><div class='add'>+		ret_user = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		adjust_insns(x + 7);</div><div class='add'>+		ret_user = 3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		adjust_insns(x + 9);</div><div class='add'>+		ret_user = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		adjust_insns(x + 11);</div><div class='add'>+		ret_user = 5;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		adjust_insns(x + 17);</div><div class='add'>+		ret_user = 7;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		adjust_insns(x + 177);</div><div class='add'>+		ret_user = 19;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int two_switches(struct simple_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	switch (ctx-&gt;x) {</div><div class='add'>+	case 0:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 1);</div><div class='add'>+		ret_user = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 7);</div><div class='add'>+		ret_user = 3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 9);</div><div class='add'>+		ret_user = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 11);</div><div class='add'>+		ret_user = 5;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 17);</div><div class='add'>+		ret_user = 7;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 177);</div><div class='add'>+		ret_user = 19;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ctx-&gt;x + !!ret_user) {</div><div class='add'>+	case 1:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 7);</div><div class='add'>+		ret_user = 103;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 9);</div><div class='add'>+		ret_user = 104;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 11);</div><div class='add'>+		ret_user = 107;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 11);</div><div class='add'>+		ret_user = 205;</div><div class='add'>+		break;</div><div class='add'>+	case 5:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 11);</div><div class='add'>+		ret_user = 115;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		adjust_insns(ctx-&gt;x + 177);</div><div class='add'>+		ret_user = 1019;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int big_jump_table(struct simple_ctx *ctx __attribute__((unused)))</div><div class='add'>+{</div><div class='add'>+	const void *const jt[256] = {</div><div class='add'>+		[0 ... 255] = &amp;&amp;default_label,</div><div class='add'>+		[0] = &amp;&amp;l0,</div><div class='add'>+		[11] = &amp;&amp;l11,</div><div class='add'>+		[27] = &amp;&amp;l27,</div><div class='add'>+		[31] = &amp;&amp;l31,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	goto *jt[ctx-&gt;x &amp; 0xff];</div><div class='add'>+</div><div class='add'>+l0:</div><div class='add'>+	adjust_insns(ctx-&gt;x + 1);</div><div class='add'>+	ret_user = 2;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+l11:</div><div class='add'>+	adjust_insns(ctx-&gt;x + 7);</div><div class='add'>+	ret_user = 3;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+l27:</div><div class='add'>+	adjust_insns(ctx-&gt;x + 9);</div><div class='add'>+	ret_user = 4;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+l31:</div><div class='add'>+	adjust_insns(ctx-&gt;x + 11);</div><div class='add'>+	ret_user = 5;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+default_label:</div><div class='add'>+	adjust_insns(ctx-&gt;x + 177);</div><div class='add'>+	ret_user = 19;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int one_jump_two_maps(struct simple_ctx *ctx __attribute__((unused)))</div><div class='add'>+{</div><div class='add'>+	__label__ l1, l2, l3, l4;</div><div class='add'>+	void *jt1[2] = { &amp;&amp;l1, &amp;&amp;l2 };</div><div class='add'>+	void *jt2[2] = { &amp;&amp;l3, &amp;&amp;l4 };</div><div class='add'>+	unsigned int a = ctx-&gt;x % 2;</div><div class='add'>+	unsigned int b = (ctx-&gt;x / 2) % 2;</div><div class='add'>+	volatile int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!(a &lt; 2 &amp;&amp; b &lt; 2))</div><div class='add'>+		return 19;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;x % 2)</div><div class='add'>+		goto *jt1[a];</div><div class='add'>+	else</div><div class='add'>+		goto *jt2[b];</div><div class='add'>+</div><div class='add'>+	l1: ret += 1;</div><div class='add'>+	l2: ret += 3;</div><div class='add'>+	l3: ret += 5;</div><div class='add'>+	l4: ret += 7;</div><div class='add'>+</div><div class='add'>+	ret_user = ret;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int one_map_two_jumps(struct simple_ctx *ctx __attribute__((unused)))</div><div class='add'>+{</div><div class='add'>+	__label__ l1, l2, l3;</div><div class='add'>+	void *jt[3] = { &amp;&amp;l1, &amp;&amp;l2, &amp;&amp;l3 };</div><div class='add'>+	unsigned int a = (ctx-&gt;x &gt;&gt; 2) &amp; 1;</div><div class='add'>+	unsigned int b = (ctx-&gt;x &gt;&gt; 3) &amp; 1;</div><div class='add'>+	volatile int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;x % 2)</div><div class='add'>+		goto *jt[a];</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;x % 3)</div><div class='add'>+		goto *jt[a + b];</div><div class='add'>+</div><div class='add'>+	l1: ret += 3;</div><div class='add'>+	l2: ret += 5;</div><div class='add'>+	l3: ret += 7;</div><div class='add'>+</div><div class='add'>+	ret_user = ret;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Just to introduce some non-zero offsets in .text */</div><div class='add'>+static __noinline int f0(volatile struct simple_ctx *ctx __arg_ctx)</div><div class='add'>+{</div><div class='add'>+	if (ctx)</div><div class='add'>+		return 1;</div><div class='add'>+	else</div><div class='add'>+		return 13;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall") int f1(struct simple_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	ret_user = 0;</div><div class='add'>+	return f0(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __noinline int __static_global(__u64 x)</div><div class='add'>+{</div><div class='add'>+	switch (x) {</div><div class='add'>+	case 0:</div><div class='add'>+		adjust_insns(x + 1);</div><div class='add'>+		ret_user = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		adjust_insns(x + 7);</div><div class='add'>+		ret_user = 3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		adjust_insns(x + 9);</div><div class='add'>+		ret_user = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		adjust_insns(x + 11);</div><div class='add'>+		ret_user = 5;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		adjust_insns(x + 17);</div><div class='add'>+		ret_user = 7;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		adjust_insns(x + 177);</div><div class='add'>+		ret_user = 19;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int use_static_global1(struct simple_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	ret_user = 0;</div><div class='add'>+	return __static_global(ctx-&gt;x);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int use_static_global2(struct simple_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	ret_user = 0;</div><div class='add'>+	adjust_insns(ctx-&gt;x + 1);</div><div class='add'>+	return __static_global(ctx-&gt;x);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry/" SYS_PREFIX "sys_nanosleep")</div><div class='add'>+int use_static_global_other_sec(void *ctx)</div><div class='add'>+{</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __static_global(in_user);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__noinline int __nonstatic_global(__u64 x)</div><div class='add'>+{</div><div class='add'>+	switch (x) {</div><div class='add'>+	case 0:</div><div class='add'>+		adjust_insns(x + 1);</div><div class='add'>+		ret_user = 2;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		adjust_insns(x + 7);</div><div class='add'>+		ret_user = 3;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		adjust_insns(x + 9);</div><div class='add'>+		ret_user = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		adjust_insns(x + 11);</div><div class='add'>+		ret_user = 5;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		adjust_insns(x + 17);</div><div class='add'>+		ret_user = 7;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		adjust_insns(x + 177);</div><div class='add'>+		ret_user = 19;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int use_nonstatic_global1(struct simple_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	ret_user = 0;</div><div class='add'>+	return __nonstatic_global(ctx-&gt;x);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int use_nonstatic_global2(struct simple_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	ret_user = 0;</div><div class='add'>+	adjust_insns(ctx-&gt;x + 1);</div><div class='add'>+	return __nonstatic_global(ctx-&gt;x);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry/" SYS_PREFIX "sys_nanosleep")</div><div class='add'>+int use_nonstatic_global_other_sec(void *ctx)</div><div class='add'>+{</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __nonstatic_global(in_user);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* __BPF_FEATURE_GOTOX */</div><div class='add'>+</div><div class='add'>+#define SKIP_TEST(TEST_NAME)				\</div><div class='add'>+	SEC("syscall") int TEST_NAME(void *ctx)		\</div><div class='add'>+	{						\</div><div class='add'>+		return 0;				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+SKIP_TEST(one_switch);</div><div class='add'>+SKIP_TEST(one_switch_non_zero_sec_off);</div><div class='add'>+SKIP_TEST(simple_test_other_sec);</div><div class='add'>+SKIP_TEST(two_switches);</div><div class='add'>+SKIP_TEST(big_jump_table);</div><div class='add'>+SKIP_TEST(one_jump_two_maps);</div><div class='add'>+SKIP_TEST(one_map_two_jumps);</div><div class='add'>+SKIP_TEST(use_static_global1);</div><div class='add'>+SKIP_TEST(use_static_global2);</div><div class='add'>+SKIP_TEST(use_static_global_other_sec);</div><div class='add'>+SKIP_TEST(use_nonstatic_global1);</div><div class='add'>+SKIP_TEST(use_nonstatic_global2);</div><div class='add'>+SKIP_TEST(use_nonstatic_global_other_sec);</div><div class='add'>+</div><div class='add'>+#endif /* __BPF_FEATURE_GOTOX */</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_map_elem.c b/tools/testing/selftests/bpf/progs/bpf_iter_map_elem.c<br/>new file mode 100644<br/>index 000000000000..2f20485e0de3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_map_elem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_iter_map_elem.c</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+__u32 value_sum = 0;</div><div class='add'>+</div><div class='add'>+SEC("iter/bpf_map_elem")</div><div class='add'>+int dump_bpf_map_values(struct bpf_iter__bpf_map_elem *ctx)</div><div class='add'>+{</div><div class='add'>+	__u32 value = 0;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;value == (void *)0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_probe_read_kernel(&amp;value, sizeof(value), ctx-&gt;value);</div><div class='add'>+	value_sum += value;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c b/tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c<br/>index 774d4dbe8189..a8aa5a71d846 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c</a></div><div class='hunk'>@@ -18,23 +18,10 @@</div><div class='ctx'> </div><div class='ctx'> unsigned short reuse_listen_hport = 0;</div><div class='ctx'> unsigned short listen_hport = 0;</div><div class='del'>-char cubic_cc[TCP_CA_NAME_MAX] = "bpf_cubic";</div><div class='add'>+const char cubic_cc[] = "bpf_cubic";</div><div class='ctx'> char dctcp_cc[TCP_CA_NAME_MAX] = "bpf_dctcp";</div><div class='ctx'> bool random_retry = false;</div><div class='ctx'> </div><div class='del'>-static bool tcp_cc_eq(const char *a, const char *b)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; TCP_CA_NAME_MAX; i++) {</div><div class='del'>-		if (a[i] != b[i])</div><div class='del'>-			return false;</div><div class='del'>-		if (!a[i])</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> SEC("iter/tcp")</div><div class='ctx'> int change_tcp_cc(struct bpf_iter__tcp *ctx)</div><div class='hunk'>@@ -58,7 +45,7 @@ int change_tcp_cc(struct bpf_iter__tcp *ctx)</div><div class='ctx'> 			   cur_cc, sizeof(cur_cc)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!tcp_cc_eq(cur_cc, cubic_cc))</div><div class='add'>+	if (bpf_strncmp(cur_cc, TCP_CA_NAME_MAX, cubic_cc))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (random_retry &amp;&amp; bpf_get_prandom_u32() % 4 == 1)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c b/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c<br/>index bc10c4e4b4fa..966ee5a7b066 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_tasks.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_iter_tasks.c</a></div><div class='hunk'>@@ -9,6 +9,13 @@ char _license[] SEC("license") = "GPL";</div><div class='ctx'> uint32_t tid = 0;</div><div class='ctx'> int num_unknown_tid = 0;</div><div class='ctx'> int num_known_tid = 0;</div><div class='add'>+void *user_ptr = 0;</div><div class='add'>+void *user_ptr_long = 0;</div><div class='add'>+uint32_t pid = 0;</div><div class='add'>+</div><div class='add'>+static char big_str1[5000];</div><div class='add'>+static char big_str2[5005];</div><div class='add'>+static char big_str3[4996];</div><div class='ctx'> </div><div class='ctx'> SEC("iter/task")</div><div class='ctx'> int dump_task(struct bpf_iter__task *ctx)</div><div class='hunk'>@@ -35,7 +42,9 @@ int dump_task(struct bpf_iter__task *ctx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int num_expected_failure_copy_from_user_task = 0;</div><div class='add'>+int num_expected_failure_copy_from_user_task_str = 0;</div><div class='ctx'> int num_success_copy_from_user_task = 0;</div><div class='add'>+int num_success_copy_from_user_task_str = 0;</div><div class='ctx'> </div><div class='ctx'> SEC("iter.s/task")</div><div class='ctx'> int dump_task_sleepable(struct bpf_iter__task *ctx)</div><div class='hunk'>@@ -44,6 +53,9 @@ int dump_task_sleepable(struct bpf_iter__task *ctx)</div><div class='ctx'> 	struct task_struct *task = ctx-&gt;task;</div><div class='ctx'> 	static const char info[] = "    === END ===";</div><div class='ctx'> 	struct pt_regs *regs;</div><div class='add'>+	char task_str1[10] = "aaaaaaaaaa";</div><div class='add'>+	char task_str2[10], task_str3[10];</div><div class='add'>+	char task_str4[20] = "aaaaaaaaaaaaaaaaaaaa";</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> 	uint32_t user_data = 0;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -78,8 +90,106 @@ int dump_task_sleepable(struct bpf_iter__task *ctx)</div><div class='ctx'> 		BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	++num_success_copy_from_user_task;</div><div class='ctx'> </div><div class='add'>+	/* Read an invalid pointer and ensure we get an error */</div><div class='add'>+	ptr = NULL;</div><div class='add'>+	ret = bpf_copy_from_user_task_str((char *)task_str1, sizeof(task_str1), ptr, task, 0);</div><div class='add'>+	if (ret &gt;= 0 || task_str1[9] != 'a' || task_str1[0] != '\0') {</div><div class='add'>+		BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read an invalid pointer and ensure we get error with pad zeros flag */</div><div class='add'>+	ptr = NULL;</div><div class='add'>+	ret = bpf_copy_from_user_task_str((char *)task_str1, sizeof(task_str1),</div><div class='add'>+					  ptr, task, BPF_F_PAD_ZEROS);</div><div class='add'>+	if (ret &gt;= 0 || task_str1[9] != '\0' || task_str1[0] != '\0') {</div><div class='add'>+		BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	++num_expected_failure_copy_from_user_task_str;</div><div class='add'>+</div><div class='add'>+	/* Same length as the string */</div><div class='add'>+	ret = bpf_copy_from_user_task_str((char *)task_str2, 10, user_ptr, task, 0);</div><div class='add'>+	/* only need to do the task pid check once */</div><div class='add'>+	if (bpf_strncmp(task_str2, 10, "test_data\0") != 0 || ret != 10 || task-&gt;tgid != pid) {</div><div class='add'>+		BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Shorter length than the string */</div><div class='add'>+	ret = bpf_copy_from_user_task_str((char *)task_str3, 2, user_ptr, task, 0);</div><div class='add'>+	if (bpf_strncmp(task_str3, 2, "t\0") != 0 || ret != 2) {</div><div class='add'>+		BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Longer length than the string */</div><div class='add'>+	ret = bpf_copy_from_user_task_str((char *)task_str4, 20, user_ptr, task, 0);</div><div class='add'>+	if (bpf_strncmp(task_str4, 10, "test_data\0") != 0 || ret != 10</div><div class='add'>+	    || task_str4[sizeof(task_str4) - 1] != 'a') {</div><div class='add'>+		BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Longer length than the string with pad zeros flag */</div><div class='add'>+	ret = bpf_copy_from_user_task_str((char *)task_str4, 20, user_ptr, task, BPF_F_PAD_ZEROS);</div><div class='add'>+	if (bpf_strncmp(task_str4, 10, "test_data\0") != 0 || ret != 10</div><div class='add'>+	    || task_str4[sizeof(task_str4) - 1] != '\0') {</div><div class='add'>+		BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Longer length than the string past a page boundary */</div><div class='add'>+	ret = bpf_copy_from_user_task_str(big_str1, 5000, user_ptr, task, 0);</div><div class='add'>+	if (bpf_strncmp(big_str1, 10, "test_data\0") != 0 || ret != 10) {</div><div class='add'>+		BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* String that crosses a page boundary */</div><div class='add'>+	ret = bpf_copy_from_user_task_str(big_str1, 5000, user_ptr_long, task, BPF_F_PAD_ZEROS);</div><div class='add'>+	if (bpf_strncmp(big_str1, 4, "baba") != 0 || ret != 5000</div><div class='add'>+	    || bpf_strncmp(big_str1 + 4996, 4, "bab\0") != 0) {</div><div class='add'>+		BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; 4999; ++i) {</div><div class='add'>+		if (i % 2 == 0) {</div><div class='add'>+			if (big_str1[i] != 'b') {</div><div class='add'>+				BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (big_str1[i] != 'a') {</div><div class='add'>+				BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Longer length than the string that crosses a page boundary */</div><div class='add'>+	ret = bpf_copy_from_user_task_str(big_str2, 5005, user_ptr_long, task, BPF_F_PAD_ZEROS);</div><div class='add'>+	if (bpf_strncmp(big_str2, 4, "baba") != 0 || ret != 5000</div><div class='add'>+	    || bpf_strncmp(big_str2 + 4996, 5, "bab\0\0") != 0) {</div><div class='add'>+		BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Shorter length than the string that crosses a page boundary */</div><div class='add'>+	ret = bpf_copy_from_user_task_str(big_str3, 4996, user_ptr_long, task, 0);</div><div class='add'>+	if (bpf_strncmp(big_str3, 4, "baba") != 0 || ret != 4996</div><div class='add'>+	    || bpf_strncmp(big_str3 + 4992, 4, "bab\0") != 0) {</div><div class='add'>+		BPF_SEQ_PRINTF(seq, "%s\n", info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	++num_success_copy_from_user_task_str;</div><div class='add'>+</div><div class='ctx'> 	if (ctx-&gt;meta-&gt;seq_num == 0)</div><div class='ctx'> 		BPF_SEQ_PRINTF(seq, "    tgid      gid     data\n");</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c b/tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c<br/>index d22449c69363..b1e509b231cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c</a></div><div class='hunk'>@@ -99,13 +99,13 @@ static int dump_tcp_sock(struct seq_file *seq, struct tcp_sock *tp,</div><div class='ctx'> 	    icsk-&gt;icsk_pending == ICSK_TIME_REO_TIMEOUT ||</div><div class='ctx'> 	    icsk-&gt;icsk_pending == ICSK_TIME_LOSS_PROBE) {</div><div class='ctx'> 		timer_active = 1;</div><div class='del'>-		timer_expires = icsk-&gt;icsk_timeout;</div><div class='add'>+		timer_expires = sp-&gt;tcp_retransmit_timer.expires;</div><div class='ctx'> 	} else if (icsk-&gt;icsk_pending == ICSK_TIME_PROBE0) {</div><div class='ctx'> 		timer_active = 4;</div><div class='del'>-		timer_expires = icsk-&gt;icsk_timeout;</div><div class='del'>-	} else if (timer_pending(&amp;sp-&gt;sk_timer)) {</div><div class='add'>+		timer_expires = sp-&gt;tcp_retransmit_timer.expires;</div><div class='add'>+	} else if (timer_pending(&amp;icsk-&gt;icsk_keepalive_timer)) {</div><div class='ctx'> 		timer_active = 2;</div><div class='del'>-		timer_expires = sp-&gt;sk_timer.expires;</div><div class='add'>+		timer_expires = icsk-&gt;icsk_keepalive_timer.expires;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		timer_active = 0;</div><div class='ctx'> 		timer_expires = bpf_jiffies64();</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c b/tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c<br/>index 8b072666f9d9..dbc7166aee91 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c</a></div><div class='hunk'>@@ -99,13 +99,13 @@ static int dump_tcp6_sock(struct seq_file *seq, struct tcp6_sock *tp,</div><div class='ctx'> 	    icsk-&gt;icsk_pending == ICSK_TIME_REO_TIMEOUT ||</div><div class='ctx'> 	    icsk-&gt;icsk_pending == ICSK_TIME_LOSS_PROBE) {</div><div class='ctx'> 		timer_active = 1;</div><div class='del'>-		timer_expires = icsk-&gt;icsk_timeout;</div><div class='add'>+		timer_expires = sp-&gt;tcp_retransmit_timer.expires;</div><div class='ctx'> 	} else if (icsk-&gt;icsk_pending == ICSK_TIME_PROBE0) {</div><div class='ctx'> 		timer_active = 4;</div><div class='del'>-		timer_expires = icsk-&gt;icsk_timeout;</div><div class='del'>-	} else if (timer_pending(&amp;sp-&gt;sk_timer)) {</div><div class='add'>+		timer_expires = sp-&gt;tcp_retransmit_timer.expires;</div><div class='add'>+	} else if (timer_pending(&amp;icsk-&gt;icsk_keepalive_timer)) {</div><div class='ctx'> 		timer_active = 2;</div><div class='del'>-		timer_expires = sp-&gt;sk_timer.expires;</div><div class='add'>+		timer_expires = icsk-&gt;icsk_keepalive_timer.expires;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		timer_active = 0;</div><div class='ctx'> 		timer_expires = bpf_jiffies64();</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_udp4.c b/tools/testing/selftests/bpf/progs/bpf_iter_udp4.c<br/>index ffbd4b116d17..23b2aa2604de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_udp4.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_udp4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_udp4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_iter_udp4.c</a></div><div class='hunk'>@@ -64,7 +64,8 @@ int dump_udp4(struct bpf_iter__udp *ctx)</div><div class='ctx'> 		       0, 0L, 0, ctx-&gt;uid, 0,</div><div class='ctx'> 		       sock_i_ino(&amp;inet-&gt;sk),</div><div class='ctx'> 		       inet-&gt;sk.sk_refcnt.refs.counter, udp_sk,</div><div class='del'>-		       inet-&gt;sk.sk_drops.counter);</div><div class='add'>+		       udp_sk-&gt;drop_counters.drops0.counter +</div><div class='add'>+		       udp_sk-&gt;drop_counters.drops1.counter);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_udp6.c b/tools/testing/selftests/bpf/progs/bpf_iter_udp6.c<br/>index 47ff7754f4fd..c48b05aa2a4b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_udp6.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_iter_udp6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_iter_udp6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_iter_udp6.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ int dump_udp6(struct bpf_iter__udp *ctx)</div><div class='ctx'> 		       0, 0L, 0, ctx-&gt;uid, 0,</div><div class='ctx'> 		       sock_i_ino(&amp;inet-&gt;sk),</div><div class='ctx'> 		       inet-&gt;sk.sk_refcnt.refs.counter, udp_sk,</div><div class='del'>-		       inet-&gt;sk.sk_drops.counter);</div><div class='del'>-</div><div class='add'>+		       udp_sk-&gt;drop_counters.drops0.counter +</div><div class='add'>+		       udp_sk-&gt;drop_counters.drops1.counter);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_misc.h b/tools/testing/selftests/bpf/progs/bpf_misc.h<br/>index f45f4352feeb..c9bfbe1bafc1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_misc.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_misc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_misc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_misc.h</a></div><div class='hunk'>@@ -33,7 +33,20 @@</div><div class='ctx'>  *                   e.g. "foo{{[0-9]+}}"  matches strings like "foo007".</div><div class='ctx'>  *                   Extended POSIX regular expression syntax is allowed</div><div class='ctx'>  *                   inside the brackets.</div><div class='add'>+ * __not_msg         Message not expected to be found in verifier log.</div><div class='add'>+ *                   If __msg_not is situated between __msg tags</div><div class='add'>+ *                   framework matches __msg tags first, and then</div><div class='add'>+ *                   checks that __msg_not is not present in a portion of</div><div class='add'>+ *                   a log between bracketing __msg tags.</div><div class='add'>+ *                   Same regex syntax as for __msg is supported.</div><div class='ctx'>  * __msg_unpriv      Same as __msg but for unprivileged mode.</div><div class='add'>+ * __not_msg_unpriv  Same as __not_msg but for unprivileged mode.</div><div class='add'>+ *</div><div class='add'>+ * __stderr          Message expected to be found in bpf stderr stream. The</div><div class='add'>+ *                   same regex rules apply like __msg.</div><div class='add'>+ * __stderr_unpriv   Same as __stderr but for unpriveleged mode.</div><div class='add'>+ * __stdout          Same as __stderr but for stdout stream.</div><div class='add'>+ * __stdout_unpriv   Same as __stdout but for unpriveleged mode.</div><div class='ctx'>  *</div><div class='ctx'>  * __xlated          Expect a line in a disassembly log after verifier applies rewrites.</div><div class='ctx'>  *                   Multiple __xlated attributes could be specified.</div><div class='hunk'>@@ -83,9 +96,11 @@</div><div class='ctx'>  *                   expect return value to match passed parameter:</div><div class='ctx'>  *                   - a decimal number</div><div class='ctx'>  *                   - a hexadecimal number, when starts from 0x</div><div class='del'>- *                   - literal INT_MIN</div><div class='del'>- *                   - literal POINTER_VALUE (see definition below)</div><div class='del'>- *                   - literal TEST_DATA_LEN (see definition below)</div><div class='add'>+ *                   - a macro which expands to one of the above</div><div class='add'>+ *                   - literal _INT_MIN (expands to INT_MIN)</div><div class='add'>+ *                   In addition, two special macros are defined below:</div><div class='add'>+ *                   - POINTER_VALUE</div><div class='add'>+ *                   - TEST_DATA_LEN</div><div class='ctx'>  * __retval_unpriv   Same, but load program in unprivileged mode.</div><div class='ctx'>  *</div><div class='ctx'>  * __description     Text to be used instead of a program name for display</div><div class='hunk'>@@ -111,22 +126,27 @@</div><div class='ctx'>  *                   Several __arch_* annotations could be specified at once.</div><div class='ctx'>  *                   When test case is not run on current arch it is marked as skipped.</div><div class='ctx'>  * __caps_unpriv     Specify the capabilities that should be set when running the test.</div><div class='add'>+ *</div><div class='add'>+ * __linear_size     Specify the size of the linear area of non-linear skbs, or</div><div class='add'>+ *                   0 for linear skbs.</div><div class='ctx'>  */</div><div class='ctx'> #define __msg(msg)		__attribute__((btf_decl_tag("comment:test_expect_msg=" XSTR(__COUNTER__) "=" msg)))</div><div class='add'>+#define __not_msg(msg)		__attribute__((btf_decl_tag("comment:test_expect_not_msg=" XSTR(__COUNTER__) "=" msg)))</div><div class='ctx'> #define __xlated(msg)		__attribute__((btf_decl_tag("comment:test_expect_xlated=" XSTR(__COUNTER__) "=" msg)))</div><div class='ctx'> #define __jited(msg)		__attribute__((btf_decl_tag("comment:test_jited=" XSTR(__COUNTER__) "=" msg)))</div><div class='ctx'> #define __failure		__attribute__((btf_decl_tag("comment:test_expect_failure")))</div><div class='ctx'> #define __success		__attribute__((btf_decl_tag("comment:test_expect_success")))</div><div class='ctx'> #define __description(desc)	__attribute__((btf_decl_tag("comment:test_description=" desc)))</div><div class='ctx'> #define __msg_unpriv(msg)	__attribute__((btf_decl_tag("comment:test_expect_msg_unpriv=" XSTR(__COUNTER__) "=" msg)))</div><div class='add'>+#define __not_msg_unpriv(msg)	__attribute__((btf_decl_tag("comment:test_expect_not_msg_unpriv=" XSTR(__COUNTER__) "=" msg)))</div><div class='ctx'> #define __xlated_unpriv(msg)	__attribute__((btf_decl_tag("comment:test_expect_xlated_unpriv=" XSTR(__COUNTER__) "=" msg)))</div><div class='ctx'> #define __jited_unpriv(msg)	__attribute__((btf_decl_tag("comment:test_jited=" XSTR(__COUNTER__) "=" msg)))</div><div class='ctx'> #define __failure_unpriv	__attribute__((btf_decl_tag("comment:test_expect_failure_unpriv")))</div><div class='ctx'> #define __success_unpriv	__attribute__((btf_decl_tag("comment:test_expect_success_unpriv")))</div><div class='ctx'> #define __log_level(lvl)	__attribute__((btf_decl_tag("comment:test_log_level="#lvl)))</div><div class='ctx'> #define __flag(flag)		__attribute__((btf_decl_tag("comment:test_prog_flags="#flag)))</div><div class='del'>-#define __retval(val)		__attribute__((btf_decl_tag("comment:test_retval="#val)))</div><div class='del'>-#define __retval_unpriv(val)	__attribute__((btf_decl_tag("comment:test_retval_unpriv="#val)))</div><div class='add'>+#define __retval(val)		__attribute__((btf_decl_tag("comment:test_retval="XSTR(val))))</div><div class='add'>+#define __retval_unpriv(val)	__attribute__((btf_decl_tag("comment:test_retval_unpriv="XSTR(val))))</div><div class='ctx'> #define __auxiliary		__attribute__((btf_decl_tag("comment:test_auxiliary")))</div><div class='ctx'> #define __auxiliary_unpriv	__attribute__((btf_decl_tag("comment:test_auxiliary_unpriv")))</div><div class='ctx'> #define __btf_path(path)	__attribute__((btf_decl_tag("comment:test_btf_path=" path)))</div><div class='hunk'>@@ -134,7 +154,15 @@</div><div class='ctx'> #define __arch_x86_64		__arch("X86_64")</div><div class='ctx'> #define __arch_arm64		__arch("ARM64")</div><div class='ctx'> #define __arch_riscv64		__arch("RISCV64")</div><div class='add'>+#define __arch_s390x		__arch("s390x")</div><div class='ctx'> #define __caps_unpriv(caps)	__attribute__((btf_decl_tag("comment:test_caps_unpriv=" EXPAND_QUOTE(caps))))</div><div class='add'>+#define __load_if_JITed()	__attribute__((btf_decl_tag("comment:load_mode=jited")))</div><div class='add'>+#define __load_if_no_JITed()	__attribute__((btf_decl_tag("comment:load_mode=no_jited")))</div><div class='add'>+#define __stderr(msg)		__attribute__((btf_decl_tag("comment:test_expect_stderr=" XSTR(__COUNTER__) "=" msg)))</div><div class='add'>+#define __stderr_unpriv(msg)	__attribute__((btf_decl_tag("comment:test_expect_stderr_unpriv=" XSTR(__COUNTER__) "=" msg)))</div><div class='add'>+#define __stdout(msg)		__attribute__((btf_decl_tag("comment:test_expect_stdout=" XSTR(__COUNTER__) "=" msg)))</div><div class='add'>+#define __stdout_unpriv(msg)	__attribute__((btf_decl_tag("comment:test_expect_stdout_unpriv=" XSTR(__COUNTER__) "=" msg)))</div><div class='add'>+#define __linear_size(sz)	__attribute__((btf_decl_tag("comment:test_linear_size=" XSTR(sz))))</div><div class='ctx'> </div><div class='ctx'> /* Define common capabilities tested using __caps_unpriv */</div><div class='ctx'> #define CAP_NET_ADMIN		12</div><div class='hunk'>@@ -152,8 +180,12 @@</div><div class='ctx'> #define __imm_ptr(name) [name]"r"(&amp;name)</div><div class='ctx'> #define __imm_insn(name, expr) [name]"i"(*(long *)&amp;(expr))</div><div class='ctx'> </div><div class='add'>+#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)-&gt;MEMBER))</div><div class='add'>+#define offsetofend(TYPE, MEMBER) \</div><div class='add'>+	(offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER))</div><div class='add'>+</div><div class='ctx'> /* Magic constants used with __retval() */</div><div class='del'>-#define POINTER_VALUE	0xcafe4all</div><div class='add'>+#define POINTER_VALUE	0xbadcafe</div><div class='ctx'> #define TEST_DATA_LEN	64</div><div class='ctx'> </div><div class='ctx'> #ifndef __used</div><div class='hunk'>@@ -172,6 +204,9 @@</div><div class='ctx'> #elif defined(__TARGET_ARCH_riscv)</div><div class='ctx'> #define SYSCALL_WRAPPER 1</div><div class='ctx'> #define SYS_PREFIX "__riscv_"</div><div class='add'>+#elif defined(__TARGET_ARCH_powerpc)</div><div class='add'>+#define SYSCALL_WRAPPER 1</div><div class='add'>+#define SYS_PREFIX ""</div><div class='ctx'> #else</div><div class='ctx'> #define SYSCALL_WRAPPER 0</div><div class='ctx'> #define SYS_PREFIX "__se_"</div><div class='hunk'>@@ -208,4 +243,31 @@</div><div class='ctx'> #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) ||	\</div><div class='add'>+     (defined(__TARGET_ARCH_riscv) &amp;&amp; __riscv_xlen == 64) ||		\</div><div class='add'>+     defined(__TARGET_ARCH_arm) || defined(__TARGET_ARCH_s390) ||	\</div><div class='add'>+     defined(__TARGET_ARCH_loongarch)) &amp;&amp;				\</div><div class='add'>+	__clang_major__ &gt;= 18</div><div class='add'>+#define CAN_USE_GOTOL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if __clang_major__ &gt;= 18</div><div class='add'>+#define CAN_USE_BPF_ST</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if __clang_major__ &gt;= 18 &amp;&amp; defined(ENABLE_ATOMICS_TESTS) &amp;&amp;		\</div><div class='add'>+	(defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) ||	\</div><div class='add'>+	 (defined(__TARGET_ARCH_riscv) &amp;&amp; __riscv_xlen == 64)) || \</div><div class='add'>+	  (defined(__TARGET_ARCH_powerpc))</div><div class='add'>+#define CAN_USE_LOAD_ACQ_STORE_REL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86)</div><div class='add'>+#define SPEC_V1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__TARGET_ARCH_x86)</div><div class='add'>+#define SPEC_V4</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_qdisc_common.h b/tools/testing/selftests/bpf/progs/bpf_qdisc_common.h<br/>new file mode 100644<br/>index 000000000000..3754f581b328<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_qdisc_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_qdisc_common.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef _BPF_QDISC_COMMON_H</div><div class='add'>+#define _BPF_QDISC_COMMON_H</div><div class='add'>+</div><div class='add'>+#define NET_XMIT_SUCCESS        0x00</div><div class='add'>+#define NET_XMIT_DROP           0x01    /* skb dropped                  */</div><div class='add'>+#define NET_XMIT_CN             0x02    /* congestion notification      */</div><div class='add'>+</div><div class='add'>+#define TC_PRIO_CONTROL  7</div><div class='add'>+#define TC_PRIO_MAX      15</div><div class='add'>+</div><div class='add'>+#define private(name) SEC(".data." #name) __hidden __attribute__((aligned(8)))</div><div class='add'>+</div><div class='add'>+struct bpf_sk_buff_ptr;</div><div class='add'>+</div><div class='add'>+static struct qdisc_skb_cb *qdisc_skb_cb(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return (struct qdisc_skb_cb *)skb-&gt;cb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int qdisc_pkt_len(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return qdisc_skb_cb(skb)-&gt;pkt_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_qdisc_fail__incompl_ops.c b/tools/testing/selftests/bpf/progs/bpf_qdisc_fail__incompl_ops.c<br/>new file mode 100644<br/>index 000000000000..f188062ed730<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_qdisc_fail__incompl_ops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_qdisc_fail__incompl_ops.c</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+#include "bpf_qdisc_common.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+SEC("struct_ops")</div><div class='add'>+int BPF_PROG(bpf_qdisc_test_enqueue, struct sk_buff *skb, struct Qdisc *sch,</div><div class='add'>+	     struct bpf_sk_buff_ptr *to_free)</div><div class='add'>+{</div><div class='add'>+	bpf_qdisc_skb_drop(skb, to_free);</div><div class='add'>+	return NET_XMIT_DROP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops")</div><div class='add'>+struct sk_buff *BPF_PROG(bpf_qdisc_test_dequeue, struct Qdisc *sch)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops")</div><div class='add'>+void BPF_PROG(bpf_qdisc_test_reset, struct Qdisc *sch)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops")</div><div class='add'>+void BPF_PROG(bpf_qdisc_test_destroy, struct Qdisc *sch)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops")</div><div class='add'>+struct Qdisc_ops test = {</div><div class='add'>+	.enqueue   = (void *)bpf_qdisc_test_enqueue,</div><div class='add'>+	.dequeue   = (void *)bpf_qdisc_test_dequeue,</div><div class='add'>+	.reset     = (void *)bpf_qdisc_test_reset,</div><div class='add'>+	.destroy   = (void *)bpf_qdisc_test_destroy,</div><div class='add'>+	.id        = "bpf_qdisc_test",</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_qdisc_fifo.c b/tools/testing/selftests/bpf/progs/bpf_qdisc_fifo.c<br/>new file mode 100644<br/>index 000000000000..1de2be3e370b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_qdisc_fifo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_qdisc_fifo.c</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+#include "bpf_qdisc_common.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct skb_node {</div><div class='add'>+	struct sk_buff __kptr * skb;</div><div class='add'>+	struct bpf_list_node node;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+private(A) struct bpf_spin_lock q_fifo_lock;</div><div class='add'>+private(A) struct bpf_list_head q_fifo __contains(skb_node, node);</div><div class='add'>+</div><div class='add'>+bool init_called;</div><div class='add'>+</div><div class='add'>+SEC("struct_ops/bpf_fifo_enqueue")</div><div class='add'>+int BPF_PROG(bpf_fifo_enqueue, struct sk_buff *skb, struct Qdisc *sch,</div><div class='add'>+	     struct bpf_sk_buff_ptr *to_free)</div><div class='add'>+{</div><div class='add'>+	struct skb_node *skbn;</div><div class='add'>+	u32 pkt_len;</div><div class='add'>+</div><div class='add'>+	if (sch-&gt;q.qlen == sch-&gt;limit)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	skbn = bpf_obj_new(typeof(*skbn));</div><div class='add'>+	if (!skbn)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	pkt_len = qdisc_pkt_len(skb);</div><div class='add'>+</div><div class='add'>+	sch-&gt;q.qlen++;</div><div class='add'>+	skb = bpf_kptr_xchg(&amp;skbn-&gt;skb, skb);</div><div class='add'>+	if (skb)</div><div class='add'>+		bpf_qdisc_skb_drop(skb, to_free);</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;q_fifo_lock);</div><div class='add'>+	bpf_list_push_back(&amp;q_fifo, &amp;skbn-&gt;node);</div><div class='add'>+	bpf_spin_unlock(&amp;q_fifo_lock);</div><div class='add'>+</div><div class='add'>+	sch-&gt;qstats.backlog += pkt_len;</div><div class='add'>+	return NET_XMIT_SUCCESS;</div><div class='add'>+drop:</div><div class='add'>+	bpf_qdisc_skb_drop(skb, to_free);</div><div class='add'>+	return NET_XMIT_DROP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops/bpf_fifo_dequeue")</div><div class='add'>+struct sk_buff *BPF_PROG(bpf_fifo_dequeue, struct Qdisc *sch)</div><div class='add'>+{</div><div class='add'>+	struct bpf_list_node *node;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct skb_node *skbn;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;q_fifo_lock);</div><div class='add'>+	node = bpf_list_pop_front(&amp;q_fifo);</div><div class='add'>+	bpf_spin_unlock(&amp;q_fifo_lock);</div><div class='add'>+	if (!node)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skbn = container_of(node, struct skb_node, node);</div><div class='add'>+	skb = bpf_kptr_xchg(&amp;skbn-&gt;skb, skb);</div><div class='add'>+	bpf_obj_drop(skbn);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	sch-&gt;qstats.backlog -= qdisc_pkt_len(skb);</div><div class='add'>+	bpf_qdisc_bstats_update(sch, skb);</div><div class='add'>+	sch-&gt;q.qlen--;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops/bpf_fifo_init")</div><div class='add'>+int BPF_PROG(bpf_fifo_init, struct Qdisc *sch, struct nlattr *opt,</div><div class='add'>+	     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	sch-&gt;limit = 1000;</div><div class='add'>+	init_called = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops/bpf_fifo_reset")</div><div class='add'>+void BPF_PROG(bpf_fifo_reset, struct Qdisc *sch)</div><div class='add'>+{</div><div class='add'>+	struct bpf_list_node *node;</div><div class='add'>+	struct skb_node *skbn;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, sch-&gt;q.qlen) {</div><div class='add'>+		struct sk_buff *skb = NULL;</div><div class='add'>+</div><div class='add'>+		bpf_spin_lock(&amp;q_fifo_lock);</div><div class='add'>+		node = bpf_list_pop_front(&amp;q_fifo);</div><div class='add'>+		bpf_spin_unlock(&amp;q_fifo_lock);</div><div class='add'>+</div><div class='add'>+		if (!node)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		skbn = container_of(node, struct skb_node, node);</div><div class='add'>+		skb = bpf_kptr_xchg(&amp;skbn-&gt;skb, skb);</div><div class='add'>+		if (skb)</div><div class='add'>+			bpf_kfree_skb(skb);</div><div class='add'>+		bpf_obj_drop(skbn);</div><div class='add'>+	}</div><div class='add'>+	sch-&gt;q.qlen = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops")</div><div class='add'>+void BPF_PROG(bpf_fifo_destroy, struct Qdisc *sch)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops")</div><div class='add'>+struct Qdisc_ops fifo = {</div><div class='add'>+	.enqueue   = (void *)bpf_fifo_enqueue,</div><div class='add'>+	.dequeue   = (void *)bpf_fifo_dequeue,</div><div class='add'>+	.init      = (void *)bpf_fifo_init,</div><div class='add'>+	.reset     = (void *)bpf_fifo_reset,</div><div class='add'>+	.destroy   = (void *)bpf_fifo_destroy,</div><div class='add'>+	.id        = "bpf_fifo",</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_qdisc_fq.c b/tools/testing/selftests/bpf/progs/bpf_qdisc_fq.c<br/>new file mode 100644<br/>index 000000000000..1a3233a275c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_qdisc_fq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_qdisc_fq.c</a></div><div class='hunk'>@@ -0,0 +1,756 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/* bpf_fq is intended for testing the bpf qdisc infrastructure and not a direct</div><div class='add'>+ * copy of sch_fq. bpf_fq implements the scheduling algorithm of sch_fq before</div><div class='add'>+ * 29f834aa326e ("net_sched: sch_fq: add 3 bands and WRR scheduling") was</div><div class='add'>+ * introduced. It gives each flow a fair chance to transmit packets in a</div><div class='add'>+ * round-robin fashion. Note that for flow pacing, bpf_fq currently only</div><div class='add'>+ * respects skb-&gt;tstamp but not skb-&gt;sk-&gt;sk_pacing_rate. In addition, if there</div><div class='add'>+ * are multiple bpf_fq instances, they will have a shared view of flows and</div><div class='add'>+ * configuration since some key data structure such as fq_prio_flows,</div><div class='add'>+ * fq_nonprio_flows, and fq_bpf_data are global.</div><div class='add'>+ *</div><div class='add'>+ * To use bpf_fq alone without running selftests, use the following commands.</div><div class='add'>+ *</div><div class='add'>+ * 1. Register bpf_fq to the kernel</div><div class='add'>+ *     bpftool struct_ops register bpf_qdisc_fq.bpf.o /sys/fs/bpf</div><div class='add'>+ * 2. Add bpf_fq to an interface</div><div class='add'>+ *     tc qdisc add dev &lt;interface name&gt; root handle &lt;handle&gt; bpf_fq</div><div class='add'>+ * 3. Delete bpf_fq attached to the interface</div><div class='add'>+ *     tc qdisc delete dev &lt;interface name&gt; root</div><div class='add'>+ * 4. Unregister bpf_fq</div><div class='add'>+ *     bpftool struct_ops unregister name fq</div><div class='add'>+ *</div><div class='add'>+ * The qdisc name, bpf_fq, used in tc commands is defined by Qdisc_ops.id.</div><div class='add'>+ * The struct_ops_map_name, fq, used in the bpftool command is the name of the</div><div class='add'>+ * Qdisc_ops.</div><div class='add'>+ *</div><div class='add'>+ * SEC(".struct_ops")</div><div class='add'>+ * struct Qdisc_ops fq = {</div><div class='add'>+ *         ...</div><div class='add'>+ *         .id        = "bpf_fq",</div><div class='add'>+ * };</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+#include "bpf_qdisc_common.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+#define NSEC_PER_USEC 1000L</div><div class='add'>+#define NSEC_PER_SEC 1000000000L</div><div class='add'>+</div><div class='add'>+#define NUM_QUEUE (1 &lt;&lt; 20)</div><div class='add'>+</div><div class='add'>+struct fq_bpf_data {</div><div class='add'>+	u32 quantum;</div><div class='add'>+	u32 initial_quantum;</div><div class='add'>+	u32 flow_refill_delay;</div><div class='add'>+	u32 flow_plimit;</div><div class='add'>+	u64 horizon;</div><div class='add'>+	u32 orphan_mask;</div><div class='add'>+	u32 timer_slack;</div><div class='add'>+	u64 time_next_delayed_flow;</div><div class='add'>+	u64 unthrottle_latency_ns;</div><div class='add'>+	u8 horizon_drop;</div><div class='add'>+	u32 new_flow_cnt;</div><div class='add'>+	u32 old_flow_cnt;</div><div class='add'>+	u64 ktime_cache;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CLS_RET_PRIO	= 0,</div><div class='add'>+	CLS_RET_NONPRIO = 1,</div><div class='add'>+	CLS_RET_ERR	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct skb_node {</div><div class='add'>+	u64 tstamp;</div><div class='add'>+	struct sk_buff __kptr * skb;</div><div class='add'>+	struct bpf_rb_node node;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fq_flow_node {</div><div class='add'>+	int credit;</div><div class='add'>+	u32 qlen;</div><div class='add'>+	u64 age;</div><div class='add'>+	u64 time_next_packet;</div><div class='add'>+	struct bpf_list_node list_node;</div><div class='add'>+	struct bpf_rb_node rb_node;</div><div class='add'>+	struct bpf_rb_root queue __contains(skb_node, node);</div><div class='add'>+	struct bpf_spin_lock lock;</div><div class='add'>+	struct bpf_refcount refcount;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dequeue_nonprio_ctx {</div><div class='add'>+	bool stop_iter;</div><div class='add'>+	u64 expire;</div><div class='add'>+	u64 now;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct remove_flows_ctx {</div><div class='add'>+	bool gc_only;</div><div class='add'>+	u32 reset_cnt;</div><div class='add'>+	u32 reset_max;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct unset_throttled_flows_ctx {</div><div class='add'>+	bool unset_all;</div><div class='add'>+	u64 now;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fq_stashed_flow {</div><div class='add'>+	struct fq_flow_node __kptr * flow;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__type(key, __u64);</div><div class='add'>+	__type(value, struct fq_stashed_flow);</div><div class='add'>+	__uint(max_entries, NUM_QUEUE);</div><div class='add'>+} fq_nonprio_flows SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__type(key, __u64);</div><div class='add'>+	__type(value, struct fq_stashed_flow);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+} fq_prio_flows SEC(".maps");</div><div class='add'>+</div><div class='add'>+private(A) struct bpf_spin_lock fq_delayed_lock;</div><div class='add'>+private(A) struct bpf_rb_root fq_delayed __contains(fq_flow_node, rb_node);</div><div class='add'>+</div><div class='add'>+private(B) struct bpf_spin_lock fq_new_flows_lock;</div><div class='add'>+private(B) struct bpf_list_head fq_new_flows __contains(fq_flow_node, list_node);</div><div class='add'>+</div><div class='add'>+private(C) struct bpf_spin_lock fq_old_flows_lock;</div><div class='add'>+private(C) struct bpf_list_head fq_old_flows __contains(fq_flow_node, list_node);</div><div class='add'>+</div><div class='add'>+private(D) struct fq_bpf_data q;</div><div class='add'>+</div><div class='add'>+/* Wrapper for bpf_kptr_xchg that expects NULL dst */</div><div class='add'>+static void bpf_kptr_xchg_back(void *map_val, void *ptr)</div><div class='add'>+{</div><div class='add'>+	void *ret;</div><div class='add'>+</div><div class='add'>+	ret = bpf_kptr_xchg(map_val, ptr);</div><div class='add'>+	if (ret)</div><div class='add'>+		bpf_obj_drop(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool skbn_tstamp_less(struct bpf_rb_node *a, const struct bpf_rb_node *b)</div><div class='add'>+{</div><div class='add'>+	struct skb_node *skbn_a;</div><div class='add'>+	struct skb_node *skbn_b;</div><div class='add'>+</div><div class='add'>+	skbn_a = container_of(a, struct skb_node, node);</div><div class='add'>+	skbn_b = container_of(b, struct skb_node, node);</div><div class='add'>+</div><div class='add'>+	return skbn_a-&gt;tstamp &lt; skbn_b-&gt;tstamp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool fn_time_next_packet_less(struct bpf_rb_node *a, const struct bpf_rb_node *b)</div><div class='add'>+{</div><div class='add'>+	struct fq_flow_node *flow_a;</div><div class='add'>+	struct fq_flow_node *flow_b;</div><div class='add'>+</div><div class='add'>+	flow_a = container_of(a, struct fq_flow_node, rb_node);</div><div class='add'>+	flow_b = container_of(b, struct fq_flow_node, rb_node);</div><div class='add'>+</div><div class='add'>+	return flow_a-&gt;time_next_packet &lt; flow_b-&gt;time_next_packet;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+fq_flows_add_head(struct bpf_list_head *head, struct bpf_spin_lock *lock,</div><div class='add'>+		  struct fq_flow_node *flow, u32 *flow_cnt)</div><div class='add'>+{</div><div class='add'>+	bpf_spin_lock(lock);</div><div class='add'>+	bpf_list_push_front(head, &amp;flow-&gt;list_node);</div><div class='add'>+	bpf_spin_unlock(lock);</div><div class='add'>+	*flow_cnt += 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+fq_flows_add_tail(struct bpf_list_head *head, struct bpf_spin_lock *lock,</div><div class='add'>+		  struct fq_flow_node *flow, u32 *flow_cnt)</div><div class='add'>+{</div><div class='add'>+	bpf_spin_lock(lock);</div><div class='add'>+	bpf_list_push_back(head, &amp;flow-&gt;list_node);</div><div class='add'>+	bpf_spin_unlock(lock);</div><div class='add'>+	*flow_cnt += 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+fq_flows_remove_front(struct bpf_list_head *head, struct bpf_spin_lock *lock,</div><div class='add'>+		      struct bpf_list_node **node, u32 *flow_cnt)</div><div class='add'>+{</div><div class='add'>+	bpf_spin_lock(lock);</div><div class='add'>+	*node = bpf_list_pop_front(head);</div><div class='add'>+	bpf_spin_unlock(lock);</div><div class='add'>+	*flow_cnt -= 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+fq_flows_is_empty(struct bpf_list_head *head, struct bpf_spin_lock *lock)</div><div class='add'>+{</div><div class='add'>+	struct bpf_list_node *node;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(lock);</div><div class='add'>+	node = bpf_list_pop_front(head);</div><div class='add'>+	if (node) {</div><div class='add'>+		bpf_list_push_front(head, node);</div><div class='add'>+		bpf_spin_unlock(lock);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	bpf_spin_unlock(lock);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* flow-&gt;age is used to denote the state of the flow (not-detached, detached, throttled)</div><div class='add'>+ * as well as the timestamp when the flow is detached.</div><div class='add'>+ *</div><div class='add'>+ * 0: not-detached</div><div class='add'>+ * 1 - (~0ULL-1): detached</div><div class='add'>+ * ~0ULL: throttled</div><div class='add'>+ */</div><div class='add'>+static void fq_flow_set_detached(struct fq_flow_node *flow)</div><div class='add'>+{</div><div class='add'>+	flow-&gt;age = bpf_jiffies64();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool fq_flow_is_detached(struct fq_flow_node *flow)</div><div class='add'>+{</div><div class='add'>+	return flow-&gt;age != 0 &amp;&amp; flow-&gt;age != ~0ULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool sk_listener(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return (1 &lt;&lt; sk-&gt;__sk_common.skc_state) &amp; (TCPF_LISTEN | TCPF_NEW_SYN_RECV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fq_gc(void);</div><div class='add'>+</div><div class='add'>+static int fq_new_flow(void *flow_map, struct fq_stashed_flow **sflow, u64 hash)</div><div class='add'>+{</div><div class='add'>+	struct fq_stashed_flow tmp = {};</div><div class='add'>+	struct fq_flow_node *flow;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	flow = bpf_obj_new(typeof(*flow));</div><div class='add'>+	if (!flow)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	flow-&gt;credit = q.initial_quantum,</div><div class='add'>+	flow-&gt;qlen = 0,</div><div class='add'>+	flow-&gt;age = 1,</div><div class='add'>+	flow-&gt;time_next_packet = 0,</div><div class='add'>+</div><div class='add'>+	ret = bpf_map_update_elem(flow_map, &amp;hash, &amp;tmp, 0);</div><div class='add'>+	if (ret == -ENOMEM || ret == -E2BIG) {</div><div class='add'>+		fq_gc();</div><div class='add'>+		bpf_map_update_elem(&amp;fq_nonprio_flows, &amp;hash, &amp;tmp, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*sflow = bpf_map_lookup_elem(flow_map, &amp;hash);</div><div class='add'>+	if (!*sflow) {</div><div class='add'>+		bpf_obj_drop(flow);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_kptr_xchg_back(&amp;(*sflow)-&gt;flow, flow);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+fq_classify(struct sk_buff *skb, struct fq_stashed_flow **sflow)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = skb-&gt;sk;</div><div class='add'>+	int ret = CLS_RET_NONPRIO;</div><div class='add'>+	u64 hash = 0;</div><div class='add'>+</div><div class='add'>+	if ((skb-&gt;priority &amp; TC_PRIO_MAX) == TC_PRIO_CONTROL) {</div><div class='add'>+		*sflow = bpf_map_lookup_elem(&amp;fq_prio_flows, &amp;hash);</div><div class='add'>+		ret = CLS_RET_PRIO;</div><div class='add'>+	} else {</div><div class='add'>+		if (!sk || sk_listener(sk)) {</div><div class='add'>+			hash = bpf_skb_get_hash(skb) &amp; q.orphan_mask;</div><div class='add'>+			/* Avoid collision with an existing flow hash, which</div><div class='add'>+			 * only uses the lower 32 bits of hash, by setting the</div><div class='add'>+			 * upper half of hash to 1.</div><div class='add'>+			 */</div><div class='add'>+			hash |= (1ULL &lt;&lt; 32);</div><div class='add'>+		} else if (sk-&gt;__sk_common.skc_state == TCP_CLOSE) {</div><div class='add'>+			hash = bpf_skb_get_hash(skb) &amp; q.orphan_mask;</div><div class='add'>+			hash |= (1ULL &lt;&lt; 32);</div><div class='add'>+		} else {</div><div class='add'>+			hash = sk-&gt;__sk_common.skc_hash;</div><div class='add'>+		}</div><div class='add'>+		*sflow = bpf_map_lookup_elem(&amp;fq_nonprio_flows, &amp;hash);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!*sflow)</div><div class='add'>+		ret = fq_new_flow(&amp;fq_nonprio_flows, sflow, hash) &lt; 0 ?</div><div class='add'>+		      CLS_RET_ERR : CLS_RET_NONPRIO;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool fq_packet_beyond_horizon(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return (s64)skb-&gt;tstamp &gt; (s64)(q.ktime_cache + q.horizon);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops/bpf_fq_enqueue")</div><div class='add'>+int BPF_PROG(bpf_fq_enqueue, struct sk_buff *skb, struct Qdisc *sch,</div><div class='add'>+	     struct bpf_sk_buff_ptr *to_free)</div><div class='add'>+{</div><div class='add'>+	struct fq_flow_node *flow = NULL, *flow_copy;</div><div class='add'>+	struct fq_stashed_flow *sflow;</div><div class='add'>+	u64 time_to_send, jiffies;</div><div class='add'>+	struct skb_node *skbn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (sch-&gt;q.qlen &gt;= sch-&gt;limit)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (!skb-&gt;tstamp) {</div><div class='add'>+		time_to_send = q.ktime_cache = bpf_ktime_get_ns();</div><div class='add'>+	} else {</div><div class='add'>+		if (fq_packet_beyond_horizon(skb)) {</div><div class='add'>+			q.ktime_cache = bpf_ktime_get_ns();</div><div class='add'>+			if (fq_packet_beyond_horizon(skb)) {</div><div class='add'>+				if (q.horizon_drop)</div><div class='add'>+					goto drop;</div><div class='add'>+</div><div class='add'>+				skb-&gt;tstamp = q.ktime_cache + q.horizon;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		time_to_send = skb-&gt;tstamp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = fq_classify(skb, &amp;sflow);</div><div class='add'>+	if (ret == CLS_RET_ERR)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	flow = bpf_kptr_xchg(&amp;sflow-&gt;flow, flow);</div><div class='add'>+	if (!flow)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (ret == CLS_RET_NONPRIO) {</div><div class='add'>+		if (flow-&gt;qlen &gt;= q.flow_plimit) {</div><div class='add'>+			bpf_kptr_xchg_back(&amp;sflow-&gt;flow, flow);</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (fq_flow_is_detached(flow)) {</div><div class='add'>+			flow_copy = bpf_refcount_acquire(flow);</div><div class='add'>+</div><div class='add'>+			jiffies = bpf_jiffies64();</div><div class='add'>+			if ((s64)(jiffies - (flow_copy-&gt;age + q.flow_refill_delay)) &gt; 0) {</div><div class='add'>+				if (flow_copy-&gt;credit &lt; q.quantum)</div><div class='add'>+					flow_copy-&gt;credit = q.quantum;</div><div class='add'>+			}</div><div class='add'>+			flow_copy-&gt;age = 0;</div><div class='add'>+			fq_flows_add_tail(&amp;fq_new_flows, &amp;fq_new_flows_lock, flow_copy,</div><div class='add'>+					  &amp;q.new_flow_cnt);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skbn = bpf_obj_new(typeof(*skbn));</div><div class='add'>+	if (!skbn) {</div><div class='add'>+		bpf_kptr_xchg_back(&amp;sflow-&gt;flow, flow);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skbn-&gt;tstamp = skb-&gt;tstamp = time_to_send;</div><div class='add'>+</div><div class='add'>+	sch-&gt;qstats.backlog += qdisc_pkt_len(skb);</div><div class='add'>+</div><div class='add'>+	skb = bpf_kptr_xchg(&amp;skbn-&gt;skb, skb);</div><div class='add'>+	if (skb)</div><div class='add'>+		bpf_qdisc_skb_drop(skb, to_free);</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;flow-&gt;lock);</div><div class='add'>+	bpf_rbtree_add(&amp;flow-&gt;queue, &amp;skbn-&gt;node, skbn_tstamp_less);</div><div class='add'>+	bpf_spin_unlock(&amp;flow-&gt;lock);</div><div class='add'>+</div><div class='add'>+	flow-&gt;qlen++;</div><div class='add'>+	bpf_kptr_xchg_back(&amp;sflow-&gt;flow, flow);</div><div class='add'>+</div><div class='add'>+	sch-&gt;q.qlen++;</div><div class='add'>+	return NET_XMIT_SUCCESS;</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	bpf_qdisc_skb_drop(skb, to_free);</div><div class='add'>+	sch-&gt;qstats.drops++;</div><div class='add'>+	return NET_XMIT_DROP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fq_unset_throttled_flows(u32 index, struct unset_throttled_flows_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_rb_node *node = NULL;</div><div class='add'>+	struct fq_flow_node *flow;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;fq_delayed_lock);</div><div class='add'>+</div><div class='add'>+	node = bpf_rbtree_first(&amp;fq_delayed);</div><div class='add'>+	if (!node) {</div><div class='add'>+		bpf_spin_unlock(&amp;fq_delayed_lock);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flow = container_of(node, struct fq_flow_node, rb_node);</div><div class='add'>+	if (!ctx-&gt;unset_all &amp;&amp; flow-&gt;time_next_packet &gt; ctx-&gt;now) {</div><div class='add'>+		q.time_next_delayed_flow = flow-&gt;time_next_packet;</div><div class='add'>+		bpf_spin_unlock(&amp;fq_delayed_lock);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node = bpf_rbtree_remove(&amp;fq_delayed, &amp;flow-&gt;rb_node);</div><div class='add'>+</div><div class='add'>+	bpf_spin_unlock(&amp;fq_delayed_lock);</div><div class='add'>+</div><div class='add'>+	if (!node)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	flow = container_of(node, struct fq_flow_node, rb_node);</div><div class='add'>+	flow-&gt;age = 0;</div><div class='add'>+	fq_flows_add_tail(&amp;fq_old_flows, &amp;fq_old_flows_lock, flow, &amp;q.old_flow_cnt);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fq_flow_set_throttled(struct fq_flow_node *flow)</div><div class='add'>+{</div><div class='add'>+	flow-&gt;age = ~0ULL;</div><div class='add'>+</div><div class='add'>+	if (q.time_next_delayed_flow &gt; flow-&gt;time_next_packet)</div><div class='add'>+		q.time_next_delayed_flow = flow-&gt;time_next_packet;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;fq_delayed_lock);</div><div class='add'>+	bpf_rbtree_add(&amp;fq_delayed, &amp;flow-&gt;rb_node, fn_time_next_packet_less);</div><div class='add'>+	bpf_spin_unlock(&amp;fq_delayed_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fq_check_throttled(u64 now)</div><div class='add'>+{</div><div class='add'>+	struct unset_throttled_flows_ctx ctx = {</div><div class='add'>+		.unset_all = false,</div><div class='add'>+		.now = now,</div><div class='add'>+	};</div><div class='add'>+	unsigned long sample;</div><div class='add'>+</div><div class='add'>+	if (q.time_next_delayed_flow &gt; now)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sample = (unsigned long)(now - q.time_next_delayed_flow);</div><div class='add'>+	q.unthrottle_latency_ns -= q.unthrottle_latency_ns &gt;&gt; 3;</div><div class='add'>+	q.unthrottle_latency_ns += sample &gt;&gt; 3;</div><div class='add'>+</div><div class='add'>+	q.time_next_delayed_flow = ~0ULL;</div><div class='add'>+	bpf_loop(NUM_QUEUE, fq_unset_throttled_flows, &amp;ctx, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff*</div><div class='add'>+fq_dequeue_nonprio_flows(u32 index, struct dequeue_nonprio_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	u64 time_next_packet, time_to_send;</div><div class='add'>+	struct bpf_rb_node *rb_node;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct bpf_list_head *head;</div><div class='add'>+	struct bpf_list_node *node;</div><div class='add'>+	struct bpf_spin_lock *lock;</div><div class='add'>+	struct fq_flow_node *flow;</div><div class='add'>+	struct skb_node *skbn;</div><div class='add'>+	bool is_empty;</div><div class='add'>+	u32 *cnt;</div><div class='add'>+</div><div class='add'>+	if (q.new_flow_cnt) {</div><div class='add'>+		head = &amp;fq_new_flows;</div><div class='add'>+		lock = &amp;fq_new_flows_lock;</div><div class='add'>+		cnt = &amp;q.new_flow_cnt;</div><div class='add'>+	} else if (q.old_flow_cnt) {</div><div class='add'>+		head = &amp;fq_old_flows;</div><div class='add'>+		lock = &amp;fq_old_flows_lock;</div><div class='add'>+		cnt = &amp;q.old_flow_cnt;</div><div class='add'>+	} else {</div><div class='add'>+		if (q.time_next_delayed_flow != ~0ULL)</div><div class='add'>+			ctx-&gt;expire = q.time_next_delayed_flow;</div><div class='add'>+		goto break_loop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fq_flows_remove_front(head, lock, &amp;node, cnt);</div><div class='add'>+	if (!node)</div><div class='add'>+		goto break_loop;</div><div class='add'>+</div><div class='add'>+	flow = container_of(node, struct fq_flow_node, list_node);</div><div class='add'>+	if (flow-&gt;credit &lt;= 0) {</div><div class='add'>+		flow-&gt;credit += q.quantum;</div><div class='add'>+		fq_flows_add_tail(&amp;fq_old_flows, &amp;fq_old_flows_lock, flow, &amp;q.old_flow_cnt);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;flow-&gt;lock);</div><div class='add'>+	rb_node = bpf_rbtree_first(&amp;flow-&gt;queue);</div><div class='add'>+	if (!rb_node) {</div><div class='add'>+		bpf_spin_unlock(&amp;flow-&gt;lock);</div><div class='add'>+		is_empty = fq_flows_is_empty(&amp;fq_old_flows, &amp;fq_old_flows_lock);</div><div class='add'>+		if (head == &amp;fq_new_flows &amp;&amp; !is_empty) {</div><div class='add'>+			fq_flows_add_tail(&amp;fq_old_flows, &amp;fq_old_flows_lock, flow, &amp;q.old_flow_cnt);</div><div class='add'>+		} else {</div><div class='add'>+			fq_flow_set_detached(flow);</div><div class='add'>+			bpf_obj_drop(flow);</div><div class='add'>+		}</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skbn = container_of(rb_node, struct skb_node, node);</div><div class='add'>+	time_to_send = skbn-&gt;tstamp;</div><div class='add'>+</div><div class='add'>+	time_next_packet = (time_to_send &gt; flow-&gt;time_next_packet) ?</div><div class='add'>+		time_to_send : flow-&gt;time_next_packet;</div><div class='add'>+	if (ctx-&gt;now &lt; time_next_packet) {</div><div class='add'>+		bpf_spin_unlock(&amp;flow-&gt;lock);</div><div class='add'>+		flow-&gt;time_next_packet = time_next_packet;</div><div class='add'>+		fq_flow_set_throttled(flow);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rb_node = bpf_rbtree_remove(&amp;flow-&gt;queue, rb_node);</div><div class='add'>+	bpf_spin_unlock(&amp;flow-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!rb_node)</div><div class='add'>+		goto add_flow_and_break;</div><div class='add'>+</div><div class='add'>+	skbn = container_of(rb_node, struct skb_node, node);</div><div class='add'>+	skb = bpf_kptr_xchg(&amp;skbn-&gt;skb, skb);</div><div class='add'>+	bpf_obj_drop(skbn);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto add_flow_and_break;</div><div class='add'>+</div><div class='add'>+	flow-&gt;credit -= qdisc_skb_cb(skb)-&gt;pkt_len;</div><div class='add'>+	flow-&gt;qlen--;</div><div class='add'>+</div><div class='add'>+add_flow_and_break:</div><div class='add'>+	fq_flows_add_head(head, lock, flow, cnt);</div><div class='add'>+</div><div class='add'>+break_loop:</div><div class='add'>+	ctx-&gt;stop_iter = true;</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *fq_dequeue_prio(void)</div><div class='add'>+{</div><div class='add'>+	struct fq_flow_node *flow = NULL;</div><div class='add'>+	struct fq_stashed_flow *sflow;</div><div class='add'>+	struct bpf_rb_node *rb_node;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct skb_node *skbn;</div><div class='add'>+	u64 hash = 0;</div><div class='add'>+</div><div class='add'>+	sflow = bpf_map_lookup_elem(&amp;fq_prio_flows, &amp;hash);</div><div class='add'>+	if (!sflow)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	flow = bpf_kptr_xchg(&amp;sflow-&gt;flow, flow);</div><div class='add'>+	if (!flow)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;flow-&gt;lock);</div><div class='add'>+	rb_node = bpf_rbtree_first(&amp;flow-&gt;queue);</div><div class='add'>+	if (!rb_node) {</div><div class='add'>+		bpf_spin_unlock(&amp;flow-&gt;lock);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skbn = container_of(rb_node, struct skb_node, node);</div><div class='add'>+	rb_node = bpf_rbtree_remove(&amp;flow-&gt;queue, &amp;skbn-&gt;node);</div><div class='add'>+	bpf_spin_unlock(&amp;flow-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!rb_node)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skbn = container_of(rb_node, struct skb_node, node);</div><div class='add'>+	skb = bpf_kptr_xchg(&amp;skbn-&gt;skb, skb);</div><div class='add'>+	bpf_obj_drop(skbn);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	bpf_kptr_xchg_back(&amp;sflow-&gt;flow, flow);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops/bpf_fq_dequeue")</div><div class='add'>+struct sk_buff *BPF_PROG(bpf_fq_dequeue, struct Qdisc *sch)</div><div class='add'>+{</div><div class='add'>+	struct dequeue_nonprio_ctx cb_ctx = {};</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!sch-&gt;q.qlen)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	skb = fq_dequeue_prio();</div><div class='add'>+	if (skb)</div><div class='add'>+		goto dequeue;</div><div class='add'>+</div><div class='add'>+	q.ktime_cache = cb_ctx.now = bpf_ktime_get_ns();</div><div class='add'>+	fq_check_throttled(q.ktime_cache);</div><div class='add'>+	bpf_for(i, 0, sch-&gt;limit) {</div><div class='add'>+		skb = fq_dequeue_nonprio_flows(i, &amp;cb_ctx);</div><div class='add'>+		if (cb_ctx.stop_iter)</div><div class='add'>+			break;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (skb) {</div><div class='add'>+dequeue:</div><div class='add'>+		sch-&gt;q.qlen--;</div><div class='add'>+		sch-&gt;qstats.backlog -= qdisc_pkt_len(skb);</div><div class='add'>+		bpf_qdisc_bstats_update(sch, skb);</div><div class='add'>+		return skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cb_ctx.expire)</div><div class='add'>+		bpf_qdisc_watchdog_schedule(sch, cb_ctx.expire, q.timer_slack);</div><div class='add'>+out:</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fq_remove_flows_in_list(u32 index, void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_list_node *node;</div><div class='add'>+	struct fq_flow_node *flow;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;fq_new_flows_lock);</div><div class='add'>+	node = bpf_list_pop_front(&amp;fq_new_flows);</div><div class='add'>+	bpf_spin_unlock(&amp;fq_new_flows_lock);</div><div class='add'>+	if (!node) {</div><div class='add'>+		bpf_spin_lock(&amp;fq_old_flows_lock);</div><div class='add'>+		node = bpf_list_pop_front(&amp;fq_old_flows);</div><div class='add'>+		bpf_spin_unlock(&amp;fq_old_flows_lock);</div><div class='add'>+		if (!node)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flow = container_of(node, struct fq_flow_node, list_node);</div><div class='add'>+	bpf_obj_drop(flow);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern unsigned CONFIG_HZ __kconfig;</div><div class='add'>+</div><div class='add'>+/* limit number of collected flows per round */</div><div class='add'>+#define FQ_GC_MAX 8</div><div class='add'>+#define FQ_GC_AGE (3*CONFIG_HZ)</div><div class='add'>+</div><div class='add'>+static bool fq_gc_candidate(struct fq_flow_node *flow)</div><div class='add'>+{</div><div class='add'>+	u64 jiffies = bpf_jiffies64();</div><div class='add'>+</div><div class='add'>+	return fq_flow_is_detached(flow) &amp;&amp;</div><div class='add'>+	       ((s64)(jiffies - (flow-&gt;age + FQ_GC_AGE)) &gt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+fq_remove_flows(struct bpf_map *flow_map, u64 *hash,</div><div class='add'>+		struct fq_stashed_flow *sflow, struct remove_flows_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	if (sflow-&gt;flow &amp;&amp;</div><div class='add'>+	    (!ctx-&gt;gc_only || fq_gc_candidate(sflow-&gt;flow))) {</div><div class='add'>+		bpf_map_delete_elem(flow_map, hash);</div><div class='add'>+		ctx-&gt;reset_cnt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ctx-&gt;reset_cnt &lt; ctx-&gt;reset_max ? 0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fq_gc(void)</div><div class='add'>+{</div><div class='add'>+	struct remove_flows_ctx cb_ctx = {</div><div class='add'>+		.gc_only = true,</div><div class='add'>+		.reset_cnt = 0,</div><div class='add'>+		.reset_max = FQ_GC_MAX,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	bpf_for_each_map_elem(&amp;fq_nonprio_flows, fq_remove_flows, &amp;cb_ctx, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops/bpf_fq_reset")</div><div class='add'>+void BPF_PROG(bpf_fq_reset, struct Qdisc *sch)</div><div class='add'>+{</div><div class='add'>+	struct unset_throttled_flows_ctx utf_ctx = {</div><div class='add'>+		.unset_all = true,</div><div class='add'>+	};</div><div class='add'>+	struct remove_flows_ctx rf_ctx = {</div><div class='add'>+		.gc_only = false,</div><div class='add'>+		.reset_cnt = 0,</div><div class='add'>+		.reset_max = NUM_QUEUE,</div><div class='add'>+	};</div><div class='add'>+	struct fq_stashed_flow *sflow;</div><div class='add'>+	u64 hash = 0;</div><div class='add'>+</div><div class='add'>+	sch-&gt;q.qlen = 0;</div><div class='add'>+	sch-&gt;qstats.backlog = 0;</div><div class='add'>+</div><div class='add'>+	bpf_for_each_map_elem(&amp;fq_nonprio_flows, fq_remove_flows, &amp;rf_ctx, 0);</div><div class='add'>+</div><div class='add'>+	rf_ctx.reset_cnt = 0;</div><div class='add'>+	bpf_for_each_map_elem(&amp;fq_prio_flows, fq_remove_flows, &amp;rf_ctx, 0);</div><div class='add'>+	fq_new_flow(&amp;fq_prio_flows, &amp;sflow, hash);</div><div class='add'>+</div><div class='add'>+	bpf_loop(NUM_QUEUE, fq_remove_flows_in_list, NULL, 0);</div><div class='add'>+	q.new_flow_cnt = 0;</div><div class='add'>+	q.old_flow_cnt = 0;</div><div class='add'>+</div><div class='add'>+	bpf_loop(NUM_QUEUE, fq_unset_throttled_flows, &amp;utf_ctx, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops/bpf_fq_init")</div><div class='add'>+int BPF_PROG(bpf_fq_init, struct Qdisc *sch, struct nlattr *opt,</div><div class='add'>+	     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = sch-&gt;dev_queue-&gt;dev;</div><div class='add'>+	u32 psched_mtu = dev-&gt;mtu + dev-&gt;hard_header_len;</div><div class='add'>+	struct fq_stashed_flow *sflow;</div><div class='add'>+	u64 hash = 0;</div><div class='add'>+</div><div class='add'>+	if (fq_new_flow(&amp;fq_prio_flows, &amp;sflow, hash) &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sch-&gt;limit = 10000;</div><div class='add'>+	q.initial_quantum = 10 * psched_mtu;</div><div class='add'>+	q.quantum = 2 * psched_mtu;</div><div class='add'>+	q.flow_refill_delay = 40;</div><div class='add'>+	q.flow_plimit = 100;</div><div class='add'>+	q.horizon = 10ULL * NSEC_PER_SEC;</div><div class='add'>+	q.horizon_drop = 1;</div><div class='add'>+	q.orphan_mask = 1024 - 1;</div><div class='add'>+	q.timer_slack = 10 * NSEC_PER_USEC;</div><div class='add'>+	q.time_next_delayed_flow = ~0ULL;</div><div class='add'>+	q.unthrottle_latency_ns = 0ULL;</div><div class='add'>+	q.new_flow_cnt = 0;</div><div class='add'>+	q.old_flow_cnt = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops")</div><div class='add'>+void BPF_PROG(bpf_fq_destroy, struct Qdisc *sch)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops")</div><div class='add'>+struct Qdisc_ops fq = {</div><div class='add'>+	.enqueue   = (void *)bpf_fq_enqueue,</div><div class='add'>+	.dequeue   = (void *)bpf_fq_dequeue,</div><div class='add'>+	.reset     = (void *)bpf_fq_reset,</div><div class='add'>+	.init      = (void *)bpf_fq_init,</div><div class='add'>+	.destroy   = (void *)bpf_fq_destroy,</div><div class='add'>+	.id        = "bpf_fq",</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_smc.c b/tools/testing/selftests/bpf/progs/bpf_smc.c<br/>new file mode 100644<br/>index 000000000000..70d8b08f5914<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_smc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_smc.c</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_tracing_net.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BPF_SMC_LISTEN	= 10,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct smc_sock___local {</div><div class='add'>+	struct sock sk;</div><div class='add'>+	struct smc_sock *listen_smc;</div><div class='add'>+	bool use_fallback;</div><div class='add'>+} __attribute__((preserve_access_index));</div><div class='add'>+</div><div class='add'>+int smc_cnt = 0;</div><div class='add'>+int fallback_cnt = 0;</div><div class='add'>+</div><div class='add'>+SEC("fentry/smc_release")</div><div class='add'>+int BPF_PROG(bpf_smc_release, struct socket *sock)</div><div class='add'>+{</div><div class='add'>+	/* only count from one side (client) */</div><div class='add'>+	if (sock-&gt;sk-&gt;__sk_common.skc_state == BPF_SMC_LISTEN)</div><div class='add'>+		return 0;</div><div class='add'>+	smc_cnt++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry/smc_switch_to_fallback")</div><div class='add'>+int BPF_PROG(bpf_smc_switch_to_fallback, struct smc_sock___local *smc)</div><div class='add'>+{</div><div class='add'>+	/* only count from one side (client) */</div><div class='add'>+	if (smc &amp;&amp; !smc-&gt;listen_smc)</div><div class='add'>+		fallback_cnt++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* go with default value if no strat was found */</div><div class='add'>+bool default_ip_strat_value = true;</div><div class='add'>+</div><div class='add'>+struct smc_policy_ip_key {</div><div class='add'>+	__u32	sip;</div><div class='add'>+	__u32	dip;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct smc_policy_ip_value {</div><div class='add'>+	__u8	mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__uint(key_size, sizeof(struct smc_policy_ip_key));</div><div class='add'>+	__uint(value_size, sizeof(struct smc_policy_ip_value));</div><div class='add'>+	__uint(max_entries, 128);</div><div class='add'>+	__uint(map_flags, BPF_F_NO_PREALLOC);</div><div class='add'>+} smc_policy_ip SEC(".maps");</div><div class='add'>+</div><div class='add'>+static bool smc_check(__u32 src, __u32 dst)</div><div class='add'>+{</div><div class='add'>+	struct smc_policy_ip_value *value;</div><div class='add'>+	struct smc_policy_ip_key key = {</div><div class='add'>+		.sip = src,</div><div class='add'>+		.dip = dst,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	value = bpf_map_lookup_elem(&amp;smc_policy_ip, &amp;key);</div><div class='add'>+	return value ? value-&gt;mode : default_ip_strat_value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fmod_ret/update_socket_protocol")</div><div class='add'>+int BPF_PROG(smc_run, int family, int type, int protocol)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+</div><div class='add'>+	if (family != AF_INET &amp;&amp; family != AF_INET6)</div><div class='add'>+		return protocol;</div><div class='add'>+</div><div class='add'>+	if ((type &amp; 0xf) != SOCK_STREAM)</div><div class='add'>+		return protocol;</div><div class='add'>+</div><div class='add'>+	if (protocol != 0 &amp;&amp; protocol != IPPROTO_TCP)</div><div class='add'>+		return protocol;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	/* Prevent from affecting other tests */</div><div class='add'>+	if (!task || !task-&gt;nsproxy-&gt;net_ns-&gt;smc.hs_ctrl)</div><div class='add'>+		return protocol;</div><div class='add'>+</div><div class='add'>+	return IPPROTO_SMC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops")</div><div class='add'>+int BPF_PROG(bpf_smc_set_tcp_option_cond, const struct tcp_sock *tp,</div><div class='add'>+	     struct inet_request_sock *ireq)</div><div class='add'>+{</div><div class='add'>+	return smc_check(ireq-&gt;req.__req_common.skc_daddr,</div><div class='add'>+			 ireq-&gt;req.__req_common.skc_rcv_saddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("struct_ops")</div><div class='add'>+int BPF_PROG(bpf_smc_set_tcp_option, struct tcp_sock *tp)</div><div class='add'>+{</div><div class='add'>+	return smc_check(tp-&gt;inet_conn.icsk_inet.sk.__sk_common.skc_rcv_saddr,</div><div class='add'>+			 tp-&gt;inet_conn.icsk_inet.sk.__sk_common.skc_daddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops")</div><div class='add'>+struct smc_hs_ctrl  linkcheck = {</div><div class='add'>+	.name		= "linkcheck",</div><div class='add'>+	.syn_option	= (void *)bpf_smc_set_tcp_option,</div><div class='add'>+	.synack_option	= (void *)bpf_smc_set_tcp_option_cond,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_test_utils.h b/tools/testing/selftests/bpf/progs/bpf_test_utils.h<br/>new file mode 100644<br/>index 000000000000..f4e67b492dd2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_test_utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_test_utils.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __BPF_TEST_UTILS_H__</div><div class='add'>+#define __BPF_TEST_UTILS_H__</div><div class='add'>+</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+/* Clobber as many native registers and stack slots as possible. */</div><div class='add'>+static __always_inline void clobber_regs_stack(void)</div><div class='add'>+{</div><div class='add'>+	char tmp_str[] = "123456789";</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+</div><div class='add'>+	bpf_strtoul(tmp_str, sizeof(tmp_str), 0, &amp;tmp);</div><div class='add'>+	__sink(tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/bpf_tracing_net.h b/tools/testing/selftests/bpf/progs/bpf_tracing_net.h<br/>index 59843b430f76..d8dacef37c16 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_tracing_net.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/bpf_tracing_net.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/bpf_tracing_net.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/bpf_tracing_net.h</a></div><div class='hunk'>@@ -15,7 +15,11 @@</div><div class='ctx'> #define SO_KEEPALIVE		9</div><div class='ctx'> #define SO_PRIORITY		12</div><div class='ctx'> #define SO_REUSEPORT		15</div><div class='add'>+#if defined(__TARGET_ARCH_powerpc)</div><div class='add'>+#define SO_RCVLOWAT		16</div><div class='add'>+#else</div><div class='ctx'> #define SO_RCVLOWAT		18</div><div class='add'>+#endif</div><div class='ctx'> #define SO_BINDTODEVICE		25</div><div class='ctx'> #define SO_MARK			36</div><div class='ctx'> #define SO_MAX_PACING_RATE	47</div><div class='hunk'>@@ -49,6 +53,7 @@</div><div class='ctx'> #define TCP_SAVED_SYN		28</div><div class='ctx'> #define TCP_CA_NAME_MAX		16</div><div class='ctx'> #define TCP_NAGLE_OFF		1</div><div class='add'>+#define TCP_RTO_MAX_MS		44</div><div class='ctx'> </div><div class='ctx'> #define TCP_ECN_OK              1</div><div class='ctx'> #define TCP_ECN_QUEUE_CWR       2</div><div class='hunk'>@@ -123,6 +128,7 @@</div><div class='ctx'> #define sk_refcnt		__sk_common.skc_refcnt</div><div class='ctx'> #define sk_state		__sk_common.skc_state</div><div class='ctx'> #define sk_net			__sk_common.skc_net</div><div class='add'>+#define sk_rcv_saddr		__sk_common.skc_rcv_saddr</div><div class='ctx'> #define sk_v6_daddr		__sk_common.skc_v6_daddr</div><div class='ctx'> #define sk_v6_rcv_saddr		__sk_common.skc_v6_rcv_saddr</div><div class='ctx'> #define sk_flags		__sk_common.skc_flags</div><div class='hunk'>@@ -140,6 +146,20 @@</div><div class='ctx'> </div><div class='ctx'> #define tcp_jiffies32 ((__u32)bpf_jiffies64())</div><div class='ctx'> </div><div class='add'>+#ifndef min</div><div class='add'>+#define min(a, b) ((a) &lt; (b) ? (a) : (b))</div><div class='add'>+#endif</div><div class='add'>+#ifndef max</div><div class='add'>+#define max(a, b) ((a) &gt; (b) ? (a) : (b))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline bool before(__u32 seq1, __u32 seq2)</div><div class='add'>+{</div><div class='add'>+	return (__s32)(seq1 - seq2) &lt; 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define after(seq2, seq1) before(seq1, seq2)</div><div class='add'>+</div><div class='ctx'> static inline struct inet_connection_sock *inet_csk(const struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	return (struct inet_connection_sock *)sk;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_signed_arr_elem_sz.c b/tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_signed_arr_elem_sz.c<br/>new file mode 100644<br/>index 000000000000..21a560427b10<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_signed_arr_elem_sz.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_signed_arr_elem_sz.c</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+#include "core_reloc_types.h"</div><div class='add'>+</div><div class='add'>+void f(struct core_reloc_arrays___err_bad_signed_arr_elem_sz x) {}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/btf_type_tag_percpu.c b/tools/testing/selftests/bpf/progs/btf_type_tag_percpu.c<br/>index 38f78d9345de..d93f68024cc6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/btf_type_tag_percpu.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/btf_type_tag_percpu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/btf_type_tag_percpu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/btf_type_tag_percpu.c</a></div><div class='hunk'>@@ -30,36 +30,42 @@ int BPF_PROG(test_percpu2, struct bpf_testmod_btf_type_tag_2 *arg)</div><div class='ctx'> </div><div class='ctx'> /* trace_cgroup_mkdir(struct cgroup *cgrp, const char *path)</div><div class='ctx'>  *</div><div class='del'>- * struct cgroup_rstat_cpu {</div><div class='add'>+ * struct css_rstat_cpu {</div><div class='ctx'>  *   ...</div><div class='del'>- *   struct cgroup *updated_children;</div><div class='add'>+ *   struct cgroup_subsys_state *updated_children;</div><div class='ctx'>  *   ...</div><div class='ctx'>  * };</div><div class='ctx'>  *</div><div class='del'>- * struct cgroup {</div><div class='add'>+ * struct cgroup_subsys_state {</div><div class='add'>+ *   ...</div><div class='add'>+ *   struct css_rstat_cpu __percpu *rstat_cpu;</div><div class='ctx'>  *   ...</div><div class='del'>- *   struct cgroup_rstat_cpu __percpu *rstat_cpu;</div><div class='add'>+ * };</div><div class='add'>+ *</div><div class='add'>+ * struct cgroup {</div><div class='add'>+ *   struct cgroup_subsys_state self;</div><div class='ctx'>  *   ...</div><div class='ctx'>  * };</div><div class='ctx'>  */</div><div class='ctx'> SEC("tp_btf/cgroup_mkdir")</div><div class='ctx'> int BPF_PROG(test_percpu_load, struct cgroup *cgrp, const char *path)</div><div class='ctx'> {</div><div class='del'>-	g = (__u64)cgrp-&gt;rstat_cpu-&gt;updated_children;</div><div class='add'>+	g = (__u64)cgrp-&gt;self.rstat_cpu-&gt;updated_children;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("tp_btf/cgroup_mkdir")</div><div class='ctx'> int BPF_PROG(test_percpu_helper, struct cgroup *cgrp, const char *path)</div><div class='ctx'> {</div><div class='del'>-	struct cgroup_rstat_cpu *rstat;</div><div class='add'>+	struct css_rstat_cpu *rstat;</div><div class='ctx'> 	__u32 cpu;</div><div class='ctx'> </div><div class='ctx'> 	cpu = bpf_get_smp_processor_id();</div><div class='del'>-	rstat = (struct cgroup_rstat_cpu *)bpf_per_cpu_ptr(cgrp-&gt;rstat_cpu, cpu);</div><div class='add'>+	rstat = (struct css_rstat_cpu *)bpf_per_cpu_ptr(</div><div class='add'>+			cgrp-&gt;self.rstat_cpu, cpu);</div><div class='ctx'> 	if (rstat) {</div><div class='ctx'> 		/* READ_ONCE */</div><div class='del'>-		*(volatile int *)rstat;</div><div class='add'>+		*(volatile long *)rstat;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c b/tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c<br/>index c74362854948..ff189a736ad8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c</a></div><div class='hunk'>@@ -37,8 +37,9 @@ struct {</div><div class='ctx'> 	__type(value, struct attach_counter);</div><div class='ctx'> } attach_counters SEC(".maps");</div><div class='ctx'> </div><div class='del'>-extern void cgroup_rstat_updated(struct cgroup *cgrp, int cpu) __ksym;</div><div class='del'>-extern void cgroup_rstat_flush(struct cgroup *cgrp) __ksym;</div><div class='add'>+extern void css_rstat_updated(</div><div class='add'>+		struct cgroup_subsys_state *css, int cpu) __ksym;</div><div class='add'>+extern void css_rstat_flush(struct cgroup_subsys_state *css) __ksym;</div><div class='ctx'> </div><div class='ctx'> static uint64_t cgroup_id(struct cgroup *cgrp)</div><div class='ctx'> {</div><div class='hunk'>@@ -75,7 +76,7 @@ int BPF_PROG(counter, struct cgroup *dst_cgrp, struct task_struct *leader,</div><div class='ctx'> 	else if (create_percpu_attach_counter(cg_id, 1))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	cgroup_rstat_updated(dst_cgrp, bpf_get_smp_processor_id());</div><div class='add'>+	css_rstat_updated(&amp;dst_cgrp-&gt;self, bpf_get_smp_processor_id());</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -141,7 +142,7 @@ int BPF_PROG(dumper, struct bpf_iter_meta *meta, struct cgroup *cgrp)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Flush the stats to make sure we get the most updated numbers */</div><div class='del'>-	cgroup_rstat_flush(cgrp);</div><div class='add'>+	css_rstat_flush(&amp;cgrp-&gt;self);</div><div class='ctx'> </div><div class='ctx'> 	total_counter = bpf_map_lookup_elem(&amp;attach_counters, &amp;cg_id);</div><div class='ctx'> 	if (!total_counter) {</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/cgroup_mprog.c b/tools/testing/selftests/bpf/progs/cgroup_mprog.c<br/>new file mode 100644<br/>index 000000000000..6a0ea02c4de2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cgroup_mprog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/cgroup_mprog.c</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+SEC("cgroup/getsockopt")</div><div class='add'>+int getsockopt_1(struct bpf_sockopt *ctx)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("cgroup/getsockopt")</div><div class='add'>+int getsockopt_2(struct bpf_sockopt *ctx)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("cgroup/getsockopt")</div><div class='add'>+int getsockopt_3(struct bpf_sockopt *ctx)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("cgroup/getsockopt")</div><div class='add'>+int getsockopt_4(struct bpf_sockopt *ctx)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/cgroup_preorder.c b/tools/testing/selftests/bpf/progs/cgroup_preorder.c<br/>new file mode 100644<br/>index 000000000000..4ef6202baa0a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cgroup_preorder.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/cgroup_preorder.c</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+unsigned int idx;</div><div class='add'>+__u8 result[4];</div><div class='add'>+</div><div class='add'>+SEC("cgroup/getsockopt")</div><div class='add'>+int child(struct bpf_sockopt *ctx)</div><div class='add'>+{</div><div class='add'>+	if (idx &lt; 4)</div><div class='add'>+		result[idx++] = 1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("cgroup/getsockopt")</div><div class='add'>+int child_2(struct bpf_sockopt *ctx)</div><div class='add'>+{</div><div class='add'>+	if (idx &lt; 4)</div><div class='add'>+		result[idx++] = 2;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("cgroup/getsockopt")</div><div class='add'>+int parent(struct bpf_sockopt *ctx)</div><div class='add'>+{</div><div class='add'>+	if (idx &lt; 4)</div><div class='add'>+		result[idx++] = 3;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("cgroup/getsockopt")</div><div class='add'>+int parent_2(struct bpf_sockopt *ctx)</div><div class='add'>+{</div><div class='add'>+	if (idx &lt; 4)</div><div class='add'>+		result[idx++] = 4;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/cgroup_read_xattr.c b/tools/testing/selftests/bpf/progs/cgroup_read_xattr.c<br/>new file mode 100644<br/>index 000000000000..88e13e17ec9e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cgroup_read_xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/cgroup_read_xattr.c</a></div><div class='hunk'>@@ -0,0 +1,158 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_core_read.h&gt;</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+char value[16];</div><div class='add'>+</div><div class='add'>+static __always_inline void read_xattr(struct cgroup *cgroup)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr value_ptr;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_mem(value, sizeof(value), 0, &amp;value_ptr);</div><div class='add'>+	bpf_cgroup_read_xattr(cgroup, "user.bpf_test",</div><div class='add'>+			      &amp;value_ptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/socket_connect")</div><div class='add'>+__success</div><div class='add'>+int BPF_PROG(trusted_cgroup_ptr_sleepable)</div><div class='add'>+{</div><div class='add'>+	u64 cgrp_id = bpf_get_current_cgroup_id();</div><div class='add'>+	struct cgroup *cgrp;</div><div class='add'>+</div><div class='add'>+	cgrp = bpf_cgroup_from_id(cgrp_id);</div><div class='add'>+	if (!cgrp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	read_xattr(cgrp);</div><div class='add'>+	bpf_cgroup_release(cgrp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm/socket_connect")</div><div class='add'>+__success</div><div class='add'>+int BPF_PROG(trusted_cgroup_ptr_non_sleepable)</div><div class='add'>+{</div><div class='add'>+	u64 cgrp_id = bpf_get_current_cgroup_id();</div><div class='add'>+	struct cgroup *cgrp;</div><div class='add'>+</div><div class='add'>+	cgrp = bpf_cgroup_from_id(cgrp_id);</div><div class='add'>+	if (!cgrp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	read_xattr(cgrp);</div><div class='add'>+	bpf_cgroup_release(cgrp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm/socket_connect")</div><div class='add'>+__success</div><div class='add'>+int BPF_PROG(use_css_iter_non_sleepable)</div><div class='add'>+{</div><div class='add'>+	u64 cgrp_id = bpf_get_current_cgroup_id();</div><div class='add'>+	struct cgroup_subsys_state *css;</div><div class='add'>+	struct cgroup *cgrp;</div><div class='add'>+</div><div class='add'>+	cgrp = bpf_cgroup_from_id(cgrp_id);</div><div class='add'>+	if (!cgrp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_for_each(css, css, &amp;cgrp-&gt;self, BPF_CGROUP_ITER_ANCESTORS_UP)</div><div class='add'>+		read_xattr(css-&gt;cgroup);</div><div class='add'>+</div><div class='add'>+	bpf_cgroup_release(cgrp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/socket_connect")</div><div class='add'>+__failure __msg("kernel func bpf_iter_css_new requires RCU critical section protection")</div><div class='add'>+int BPF_PROG(use_css_iter_sleepable_missing_rcu_lock)</div><div class='add'>+{</div><div class='add'>+	u64 cgrp_id = bpf_get_current_cgroup_id();</div><div class='add'>+	struct cgroup_subsys_state *css;</div><div class='add'>+	struct cgroup *cgrp;</div><div class='add'>+</div><div class='add'>+	cgrp = bpf_cgroup_from_id(cgrp_id);</div><div class='add'>+	if (!cgrp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_for_each(css, css, &amp;cgrp-&gt;self, BPF_CGROUP_ITER_ANCESTORS_UP)</div><div class='add'>+		read_xattr(css-&gt;cgroup);</div><div class='add'>+</div><div class='add'>+	bpf_cgroup_release(cgrp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/socket_connect")</div><div class='add'>+__success</div><div class='add'>+int BPF_PROG(use_css_iter_sleepable_with_rcu_lock)</div><div class='add'>+{</div><div class='add'>+	u64 cgrp_id = bpf_get_current_cgroup_id();</div><div class='add'>+	struct cgroup_subsys_state *css;</div><div class='add'>+	struct cgroup *cgrp;</div><div class='add'>+</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	cgrp = bpf_cgroup_from_id(cgrp_id);</div><div class='add'>+	if (!cgrp)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bpf_for_each(css, css, &amp;cgrp-&gt;self, BPF_CGROUP_ITER_ANCESTORS_UP)</div><div class='add'>+		read_xattr(css-&gt;cgroup);</div><div class='add'>+</div><div class='add'>+	bpf_cgroup_release(cgrp);</div><div class='add'>+out:</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm/socket_connect")</div><div class='add'>+__success</div><div class='add'>+int BPF_PROG(use_bpf_cgroup_ancestor)</div><div class='add'>+{</div><div class='add'>+	u64 cgrp_id = bpf_get_current_cgroup_id();</div><div class='add'>+	struct cgroup *cgrp, *ancestor;</div><div class='add'>+</div><div class='add'>+	cgrp = bpf_cgroup_from_id(cgrp_id);</div><div class='add'>+	if (!cgrp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ancestor = bpf_cgroup_ancestor(cgrp, 1);</div><div class='add'>+	if (!ancestor)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	read_xattr(cgrp);</div><div class='add'>+	bpf_cgroup_release(ancestor);</div><div class='add'>+out:</div><div class='add'>+	bpf_cgroup_release(cgrp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("cgroup/sendmsg4")</div><div class='add'>+__success</div><div class='add'>+int BPF_PROG(cgroup_skb)</div><div class='add'>+{</div><div class='add'>+	u64 cgrp_id = bpf_get_current_cgroup_id();</div><div class='add'>+	struct cgroup *cgrp, *ancestor;</div><div class='add'>+</div><div class='add'>+	cgrp = bpf_cgroup_from_id(cgrp_id);</div><div class='add'>+	if (!cgrp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ancestor = bpf_cgroup_ancestor(cgrp, 1);</div><div class='add'>+	if (!ancestor)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	read_xattr(cgrp);</div><div class='add'>+	bpf_cgroup_release(ancestor);</div><div class='add'>+out:</div><div class='add'>+	bpf_cgroup_release(cgrp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/cgrp_kfunc_success.c b/tools/testing/selftests/bpf/progs/cgrp_kfunc_success.c<br/>index 5354455a01be..02d8f160ca0e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cgrp_kfunc_success.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cgrp_kfunc_success.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cgrp_kfunc_success.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/cgrp_kfunc_success.c</a></div><div class='hunk'>@@ -221,3 +221,15 @@ int BPF_PROG(test_cgrp_from_id, struct cgroup *cgrp, const char *path)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int test_cgrp_from_id_ns(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct cgroup *cg;</div><div class='add'>+</div><div class='add'>+	cg = bpf_cgroup_from_id(1);</div><div class='add'>+	if (!cg)</div><div class='add'>+		return 42;</div><div class='add'>+	bpf_cgroup_release(cg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/changes_pkt_data.c b/tools/testing/selftests/bpf/progs/changes_pkt_data.c<br/>deleted file mode 100644<br/>index 43cada48b28a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/changes_pkt_data.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/changes_pkt_data.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='del'>-#include &lt;bpf/bpf_helpers.h&gt;</div><div class='del'>-</div><div class='del'>-__noinline</div><div class='del'>-long changes_pkt_data(struct __sk_buff *sk)</div><div class='del'>-{</div><div class='del'>-	return bpf_skb_pull_data(sk, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__noinline __weak</div><div class='del'>-long does_not_change_pkt_data(struct __sk_buff *sk)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-SEC("?tc")</div><div class='del'>-int main_with_subprogs(struct __sk_buff *sk)</div><div class='del'>-{</div><div class='del'>-	changes_pkt_data(sk);</div><div class='del'>-	does_not_change_pkt_data(sk);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-SEC("?tc")</div><div class='del'>-int main_changes(struct __sk_buff *sk)</div><div class='del'>-{</div><div class='del'>-	bpf_skb_pull_data(sk, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-SEC("?tc")</div><div class='del'>-int main_does_not_change(struct __sk_buff *sk)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/compute_live_registers.c b/tools/testing/selftests/bpf/progs/compute_live_registers.c<br/>new file mode 100644<br/>index 000000000000..6884ab99a421<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/compute_live_registers.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/compute_live_registers.c</a></div><div class='hunk'>@@ -0,0 +1,440 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "../../../include/linux/filter.h"</div><div class='add'>+#include "bpf_arena_common.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u64);</div><div class='add'>+} test_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARENA);</div><div class='add'>+	__uint(map_flags, BPF_F_MMAPABLE);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+} arena SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg(" 0: .......... (b7) r0 = 42")</div><div class='add'>+__msg(" 1: 0......... (bf) r1 = r0")</div><div class='add'>+__msg(" 2: .1........ (bf) r2 = r1")</div><div class='add'>+__msg(" 3: ..2....... (bf) r3 = r2")</div><div class='add'>+__msg(" 4: ...3...... (bf) r4 = r3")</div><div class='add'>+__msg(" 5: ....4..... (bf) r5 = r4")</div><div class='add'>+__msg(" 6: .....5.... (bf) r6 = r5")</div><div class='add'>+__msg(" 7: ......6... (bf) r7 = r6")</div><div class='add'>+__msg(" 8: .......7.. (bf) r8 = r7")</div><div class='add'>+__msg(" 9: ........8. (bf) r9 = r8")</div><div class='add'>+__msg("10: .........9 (bf) r0 = r9")</div><div class='add'>+__msg("11: 0......... (95) exit")</div><div class='add'>+__naked void assign_chain(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r0 = 42;"</div><div class='add'>+		"r1 = r0;"</div><div class='add'>+		"r2 = r1;"</div><div class='add'>+		"r3 = r2;"</div><div class='add'>+		"r4 = r3;"</div><div class='add'>+		"r5 = r4;"</div><div class='add'>+		"r6 = r5;"</div><div class='add'>+		"r7 = r6;"</div><div class='add'>+		"r8 = r7;"</div><div class='add'>+		"r9 = r8;"</div><div class='add'>+		"r0 = r9;"</div><div class='add'>+		"exit;"</div><div class='add'>+		::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("0: .......... (b7) r1 = 7")</div><div class='add'>+__msg("1: .1........ (07) r1 += 7")</div><div class='add'>+__msg("2: .......... (b7) r2 = 7")</div><div class='add'>+__msg("3: ..2....... (b7) r3 = 42")</div><div class='add'>+__msg("4: ..23...... (0f) r2 += r3")</div><div class='add'>+__msg("5: .......... (b7) r0 = 0")</div><div class='add'>+__msg("6: 0......... (95) exit")</div><div class='add'>+__naked void arithmetics(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r1 = 7;"</div><div class='add'>+		"r1 += 7;"</div><div class='add'>+		"r2 = 7;"</div><div class='add'>+		"r3 = 42;"</div><div class='add'>+		"r2 += r3;"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+		::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CAN_USE_BPF_ST</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("  1: .1........ (07) r1 += -8")</div><div class='add'>+__msg("  2: .1........ (7a) *(u64 *)(r1 +0) = 7")</div><div class='add'>+__msg("  3: .1........ (b7) r2 = 42")</div><div class='add'>+__msg("  4: .12....... (7b) *(u64 *)(r1 +0) = r2")</div><div class='add'>+__msg("  5: .12....... (7b) *(u64 *)(r1 +0) = r2")</div><div class='add'>+__msg("  6: .......... (b7) r0 = 0")</div><div class='add'>+__naked void store(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"*(u64 *)(r1 +0) = 7;"</div><div class='add'>+		"r2 = 42;"</div><div class='add'>+		"*(u64 *)(r1 +0) = r2;"</div><div class='add'>+		"*(u64 *)(r1 +0) = r2;"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+		::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("1: ....4..... (07) r4 += -8")</div><div class='add'>+__msg("2: ....4..... (79) r5 = *(u64 *)(r4 +0)")</div><div class='add'>+__msg("3: ....45.... (07) r4 += -8")</div><div class='add'>+__naked void load(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r4 = r10;"</div><div class='add'>+		"r4 += -8;"</div><div class='add'>+		"r5 = *(u64 *)(r4 +0);"</div><div class='add'>+		"r4 += -8;"</div><div class='add'>+		"r0 = r5;"</div><div class='add'>+		"exit;"</div><div class='add'>+		::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("0: .1........ (61) r2 = *(u32 *)(r1 +0)")</div><div class='add'>+__msg("1: ..2....... (d4) r2 = le64 r2")</div><div class='add'>+__msg("2: ..2....... (bf) r0 = r2")</div><div class='add'>+__naked void endian(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r2 = *(u32 *)(r1 +0);"</div><div class='add'>+		"r2 = le64 r2;"</div><div class='add'>+		"r0 = r2;"</div><div class='add'>+		"exit;"</div><div class='add'>+		::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg(" 8: 0......... (b7) r1 = 1")</div><div class='add'>+__msg(" 9: 01........ (db) r1 = atomic64_fetch_add((u64 *)(r0 +0), r1)")</div><div class='add'>+__msg("10: 01........ (c3) lock *(u32 *)(r0 +0) += r1")</div><div class='add'>+__msg("11: 01........ (db) r1 = atomic64_xchg((u64 *)(r0 +0), r1)")</div><div class='add'>+__msg("12: 01........ (bf) r2 = r0")</div><div class='add'>+__msg("13: .12....... (bf) r0 = r1")</div><div class='add'>+__msg("14: 012....... (db) r0 = atomic64_cmpxchg((u64 *)(r2 +0), r0, r1)")</div><div class='add'>+__naked void atomic(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r2 = r10;"</div><div class='add'>+		"r2 += -8;"</div><div class='add'>+		"r1 = 0;"</div><div class='add'>+		"*(u64 *)(r2 +0) = r1;"</div><div class='add'>+		"r1 = %[test_map] ll;"</div><div class='add'>+		"call %[bpf_map_lookup_elem];"</div><div class='add'>+		"if r0 == 0 goto 1f;"</div><div class='add'>+		"r1 = 1;"</div><div class='add'>+		"r1 = atomic_fetch_add((u64 *)(r0 +0), r1);"</div><div class='add'>+		".8byte %[add_nofetch];" /* same as "lock *(u32 *)(r0 +0) += r1;" */</div><div class='add'>+		"r1 = xchg_64(r0 + 0, r1);"</div><div class='add'>+		"r2 = r0;"</div><div class='add'>+		"r0 = r1;"</div><div class='add'>+		"r0 = cmpxchg_64(r2 + 0, r0, r1);"</div><div class='add'>+		"1: exit;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_map_lookup_elem),</div><div class='add'>+		  __imm_addr(test_map),</div><div class='add'>+		  __imm_insn(add_nofetch, BPF_ATOMIC_OP(BPF_W, BPF_ADD, BPF_REG_0, BPF_REG_1, 0))</div><div class='add'>+		: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CAN_USE_LOAD_ACQ_STORE_REL</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("2: .12....... (db) store_release((u64 *)(r2 -8), r1)")</div><div class='add'>+__msg("3: .......... (bf) r3 = r10")</div><div class='add'>+__msg("4: ...3...... (db) r4 = load_acquire((u64 *)(r3 -8))")</div><div class='add'>+__naked void atomic_load_acq_store_rel(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r1 = 42;"</div><div class='add'>+		"r2 = r10;"</div><div class='add'>+		".8byte %[store_release_insn];" /* store_release((u64 *)(r2 - 8), r1); */</div><div class='add'>+		"r3 = r10;"</div><div class='add'>+		".8byte %[load_acquire_insn];" /* r4 = load_acquire((u64 *)(r3 + 0)); */</div><div class='add'>+		"r0 = r4;"</div><div class='add'>+		"exit;"</div><div class='add'>+		:</div><div class='add'>+		: __imm_insn(store_release_insn,</div><div class='add'>+			     BPF_ATOMIC_OP(BPF_DW, BPF_STORE_REL, BPF_REG_2, BPF_REG_1, -8)),</div><div class='add'>+		  __imm_insn(load_acquire_insn,</div><div class='add'>+			     BPF_ATOMIC_OP(BPF_DW, BPF_LOAD_ACQ, BPF_REG_4, BPF_REG_3, -8))</div><div class='add'>+		: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CAN_USE_LOAD_ACQ_STORE_REL */</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("4: .12....7.. (85) call bpf_trace_printk#6")</div><div class='add'>+__msg("5: 0......7.. (0f) r0 += r7")</div><div class='add'>+__naked void regular_call(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r7 = 1;"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"r2 = 1;"</div><div class='add'>+		"call %[bpf_trace_printk];"</div><div class='add'>+		"r0 += r7;"</div><div class='add'>+		"exit;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_trace_printk)</div><div class='add'>+		: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("2: 012....... (25) if r1 &gt; 0x7 goto pc+1")</div><div class='add'>+__msg("3: ..2....... (bf) r0 = r2")</div><div class='add'>+__naked void if1(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r0 = 1;"</div><div class='add'>+		"r2 = 2;"</div><div class='add'>+		"if r1 &gt; 0x7 goto +1;"</div><div class='add'>+		"r0 = r2;"</div><div class='add'>+		"exit;"</div><div class='add'>+		::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("3: 0123...... (2d) if r1 &gt; r3 goto pc+1")</div><div class='add'>+__msg("4: ..2....... (bf) r0 = r2")</div><div class='add'>+__naked void if2(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r0 = 1;"</div><div class='add'>+		"r2 = 2;"</div><div class='add'>+		"r3 = 7;"</div><div class='add'>+		"if r1 &gt; r3 goto +1;"</div><div class='add'>+		"r0 = r2;"</div><div class='add'>+		"exit;"</div><div class='add'>+		::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Verifier misses that r2 is alive if jset is not handled properly */</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("2: 012....... (45) if r1 &amp; 0x7 goto pc+1")</div><div class='add'>+__naked void if3_jset_bug(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r0 = 1;"</div><div class='add'>+		"r2 = 2;"</div><div class='add'>+		"if r1 &amp; 0x7 goto +1;"</div><div class='add'>+		"exit;"</div><div class='add'>+		"r0 = r2;"</div><div class='add'>+		"exit;"</div><div class='add'>+		::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("0: .......... (b7) r1 = 0")</div><div class='add'>+__msg("1: .1........ (b7) r2 = 7")</div><div class='add'>+__msg("2: .12....... (25) if r1 &gt; 0x7 goto pc+4")</div><div class='add'>+__msg("3: .12....... (07) r1 += 1")</div><div class='add'>+__msg("4: .12....... (27) r2 *= 2")</div><div class='add'>+__msg("5: .12....... (05) goto pc+0")</div><div class='add'>+__msg("6: .12....... (05) goto pc-5")</div><div class='add'>+__msg("7: .......... (b7) r0 = 0")</div><div class='add'>+__msg("8: 0......... (95) exit")</div><div class='add'>+__naked void loop(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r1 = 0;"</div><div class='add'>+		"r2 = 7;"</div><div class='add'>+		"if r1 &gt; 0x7 goto +4;"</div><div class='add'>+		"r1 += 1;"</div><div class='add'>+		"r2 *= 2;"</div><div class='add'>+		"goto +0;"</div><div class='add'>+		"goto -5;"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_trace_printk)</div><div class='add'>+		: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CAN_USE_GOTOL</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("2: .123...... (25) if r1 &gt; 0x7 goto pc+2")</div><div class='add'>+__msg("3: ..2....... (bf) r0 = r2")</div><div class='add'>+__msg("4: 0......... (06) gotol pc+1")</div><div class='add'>+__msg("5: ...3...... (bf) r0 = r3")</div><div class='add'>+__msg("6: 0......... (95) exit")</div><div class='add'>+__naked void gotol(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r2 = 42;"</div><div class='add'>+		"r3 = 24;"</div><div class='add'>+		"if r1 &gt; 0x7 goto +2;"</div><div class='add'>+		"r0 = r2;"</div><div class='add'>+		"gotol +1;"</div><div class='add'>+		"r0 = r3;"</div><div class='add'>+		"exit;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_trace_printk)</div><div class='add'>+		: __clobber_all);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("0: .......... (b7) r1 = 1")</div><div class='add'>+__msg("1: .1........ (e5) may_goto pc+1")</div><div class='add'>+__msg("2: .......... (05) goto pc-3")</div><div class='add'>+__msg("3: .1........ (bf) r0 = r1")</div><div class='add'>+__msg("4: 0......... (95) exit")</div><div class='add'>+__naked void may_goto(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"1: r1 = 1;"</div><div class='add'>+	".8byte %[may_goto];"</div><div class='add'>+	"goto 1b;"</div><div class='add'>+	"r0 = r1;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_smp_processor_id),</div><div class='add'>+	  __imm_insn(may_goto, BPF_RAW_INSN(BPF_JMP | BPF_JCOND, 0, 0, +1 /* offset */, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("1: 0......... (18) r2 = 0x7")</div><div class='add'>+__msg("3: 0.2....... (0f) r0 += r2")</div><div class='add'>+__naked void ldimm64(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"r2 = 0x7 ll;"</div><div class='add'>+		"r0 += r2;"</div><div class='add'>+		"exit;"</div><div class='add'>+		:</div><div class='add'>+		:: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* No rules specific for LD_ABS/LD_IND, default behaviour kicks in */</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("2: 0123456789 (30) r0 = *(u8 *)skb[42]")</div><div class='add'>+__msg("3: 012.456789 (0f) r7 += r0")</div><div class='add'>+__msg("4: 012.456789 (b7) r3 = 42")</div><div class='add'>+__msg("5: 0123456789 (50) r0 = *(u8 *)skb[r3 + 0]")</div><div class='add'>+__msg("6: 0......7.. (0f) r7 += r0")</div><div class='add'>+__naked void ldabs(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r6 = r1;"</div><div class='add'>+		"r7 = 0;"</div><div class='add'>+		"r0 = *(u8 *)skb[42];"</div><div class='add'>+		"r7 += r0;"</div><div class='add'>+		"r3 = 42;"</div><div class='add'>+		".8byte %[ld_ind];" /* same as "r0 = *(u8 *)skb[r3];" */</div><div class='add'>+		"r7 += r0;"</div><div class='add'>+		"r0 = r7;"</div><div class='add'>+		"exit;"</div><div class='add'>+		:</div><div class='add'>+		: __imm_insn(ld_ind, BPF_LD_IND(BPF_B, BPF_REG_3, 0))</div><div class='add'>+		: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef __BPF_FEATURE_ADDR_SPACE_CAST</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg(" 6: .12345.... (85) call bpf_arena_alloc_pages")</div><div class='add'>+__msg(" 7: 0......... (bf) r1 = addr_space_cast(r0, 0, 1)")</div><div class='add'>+__msg(" 8: .1........ (b7) r2 = 42")</div><div class='add'>+__naked void addr_space_cast(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r1 = %[arena] ll;"</div><div class='add'>+		"r2 = 0;"</div><div class='add'>+		"r3 = 1;"</div><div class='add'>+		"r4 = 0;"</div><div class='add'>+		"r5 = 0;"</div><div class='add'>+		"call %[bpf_arena_alloc_pages];"</div><div class='add'>+		"r1 = addr_space_cast(r0, 0, 1);"</div><div class='add'>+		"r2 = 42;"</div><div class='add'>+		"*(u64 *)(r1 +0) = r2;"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_arena_alloc_pages),</div><div class='add'>+		  __imm_addr(arena)</div><div class='add'>+		: __clobber_all);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static __used __naked int aux1(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r0 = r1;"</div><div class='add'>+		"r0 += r2;"</div><div class='add'>+		"exit;"</div><div class='add'>+		::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("0: ....45.... (b7) r1 = 1")</div><div class='add'>+__msg("1: .1..45.... (b7) r2 = 2")</div><div class='add'>+__msg("2: .12.45.... (b7) r3 = 3")</div><div class='add'>+/* Conservative liveness for subprog parameters. */</div><div class='add'>+__msg("3: .12345.... (85) call pc+2")</div><div class='add'>+__msg("4: .......... (b7) r0 = 0")</div><div class='add'>+__msg("5: 0......... (95) exit")</div><div class='add'>+__msg("6: .12....... (bf) r0 = r1")</div><div class='add'>+__msg("7: 0.2....... (0f) r0 += r2")</div><div class='add'>+/* Conservative liveness for subprog return value. */</div><div class='add'>+__msg("8: 0......... (95) exit")</div><div class='add'>+__naked void subprog1(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r1 = 1;"</div><div class='add'>+		"r2 = 2;"</div><div class='add'>+		"r3 = 3;"</div><div class='add'>+		"call aux1;"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+		::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* to retain debug info for BTF generation */</div><div class='add'>+void kfunc_root(void)</div><div class='add'>+{</div><div class='add'>+	bpf_arena_alloc_pages(0, 0, 0, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/connect4_dropper.c b/tools/testing/selftests/bpf/progs/connect4_dropper.c<br/>index d3f4c5e4fb69..a3819a5d09c8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/connect4_dropper.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/connect4_dropper.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/connect4_dropper.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/connect4_dropper.c</a></div><div class='hunk'>@@ -13,12 +13,14 @@</div><div class='ctx'> #define VERDICT_REJECT	0</div><div class='ctx'> #define VERDICT_PROCEED	1</div><div class='ctx'> </div><div class='add'>+int port;</div><div class='add'>+</div><div class='ctx'> SEC("cgroup/connect4")</div><div class='ctx'> int connect_v4_dropper(struct bpf_sock_addr *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	if (ctx-&gt;type != SOCK_STREAM)</div><div class='ctx'> 		return VERDICT_PROCEED;</div><div class='del'>-	if (ctx-&gt;user_port == bpf_htons(60120))</div><div class='add'>+	if (ctx-&gt;user_port == bpf_htons(port))</div><div class='ctx'> 		return VERDICT_REJECT;</div><div class='ctx'> 	return VERDICT_PROCEED;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/connect4_prog.c b/tools/testing/selftests/bpf/progs/connect4_prog.c<br/>index 9e9ebf27b878..9d158cfad981 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/connect4_prog.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/connect4_prog.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/connect4_prog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/connect4_prog.c</a></div><div class='hunk'>@@ -34,6 +34,9 @@</div><div class='ctx'> #define SOL_TCP 6</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+const char reno[] = "reno";</div><div class='add'>+const char cubic[] = "cubic";</div><div class='add'>+</div><div class='ctx'> __attribute__ ((noinline)) __weak</div><div class='ctx'> int do_bind(struct bpf_sock_addr *ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -50,35 +53,27 @@ int do_bind(struct bpf_sock_addr *ctx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __inline int verify_cc(struct bpf_sock_addr *ctx,</div><div class='del'>-			      char expected[TCP_CA_NAME_MAX])</div><div class='add'>+			      const char expected[])</div><div class='ctx'> {</div><div class='ctx'> 	char buf[TCP_CA_NAME_MAX];</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (bpf_getsockopt(ctx, SOL_TCP, TCP_CONGESTION, &amp;buf, sizeof(buf)))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; TCP_CA_NAME_MAX; i++) {</div><div class='del'>-		if (buf[i] != expected[i])</div><div class='del'>-			return 1;</div><div class='del'>-		if (buf[i] == 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	if (bpf_strncmp(buf, TCP_CA_NAME_MAX, expected))</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __inline int set_cc(struct bpf_sock_addr *ctx)</div><div class='ctx'> {</div><div class='del'>-	char reno[TCP_CA_NAME_MAX] = "reno";</div><div class='del'>-	char cubic[TCP_CA_NAME_MAX] = "cubic";</div><div class='del'>-</div><div class='del'>-	if (bpf_setsockopt(ctx, SOL_TCP, TCP_CONGESTION, &amp;reno, sizeof(reno)))</div><div class='add'>+	if (bpf_setsockopt(ctx, SOL_TCP, TCP_CONGESTION, (void *)reno, sizeof(reno)))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	if (verify_cc(ctx, reno))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	if (bpf_setsockopt(ctx, SOL_TCP, TCP_CONGESTION, &amp;cubic, sizeof(cubic)))</div><div class='add'>+	if (bpf_setsockopt(ctx, SOL_TCP, TCP_CONGESTION, (void *)cubic, sizeof(cubic)))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	if (verify_cc(ctx, cubic))</div><div class='ctx'> 		return 1;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/core_reloc_types.h b/tools/testing/selftests/bpf/progs/core_reloc_types.h<br/>index fd8e1b4c6762..5760ae015e09 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/core_reloc_types.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/core_reloc_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/core_reloc_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/core_reloc_types.h</a></div><div class='hunk'>@@ -347,6 +347,7 @@ struct core_reloc_nesting___err_too_deep {</div><div class='ctx'>  */</div><div class='ctx'> struct core_reloc_arrays_output {</div><div class='ctx'> 	int a2;</div><div class='add'>+	int a3;</div><div class='ctx'> 	char b123;</div><div class='ctx'> 	int c1c;</div><div class='ctx'> 	int d00d;</div><div class='hunk'>@@ -455,6 +456,15 @@ struct core_reloc_arrays___err_bad_zero_sz_arr {</div><div class='ctx'> 	struct core_reloc_arrays_substruct d[1][2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct core_reloc_arrays___err_bad_signed_arr_elem_sz {</div><div class='add'>+	/* int -&gt; short (signed!): not supported case */</div><div class='add'>+	short a[5];</div><div class='add'>+	char b[2][3][4];</div><div class='add'>+	struct core_reloc_arrays_substruct c[3];</div><div class='add'>+	struct core_reloc_arrays_substruct d[1][2];</div><div class='add'>+	struct core_reloc_arrays_substruct f[][2];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * PRIMITIVES</div><div class='ctx'>  */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/cpumask_common.h b/tools/testing/selftests/bpf/progs/cpumask_common.h<br/>index 4ece7873ba60..86085b79f5ca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cpumask_common.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cpumask_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cpumask_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/cpumask_common.h</a></div><div class='hunk'>@@ -61,6 +61,7 @@ u32 bpf_cpumask_any_distribute(const struct cpumask *src) __ksym __weak;</div><div class='ctx'> u32 bpf_cpumask_any_and_distribute(const struct cpumask *src1,</div><div class='ctx'> 				   const struct cpumask *src2) __ksym __weak;</div><div class='ctx'> u32 bpf_cpumask_weight(const struct cpumask *cpumask) __ksym __weak;</div><div class='add'>+int bpf_cpumask_populate(struct cpumask *cpumask, void *src, size_t src__sz) __ksym __weak;</div><div class='ctx'> </div><div class='ctx'> void bpf_rcu_read_lock(void) __ksym __weak;</div><div class='ctx'> void bpf_rcu_read_unlock(void) __ksym __weak;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/cpumask_failure.c b/tools/testing/selftests/bpf/progs/cpumask_failure.c<br/>index b40b52548ffb..8a2fd596c8a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cpumask_failure.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cpumask_failure.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cpumask_failure.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/cpumask_failure.c</a></div><div class='hunk'>@@ -222,3 +222,41 @@ int BPF_PROG(test_invalid_nested_array, struct task_struct *task, u64 clone_flag</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/task_newtask")</div><div class='add'>+__failure __msg("type=scalar expected=fp")</div><div class='add'>+int BPF_PROG(test_populate_invalid_destination, struct task_struct *task, u64 clone_flags)</div><div class='add'>+{</div><div class='add'>+	struct bpf_cpumask *invalid = (struct bpf_cpumask *)0x123456;</div><div class='add'>+	u64 bits;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bpf_cpumask_populate((struct cpumask *)invalid, &amp;bits, sizeof(bits));</div><div class='add'>+	if (!ret)</div><div class='add'>+		err = 2;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/task_newtask")</div><div class='add'>+__failure __msg("leads to invalid memory access")</div><div class='add'>+int BPF_PROG(test_populate_invalid_source, struct task_struct *task, u64 clone_flags)</div><div class='add'>+{</div><div class='add'>+	void *garbage = (void *)0x123456;</div><div class='add'>+	struct bpf_cpumask *local;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	local = create_cpumask();</div><div class='add'>+	if (!local) {</div><div class='add'>+		err = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = bpf_cpumask_populate((struct cpumask *)local, garbage, 8);</div><div class='add'>+	if (!ret)</div><div class='add'>+		err = 2;</div><div class='add'>+</div><div class='add'>+	bpf_cpumask_release(local);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/cpumask_success.c b/tools/testing/selftests/bpf/progs/cpumask_success.c<br/>index 80ee469b0b60..0e04c31b91c0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cpumask_success.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/cpumask_success.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/cpumask_success.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/cpumask_success.c</a></div><div class='hunk'>@@ -749,7 +749,6 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("tp_btf/task_newtask")</div><div class='del'>-__success</div><div class='ctx'> int BPF_PROG(test_refcount_null_tracking, struct task_struct *task, u64 clone_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_cpumask *mask1, *mask2;</div><div class='hunk'>@@ -770,3 +769,122 @@ free_masks_return:</div><div class='ctx'> 		bpf_cpumask_release(mask2);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/task_newtask")</div><div class='add'>+int BPF_PROG(test_populate_reject_small_mask, struct task_struct *task, u64 clone_flags)</div><div class='add'>+{</div><div class='add'>+	struct bpf_cpumask *local;</div><div class='add'>+	u8 toofewbits;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!is_test_task())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	local = create_cpumask();</div><div class='add'>+	if (!local)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* The kfunc should prevent this operation */</div><div class='add'>+	ret = bpf_cpumask_populate((struct cpumask *)local, &amp;toofewbits, sizeof(toofewbits));</div><div class='add'>+	if (ret != -EACCES)</div><div class='add'>+		err = 2;</div><div class='add'>+</div><div class='add'>+	bpf_cpumask_release(local);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Mask is guaranteed to be large enough for bpf_cpumask_t. */</div><div class='add'>+#define CPUMASK_TEST_MASKLEN (sizeof(cpumask_t))</div><div class='add'>+</div><div class='add'>+/* Add an extra word for the test_populate_reject_unaligned test. */</div><div class='add'>+u64 bits[CPUMASK_TEST_MASKLEN / 8 + 1];</div><div class='add'>+extern bool CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS __kconfig __weak;</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/task_newtask")</div><div class='add'>+int BPF_PROG(test_populate_reject_unaligned, struct task_struct *task, u64 clone_flags)</div><div class='add'>+{</div><div class='add'>+	struct bpf_cpumask *mask;</div><div class='add'>+	char *src;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!is_test_task())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Skip if unaligned accesses are fine for this arch.  */</div><div class='add'>+	if (CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mask = bpf_cpumask_create();</div><div class='add'>+	if (!mask) {</div><div class='add'>+		err = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Misalign the source array by a byte. */</div><div class='add'>+	src = &amp;((char *)bits)[1];</div><div class='add'>+</div><div class='add'>+	ret = bpf_cpumask_populate((struct cpumask *)mask, src, CPUMASK_TEST_MASKLEN);</div><div class='add'>+	if (ret != -EINVAL)</div><div class='add'>+		err = 2;</div><div class='add'>+</div><div class='add'>+	bpf_cpumask_release(mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/task_newtask")</div><div class='add'>+int BPF_PROG(test_populate, struct task_struct *task, u64 clone_flags)</div><div class='add'>+{</div><div class='add'>+	struct bpf_cpumask *mask;</div><div class='add'>+	bool bit;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!is_test_task())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Set only odd bits. */</div><div class='add'>+	__builtin_memset(bits, 0xaa, CPUMASK_TEST_MASKLEN);</div><div class='add'>+</div><div class='add'>+	mask = bpf_cpumask_create();</div><div class='add'>+	if (!mask) {</div><div class='add'>+		err = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Pass the entire bits array, the kfunc will only copy the valid bits. */</div><div class='add'>+	ret = bpf_cpumask_populate((struct cpumask *)mask, bits, CPUMASK_TEST_MASKLEN);</div><div class='add'>+	if (ret) {</div><div class='add'>+		err = 2;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Test is there to appease the verifier. We cannot directly</div><div class='add'>+	 * access NR_CPUS, the upper bound for nr_cpus, so we infer</div><div class='add'>+	 * it from the size of cpumask_t.</div><div class='add'>+	 */</div><div class='add'>+	if (nr_cpus &lt; 0 || nr_cpus &gt;= CPUMASK_TEST_MASKLEN * 8) {</div><div class='add'>+		err = 3;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, nr_cpus) {</div><div class='add'>+		/* Odd-numbered bits should be set, even ones unset. */</div><div class='add'>+		bit = bpf_cpumask_test_cpu(i, (const struct cpumask *)mask);</div><div class='add'>+		if (bit == (i % 2 != 0))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = 4;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	bpf_cpumask_release(mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef CPUMASK_TEST_MASKLEN</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/crypto_sanity.c b/tools/testing/selftests/bpf/progs/crypto_sanity.c<br/>index 645be6cddf36..dfd8a258f14a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/crypto_sanity.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/crypto_sanity.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/crypto_sanity.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/crypto_sanity.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@ unsigned char key[256] = {};</div><div class='ctx'> u16 udp_test_port = 7777;</div><div class='ctx'> u32 authsize, key_len;</div><div class='ctx'> char algo[128] = {};</div><div class='del'>-char dst[16] = {};</div><div class='add'>+char dst[16] = {}, dst_bad[8] = {};</div><div class='ctx'> int status;</div><div class='ctx'> </div><div class='ctx'> static int skb_dynptr_validate(struct __sk_buff *skb, struct bpf_dynptr *psrc)</div><div class='hunk'>@@ -59,10 +59,9 @@ int skb_crypto_setup(void *ctx)</div><div class='ctx'> 		.authsize = authsize,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct bpf_crypto_ctx *cctx;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	status = 0;</div><div class='del'>-</div><div class='ctx'> 	if (key_len &gt; 256) {</div><div class='ctx'> 		status = -EINVAL;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -70,8 +69,8 @@ int skb_crypto_setup(void *ctx)</div><div class='ctx'> </div><div class='ctx'> 	__builtin_memcpy(&amp;params.algo, algo, sizeof(algo));</div><div class='ctx'> 	__builtin_memcpy(&amp;params.key, key, sizeof(key));</div><div class='del'>-	cctx = bpf_crypto_ctx_create(&amp;params, sizeof(params), &amp;err);</div><div class='ctx'> </div><div class='add'>+	cctx = bpf_crypto_ctx_create(&amp;params, sizeof(params), &amp;err);</div><div class='ctx'> 	if (!cctx) {</div><div class='ctx'> 		status = err;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -80,7 +79,6 @@ int skb_crypto_setup(void *ctx)</div><div class='ctx'> 	err = crypto_ctx_insert(cctx);</div><div class='ctx'> 	if (err &amp;&amp; err != -EEXIST)</div><div class='ctx'> 		status = err;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -92,6 +90,7 @@ int decrypt_sanity(struct __sk_buff *skb)</div><div class='ctx'> 	struct bpf_dynptr psrc, pdst;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	status = 0;</div><div class='ctx'> 	err = skb_dynptr_validate(skb, &amp;psrc);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		status = err;</div><div class='hunk'>@@ -110,13 +109,23 @@ int decrypt_sanity(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_SHOT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* dst is a global variable to make testing part easier to check. In real</div><div class='del'>-	 * production code, a percpu map should be used to store the result.</div><div class='add'>+	/* Check also bad case where the dst buffer is smaller than the</div><div class='add'>+	 * skb's linear section.</div><div class='add'>+	 */</div><div class='add'>+	bpf_dynptr_from_mem(dst_bad, sizeof(dst_bad), 0, &amp;pdst);</div><div class='add'>+	status = bpf_crypto_decrypt(ctx, &amp;psrc, &amp;pdst, NULL);</div><div class='add'>+	if (!status)</div><div class='add'>+		status = -EIO;</div><div class='add'>+	if (status != -EINVAL)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* dst is a global variable to make testing part easier to check.</div><div class='add'>+	 * In real production code, a percpu map should be used to store</div><div class='add'>+	 * the result.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bpf_dynptr_from_mem(dst, sizeof(dst), 0, &amp;pdst);</div><div class='del'>-</div><div class='ctx'> 	status = bpf_crypto_decrypt(ctx, &amp;psrc, &amp;pdst, NULL);</div><div class='del'>-</div><div class='add'>+err:</div><div class='ctx'> 	return TC_ACT_SHOT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -129,7 +138,6 @@ int encrypt_sanity(struct __sk_buff *skb)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	status = 0;</div><div class='del'>-</div><div class='ctx'> 	err = skb_dynptr_validate(skb, &amp;psrc);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		status = err;</div><div class='hunk'>@@ -148,13 +156,23 @@ int encrypt_sanity(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_SHOT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* dst is a global variable to make testing part easier to check. In real</div><div class='del'>-	 * production code, a percpu map should be used to store the result.</div><div class='add'>+	/* Check also bad case where the dst buffer is smaller than the</div><div class='add'>+	 * skb's linear section.</div><div class='add'>+	 */</div><div class='add'>+	bpf_dynptr_from_mem(dst_bad, sizeof(dst_bad), 0, &amp;pdst);</div><div class='add'>+	status = bpf_crypto_encrypt(ctx, &amp;psrc, &amp;pdst, NULL);</div><div class='add'>+	if (!status)</div><div class='add'>+		status = -EIO;</div><div class='add'>+	if (status != -EINVAL)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* dst is a global variable to make testing part easier to check.</div><div class='add'>+	 * In real production code, a percpu map should be used to store</div><div class='add'>+	 * the result.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bpf_dynptr_from_mem(dst, sizeof(dst), 0, &amp;pdst);</div><div class='del'>-</div><div class='ctx'> 	status = bpf_crypto_encrypt(ctx, &amp;psrc, &amp;pdst, NULL);</div><div class='del'>-</div><div class='add'>+err:</div><div class='ctx'> 	return TC_ACT_SHOT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/dmabuf_iter.c b/tools/testing/selftests/bpf/progs/dmabuf_iter.c<br/>new file mode 100644<br/>index 000000000000..13cdb11fdeb2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/dmabuf_iter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/dmabuf_iter.c</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Google LLC */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_core_read.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+/* From uapi/linux/dma-buf.h */</div><div class='add'>+#define DMA_BUF_NAME_LEN 32</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__uint(key_size, DMA_BUF_NAME_LEN);</div><div class='add'>+	__type(value, bool);</div><div class='add'>+	__uint(max_entries, 5);</div><div class='add'>+} testbuf_hash SEC(".maps");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fields output by this iterator are delimited by newlines. Convert any</div><div class='add'>+ * newlines in user-provided printed strings to spaces.</div><div class='add'>+ */</div><div class='add'>+static void sanitize_string(char *src, size_t size)</div><div class='add'>+{</div><div class='add'>+	for (char *c = src; (size_t)(c - src) &lt; size &amp;&amp; *c; ++c)</div><div class='add'>+		if (*c == '\n')</div><div class='add'>+			*c = ' ';</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("iter/dmabuf")</div><div class='add'>+int dmabuf_collector(struct bpf_iter__dmabuf *ctx)</div><div class='add'>+{</div><div class='add'>+	const struct dma_buf *dmabuf = ctx-&gt;dmabuf;</div><div class='add'>+	struct seq_file *seq = ctx-&gt;meta-&gt;seq;</div><div class='add'>+	unsigned long inode = 0;</div><div class='add'>+	size_t size;</div><div class='add'>+	const char *pname, *exporter;</div><div class='add'>+	char name[DMA_BUF_NAME_LEN] = {'\0'};</div><div class='add'>+</div><div class='add'>+	if (!dmabuf)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (BPF_CORE_READ_INTO(&amp;inode, dmabuf, file, f_inode, i_ino) ||</div><div class='add'>+	    bpf_core_read(&amp;size, sizeof(size), &amp;dmabuf-&gt;size) ||</div><div class='add'>+	    bpf_core_read(&amp;pname, sizeof(pname), &amp;dmabuf-&gt;name) ||</div><div class='add'>+	    bpf_core_read(&amp;exporter, sizeof(exporter), &amp;dmabuf-&gt;exp_name))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* Buffers are not required to be named */</div><div class='add'>+	if (pname) {</div><div class='add'>+		if (bpf_probe_read_kernel(name, sizeof(name), pname))</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		/* Name strings can be provided by userspace */</div><div class='add'>+		sanitize_string(name, sizeof(name));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BPF_SEQ_PRINTF(seq, "%lu\n%llu\n%s\n%s\n", inode, size, name, exporter);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int iter_dmabuf_for_each(const void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct dma_buf *d;</div><div class='add'>+</div><div class='add'>+	bpf_for_each(dmabuf, d) {</div><div class='add'>+		char name[DMA_BUF_NAME_LEN];</div><div class='add'>+		const char *pname;</div><div class='add'>+		bool *found;</div><div class='add'>+		long len;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		if (bpf_core_read(&amp;pname, sizeof(pname), &amp;d-&gt;name))</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		/* Buffers are not required to be named */</div><div class='add'>+		if (!pname)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		len = bpf_probe_read_kernel_str(name, sizeof(name), pname);</div><div class='add'>+		if (len &lt; 0)</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The entire name buffer is used as a map key.</div><div class='add'>+		 * Zeroize any uninitialized trailing bytes after the NUL.</div><div class='add'>+		 */</div><div class='add'>+		bpf_for(i, len, DMA_BUF_NAME_LEN)</div><div class='add'>+			name[i] = 0;</div><div class='add'>+</div><div class='add'>+		found = bpf_map_lookup_elem(&amp;testbuf_hash, name);</div><div class='add'>+		if (found) {</div><div class='add'>+			bool t = true;</div><div class='add'>+</div><div class='add'>+			bpf_map_update_elem(&amp;testbuf_hash, name, &amp;t, BPF_EXIST);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/dynptr_fail.c b/tools/testing/selftests/bpf/progs/dynptr_fail.c<br/>index bd8f15229f5c..dda6a8dada82 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/dynptr_fail.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/dynptr_fail.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/dynptr_fail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/dynptr_fail.c</a></div><div class='hunk'>@@ -269,6 +269,26 @@ int data_slice_out_of_bounds_skb(struct __sk_buff *skb)</div><div class='ctx'> 	return SK_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* A metadata slice can't be accessed out of bounds */</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("value is outside of the allowed memory range")</div><div class='add'>+int data_slice_out_of_bounds_skb_meta(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 *md;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+</div><div class='add'>+	md = bpf_dynptr_slice_rdwr(&amp;meta, 0, NULL, sizeof(*md));</div><div class='add'>+	if (!md)</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	*(md + 1) = 42;</div><div class='add'>+</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> SEC("?raw_tp")</div><div class='ctx'> __failure __msg("value is outside of the allowed memory range")</div><div class='ctx'> int data_slice_out_of_bounds_map_value(void *ctx)</div><div class='hunk'>@@ -1089,6 +1109,26 @@ int skb_invalid_slice_write(struct __sk_buff *skb)</div><div class='ctx'> 	return SK_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* bpf_dynptr_slice()s are read-only and cannot be written to */</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("R{{[0-9]+}} cannot write into rdonly_mem")</div><div class='add'>+int skb_meta_invalid_slice_write(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 *md;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+</div><div class='add'>+	md = bpf_dynptr_slice(&amp;meta, 0, NULL, sizeof(*md));</div><div class='add'>+	if (!md)</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	*md = 42;</div><div class='add'>+</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* The read-only data slice is invalidated whenever a helper changes packet data */</div><div class='ctx'> SEC("?tc")</div><div class='ctx'> __failure __msg("invalid mem access 'scalar'")</div><div class='hunk'>@@ -1192,6 +1232,188 @@ int skb_invalid_data_slice4(struct __sk_buff *skb)</div><div class='ctx'> 	return SK_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Read-only skb data slice is invalidated on write to skb metadata */</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("invalid mem access 'scalar'")</div><div class='add'>+int ro_skb_slice_invalid_after_metadata_write(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr data, meta;</div><div class='add'>+	__u8 *d;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb(skb, 0, &amp;data);</div><div class='add'>+	bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+</div><div class='add'>+	d = bpf_dynptr_slice(&amp;data, 0, NULL, sizeof(*d));</div><div class='add'>+	if (!d)</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_write(&amp;meta, 0, "x", 1, 0);</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	val = *d;</div><div class='add'>+</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read-write skb data slice is invalidated on write to skb metadata */</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("invalid mem access 'scalar'")</div><div class='add'>+int rw_skb_slice_invalid_after_metadata_write(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr data, meta;</div><div class='add'>+	__u8 *d;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb(skb, 0, &amp;data);</div><div class='add'>+	bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+</div><div class='add'>+	d = bpf_dynptr_slice_rdwr(&amp;data, 0, NULL, sizeof(*d));</div><div class='add'>+	if (!d)</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_write(&amp;meta, 0, "x", 1, 0);</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	*d = 42;</div><div class='add'>+</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read-only skb metadata slice is invalidated on write to skb data */</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("invalid mem access 'scalar'")</div><div class='add'>+int ro_skb_meta_slice_invalid_after_payload_write(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr data, meta;</div><div class='add'>+	__u8 *md;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb(skb, 0, &amp;data);</div><div class='add'>+	bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+</div><div class='add'>+	md = bpf_dynptr_slice(&amp;meta, 0, NULL, sizeof(*md));</div><div class='add'>+	if (!md)</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_write(&amp;data, 0, "x", 1, 0);</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	val = *md;</div><div class='add'>+</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read-write skb metadata slice is invalidated on write to skb data slice */</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("invalid mem access 'scalar'")</div><div class='add'>+int rw_skb_meta_slice_invalid_after_payload_write(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr data, meta;</div><div class='add'>+	__u8 *md;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb(skb, 0, &amp;data);</div><div class='add'>+	bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+</div><div class='add'>+	md = bpf_dynptr_slice_rdwr(&amp;meta, 0, NULL, sizeof(*md));</div><div class='add'>+	if (!md)</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_write(&amp;data, 0, "x", 1, 0);</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	*md = 42;</div><div class='add'>+</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read-only skb metadata slice is invalidated whenever a helper changes packet data */</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("invalid mem access 'scalar'")</div><div class='add'>+int ro_skb_meta_slice_invalid_after_payload_helper(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 *md;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+</div><div class='add'>+	md = bpf_dynptr_slice(&amp;meta, 0, NULL, sizeof(*md));</div><div class='add'>+	if (!md)</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	if (bpf_skb_pull_data(skb, skb-&gt;len))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	val = *md;</div><div class='add'>+</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read-write skb metadata slice is invalidated whenever a helper changes packet data */</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("invalid mem access 'scalar'")</div><div class='add'>+int rw_skb_meta_slice_invalid_after_payload_helper(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 *md;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+</div><div class='add'>+	md = bpf_dynptr_slice_rdwr(&amp;meta, 0, NULL, sizeof(*md));</div><div class='add'>+	if (!md)</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	if (bpf_skb_pull_data(skb, skb-&gt;len))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	*md = 42;</div><div class='add'>+</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read-only skb metadata slice is invalidated on write to skb metadata */</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("invalid mem access 'scalar'")</div><div class='add'>+int ro_skb_meta_slice_invalid_after_metadata_write(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 *md;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+</div><div class='add'>+	md = bpf_dynptr_slice(&amp;meta, 0, NULL, sizeof(*md));</div><div class='add'>+	if (!md)</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_write(&amp;meta, 0, "x", 1, 0);</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	val = *md;</div><div class='add'>+</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read-write skb metadata slice is invalidated on write to skb metadata */</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("invalid mem access 'scalar'")</div><div class='add'>+int rw_skb_meta_slice_invalid_after_metadata_write(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 *md;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+</div><div class='add'>+	md = bpf_dynptr_slice_rdwr(&amp;meta, 0, NULL, sizeof(*md));</div><div class='add'>+	if (!md)</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_write(&amp;meta, 0, "x", 1, 0);</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	*md = 42;</div><div class='add'>+</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* The read-only data slice is invalidated whenever a helper changes packet data */</div><div class='ctx'> SEC("?xdp")</div><div class='ctx'> __failure __msg("invalid mem access 'scalar'")</div><div class='hunk'>@@ -1255,6 +1477,19 @@ int skb_invalid_ctx(void *ctx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Only supported prog type can create skb_meta-type dynptrs */</div><div class='add'>+SEC("?raw_tp")</div><div class='add'>+__failure __msg("calling kernel function bpf_dynptr_from_skb_meta is not allowed")</div><div class='add'>+int skb_meta_invalid_ctx(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> SEC("fentry/skb_tx_error")</div><div class='ctx'> __failure __msg("must be referenced or trusted")</div><div class='ctx'> int BPF_PROG(skb_invalid_ctx_fentry, void *skb)</div><div class='hunk'>@@ -1665,6 +1900,29 @@ int clone_skb_packet_data(struct __sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* A skb clone's metadata slice becomes invalid anytime packet data changes */</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("invalid mem access 'scalar'")</div><div class='add'>+int clone_skb_packet_meta(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr clone, meta;</div><div class='add'>+	__u8 *md;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+	bpf_dynptr_clone(&amp;meta, &amp;clone);</div><div class='add'>+	md = bpf_dynptr_slice_rdwr(&amp;clone, 0, NULL, sizeof(*md));</div><div class='add'>+	if (!md)</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	if (bpf_skb_pull_data(skb, skb-&gt;len))</div><div class='add'>+		return SK_DROP;</div><div class='add'>+</div><div class='add'>+	/* this should fail */</div><div class='add'>+	*md = 42;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* A xdp clone's data slices should be invalid anytime packet data changes */</div><div class='ctx'> SEC("?xdp")</div><div class='ctx'> __failure __msg("invalid mem access 'scalar'")</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/dynptr_success.c b/tools/testing/selftests/bpf/progs/dynptr_success.c<br/>index bfcc85686cf0..e0d672d93adf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/dynptr_success.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/dynptr_success.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/dynptr_success.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/dynptr_success.c</a></div><div class='hunk'>@@ -1,20 +1,21 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Copyright (c) 2022 Facebook */</div><div class='ctx'> </div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;stdbool.h&gt;</div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='del'>-#include "bpf_kfuncs.h"</div><div class='ctx'> #include "errno.h"</div><div class='ctx'> </div><div class='add'>+#define PAGE_SIZE_64K 65536</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='ctx'> int pid, err, val;</div><div class='ctx'> </div><div class='del'>-struct sample {</div><div class='add'>+struct ringbuf_sample {</div><div class='ctx'> 	int pid;</div><div class='ctx'> 	int seq;</div><div class='ctx'> 	long value;</div><div class='hunk'>@@ -121,7 +122,7 @@ int test_dynptr_data(void *ctx)</div><div class='ctx'> </div><div class='ctx'> static int ringbuf_callback(__u32 index, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct sample *sample;</div><div class='add'>+	struct ringbuf_sample *sample;</div><div class='ctx'> </div><div class='ctx'> 	struct bpf_dynptr *ptr = (struct bpf_dynptr *)data;</div><div class='ctx'> </div><div class='hunk'>@@ -138,7 +139,7 @@ SEC("?tp/syscalls/sys_enter_nanosleep")</div><div class='ctx'> int test_ringbuf(void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_dynptr ptr;</div><div class='del'>-	struct sample *sample;</div><div class='add'>+	struct ringbuf_sample *sample;</div><div class='ctx'> </div><div class='ctx'> 	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -210,6 +211,61 @@ int test_dynptr_skb_data(struct __sk_buff *skb)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("?tc")</div><div class='add'>+int test_dynptr_skb_meta_data(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 *md;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	err = 1;</div><div class='add'>+	ret = bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* This should return NULL. Must use bpf_dynptr_slice API */</div><div class='add'>+	err = 2;</div><div class='add'>+	md = bpf_dynptr_data(&amp;meta, 0, sizeof(*md));</div><div class='add'>+	if (md)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check that skb metadata dynptr ops don't accept any flags. */</div><div class='add'>+SEC("?tc")</div><div class='add'>+int test_dynptr_skb_meta_flags(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const __u64 INVALID_FLAGS = ~0ULL;</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 buf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	err = 1;</div><div class='add'>+	ret = bpf_dynptr_from_skb_meta(skb, INVALID_FLAGS, &amp;meta);</div><div class='add'>+	if (ret != -EINVAL)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	err = 2;</div><div class='add'>+	ret = bpf_dynptr_from_skb_meta(skb, 0, &amp;meta);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	err = 3;</div><div class='add'>+	ret = bpf_dynptr_read(&amp;buf, 0, &amp;meta, 0, INVALID_FLAGS);</div><div class='add'>+	if (ret != -EINVAL)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	err = 4;</div><div class='add'>+	ret = bpf_dynptr_write(&amp;meta, 0, &amp;buf, 0, INVALID_FLAGS);</div><div class='add'>+	if (ret != -EINVAL)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> SEC("tp/syscalls/sys_enter_nanosleep")</div><div class='ctx'> int test_adjust(void *ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -567,3 +623,515 @@ int BPF_PROG(test_dynptr_skb_tp_btf, void *skb, void *location)</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int bpf_memcmp(const char *a, const char *b, u32 size)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, size) {</div><div class='add'>+		if (a[i] != b[i])</div><div class='add'>+			return a[i] &lt; b[i] ? -1 : 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tp/syscalls/sys_enter_nanosleep")</div><div class='add'>+int test_dynptr_copy(void *ctx)</div><div class='add'>+{</div><div class='add'>+	char data[] = "hello there, world!!";</div><div class='add'>+	char buf[32] = {'\0'};</div><div class='add'>+	__u32 sz = sizeof(data);</div><div class='add'>+	struct bpf_dynptr src, dst;</div><div class='add'>+</div><div class='add'>+	bpf_ringbuf_reserve_dynptr(&amp;ringbuf, sz, 0, &amp;src);</div><div class='add'>+	bpf_ringbuf_reserve_dynptr(&amp;ringbuf, sz, 0, &amp;dst);</div><div class='add'>+</div><div class='add'>+	/* Test basic case of copying contiguous memory backed dynptrs */</div><div class='add'>+	err = bpf_dynptr_write(&amp;src, 0, data, sz, 0);</div><div class='add'>+	err = err ?: bpf_dynptr_copy(&amp;dst, 0, &amp;src, 0, sz);</div><div class='add'>+	err = err ?: bpf_dynptr_read(buf, sz, &amp;dst, 0, 0);</div><div class='add'>+	err = err ?: bpf_memcmp(data, buf, sz);</div><div class='add'>+</div><div class='add'>+	/* Test that offsets are handled correctly */</div><div class='add'>+	err = err ?: bpf_dynptr_copy(&amp;dst, 3, &amp;src, 5, sz - 5);</div><div class='add'>+	err = err ?: bpf_dynptr_read(buf, sz - 5, &amp;dst, 3, 0);</div><div class='add'>+	err = err ?: bpf_memcmp(data + 5, buf, sz - 5);</div><div class='add'>+</div><div class='add'>+	bpf_ringbuf_discard_dynptr(&amp;src, 0);</div><div class='add'>+	bpf_ringbuf_discard_dynptr(&amp;dst, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int test_dynptr_copy_xdp(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr ptr_buf, ptr_xdp;</div><div class='add'>+	char data[] = "qwertyuiopasdfghjkl";</div><div class='add'>+	char buf[32] = {'\0'};</div><div class='add'>+	__u32 len = sizeof(data), xdp_data_size;</div><div class='add'>+	int i, chunks = 200;</div><div class='add'>+</div><div class='add'>+	/* ptr_xdp is backed by non-contiguous memory */</div><div class='add'>+	bpf_dynptr_from_xdp(xdp, 0, &amp;ptr_xdp);</div><div class='add'>+	xdp_data_size = bpf_dynptr_size(&amp;ptr_xdp);</div><div class='add'>+	bpf_ringbuf_reserve_dynptr(&amp;ringbuf, len * chunks, 0, &amp;ptr_buf);</div><div class='add'>+</div><div class='add'>+	/* Destination dynptr is backed by non-contiguous memory */</div><div class='add'>+	bpf_for(i, 0, chunks) {</div><div class='add'>+		err = bpf_dynptr_write(&amp;ptr_buf, i * len, data, len, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_copy(&amp;ptr_xdp, 0, &amp;ptr_buf, 0, len * chunks);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, chunks) {</div><div class='add'>+		__builtin_memset(buf, 0, sizeof(buf));</div><div class='add'>+		err = bpf_dynptr_read(&amp;buf, len, &amp;ptr_xdp, i * len, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		if (bpf_memcmp(data, buf, len) != 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Source dynptr is backed by non-contiguous memory */</div><div class='add'>+	__builtin_memset(buf, 0, sizeof(buf));</div><div class='add'>+	bpf_for(i, 0, chunks) {</div><div class='add'>+		err = bpf_dynptr_write(&amp;ptr_buf, i * len, buf, len, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_copy(&amp;ptr_buf, 0, &amp;ptr_xdp, 0, len * chunks);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, chunks) {</div><div class='add'>+		__builtin_memset(buf, 0, sizeof(buf));</div><div class='add'>+		err = bpf_dynptr_read(&amp;buf, len, &amp;ptr_buf, i * len, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		if (bpf_memcmp(data, buf, len) != 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Both source and destination dynptrs are backed by non-contiguous memory */</div><div class='add'>+	err = bpf_dynptr_copy(&amp;ptr_xdp, 2, &amp;ptr_xdp, len, len * (chunks - 1));</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, chunks - 1) {</div><div class='add'>+		__builtin_memset(buf, 0, sizeof(buf));</div><div class='add'>+		err = bpf_dynptr_read(&amp;buf, len, &amp;ptr_xdp, 2 + i * len, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		if (bpf_memcmp(data, buf, len) != 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bpf_dynptr_copy(&amp;ptr_xdp, xdp_data_size - 3000, &amp;ptr_xdp, 0, len * chunks) != -E2BIG)</div><div class='add'>+		err = 1;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	bpf_ringbuf_discard_dynptr(&amp;ptr_buf, 0);</div><div class='add'>+	return XDP_DROP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char memset_zero_data[] = "data to be zeroed";</div><div class='add'>+</div><div class='add'>+SEC("?tp/syscalls/sys_enter_nanosleep")</div><div class='add'>+int test_dynptr_memset_zero(void *ctx)</div><div class='add'>+{</div><div class='add'>+	__u32 data_sz = sizeof(memset_zero_data);</div><div class='add'>+	char zeroes[32] = {'\0'};</div><div class='add'>+	struct bpf_dynptr ptr;</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_from_mem(memset_zero_data, data_sz, 0, &amp;ptr);</div><div class='add'>+	err = err ?: bpf_dynptr_memset(&amp;ptr, 0, data_sz, 0);</div><div class='add'>+	err = err ?: bpf_memcmp(zeroes, memset_zero_data, data_sz);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DYNPTR_MEMSET_VAL 42</div><div class='add'>+</div><div class='add'>+char memset_notzero_data[] = "data to be overwritten";</div><div class='add'>+</div><div class='add'>+SEC("?tp/syscalls/sys_enter_nanosleep")</div><div class='add'>+int test_dynptr_memset_notzero(void *ctx)</div><div class='add'>+{</div><div class='add'>+	u32 data_sz = sizeof(memset_notzero_data);</div><div class='add'>+	struct bpf_dynptr ptr;</div><div class='add'>+	char expected[32];</div><div class='add'>+</div><div class='add'>+	__builtin_memset(expected, DYNPTR_MEMSET_VAL, data_sz);</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_from_mem(memset_notzero_data, data_sz, 0, &amp;ptr);</div><div class='add'>+	err = err ?: bpf_dynptr_memset(&amp;ptr, 0, data_sz, DYNPTR_MEMSET_VAL);</div><div class='add'>+	err = err ?: bpf_memcmp(expected, memset_notzero_data, data_sz);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char memset_zero_offset_data[] = "data to be zeroed partially";</div><div class='add'>+</div><div class='add'>+SEC("?tp/syscalls/sys_enter_nanosleep")</div><div class='add'>+int test_dynptr_memset_zero_offset(void *ctx)</div><div class='add'>+{</div><div class='add'>+	char expected[] = "data to \0\0\0\0eroed partially";</div><div class='add'>+	__u32 data_sz = sizeof(memset_zero_offset_data);</div><div class='add'>+	struct bpf_dynptr ptr;</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_from_mem(memset_zero_offset_data, data_sz, 0, &amp;ptr);</div><div class='add'>+	err = err ?: bpf_dynptr_memset(&amp;ptr, 8, 4, 0);</div><div class='add'>+	err = err ?: bpf_memcmp(expected, memset_zero_offset_data, data_sz);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char memset_zero_adjusted_data[] = "data to be zeroed partially";</div><div class='add'>+</div><div class='add'>+SEC("?tp/syscalls/sys_enter_nanosleep")</div><div class='add'>+int test_dynptr_memset_zero_adjusted(void *ctx)</div><div class='add'>+{</div><div class='add'>+	char expected[] = "data\0\0\0\0be zeroed partially";</div><div class='add'>+	__u32 data_sz = sizeof(memset_zero_adjusted_data);</div><div class='add'>+	struct bpf_dynptr ptr;</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_from_mem(memset_zero_adjusted_data, data_sz, 0, &amp;ptr);</div><div class='add'>+	err = err ?: bpf_dynptr_adjust(&amp;ptr, 4, 8);</div><div class='add'>+	err = err ?: bpf_dynptr_memset(&amp;ptr, 0, bpf_dynptr_size(&amp;ptr), 0);</div><div class='add'>+	err = err ?: bpf_memcmp(expected, memset_zero_adjusted_data, data_sz);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char memset_overflow_data[] = "memset overflow data";</div><div class='add'>+</div><div class='add'>+SEC("?tp/syscalls/sys_enter_nanosleep")</div><div class='add'>+int test_dynptr_memset_overflow(void *ctx)</div><div class='add'>+{</div><div class='add'>+	__u32 data_sz = sizeof(memset_overflow_data);</div><div class='add'>+	struct bpf_dynptr ptr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_from_mem(memset_overflow_data, data_sz, 0, &amp;ptr);</div><div class='add'>+	ret = bpf_dynptr_memset(&amp;ptr, 0, data_sz + 1, 0);</div><div class='add'>+	if (ret != -E2BIG)</div><div class='add'>+		err = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tp/syscalls/sys_enter_nanosleep")</div><div class='add'>+int test_dynptr_memset_overflow_offset(void *ctx)</div><div class='add'>+{</div><div class='add'>+	__u32 data_sz = sizeof(memset_overflow_data);</div><div class='add'>+	struct bpf_dynptr ptr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_from_mem(memset_overflow_data, data_sz, 0, &amp;ptr);</div><div class='add'>+	ret = bpf_dynptr_memset(&amp;ptr, 1, data_sz, 0);</div><div class='add'>+	if (ret != -E2BIG)</div><div class='add'>+		err = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?cgroup_skb/egress")</div><div class='add'>+int test_dynptr_memset_readonly(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr ptr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_from_skb(skb, 0, &amp;ptr);</div><div class='add'>+</div><div class='add'>+	/* cgroup skbs are read only, memset should fail */</div><div class='add'>+	ret = bpf_dynptr_memset(&amp;ptr, 0, bpf_dynptr_size(&amp;ptr), 0);</div><div class='add'>+	if (ret != -EINVAL)</div><div class='add'>+		err = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define min_t(type, x, y) ({		\</div><div class='add'>+	type __x = (x);			\</div><div class='add'>+	type __y = (y);			\</div><div class='add'>+	__x &lt; __y ? __x : __y; })</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int test_dynptr_memset_xdp_chunks(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	u32 data_sz, chunk_sz, offset = 0;</div><div class='add'>+	const int max_chunks = 200;</div><div class='add'>+	struct bpf_dynptr ptr_xdp;</div><div class='add'>+	char expected_buf[32];</div><div class='add'>+	char buf[32];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	__builtin_memset(expected_buf, DYNPTR_MEMSET_VAL, sizeof(expected_buf));</div><div class='add'>+</div><div class='add'>+	/* ptr_xdp is backed by non-contiguous memory */</div><div class='add'>+	bpf_dynptr_from_xdp(xdp, 0, &amp;ptr_xdp);</div><div class='add'>+	data_sz = bpf_dynptr_size(&amp;ptr_xdp);</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_memset(&amp;ptr_xdp, 0, data_sz, DYNPTR_MEMSET_VAL);</div><div class='add'>+	if (err) {</div><div class='add'>+		/* bpf_dynptr_memset() eventually called bpf_xdp_pointer()</div><div class='add'>+		 * where if data_sz is greater than 0xffff, -EFAULT will be</div><div class='add'>+		 * returned. For 64K page size, data_sz is greater than</div><div class='add'>+		 * 64K, so error is expected and let us zero out error and</div><div class='add'>+		 * return success.</div><div class='add'>+		 */</div><div class='add'>+		if (data_sz &gt;= PAGE_SIZE_64K)</div><div class='add'>+			err = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, max_chunks) {</div><div class='add'>+		offset = i * sizeof(buf);</div><div class='add'>+		if (offset &gt;= data_sz)</div><div class='add'>+			goto out;</div><div class='add'>+		chunk_sz = min_t(u32, sizeof(buf), data_sz - offset);</div><div class='add'>+		err = bpf_dynptr_read(&amp;buf, chunk_sz, &amp;ptr_xdp, offset, 0);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		err = bpf_memcmp(buf, expected_buf, sizeof(buf));</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return XDP_DROP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *user_ptr;</div><div class='add'>+/* Contains the copy of the data pointed by user_ptr.</div><div class='add'>+ * Size 384 to make it not fit into a single kernel chunk when copying</div><div class='add'>+ * but less than the maximum bpf stack size (512).</div><div class='add'>+ */</div><div class='add'>+char expected_str[384];</div><div class='add'>+__u32 test_len[7] = {0/* placeholder */, 0, 1, 2, 255, 256, 257};</div><div class='add'>+</div><div class='add'>+typedef int (*bpf_read_dynptr_fn_t)(struct bpf_dynptr *dptr, u64 off,</div><div class='add'>+				    u64 size, const void *unsafe_ptr);</div><div class='add'>+</div><div class='add'>+/* Returns the offset just before the end of the maximum sized xdp fragment.</div><div class='add'>+ * Any write larger than 32 bytes will be split between 2 fragments.</div><div class='add'>+ */</div><div class='add'>+__u32 xdp_near_frag_end_offset(void)</div><div class='add'>+{</div><div class='add'>+	const __u32 headroom = 256;</div><div class='add'>+	const __u32 max_frag_size =  __PAGE_SIZE - headroom - sizeof(struct skb_shared_info);</div><div class='add'>+</div><div class='add'>+	/* 32 bytes before the approximate end of the fragment */</div><div class='add'>+	return max_frag_size - 32;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Use __always_inline on test_dynptr_probe[_str][_xdp]() and callbacks</div><div class='add'>+ * of type bpf_read_dynptr_fn_t to prevent compiler from generating</div><div class='add'>+ * indirect calls that make program fail to load with "unknown opcode" error.</div><div class='add'>+ */</div><div class='add'>+static __always_inline void test_dynptr_probe(void *ptr, bpf_read_dynptr_fn_t bpf_read_dynptr_fn)</div><div class='add'>+{</div><div class='add'>+	char buf[sizeof(expected_str)];</div><div class='add'>+	struct bpf_dynptr ptr_buf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = bpf_ringbuf_reserve_dynptr(&amp;ringbuf, sizeof(buf), 0, &amp;ptr_buf);</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, ARRAY_SIZE(test_len)) {</div><div class='add'>+		__u32 len = test_len[i];</div><div class='add'>+</div><div class='add'>+		err = err ?: bpf_read_dynptr_fn(&amp;ptr_buf, 0, test_len[i], ptr);</div><div class='add'>+		if (len &gt; sizeof(buf))</div><div class='add'>+			break;</div><div class='add'>+		err = err ?: bpf_dynptr_read(&amp;buf, len, &amp;ptr_buf, 0, 0);</div><div class='add'>+</div><div class='add'>+		if (err || bpf_memcmp(expected_str, buf, len))</div><div class='add'>+			err = 1;</div><div class='add'>+</div><div class='add'>+		/* Reset buffer and dynptr */</div><div class='add'>+		__builtin_memset(buf, 0, sizeof(buf));</div><div class='add'>+		err = err ?: bpf_dynptr_write(&amp;ptr_buf, 0, buf, len, 0);</div><div class='add'>+	}</div><div class='add'>+	bpf_ringbuf_discard_dynptr(&amp;ptr_buf, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void test_dynptr_probe_str(void *ptr,</div><div class='add'>+						  bpf_read_dynptr_fn_t bpf_read_dynptr_fn)</div><div class='add'>+{</div><div class='add'>+	char buf[sizeof(expected_str)];</div><div class='add'>+	struct bpf_dynptr ptr_buf;</div><div class='add'>+	__u32 cnt, i;</div><div class='add'>+</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bpf_ringbuf_reserve_dynptr(&amp;ringbuf, sizeof(buf), 0, &amp;ptr_buf);</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, ARRAY_SIZE(test_len)) {</div><div class='add'>+		__u32 len = test_len[i];</div><div class='add'>+</div><div class='add'>+		cnt = bpf_read_dynptr_fn(&amp;ptr_buf, 0, len, ptr);</div><div class='add'>+		if (cnt != len)</div><div class='add'>+			err = 1;</div><div class='add'>+</div><div class='add'>+		if (len &gt; sizeof(buf))</div><div class='add'>+			continue;</div><div class='add'>+		err = err ?: bpf_dynptr_read(&amp;buf, len, &amp;ptr_buf, 0, 0);</div><div class='add'>+		if (!len)</div><div class='add'>+			continue;</div><div class='add'>+		if (err || bpf_memcmp(expected_str, buf, len - 1) || buf[len - 1] != '\0')</div><div class='add'>+			err = 1;</div><div class='add'>+	}</div><div class='add'>+	bpf_ringbuf_discard_dynptr(&amp;ptr_buf, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void test_dynptr_probe_xdp(struct xdp_md *xdp, void *ptr,</div><div class='add'>+						  bpf_read_dynptr_fn_t bpf_read_dynptr_fn)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr ptr_xdp;</div><div class='add'>+	char buf[sizeof(expected_str)];</div><div class='add'>+	__u32 off, i;</div><div class='add'>+</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	off = xdp_near_frag_end_offset();</div><div class='add'>+	err = bpf_dynptr_from_xdp(xdp, 0, &amp;ptr_xdp);</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, ARRAY_SIZE(test_len)) {</div><div class='add'>+		__u32 len = test_len[i];</div><div class='add'>+</div><div class='add'>+		err = err ?: bpf_read_dynptr_fn(&amp;ptr_xdp, off, len, ptr);</div><div class='add'>+		if (len &gt; sizeof(buf))</div><div class='add'>+			continue;</div><div class='add'>+		err = err ?: bpf_dynptr_read(&amp;buf, len, &amp;ptr_xdp, off, 0);</div><div class='add'>+		if (err || bpf_memcmp(expected_str, buf, len))</div><div class='add'>+			err = 1;</div><div class='add'>+		/* Reset buffer and dynptr */</div><div class='add'>+		__builtin_memset(buf, 0, sizeof(buf));</div><div class='add'>+		err = err ?: bpf_dynptr_write(&amp;ptr_xdp, off, buf, len, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __always_inline void test_dynptr_probe_str_xdp(struct xdp_md *xdp, void *ptr,</div><div class='add'>+						      bpf_read_dynptr_fn_t bpf_read_dynptr_fn)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr ptr_xdp;</div><div class='add'>+	char buf[sizeof(expected_str)];</div><div class='add'>+	__u32 cnt, off, i;</div><div class='add'>+</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	off = xdp_near_frag_end_offset();</div><div class='add'>+	err = bpf_dynptr_from_xdp(xdp, 0, &amp;ptr_xdp);</div><div class='add'>+	if (err)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, ARRAY_SIZE(test_len)) {</div><div class='add'>+		__u32 len = test_len[i];</div><div class='add'>+</div><div class='add'>+		cnt = bpf_read_dynptr_fn(&amp;ptr_xdp, off, len, ptr);</div><div class='add'>+		if (cnt != len)</div><div class='add'>+			err = 1;</div><div class='add'>+</div><div class='add'>+		if (len &gt; sizeof(buf))</div><div class='add'>+			continue;</div><div class='add'>+		err = err ?: bpf_dynptr_read(&amp;buf, len, &amp;ptr_xdp, off, 0);</div><div class='add'>+</div><div class='add'>+		if (!len)</div><div class='add'>+			continue;</div><div class='add'>+		if (err || bpf_memcmp(expected_str, buf, len - 1) || buf[len - 1] != '\0')</div><div class='add'>+			err = 1;</div><div class='add'>+</div><div class='add'>+		__builtin_memset(buf, 0, sizeof(buf));</div><div class='add'>+		err = err ?: bpf_dynptr_write(&amp;ptr_xdp, off, buf, len, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int test_probe_read_user_dynptr(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	test_dynptr_probe(user_ptr, bpf_probe_read_user_dynptr);</div><div class='add'>+	if (!err)</div><div class='add'>+		test_dynptr_probe_xdp(xdp, user_ptr, bpf_probe_read_user_dynptr);</div><div class='add'>+	return XDP_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int test_probe_read_kernel_dynptr(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	test_dynptr_probe(expected_str, bpf_probe_read_kernel_dynptr);</div><div class='add'>+	if (!err)</div><div class='add'>+		test_dynptr_probe_xdp(xdp, expected_str, bpf_probe_read_kernel_dynptr);</div><div class='add'>+	return XDP_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int test_probe_read_user_str_dynptr(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	test_dynptr_probe_str(user_ptr, bpf_probe_read_user_str_dynptr);</div><div class='add'>+	if (!err)</div><div class='add'>+		test_dynptr_probe_str_xdp(xdp, user_ptr, bpf_probe_read_user_str_dynptr);</div><div class='add'>+	return XDP_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int test_probe_read_kernel_str_dynptr(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	test_dynptr_probe_str(expected_str, bpf_probe_read_kernel_str_dynptr);</div><div class='add'>+	if (!err)</div><div class='add'>+		test_dynptr_probe_str_xdp(xdp, expected_str, bpf_probe_read_kernel_str_dynptr);</div><div class='add'>+	return XDP_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry.s/" SYS_PREFIX "sys_nanosleep")</div><div class='add'>+int test_copy_from_user_dynptr(void *ctx)</div><div class='add'>+{</div><div class='add'>+	test_dynptr_probe(user_ptr, bpf_copy_from_user_dynptr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry.s/" SYS_PREFIX "sys_nanosleep")</div><div class='add'>+int test_copy_from_user_str_dynptr(void *ctx)</div><div class='add'>+{</div><div class='add'>+	test_dynptr_probe_str(user_ptr, bpf_copy_from_user_str_dynptr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_copy_data_from_user_task(struct bpf_dynptr *dptr, u64 off,</div><div class='add'>+					u64 size, const void *unsafe_ptr)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task = bpf_get_current_task_btf();</div><div class='add'>+</div><div class='add'>+	return bpf_copy_from_user_task_dynptr(dptr, off, size, unsafe_ptr, task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_copy_data_from_user_task_str(struct bpf_dynptr *dptr, u64 off,</div><div class='add'>+					    u64 size, const void *unsafe_ptr)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task = bpf_get_current_task_btf();</div><div class='add'>+</div><div class='add'>+	return bpf_copy_from_user_task_str_dynptr(dptr, off, size, unsafe_ptr, task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry.s/" SYS_PREFIX "sys_nanosleep")</div><div class='add'>+int test_copy_from_user_task_dynptr(void *ctx)</div><div class='add'>+{</div><div class='add'>+	test_dynptr_probe(user_ptr, bpf_copy_data_from_user_task);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry.s/" SYS_PREFIX "sys_nanosleep")</div><div class='add'>+int test_copy_from_user_task_str_dynptr(void *ctx)</div><div class='add'>+{</div><div class='add'>+	test_dynptr_probe_str(user_ptr, bpf_copy_data_from_user_task_str);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/exceptions_assert.c b/tools/testing/selftests/bpf/progs/exceptions_assert.c<br/>index 5e0a1ca96d4e..a01c2736890f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/exceptions_assert.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/exceptions_assert.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/exceptions_assert.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/exceptions_assert.c</a></div><div class='hunk'>@@ -18,43 +18,43 @@</div><div class='ctx'> 		return *(u64 *)num;					\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-__msg(": R0_w=0xffffffff80000000")</div><div class='add'>+__msg(": R0=0xffffffff80000000")</div><div class='ctx'> check_assert(s64, ==, eq_int_min, INT_MIN);</div><div class='del'>-__msg(": R0_w=0x7fffffff")</div><div class='add'>+__msg(": R0=0x7fffffff")</div><div class='ctx'> check_assert(s64, ==, eq_int_max, INT_MAX);</div><div class='del'>-__msg(": R0_w=0")</div><div class='add'>+__msg(": R0=0")</div><div class='ctx'> check_assert(s64, ==, eq_zero, 0);</div><div class='del'>-__msg(": R0_w=0x8000000000000000 R1_w=0x8000000000000000")</div><div class='add'>+__msg(": R0=0x8000000000000000 R1=0x8000000000000000")</div><div class='ctx'> check_assert(s64, ==, eq_llong_min, LLONG_MIN);</div><div class='del'>-__msg(": R0_w=0x7fffffffffffffff R1_w=0x7fffffffffffffff")</div><div class='add'>+__msg(": R0=0x7fffffffffffffff R1=0x7fffffffffffffff")</div><div class='ctx'> check_assert(s64, ==, eq_llong_max, LLONG_MAX);</div><div class='ctx'> </div><div class='del'>-__msg(": R0_w=scalar(id=1,smax=0x7ffffffe)")</div><div class='add'>+__msg(": R0=scalar(id=1,smax=0x7ffffffe)")</div><div class='ctx'> check_assert(s64, &lt;, lt_pos, INT_MAX);</div><div class='del'>-__msg(": R0_w=scalar(id=1,smax=-1,umin=0x8000000000000000,var_off=(0x8000000000000000; 0x7fffffffffffffff))")</div><div class='add'>+__msg(": R0=scalar(id=1,smax=-1,umin=0x8000000000000000,var_off=(0x8000000000000000; 0x7fffffffffffffff))")</div><div class='ctx'> check_assert(s64, &lt;, lt_zero, 0);</div><div class='del'>-__msg(": R0_w=scalar(id=1,smax=0xffffffff7fffffff")</div><div class='add'>+__msg(": R0=scalar(id=1,smax=0xffffffff7fffffff")</div><div class='ctx'> check_assert(s64, &lt;, lt_neg, INT_MIN);</div><div class='ctx'> </div><div class='del'>-__msg(": R0_w=scalar(id=1,smax=0x7fffffff)")</div><div class='add'>+__msg(": R0=scalar(id=1,smax=0x7fffffff)")</div><div class='ctx'> check_assert(s64, &lt;=, le_pos, INT_MAX);</div><div class='del'>-__msg(": R0_w=scalar(id=1,smax=0)")</div><div class='add'>+__msg(": R0=scalar(id=1,smax=0)")</div><div class='ctx'> check_assert(s64, &lt;=, le_zero, 0);</div><div class='del'>-__msg(": R0_w=scalar(id=1,smax=0xffffffff80000000")</div><div class='add'>+__msg(": R0=scalar(id=1,smax=0xffffffff80000000")</div><div class='ctx'> check_assert(s64, &lt;=, le_neg, INT_MIN);</div><div class='ctx'> </div><div class='del'>-__msg(": R0_w=scalar(id=1,smin=umin=0x80000000,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))")</div><div class='add'>+__msg(": R0=scalar(id=1,smin=umin=0x80000000,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))")</div><div class='ctx'> check_assert(s64, &gt;, gt_pos, INT_MAX);</div><div class='del'>-__msg(": R0_w=scalar(id=1,smin=umin=1,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))")</div><div class='add'>+__msg(": R0=scalar(id=1,smin=umin=1,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))")</div><div class='ctx'> check_assert(s64, &gt;, gt_zero, 0);</div><div class='del'>-__msg(": R0_w=scalar(id=1,smin=0xffffffff80000001")</div><div class='add'>+__msg(": R0=scalar(id=1,smin=0xffffffff80000001")</div><div class='ctx'> check_assert(s64, &gt;, gt_neg, INT_MIN);</div><div class='ctx'> </div><div class='del'>-__msg(": R0_w=scalar(id=1,smin=umin=0x7fffffff,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))")</div><div class='add'>+__msg(": R0=scalar(id=1,smin=umin=0x7fffffff,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))")</div><div class='ctx'> check_assert(s64, &gt;=, ge_pos, INT_MAX);</div><div class='del'>-__msg(": R0_w=scalar(id=1,smin=0,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))")</div><div class='add'>+__msg(": R0=scalar(id=1,smin=0,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))")</div><div class='ctx'> check_assert(s64, &gt;=, ge_zero, 0);</div><div class='del'>-__msg(": R0_w=scalar(id=1,smin=0xffffffff80000000")</div><div class='add'>+__msg(": R0=scalar(id=1,smin=0xffffffff80000000")</div><div class='ctx'> check_assert(s64, &gt;=, ge_neg, INT_MIN);</div><div class='ctx'> </div><div class='ctx'> SEC("?tc")</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/fd_htab_lookup.c b/tools/testing/selftests/bpf/progs/fd_htab_lookup.c<br/>new file mode 100644<br/>index 000000000000..a4a9e1db626f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/fd_htab_lookup.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/fd_htab_lookup.c</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2025. Huawei Technologies Co., Ltd */</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct inner_map_type {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(key_size, 4);</div><div class='add'>+	__uint(value_size, 4);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+} inner_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH_OF_MAPS);</div><div class='add'>+	__uint(max_entries, 64);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, int);</div><div class='add'>+	__array(values, struct inner_map_type);</div><div class='add'>+} outer_map SEC(".maps") = {</div><div class='add'>+	.values = {</div><div class='add'>+		[0] = &amp;inner_map,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/file_reader.c b/tools/testing/selftests/bpf/progs/file_reader.c<br/>new file mode 100644<br/>index 000000000000..4d756b623557<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/file_reader.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/file_reader.c</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "errno.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct elem);</div><div class='add'>+} arrmap SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct elem {</div><div class='add'>+	struct file *file;</div><div class='add'>+	struct bpf_task_work tw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+char user_buf[256000];</div><div class='add'>+char tmp_buf[256000];</div><div class='add'>+</div><div class='add'>+int pid = 0;</div><div class='add'>+int err, run_success = 0;</div><div class='add'>+</div><div class='add'>+static int validate_file_read(struct file *file);</div><div class='add'>+static int task_work_callback(struct bpf_map *map, void *key, void *value);</div><div class='add'>+</div><div class='add'>+SEC("lsm/file_open")</div><div class='add'>+int on_open_expect_fault(void *c)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr dynptr;</div><div class='add'>+	struct file *file;</div><div class='add'>+	int local_err = 1;</div><div class='add'>+	__u32 user_buf_sz = sizeof(user_buf);</div><div class='add'>+</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	file = bpf_get_task_exe_file(bpf_get_current_task_btf());</div><div class='add'>+	if (!file)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (bpf_dynptr_from_file(file, 0, &amp;dynptr))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	local_err = bpf_dynptr_read(tmp_buf, user_buf_sz, &amp;dynptr, user_buf_sz, 0);</div><div class='add'>+	if (local_err == -EFAULT) { /* Expect page fault */</div><div class='add'>+		local_err = 0;</div><div class='add'>+		run_success = 1;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	bpf_dynptr_file_discard(&amp;dynptr);</div><div class='add'>+	if (local_err)</div><div class='add'>+		err = local_err;</div><div class='add'>+	bpf_put_file(file);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm/file_open")</div><div class='add'>+int on_open_validate_file_read(void *c)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task = bpf_get_current_task_btf();</div><div class='add'>+	struct elem *work;</div><div class='add'>+	int key = 0;</div><div class='add'>+</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	work = bpf_map_lookup_elem(&amp;arrmap, &amp;key);</div><div class='add'>+	if (!work) {</div><div class='add'>+		err = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	bpf_task_work_schedule_signal_impl(task, &amp;work-&gt;tw, &amp;arrmap, task_work_callback, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called in a sleepable context, read 256K bytes, cross check with user space read data */</div><div class='add'>+static int task_work_callback(struct bpf_map *map, void *key, void *value)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task = bpf_get_current_task_btf();</div><div class='add'>+	struct file *file = bpf_get_task_exe_file(task);</div><div class='add'>+</div><div class='add'>+	if (!file)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = validate_file_read(file);</div><div class='add'>+	if (!err)</div><div class='add'>+		run_success = 1;</div><div class='add'>+	bpf_put_file(file);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int verify_dynptr_read(struct bpf_dynptr *ptr, u32 off, char *user_buf, u32 len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (bpf_dynptr_read(tmp_buf, len, ptr, off, 0))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* Verify file contents read from BPF is the same as the one read from userspace */</div><div class='add'>+	bpf_for(i, 0, len)</div><div class='add'>+	{</div><div class='add'>+		if (tmp_buf[i] != user_buf[i])</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int validate_file_read(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr dynptr;</div><div class='add'>+	int loc_err = 1, off;</div><div class='add'>+	__u32 user_buf_sz = sizeof(user_buf);</div><div class='add'>+</div><div class='add'>+	if (bpf_dynptr_from_file(file, 0, &amp;dynptr))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	loc_err = verify_dynptr_read(&amp;dynptr, 0, user_buf, user_buf_sz);</div><div class='add'>+	off = 1;</div><div class='add'>+	loc_err = loc_err ?: verify_dynptr_read(&amp;dynptr, off, user_buf + off, user_buf_sz - off);</div><div class='add'>+	off = user_buf_sz - 1;</div><div class='add'>+	loc_err = loc_err ?: verify_dynptr_read(&amp;dynptr, off, user_buf + off, user_buf_sz - off);</div><div class='add'>+	/* Read file with random offset and length */</div><div class='add'>+	off = 4097;</div><div class='add'>+	loc_err = loc_err ?: verify_dynptr_read(&amp;dynptr, off, user_buf + off, 100);</div><div class='add'>+</div><div class='add'>+	/* Adjust dynptr, verify read */</div><div class='add'>+	loc_err = loc_err ?: bpf_dynptr_adjust(&amp;dynptr, off, off + 1);</div><div class='add'>+	loc_err = loc_err ?: verify_dynptr_read(&amp;dynptr, 0, user_buf + off, 1);</div><div class='add'>+	/* Can't read more than 1 byte */</div><div class='add'>+	loc_err = loc_err ?: verify_dynptr_read(&amp;dynptr, 0, user_buf + off, 2) == 0;</div><div class='add'>+	/* Can't read with far offset */</div><div class='add'>+	loc_err = loc_err ?: verify_dynptr_read(&amp;dynptr, 1, user_buf + off, 1) == 0;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	bpf_dynptr_file_discard(&amp;dynptr);</div><div class='add'>+	return loc_err;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/file_reader_fail.c b/tools/testing/selftests/bpf/progs/file_reader_fail.c<br/>new file mode 100644<br/>index 000000000000..32fe28ed2439<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/file_reader_fail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/file_reader_fail.c</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+int err;</div><div class='add'>+void *user_ptr;</div><div class='add'>+</div><div class='add'>+SEC("lsm/file_open")</div><div class='add'>+__failure</div><div class='add'>+__msg("Unreleased reference id=")</div><div class='add'>+int on_nanosleep_unreleased_ref(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task = bpf_get_current_task_btf();</div><div class='add'>+	struct file *file = bpf_get_task_exe_file(task);</div><div class='add'>+	struct bpf_dynptr dynptr;</div><div class='add'>+</div><div class='add'>+	if (!file)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_from_file(file, 0, &amp;dynptr);</div><div class='add'>+	return err ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+__failure</div><div class='add'>+__msg("Expected a dynptr of type file as arg #0")</div><div class='add'>+int xdp_wrong_dynptr_type(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr dynptr;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_xdp(xdp, 0, &amp;dynptr);</div><div class='add'>+	bpf_dynptr_file_discard(&amp;dynptr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+__failure</div><div class='add'>+__msg("Expected an initialized dynptr as arg #0")</div><div class='add'>+int xdp_no_dynptr_type(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr dynptr;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_file_discard(&amp;dynptr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/for_each_hash_modify.c b/tools/testing/selftests/bpf/progs/for_each_hash_modify.c<br/>new file mode 100644<br/>index 000000000000..82307166f789<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/for_each_hash_modify.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/for_each_hash_modify.c</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Intel Corporation */</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__uint(max_entries, 128);</div><div class='add'>+	__type(key, __u64);</div><div class='add'>+	__type(value, __u64);</div><div class='add'>+} hashmap SEC(".maps");</div><div class='add'>+</div><div class='add'>+static int cb(struct bpf_map *map, __u64 *key, __u64 *val, void *arg)</div><div class='add'>+{</div><div class='add'>+	bpf_map_delete_elem(map, key);</div><div class='add'>+	bpf_map_update_elem(map, key, val, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int test_pkt_access(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	(void)skb;</div><div class='add'>+</div><div class='add'>+	bpf_for_each_map_elem(&amp;hashmap, cb, NULL, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/freplace_connect_v4_prog.c b/tools/testing/selftests/bpf/progs/freplace_connect_v4_prog.c<br/>index 544e5ac90461..d09bbd8ae8a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/freplace_connect_v4_prog.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/freplace_connect_v4_prog.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/freplace_connect_v4_prog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/freplace_connect_v4_prog.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> SEC("freplace/connect_v4_prog")</div><div class='ctx'> int new_connect_v4_prog(struct bpf_sock_addr *ctx)</div><div class='ctx'> {</div><div class='del'>-	// return value thats in invalid range</div><div class='add'>+	// return value that's in invalid range</div><div class='ctx'> 	return 255;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/htab_update.c b/tools/testing/selftests/bpf/progs/htab_update.c<br/>index 7481bb30b29b..195d3b2fba00 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/htab_update.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/htab_update.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/htab_update.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/htab_update.c</a></div><div class='hunk'>@@ -6,24 +6,31 @@</div><div class='ctx'> </div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='add'>+/* Map value type: has BTF-managed field (bpf_timer) */</div><div class='add'>+struct val {</div><div class='add'>+	struct bpf_timer t;</div><div class='add'>+	__u64 payload;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct {</div><div class='ctx'> 	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='ctx'> 	__uint(max_entries, 1);</div><div class='del'>-	__uint(key_size, sizeof(__u32));</div><div class='del'>-	__uint(value_size, sizeof(__u32));</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, struct val);</div><div class='ctx'> } htab SEC(".maps");</div><div class='ctx'> </div><div class='ctx'> int pid = 0;</div><div class='ctx'> int update_err = 0;</div><div class='ctx'> </div><div class='del'>-SEC("?fentry/lookup_elem_raw")</div><div class='del'>-int lookup_elem_raw(void *ctx)</div><div class='add'>+SEC("?fentry/bpf_obj_free_fields")</div><div class='add'>+int bpf_obj_free_fields(void *ctx)</div><div class='ctx'> {</div><div class='del'>-	__u32 key = 0, value = 1;</div><div class='add'>+	__u32 key = 0;</div><div class='add'>+	struct val value = { .payload = 1 };</div><div class='ctx'> </div><div class='ctx'> 	if ((bpf_get_current_pid_tgid() &gt;&gt; 32) != pid)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	update_err = bpf_map_update_elem(&amp;htab, &amp;key, &amp;value, 0);</div><div class='add'>+	update_err = bpf_map_update_elem(&amp;htab, &amp;key, &amp;value, BPF_ANY);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/ip_check_defrag.c b/tools/testing/selftests/bpf/progs/ip_check_defrag.c<br/>index 645b2c9f7867..0e87ad1ebcfa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/ip_check_defrag.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/ip_check_defrag.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/ip_check_defrag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/ip_check_defrag.c</a></div><div class='hunk'>@@ -12,11 +12,6 @@</div><div class='ctx'> #define IP_OFFSET		0x1FFF</div><div class='ctx'> #define NEXTHDR_FRAGMENT	44</div><div class='ctx'> </div><div class='del'>-extern int bpf_dynptr_from_skb(struct __sk_buff *skb, __u64 flags,</div><div class='del'>-			      struct bpf_dynptr *ptr__uninit) __ksym;</div><div class='del'>-extern void *bpf_dynptr_slice(const struct bpf_dynptr *ptr, uint32_t offset,</div><div class='del'>-			      void *buffer, uint32_t buffer__sz) __ksym;</div><div class='del'>-</div><div class='ctx'> volatile int shootdowns = 0;</div><div class='ctx'> </div><div class='ctx'> static bool is_frag_v4(struct iphdr *iph)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/irq.c b/tools/testing/selftests/bpf/progs/irq.c<br/>index b0b53d980964..74d912b22de9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/irq.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/irq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/irq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/irq.c</a></div><div class='hunk'>@@ -11,6 +11,9 @@ extern void bpf_local_irq_save(unsigned long *) __weak __ksym;</div><div class='ctx'> extern void bpf_local_irq_restore(unsigned long *) __weak __ksym;</div><div class='ctx'> extern int bpf_copy_from_user_str(void *dst, u32 dst__sz, const void *unsafe_ptr__ign, u64 flags) __weak __ksym;</div><div class='ctx'> </div><div class='add'>+struct bpf_res_spin_lock lockA __hidden SEC(".data.A");</div><div class='add'>+struct bpf_res_spin_lock lockB __hidden SEC(".data.B");</div><div class='add'>+</div><div class='ctx'> SEC("?tc")</div><div class='ctx'> __failure __msg("arg#0 doesn't point to an irq flag on stack")</div><div class='ctx'> int irq_save_bad_arg(struct __sk_buff *ctx)</div><div class='hunk'>@@ -222,7 +225,7 @@ int __noinline global_local_irq_balance(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("?tc")</div><div class='del'>-__failure __msg("global function calls are not allowed with IRQs disabled")</div><div class='add'>+__success</div><div class='ctx'> int irq_global_subprog(struct __sk_buff *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -441,4 +444,123 @@ int irq_ooo_refs_array(struct __sk_buff *ctx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int __noinline</div><div class='add'>+global_subprog(int i)</div><div class='add'>+{</div><div class='add'>+	if (i)</div><div class='add'>+		bpf_printk("%p", &amp;i);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_sleepable_helper_subprog(int i)</div><div class='add'>+{</div><div class='add'>+	if (i)</div><div class='add'>+		bpf_copy_from_user(&amp;i, sizeof(i), NULL);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_sleepable_kfunc_subprog(int i)</div><div class='add'>+{</div><div class='add'>+	if (i)</div><div class='add'>+		bpf_copy_from_user_str(&amp;i, sizeof(i), NULL, 0);</div><div class='add'>+	global_subprog(i);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_subprog_calling_sleepable_global(int i)</div><div class='add'>+{</div><div class='add'>+	if (!i)</div><div class='add'>+		global_sleepable_kfunc_subprog(i);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?syscall")</div><div class='add'>+__success</div><div class='add'>+int irq_non_sleepable_global_subprog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	bpf_local_irq_save(&amp;flags);</div><div class='add'>+	global_subprog(0);</div><div class='add'>+	bpf_local_irq_restore(&amp;flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?syscall")</div><div class='add'>+__failure __msg("global functions that may sleep are not allowed in non-sleepable context")</div><div class='add'>+int irq_sleepable_helper_global_subprog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	bpf_local_irq_save(&amp;flags);</div><div class='add'>+	global_sleepable_helper_subprog(0);</div><div class='add'>+	bpf_local_irq_restore(&amp;flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?syscall")</div><div class='add'>+__failure __msg("global functions that may sleep are not allowed in non-sleepable context")</div><div class='add'>+int irq_sleepable_global_subprog_indirect(void *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	bpf_local_irq_save(&amp;flags);</div><div class='add'>+	global_subprog_calling_sleepable_global(0);</div><div class='add'>+	bpf_local_irq_restore(&amp;flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("cannot restore irq state out of order")</div><div class='add'>+int irq_ooo_lock_cond_inv(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags1, flags2;</div><div class='add'>+</div><div class='add'>+	if (bpf_res_spin_lock_irqsave(&amp;lockA, &amp;flags1))</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_res_spin_lock_irqsave(&amp;lockB, &amp;flags2)) {</div><div class='add'>+		bpf_res_spin_unlock_irqrestore(&amp;lockA, &amp;flags1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_res_spin_unlock_irqrestore(&amp;lockB, &amp;flags1);</div><div class='add'>+	bpf_res_spin_unlock_irqrestore(&amp;lockA, &amp;flags2);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("function calls are not allowed")</div><div class='add'>+int irq_wrong_kfunc_class_1(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags1;</div><div class='add'>+</div><div class='add'>+	if (bpf_res_spin_lock_irqsave(&amp;lockA, &amp;flags1))</div><div class='add'>+		return 0;</div><div class='add'>+	/* For now, bpf_local_irq_restore is not allowed in critical section,</div><div class='add'>+	 * but this test ensures error will be caught with kfunc_class when it's</div><div class='add'>+	 * opened up. Tested by temporarily permitting this kfunc in critical</div><div class='add'>+	 * section.</div><div class='add'>+	 */</div><div class='add'>+	bpf_local_irq_restore(&amp;flags1);</div><div class='add'>+	bpf_res_spin_unlock_irqrestore(&amp;lockA, &amp;flags1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("function calls are not allowed")</div><div class='add'>+int irq_wrong_kfunc_class_2(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags1, flags2;</div><div class='add'>+</div><div class='add'>+	bpf_local_irq_save(&amp;flags1);</div><div class='add'>+	if (bpf_res_spin_lock_irqsave(&amp;lockA, &amp;flags2))</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_local_irq_restore(&amp;flags2);</div><div class='add'>+	bpf_res_spin_unlock_irqrestore(&amp;lockA, &amp;flags1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/iters.c b/tools/testing/selftests/bpf/progs/iters.c<br/>index 190822b2f08b..7dd92a303bf6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/iters.c</a></div><div class='hunk'>@@ -1175,6 +1175,122 @@ __naked int loop_state_deps2(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("?raw_tp")</div><div class='add'>+__failure</div><div class='add'>+__msg("math between fp pointer and register with unbounded")</div><div class='add'>+__flag(BPF_F_TEST_STATE_FREQ)</div><div class='add'>+__naked int loop_state_deps3(void)</div><div class='add'>+{</div><div class='add'>+	/* This is equivalent to a C program below.</div><div class='add'>+	 *</div><div class='add'>+	 *   if (random() != 24) {       // assume false branch is placed first</div><div class='add'>+	 *     i = iter_new();           // fp[-8]</div><div class='add'>+	 *     while (iter_next(i));</div><div class='add'>+	 *     iter_destroy(i);</div><div class='add'>+	 *     return;</div><div class='add'>+	 *   }</div><div class='add'>+	 *</div><div class='add'>+	 *   for (i = 10; i &gt; 0; i--);   // increase dfs_depth for child states</div><div class='add'>+	 *</div><div class='add'>+	 *   i = iter_new();             // fp[-8]</div><div class='add'>+	 *   b = -24;                    // r8</div><div class='add'>+	 *   for (;;) {                  // checkpoint (L)</div><div class='add'>+	 *     if (iter_next(i))         // checkpoint (N)</div><div class='add'>+	 *       break;</div><div class='add'>+	 *     if (random() == 77) {     // assume false branch is placed first</div><div class='add'>+	 *       *(u64 *)(r10 + b) = 7;  // this is not safe when b == -25</div><div class='add'>+	 *       iter_destroy(i);</div><div class='add'>+	 *       return;</div><div class='add'>+	 *     }</div><div class='add'>+	 *     if (random() == 42) {     // assume false branch is placed first</div><div class='add'>+	 *       b = -25;</div><div class='add'>+	 *     }</div><div class='add'>+	 *   }</div><div class='add'>+	 *   iter_destroy(i);</div><div class='add'>+	 *</div><div class='add'>+	 * In case of a buggy verifier first loop might poison</div><div class='add'>+	 * env-&gt;cur_state-&gt;loop_entry with a state having 0 branches</div><div class='add'>+	 * and small dfs_depth. This would trigger NOT_EXACT states</div><div class='add'>+	 * comparison for some states within second loop.</div><div class='add'>+	 * Specifically, checkpoint (L) might be problematic if:</div><div class='add'>+	 * - branch with '*(u64 *)(r10 + b) = 7' is not explored yet;</div><div class='add'>+	 * - checkpoint (L) is first reached in state {b=-24};</div><div class='add'>+	 * - traversal is pruned at checkpoint (N) setting checkpoint's (L)</div><div class='add'>+	 *   branch count to 0, thus making it eligible for use in pruning;</div><div class='add'>+	 * - checkpoint (L) is next reached in state {b=-25},</div><div class='add'>+	 *   this would cause NOT_EXACT comparison with a state {b=-24}</div><div class='add'>+	 *   while 'b' is not marked precise yet.</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"if r0 == 24 goto 2f;"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"r2 = 0;"</div><div class='add'>+		"r3 = 5;"</div><div class='add'>+		"call %[bpf_iter_num_new];"</div><div class='add'>+	"1:"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"call %[bpf_iter_num_next];"</div><div class='add'>+		"if r0 != 0 goto 1b;"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"call %[bpf_iter_num_destroy];"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+	"2:"</div><div class='add'>+		/* loop to increase dfs_depth */</div><div class='add'>+		"r0 = 10;"</div><div class='add'>+	"3:"</div><div class='add'>+		"r0 -= 1;"</div><div class='add'>+		"if r0 != 0 goto 3b;"</div><div class='add'>+		/* end of loop */</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"r2 = 0;"</div><div class='add'>+		"r3 = 10;"</div><div class='add'>+		"call %[bpf_iter_num_new];"</div><div class='add'>+		"r8 = -24;"</div><div class='add'>+	"main_loop_%=:"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"call %[bpf_iter_num_next];"</div><div class='add'>+		"if r0 == 0 goto main_loop_end_%=;"</div><div class='add'>+		/* first if */</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"if r0 == 77 goto unsafe_write_%=;"</div><div class='add'>+		/* second if */</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"if r0 == 42 goto poison_r8_%=;"</div><div class='add'>+		/* iterate */</div><div class='add'>+		"goto main_loop_%=;"</div><div class='add'>+	"main_loop_end_%=:"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"call %[bpf_iter_num_destroy];"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+</div><div class='add'>+	"unsafe_write_%=:"</div><div class='add'>+		"r0 = r10;"</div><div class='add'>+		"r0 += r8;"</div><div class='add'>+		"r1 = 7;"</div><div class='add'>+		"*(u64 *)(r0 + 0) = r1;"</div><div class='add'>+		"goto main_loop_end_%=;"</div><div class='add'>+</div><div class='add'>+	"poison_r8_%=:"</div><div class='add'>+		"r8 = -25;"</div><div class='add'>+		"goto main_loop_%=;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_get_prandom_u32),</div><div class='add'>+		  __imm(bpf_iter_num_new),</div><div class='add'>+		  __imm(bpf_iter_num_next),</div><div class='add'>+		  __imm(bpf_iter_num_destroy)</div><div class='add'>+		: __clobber_all</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?raw_tp")</div><div class='ctx'> __success</div><div class='ctx'> __naked int triple_continue(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1512,4 +1628,302 @@ int iter_destroy_bad_arg(const void *ctx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("raw_tp")</div><div class='add'>+__success</div><div class='add'>+int clean_live_states(const void *ctx)</div><div class='add'>+{</div><div class='add'>+	char buf[1];</div><div class='add'>+	int i, j, k, l, m, n, o;</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, 10)</div><div class='add'>+	bpf_for(j, 0, 10)</div><div class='add'>+	bpf_for(k, 0, 10)</div><div class='add'>+	bpf_for(l, 0, 10)</div><div class='add'>+	bpf_for(m, 0, 10)</div><div class='add'>+	bpf_for(n, 0, 10)</div><div class='add'>+	bpf_for(o, 0, 10) {</div><div class='add'>+		if (unlikely(bpf_get_prandom_u32()))</div><div class='add'>+			buf[0] = 42;</div><div class='add'>+		bpf_printk("%s", buf);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?raw_tp")</div><div class='add'>+__flag(BPF_F_TEST_STATE_FREQ)</div><div class='add'>+__failure __msg("misaligned stack access off 0+-31+0 size 8")</div><div class='add'>+__naked int absent_mark_in_the_middle_state(void)</div><div class='add'>+{</div><div class='add'>+	/* This is equivalent to C program below.</div><div class='add'>+	 *</div><div class='add'>+	 * r8 = bpf_get_prandom_u32();</div><div class='add'>+	 * r6 = -32;</div><div class='add'>+	 * bpf_iter_num_new(&amp;fp[-8], 0, 10);</div><div class='add'>+	 * if (unlikely(bpf_get_prandom_u32()))</div><div class='add'>+	 *   r6 = -31;</div><div class='add'>+	 * while (bpf_iter_num_next(&amp;fp[-8])) {</div><div class='add'>+	 *   if (unlikely(bpf_get_prandom_u32()))</div><div class='add'>+	 *     *(fp + r6) = 7;</div><div class='add'>+	 * }</div><div class='add'>+	 * bpf_iter_num_destroy(&amp;fp[-8])</div><div class='add'>+	 * return 0</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"r8 = r0;"</div><div class='add'>+		"r7 = 0;"</div><div class='add'>+		"r6 = -32;"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"*(u64 *)(r10 - 16) = r0;"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"r2 = 0;"</div><div class='add'>+		"r3 = 10;"</div><div class='add'>+		"call %[bpf_iter_num_new];"</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"if r0 == r8 goto change_r6_%=;"</div><div class='add'>+	"loop_%=:"</div><div class='add'>+		"call noop;"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"call %[bpf_iter_num_next];"</div><div class='add'>+		"if r0 == 0 goto loop_end_%=;"</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"if r0 == r8 goto use_r6_%=;"</div><div class='add'>+		"goto loop_%=;"</div><div class='add'>+	"loop_end_%=:"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"call %[bpf_iter_num_destroy];"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+	"use_r6_%=:"</div><div class='add'>+		"r0 = r10;"</div><div class='add'>+		"r0 += r6;"</div><div class='add'>+		"r1 = 7;"</div><div class='add'>+		"*(u64 *)(r0 + 0) = r1;"</div><div class='add'>+		"goto loop_%=;"</div><div class='add'>+	"change_r6_%=:"</div><div class='add'>+		"r6 = -31;"</div><div class='add'>+		"goto loop_%=;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_iter_num_new),</div><div class='add'>+		  __imm(bpf_iter_num_next),</div><div class='add'>+		  __imm(bpf_iter_num_destroy),</div><div class='add'>+		  __imm(bpf_get_prandom_u32)</div><div class='add'>+		: __clobber_all</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__used __naked</div><div class='add'>+static int noop(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?raw_tp")</div><div class='add'>+__flag(BPF_F_TEST_STATE_FREQ)</div><div class='add'>+__failure __msg("misaligned stack access off 0+-31+0 size 8")</div><div class='add'>+__naked int absent_mark_in_the_middle_state2(void)</div><div class='add'>+{</div><div class='add'>+	/* This is equivalent to C program below.</div><div class='add'>+	 *</div><div class='add'>+	 *     r8 = bpf_get_prandom_u32();</div><div class='add'>+	 *     r6 = -32;</div><div class='add'>+	 *     bpf_iter_num_new(&amp;fp[-8], 0, 10);</div><div class='add'>+	 *     if (unlikely(bpf_get_prandom_u32())) {</div><div class='add'>+	 *       r6 = -31;</div><div class='add'>+	 * jump_into_loop:</div><div class='add'>+	 *       goto +0;</div><div class='add'>+	 *       goto loop;</div><div class='add'>+	 *     }</div><div class='add'>+	 *     if (unlikely(bpf_get_prandom_u32()))</div><div class='add'>+	 *       goto jump_into_loop;</div><div class='add'>+	 * loop:</div><div class='add'>+	 *     while (bpf_iter_num_next(&amp;fp[-8])) {</div><div class='add'>+	 *       if (unlikely(bpf_get_prandom_u32()))</div><div class='add'>+	 *         *(fp + r6) = 7;</div><div class='add'>+	 *     }</div><div class='add'>+	 *     bpf_iter_num_destroy(&amp;fp[-8])</div><div class='add'>+	 *     return 0</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"r8 = r0;"</div><div class='add'>+		"r7 = 0;"</div><div class='add'>+		"r6 = -32;"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"*(u64 *)(r10 - 16) = r0;"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"r2 = 0;"</div><div class='add'>+		"r3 = 10;"</div><div class='add'>+		"call %[bpf_iter_num_new];"</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"if r0 == r8 goto change_r6_%=;"</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"if r0 == r8 goto jump_into_loop_%=;"</div><div class='add'>+	"loop_%=:"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"call %[bpf_iter_num_next];"</div><div class='add'>+		"if r0 == 0 goto loop_end_%=;"</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"if r0 == r8 goto use_r6_%=;"</div><div class='add'>+		"goto loop_%=;"</div><div class='add'>+	"loop_end_%=:"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"call %[bpf_iter_num_destroy];"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+	"use_r6_%=:"</div><div class='add'>+		"r0 = r10;"</div><div class='add'>+		"r0 += r6;"</div><div class='add'>+		"r1 = 7;"</div><div class='add'>+		"*(u64 *)(r0 + 0) = r1;"</div><div class='add'>+		"goto loop_%=;"</div><div class='add'>+	"change_r6_%=:"</div><div class='add'>+		"r6 = -31;"</div><div class='add'>+	"jump_into_loop_%=: "</div><div class='add'>+		"goto +0;"</div><div class='add'>+		"goto loop_%=;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_iter_num_new),</div><div class='add'>+		  __imm(bpf_iter_num_next),</div><div class='add'>+		  __imm(bpf_iter_num_destroy),</div><div class='add'>+		  __imm(bpf_get_prandom_u32)</div><div class='add'>+		: __clobber_all</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?raw_tp")</div><div class='add'>+__flag(BPF_F_TEST_STATE_FREQ)</div><div class='add'>+__failure __msg("misaligned stack access off 0+-31+0 size 8")</div><div class='add'>+__naked int absent_mark_in_the_middle_state3(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * bpf_iter_num_new(&amp;fp[-8], 0, 10)</div><div class='add'>+	 * loop1(-32, &amp;fp[-8])</div><div class='add'>+	 * loop1_wrapper(&amp;fp[-8])</div><div class='add'>+	 * bpf_iter_num_destroy(&amp;fp[-8])</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"r2 = 0;"</div><div class='add'>+		"r3 = 10;"</div><div class='add'>+		"call %[bpf_iter_num_new];"</div><div class='add'>+		/* call #1 */</div><div class='add'>+		"r1 = -32;"</div><div class='add'>+		"r2 = r10;"</div><div class='add'>+		"r2 += -8;"</div><div class='add'>+		"call loop1;"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"call %[bpf_iter_num_destroy];"</div><div class='add'>+		/* call #2 */</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"r2 = 0;"</div><div class='add'>+		"r3 = 10;"</div><div class='add'>+		"call %[bpf_iter_num_new];"</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"call loop1_wrapper;"</div><div class='add'>+		/* return */</div><div class='add'>+		"r1 = r10;"</div><div class='add'>+		"r1 += -8;"</div><div class='add'>+		"call %[bpf_iter_num_destroy];"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_iter_num_new),</div><div class='add'>+		  __imm(bpf_iter_num_destroy),</div><div class='add'>+		  __imm(bpf_get_prandom_u32)</div><div class='add'>+		: __clobber_all</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__used __naked</div><div class='add'>+static int loop1(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 *  int loop1(num, iter) {</div><div class='add'>+	 *     r6 = num;</div><div class='add'>+	 *     r7 = iter;</div><div class='add'>+	 *     while (bpf_iter_num_next(r7)) {</div><div class='add'>+	 *       if (unlikely(bpf_get_prandom_u32()))</div><div class='add'>+	 *         *(fp + r6) = 7;</div><div class='add'>+	 *     }</div><div class='add'>+	 *     return 0</div><div class='add'>+	 *  }</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r6 = r1;"</div><div class='add'>+		"r7 = r2;"</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"r8 = r0;"</div><div class='add'>+	"loop_%=:"</div><div class='add'>+		"r1 = r7;"</div><div class='add'>+		"call %[bpf_iter_num_next];"</div><div class='add'>+		"if r0 == 0 goto loop_end_%=;"</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"if r0 == r8 goto use_r6_%=;"</div><div class='add'>+		"goto loop_%=;"</div><div class='add'>+	"loop_end_%=:"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+	"use_r6_%=:"</div><div class='add'>+		"r0 = r10;"</div><div class='add'>+		"r0 += r6;"</div><div class='add'>+		"r1 = 7;"</div><div class='add'>+		"*(u64 *)(r0 + 0) = r1;"</div><div class='add'>+		"goto loop_%=;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_iter_num_next),</div><div class='add'>+		  __imm(bpf_get_prandom_u32)</div><div class='add'>+		: __clobber_all</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__used __naked</div><div class='add'>+static int loop1_wrapper(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 *  int loop1_wrapper(iter) {</div><div class='add'>+	 *    r6 = -32;</div><div class='add'>+	 *    r7 = iter;</div><div class='add'>+	 *    if (unlikely(bpf_get_prandom_u32()))</div><div class='add'>+	 *      r6 = -31;</div><div class='add'>+	 *    loop1(r6, r7);</div><div class='add'>+	 *    return 0;</div><div class='add'>+	 *  }</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r6 = -32;"</div><div class='add'>+		"r7 = r1;"</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"r8 = r0;"</div><div class='add'>+		"call %[bpf_get_prandom_u32];"</div><div class='add'>+		"if r0 == r8 goto change_r6_%=;"</div><div class='add'>+	"loop_%=:"</div><div class='add'>+		"r1 = r6;"</div><div class='add'>+		"r2 = r7;"</div><div class='add'>+		"call loop1;"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+	"change_r6_%=:"</div><div class='add'>+		"r6 = -31;"</div><div class='add'>+		"goto loop_%=;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_iter_num_next),</div><div class='add'>+		  __imm(bpf_get_prandom_u32)</div><div class='add'>+		: __clobber_all</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/iters_looping.c b/tools/testing/selftests/bpf/progs/iters_looping.c<br/>index 05fa5ce7fc59..d00fd570255a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters_looping.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters_looping.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters_looping.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/iters_looping.c</a></div><div class='hunk'>@@ -161,3 +161,56 @@ int simplest_loop(void *ctx)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+__used</div><div class='add'>+static void iterator_with_diff_stack_depth(int x)</div><div class='add'>+{</div><div class='add'>+	struct bpf_iter_num iter;</div><div class='add'>+</div><div class='add'>+	asm volatile (</div><div class='add'>+		"if r1 == 42 goto 0f;"</div><div class='add'>+		"*(u64 *)(r10 - 128) = 0;"</div><div class='add'>+	"0:"</div><div class='add'>+		/* create iterator */</div><div class='add'>+		"r1 = %[iter];"</div><div class='add'>+		"r2 = 0;"</div><div class='add'>+		"r3 = 10;"</div><div class='add'>+		"call %[bpf_iter_num_new];"</div><div class='add'>+	"1:"</div><div class='add'>+		/* consume next item */</div><div class='add'>+		"r1 = %[iter];"</div><div class='add'>+		"call %[bpf_iter_num_next];"</div><div class='add'>+		"if r0 == 0 goto 2f;"</div><div class='add'>+		"goto 1b;"</div><div class='add'>+	"2:"</div><div class='add'>+		/* destroy iterator */</div><div class='add'>+		"r1 = %[iter];"</div><div class='add'>+		"call %[bpf_iter_num_destroy];"</div><div class='add'>+		:</div><div class='add'>+		: __imm_ptr(iter), ITER_HELPERS</div><div class='add'>+		: __clobber_common, "r6"</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__success</div><div class='add'>+__naked int widening_stack_size_bug(void *ctx)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Depending on iterator_with_diff_stack_depth() parameter value,</div><div class='add'>+	 * subprogram stack depth is either 8 or 128 bytes. Arrange values so</div><div class='add'>+	 * that it is 128 on a first call and 8 on a second. This triggered a</div><div class='add'>+	 * bug in verifier's widen_imprecise_scalars() logic.</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r6 = 0;"</div><div class='add'>+		"r1 = 0;"</div><div class='add'>+	"1:"</div><div class='add'>+		"call iterator_with_diff_stack_depth;"</div><div class='add'>+		"r1 = 42;"</div><div class='add'>+		"r6 += 1;"</div><div class='add'>+		"if r6 &lt; 2 goto 1b;"</div><div class='add'>+		"r0 = 0;"</div><div class='add'>+		"exit;"</div><div class='add'>+		::: __clobber_all);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/iters_state_safety.c b/tools/testing/selftests/bpf/progs/iters_state_safety.c<br/>index f41257eadbb2..d273b46dfc7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters_state_safety.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters_state_safety.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters_state_safety.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/iters_state_safety.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@ int force_clang_to_emit_btf_for_externs(void *ctx)</div><div class='ctx'> </div><div class='ctx'> SEC("?raw_tp")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("fp-8_w=iter_num(ref_id=1,state=active,depth=0)")</div><div class='add'>+__msg("fp-8=iter_num(ref_id=1,state=active,depth=0)")</div><div class='ctx'> int create_and_destroy(void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_iter_num iter;</div><div class='hunk'>@@ -196,7 +196,7 @@ int leak_iter_from_subprog_fail(void *ctx)</div><div class='ctx'> </div><div class='ctx'> SEC("?raw_tp")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("fp-8_w=iter_num(ref_id=1,state=active,depth=0)")</div><div class='add'>+__msg("fp-8=iter_num(ref_id=1,state=active,depth=0)")</div><div class='ctx'> int valid_stack_reuse(void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_iter_num iter;</div><div class='hunk'>@@ -345,7 +345,7 @@ int __naked read_from_iter_slot_fail(void)</div><div class='ctx'> 		"r3 = 1000;"</div><div class='ctx'> 		"call %[bpf_iter_num_new];"</div><div class='ctx'> </div><div class='del'>-		/* attemp to leak bpf_iter_num state */</div><div class='add'>+		/* attempt to leak bpf_iter_num state */</div><div class='ctx'> 		"r7 = *(u64 *)(r6 + 0);"</div><div class='ctx'> 		"r8 = *(u64 *)(r6 + 8);"</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/iters_task_failure.c b/tools/testing/selftests/bpf/progs/iters_task_failure.c<br/>index 6b1588d70652..fe3663dedbe1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters_task_failure.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters_task_failure.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters_task_failure.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/iters_task_failure.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@ void bpf_rcu_read_lock(void) __ksym;</div><div class='ctx'> void bpf_rcu_read_unlock(void) __ksym;</div><div class='ctx'> </div><div class='ctx'> SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='del'>-__failure __msg("expected an RCU CS when using bpf_iter_task_next")</div><div class='add'>+__failure __msg("kernel func bpf_iter_task_new requires RCU critical section protection")</div><div class='ctx'> int BPF_PROG(iter_tasks_without_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *pos;</div><div class='hunk'>@@ -27,7 +27,7 @@ int BPF_PROG(iter_tasks_without_lock)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='del'>-__failure __msg("expected an RCU CS when using bpf_iter_css_next")</div><div class='add'>+__failure __msg("kernel func bpf_iter_css_new requires RCU critical section protection")</div><div class='ctx'> int BPF_PROG(iter_css_without_lock)</div><div class='ctx'> {</div><div class='ctx'> 	u64 cg_id = bpf_get_current_cgroup_id();</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/iters_testmod.c b/tools/testing/selftests/bpf/progs/iters_testmod.c<br/>index 9e4b45201e69..5379e9960ffd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters_testmod.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters_testmod.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters_testmod.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/iters_testmod.c</a></div><div class='hunk'>@@ -123,3 +123,49 @@ out:</div><div class='ctx'> 	bpf_iter_num_destroy(&amp;num_it);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+__failure __msg("kernel func bpf_kfunc_ret_rcu_test requires RCU critical section protection")</div><div class='add'>+int iter_ret_rcu_test_protected(const void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *p;</div><div class='add'>+</div><div class='add'>+	p = bpf_kfunc_ret_rcu_test();</div><div class='add'>+	return p-&gt;pid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+__failure __msg("R1 type=rcu_ptr_or_null_ expected=")</div><div class='add'>+int iter_ret_rcu_test_type(const void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *p;</div><div class='add'>+</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	p = bpf_kfunc_ret_rcu_test();</div><div class='add'>+	bpf_this_cpu_ptr(p);</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+__failure __msg("kernel func bpf_kfunc_ret_rcu_test_nostruct requires RCU critical section protection")</div><div class='add'>+int iter_ret_rcu_test_protected_nostruct(const void *ctx)</div><div class='add'>+{</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	p = bpf_kfunc_ret_rcu_test_nostruct(4);</div><div class='add'>+	return *(int *)p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+__failure __msg("R1 type=rdonly_rcu_mem_or_null expected=")</div><div class='add'>+int iter_ret_rcu_test_type_nostruct(const void *ctx)</div><div class='add'>+{</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	p = bpf_kfunc_ret_rcu_test_nostruct(4);</div><div class='add'>+	bpf_this_cpu_ptr(p);</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/iters_testmod_seq.c b/tools/testing/selftests/bpf/progs/iters_testmod_seq.c<br/>index 6543d5b6e0a9..83791348bed5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters_testmod_seq.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/iters_testmod_seq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/iters_testmod_seq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/iters_testmod_seq.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@ __s64 res_empty;</div><div class='ctx'> </div><div class='ctx'> SEC("raw_tp/sys_enter")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("fp-16_w=iter_testmod_seq(ref_id=1,state=active,depth=0)")</div><div class='add'>+__msg("fp-16=iter_testmod_seq(ref_id=1,state=active,depth=0)")</div><div class='ctx'> __msg("fp-16=iter_testmod_seq(ref_id=1,state=drained,depth=0)")</div><div class='ctx'> __msg("call bpf_iter_testmod_seq_destroy")</div><div class='ctx'> int testmod_seq_empty(const void *ctx)</div><div class='hunk'>@@ -38,7 +38,7 @@ __s64 res_full;</div><div class='ctx'> </div><div class='ctx'> SEC("raw_tp/sys_enter")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("fp-16_w=iter_testmod_seq(ref_id=1,state=active,depth=0)")</div><div class='add'>+__msg("fp-16=iter_testmod_seq(ref_id=1,state=active,depth=0)")</div><div class='ctx'> __msg("fp-16=iter_testmod_seq(ref_id=1,state=drained,depth=0)")</div><div class='ctx'> __msg("call bpf_iter_testmod_seq_destroy")</div><div class='ctx'> int testmod_seq_full(const void *ctx)</div><div class='hunk'>@@ -58,7 +58,7 @@ static volatile int zero = 0;</div><div class='ctx'> </div><div class='ctx'> SEC("raw_tp/sys_enter")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("fp-16_w=iter_testmod_seq(ref_id=1,state=active,depth=0)")</div><div class='add'>+__msg("fp-16=iter_testmod_seq(ref_id=1,state=active,depth=0)")</div><div class='ctx'> __msg("fp-16=iter_testmod_seq(ref_id=1,state=drained,depth=0)")</div><div class='ctx'> __msg("call bpf_iter_testmod_seq_destroy")</div><div class='ctx'> int testmod_seq_truncated(const void *ctx)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/kprobe_write_ctx.c b/tools/testing/selftests/bpf/progs/kprobe_write_ctx.c<br/>new file mode 100644<br/>index 000000000000..f77aef0474d3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/kprobe_write_ctx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/kprobe_write_ctx.c</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+#if defined(__TARGET_ARCH_x86)</div><div class='add'>+SEC("kprobe")</div><div class='add'>+int kprobe_write_ctx(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	ctx-&gt;ax = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("kprobe.multi")</div><div class='add'>+int kprobe_multi_write_ctx(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	ctx-&gt;ax = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/linked_list_fail.c b/tools/testing/selftests/bpf/progs/linked_list_fail.c<br/>index 6438982b928b..ddd26d1a083f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/linked_list_fail.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/linked_list_fail.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/linked_list_fail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/linked_list_fail.c</a></div><div class='hunk'>@@ -226,8 +226,7 @@ int obj_new_no_composite(void *ctx)</div><div class='ctx'> SEC("?tc")</div><div class='ctx'> int obj_new_no_struct(void *ctx)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	bpf_obj_new(union { int data; unsigned udata; });</div><div class='add'>+	(void)bpf_obj_new(union { int data; unsigned udata; });</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -252,7 +251,7 @@ int new_null_ret(void *ctx)</div><div class='ctx'> SEC("?tc")</div><div class='ctx'> int obj_new_acq(void *ctx)</div><div class='ctx'> {</div><div class='del'>-	bpf_obj_new(struct foo);</div><div class='add'>+	(void)bpf_obj_new(struct foo);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/linked_list_peek.c b/tools/testing/selftests/bpf/progs/linked_list_peek.c<br/>new file mode 100644<br/>index 000000000000..264e81bfb287<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/linked_list_peek.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/linked_list_peek.c</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+</div><div class='add'>+struct node_data {</div><div class='add'>+	struct bpf_list_node l;</div><div class='add'>+	int key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define private(name) SEC(".data." #name) __hidden __attribute__((aligned(8)))</div><div class='add'>+private(A) struct bpf_spin_lock glock;</div><div class='add'>+private(A) struct bpf_list_head ghead __contains(node_data, l);</div><div class='add'>+</div><div class='add'>+#define list_entry(ptr, type, member) container_of(ptr, type, member)</div><div class='add'>+#define NR_NODES 16</div><div class='add'>+</div><div class='add'>+int zero = 0;</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__retval(0)</div><div class='add'>+long list_peek(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_list_node *l_n;</div><div class='add'>+	struct node_data *n;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;glock);</div><div class='add'>+	l_n = bpf_list_front(&amp;ghead);</div><div class='add'>+	bpf_spin_unlock(&amp;glock);</div><div class='add'>+	if (l_n)</div><div class='add'>+		return __LINE__;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;glock);</div><div class='add'>+	l_n = bpf_list_back(&amp;ghead);</div><div class='add'>+	bpf_spin_unlock(&amp;glock);</div><div class='add'>+	if (l_n)</div><div class='add'>+		return __LINE__;</div><div class='add'>+</div><div class='add'>+	for (i = zero; i &lt; NR_NODES &amp;&amp; can_loop; i++) {</div><div class='add'>+		n = bpf_obj_new(typeof(*n));</div><div class='add'>+		if (!n)</div><div class='add'>+			return __LINE__;</div><div class='add'>+		n-&gt;key = i;</div><div class='add'>+		bpf_spin_lock(&amp;glock);</div><div class='add'>+		bpf_list_push_back(&amp;ghead, &amp;n-&gt;l);</div><div class='add'>+		bpf_spin_unlock(&amp;glock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;glock);</div><div class='add'>+</div><div class='add'>+	l_n = bpf_list_front(&amp;ghead);</div><div class='add'>+	if (!l_n) {</div><div class='add'>+		err = __LINE__;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n = list_entry(l_n, struct node_data, l);</div><div class='add'>+	if (n-&gt;key != 0) {</div><div class='add'>+		err = __LINE__;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	l_n = bpf_list_back(&amp;ghead);</div><div class='add'>+	if (!l_n) {</div><div class='add'>+		err = __LINE__;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n = list_entry(l_n, struct node_data, l);</div><div class='add'>+	if (n-&gt;key != NR_NODES - 1) {</div><div class='add'>+		err = __LINE__;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	bpf_spin_unlock(&amp;glock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TEST_FB(op, dolock)					\</div><div class='add'>+SEC("syscall")							\</div><div class='add'>+__failure __msg(MSG)						\</div><div class='add'>+long test_##op##_spinlock_##dolock(void *ctx)			\</div><div class='add'>+{								\</div><div class='add'>+	struct bpf_list_node *l_n;				\</div><div class='add'>+	__u64 jiffies = 0;					\</div><div class='add'>+								\</div><div class='add'>+	if (dolock)						\</div><div class='add'>+		bpf_spin_lock(&amp;glock);				\</div><div class='add'>+	l_n = bpf_list_##op(&amp;ghead);				\</div><div class='add'>+	if (l_n)						\</div><div class='add'>+		jiffies = bpf_jiffies64();			\</div><div class='add'>+	if (dolock)						\</div><div class='add'>+		bpf_spin_unlock(&amp;glock);			\</div><div class='add'>+								\</div><div class='add'>+	return !!jiffies;					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MSG "call bpf_list_{{(front|back).+}}; R0{{(_w)?}}=ptr_or_null_node_data(id={{[0-9]+}},non_own_ref"</div><div class='add'>+TEST_FB(front, true)</div><div class='add'>+TEST_FB(back, true)</div><div class='add'>+#undef MSG</div><div class='add'>+</div><div class='add'>+#define MSG "bpf_spin_lock at off=0 must be held for bpf_list_head"</div><div class='add'>+TEST_FB(front, false)</div><div class='add'>+TEST_FB(back, false)</div><div class='add'>+#undef MSG</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/livepatch_trampoline.c b/tools/testing/selftests/bpf/progs/livepatch_trampoline.c<br/>new file mode 100644<br/>index 000000000000..15579d5bcd91<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/livepatch_trampoline.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/livepatch_trampoline.c</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+</div><div class='add'>+int fentry_hit;</div><div class='add'>+int fexit_hit;</div><div class='add'>+int my_pid;</div><div class='add'>+</div><div class='add'>+SEC("fentry/cmdline_proc_show")</div><div class='add'>+int BPF_PROG(fentry_cmdline)</div><div class='add'>+{</div><div class='add'>+	if (my_pid != (bpf_get_current_pid_tgid() &gt;&gt; 32))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	fentry_hit = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fexit/cmdline_proc_show")</div><div class='add'>+int BPF_PROG(fexit_cmdline)</div><div class='add'>+{</div><div class='add'>+	if (my_pid != (bpf_get_current_pid_tgid() &gt;&gt; 32))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	fexit_hit = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/loop1.c b/tools/testing/selftests/bpf/progs/loop1.c<br/>index 50e66772c046..b0fa26fb4760 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/loop1.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/loop1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/loop1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/loop1.c</a></div><div class='hunk'>@@ -1,11 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> // Copyright (c) 2019 Facebook</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;stdint.h&gt;</div><div class='del'>-#include &lt;stddef.h&gt;</div><div class='del'>-#include &lt;stdbool.h&gt;</div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include "vmlinux.h"</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/loop2.c b/tools/testing/selftests/bpf/progs/loop2.c<br/>index 947bb7e988c2..0227409d4b0e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/loop2.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/loop2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/loop2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/loop2.c</a></div><div class='hunk'>@@ -1,11 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> // Copyright (c) 2019 Facebook</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;stdint.h&gt;</div><div class='del'>-#include &lt;stddef.h&gt;</div><div class='del'>-#include &lt;stdbool.h&gt;</div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include "vmlinux.h"</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/loop3.c b/tools/testing/selftests/bpf/progs/loop3.c<br/>index 717dab14322b..5d1c9a775e6b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/loop3.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/loop3.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/loop3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/loop3.c</a></div><div class='hunk'>@@ -1,11 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> // Copyright (c) 2019 Facebook</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;stdint.h&gt;</div><div class='del'>-#include &lt;stddef.h&gt;</div><div class='del'>-#include &lt;stdbool.h&gt;</div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include "vmlinux.h"</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/loop6.c b/tools/testing/selftests/bpf/progs/loop6.c<br/>index e4ff97fbcce1..dd36aff4fba3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/loop6.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/loop6.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/loop6.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/loop6.c</a></div><div class='hunk'>@@ -1,8 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;stddef.h&gt;</div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_core_read.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='hunk'>@@ -26,12 +25,6 @@ char _license[] SEC("license") = "GPL";</div><div class='ctx'> #define SG_CHAIN	0x01UL</div><div class='ctx'> #define SG_END		0x02UL</div><div class='ctx'> </div><div class='del'>-struct scatterlist {</div><div class='del'>-	unsigned long   page_link;</div><div class='del'>-	unsigned int    offset;</div><div class='del'>-	unsigned int    length;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define sg_is_chain(sg)		((sg)-&gt;page_link &amp; SG_CHAIN)</div><div class='ctx'> #define sg_is_last(sg)		((sg)-&gt;page_link &amp; SG_END)</div><div class='ctx'> #define sg_chain_ptr(sg)	\</div><div class='hunk'>@@ -62,7 +55,7 @@ static inline struct scatterlist *get_sgp(struct scatterlist **sgs, int i)</div><div class='ctx'> 	return sgp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int config = 0;</div><div class='add'>+int run_once = 0;</div><div class='ctx'> int result = 0;</div><div class='ctx'> </div><div class='ctx'> SEC("kprobe/virtqueue_add_sgs")</div><div class='hunk'>@@ -73,14 +66,14 @@ int BPF_KPROBE(trace_virtqueue_add_sgs, void *unused, struct scatterlist **sgs,</div><div class='ctx'> 	__u64 length1 = 0, length2 = 0;</div><div class='ctx'> 	unsigned int i, n, len;</div><div class='ctx'> </div><div class='del'>-	if (config != 0)</div><div class='add'>+	if (run_once != 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; (i &lt; VIRTIO_MAX_SGS) &amp;&amp; (i &lt; out_sgs); i++) {</div><div class='ctx'> 		__sink(out_sgs);</div><div class='ctx'> 		for (n = 0, sgp = get_sgp(sgs, i); sgp &amp;&amp; (n &lt; SG_MAX);</div><div class='ctx'> 		     sgp = __sg_next(sgp)) {</div><div class='del'>-			bpf_probe_read_kernel(&amp;len, sizeof(len), &amp;sgp-&gt;length);</div><div class='add'>+			len = BPF_CORE_READ(sgp, length);</div><div class='ctx'> 			length1 += len;</div><div class='ctx'> 			n++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -90,13 +83,13 @@ int BPF_KPROBE(trace_virtqueue_add_sgs, void *unused, struct scatterlist **sgs,</div><div class='ctx'> 		__sink(in_sgs);</div><div class='ctx'> 		for (n = 0, sgp = get_sgp(sgs, i); sgp &amp;&amp; (n &lt; SG_MAX);</div><div class='ctx'> 		     sgp = __sg_next(sgp)) {</div><div class='del'>-			bpf_probe_read_kernel(&amp;len, sizeof(len), &amp;sgp-&gt;length);</div><div class='add'>+			len = BPF_CORE_READ(sgp, length);</div><div class='ctx'> 			length2 += len;</div><div class='ctx'> 			n++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	config = 1;</div><div class='add'>+	run_once = 1;</div><div class='ctx'> 	result = length2 - length1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/lpm_trie.h b/tools/testing/selftests/bpf/progs/lpm_trie.h<br/>new file mode 100644<br/>index 000000000000..76aa5821807f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/lpm_trie.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/lpm_trie.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#ifndef __PROGS_LPM_TRIE_H</div><div class='add'>+#define __PROGS_LPM_TRIE_H</div><div class='add'>+</div><div class='add'>+struct trie_key {</div><div class='add'>+	__u32 prefixlen;</div><div class='add'>+	__u32 data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Benchmark operations */</div><div class='add'>+enum {</div><div class='add'>+	LPM_OP_NOOP = 0,</div><div class='add'>+	LPM_OP_BASELINE,</div><div class='add'>+	LPM_OP_LOOKUP,</div><div class='add'>+	LPM_OP_INSERT,</div><div class='add'>+	LPM_OP_UPDATE,</div><div class='add'>+	LPM_OP_DELETE,</div><div class='add'>+	LPM_OP_FREE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return values from run_bench.</div><div class='add'>+ *</div><div class='add'>+ * Negative values are also allowed and represent kernel error codes.</div><div class='add'>+ */</div><div class='add'>+#define LPM_BENCH_SUCCESS	0</div><div class='add'>+#define LPM_BENCH_REINIT_MAP 	1	/* Reset trie to initial state for current op */</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/lpm_trie_bench.c b/tools/testing/selftests/bpf/progs/lpm_trie_bench.c<br/>new file mode 100644<br/>index 000000000000..a0e6ebd5507a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/lpm_trie_bench.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/lpm_trie_bench.c</a></div><div class='hunk'>@@ -0,0 +1,230 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Cloudflare */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_core_read.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "bpf_atomic.h"</div><div class='add'>+#include "progs/lpm_trie.h"</div><div class='add'>+</div><div class='add'>+#define BPF_OBJ_NAME_LEN 16U</div><div class='add'>+#define MAX_ENTRIES 100000000</div><div class='add'>+#define NR_LOOPS 10000</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+/* Filled by userspace. See fill_map() in bench_lpm_trie_map.c */</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_LPM_TRIE);</div><div class='add'>+	__type(key, struct trie_key);</div><div class='add'>+	__type(value, __u32);</div><div class='add'>+	__uint(map_flags, BPF_F_NO_PREALLOC);</div><div class='add'>+	__uint(max_entries, MAX_ENTRIES);</div><div class='add'>+} trie_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+long hits;</div><div class='add'>+long duration_ns;</div><div class='add'>+</div><div class='add'>+/* Configured from userspace */</div><div class='add'>+__u32 nr_entries;</div><div class='add'>+__u32 prefixlen;</div><div class='add'>+bool random;</div><div class='add'>+__u8 op;</div><div class='add'>+</div><div class='add'>+static __u64 latency_free_start;</div><div class='add'>+</div><div class='add'>+SEC("fentry/bpf_map_free_deferred")</div><div class='add'>+int BPF_PROG(trie_free_entry, struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct bpf_map *map = container_of(work, struct bpf_map, work);</div><div class='add'>+	char name[BPF_OBJ_NAME_LEN];</div><div class='add'>+	u32 map_type;</div><div class='add'>+</div><div class='add'>+	map_type = BPF_CORE_READ(map, map_type);</div><div class='add'>+	if (map_type != BPF_MAP_TYPE_LPM_TRIE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ideally we'd have access to the map ID but that's already</div><div class='add'>+	 * freed before we enter trie_free().</div><div class='add'>+	 */</div><div class='add'>+	BPF_CORE_READ_STR_INTO(&amp;name, map, name);</div><div class='add'>+	if (bpf_strncmp(name, BPF_OBJ_NAME_LEN, "trie_free_map"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	latency_free_start = bpf_ktime_get_ns();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fexit/bpf_map_free_deferred")</div><div class='add'>+int BPF_PROG(trie_free_exit, struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	__u64 val;</div><div class='add'>+</div><div class='add'>+	if (!latency_free_start)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	val = bpf_ktime_get_ns() - latency_free_start;</div><div class='add'>+	latency_free_start = 0;</div><div class='add'>+</div><div class='add'>+	__sync_add_and_fetch(&amp;duration_ns, val);</div><div class='add'>+	__sync_add_and_fetch(&amp;hits, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __u32 cur_key;</div><div class='add'>+</div><div class='add'>+static __always_inline void generate_key(struct trie_key *key)</div><div class='add'>+{</div><div class='add'>+	key-&gt;prefixlen = prefixlen;</div><div class='add'>+</div><div class='add'>+	if (random)</div><div class='add'>+		key-&gt;data = bpf_get_prandom_u32() % nr_entries;</div><div class='add'>+	else</div><div class='add'>+		key-&gt;data = cur_key++ % nr_entries;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int noop(__u32 index, __u32 *unused)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int baseline(__u32 index, __u32 *unused)</div><div class='add'>+{</div><div class='add'>+	struct trie_key key;</div><div class='add'>+	__u32 blackbox = 0;</div><div class='add'>+</div><div class='add'>+	generate_key(&amp;key);</div><div class='add'>+	/* Avoid compiler optimizing out the modulo */</div><div class='add'>+	barrier_var(blackbox);</div><div class='add'>+	blackbox = READ_ONCE(key.data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lookup(__u32 index, int *retval)</div><div class='add'>+{</div><div class='add'>+	struct trie_key key;</div><div class='add'>+</div><div class='add'>+	generate_key(&amp;key);</div><div class='add'>+	if (!bpf_map_lookup_elem(&amp;trie_map, &amp;key)) {</div><div class='add'>+		*retval = -ENOENT;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int insert(__u32 index, int *retval)</div><div class='add'>+{</div><div class='add'>+	struct trie_key key;</div><div class='add'>+	u32 val = 1;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	generate_key(&amp;key);</div><div class='add'>+	err = bpf_map_update_elem(&amp;trie_map, &amp;key, &amp;val, BPF_NOEXIST);</div><div class='add'>+	if (err) {</div><div class='add'>+		*retval = err;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Is this the last entry? */</div><div class='add'>+	if (key.data == nr_entries - 1) {</div><div class='add'>+		/* For atomicity concerns, see the comment in delete() */</div><div class='add'>+		*retval = LPM_BENCH_REINIT_MAP;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update(__u32 index, int *retval)</div><div class='add'>+{</div><div class='add'>+	struct trie_key key;</div><div class='add'>+	u32 val = 1;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	generate_key(&amp;key);</div><div class='add'>+	err = bpf_map_update_elem(&amp;trie_map, &amp;key, &amp;val, BPF_EXIST);</div><div class='add'>+	if (err) {</div><div class='add'>+		*retval = err;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int delete(__u32 index, int *retval)</div><div class='add'>+{</div><div class='add'>+	struct trie_key key;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	generate_key(&amp;key);</div><div class='add'>+	err = bpf_map_delete_elem(&amp;trie_map, &amp;key);</div><div class='add'>+	if (err) {</div><div class='add'>+		*retval = err;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do we need to refill the map? */</div><div class='add'>+	if (key.data == nr_entries - 1) {</div><div class='add'>+		/*</div><div class='add'>+		 * Atomicity isn't required because DELETE only supports</div><div class='add'>+		 * one producer running concurrently. What we need is a</div><div class='add'>+		 * way to track how many entries have been deleted from</div><div class='add'>+		 * the trie between consecutive invocations of the BPF</div><div class='add'>+		 * prog because a single bpf_loop() call might not</div><div class='add'>+		 * delete all entries, e.g. when NR_LOOPS &lt; nr_entries.</div><div class='add'>+		 */</div><div class='add'>+		*retval = LPM_BENCH_REINIT_MAP;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int BPF_PROG(run_bench)</div><div class='add'>+{</div><div class='add'>+	int err = LPM_BENCH_SUCCESS;</div><div class='add'>+	u64 start, delta;</div><div class='add'>+	int loops;</div><div class='add'>+</div><div class='add'>+	start = bpf_ktime_get_ns();</div><div class='add'>+</div><div class='add'>+	switch (op) {</div><div class='add'>+	case LPM_OP_NOOP:</div><div class='add'>+		loops = bpf_loop(NR_LOOPS, noop, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	case LPM_OP_BASELINE:</div><div class='add'>+		loops = bpf_loop(NR_LOOPS, baseline, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	case LPM_OP_LOOKUP:</div><div class='add'>+		loops = bpf_loop(NR_LOOPS, lookup, &amp;err, 0);</div><div class='add'>+		break;</div><div class='add'>+	case LPM_OP_INSERT:</div><div class='add'>+		loops = bpf_loop(NR_LOOPS, insert, &amp;err, 0);</div><div class='add'>+		break;</div><div class='add'>+	case LPM_OP_UPDATE:</div><div class='add'>+		loops = bpf_loop(NR_LOOPS, update, &amp;err, 0);</div><div class='add'>+		break;</div><div class='add'>+	case LPM_OP_DELETE:</div><div class='add'>+		loops = bpf_loop(NR_LOOPS, delete, &amp;err, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		bpf_printk("invalid benchmark operation\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delta = bpf_ktime_get_ns() - start;</div><div class='add'>+</div><div class='add'>+	__sync_add_and_fetch(&amp;duration_ns, delta);</div><div class='add'>+	__sync_add_and_fetch(&amp;hits, loops);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/lpm_trie_map.c b/tools/testing/selftests/bpf/progs/lpm_trie_map.c<br/>new file mode 100644<br/>index 000000000000..6e60d686b664<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/lpm_trie_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/lpm_trie_map.c</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX_ENTRIES 100000000</div><div class='add'>+</div><div class='add'>+struct trie_key {</div><div class='add'>+	__u32 prefixlen;</div><div class='add'>+	__u32 data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_LPM_TRIE);</div><div class='add'>+	__type(key, struct trie_key);</div><div class='add'>+	__type(value, __u32);</div><div class='add'>+	__uint(map_flags, BPF_F_NO_PREALLOC);</div><div class='add'>+	__uint(max_entries, MAX_ENTRIES);</div><div class='add'>+} trie_free_map SEC(".maps");</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/lsm.c b/tools/testing/selftests/bpf/progs/lsm.c<br/>index 0c13b7409947..7de173daf27b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/lsm.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/lsm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/lsm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/lsm.c</a></div><div class='hunk'>@@ -89,14 +89,16 @@ SEC("lsm/file_mprotect")</div><div class='ctx'> int BPF_PROG(test_int_hook, struct vm_area_struct *vma,</div><div class='ctx'> 	     unsigned long reqprot, unsigned long prot, int ret)</div><div class='ctx'> {</div><div class='del'>-	if (ret != 0)</div><div class='add'>+	struct mm_struct *mm = vma-&gt;vm_mm;</div><div class='add'>+</div><div class='add'>+	if (ret != 0 || !mm)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	__s32 pid = bpf_get_current_pid_tgid() &gt;&gt; 32;</div><div class='ctx'> 	int is_stack = 0;</div><div class='ctx'> </div><div class='del'>-	is_stack = (vma-&gt;vm_start &lt;= vma-&gt;vm_mm-&gt;start_stack &amp;&amp;</div><div class='del'>-		    vma-&gt;vm_end &gt;= vma-&gt;vm_mm-&gt;start_stack);</div><div class='add'>+	is_stack = (vma-&gt;vm_start &lt;= mm-&gt;start_stack &amp;&amp;</div><div class='add'>+		    vma-&gt;vm_end &gt;= mm-&gt;start_stack);</div><div class='ctx'> </div><div class='ctx'> 	if (is_stack &amp;&amp; monitored_pid == pid) {</div><div class='ctx'> 		mprotect_count++;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/lsm_tailcall.c b/tools/testing/selftests/bpf/progs/lsm_tailcall.c<br/>index 49c075ce2d4c..6e7e58051e64 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/lsm_tailcall.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/lsm_tailcall.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/lsm_tailcall.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/lsm_tailcall.c</a></div><div class='hunk'>@@ -20,14 +20,14 @@ int lsm_file_permission_prog(void *ctx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("lsm/file_alloc_security")</div><div class='del'>-int lsm_file_alloc_security_prog(void *ctx)</div><div class='add'>+SEC("lsm/kernfs_init_security")</div><div class='add'>+int lsm_kernfs_init_security_prog(void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("lsm/file_alloc_security")</div><div class='del'>-int lsm_file_alloc_security_entry(void *ctx)</div><div class='add'>+SEC("lsm/kernfs_init_security")</div><div class='add'>+int lsm_kernfs_init_security_entry(void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	bpf_tail_call_static(ctx, &amp;jmp_table, 0);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/map_excl.c b/tools/testing/selftests/bpf/progs/map_excl.c<br/>new file mode 100644<br/>index 000000000000..d461684728e4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/map_excl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/map_excl.c</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2025 Google LLC. */</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;time.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u32);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+} excl_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+int should_have_access(void *ctx)</div><div class='add'>+{</div><div class='add'>+	int key = 0, value = 0xdeadbeef;</div><div class='add'>+</div><div class='add'>+	bpf_map_update_elem(&amp;excl_map, &amp;key, &amp;value, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+int should_not_have_access(void *ctx)</div><div class='add'>+{</div><div class='add'>+	int key = 0, value = 0xdeadbeef;</div><div class='add'>+</div><div class='add'>+	bpf_map_update_elem(&amp;excl_map, &amp;key, &amp;value, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/mem_rdonly_untrusted.c b/tools/testing/selftests/bpf/progs/mem_rdonly_untrusted.c<br/>new file mode 100644<br/>index 000000000000..3b984b6ae7c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/mem_rdonly_untrusted.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/mem_rdonly_untrusted.c</a></div><div class='hunk'>@@ -0,0 +1,229 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_core_read.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "../test_kmods/bpf_testmod_kfunc.h"</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/sys_enter")</div><div class='add'>+__success</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("r8 = *(u64 *)(r7 +0)          ; R7=ptr_nameidata(off={{[0-9]+}}) R8=rdonly_untrusted_mem(sz=0)")</div><div class='add'>+__msg("r9 = *(u8 *)(r8 +0)           ; R8=rdonly_untrusted_mem(sz=0) R9=scalar")</div><div class='add'>+int btf_id_to_ptr_mem(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	struct nameidata *idata;</div><div class='add'>+	u64 ret, off;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	idata = task-&gt;nameidata;</div><div class='add'>+	off = bpf_core_field_offset(struct nameidata, pathname);</div><div class='add'>+	/*</div><div class='add'>+	 * asm block to have reliable match target for __msg, equivalent of:</div><div class='add'>+	 *   ret = task-&gt;nameidata-&gt;pathname[0];</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r7 = %[idata];"</div><div class='add'>+	"r7 += %[off];"</div><div class='add'>+	"r8 = *(u64 *)(r7 + 0);"</div><div class='add'>+	"r9 = *(u8 *)(r8 + 0);"</div><div class='add'>+	"%[ret] = r9;"</div><div class='add'>+	: [ret]"=r"(ret)</div><div class='add'>+	: [idata]"r"(idata),</div><div class='add'>+	  [off]"r"(off)</div><div class='add'>+	: "r7", "r8", "r9");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__success</div><div class='add'>+__retval(0)</div><div class='add'>+int ldx_is_ok_bad_addr(void *ctx)</div><div class='add'>+{</div><div class='add'>+	char *p;</div><div class='add'>+</div><div class='add'>+	if (!bpf_core_enum_value_exists(enum bpf_features, BPF_FEAT_RDONLY_CAST_TO_VOID))</div><div class='add'>+		return 42;</div><div class='add'>+</div><div class='add'>+	p = bpf_rdonly_cast(0, 0);</div><div class='add'>+	return p[0x7fff];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__success</div><div class='add'>+__retval(1)</div><div class='add'>+int ldx_is_ok_good_addr(void *ctx)</div><div class='add'>+{</div><div class='add'>+	int v, *p;</div><div class='add'>+</div><div class='add'>+	v = 1;</div><div class='add'>+	p = bpf_rdonly_cast(&amp;v, 0);</div><div class='add'>+	return *p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__success</div><div class='add'>+int offset_not_tracked(void *ctx)</div><div class='add'>+{</div><div class='add'>+	int *p, i, s;</div><div class='add'>+</div><div class='add'>+	p = bpf_rdonly_cast(0, 0);</div><div class='add'>+	s = 0;</div><div class='add'>+	bpf_for(i, 0, 1000 * 1000 * 1000) {</div><div class='add'>+		p++;</div><div class='add'>+		s += *p;</div><div class='add'>+	}</div><div class='add'>+	return s;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure</div><div class='add'>+__msg("cannot write into rdonly_untrusted_mem")</div><div class='add'>+int stx_not_ok(void *ctx)</div><div class='add'>+{</div><div class='add'>+	int v, *p;</div><div class='add'>+</div><div class='add'>+	v = 1;</div><div class='add'>+	p = bpf_rdonly_cast(&amp;v, 0);</div><div class='add'>+	*p = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure</div><div class='add'>+__msg("cannot write into rdonly_untrusted_mem")</div><div class='add'>+int atomic_not_ok(void *ctx)</div><div class='add'>+{</div><div class='add'>+	int v, *p;</div><div class='add'>+</div><div class='add'>+	v = 1;</div><div class='add'>+	p = bpf_rdonly_cast(&amp;v, 0);</div><div class='add'>+	__sync_fetch_and_add(p, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure</div><div class='add'>+__msg("cannot write into rdonly_untrusted_mem")</div><div class='add'>+int atomic_rmw_not_ok(void *ctx)</div><div class='add'>+{</div><div class='add'>+	long v, *p;</div><div class='add'>+</div><div class='add'>+	v = 1;</div><div class='add'>+	p = bpf_rdonly_cast(&amp;v, 0);</div><div class='add'>+	return __sync_val_compare_and_swap(p, 0, 42);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure</div><div class='add'>+__msg("invalid access to memory, mem_size=0 off=0 size=4")</div><div class='add'>+__msg("R1 min value is outside of the allowed memory range")</div><div class='add'>+int kfunc_param_not_ok(void *ctx)</div><div class='add'>+{</div><div class='add'>+	int *p;</div><div class='add'>+</div><div class='add'>+	p = bpf_rdonly_cast(0, 0);</div><div class='add'>+	bpf_kfunc_trusted_num_test(p);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+__failure</div><div class='add'>+__msg("R1 type=rdonly_untrusted_mem expected=")</div><div class='add'>+int helper_param_not_ok(void *ctx)</div><div class='add'>+{</div><div class='add'>+	char *p;</div><div class='add'>+</div><div class='add'>+	p = bpf_rdonly_cast(0, 0);</div><div class='add'>+	/*</div><div class='add'>+	 * Any helper with ARG_CONST_SIZE_OR_ZERO constraint will do,</div><div class='add'>+	 * the most permissive constraint</div><div class='add'>+	 */</div><div class='add'>+	bpf_copy_from_user(p, 0, (void *)42);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __noinline u64 *get_some_addr(void)</div><div class='add'>+{</div><div class='add'>+	if (bpf_get_prandom_u32())</div><div class='add'>+		return bpf_rdonly_cast(0, bpf_core_type_id_kernel(struct sock));</div><div class='add'>+	else</div><div class='add'>+		return bpf_rdonly_cast(0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__success</div><div class='add'>+__retval(0)</div><div class='add'>+int mixed_mem_type(void *ctx)</div><div class='add'>+{</div><div class='add'>+	u64 *p;</div><div class='add'>+</div><div class='add'>+	/* Try to avoid compiler hoisting load to if branches by using __noinline func. */</div><div class='add'>+	p = get_some_addr();</div><div class='add'>+	return *p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__attribute__((__aligned__(8)))</div><div class='add'>+u8 global[] = {</div><div class='add'>+	0x11, 0x22, 0x33, 0x44,</div><div class='add'>+	0x55, 0x66, 0x77, 0x88,</div><div class='add'>+	0x99</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+__always_inline</div><div class='add'>+static u64 combine(void *p)</div><div class='add'>+{</div><div class='add'>+	u64 acc;</div><div class='add'>+</div><div class='add'>+	acc = 0;</div><div class='add'>+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='add'>+	acc |= (*(u64 *)p &gt;&gt; 56) &lt;&lt; 24;</div><div class='add'>+	acc |= (*(u32 *)p &gt;&gt; 24) &lt;&lt; 16;</div><div class='add'>+	acc |= (*(u16 *)p &gt;&gt; 8)  &lt;&lt; 8;</div><div class='add'>+	acc |= *(u8 *)p;</div><div class='add'>+#else</div><div class='add'>+	acc |= (*(u64 *)p &amp; 0xff) &lt;&lt; 24;</div><div class='add'>+	acc |= (*(u32 *)p &amp; 0xff) &lt;&lt; 16;</div><div class='add'>+	acc |= (*(u16 *)p &amp; 0xff) &lt;&lt; 8;</div><div class='add'>+	acc |= *(u8 *)p;</div><div class='add'>+#endif</div><div class='add'>+	return acc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__retval(0x88442211)</div><div class='add'>+int diff_size_access(void *ctx)</div><div class='add'>+{</div><div class='add'>+	return combine(bpf_rdonly_cast(&amp;global, 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__retval(0x99553322)</div><div class='add'>+int misaligned_access(void *ctx)</div><div class='add'>+{</div><div class='add'>+	return combine(bpf_rdonly_cast(&amp;global, 0) + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__weak int return_one(void)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__success</div><div class='add'>+__retval(1)</div><div class='add'>+int null_check(void *ctx)</div><div class='add'>+{</div><div class='add'>+	int *p;</div><div class='add'>+</div><div class='add'>+	p = bpf_rdonly_cast(0, 0);</div><div class='add'>+	if (p == 0)</div><div class='add'>+		/* make this a function call to avoid compiler</div><div class='add'>+		 * moving r0 assignment before check.</div><div class='add'>+		 */</div><div class='add'>+		return return_one();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/mptcp_sockmap.c b/tools/testing/selftests/bpf/progs/mptcp_sockmap.c<br/>new file mode 100644<br/>index 000000000000..d4eef0cbadb9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/mptcp_sockmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/mptcp_sockmap.c</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include "bpf_tracing_net.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+int sk_index;</div><div class='add'>+int redirect_idx;</div><div class='add'>+int trace_port;</div><div class='add'>+int helper_ret;</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_SOCKMAP);</div><div class='add'>+	__uint(key_size, sizeof(__u32));</div><div class='add'>+	__uint(value_size, sizeof(__u32));</div><div class='add'>+	__uint(max_entries, 100);</div><div class='add'>+} sock_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("sockops")</div><div class='add'>+int mptcp_sockmap_inject(struct bpf_sock_ops *skops)</div><div class='add'>+{</div><div class='add'>+	struct bpf_sock *sk;</div><div class='add'>+</div><div class='add'>+	/* only accept specified connection */</div><div class='add'>+	if (skops-&gt;local_port != trace_port ||</div><div class='add'>+	    skops-&gt;op != BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	sk = skops-&gt;sk;</div><div class='add'>+	if (!sk)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* update sk handler */</div><div class='add'>+	helper_ret = bpf_sock_map_update(skops, &amp;sock_map, &amp;sk_index, BPF_NOEXIST);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sk_skb/stream_verdict")</div><div class='add'>+int mptcp_sockmap_redirect(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* redirect skb to the sk under sock_map[redirect_idx] */</div><div class='add'>+	return bpf_sk_redirect_map(skb, &amp;sock_map, redirect_idx, 0);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/mptcp_subflow.c b/tools/testing/selftests/bpf/progs/mptcp_subflow.c<br/>index 70302477e326..41389e579578 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/mptcp_subflow.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/mptcp_subflow.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/mptcp_subflow.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/mptcp_subflow.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ int _getsockopt_subflow(struct bpf_sockopt *ctx)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	msk = bpf_core_cast(sk, struct mptcp_sock);</div><div class='del'>-	if (msk-&gt;pm.subflows != 1) {</div><div class='add'>+	if (msk-&gt;pm.extra_subflows != 1) {</div><div class='ctx'> 		ctx-&gt;retval = -1;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/net_timestamping.c b/tools/testing/selftests/bpf/progs/net_timestamping.c<br/>new file mode 100644<br/>index 000000000000..b4c2f0f2be11<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/net_timestamping.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/net_timestamping.c</a></div><div class='hunk'>@@ -0,0 +1,248 @@</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include "bpf_tracing_net.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "bpf_kfuncs.h"</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+</div><div class='add'>+__u32 monitored_pid = 0;</div><div class='add'>+</div><div class='add'>+int nr_active;</div><div class='add'>+int nr_snd;</div><div class='add'>+int nr_passive;</div><div class='add'>+int nr_sched;</div><div class='add'>+int nr_txsw;</div><div class='add'>+int nr_ack;</div><div class='add'>+</div><div class='add'>+struct sk_stg {</div><div class='add'>+	__u64 sendmsg_ns;	/* record ts when sendmsg is called */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sk_tskey {</div><div class='add'>+	u64 cookie;</div><div class='add'>+	u32 tskey;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct delay_info {</div><div class='add'>+	u64 sendmsg_ns;		/* record ts when sendmsg is called */</div><div class='add'>+	u32 sched_delay;	/* SCHED_CB - sendmsg_ns */</div><div class='add'>+	u32 snd_sw_delay;	/* SND_SW_CB - SCHED_CB */</div><div class='add'>+	u32 ack_delay;		/* ACK_CB - SND_SW_CB */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_SK_STORAGE);</div><div class='add'>+	__uint(map_flags, BPF_F_NO_PREALLOC);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct sk_stg);</div><div class='add'>+} sk_stg_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__type(key, struct sk_tskey);</div><div class='add'>+	__type(value, struct delay_info);</div><div class='add'>+	__uint(max_entries, 1024);</div><div class='add'>+} time_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+static u64 delay_tolerance_nsec = 10000000000; /* 10 second as an example */</div><div class='add'>+</div><div class='add'>+extern int bpf_sock_ops_enable_tx_tstamp(struct bpf_sock_ops_kern *skops, u64 flags) __ksym;</div><div class='add'>+</div><div class='add'>+static int bpf_test_sockopt(void *ctx, const struct sock *sk, int expected)</div><div class='add'>+{</div><div class='add'>+	int tmp, new = SK_BPF_CB_TX_TIMESTAMPING;</div><div class='add'>+	int opt = SK_BPF_CB_FLAGS;</div><div class='add'>+	int level = SOL_SOCKET;</div><div class='add'>+</div><div class='add'>+	if (bpf_setsockopt(ctx, level, opt, &amp;new, sizeof(new)) != expected)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (bpf_getsockopt(ctx, level, opt, &amp;tmp, sizeof(tmp)) != expected ||</div><div class='add'>+	    (!expected &amp;&amp; tmp != new))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bpf_test_access_sockopt(void *ctx, const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (bpf_test_sockopt(ctx, sk, -EOPNOTSUPP))</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bpf_test_access_load_hdr_opt(struct bpf_sock_ops *skops)</div><div class='add'>+{</div><div class='add'>+	u8 opt[3] = {0};</div><div class='add'>+	int load_flags = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bpf_load_hdr_opt(skops, opt, sizeof(opt), load_flags);</div><div class='add'>+	if (ret != -EOPNOTSUPP)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bpf_test_access_cb_flags_set(struct bpf_sock_ops *skops)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bpf_sock_ops_cb_flags_set(skops, 0);</div><div class='add'>+	if (ret != -EOPNOTSUPP)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* In the timestamping callbacks, we're not allowed to call the following</div><div class='add'>+ * BPF CALLs for the safety concern. Return false if expected.</div><div class='add'>+ */</div><div class='add'>+static bool bpf_test_access_bpf_calls(struct bpf_sock_ops *skops,</div><div class='add'>+				      const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (bpf_test_access_sockopt(skops, sk))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (bpf_test_access_load_hdr_opt(skops))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (bpf_test_access_cb_flags_set(skops))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bpf_test_delay(struct bpf_sock_ops *skops, const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct bpf_sock_ops_kern *skops_kern;</div><div class='add'>+	u64 timestamp = bpf_ktime_get_ns();</div><div class='add'>+	struct skb_shared_info *shinfo;</div><div class='add'>+	struct delay_info dinfo = {0};</div><div class='add'>+	struct sk_tskey key = {0};</div><div class='add'>+	struct delay_info *val;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct sk_stg *stg;</div><div class='add'>+	u64 prior_ts, delay;</div><div class='add'>+</div><div class='add'>+	if (bpf_test_access_bpf_calls(skops, sk))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	skops_kern = bpf_cast_to_kern_ctx(skops);</div><div class='add'>+	skb = skops_kern-&gt;skb;</div><div class='add'>+	shinfo = bpf_core_cast(skb-&gt;head + skb-&gt;end, struct skb_shared_info);</div><div class='add'>+</div><div class='add'>+	key.cookie = bpf_get_socket_cookie(skops);</div><div class='add'>+	if (!key.cookie)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (skops-&gt;op == BPF_SOCK_OPS_TSTAMP_SENDMSG_CB) {</div><div class='add'>+		stg = bpf_sk_storage_get(&amp;sk_stg_map, (void *)sk, 0, 0);</div><div class='add'>+		if (!stg)</div><div class='add'>+			return false;</div><div class='add'>+		dinfo.sendmsg_ns = stg-&gt;sendmsg_ns;</div><div class='add'>+		bpf_sock_ops_enable_tx_tstamp(skops_kern, 0);</div><div class='add'>+		key.tskey = shinfo-&gt;tskey;</div><div class='add'>+		if (!key.tskey)</div><div class='add'>+			return false;</div><div class='add'>+		bpf_map_update_elem(&amp;time_map, &amp;key, &amp;dinfo, BPF_ANY);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key.tskey = shinfo-&gt;tskey;</div><div class='add'>+	if (!key.tskey)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	val = bpf_map_lookup_elem(&amp;time_map, &amp;key);</div><div class='add'>+	if (!val)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (skops-&gt;op) {</div><div class='add'>+	case BPF_SOCK_OPS_TSTAMP_SCHED_CB:</div><div class='add'>+		val-&gt;sched_delay = timestamp - val-&gt;sendmsg_ns;</div><div class='add'>+		delay = val-&gt;sched_delay;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_SOCK_OPS_TSTAMP_SND_SW_CB:</div><div class='add'>+		prior_ts = val-&gt;sched_delay + val-&gt;sendmsg_ns;</div><div class='add'>+		val-&gt;snd_sw_delay = timestamp - prior_ts;</div><div class='add'>+		delay = val-&gt;snd_sw_delay;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_SOCK_OPS_TSTAMP_ACK_CB:</div><div class='add'>+		prior_ts = val-&gt;snd_sw_delay + val-&gt;sched_delay + val-&gt;sendmsg_ns;</div><div class='add'>+		val-&gt;ack_delay = timestamp - prior_ts;</div><div class='add'>+		delay = val-&gt;ack_delay;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (delay &gt;= delay_tolerance_nsec)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Since it's the last one, remove from the map after latency check */</div><div class='add'>+	if (skops-&gt;op == BPF_SOCK_OPS_TSTAMP_ACK_CB)</div><div class='add'>+		bpf_map_delete_elem(&amp;time_map, &amp;key);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry/tcp_sendmsg_locked")</div><div class='add'>+int BPF_PROG(trace_tcp_sendmsg_locked, struct sock *sk, struct msghdr *msg,</div><div class='add'>+	     size_t size)</div><div class='add'>+{</div><div class='add'>+	__u32 pid = bpf_get_current_pid_tgid() &gt;&gt; 32;</div><div class='add'>+	u64 timestamp = bpf_ktime_get_ns();</div><div class='add'>+	u32 flag = sk-&gt;sk_bpf_cb_flags;</div><div class='add'>+	struct sk_stg *stg;</div><div class='add'>+</div><div class='add'>+	if (pid != monitored_pid || !flag)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	stg = bpf_sk_storage_get(&amp;sk_stg_map, sk, 0,</div><div class='add'>+				 BPF_SK_STORAGE_GET_F_CREATE);</div><div class='add'>+	if (!stg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	stg-&gt;sendmsg_ns = timestamp;</div><div class='add'>+	nr_snd += 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sockops")</div><div class='add'>+int skops_sockopt(struct bpf_sock_ops *skops)</div><div class='add'>+{</div><div class='add'>+	struct bpf_sock *bpf_sk = skops-&gt;sk;</div><div class='add'>+	const struct sock *sk;</div><div class='add'>+</div><div class='add'>+	if (!bpf_sk)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	sk = (struct sock *)bpf_skc_to_tcp_sock(bpf_sk);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	switch (skops-&gt;op) {</div><div class='add'>+	case BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB:</div><div class='add'>+		nr_active += !bpf_test_sockopt(skops, sk, 0);</div><div class='add'>+		break;</div><div class='add'>+	case BPF_SOCK_OPS_TSTAMP_SENDMSG_CB:</div><div class='add'>+		if (bpf_test_delay(skops, sk))</div><div class='add'>+			nr_snd += 1;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_SOCK_OPS_TSTAMP_SCHED_CB:</div><div class='add'>+		if (bpf_test_delay(skops, sk))</div><div class='add'>+			nr_sched += 1;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_SOCK_OPS_TSTAMP_SND_SW_CB:</div><div class='add'>+		if (bpf_test_delay(skops, sk))</div><div class='add'>+			nr_txsw += 1;</div><div class='add'>+		break;</div><div class='add'>+	case BPF_SOCK_OPS_TSTAMP_ACK_CB:</div><div class='add'>+		if (bpf_test_delay(skops, sk))</div><div class='add'>+			nr_ack += 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/netns_cookie_prog.c b/tools/testing/selftests/bpf/progs/netns_cookie_prog.c<br/>index c6edf8dbefeb..94040714af18 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/netns_cookie_prog.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/netns_cookie_prog.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/netns_cookie_prog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/netns_cookie_prog.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@ struct {</div><div class='ctx'> } sock_map SEC(".maps");</div><div class='ctx'> </div><div class='ctx'> int tcx_init_netns_cookie, tcx_netns_cookie;</div><div class='add'>+int cgroup_skb_init_netns_cookie, cgroup_skb_netns_cookie;</div><div class='ctx'> </div><div class='ctx'> SEC("sockops")</div><div class='ctx'> int get_netns_cookie_sockops(struct bpf_sock_ops *ctx)</div><div class='hunk'>@@ -91,4 +92,12 @@ int get_netns_cookie_tcx(struct __sk_buff *skb)</div><div class='ctx'> 	return TCX_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("cgroup_skb/ingress")</div><div class='add'>+int get_netns_cookie_cgroup_skb(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	cgroup_skb_init_netns_cookie = bpf_get_netns_cookie(NULL);</div><div class='add'>+	cgroup_skb_netns_cookie = bpf_get_netns_cookie(skb);</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/preempt_lock.c b/tools/testing/selftests/bpf/progs/preempt_lock.c<br/>index 6c5797bf0ead..7d04254e61f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/preempt_lock.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/preempt_lock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/preempt_lock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/preempt_lock.c</a></div><div class='hunk'>@@ -134,7 +134,7 @@ int __noinline preempt_global_subprog(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("?tc")</div><div class='del'>-__failure __msg("global function calls are not allowed with preemption disabled")</div><div class='add'>+__success</div><div class='ctx'> int preempt_global_subprog_test(struct __sk_buff *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	preempt_disable();</div><div class='hunk'>@@ -143,4 +143,70 @@ int preempt_global_subprog_test(struct __sk_buff *ctx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int __noinline</div><div class='add'>+global_subprog(int i)</div><div class='add'>+{</div><div class='add'>+	if (i)</div><div class='add'>+		bpf_printk("%p", &amp;i);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_sleepable_helper_subprog(int i)</div><div class='add'>+{</div><div class='add'>+	if (i)</div><div class='add'>+		bpf_copy_from_user(&amp;i, sizeof(i), NULL);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_sleepable_kfunc_subprog(int i)</div><div class='add'>+{</div><div class='add'>+	if (i)</div><div class='add'>+		bpf_copy_from_user_str(&amp;i, sizeof(i), NULL, 0);</div><div class='add'>+	global_subprog(i);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_subprog_calling_sleepable_global(int i)</div><div class='add'>+{</div><div class='add'>+	if (!i)</div><div class='add'>+		global_sleepable_kfunc_subprog(i);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?syscall")</div><div class='add'>+__failure __msg("global functions that may sleep are not allowed in non-sleepable context")</div><div class='add'>+int preempt_global_sleepable_helper_subprog(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	preempt_disable();</div><div class='add'>+	if (ctx-&gt;mark)</div><div class='add'>+		global_sleepable_helper_subprog(ctx-&gt;mark);</div><div class='add'>+	preempt_enable();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?syscall")</div><div class='add'>+__failure __msg("global functions that may sleep are not allowed in non-sleepable context")</div><div class='add'>+int preempt_global_sleepable_kfunc_subprog(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	preempt_disable();</div><div class='add'>+	if (ctx-&gt;mark)</div><div class='add'>+		global_sleepable_kfunc_subprog(ctx-&gt;mark);</div><div class='add'>+	preempt_enable();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?syscall")</div><div class='add'>+__failure __msg("global functions that may sleep are not allowed in non-sleepable context")</div><div class='add'>+int preempt_global_sleepable_subprog_indirect(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	preempt_disable();</div><div class='add'>+	if (ctx-&gt;mark)</div><div class='add'>+		global_subprog_calling_sleepable_global(ctx-&gt;mark);</div><div class='add'>+	preempt_enable();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/prepare.c b/tools/testing/selftests/bpf/progs/prepare.c<br/>new file mode 100644<br/>index 000000000000..cfc1f48e0d28<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/prepare.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/prepare.c</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+int err;</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_RINGBUF);</div><div class='add'>+	__uint(max_entries, 4096);</div><div class='add'>+} ringbuf SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u32);</div><div class='add'>+} array_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("cgroup_skb/egress")</div><div class='add'>+int program(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	err = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/priv_freplace_prog.c b/tools/testing/selftests/bpf/progs/priv_freplace_prog.c<br/>new file mode 100644<br/>index 000000000000..ccf1b04010ba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/priv_freplace_prog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/priv_freplace_prog.c</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+SEC("freplace/xdp_prog1")</div><div class='add'>+int new_xdp_prog2(struct xdp_md *xd)</div><div class='add'>+{</div><div class='add'>+	return XDP_DROP;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/priv_prog.c b/tools/testing/selftests/bpf/progs/priv_prog.c<br/>index 3c7b2b618c8a..725e29595079 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/priv_prog.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/priv_prog.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/priv_prog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/priv_prog.c</a></div><div class='hunk'>@@ -6,8 +6,8 @@</div><div class='ctx'> </div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='del'>-SEC("kprobe")</div><div class='del'>-int kprobe_prog(void *ctx)</div><div class='add'>+SEC("xdp")</div><div class='add'>+int xdp_prog1(struct xdp_md *xdp)</div><div class='ctx'> {</div><div class='del'>-	return 1;</div><div class='add'>+	return XDP_DROP;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/pro_epilogue_with_kfunc.c b/tools/testing/selftests/bpf/progs/pro_epilogue_with_kfunc.c<br/>new file mode 100644<br/>index 000000000000..a5a8f08ac8fb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/pro_epilogue_with_kfunc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/pro_epilogue_with_kfunc.c</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "../test_kmods/bpf_testmod_kfunc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+void __kfunc_btf_root(void)</div><div class='add'>+{</div><div class='add'>+	bpf_kfunc_st_ops_inc10(NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __noinline __used int subprog(struct st_ops_args *args)</div><div class='add'>+{</div><div class='add'>+	args-&gt;a += 1;</div><div class='add'>+	return args-&gt;a;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__success</div><div class='add'>+/* prologue */</div><div class='add'>+__xlated("0: r8 = r1")</div><div class='add'>+__xlated("1: r1 = 0")</div><div class='add'>+__xlated("2: call kernel-function")</div><div class='add'>+__xlated("3: if r0 != 0x0 goto pc+5")</div><div class='add'>+__xlated("4: r6 = *(u64 *)(r8 +0)")</div><div class='add'>+__xlated("5: r7 = *(u64 *)(r6 +0)")</div><div class='add'>+__xlated("6: r7 += 1000")</div><div class='add'>+__xlated("7: *(u64 *)(r6 +0) = r7")</div><div class='add'>+__xlated("8: goto pc+2")</div><div class='add'>+__xlated("9: r1 = r0")</div><div class='add'>+__xlated("10: call kernel-function")</div><div class='add'>+__xlated("11: r1 = r8")</div><div class='add'>+/* save __u64 *ctx to stack */</div><div class='add'>+__xlated("12: *(u64 *)(r10 -8) = r1")</div><div class='add'>+/* main prog */</div><div class='add'>+__xlated("13: r1 = *(u64 *)(r1 +0)")</div><div class='add'>+__xlated("14: r6 = r1")</div><div class='add'>+__xlated("15: call kernel-function")</div><div class='add'>+__xlated("16: r1 = r6")</div><div class='add'>+__xlated("17: call pc+")</div><div class='add'>+/* epilogue */</div><div class='add'>+__xlated("18: r1 = 0")</div><div class='add'>+__xlated("19: r6 = 0")</div><div class='add'>+__xlated("20: call kernel-function")</div><div class='add'>+__xlated("21: if r0 != 0x0 goto pc+6")</div><div class='add'>+__xlated("22: r1 = *(u64 *)(r10 -8)")</div><div class='add'>+__xlated("23: r1 = *(u64 *)(r1 +0)")</div><div class='add'>+__xlated("24: r6 = *(u64 *)(r1 +0)")</div><div class='add'>+__xlated("25: r6 += 10000")</div><div class='add'>+__xlated("26: *(u64 *)(r1 +0) = r6")</div><div class='add'>+__xlated("27: goto pc+2")</div><div class='add'>+__xlated("28: r1 = r0")</div><div class='add'>+__xlated("29: call kernel-function")</div><div class='add'>+__xlated("30: r0 = r6")</div><div class='add'>+__xlated("31: r0 *= 2")</div><div class='add'>+__xlated("32: exit")</div><div class='add'>+SEC("struct_ops/test_pro_epilogue")</div><div class='add'>+__naked int test_kfunc_pro_epilogue(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = *(u64 *)(r1 +0);"</div><div class='add'>+	"r6 = r1;"</div><div class='add'>+	"call %[bpf_kfunc_st_ops_inc10];"</div><div class='add'>+	"r1 = r6;"</div><div class='add'>+	"call subprog;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_kfunc_st_ops_inc10)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__retval(22022) /* (PROLOGUE_A [1000] + KFUNC_INC10 + SUBPROG_A [1] + EPILOGUE_A [10000]) * 2 */</div><div class='add'>+int syscall_pro_epilogue(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct st_ops_args args = {};</div><div class='add'>+</div><div class='add'>+	return bpf_kfunc_st_ops_test_pro_epilogue(&amp;args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_st_ops pro_epilogue_with_kfunc = {</div><div class='add'>+	.test_pro_epilogue = (void *)test_kfunc_pro_epilogue,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/profiler.inc.h b/tools/testing/selftests/bpf/progs/profiler.inc.h<br/>index 8bd1ebd7d6af..813143b4985d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/profiler.inc.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/profiler.inc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/profiler.inc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/profiler.inc.h</a></div><div class='hunk'>@@ -223,7 +223,7 @@ static INLINE void* read_full_cgroup_path(struct kernfs_node* cgroup_node,</div><div class='ctx'> 		if (bpf_cmp_likely(filepart_length, &lt;=, MAX_PATH)) {</div><div class='ctx'> 			payload += filepart_length;</div><div class='ctx'> 		}</div><div class='del'>-		cgroup_node = BPF_CORE_READ(cgroup_node, parent);</div><div class='add'>+		cgroup_node = BPF_CORE_READ(cgroup_node, __parent);</div><div class='ctx'> 	}</div><div class='ctx'> 	return payload;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/raw_tp_null.c b/tools/testing/selftests/bpf/progs/raw_tp_null.c<br/>index 5927054b6dd9..efa416f53968 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/raw_tp_null.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/raw_tp_null.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/raw_tp_null.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/raw_tp_null.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@ char _license[] SEC("license") = "GPL";</div><div class='ctx'> int tid;</div><div class='ctx'> int i;</div><div class='ctx'> </div><div class='del'>-SEC("tp_btf/bpf_testmod_test_raw_tp_null")</div><div class='add'>+SEC("tp_btf/bpf_testmod_test_raw_tp_null_tp")</div><div class='ctx'> int BPF_PROG(test_raw_tp_null, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *task = bpf_get_current_task_btf();</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/raw_tp_null_fail.c b/tools/testing/selftests/bpf/progs/raw_tp_null_fail.c<br/>index 38d669957bf1..0d58114a4955 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/raw_tp_null_fail.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/raw_tp_null_fail.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/raw_tp_null_fail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/raw_tp_null_fail.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='ctx'> /* Ensure module parameter has PTR_MAYBE_NULL */</div><div class='del'>-SEC("tp_btf/bpf_testmod_test_raw_tp_null")</div><div class='add'>+SEC("tp_btf/bpf_testmod_test_raw_tp_null_tp")</div><div class='ctx'> __failure __msg("R1 invalid mem access 'trusted_ptr_or_null_'")</div><div class='ctx'> int test_raw_tp_null_bpf_testmod_test_raw_tp_null_arg_1(void *ctx) {</div><div class='ctx'>     asm volatile("r1 = *(u64 *)(r1 +0); r1 = *(u64 *)(r1 +0);" ::: __clobber_all);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/rbtree.c b/tools/testing/selftests/bpf/progs/rbtree.c<br/>index a3620c15c136..49fe93d7e059 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/rbtree.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/rbtree.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/rbtree.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/rbtree.c</a></div><div class='hunk'>@@ -61,19 +61,19 @@ static long __add_three(struct bpf_rb_root *root, struct bpf_spin_lock *lock)</div><div class='ctx'> 	}</div><div class='ctx'> 	m-&gt;key = 1;</div><div class='ctx'> </div><div class='del'>-	bpf_spin_lock(&amp;glock);</div><div class='del'>-	bpf_rbtree_add(&amp;groot, &amp;n-&gt;node, less);</div><div class='del'>-	bpf_rbtree_add(&amp;groot, &amp;m-&gt;node, less);</div><div class='del'>-	bpf_spin_unlock(&amp;glock);</div><div class='add'>+	bpf_spin_lock(lock);</div><div class='add'>+	bpf_rbtree_add(root, &amp;n-&gt;node, less);</div><div class='add'>+	bpf_rbtree_add(root, &amp;m-&gt;node, less);</div><div class='add'>+	bpf_spin_unlock(lock);</div><div class='ctx'> </div><div class='ctx'> 	n = bpf_obj_new(typeof(*n));</div><div class='ctx'> 	if (!n)</div><div class='ctx'> 		return 3;</div><div class='ctx'> 	n-&gt;key = 3;</div><div class='ctx'> </div><div class='del'>-	bpf_spin_lock(&amp;glock);</div><div class='del'>-	bpf_rbtree_add(&amp;groot, &amp;n-&gt;node, less);</div><div class='del'>-	bpf_spin_unlock(&amp;glock);</div><div class='add'>+	bpf_spin_lock(lock);</div><div class='add'>+	bpf_rbtree_add(root, &amp;n-&gt;node, less);</div><div class='add'>+	bpf_spin_unlock(lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/rbtree_fail.c b/tools/testing/selftests/bpf/progs/rbtree_fail.c<br/>index dbd5eee8e25e..4acb6af2dfe3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/rbtree_fail.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/rbtree_fail.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/rbtree_fail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/rbtree_fail.c</a></div><div class='hunk'>@@ -69,11 +69,11 @@ long rbtree_api_nolock_first(void *ctx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("?tc")</div><div class='del'>-__failure __msg("rbtree_remove node input must be non-owning ref")</div><div class='add'>+__retval(0)</div><div class='ctx'> long rbtree_api_remove_unadded_node(void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct node_data *n, *m;</div><div class='del'>-	struct bpf_rb_node *res;</div><div class='add'>+	struct bpf_rb_node *res_n, *res_m;</div><div class='ctx'> </div><div class='ctx'> 	n = bpf_obj_new(typeof(*n));</div><div class='ctx'> 	if (!n)</div><div class='hunk'>@@ -88,19 +88,20 @@ long rbtree_api_remove_unadded_node(void *ctx)</div><div class='ctx'> 	bpf_spin_lock(&amp;glock);</div><div class='ctx'> 	bpf_rbtree_add(&amp;groot, &amp;n-&gt;node, less);</div><div class='ctx'> </div><div class='del'>-	/* This remove should pass verifier */</div><div class='del'>-	res = bpf_rbtree_remove(&amp;groot, &amp;n-&gt;node);</div><div class='del'>-	n = container_of(res, struct node_data, node);</div><div class='add'>+	res_n = bpf_rbtree_remove(&amp;groot, &amp;n-&gt;node);</div><div class='ctx'> </div><div class='del'>-	/* This remove shouldn't, m isn't in an rbtree */</div><div class='del'>-	res = bpf_rbtree_remove(&amp;groot, &amp;m-&gt;node);</div><div class='del'>-	m = container_of(res, struct node_data, node);</div><div class='add'>+	res_m = bpf_rbtree_remove(&amp;groot, &amp;m-&gt;node);</div><div class='ctx'> 	bpf_spin_unlock(&amp;glock);</div><div class='ctx'> </div><div class='del'>-	if (n)</div><div class='del'>-		bpf_obj_drop(n);</div><div class='del'>-	if (m)</div><div class='del'>-		bpf_obj_drop(m);</div><div class='add'>+	bpf_obj_drop(m);</div><div class='add'>+	if (res_n)</div><div class='add'>+		bpf_obj_drop(container_of(res_n, struct node_data, node));</div><div class='add'>+	if (res_m) {</div><div class='add'>+		bpf_obj_drop(container_of(res_m, struct node_data, node));</div><div class='add'>+		/* m was not added to the rbtree */</div><div class='add'>+		return 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -178,7 +179,7 @@ err_out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("?tc")</div><div class='del'>-__failure __msg("rbtree_remove node input must be non-owning ref")</div><div class='add'>+__failure __msg("bpf_rbtree_remove can only take non-owning or refcounted bpf_rb_node pointer")</div><div class='ctx'> long rbtree_api_add_release_unlock_escape(void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct node_data *n;</div><div class='hunk'>@@ -202,7 +203,7 @@ long rbtree_api_add_release_unlock_escape(void *ctx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("?tc")</div><div class='del'>-__failure __msg("rbtree_remove node input must be non-owning ref")</div><div class='add'>+__failure __msg("bpf_rbtree_remove can only take non-owning or refcounted bpf_rb_node pointer")</div><div class='ctx'> long rbtree_api_first_release_unlock_escape(void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_rb_node *res;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/rbtree_search.c b/tools/testing/selftests/bpf/progs/rbtree_search.c<br/>new file mode 100644<br/>index 000000000000..b05565d1db0d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/rbtree_search.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/rbtree_search.c</a></div><div class='hunk'>@@ -0,0 +1,206 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+</div><div class='add'>+struct node_data {</div><div class='add'>+	struct bpf_refcount ref;</div><div class='add'>+	struct bpf_rb_node r0;</div><div class='add'>+	struct bpf_rb_node r1;</div><div class='add'>+	int key0;</div><div class='add'>+	int key1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define private(name) SEC(".data." #name) __hidden __attribute__((aligned(8)))</div><div class='add'>+private(A) struct bpf_spin_lock glock0;</div><div class='add'>+private(A) struct bpf_rb_root groot0 __contains(node_data, r0);</div><div class='add'>+</div><div class='add'>+private(B) struct bpf_spin_lock glock1;</div><div class='add'>+private(B) struct bpf_rb_root groot1 __contains(node_data, r1);</div><div class='add'>+</div><div class='add'>+#define rb_entry(ptr, type, member) container_of(ptr, type, member)</div><div class='add'>+#define NR_NODES 16</div><div class='add'>+</div><div class='add'>+int zero = 0;</div><div class='add'>+</div><div class='add'>+static bool less0(struct bpf_rb_node *a, const struct bpf_rb_node *b)</div><div class='add'>+{</div><div class='add'>+	struct node_data *node_a;</div><div class='add'>+	struct node_data *node_b;</div><div class='add'>+</div><div class='add'>+	node_a = rb_entry(a, struct node_data, r0);</div><div class='add'>+	node_b = rb_entry(b, struct node_data, r0);</div><div class='add'>+</div><div class='add'>+	return node_a-&gt;key0 &lt; node_b-&gt;key0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool less1(struct bpf_rb_node *a, const struct bpf_rb_node *b)</div><div class='add'>+{</div><div class='add'>+	struct node_data *node_a;</div><div class='add'>+	struct node_data *node_b;</div><div class='add'>+</div><div class='add'>+	node_a = rb_entry(a, struct node_data, r1);</div><div class='add'>+	node_b = rb_entry(b, struct node_data, r1);</div><div class='add'>+</div><div class='add'>+	return node_a-&gt;key1 &lt; node_b-&gt;key1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__retval(0)</div><div class='add'>+long rbtree_search(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_rb_node *rb_n, *rb_m, *gc_ns[NR_NODES];</div><div class='add'>+	long lookup_key = NR_NODES / 2;</div><div class='add'>+	struct node_data *n, *m;</div><div class='add'>+	int i, nr_gc = 0;</div><div class='add'>+</div><div class='add'>+	for (i = zero; i &lt; NR_NODES &amp;&amp; can_loop; i++) {</div><div class='add'>+		n = bpf_obj_new(typeof(*n));</div><div class='add'>+		if (!n)</div><div class='add'>+			return __LINE__;</div><div class='add'>+</div><div class='add'>+		m = bpf_refcount_acquire(n);</div><div class='add'>+</div><div class='add'>+		n-&gt;key0 = i;</div><div class='add'>+		m-&gt;key1 = i;</div><div class='add'>+</div><div class='add'>+		bpf_spin_lock(&amp;glock0);</div><div class='add'>+		bpf_rbtree_add(&amp;groot0, &amp;n-&gt;r0, less0);</div><div class='add'>+		bpf_spin_unlock(&amp;glock0);</div><div class='add'>+</div><div class='add'>+		bpf_spin_lock(&amp;glock1);</div><div class='add'>+		bpf_rbtree_add(&amp;groot1, &amp;m-&gt;r1, less1);</div><div class='add'>+		bpf_spin_unlock(&amp;glock1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n = NULL;</div><div class='add'>+	bpf_spin_lock(&amp;glock0);</div><div class='add'>+	rb_n = bpf_rbtree_root(&amp;groot0);</div><div class='add'>+	while (can_loop) {</div><div class='add'>+		if (!rb_n) {</div><div class='add'>+			bpf_spin_unlock(&amp;glock0);</div><div class='add'>+			return __LINE__;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		n = rb_entry(rb_n, struct node_data, r0);</div><div class='add'>+		if (lookup_key == n-&gt;key0)</div><div class='add'>+			break;</div><div class='add'>+		if (nr_gc &lt; NR_NODES)</div><div class='add'>+			gc_ns[nr_gc++] = rb_n;</div><div class='add'>+		if (lookup_key &lt; n-&gt;key0)</div><div class='add'>+			rb_n = bpf_rbtree_left(&amp;groot0, rb_n);</div><div class='add'>+		else</div><div class='add'>+			rb_n = bpf_rbtree_right(&amp;groot0, rb_n);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!n || lookup_key != n-&gt;key0) {</div><div class='add'>+		bpf_spin_unlock(&amp;glock0);</div><div class='add'>+		return __LINE__;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr_gc; i++) {</div><div class='add'>+		rb_n = gc_ns[i];</div><div class='add'>+		gc_ns[i] = bpf_rbtree_remove(&amp;groot0, rb_n);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	m = bpf_refcount_acquire(n);</div><div class='add'>+	bpf_spin_unlock(&amp;glock0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr_gc; i++) {</div><div class='add'>+		rb_n = gc_ns[i];</div><div class='add'>+		if (rb_n) {</div><div class='add'>+			n = rb_entry(rb_n, struct node_data, r0);</div><div class='add'>+			bpf_obj_drop(n);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!m)</div><div class='add'>+		return __LINE__;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;glock1);</div><div class='add'>+	rb_m = bpf_rbtree_remove(&amp;groot1, &amp;m-&gt;r1);</div><div class='add'>+	bpf_spin_unlock(&amp;glock1);</div><div class='add'>+	bpf_obj_drop(m);</div><div class='add'>+	if (!rb_m)</div><div class='add'>+		return __LINE__;</div><div class='add'>+	bpf_obj_drop(rb_entry(rb_m, struct node_data, r1));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TEST_ROOT(dolock)				\</div><div class='add'>+SEC("syscall")						\</div><div class='add'>+__failure __msg(MSG)					\</div><div class='add'>+long test_root_spinlock_##dolock(void *ctx)		\</div><div class='add'>+{							\</div><div class='add'>+	struct bpf_rb_node *rb_n;			\</div><div class='add'>+	__u64 jiffies = 0;				\</div><div class='add'>+							\</div><div class='add'>+	if (dolock)					\</div><div class='add'>+		bpf_spin_lock(&amp;glock0);			\</div><div class='add'>+	rb_n = bpf_rbtree_root(&amp;groot0);		\</div><div class='add'>+	if (rb_n)					\</div><div class='add'>+		jiffies = bpf_jiffies64();		\</div><div class='add'>+	if (dolock)					\</div><div class='add'>+		bpf_spin_unlock(&amp;glock0);		\</div><div class='add'>+							\</div><div class='add'>+	return !!jiffies;				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TEST_LR(op, dolock)				\</div><div class='add'>+SEC("syscall")						\</div><div class='add'>+__failure __msg(MSG)					\</div><div class='add'>+long test_##op##_spinlock_##dolock(void *ctx)		\</div><div class='add'>+{							\</div><div class='add'>+	struct bpf_rb_node *rb_n;			\</div><div class='add'>+	struct node_data *n;				\</div><div class='add'>+	__u64 jiffies = 0;				\</div><div class='add'>+							\</div><div class='add'>+	bpf_spin_lock(&amp;glock0);				\</div><div class='add'>+	rb_n = bpf_rbtree_root(&amp;groot0);		\</div><div class='add'>+	if (!rb_n) {					\</div><div class='add'>+		bpf_spin_unlock(&amp;glock0);		\</div><div class='add'>+		return 1;				\</div><div class='add'>+	}						\</div><div class='add'>+	n = rb_entry(rb_n, struct node_data, r0);	\</div><div class='add'>+	n = bpf_refcount_acquire(n);			\</div><div class='add'>+	bpf_spin_unlock(&amp;glock0);			\</div><div class='add'>+	if (!n)						\</div><div class='add'>+		return 1;				\</div><div class='add'>+							\</div><div class='add'>+	if (dolock)					\</div><div class='add'>+		bpf_spin_lock(&amp;glock0);			\</div><div class='add'>+	rb_n = bpf_rbtree_##op(&amp;groot0, &amp;n-&gt;r0);	\</div><div class='add'>+	if (rb_n)					\</div><div class='add'>+		jiffies = bpf_jiffies64();		\</div><div class='add'>+	if (dolock)					\</div><div class='add'>+		bpf_spin_unlock(&amp;glock0);		\</div><div class='add'>+							\</div><div class='add'>+	return !!jiffies;				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use a separate MSG macro instead of passing to TEST_XXX(..., MSG)</div><div class='add'>+ * to ensure the message itself is not in the bpf prog lineinfo</div><div class='add'>+ * which the verifier includes in its log.</div><div class='add'>+ * Otherwise, the test_loader will incorrectly match the prog lineinfo</div><div class='add'>+ * instead of the log generated by the verifier.</div><div class='add'>+ */</div><div class='add'>+#define MSG "call bpf_rbtree_root{{.+}}; R0{{(_w)?}}=rcu_ptr_or_null_node_data(id={{[0-9]+}},non_own_ref"</div><div class='add'>+TEST_ROOT(true)</div><div class='add'>+#undef MSG</div><div class='add'>+#define MSG "call bpf_rbtree_{{(left|right).+}}; R0{{(_w)?}}=rcu_ptr_or_null_node_data(id={{[0-9]+}},non_own_ref"</div><div class='add'>+TEST_LR(left,  true)</div><div class='add'>+TEST_LR(right, true)</div><div class='add'>+#undef MSG</div><div class='add'>+</div><div class='add'>+#define MSG "bpf_spin_lock at off=0 must be held for bpf_rb_root"</div><div class='add'>+TEST_ROOT(false)</div><div class='add'>+TEST_LR(left, false)</div><div class='add'>+TEST_LR(right, false)</div><div class='add'>+#undef MSG</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/rcu_read_lock.c b/tools/testing/selftests/bpf/progs/rcu_read_lock.c<br/>index ab3a532b7dd6..d70c28824bbe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/rcu_read_lock.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/rcu_read_lock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/rcu_read_lock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/rcu_read_lock.c</a></div><div class='hunk'>@@ -16,10 +16,11 @@ struct {</div><div class='ctx'> 	__type(value, long);</div><div class='ctx'> } map_a SEC(".maps");</div><div class='ctx'> </div><div class='del'>-__u32 user_data, key_serial, target_pid;</div><div class='add'>+__u32 user_data, target_pid;</div><div class='add'>+__s32 key_serial;</div><div class='ctx'> __u64 flags, task_storage_val, cgroup_id;</div><div class='ctx'> </div><div class='del'>-struct bpf_key *bpf_lookup_user_key(__u32 serial, __u64 flags) __ksym;</div><div class='add'>+struct bpf_key *bpf_lookup_user_key(__s32 serial, __u64 flags) __ksym;</div><div class='ctx'> void bpf_key_put(struct bpf_key *key) __ksym;</div><div class='ctx'> void bpf_rcu_read_lock(void) __ksym;</div><div class='ctx'> void bpf_rcu_read_unlock(void) __ksym;</div><div class='hunk'>@@ -242,7 +243,8 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("?lsm.s/bpf")</div><div class='del'>-int BPF_PROG(inproper_sleepable_kfunc, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='add'>+int BPF_PROG(inproper_sleepable_kfunc, int cmd, union bpf_attr *attr, unsigned int size,</div><div class='add'>+	     bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_key *bkey;</div><div class='ctx'> </div><div class='hunk'>@@ -276,6 +278,46 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_nanosleep")</div><div class='add'>+int nested_rcu_region_unbalanced_1(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task, *real_parent;</div><div class='add'>+</div><div class='add'>+	/* nested rcu read lock regions */</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	real_parent = task-&gt;real_parent;</div><div class='add'>+	if (!real_parent)</div><div class='add'>+		goto out;</div><div class='add'>+	(void)bpf_task_storage_get(&amp;map_a, real_parent, 0, 0);</div><div class='add'>+out:</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_nanosleep")</div><div class='add'>+int nested_rcu_region_unbalanced_2(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task, *real_parent;</div><div class='add'>+</div><div class='add'>+	/* nested rcu read lock regions */</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	real_parent = task-&gt;real_parent;</div><div class='add'>+	if (!real_parent)</div><div class='add'>+		goto out;</div><div class='add'>+	(void)bpf_task_storage_get(&amp;map_a, real_parent, 0, 0);</div><div class='add'>+out:</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='ctx'> int task_trusted_non_rcuptr(void *ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -439,3 +481,61 @@ int rcu_read_lock_global_subprog_unlock(void *ctx)</div><div class='ctx'> 	ret += global_subprog_unlock(ret);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_sleepable_helper_subprog(int i)</div><div class='add'>+{</div><div class='add'>+	if (i)</div><div class='add'>+		bpf_copy_from_user(&amp;i, sizeof(i), NULL);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_sleepable_kfunc_subprog(int i)</div><div class='add'>+{</div><div class='add'>+	if (i)</div><div class='add'>+		bpf_copy_from_user_str(&amp;i, sizeof(i), NULL, 0);</div><div class='add'>+	global_subprog(i);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_subprog_calling_sleepable_global(int i)</div><div class='add'>+{</div><div class='add'>+	if (!i)</div><div class='add'>+		global_sleepable_kfunc_subprog(i);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+int rcu_read_lock_sleepable_helper_global_subprog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	volatile int ret = 0;</div><div class='add'>+</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	ret += global_sleepable_helper_subprog(ret);</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+int rcu_read_lock_sleepable_kfunc_global_subprog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	volatile int ret = 0;</div><div class='add'>+</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	ret += global_sleepable_kfunc_subprog(ret);</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+int rcu_read_lock_sleepable_global_subprog_indirect(void *ctx)</div><div class='add'>+{</div><div class='add'>+	volatile int ret = 0;</div><div class='add'>+</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	ret += global_subprog_calling_sleepable_global(ret);</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/read_cgroupfs_xattr.c b/tools/testing/selftests/bpf/progs/read_cgroupfs_xattr.c<br/>new file mode 100644<br/>index 000000000000..405adbe5e8b0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/read_cgroupfs_xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/read_cgroupfs_xattr.c</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_core_read.h&gt;</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+pid_t target_pid = 0;</div><div class='add'>+</div><div class='add'>+char xattr_value[64];</div><div class='add'>+static const char expected_value_a[] = "bpf_selftest_value_a";</div><div class='add'>+static const char expected_value_b[] = "bpf_selftest_value_b";</div><div class='add'>+bool found_value_a;</div><div class='add'>+bool found_value_b;</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/file_open")</div><div class='add'>+int BPF_PROG(test_file_open)</div><div class='add'>+{</div><div class='add'>+	u64 cgrp_id = bpf_get_current_cgroup_id();</div><div class='add'>+	struct cgroup_subsys_state *css, *tmp;</div><div class='add'>+	struct bpf_dynptr value_ptr;</div><div class='add'>+	struct cgroup *cgrp;</div><div class='add'>+</div><div class='add'>+	if ((bpf_get_current_pid_tgid() &gt;&gt; 32) != target_pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_rcu_read_lock();</div><div class='add'>+	cgrp = bpf_cgroup_from_id(cgrp_id);</div><div class='add'>+	if (!cgrp) {</div><div class='add'>+		bpf_rcu_read_unlock();</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	css = &amp;cgrp-&gt;self;</div><div class='add'>+	bpf_dynptr_from_mem(xattr_value, sizeof(xattr_value), 0, &amp;value_ptr);</div><div class='add'>+	bpf_for_each(css, tmp, css, BPF_CGROUP_ITER_ANCESTORS_UP) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = bpf_cgroup_read_xattr(tmp-&gt;cgroup, "user.bpf_test",</div><div class='add'>+					    &amp;value_ptr);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ret == sizeof(expected_value_a) &amp;&amp;</div><div class='add'>+		    !bpf_strncmp(xattr_value, sizeof(expected_value_a), expected_value_a))</div><div class='add'>+			found_value_a = true;</div><div class='add'>+		if (ret == sizeof(expected_value_b) &amp;&amp;</div><div class='add'>+		    !bpf_strncmp(xattr_value, sizeof(expected_value_b), expected_value_b))</div><div class='add'>+			found_value_b = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_rcu_read_unlock();</div><div class='add'>+	bpf_cgroup_release(cgrp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/read_vsyscall.c b/tools/testing/selftests/bpf/progs/read_vsyscall.c<br/>index 39ebef430059..395591374d4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/read_vsyscall.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/read_vsyscall.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/read_vsyscall.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/read_vsyscall.c</a></div><div class='hunk'>@@ -8,14 +8,16 @@</div><div class='ctx'> </div><div class='ctx'> int target_pid = 0;</div><div class='ctx'> void *user_ptr = 0;</div><div class='del'>-int read_ret[9];</div><div class='add'>+int read_ret[10];</div><div class='ctx'> </div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This is the only kfunc, the others are helpers</div><div class='add'>+ * These are the kfuncs, the others are helpers</div><div class='ctx'>  */</div><div class='ctx'> int bpf_copy_from_user_str(void *dst, u32, const void *, u64) __weak __ksym;</div><div class='add'>+int bpf_copy_from_user_task_str(void *dst, u32, const void *,</div><div class='add'>+				struct task_struct *, u64) __weak __ksym;</div><div class='ctx'> </div><div class='ctx'> SEC("fentry/" SYS_PREFIX "sys_nanosleep")</div><div class='ctx'> int do_probe_read(void *ctx)</div><div class='hunk'>@@ -47,6 +49,11 @@ int do_copy_from_user(void *ctx)</div><div class='ctx'> 	read_ret[7] = bpf_copy_from_user_task(buf, sizeof(buf), user_ptr,</div><div class='ctx'> 					      bpf_get_current_task_btf(), 0);</div><div class='ctx'> 	read_ret[8] = bpf_copy_from_user_str((char *)buf, sizeof(buf), user_ptr, 0);</div><div class='add'>+	read_ret[9] = bpf_copy_from_user_task_str((char *)buf,</div><div class='add'>+						  sizeof(buf),</div><div class='add'>+						  user_ptr,</div><div class='add'>+						  bpf_get_current_task_btf(),</div><div class='add'>+						  0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/refcounted_kptr.c b/tools/testing/selftests/bpf/progs/refcounted_kptr.c<br/>index 893a4fdb4b6e..1aca85d86aeb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/refcounted_kptr.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/refcounted_kptr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/refcounted_kptr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/refcounted_kptr.c</a></div><div class='hunk'>@@ -568,4 +568,64 @@ err_out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+private(kptr_ref) u64 ref;</div><div class='add'>+</div><div class='add'>+static int probe_read_refcount(void)</div><div class='add'>+{</div><div class='add'>+	u32 refcount;</div><div class='add'>+</div><div class='add'>+	bpf_probe_read_kernel(&amp;refcount, sizeof(refcount), (void *) ref);</div><div class='add'>+	return refcount;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __insert_in_list(struct bpf_list_head *head, struct bpf_spin_lock *lock,</div><div class='add'>+			    struct node_data __kptr **node)</div><div class='add'>+{</div><div class='add'>+	struct node_data *node_new, *node_ref, *node_old;</div><div class='add'>+</div><div class='add'>+	node_new = bpf_obj_new(typeof(*node_new));</div><div class='add'>+	if (!node_new)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	node_ref = bpf_refcount_acquire(node_new);</div><div class='add'>+	node_old = bpf_kptr_xchg(node, node_new);</div><div class='add'>+	if (node_old) {</div><div class='add'>+		bpf_obj_drop(node_old);</div><div class='add'>+		bpf_obj_drop(node_ref);</div><div class='add'>+		return -2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(lock);</div><div class='add'>+	bpf_list_push_front(head, &amp;node_ref-&gt;l);</div><div class='add'>+	ref = (u64)(void *) &amp;node_ref-&gt;ref;</div><div class='add'>+	bpf_spin_unlock(lock);</div><div class='add'>+	return probe_read_refcount();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_PERCPU_HASH);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct map_value);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+} percpu_hash SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int percpu_hash_refcount_leak(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct map_value *v;</div><div class='add'>+	int key = 0;</div><div class='add'>+</div><div class='add'>+	v = bpf_map_lookup_elem(&amp;percpu_hash, &amp;key);</div><div class='add'>+	if (!v)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __insert_in_list(&amp;head, &amp;lock, &amp;v-&gt;node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int check_percpu_hash_refcount(void *ctx)</div><div class='add'>+{</div><div class='add'>+	return probe_read_refcount();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/res_spin_lock.c b/tools/testing/selftests/bpf/progs/res_spin_lock.c<br/>new file mode 100644<br/>index 000000000000..22c4fb8b9266<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/res_spin_lock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/res_spin_lock.c</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2024-2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+#define EDEADLK 35</div><div class='add'>+#define ETIMEDOUT 110</div><div class='add'>+</div><div class='add'>+struct arr_elem {</div><div class='add'>+	struct bpf_res_spin_lock lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 64);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct arr_elem);</div><div class='add'>+} arrmap SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct bpf_res_spin_lock lockA __hidden SEC(".data.A");</div><div class='add'>+struct bpf_res_spin_lock lockB __hidden SEC(".data.B");</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int res_spin_lock_test(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem1, *elem2;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	elem1 = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem1)</div><div class='add'>+		return -1;</div><div class='add'>+	elem2 = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem2)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	r = bpf_res_spin_lock(&amp;elem1-&gt;lock);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	r = bpf_res_spin_lock(&amp;elem2-&gt;lock);</div><div class='add'>+	if (!r) {</div><div class='add'>+		bpf_res_spin_unlock(&amp;elem2-&gt;lock);</div><div class='add'>+		bpf_res_spin_unlock(&amp;elem1-&gt;lock);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	bpf_res_spin_unlock(&amp;elem1-&gt;lock);</div><div class='add'>+	return r != -EDEADLK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int res_spin_lock_test_AB(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = bpf_res_spin_lock(&amp;lockA);</div><div class='add'>+	if (r)</div><div class='add'>+		return !r;</div><div class='add'>+	/* Only unlock if we took the lock. */</div><div class='add'>+	if (!bpf_res_spin_lock(&amp;lockB))</div><div class='add'>+		bpf_res_spin_unlock(&amp;lockB);</div><div class='add'>+	bpf_res_spin_unlock(&amp;lockA);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int err;</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int res_spin_lock_test_BA(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = bpf_res_spin_lock(&amp;lockB);</div><div class='add'>+	if (r)</div><div class='add'>+		return !r;</div><div class='add'>+	if (!bpf_res_spin_lock(&amp;lockA))</div><div class='add'>+		bpf_res_spin_unlock(&amp;lockA);</div><div class='add'>+	else</div><div class='add'>+		err = -EDEADLK;</div><div class='add'>+	bpf_res_spin_unlock(&amp;lockB);</div><div class='add'>+	return err ?: 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int res_spin_lock_test_held_lock_max(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_res_spin_lock *locks[48] = {};</div><div class='add'>+	struct arr_elem *e;</div><div class='add'>+	u64 time_beg, time;</div><div class='add'>+	int ret = 0, i;</div><div class='add'>+</div><div class='add'>+	_Static_assert(ARRAY_SIZE(((struct rqspinlock_held){}).locks) == 31,</div><div class='add'>+		       "RES_NR_HELD assumed to be 31");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 34; i++) {</div><div class='add'>+		int key = i;</div><div class='add'>+</div><div class='add'>+		/* We cannot pass in i as it will get spilled/filled by the compiler and</div><div class='add'>+		 * loses bounds in verifier state.</div><div class='add'>+		 */</div><div class='add'>+		e = bpf_map_lookup_elem(&amp;arrmap, &amp;key);</div><div class='add'>+		if (!e)</div><div class='add'>+			return 1;</div><div class='add'>+		locks[i] = &amp;e-&gt;lock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; i &lt; 48; i++) {</div><div class='add'>+		int key = i - 2;</div><div class='add'>+</div><div class='add'>+		/* We cannot pass in i as it will get spilled/filled by the compiler and</div><div class='add'>+		 * loses bounds in verifier state.</div><div class='add'>+		 */</div><div class='add'>+		e = bpf_map_lookup_elem(&amp;arrmap, &amp;key);</div><div class='add'>+		if (!e)</div><div class='add'>+			return 1;</div><div class='add'>+		locks[i] = &amp;e-&gt;lock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	time_beg = bpf_ktime_get_ns();</div><div class='add'>+	for (i = 0; i &lt; 34; i++) {</div><div class='add'>+		if (bpf_res_spin_lock(locks[i]))</div><div class='add'>+			goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Trigger AA, after exhausting entries in the held lock table. This</div><div class='add'>+	 * time, only the timeout can save us, as AA detection won't succeed.</div><div class='add'>+	 */</div><div class='add'>+	ret = bpf_res_spin_lock(locks[34]);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		bpf_res_spin_unlock(locks[34]);</div><div class='add'>+		ret = 1;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ret != -ETIMEDOUT ? 2 : 0;</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	for (i = i - 1; i &gt;= 0; i--)</div><div class='add'>+		bpf_res_spin_unlock(locks[i]);</div><div class='add'>+	time = bpf_ktime_get_ns() - time_beg;</div><div class='add'>+	/* Time spent should be easily above our limit (1/4 s), since AA</div><div class='add'>+	 * detection won't be expedited due to lack of held lock entry.</div><div class='add'>+	 */</div><div class='add'>+	return ret ?: (time &gt; 1000000000 / 4 ? 0 : 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/res_spin_lock_fail.c b/tools/testing/selftests/bpf/progs/res_spin_lock_fail.c<br/>new file mode 100644<br/>index 000000000000..330682a88c16<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/res_spin_lock_fail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/res_spin_lock_fail.c</a></div><div class='hunk'>@@ -0,0 +1,244 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2024-2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_core_read.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+</div><div class='add'>+struct arr_elem {</div><div class='add'>+	struct bpf_res_spin_lock lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct arr_elem);</div><div class='add'>+} arrmap SEC(".maps");</div><div class='add'>+</div><div class='add'>+long value;</div><div class='add'>+</div><div class='add'>+struct bpf_spin_lock lock __hidden SEC(".data.A");</div><div class='add'>+struct bpf_res_spin_lock res_lock __hidden SEC(".data.B");</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("point to map value or allocated object")</div><div class='add'>+int res_spin_lock_arg(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem;</div><div class='add'>+</div><div class='add'>+	elem = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem)</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_res_spin_lock((struct bpf_res_spin_lock *)bpf_core_cast(&amp;elem-&gt;lock, struct __sk_buff));</div><div class='add'>+	bpf_res_spin_lock(&amp;elem-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("AA deadlock detected")</div><div class='add'>+int res_spin_lock_AA(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem;</div><div class='add'>+</div><div class='add'>+	elem = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem)</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_res_spin_lock(&amp;elem-&gt;lock);</div><div class='add'>+	bpf_res_spin_lock(&amp;elem-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("AA deadlock detected")</div><div class='add'>+int res_spin_lock_cond_AA(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem;</div><div class='add'>+</div><div class='add'>+	elem = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem)</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_res_spin_lock(&amp;elem-&gt;lock))</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_res_spin_lock(&amp;elem-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("unlock of different lock")</div><div class='add'>+int res_spin_lock_mismatch_1(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem;</div><div class='add'>+</div><div class='add'>+	elem = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem)</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_res_spin_lock(&amp;elem-&gt;lock))</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_res_spin_unlock(&amp;res_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("unlock of different lock")</div><div class='add'>+int res_spin_lock_mismatch_2(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem;</div><div class='add'>+</div><div class='add'>+	elem = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem)</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_res_spin_lock(&amp;res_lock))</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_res_spin_unlock(&amp;elem-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("unlock of different lock")</div><div class='add'>+int res_spin_lock_irq_mismatch_1(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem;</div><div class='add'>+	unsigned long f1;</div><div class='add'>+</div><div class='add'>+	elem = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem)</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_local_irq_save(&amp;f1);</div><div class='add'>+	if (bpf_res_spin_lock(&amp;res_lock))</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_res_spin_unlock_irqrestore(&amp;res_lock, &amp;f1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("unlock of different lock")</div><div class='add'>+int res_spin_lock_irq_mismatch_2(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem;</div><div class='add'>+	unsigned long f1;</div><div class='add'>+</div><div class='add'>+	elem = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem)</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_res_spin_lock_irqsave(&amp;res_lock, &amp;f1))</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_res_spin_unlock(&amp;res_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__success</div><div class='add'>+int res_spin_lock_ooo(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem;</div><div class='add'>+</div><div class='add'>+	elem = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem)</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_res_spin_lock(&amp;res_lock))</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_res_spin_lock(&amp;elem-&gt;lock)) {</div><div class='add'>+		bpf_res_spin_unlock(&amp;res_lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	bpf_res_spin_unlock(&amp;elem-&gt;lock);</div><div class='add'>+	bpf_res_spin_unlock(&amp;res_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__success</div><div class='add'>+int res_spin_lock_ooo_irq(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem;</div><div class='add'>+	unsigned long f1, f2;</div><div class='add'>+</div><div class='add'>+	elem = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem)</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_res_spin_lock_irqsave(&amp;res_lock, &amp;f1))</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_res_spin_lock_irqsave(&amp;elem-&gt;lock, &amp;f2)) {</div><div class='add'>+		bpf_res_spin_unlock_irqrestore(&amp;res_lock, &amp;f1);</div><div class='add'>+		/* We won't have a unreleased IRQ flag error here. */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	bpf_res_spin_unlock_irqrestore(&amp;elem-&gt;lock, &amp;f2);</div><div class='add'>+	bpf_res_spin_unlock_irqrestore(&amp;res_lock, &amp;f1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bpf_res_spin_lock lock1 __hidden SEC(".data.OO1");</div><div class='add'>+struct bpf_res_spin_lock lock2 __hidden SEC(".data.OO2");</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("bpf_res_spin_unlock cannot be out of order")</div><div class='add'>+int res_spin_lock_ooo_unlock(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	if (bpf_res_spin_lock(&amp;lock1))</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_res_spin_lock(&amp;lock2)) {</div><div class='add'>+		bpf_res_spin_unlock(&amp;lock1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	bpf_res_spin_unlock(&amp;lock1);</div><div class='add'>+	bpf_res_spin_unlock(&amp;lock2);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("off 1 doesn't point to 'struct bpf_res_spin_lock' that is at 0")</div><div class='add'>+int res_spin_lock_bad_off(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem;</div><div class='add'>+</div><div class='add'>+	elem = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem)</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_res_spin_lock((void *)&amp;elem-&gt;lock + 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("R1 doesn't have constant offset. bpf_res_spin_lock has to be at the constant offset")</div><div class='add'>+int res_spin_lock_var_off(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct arr_elem *elem;</div><div class='add'>+	u64 val = value;</div><div class='add'>+</div><div class='add'>+	elem = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!elem) {</div><div class='add'>+		// FIXME: Only inline assembly use in assert macro doesn't emit</div><div class='add'>+		//	  BTF definition.</div><div class='add'>+		bpf_throw(0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	bpf_assert_range(val, 0, 40);</div><div class='add'>+	bpf_res_spin_lock((void *)&amp;value + val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("map 'res_spin.bss' has no valid bpf_res_spin_lock")</div><div class='add'>+int res_spin_lock_no_lock_map(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	bpf_res_spin_lock((void *)&amp;value + 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+__failure __msg("local 'kptr' has no valid bpf_res_spin_lock")</div><div class='add'>+int res_spin_lock_no_lock_kptr(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct { int i; } *p = bpf_obj_new(typeof(*p));</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_res_spin_lock((void *)p);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/ringbuf_bench.c b/tools/testing/selftests/bpf/progs/ringbuf_bench.c<br/>index 6a468496f539..d96c7d1e8fc2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/ringbuf_bench.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/ringbuf_bench.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/ringbuf_bench.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/ringbuf_bench.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> // Copyright (c) 2020 Facebook</div><div class='ctx'> </div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;stdint.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='hunk'>@@ -14,9 +15,11 @@ struct {</div><div class='ctx'> </div><div class='ctx'> const volatile int batch_cnt = 0;</div><div class='ctx'> const volatile long use_output = 0;</div><div class='add'>+const volatile bool bench_producer = false;</div><div class='ctx'> </div><div class='ctx'> long sample_val = 42;</div><div class='ctx'> long dropped __attribute__((aligned(128))) = 0;</div><div class='add'>+long hits __attribute__((aligned(128))) = 0;</div><div class='ctx'> </div><div class='ctx'> const volatile long wakeup_data_size = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -24,6 +27,9 @@ static __always_inline long get_flags()</div><div class='ctx'> {</div><div class='ctx'> 	long sz;</div><div class='ctx'> </div><div class='add'>+	if (bench_producer)</div><div class='add'>+		return BPF_RB_NO_WAKEUP;</div><div class='add'>+</div><div class='ctx'> 	if (!wakeup_data_size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -47,6 +53,8 @@ int bench_ringbuf(void *ctx)</div><div class='ctx'> 				*sample = sample_val;</div><div class='ctx'> 				flags = get_flags();</div><div class='ctx'> 				bpf_ringbuf_submit(sample, flags);</div><div class='add'>+				if (bench_producer)</div><div class='add'>+					__sync_add_and_fetch(&amp;hits, 1);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -55,6 +63,9 @@ int bench_ringbuf(void *ctx)</div><div class='ctx'> 			if (bpf_ringbuf_output(&amp;ringbuf, &amp;sample_val,</div><div class='ctx'> 					       sizeof(sample_val), flags))</div><div class='ctx'> 				__sync_add_and_fetch(&amp;dropped, 1);</div><div class='add'>+			else if (bench_producer)</div><div class='add'>+				__sync_add_and_fetch(&amp;hits, 1);</div><div class='add'>+</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/security_bpf_map.c b/tools/testing/selftests/bpf/progs/security_bpf_map.c<br/>new file mode 100644<br/>index 000000000000..7216b3450e96<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/security_bpf_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/security_bpf_map.c</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+#define EPERM 1 /* Operation not permitted */</div><div class='add'>+</div><div class='add'>+/* From include/linux/mm.h. */</div><div class='add'>+#define FMODE_WRITE	0x2</div><div class='add'>+</div><div class='add'>+struct map;</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u32);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+} prot_status_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u32);</div><div class='add'>+	__uint(max_entries, 3);</div><div class='add'>+} prot_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u32);</div><div class='add'>+	__uint(max_entries, 3);</div><div class='add'>+} not_prot_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("fmod_ret/security_bpf_map")</div><div class='add'>+int BPF_PROG(fmod_bpf_map, struct bpf_map *map, int fmode)</div><div class='add'>+{</div><div class='add'>+	__u32 key = 0;</div><div class='add'>+	__u32 *status_ptr = bpf_map_lookup_elem(&amp;prot_status_map, &amp;key);</div><div class='add'>+</div><div class='add'>+	if (!status_ptr || !*status_ptr)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (map == &amp;prot_map) {</div><div class='add'>+		/* Allow read-only access */</div><div class='add'>+		if (fmode &amp; FMODE_WRITE)</div><div class='add'>+			return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This program keeps references to maps. This is needed to prevent</div><div class='add'>+ * optimizing them out.</div><div class='add'>+ */</div><div class='add'>+SEC("fentry/bpf_fentry_test1")</div><div class='add'>+int BPF_PROG(fentry_dummy1, int a)</div><div class='add'>+{</div><div class='add'>+	__u32 key = 0;</div><div class='add'>+	__u32 val1 = a;</div><div class='add'>+	__u32 val2 = a + 1;</div><div class='add'>+</div><div class='add'>+	bpf_map_update_elem(&amp;prot_map, &amp;key, &amp;val1, BPF_ANY);</div><div class='add'>+	bpf_map_update_elem(&amp;not_prot_map, &amp;key, &amp;val2, BPF_ANY);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/set_global_vars.c b/tools/testing/selftests/bpf/progs/set_global_vars.c<br/>new file mode 100644<br/>index 000000000000..ebaef28b2cb3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/set_global_vars.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/set_global_vars.c</a></div><div class='hunk'>@@ -0,0 +1,106 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+typedef __s32 s32;</div><div class='add'>+typedef s32 i32;</div><div class='add'>+typedef __u8 u8;</div><div class='add'>+</div><div class='add'>+enum Enum { EA1 = 0, EA2 = 11, EA3 = 10 };</div><div class='add'>+enum Enumu64 {EB1 = 0llu, EB2 = 12llu };</div><div class='add'>+enum Enums64 { EC1 = 0ll, EC2 = 13ll };</div><div class='add'>+</div><div class='add'>+const volatile __s64 var_s64 = -1;</div><div class='add'>+const volatile __u64 var_u64 = 0;</div><div class='add'>+const volatile i32 var_s32 = -1;</div><div class='add'>+const volatile __u32 var_u32 = 0;</div><div class='add'>+const volatile __s16 var_s16 = -1;</div><div class='add'>+const volatile __u16 var_u16 = 0;</div><div class='add'>+const volatile __s8 var_s8 = -1;</div><div class='add'>+const volatile u8 var_u8 = 0;</div><div class='add'>+const volatile enum Enum var_ea = EA1;</div><div class='add'>+const volatile enum Enumu64 var_eb = EB1;</div><div class='add'>+const volatile enum Enums64 var_ec = EC1;</div><div class='add'>+const volatile bool var_b = false;</div><div class='add'>+const volatile i32 arr[32];</div><div class='add'>+const volatile enum Enum enum_arr[32];</div><div class='add'>+const volatile i32 three_d[47][19][17];</div><div class='add'>+const volatile i32 *ptr_arr[32];</div><div class='add'>+</div><div class='add'>+struct Struct {</div><div class='add'>+	int:16;</div><div class='add'>+	__u16 filler;</div><div class='add'>+	struct {</div><div class='add'>+		const __u16 filler2;</div><div class='add'>+	};</div><div class='add'>+	struct Struct2 {</div><div class='add'>+		__u16 filler;</div><div class='add'>+		volatile struct {</div><div class='add'>+			const int:1;</div><div class='add'>+			union {</div><div class='add'>+				const volatile u8 var_u8[3];</div><div class='add'>+				const volatile __s16 filler3;</div><div class='add'>+				const int:1;</div><div class='add'>+				s32 mat[7][5];</div><div class='add'>+			} u;</div><div class='add'>+		};</div><div class='add'>+	} struct2[2][4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const volatile __u32 stru = 0; /* same prefix as below */</div><div class='add'>+const volatile struct Struct struct1[3];</div><div class='add'>+const volatile struct Struct struct11[11][7];</div><div class='add'>+</div><div class='add'>+struct Struct3 {</div><div class='add'>+	struct {</div><div class='add'>+		u8 var_u8_l;</div><div class='add'>+	};</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u8 var_u8_h;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+typedef struct Struct3 Struct3_t;</div><div class='add'>+</div><div class='add'>+union Union {</div><div class='add'>+	__u16 var_u16;</div><div class='add'>+	Struct3_t struct3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const volatile union Union union1 = {.var_u16 = -1};</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+int test_set_globals(void *ctx)</div><div class='add'>+{</div><div class='add'>+	volatile __s8 a;</div><div class='add'>+</div><div class='add'>+	a = var_s64;</div><div class='add'>+	a = var_u64;</div><div class='add'>+	a = var_s32;</div><div class='add'>+	a = var_u32;</div><div class='add'>+	a = var_s16;</div><div class='add'>+	a = var_u16;</div><div class='add'>+	a = var_s8;</div><div class='add'>+	a = var_u8;</div><div class='add'>+	a = var_ea;</div><div class='add'>+	a = var_eb;</div><div class='add'>+	a = var_ec;</div><div class='add'>+	a = var_b;</div><div class='add'>+	a = struct1[2].struct2[1][2].u.var_u8[2];</div><div class='add'>+	a = union1.var_u16;</div><div class='add'>+	a = arr[3];</div><div class='add'>+	a = arr[EA2];</div><div class='add'>+	a = enum_arr[EC2];</div><div class='add'>+	a = three_d[31][7][EA2];</div><div class='add'>+	a = struct1[2].struct2[1][2].u.mat[5][3];</div><div class='add'>+	a = struct11[7][5].struct2[0][1].u.mat[3][0];</div><div class='add'>+</div><div class='add'>+	return a;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/setget_sockopt.c b/tools/testing/selftests/bpf/progs/setget_sockopt.c<br/>index 6dd4318debbf..d330b1511979 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/setget_sockopt.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/setget_sockopt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/setget_sockopt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/setget_sockopt.c</a></div><div class='hunk'>@@ -61,6 +61,9 @@ static const struct sockopt_test sol_tcp_tests[] = {</div><div class='ctx'> 	{ .opt = TCP_NOTSENT_LOWAT, .new = 1314, .expected = 1314, },</div><div class='ctx'> 	{ .opt = TCP_BPF_SOCK_OPS_CB_FLAGS, .new = BPF_SOCK_OPS_ALL_CB_FLAGS,</div><div class='ctx'> 	  .expected = BPF_SOCK_OPS_ALL_CB_FLAGS, },</div><div class='add'>+	{ .opt = TCP_BPF_DELACK_MAX, .new = 30000, .expected = 30000, },</div><div class='add'>+	{ .opt = TCP_BPF_RTO_MIN, .new = 30000, .expected = 30000, },</div><div class='add'>+	{ .opt = TCP_RTO_MAX_MS, .new = 2000, .expected = 2000, },</div><div class='ctx'> 	{ .opt = 0, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -80,6 +83,14 @@ struct loop_ctx {</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static bool sk_is_tcp(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return (sk-&gt;__sk_common.skc_family == AF_INET ||</div><div class='add'>+		sk-&gt;__sk_common.skc_family == AF_INET6) &amp;&amp;</div><div class='add'>+		sk-&gt;sk_type == SOCK_STREAM &amp;&amp;</div><div class='add'>+		sk-&gt;sk_protocol == IPPROTO_TCP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bpf_test_sockopt_flip(void *ctx, struct sock *sk,</div><div class='ctx'> 				 const struct sockopt_test *t,</div><div class='ctx'> 				 int level)</div><div class='hunk'>@@ -88,6 +99,9 @@ static int bpf_test_sockopt_flip(void *ctx, struct sock *sk,</div><div class='ctx'> </div><div class='ctx'> 	opt = t-&gt;opt;</div><div class='ctx'> </div><div class='add'>+	if (opt == SO_TXREHASH &amp;&amp; !sk_is_tcp(sk))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (bpf_getsockopt(ctx, level, opt, &amp;old, sizeof(old)))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	/* kernel initialized txrehash to 255 */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/sk_bypass_prot_mem.c b/tools/testing/selftests/bpf/progs/sk_bypass_prot_mem.c<br/>new file mode 100644<br/>index 000000000000..09a00d11ffcc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/sk_bypass_prot_mem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/sk_bypass_prot_mem.c</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright 2025 Google LLC */</div><div class='add'>+</div><div class='add'>+#include "bpf_tracing_net.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+</div><div class='add'>+extern int tcp_memory_per_cpu_fw_alloc __ksym;</div><div class='add'>+extern int udp_memory_per_cpu_fw_alloc __ksym;</div><div class='add'>+</div><div class='add'>+int nr_cpus;</div><div class='add'>+bool tcp_activated, udp_activated;</div><div class='add'>+long tcp_memory_allocated, udp_memory_allocated;</div><div class='add'>+</div><div class='add'>+struct sk_prot {</div><div class='add'>+	long *memory_allocated;</div><div class='add'>+	int *memory_per_cpu_fw_alloc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int drain_memory_per_cpu_fw_alloc(__u32 i, struct sk_prot *sk_prot_ctx)</div><div class='add'>+{</div><div class='add'>+	int *memory_per_cpu_fw_alloc;</div><div class='add'>+</div><div class='add'>+	memory_per_cpu_fw_alloc = bpf_per_cpu_ptr(sk_prot_ctx-&gt;memory_per_cpu_fw_alloc, i);</div><div class='add'>+	if (memory_per_cpu_fw_alloc)</div><div class='add'>+		*sk_prot_ctx-&gt;memory_allocated += *memory_per_cpu_fw_alloc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long get_memory_allocated(struct sock *_sk, int *memory_per_cpu_fw_alloc)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = bpf_core_cast(_sk, struct sock);</div><div class='add'>+	struct sk_prot sk_prot_ctx;</div><div class='add'>+	long memory_allocated;</div><div class='add'>+</div><div class='add'>+	/* net_aligned_data.{tcp,udp}_memory_allocated was not available. */</div><div class='add'>+	memory_allocated = sk-&gt;__sk_common.skc_prot-&gt;memory_allocated-&gt;counter;</div><div class='add'>+</div><div class='add'>+	sk_prot_ctx.memory_allocated = &amp;memory_allocated;</div><div class='add'>+	sk_prot_ctx.memory_per_cpu_fw_alloc = memory_per_cpu_fw_alloc;</div><div class='add'>+</div><div class='add'>+	bpf_loop(nr_cpus, drain_memory_per_cpu_fw_alloc, &amp;sk_prot_ctx, 0);</div><div class='add'>+</div><div class='add'>+	return memory_allocated;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fentry_init_sock(struct sock *sk, bool *activated,</div><div class='add'>+			     long *memory_allocated, int *memory_per_cpu_fw_alloc)</div><div class='add'>+{</div><div class='add'>+	if (!*activated)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*memory_allocated = get_memory_allocated(sk, memory_per_cpu_fw_alloc);</div><div class='add'>+	*activated = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry/tcp_init_sock")</div><div class='add'>+int BPF_PROG(fentry_tcp_init_sock, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	fentry_init_sock(sk, &amp;tcp_activated,</div><div class='add'>+			 &amp;tcp_memory_allocated, &amp;tcp_memory_per_cpu_fw_alloc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry/udp_init_sock")</div><div class='add'>+int BPF_PROG(fentry_udp_init_sock, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	fentry_init_sock(sk, &amp;udp_activated,</div><div class='add'>+			 &amp;udp_memory_allocated, &amp;udp_memory_per_cpu_fw_alloc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("cgroup/sock_create")</div><div class='add'>+int sock_create(struct bpf_sock *ctx)</div><div class='add'>+{</div><div class='add'>+	int err, val = 1;</div><div class='add'>+</div><div class='add'>+	err = bpf_setsockopt(ctx, SOL_SOCKET, SK_BPF_BYPASS_PROT_MEM,</div><div class='add'>+			     &amp;val, sizeof(val));</div><div class='add'>+	if (err)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	val = 0;</div><div class='add'>+</div><div class='add'>+	err = bpf_getsockopt(ctx, SOL_SOCKET, SK_BPF_BYPASS_PROT_MEM,</div><div class='add'>+			     &amp;val, sizeof(val));</div><div class='add'>+	if (err)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (val != 1) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	bpf_set_retval(err);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char LICENSE[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/sock_iter_batch.c b/tools/testing/selftests/bpf/progs/sock_iter_batch.c<br/>index 96531b0d9d55..77966ded5467 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/sock_iter_batch.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/sock_iter_batch.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/sock_iter_batch.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/sock_iter_batch.c</a></div><div class='hunk'>@@ -17,6 +17,13 @@ static bool ipv6_addr_loopback(const struct in6_addr *a)</div><div class='ctx'> 		a-&gt;s6_addr32[2] | (a-&gt;s6_addr32[3] ^ bpf_htonl(1))) == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ipv4_addr_loopback(__be32 a)</div><div class='add'>+{</div><div class='add'>+	return a == bpf_ntohl(0x7f000001);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+volatile const unsigned int sf;</div><div class='add'>+volatile const unsigned int ss;</div><div class='ctx'> volatile const __u16 ports[2];</div><div class='ctx'> unsigned int bucket[2];</div><div class='ctx'> </div><div class='hunk'>@@ -26,22 +33,28 @@ int iter_tcp_soreuse(struct bpf_iter__tcp *ctx)</div><div class='ctx'> 	struct sock *sk = (struct sock *)ctx-&gt;sk_common;</div><div class='ctx'> 	struct inet_hashinfo *hinfo;</div><div class='ctx'> 	unsigned int hash;</div><div class='add'>+	__u64 sock_cookie;</div><div class='ctx'> 	struct net *net;</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	sock_cookie = bpf_get_socket_cookie(sk);</div><div class='ctx'> 	sk = bpf_core_cast(sk, struct sock);</div><div class='del'>-	if (sk-&gt;sk_family != AF_INET6 ||</div><div class='del'>-	    sk-&gt;sk_state != TCP_LISTEN ||</div><div class='del'>-	    !ipv6_addr_loopback(&amp;sk-&gt;sk_v6_rcv_saddr))</div><div class='add'>+	if (sk-&gt;sk_family != sf ||</div><div class='add'>+	    (ss &amp;&amp; sk-&gt;sk_state != ss) ||</div><div class='add'>+	    (sk-&gt;sk_family == AF_INET6 ?</div><div class='add'>+	    !ipv6_addr_loopback(&amp;sk-&gt;sk_v6_rcv_saddr) :</div><div class='add'>+	    !ipv4_addr_loopback(sk-&gt;sk_rcv_saddr)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_num == ports[0])</div><div class='ctx'> 		idx = 0;</div><div class='ctx'> 	else if (sk-&gt;sk_num == ports[1])</div><div class='ctx'> 		idx = 1;</div><div class='add'>+	else if (!ports[0] &amp;&amp; !ports[1])</div><div class='add'>+		idx = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +65,28 @@ int iter_tcp_soreuse(struct bpf_iter__tcp *ctx)</div><div class='ctx'> 	hinfo = net-&gt;ipv4.tcp_death_row.hashinfo;</div><div class='ctx'> 	bucket[idx] = hash &amp; hinfo-&gt;lhash2_mask;</div><div class='ctx'> 	bpf_seq_write(ctx-&gt;meta-&gt;seq, &amp;idx, sizeof(idx));</div><div class='add'>+	bpf_seq_write(ctx-&gt;meta-&gt;seq, &amp;sock_cookie, sizeof(sock_cookie));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+volatile const __u64 destroy_cookie;</div><div class='add'>+</div><div class='add'>+SEC("iter/tcp")</div><div class='add'>+int iter_tcp_destroy(struct bpf_iter__tcp *ctx)</div><div class='add'>+{</div><div class='add'>+	struct sock_common *sk_common = (struct sock_common *)ctx-&gt;sk_common;</div><div class='add'>+	__u64 sock_cookie;</div><div class='add'>+</div><div class='add'>+	if (!sk_common)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	sock_cookie = bpf_get_socket_cookie(sk_common);</div><div class='add'>+	if (sock_cookie != destroy_cookie)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_sock_destroy(sk_common);</div><div class='add'>+	bpf_seq_write(ctx-&gt;meta-&gt;seq, &amp;sock_cookie, sizeof(sock_cookie));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -63,20 +98,26 @@ int iter_udp_soreuse(struct bpf_iter__udp *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct sock *sk = (struct sock *)ctx-&gt;udp_sk;</div><div class='ctx'> 	struct udp_table *udptable;</div><div class='add'>+	__u64 sock_cookie;</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='ctx'> 	if (!sk)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	sock_cookie = bpf_get_socket_cookie(sk);</div><div class='ctx'> 	sk = bpf_core_cast(sk, struct sock);</div><div class='del'>-	if (sk-&gt;sk_family != AF_INET6 ||</div><div class='del'>-	    !ipv6_addr_loopback(&amp;sk-&gt;sk_v6_rcv_saddr))</div><div class='add'>+	if (sk-&gt;sk_family != sf ||</div><div class='add'>+	    (sk-&gt;sk_family == AF_INET6 ?</div><div class='add'>+	    !ipv6_addr_loopback(&amp;sk-&gt;sk_v6_rcv_saddr) :</div><div class='add'>+	    !ipv4_addr_loopback(sk-&gt;sk_rcv_saddr)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (sk-&gt;sk_num == ports[0])</div><div class='ctx'> 		idx = 0;</div><div class='ctx'> 	else if (sk-&gt;sk_num == ports[1])</div><div class='ctx'> 		idx = 1;</div><div class='add'>+	else if (!ports[0] &amp;&amp; !ports[1])</div><div class='add'>+		idx = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -84,6 +125,7 @@ int iter_udp_soreuse(struct bpf_iter__udp *ctx)</div><div class='ctx'> 	udptable = sk-&gt;sk_net.net-&gt;ipv4.udp_table;</div><div class='ctx'> 	bucket[idx] = udp_sk(sk)-&gt;udp_portaddr_hash &amp; udptable-&gt;mask;</div><div class='ctx'> 	bpf_seq_write(ctx-&gt;meta-&gt;seq, &amp;idx, sizeof(idx));</div><div class='add'>+	bpf_seq_write(ctx-&gt;meta-&gt;seq, &amp;sock_cookie, sizeof(sock_cookie));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/stacktrace_ips.c b/tools/testing/selftests/bpf/progs/stacktrace_ips.c<br/>new file mode 100644<br/>index 000000000000..a96c8150d7f5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/stacktrace_ips.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/stacktrace_ips.c</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2018 Facebook</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef PERF_MAX_STACK_DEPTH</div><div class='add'>+#define PERF_MAX_STACK_DEPTH         127</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef __u64 stack_trace_t[PERF_MAX_STACK_DEPTH];</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_STACK_TRACE);</div><div class='add'>+	__uint(max_entries, 16384);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, stack_trace_t);</div><div class='add'>+} stackmap SEC(".maps");</div><div class='add'>+</div><div class='add'>+extern bool CONFIG_UNWINDER_ORC __kconfig __weak;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function is here to have CONFIG_UNWINDER_ORC</div><div class='add'>+ * used and added to object BTF.</div><div class='add'>+ */</div><div class='add'>+int unused(void)</div><div class='add'>+{</div><div class='add'>+	return CONFIG_UNWINDER_ORC ? 0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__u32 stack_key;</div><div class='add'>+</div><div class='add'>+SEC("kprobe.multi")</div><div class='add'>+int kprobe_multi_test(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	stack_key = bpf_get_stackid(ctx, &amp;stackmap, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("raw_tp/bpf_testmod_test_read")</div><div class='add'>+int rawtp_test(void *ctx)</div><div class='add'>+{</div><div class='add'>+	/* Skip ebpf program entry in the stack. */</div><div class='add'>+	stack_key = bpf_get_stackid(ctx, &amp;stackmap, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_stacktrace_map.c b/tools/testing/selftests/bpf/progs/stacktrace_map.c<br/>index 47568007b668..0c77df05be7f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_stacktrace_map.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_stacktrace_map.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/stacktrace_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/stacktrace_map.c</a></div><div class='hunk'>@@ -50,6 +50,7 @@ struct sched_switch_args {</div><div class='ctx'> 	int next_prio;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+__u32 stack_id;</div><div class='ctx'> SEC("tracepoint/sched/sched_switch")</div><div class='ctx'> int oncpu(struct sched_switch_args *ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -64,6 +65,7 @@ int oncpu(struct sched_switch_args *ctx)</div><div class='ctx'> 	/* The size of stackmap and stackid_hmap should be the same */</div><div class='ctx'> 	key = bpf_get_stackid(ctx, &amp;stackmap, 0);</div><div class='ctx'> 	if ((int)key &gt;= 0) {</div><div class='add'>+		stack_id = key;</div><div class='ctx'> 		bpf_map_update_elem(&amp;stackid_hmap, &amp;key, &amp;val, 0);</div><div class='ctx'> 		stack_p = bpf_map_lookup_elem(&amp;stack_amap, &amp;key);</div><div class='ctx'> 		if (stack_p)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/stream.c b/tools/testing/selftests/bpf/progs/stream.c<br/>new file mode 100644<br/>index 000000000000..4a5bd852f10c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/stream.c</a></div><div class='hunk'>@@ -0,0 +1,237 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+#include "bpf_arena_common.h"</div><div class='add'>+</div><div class='add'>+struct arr_elem {</div><div class='add'>+	struct bpf_res_spin_lock lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct arr_elem);</div><div class='add'>+} arrmap SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARENA);</div><div class='add'>+	__uint(map_flags, BPF_F_MMAPABLE);</div><div class='add'>+	__uint(max_entries, 1); /* number of pages */</div><div class='add'>+} arena SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct elem {</div><div class='add'>+	struct bpf_timer timer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct elem);</div><div class='add'>+} array SEC(".maps");</div><div class='add'>+</div><div class='add'>+#define ENOSPC 28</div><div class='add'>+#define _STR "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"</div><div class='add'>+</div><div class='add'>+int size;</div><div class='add'>+u64 fault_addr;</div><div class='add'>+void *arena_ptr;</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__success __retval(0)</div><div class='add'>+int stream_exhaust(void *ctx)</div><div class='add'>+{</div><div class='add'>+	/* Use global variable for loop convergence. */</div><div class='add'>+	size = 0;</div><div class='add'>+	bpf_repeat(BPF_MAX_LOOPS) {</div><div class='add'>+		if (bpf_stream_printk(BPF_STDOUT, _STR) == -ENOSPC &amp;&amp; size == 99954)</div><div class='add'>+			return 0;</div><div class='add'>+		size += sizeof(_STR) - 1;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__arch_x86_64</div><div class='add'>+__arch_arm64</div><div class='add'>+__arch_s390x</div><div class='add'>+__success __retval(0)</div><div class='add'>+__stderr("ERROR: Timeout detected for may_goto instruction")</div><div class='add'>+__stderr("CPU: {{[0-9]+}} UID: 0 PID: {{[0-9]+}} Comm: {{.*}}")</div><div class='add'>+__stderr("Call trace:\n"</div><div class='add'>+"{{([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n"</div><div class='add'>+"|[ \t]+[^\n]+\n)*}}")</div><div class='add'>+int stream_cond_break(void *ctx)</div><div class='add'>+{</div><div class='add'>+	while (can_loop)</div><div class='add'>+		;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__success __retval(0)</div><div class='add'>+__stderr("ERROR: AA or ABBA deadlock detected for bpf_res_spin_lock")</div><div class='add'>+__stderr("{{Attempted lock   = (0x[0-9a-fA-F]+)\n"</div><div class='add'>+"Total held locks = 1\n"</div><div class='add'>+"Held lock\\[ 0\\] = \\1}}")</div><div class='add'>+__stderr("...")</div><div class='add'>+__stderr("CPU: {{[0-9]+}} UID: 0 PID: {{[0-9]+}} Comm: {{.*}}")</div><div class='add'>+__stderr("Call trace:\n"</div><div class='add'>+"{{([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n"</div><div class='add'>+"|[ \t]+[^\n]+\n)*}}")</div><div class='add'>+int stream_deadlock(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_res_spin_lock *lock, *nlock;</div><div class='add'>+</div><div class='add'>+	lock = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!lock)</div><div class='add'>+		return 1;</div><div class='add'>+	nlock = bpf_map_lookup_elem(&amp;arrmap, &amp;(int){0});</div><div class='add'>+	if (!nlock)</div><div class='add'>+		return 1;</div><div class='add'>+	if (bpf_res_spin_lock(lock))</div><div class='add'>+		return 1;</div><div class='add'>+	if (bpf_res_spin_lock(nlock)) {</div><div class='add'>+		bpf_res_spin_unlock(lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	bpf_res_spin_unlock(nlock);</div><div class='add'>+	bpf_res_spin_unlock(lock);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__success __retval(0)</div><div class='add'>+int stream_syscall(void *ctx)</div><div class='add'>+{</div><div class='add'>+	bpf_stream_printk(BPF_STDOUT, "foo");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__arch_x86_64</div><div class='add'>+__arch_arm64</div><div class='add'>+__success __retval(0)</div><div class='add'>+__stderr("ERROR: Arena WRITE access at unmapped address 0x{{.*}}")</div><div class='add'>+__stderr("CPU: {{[0-9]+}} UID: 0 PID: {{[0-9]+}} Comm: {{.*}}")</div><div class='add'>+__stderr("Call trace:\n"</div><div class='add'>+"{{([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n"</div><div class='add'>+"|[ \t]+[^\n]+\n)*}}")</div><div class='add'>+int stream_arena_write_fault(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_arena *ptr = (void *)&amp;arena;</div><div class='add'>+	u64 user_vm_start;</div><div class='add'>+</div><div class='add'>+	/* Prevent GCC bounds warning: casting &amp;arena to struct bpf_arena *</div><div class='add'>+	 * triggers bounds checking since the map definition is smaller than struct</div><div class='add'>+	 * bpf_arena. barrier_var() makes the pointer opaque to GCC, preventing the</div><div class='add'>+	 * bounds analysis</div><div class='add'>+	 */</div><div class='add'>+	barrier_var(ptr);</div><div class='add'>+	user_vm_start = ptr-&gt;user_vm_start;</div><div class='add'>+	fault_addr = user_vm_start + 0x7fff;</div><div class='add'>+	bpf_addr_space_cast(user_vm_start, 0, 1);</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r1 = %0;"</div><div class='add'>+		"r2 = 1;"</div><div class='add'>+		"*(u32 *)(r1 + 0x7fff) = r2;"</div><div class='add'>+		:</div><div class='add'>+		: "r" (user_vm_start)</div><div class='add'>+		: "r1", "r2"</div><div class='add'>+	);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__arch_x86_64</div><div class='add'>+__arch_arm64</div><div class='add'>+__success __retval(0)</div><div class='add'>+__stderr("ERROR: Arena READ access at unmapped address 0x{{.*}}")</div><div class='add'>+__stderr("CPU: {{[0-9]+}} UID: 0 PID: {{[0-9]+}} Comm: {{.*}}")</div><div class='add'>+__stderr("Call trace:\n"</div><div class='add'>+"{{([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n"</div><div class='add'>+"|[ \t]+[^\n]+\n)*}}")</div><div class='add'>+int stream_arena_read_fault(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_arena *ptr = (void *)&amp;arena;</div><div class='add'>+	u64 user_vm_start;</div><div class='add'>+</div><div class='add'>+	/* Prevent GCC bounds warning: casting &amp;arena to struct bpf_arena *</div><div class='add'>+	 * triggers bounds checking since the map definition is smaller than struct</div><div class='add'>+	 * bpf_arena. barrier_var() makes the pointer opaque to GCC, preventing the</div><div class='add'>+	 * bounds analysis</div><div class='add'>+	 */</div><div class='add'>+	barrier_var(ptr);</div><div class='add'>+	user_vm_start = ptr-&gt;user_vm_start;</div><div class='add'>+	fault_addr = user_vm_start + 0x7fff;</div><div class='add'>+	bpf_addr_space_cast(user_vm_start, 0, 1);</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r1 = %0;"</div><div class='add'>+		"r1 = *(u32 *)(r1 + 0x7fff);"</div><div class='add'>+		:</div><div class='add'>+		: "r" (user_vm_start)</div><div class='add'>+		: "r1"</div><div class='add'>+	);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __noinline void subprog(void)</div><div class='add'>+{</div><div class='add'>+	int __arena *addr = (int __arena *)0xdeadbeef;</div><div class='add'>+</div><div class='add'>+	arena_ptr = &amp;arena;</div><div class='add'>+	*addr = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__arch_x86_64</div><div class='add'>+__arch_arm64</div><div class='add'>+__success __retval(0)</div><div class='add'>+__stderr("ERROR: Arena WRITE access at unmapped address 0x{{.*}}")</div><div class='add'>+__stderr("CPU: {{[0-9]+}} UID: 0 PID: {{[0-9]+}} Comm: {{.*}}")</div><div class='add'>+__stderr("Call trace:\n"</div><div class='add'>+"{{([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n"</div><div class='add'>+"|[ \t]+[^\n]+\n)*}}")</div><div class='add'>+int stream_arena_subprog_fault(void *ctx)</div><div class='add'>+{</div><div class='add'>+	subprog();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __noinline int timer_cb(void *map, int *key, struct bpf_timer *timer)</div><div class='add'>+{</div><div class='add'>+	int __arena *addr = (int __arena *)0xdeadbeef;</div><div class='add'>+</div><div class='add'>+	arena_ptr = &amp;arena;</div><div class='add'>+	*addr = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__arch_x86_64</div><div class='add'>+__arch_arm64</div><div class='add'>+__success __retval(0)</div><div class='add'>+__stderr("ERROR: Arena WRITE access at unmapped address 0x{{.*}}")</div><div class='add'>+__stderr("CPU: {{[0-9]+}} UID: 0 PID: {{[0-9]+}} Comm: {{.*}}")</div><div class='add'>+__stderr("Call trace:\n"</div><div class='add'>+"{{([a-zA-Z_][a-zA-Z0-9_]*\\+0x[0-9a-fA-F]+/0x[0-9a-fA-F]+\n"</div><div class='add'>+"|[ \t]+[^\n]+\n)*}}")</div><div class='add'>+int stream_arena_callback_fault(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_timer *arr_timer;</div><div class='add'>+</div><div class='add'>+	arr_timer = bpf_map_lookup_elem(&amp;array, &amp;(int){0});</div><div class='add'>+	if (!arr_timer)</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_timer_init(arr_timer, &amp;array, 1);</div><div class='add'>+	bpf_timer_set_callback(arr_timer, timer_cb);</div><div class='add'>+	bpf_timer_start(arr_timer, 0, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/stream_fail.c b/tools/testing/selftests/bpf/progs/stream_fail.c<br/>new file mode 100644<br/>index 000000000000..3662515f0107<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/stream_fail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/stream_fail.c</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_core_read.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__failure __msg("Possibly NULL pointer passed")</div><div class='add'>+int stream_vprintk_null_arg(void *ctx)</div><div class='add'>+{</div><div class='add'>+	bpf_stream_vprintk_impl(BPF_STDOUT, "", NULL, 0, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__failure __msg("R3 type=scalar expected=")</div><div class='add'>+int stream_vprintk_scalar_arg(void *ctx)</div><div class='add'>+{</div><div class='add'>+	bpf_stream_vprintk_impl(BPF_STDOUT, "", (void *)46, 0, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__failure __msg("arg#1 doesn't point to a const string")</div><div class='add'>+int stream_vprintk_string_arg(void *ctx)</div><div class='add'>+{</div><div class='add'>+	bpf_stream_vprintk_impl(BPF_STDOUT, ctx, NULL, 0, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/string_kfuncs_failure1.c b/tools/testing/selftests/bpf/progs/string_kfuncs_failure1.c<br/>new file mode 100644<br/>index 000000000000..826e6b6aff7e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/string_kfuncs_failure1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/string_kfuncs_failure1.c</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2025 Red Hat, Inc.*/</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "errno.h"</div><div class='add'>+</div><div class='add'>+char *user_ptr = (char *)1;</div><div class='add'>+char *invalid_kern_ptr = (char *)-1;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * When passing userspace pointers, the error code differs based on arch:</div><div class='add'>+ *   -ERANGE on arches with non-overlapping address spaces</div><div class='add'>+ *   -EFAULT on other arches</div><div class='add'>+ */</div><div class='add'>+#if defined(__TARGET_ARCH_arm) || defined(__TARGET_ARCH_loongarch) || \</div><div class='add'>+    defined(__TARGET_ARCH_powerpc) || defined(__TARGET_ARCH_x86)</div><div class='add'>+#define USER_PTR_ERR -ERANGE</div><div class='add'>+#else</div><div class='add'>+#define USER_PTR_ERR -EFAULT</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On s390, __get_kernel_nofault (used in string kfuncs) returns 0 for NULL and</div><div class='add'>+ * user_ptr (instead of causing an exception) so the below two groups of tests</div><div class='add'>+ * are not applicable.</div><div class='add'>+ */</div><div class='add'>+#ifndef __TARGET_ARCH_s390</div><div class='add'>+</div><div class='add'>+/* Passing NULL to string kfuncs (treated as a userspace ptr) */</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strcmp_null1(void *ctx) { return bpf_strcmp(NULL, "hello"); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strcmp_null2(void *ctx) { return bpf_strcmp("hello", NULL); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strcasecmp_null1(void *ctx) { return bpf_strcasecmp(NULL, "HELLO"); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strcasecmp_null2(void *ctx) { return bpf_strcasecmp("HELLO", NULL); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strchr_null(void *ctx) { return bpf_strchr(NULL, 'a'); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strchrnul_null(void *ctx) { return bpf_strchrnul(NULL, 'a'); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strnchr_null(void *ctx) { return bpf_strnchr(NULL, 1, 'a'); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strrchr_null(void *ctx) { return bpf_strrchr(NULL, 'a'); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strlen_null(void *ctx) { return bpf_strlen(NULL); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strnlen_null(void *ctx) { return bpf_strnlen(NULL, 1); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strspn_null1(void *ctx) { return bpf_strspn(NULL, "hello"); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strspn_null2(void *ctx) { return bpf_strspn("hello", NULL); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strcspn_null1(void *ctx) { return bpf_strcspn(NULL, "hello"); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strcspn_null2(void *ctx) { return bpf_strcspn("hello", NULL); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strstr_null1(void *ctx) { return bpf_strstr(NULL, "hello"); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strstr_null2(void *ctx) { return bpf_strstr("hello", NULL); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strcasestr_null1(void *ctx) { return bpf_strcasestr(NULL, "hello"); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strcasestr_null2(void *ctx) { return bpf_strcasestr("hello", NULL); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strnstr_null1(void *ctx) { return bpf_strnstr(NULL, "hello", 1); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strnstr_null2(void *ctx) { return bpf_strnstr("hello", NULL, 1); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strncasestr_null1(void *ctx) { return bpf_strncasestr(NULL, "hello", 1); }</div><div class='add'>+SEC("syscall")  __retval(USER_PTR_ERR)int test_strncasestr_null2(void *ctx) { return bpf_strncasestr("hello", NULL, 1); }</div><div class='add'>+</div><div class='add'>+/* Passing userspace ptr to string kfuncs */</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strcmp_user_ptr1(void *ctx) { return bpf_strcmp(user_ptr, "hello"); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strcmp_user_ptr2(void *ctx) { return bpf_strcmp("hello", user_ptr); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strcasecmp_user_ptr1(void *ctx) { return bpf_strcasecmp(user_ptr, "HELLO"); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strcasecmp_user_ptr2(void *ctx) { return bpf_strcasecmp("HELLO", user_ptr); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strchr_user_ptr(void *ctx) { return bpf_strchr(user_ptr, 'a'); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strchrnul_user_ptr(void *ctx) { return bpf_strchrnul(user_ptr, 'a'); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strnchr_user_ptr(void *ctx) { return bpf_strnchr(user_ptr, 1, 'a'); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strrchr_user_ptr(void *ctx) { return bpf_strrchr(user_ptr, 'a'); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strlen_user_ptr(void *ctx) { return bpf_strlen(user_ptr); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strnlen_user_ptr(void *ctx) { return bpf_strnlen(user_ptr, 1); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strspn_user_ptr1(void *ctx) { return bpf_strspn(user_ptr, "hello"); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strspn_user_ptr2(void *ctx) { return bpf_strspn("hello", user_ptr); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strcspn_user_ptr1(void *ctx) { return bpf_strcspn(user_ptr, "hello"); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strcspn_user_ptr2(void *ctx) { return bpf_strcspn("hello", user_ptr); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strstr_user_ptr1(void *ctx) { return bpf_strstr(user_ptr, "hello"); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strstr_user_ptr2(void *ctx) { return bpf_strstr("hello", user_ptr); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strcasestr_user_ptr1(void *ctx) { return bpf_strcasestr(user_ptr, "hello"); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strcasestr_user_ptr2(void *ctx) { return bpf_strcasestr("hello", user_ptr); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strnstr_user_ptr1(void *ctx) { return bpf_strnstr(user_ptr, "hello", 1); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strnstr_user_ptr2(void *ctx) { return bpf_strnstr("hello", user_ptr, 1); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strncasestr_user_ptr1(void *ctx) { return bpf_strncasestr(user_ptr, "hello", 1); }</div><div class='add'>+SEC("syscall") __retval(USER_PTR_ERR) int test_strncasestr_user_ptr2(void *ctx) { return bpf_strncasestr("hello", user_ptr, 1); }</div><div class='add'>+</div><div class='add'>+#endif /* __TARGET_ARCH_s390 */</div><div class='add'>+</div><div class='add'>+/* Passing invalid kernel ptr to string kfuncs should always return -EFAULT */</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strcmp_pagefault1(void *ctx) { return bpf_strcmp(invalid_kern_ptr, "hello"); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strcmp_pagefault2(void *ctx) { return bpf_strcmp("hello", invalid_kern_ptr); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strcasecmp_pagefault1(void *ctx) { return bpf_strcasecmp(invalid_kern_ptr, "HELLO"); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strcasecmp_pagefault2(void *ctx) { return bpf_strcasecmp("HELLO", invalid_kern_ptr); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strchr_pagefault(void *ctx) { return bpf_strchr(invalid_kern_ptr, 'a'); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strchrnul_pagefault(void *ctx) { return bpf_strchrnul(invalid_kern_ptr, 'a'); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strnchr_pagefault(void *ctx) { return bpf_strnchr(invalid_kern_ptr, 1, 'a'); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strrchr_pagefault(void *ctx) { return bpf_strrchr(invalid_kern_ptr, 'a'); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strlen_pagefault(void *ctx) { return bpf_strlen(invalid_kern_ptr); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strnlen_pagefault(void *ctx) { return bpf_strnlen(invalid_kern_ptr, 1); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strspn_pagefault1(void *ctx) { return bpf_strspn(invalid_kern_ptr, "hello"); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strspn_pagefault2(void *ctx) { return bpf_strspn("hello", invalid_kern_ptr); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strcspn_pagefault1(void *ctx) { return bpf_strcspn(invalid_kern_ptr, "hello"); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strcspn_pagefault2(void *ctx) { return bpf_strcspn("hello", invalid_kern_ptr); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strstr_pagefault1(void *ctx) { return bpf_strstr(invalid_kern_ptr, "hello"); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strstr_pagefault2(void *ctx) { return bpf_strstr("hello", invalid_kern_ptr); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strcasestr_pagefault1(void *ctx) { return bpf_strcasestr(invalid_kern_ptr, "hello"); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strcasestr_pagefault2(void *ctx) { return bpf_strcasestr("hello", invalid_kern_ptr); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strnstr_pagefault1(void *ctx) { return bpf_strnstr(invalid_kern_ptr, "hello", 1); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strnstr_pagefault2(void *ctx) { return bpf_strnstr("hello", invalid_kern_ptr, 1); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strncasestr_pagefault1(void *ctx) { return bpf_strncasestr(invalid_kern_ptr, "hello", 1); }</div><div class='add'>+SEC("syscall") __retval(-EFAULT) int test_strncasestr_pagefault2(void *ctx) { return bpf_strncasestr("hello", invalid_kern_ptr, 1); }</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/string_kfuncs_failure2.c b/tools/testing/selftests/bpf/progs/string_kfuncs_failure2.c<br/>new file mode 100644<br/>index 000000000000..05e1da1f250f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/string_kfuncs_failure2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/string_kfuncs_failure2.c</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2025 Red Hat, Inc.*/</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+</div><div class='add'>+char long_str[XATTR_SIZE_MAX + 1];</div><div class='add'>+</div><div class='add'>+SEC("syscall") int test_strcmp_too_long(void *ctx) { return bpf_strcmp(long_str, long_str); }</div><div class='add'>+SEC("syscall") int test_strcasecmp_too_long(void *ctx) { return bpf_strcasecmp(long_str, long_str); }</div><div class='add'>+SEC("syscall") int test_strchr_too_long(void *ctx) { return bpf_strchr(long_str, 'b'); }</div><div class='add'>+SEC("syscall") int test_strchrnul_too_long(void *ctx) { return bpf_strchrnul(long_str, 'b'); }</div><div class='add'>+SEC("syscall") int test_strnchr_too_long(void *ctx) { return bpf_strnchr(long_str, sizeof(long_str), 'b'); }</div><div class='add'>+SEC("syscall") int test_strrchr_too_long(void *ctx) { return bpf_strrchr(long_str, 'b'); }</div><div class='add'>+SEC("syscall") int test_strlen_too_long(void *ctx) { return bpf_strlen(long_str); }</div><div class='add'>+SEC("syscall") int test_strnlen_too_long(void *ctx) { return bpf_strnlen(long_str, sizeof(long_str)); }</div><div class='add'>+SEC("syscall") int test_strspn_str_too_long(void *ctx) { return bpf_strspn(long_str, "a"); }</div><div class='add'>+SEC("syscall") int test_strspn_accept_too_long(void *ctx) { return bpf_strspn("b", long_str); }</div><div class='add'>+SEC("syscall") int test_strcspn_str_too_long(void *ctx) { return bpf_strcspn(long_str, "b"); }</div><div class='add'>+SEC("syscall") int test_strcspn_reject_too_long(void *ctx) { return bpf_strcspn("b", long_str); }</div><div class='add'>+SEC("syscall") int test_strstr_too_long(void *ctx) { return bpf_strstr(long_str, "hello"); }</div><div class='add'>+SEC("syscall") int test_strcasestr_too_long(void *ctx) { return bpf_strcasestr(long_str, "hello"); }</div><div class='add'>+SEC("syscall") int test_strnstr_too_long(void *ctx) { return bpf_strnstr(long_str, "hello", sizeof(long_str)); }</div><div class='add'>+SEC("syscall") int test_strncasestr_too_long(void *ctx) { return bpf_strncasestr(long_str, "hello", sizeof(long_str)); }</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/string_kfuncs_success.c b/tools/testing/selftests/bpf/progs/string_kfuncs_success.c<br/>new file mode 100644<br/>index 000000000000..a8513964516b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/string_kfuncs_success.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/string_kfuncs_success.c</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2025 Red Hat, Inc.*/</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "errno.h"</div><div class='add'>+</div><div class='add'>+char str[] = "hello world";</div><div class='add'>+</div><div class='add'>+#define __test(retval) SEC("syscall") __success __retval(retval)</div><div class='add'>+</div><div class='add'>+/* Functional tests */</div><div class='add'>+__test(0) int test_strcmp_eq(void *ctx) { return bpf_strcmp(str, "hello world"); }</div><div class='add'>+__test(1) int test_strcmp_neq(void *ctx) { return bpf_strcmp(str, "hello"); }</div><div class='add'>+__test(0) int test_strcasecmp_eq1(void *ctx) { return bpf_strcasecmp(str, "hello world"); }</div><div class='add'>+__test(0) int test_strcasecmp_eq2(void *ctx) { return bpf_strcasecmp(str, "HELLO WORLD"); }</div><div class='add'>+__test(0) int test_strcasecmp_eq3(void *ctx) { return bpf_strcasecmp(str, "HELLO world"); }</div><div class='add'>+__test(1) int test_strcasecmp_neq1(void *ctx) { return bpf_strcasecmp(str, "hello"); }</div><div class='add'>+__test(1) int test_strcasecmp_neq2(void *ctx) { return bpf_strcasecmp(str, "HELLO"); }</div><div class='add'>+__test(1) int test_strchr_found(void *ctx) { return bpf_strchr(str, 'e'); }</div><div class='add'>+__test(11) int test_strchr_null(void *ctx) { return bpf_strchr(str, '\0'); }</div><div class='add'>+__test(-ENOENT) int test_strchr_notfound(void *ctx) { return bpf_strchr(str, 'x'); }</div><div class='add'>+__test(1) int test_strchrnul_found(void *ctx) { return bpf_strchrnul(str, 'e'); }</div><div class='add'>+__test(11) int test_strchrnul_notfound(void *ctx) { return bpf_strchrnul(str, 'x'); }</div><div class='add'>+__test(1) int test_strnchr_found(void *ctx) { return bpf_strnchr(str, 5, 'e'); }</div><div class='add'>+__test(11) int test_strnchr_null(void *ctx) { return bpf_strnchr(str, 12, '\0'); }</div><div class='add'>+__test(-ENOENT) int test_strnchr_notfound(void *ctx) { return bpf_strnchr(str, 5, 'w'); }</div><div class='add'>+__test(9) int test_strrchr_found(void *ctx) { return bpf_strrchr(str, 'l'); }</div><div class='add'>+__test(11) int test_strrchr_null(void *ctx) { return bpf_strrchr(str, '\0'); }</div><div class='add'>+__test(-ENOENT) int test_strrchr_notfound(void *ctx) { return bpf_strrchr(str, 'x'); }</div><div class='add'>+__test(11) int test_strlen(void *ctx) { return bpf_strlen(str); }</div><div class='add'>+__test(11) int test_strnlen(void *ctx) { return bpf_strnlen(str, 12); }</div><div class='add'>+__test(5) int test_strspn(void *ctx) { return bpf_strspn(str, "ehlo"); }</div><div class='add'>+__test(2) int test_strcspn(void *ctx) { return bpf_strcspn(str, "lo"); }</div><div class='add'>+__test(6) int test_strstr_found(void *ctx) { return bpf_strstr(str, "world"); }</div><div class='add'>+__test(6) int test_strcasestr_found(void *ctx) { return bpf_strcasestr(str, "woRLD"); }</div><div class='add'>+__test(-ENOENT) int test_strstr_notfound(void *ctx) { return bpf_strstr(str, "hi"); }</div><div class='add'>+__test(-ENOENT) int test_strcasestr_notfound(void *ctx) { return bpf_strcasestr(str, "hi"); }</div><div class='add'>+__test(0) int test_strstr_empty(void *ctx) { return bpf_strstr(str, ""); }</div><div class='add'>+__test(0) int test_strcasestr_empty(void *ctx) { return bpf_strcasestr(str, ""); }</div><div class='add'>+__test(0) int test_strnstr_found1(void *ctx) { return bpf_strnstr("", "", 0); }</div><div class='add'>+__test(0) int test_strnstr_found2(void *ctx) { return bpf_strnstr(str, "hello", 5); }</div><div class='add'>+__test(0) int test_strnstr_found3(void *ctx) { return bpf_strnstr(str, "hello", 6); }</div><div class='add'>+__test(-ENOENT) int test_strnstr_notfound1(void *ctx) { return bpf_strnstr(str, "hi", 10); }</div><div class='add'>+__test(-ENOENT) int test_strnstr_notfound2(void *ctx) { return bpf_strnstr(str, "hello", 4); }</div><div class='add'>+__test(-ENOENT) int test_strnstr_notfound3(void *ctx) { return bpf_strnstr("", "a", 0); }</div><div class='add'>+__test(0) int test_strnstr_empty(void *ctx) { return bpf_strnstr(str, "", 1); }</div><div class='add'>+__test(0) int test_strncasestr_found1(void *ctx) { return bpf_strncasestr("", "", 0); }</div><div class='add'>+__test(0) int test_strncasestr_found2(void *ctx) { return bpf_strncasestr(str, "heLLO", 5); }</div><div class='add'>+__test(0) int test_strncasestr_found3(void *ctx) { return bpf_strncasestr(str, "heLLO", 6); }</div><div class='add'>+__test(-ENOENT) int test_strncasestr_notfound1(void *ctx) { return bpf_strncasestr(str, "hi", 10); }</div><div class='add'>+__test(-ENOENT) int test_strncasestr_notfound2(void *ctx) { return bpf_strncasestr(str, "hello", 4); }</div><div class='add'>+__test(-ENOENT) int test_strncasestr_notfound3(void *ctx) { return bpf_strncasestr("", "a", 0); }</div><div class='add'>+__test(0) int test_strncasestr_empty(void *ctx) { return bpf_strncasestr(str, "", 1); }</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/strncmp_bench.c b/tools/testing/selftests/bpf/progs/strncmp_bench.c<br/>index 18373a7df76e..f47bf88f8d2a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/strncmp_bench.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/strncmp_bench.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/strncmp_bench.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/strncmp_bench.c</a></div><div class='hunk'>@@ -35,7 +35,10 @@ static __always_inline int local_strncmp(const char *s1, unsigned int sz,</div><div class='ctx'> SEC("tp/syscalls/sys_enter_getpgid")</div><div class='ctx'> int strncmp_no_helper(void *ctx)</div><div class='ctx'> {</div><div class='del'>-	if (local_strncmp(str, cmp_str_len + 1, target) &lt; 0)</div><div class='add'>+	const char *target_str = target;</div><div class='add'>+</div><div class='add'>+	barrier_var(target_str);</div><div class='add'>+	if (local_strncmp(str, cmp_str_len + 1, target_str) &lt; 0)</div><div class='ctx'> 		__sync_add_and_fetch(&amp;hits, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/strobemeta.h b/tools/testing/selftests/bpf/progs/strobemeta.h<br/>index a5c74d31a244..6e1918deaf26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/strobemeta.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/strobemeta.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/strobemeta.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/strobemeta.h</a></div><div class='hunk'>@@ -330,9 +330,9 @@ static void *calc_location(struct strobe_value_loc *loc, void *tls_base)</div><div class='ctx'> 	}</div><div class='ctx'> 	bpf_probe_read_user(&amp;tls_ptr, sizeof(void *), dtv);</div><div class='ctx'> 	/* if pointer has (void *)-1 value, then TLS wasn't initialized yet */</div><div class='del'>-	return tls_ptr &amp;&amp; tls_ptr != (void *)-1</div><div class='del'>-		? tls_ptr + tls_index.offset</div><div class='del'>-		: NULL;</div><div class='add'>+	if (!tls_ptr || tls_ptr == (void *)-1)</div><div class='add'>+		return NULL;</div><div class='add'>+	return tls_ptr + tls_index.offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef SUBPROGS</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping1.c b/tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping1.c<br/>new file mode 100644<br/>index 000000000000..ad8bb546c9bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping1.c</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "../test_kmods/bpf_testmod_kfunc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+#define bpf_kfunc_multi_st_ops_test_1(args) bpf_kfunc_multi_st_ops_test_1(args, st_ops_id)</div><div class='add'>+int st_ops_id;</div><div class='add'>+</div><div class='add'>+int test_pid;</div><div class='add'>+int test_err;</div><div class='add'>+</div><div class='add'>+#define MAP1_MAGIC 1234</div><div class='add'>+</div><div class='add'>+SEC("struct_ops")</div><div class='add'>+int BPF_PROG(test_1, struct st_ops_args *args)</div><div class='add'>+{</div><div class='add'>+	return MAP1_MAGIC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/sys_enter")</div><div class='add'>+int BPF_PROG(sys_enter, struct pt_regs *regs, long id)</div><div class='add'>+{</div><div class='add'>+	struct st_ops_args args = {};</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	if (!test_pid || task-&gt;pid != test_pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = bpf_kfunc_multi_st_ops_test_1(&amp;args);</div><div class='add'>+	if (ret != MAP1_MAGIC)</div><div class='add'>+		test_err++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int syscall_prog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct st_ops_args args = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bpf_kfunc_multi_st_ops_test_1(&amp;args);</div><div class='add'>+	if (ret != MAP1_MAGIC)</div><div class='add'>+		test_err++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_multi_st_ops st_ops_map = {</div><div class='add'>+	.test_1 = (void *)test_1,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping2.c b/tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping2.c<br/>new file mode 100644<br/>index 000000000000..cea1a2f4b62f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_id_ops_mapping2.c</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "../test_kmods/bpf_testmod_kfunc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+#define bpf_kfunc_multi_st_ops_test_1(args) bpf_kfunc_multi_st_ops_test_1(args, st_ops_id)</div><div class='add'>+int st_ops_id;</div><div class='add'>+</div><div class='add'>+int test_pid;</div><div class='add'>+int test_err;</div><div class='add'>+</div><div class='add'>+#define MAP2_MAGIC 4567</div><div class='add'>+</div><div class='add'>+SEC("struct_ops")</div><div class='add'>+int BPF_PROG(test_1, struct st_ops_args *args)</div><div class='add'>+{</div><div class='add'>+	return MAP2_MAGIC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/sys_enter")</div><div class='add'>+int BPF_PROG(sys_enter, struct pt_regs *regs, long id)</div><div class='add'>+{</div><div class='add'>+	struct st_ops_args args = {};</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	if (!test_pid || task-&gt;pid != test_pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = bpf_kfunc_multi_st_ops_test_1(&amp;args);</div><div class='add'>+	if (ret != MAP2_MAGIC)</div><div class='add'>+		test_err++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int syscall_prog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct st_ops_args args = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bpf_kfunc_multi_st_ops_test_1(&amp;args);</div><div class='add'>+	if (ret != MAP2_MAGIC)</div><div class='add'>+		test_err++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_multi_st_ops st_ops_map = {</div><div class='add'>+	.test_1 = (void *)test_1,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_kptr_return.c b/tools/testing/selftests/bpf/progs/struct_ops_kptr_return.c<br/>new file mode 100644<br/>index 000000000000..2b98b7710816<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_kptr_return.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_kptr_return.c</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+void bpf_task_release(struct task_struct *p) __ksym;</div><div class='add'>+</div><div class='add'>+/* This test struct_ops BPF programs returning referenced kptr. The verifier should</div><div class='add'>+ * allow a referenced kptr or a NULL pointer to be returned. A referenced kptr to task</div><div class='add'>+ * here is acquired automatically as the task argument is tagged with "__ref".</div><div class='add'>+ */</div><div class='add'>+SEC("struct_ops/test_return_ref_kptr")</div><div class='add'>+struct task_struct *BPF_PROG(kptr_return, int dummy,</div><div class='add'>+			     struct task_struct *task, struct cgroup *cgrp)</div><div class='add'>+{</div><div class='add'>+	if (dummy % 2) {</div><div class='add'>+		bpf_task_release(task);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return task;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_ops testmod_kptr_return = {</div><div class='add'>+	.test_return_ref_kptr = (void *)kptr_return,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__invalid_scalar.c b/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__invalid_scalar.c<br/>new file mode 100644<br/>index 000000000000..caeea158ef69<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__invalid_scalar.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__invalid_scalar.c</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct cgroup *bpf_cgroup_acquire(struct cgroup *p) __ksym;</div><div class='add'>+void bpf_task_release(struct task_struct *p) __ksym;</div><div class='add'>+</div><div class='add'>+/* This test struct_ops BPF programs returning referenced kptr. The verifier should</div><div class='add'>+ * reject programs returning a non-zero scalar value.</div><div class='add'>+ */</div><div class='add'>+SEC("struct_ops/test_return_ref_kptr")</div><div class='add'>+__failure __msg("At program exit the register R0 has smin=1 smax=1 should have been in [0, 0]")</div><div class='add'>+struct task_struct *BPF_PROG(kptr_return_fail__invalid_scalar, int dummy,</div><div class='add'>+			     struct task_struct *task, struct cgroup *cgrp)</div><div class='add'>+{</div><div class='add'>+	bpf_task_release(task);</div><div class='add'>+	return (struct task_struct *)1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_ops testmod_kptr_return = {</div><div class='add'>+	.test_return_ref_kptr = (void *)kptr_return_fail__invalid_scalar,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__local_kptr.c b/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__local_kptr.c<br/>new file mode 100644<br/>index 000000000000..b8b4f05c3d7f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__local_kptr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__local_kptr.c</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct cgroup *bpf_cgroup_acquire(struct cgroup *p) __ksym;</div><div class='add'>+void bpf_task_release(struct task_struct *p) __ksym;</div><div class='add'>+</div><div class='add'>+/* This test struct_ops BPF programs returning referenced kptr. The verifier should</div><div class='add'>+ * reject programs returning a local kptr.</div><div class='add'>+ */</div><div class='add'>+SEC("struct_ops/test_return_ref_kptr")</div><div class='add'>+__failure __msg("At program exit the register R0 is not a known value (ptr_or_null_)")</div><div class='add'>+struct task_struct *BPF_PROG(kptr_return_fail__local_kptr, int dummy,</div><div class='add'>+			     struct task_struct *task, struct cgroup *cgrp)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *t;</div><div class='add'>+</div><div class='add'>+	bpf_task_release(task);</div><div class='add'>+</div><div class='add'>+	t = bpf_obj_new(typeof(*task));</div><div class='add'>+	if (!t)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return t;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_ops testmod_kptr_return = {</div><div class='add'>+	.test_return_ref_kptr = (void *)kptr_return_fail__local_kptr,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__nonzero_offset.c b/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__nonzero_offset.c<br/>new file mode 100644<br/>index 000000000000..7ddeb28c2329<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__nonzero_offset.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__nonzero_offset.c</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct cgroup *bpf_cgroup_acquire(struct cgroup *p) __ksym;</div><div class='add'>+void bpf_task_release(struct task_struct *p) __ksym;</div><div class='add'>+</div><div class='add'>+/* This test struct_ops BPF programs returning referenced kptr. The verifier should</div><div class='add'>+ * reject programs returning a modified referenced kptr.</div><div class='add'>+ */</div><div class='add'>+SEC("struct_ops/test_return_ref_kptr")</div><div class='add'>+__failure __msg("dereference of modified trusted_ptr_ ptr R0 off={{[0-9]+}} disallowed")</div><div class='add'>+struct task_struct *BPF_PROG(kptr_return_fail__nonzero_offset, int dummy,</div><div class='add'>+			     struct task_struct *task, struct cgroup *cgrp)</div><div class='add'>+{</div><div class='add'>+	return (struct task_struct *)&amp;task-&gt;jobctl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_ops testmod_kptr_return = {</div><div class='add'>+	.test_return_ref_kptr = (void *)kptr_return_fail__nonzero_offset,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__wrong_type.c b/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__wrong_type.c<br/>new file mode 100644<br/>index 000000000000..6a2dd5367802<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__wrong_type.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__wrong_type.c</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct cgroup *bpf_cgroup_acquire(struct cgroup *p) __ksym;</div><div class='add'>+void bpf_task_release(struct task_struct *p) __ksym;</div><div class='add'>+</div><div class='add'>+/* This test struct_ops BPF programs returning referenced kptr. The verifier should</div><div class='add'>+ * reject programs returning a referenced kptr of the wrong type.</div><div class='add'>+ */</div><div class='add'>+SEC("struct_ops/test_return_ref_kptr")</div><div class='add'>+__failure __msg("At program exit the register R0 is not a known value (ptr_or_null_)")</div><div class='add'>+struct task_struct *BPF_PROG(kptr_return_fail__wrong_type, int dummy,</div><div class='add'>+			     struct task_struct *task, struct cgroup *cgrp)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *ret;</div><div class='add'>+</div><div class='add'>+	ret = (struct task_struct *)bpf_cgroup_acquire(cgrp);</div><div class='add'>+	bpf_task_release(task);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_ops testmod_kptr_return = {</div><div class='add'>+	.test_return_ref_kptr = (void *)kptr_return_fail__wrong_type,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_private_stack.c b/tools/testing/selftests/bpf/progs/struct_ops_private_stack.c<br/>index 0e4d2ff63ab8..dbe646013811 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_private_stack.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_private_stack.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_private_stack.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_private_stack.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='del'>-#if defined(__TARGET_ARCH_x86)</div><div class='add'>+#if defined(__TARGET_ARCH_x86) || defined(__TARGET_ARCH_arm64)</div><div class='ctx'> bool skip __attribute((__section__(".data"))) = false;</div><div class='ctx'> #else</div><div class='ctx'> bool skip = true;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_private_stack_fail.c b/tools/testing/selftests/bpf/progs/struct_ops_private_stack_fail.c<br/>index 58d5d8dc2235..3d89ad7cbe2a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_private_stack_fail.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_private_stack_fail.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_private_stack_fail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_private_stack_fail.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='del'>-#if defined(__TARGET_ARCH_x86)</div><div class='add'>+#if defined(__TARGET_ARCH_x86) || defined(__TARGET_ARCH_arm64)</div><div class='ctx'> bool skip __attribute((__section__(".data"))) = false;</div><div class='ctx'> #else</div><div class='ctx'> bool skip = true;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_private_stack_recur.c b/tools/testing/selftests/bpf/progs/struct_ops_private_stack_recur.c<br/>index 31e58389bb8b..b1f6d7e5a8e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_private_stack_recur.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/struct_ops_private_stack_recur.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_private_stack_recur.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_private_stack_recur.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='del'>-#if defined(__TARGET_ARCH_x86)</div><div class='add'>+#if defined(__TARGET_ARCH_x86) || defined(__TARGET_ARCH_arm64)</div><div class='ctx'> bool skip __attribute((__section__(".data"))) = false;</div><div class='ctx'> #else</div><div class='ctx'> bool skip = true;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_refcounted.c b/tools/testing/selftests/bpf/progs/struct_ops_refcounted.c<br/>new file mode 100644<br/>index 000000000000..9c0a65466356<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_refcounted.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_refcounted.c</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+__attribute__((nomerge)) extern void bpf_task_release(struct task_struct *p) __ksym;</div><div class='add'>+</div><div class='add'>+/* This is a test BPF program that uses struct_ops to access a referenced</div><div class='add'>+ * kptr argument. This is a test for the verifier to ensure that it</div><div class='add'>+ * 1) recognizes the task as a referenced object (i.e., ref_obj_id &gt; 0), and</div><div class='add'>+ * 2) the same reference can be acquired from multiple paths as long as it</div><div class='add'>+ *    has not been released.</div><div class='add'>+ */</div><div class='add'>+SEC("struct_ops/test_refcounted")</div><div class='add'>+int BPF_PROG(refcounted, int dummy, struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	if (dummy == 1)</div><div class='add'>+		bpf_task_release(task);</div><div class='add'>+	else</div><div class='add'>+		bpf_task_release(task);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_ops testmod_refcounted = {</div><div class='add'>+	.test_refcounted = (void *)refcounted,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__global_subprog.c b/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__global_subprog.c<br/>new file mode 100644<br/>index 000000000000..ae074aa62852<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__global_subprog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__global_subprog.c</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+extern void bpf_task_release(struct task_struct *p) __ksym;</div><div class='add'>+</div><div class='add'>+__noinline int subprog_release(__u64 *ctx __arg_ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task = (struct task_struct *)ctx[1];</div><div class='add'>+	int dummy = (int)ctx[0];</div><div class='add'>+</div><div class='add'>+	bpf_task_release(task);</div><div class='add'>+</div><div class='add'>+	return dummy + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test that the verifier rejects a program that contains a global</div><div class='add'>+ * subprogram with referenced kptr arguments</div><div class='add'>+ */</div><div class='add'>+SEC("struct_ops/test_refcounted")</div><div class='add'>+__failure __log_level(2)</div><div class='add'>+__msg("Validating subprog_release() func#1...")</div><div class='add'>+__msg("invalid bpf_context access off=8. Reference may already be released")</div><div class='add'>+int refcounted_fail__global_subprog(unsigned long long *ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task = (struct task_struct *)ctx[1];</div><div class='add'>+</div><div class='add'>+	bpf_task_release(task);</div><div class='add'>+</div><div class='add'>+	return subprog_release(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_ops testmod_ref_acquire = {</div><div class='add'>+	.test_refcounted = (void *)refcounted_fail__global_subprog,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__ref_leak.c b/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__ref_leak.c<br/>new file mode 100644<br/>index 000000000000..e945b1a04294<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__ref_leak.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__ref_leak.c</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+/* Test that the verifier rejects a program that acquires a referenced</div><div class='add'>+ * kptr through context without releasing the reference</div><div class='add'>+ */</div><div class='add'>+SEC("struct_ops/test_refcounted")</div><div class='add'>+__failure __msg("Unreleased reference id=1 alloc_insn=0")</div><div class='add'>+int BPF_PROG(refcounted_fail__ref_leak, int dummy,</div><div class='add'>+	     struct task_struct *task)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_ops testmod_ref_acquire = {</div><div class='add'>+	.test_refcounted = (void *)refcounted_fail__ref_leak,</div><div class='add'>+};</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c b/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c<br/>new file mode 100644<br/>index 000000000000..3b125025a1f2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "../test_kmods/bpf_testmod.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_PROG_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__uint(key_size, sizeof(__u32));</div><div class='add'>+	__uint(value_size, sizeof(__u32));</div><div class='add'>+} prog_array SEC(".maps");</div><div class='add'>+</div><div class='add'>+/* Test that the verifier rejects a program with referenced kptr arguments</div><div class='add'>+ * that tail call</div><div class='add'>+ */</div><div class='add'>+SEC("struct_ops/test_refcounted")</div><div class='add'>+__failure __msg("program with __ref argument cannot tail call")</div><div class='add'>+int refcounted_fail__tail_call(unsigned long long *ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task = (struct task_struct *)ctx[1];</div><div class='add'>+</div><div class='add'>+	bpf_task_release(task);</div><div class='add'>+	bpf_tail_call(ctx, &amp;prog_array, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC(".struct_ops.link")</div><div class='add'>+struct bpf_testmod_ops testmod_ref_acquire = {</div><div class='add'>+	.test_refcounted = (void *)refcounted_fail__tail_call,</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/summarization.c b/tools/testing/selftests/bpf/progs/summarization.c<br/>new file mode 100644<br/>index 000000000000..f89effe82c9e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/summarization.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/summarization.c</a></div><div class='hunk'>@@ -0,0 +1,78 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+__noinline</div><div class='add'>+long changes_pkt_data(struct __sk_buff *sk)</div><div class='add'>+{</div><div class='add'>+	return bpf_skb_pull_data(sk, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__noinline __weak</div><div class='add'>+long does_not_change_pkt_data(struct __sk_buff *sk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+int main_changes_with_subprogs(struct __sk_buff *sk)</div><div class='add'>+{</div><div class='add'>+	changes_pkt_data(sk);</div><div class='add'>+	does_not_change_pkt_data(sk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+int main_changes(struct __sk_buff *sk)</div><div class='add'>+{</div><div class='add'>+	bpf_skb_pull_data(sk, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?tc")</div><div class='add'>+int main_does_not_change(struct __sk_buff *sk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__noinline</div><div class='add'>+long might_sleep(struct pt_regs *ctx __arg_ctx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bpf_copy_from_user(&amp;i, sizeof(i), NULL);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__noinline __weak</div><div class='add'>+long does_not_sleep(struct pt_regs *ctx __arg_ctx)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?uprobe.s")</div><div class='add'>+int main_might_sleep_with_subprogs(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	might_sleep(ctx);</div><div class='add'>+	does_not_sleep(ctx);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?uprobe.s")</div><div class='add'>+int main_might_sleep(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bpf_copy_from_user(&amp;i, sizeof(i), NULL);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?uprobe.s")</div><div class='add'>+int main_does_not_sleep(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/changes_pkt_data_freplace.c b/tools/testing/selftests/bpf/progs/summarization_freplace.c<br/>index f9a622705f1b..935f00e0e9ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/changes_pkt_data_freplace.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/changes_pkt_data_freplace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/summarization_freplace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/summarization_freplace.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> </div><div class='ctx'> SEC("?freplace")</div><div class='hunk'>@@ -15,4 +15,19 @@ long does_not_change_pkt_data(struct __sk_buff *sk)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("?freplace")</div><div class='add'>+long might_sleep(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bpf_copy_from_user(&amp;i, sizeof(i), NULL);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?freplace")</div><div class='add'>+long does_not_sleep(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy1.c b/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy1.c<br/>index 327ca395e860..d556b19413d7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy1.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy1.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include "bpf_legacy.h"</div><div class='add'>+#include "bpf_test_utils.h"</div><div class='ctx'> </div><div class='ctx'> struct {</div><div class='ctx'> 	__uint(type, BPF_MAP_TYPE_PROG_ARRAY);</div><div class='hunk'>@@ -24,6 +25,8 @@ int entry(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 1;</div><div class='ctx'> </div><div class='add'>+	clobber_regs_stack();</div><div class='add'>+</div><div class='ctx'> 	count++;</div><div class='ctx'> 	subprog_tail(skb);</div><div class='ctx'> 	subprog_tail(skb);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy2.c b/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy2.c<br/>index 72fd0d577506..ae94c9c70ab7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy2.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy2.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='add'>+#include "bpf_test_utils.h"</div><div class='ctx'> </div><div class='ctx'> int classifier_0(struct __sk_buff *skb);</div><div class='ctx'> int classifier_1(struct __sk_buff *skb);</div><div class='hunk'>@@ -60,6 +61,8 @@ int tailcall_bpf2bpf_hierarchy_2(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	clobber_regs_stack();</div><div class='add'>+</div><div class='ctx'> 	subprog_tail0(skb);</div><div class='ctx'> 	subprog_tail1(skb);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy3.c b/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy3.c<br/>index a7fb91cb05b7..56b6b0099840 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy3.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy3.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy3.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='add'>+#include "bpf_test_utils.h"</div><div class='ctx'> </div><div class='ctx'> int classifier_0(struct __sk_buff *skb);</div><div class='ctx'> </div><div class='hunk'>@@ -53,6 +54,8 @@ int tailcall_bpf2bpf_hierarchy_3(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	clobber_regs_stack();</div><div class='add'>+</div><div class='ctx'> 	bpf_tail_call_static(skb, &amp;jmp_table0, 0);</div><div class='ctx'> </div><div class='ctx'> 	__sink(ret);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c b/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c<br/>index c87f9ca982d3..5261395713cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #include "vmlinux.h"</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_test_utils.h"</div><div class='ctx'> </div><div class='ctx'> struct {</div><div class='ctx'> 	__uint(type, BPF_MAP_TYPE_PROG_ARRAY);</div><div class='hunk'>@@ -24,6 +25,8 @@ int subprog_tail(void *ctx)</div><div class='ctx'> SEC("fentry/dummy")</div><div class='ctx'> int BPF_PROG(fentry, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	clobber_regs_stack();</div><div class='add'>+</div><div class='ctx'> 	count++;</div><div class='ctx'> 	subprog_tail(ctx);</div><div class='ctx'> 	subprog_tail(ctx);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/task_local_data.bpf.h b/tools/testing/selftests/bpf/progs/task_local_data.bpf.h<br/>new file mode 100644<br/>index 000000000000..432fff2af844<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/task_local_data.bpf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/task_local_data.bpf.h</a></div><div class='hunk'>@@ -0,0 +1,237 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __TASK_LOCAL_DATA_BPF_H</div><div class='add'>+#define __TASK_LOCAL_DATA_BPF_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Task local data is a library that facilitates sharing per-task data</div><div class='add'>+ * between user space and bpf programs.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * USAGE</div><div class='add'>+ *</div><div class='add'>+ * A TLD, an entry of data in task local data, first needs to be created by the</div><div class='add'>+ * user space. This is done by calling user space API, TLD_DEFINE_KEY() or</div><div class='add'>+ * tld_create_key(), with the name of the TLD and the size.</div><div class='add'>+ *</div><div class='add'>+ * TLD_DEFINE_KEY(prio, "priority", sizeof(int));</div><div class='add'>+ *</div><div class='add'>+ * or</div><div class='add'>+ *</div><div class='add'>+ * void func_call(...) {</div><div class='add'>+ *     tld_key_t prio, in_cs;</div><div class='add'>+ *</div><div class='add'>+ *     prio = tld_create_key("priority", sizeof(int));</div><div class='add'>+ *     in_cs = tld_create_key("in_critical_section", sizeof(bool));</div><div class='add'>+ *     ...</div><div class='add'>+ *</div><div class='add'>+ * A key associated with the TLD, which has an opaque type tld_key_t, will be</div><div class='add'>+ * initialized or returned. It can be used to get a pointer to the TLD in the</div><div class='add'>+ * user space by calling tld_get_data().</div><div class='add'>+ *</div><div class='add'>+ * In a bpf program, tld_object_init() first needs to be called to initialized a</div><div class='add'>+ * tld_object on the stack. Then, TLDs can be accessed by calling tld_get_data().</div><div class='add'>+ * The API will try to fetch the key by the name and use it to locate the data.</div><div class='add'>+ * A pointer to the TLD will be returned. It also caches the key in a task local</div><div class='add'>+ * storage map, tld_key_map, whose value type, struct tld_keys, must be defined</div><div class='add'>+ * by the developer.</div><div class='add'>+ *</div><div class='add'>+ * struct tld_keys {</div><div class='add'>+ *     tld_key_t prio;</div><div class='add'>+ *     tld_key_t in_cs;</div><div class='add'>+ * };</div><div class='add'>+ *</div><div class='add'>+ * SEC("struct_ops")</div><div class='add'>+ * void prog(struct task_struct task, ...)</div><div class='add'>+ * {</div><div class='add'>+ *     struct tld_object tld_obj;</div><div class='add'>+ *     int err, *p;</div><div class='add'>+ *</div><div class='add'>+ *     err = tld_object_init(task, &amp;tld_obj);</div><div class='add'>+ *     if (err)</div><div class='add'>+ *         return;</div><div class='add'>+ *</div><div class='add'>+ *     p = tld_get_data(&amp;tld_obj, prio, "priority", sizeof(int));</div><div class='add'>+ *     if (p)</div><div class='add'>+ *         // do something depending on *p</div><div class='add'>+ */</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+#define TLD_ROUND_MASK(x, y) ((__typeof__(x))((y) - 1))</div><div class='add'>+#define TLD_ROUND_UP(x, y) ((((x) - 1) | TLD_ROUND_MASK(x, y)) + 1)</div><div class='add'>+</div><div class='add'>+#define TLD_MAX_DATA_CNT (__PAGE_SIZE / sizeof(struct tld_metadata) - 1)</div><div class='add'>+</div><div class='add'>+#ifndef TLD_NAME_LEN</div><div class='add'>+#define TLD_NAME_LEN 62</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef TLD_KEY_MAP_CREATE_RETRY</div><div class='add'>+#define TLD_KEY_MAP_CREATE_RETRY 10</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	__s16 off;</div><div class='add'>+} tld_key_t;</div><div class='add'>+</div><div class='add'>+struct tld_metadata {</div><div class='add'>+	char name[TLD_NAME_LEN];</div><div class='add'>+	__u16 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tld_meta_u {</div><div class='add'>+	__u8 cnt;</div><div class='add'>+	__u16 size;</div><div class='add'>+	struct tld_metadata metadata[TLD_MAX_DATA_CNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tld_data_u {</div><div class='add'>+	__u64 start; /* offset of tld_data_u-&gt;data in a page */</div><div class='add'>+	char data[__PAGE_SIZE - sizeof(__u64)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tld_map_value {</div><div class='add'>+	struct tld_data_u __uptr *data;</div><div class='add'>+	struct tld_meta_u __uptr *meta;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+typedef struct tld_uptr_dummy {</div><div class='add'>+	struct tld_data_u data[0];</div><div class='add'>+	struct tld_meta_u meta[0];</div><div class='add'>+} *tld_uptr_dummy_t;</div><div class='add'>+</div><div class='add'>+struct tld_object {</div><div class='add'>+	struct tld_map_value *data_map;</div><div class='add'>+	struct tld_keys *key_map;</div><div class='add'>+	/*</div><div class='add'>+	 * Force the compiler to generate the actual definition of tld_meta_u</div><div class='add'>+	 * and tld_data_u in BTF. Without it, tld_meta_u and u_tld_data will</div><div class='add'>+	 * be BTF_KIND_FWD.</div><div class='add'>+	 */</div><div class='add'>+	tld_uptr_dummy_t dummy[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Map value of tld_key_map for caching keys. Must be defined by the developer.</div><div class='add'>+ * Members should be tld_key_t and passed to the 3rd argument of tld_fetch_key().</div><div class='add'>+ */</div><div class='add'>+struct tld_keys;</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_TASK_STORAGE);</div><div class='add'>+	__uint(map_flags, BPF_F_NO_PREALLOC);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct tld_map_value);</div><div class='add'>+} tld_data_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_TASK_STORAGE);</div><div class='add'>+	__uint(map_flags, BPF_F_NO_PREALLOC);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct tld_keys);</div><div class='add'>+} tld_key_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tld_object_init() - Initialize a tld_object.</div><div class='add'>+ *</div><div class='add'>+ * @task: The task_struct of the target task</div><div class='add'>+ * @tld_obj: A pointer to a tld_object to be initialized</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on success; -ENODATA if the user space did not initialize task local data</div><div class='add'>+ * for the current task through tld_get_data(); -ENOMEM if the creation of tld_key_map</div><div class='add'>+ * fails</div><div class='add'>+ */</div><div class='add'>+__attribute__((unused))</div><div class='add'>+static int tld_object_init(struct task_struct *task, struct tld_object *tld_obj)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	tld_obj-&gt;data_map = bpf_task_storage_get(&amp;tld_data_map, task, 0, 0);</div><div class='add'>+	if (!tld_obj-&gt;data_map)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, TLD_KEY_MAP_CREATE_RETRY) {</div><div class='add'>+		tld_obj-&gt;key_map = bpf_task_storage_get(&amp;tld_key_map, task, 0,</div><div class='add'>+							BPF_LOCAL_STORAGE_GET_F_CREATE);</div><div class='add'>+		if (likely(tld_obj-&gt;key_map))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (!tld_obj-&gt;key_map)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return the offset of TLD if @name is found. Otherwise, return the current TLD count</div><div class='add'>+ * using the nonpositive range so that the next tld_get_data() can skip fetching key if</div><div class='add'>+ * no new TLD is added or start comparing name from the first newly added TLD.</div><div class='add'>+ */</div><div class='add'>+__attribute__((unused))</div><div class='add'>+static int __tld_fetch_key(struct tld_object *tld_obj, const char *name, int i_start)</div><div class='add'>+{</div><div class='add'>+	struct tld_metadata *metadata;</div><div class='add'>+	int i, cnt, start, off = 0;</div><div class='add'>+</div><div class='add'>+	if (!tld_obj-&gt;data_map || !tld_obj-&gt;data_map-&gt;data || !tld_obj-&gt;data_map-&gt;meta)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	start = tld_obj-&gt;data_map-&gt;data-&gt;start;</div><div class='add'>+	cnt = tld_obj-&gt;data_map-&gt;meta-&gt;cnt;</div><div class='add'>+	metadata = tld_obj-&gt;data_map-&gt;meta-&gt;metadata;</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, cnt) {</div><div class='add'>+		if (i &gt;= TLD_MAX_DATA_CNT)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (i &gt;= i_start &amp;&amp; !bpf_strncmp(metadata[i].name, TLD_NAME_LEN, name))</div><div class='add'>+			return start + off;</div><div class='add'>+</div><div class='add'>+		off += TLD_ROUND_UP(metadata[i].size, 8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * tld_get_data() - Retrieve a pointer to the TLD associated with the name.</div><div class='add'>+ *</div><div class='add'>+ * @tld_obj: A pointer to a valid tld_object initialized by tld_object_init()</div><div class='add'>+ * @key: The cached key of the TLD in tld_key_map</div><div class='add'>+ * @name: The name of the key associated with a TLD</div><div class='add'>+ * @size: The size of the TLD. Must be a known constant value</div><div class='add'>+ *</div><div class='add'>+ * Return a pointer to the TLD associated with @name; NULL if not found or @size is too</div><div class='add'>+ * big. @key is used to cache the key if the TLD is found to speed up subsequent calls.</div><div class='add'>+ * It should be defined as an member of tld_keys of tld_key_t type by the developer.</div><div class='add'>+ */</div><div class='add'>+#define tld_get_data(tld_obj, key, name, size)						\</div><div class='add'>+	({										\</div><div class='add'>+		void *data = NULL, *_data = (tld_obj)-&gt;data_map-&gt;data;			\</div><div class='add'>+		long off = (tld_obj)-&gt;key_map-&gt;key.off;					\</div><div class='add'>+		int cnt;								\</div><div class='add'>+											\</div><div class='add'>+		if (likely(_data)) {							\</div><div class='add'>+			if (likely(off &gt; 0)) {						\</div><div class='add'>+				barrier_var(off);					\</div><div class='add'>+				if (likely(off &lt; __PAGE_SIZE - size))			\</div><div class='add'>+					data = _data + off;				\</div><div class='add'>+			} else {							\</div><div class='add'>+				cnt = -(off);						\</div><div class='add'>+				if (likely((tld_obj)-&gt;data_map-&gt;meta) &amp;&amp;		\</div><div class='add'>+				    cnt &lt; (tld_obj)-&gt;data_map-&gt;meta-&gt;cnt) {		\</div><div class='add'>+					off = __tld_fetch_key(tld_obj, name, cnt);	\</div><div class='add'>+					(tld_obj)-&gt;key_map-&gt;key.off = off;		\</div><div class='add'>+											\</div><div class='add'>+					if (likely(off &lt; __PAGE_SIZE - size)) {		\</div><div class='add'>+						barrier_var(off);			\</div><div class='add'>+						if (off &gt; 0)				\</div><div class='add'>+							data = _data + off;		\</div><div class='add'>+					}						\</div><div class='add'>+				}							\</div><div class='add'>+			}								\</div><div class='add'>+		}									\</div><div class='add'>+		data;									\</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/task_work.c b/tools/testing/selftests/bpf/progs/task_work.c<br/>new file mode 100644<br/>index 000000000000..663a80990f8f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/task_work.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/task_work.c</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "errno.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+const void *user_ptr = NULL;</div><div class='add'>+</div><div class='add'>+struct elem {</div><div class='add'>+	char data[128];</div><div class='add'>+	struct bpf_task_work tw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__uint(map_flags, BPF_F_NO_PREALLOC);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct elem);</div><div class='add'>+} hmap SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct elem);</div><div class='add'>+} arrmap SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_LRU_HASH);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct elem);</div><div class='add'>+} lrumap SEC(".maps");</div><div class='add'>+</div><div class='add'>+static int process_work(struct bpf_map *map, void *key, void *value)</div><div class='add'>+{</div><div class='add'>+	struct elem *work = value;</div><div class='add'>+</div><div class='add'>+	bpf_copy_from_user_str(work-&gt;data, sizeof(work-&gt;data), (const void *)user_ptr, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int key = 0;</div><div class='add'>+</div><div class='add'>+SEC("perf_event")</div><div class='add'>+int oncpu_hash_map(struct pt_regs *args)</div><div class='add'>+{</div><div class='add'>+	struct elem empty_work = { .data = { 0 } };</div><div class='add'>+	struct elem *work;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	err = bpf_map_update_elem(&amp;hmap, &amp;key, &amp;empty_work, BPF_NOEXIST);</div><div class='add'>+	if (err)</div><div class='add'>+		return 0;</div><div class='add'>+	work = bpf_map_lookup_elem(&amp;hmap, &amp;key);</div><div class='add'>+	if (!work)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_task_work_schedule_resume_impl(task, &amp;work-&gt;tw, &amp;hmap, process_work, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("perf_event")</div><div class='add'>+int oncpu_array_map(struct pt_regs *args)</div><div class='add'>+{</div><div class='add'>+	struct elem *work;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	work = bpf_map_lookup_elem(&amp;arrmap, &amp;key);</div><div class='add'>+	if (!work)</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_task_work_schedule_signal_impl(task, &amp;work-&gt;tw, &amp;arrmap, process_work, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("perf_event")</div><div class='add'>+int oncpu_lru_map(struct pt_regs *args)</div><div class='add'>+{</div><div class='add'>+	struct elem empty_work = { .data = { 0 } };</div><div class='add'>+	struct elem *work;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	work = bpf_map_lookup_elem(&amp;lrumap, &amp;key);</div><div class='add'>+	if (work)</div><div class='add'>+		return 0;</div><div class='add'>+	err = bpf_map_update_elem(&amp;lrumap, &amp;key, &amp;empty_work, BPF_NOEXIST);</div><div class='add'>+	if (err)</div><div class='add'>+		return 0;</div><div class='add'>+	work = bpf_map_lookup_elem(&amp;lrumap, &amp;key);</div><div class='add'>+	if (!work || work-&gt;data[0])</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_task_work_schedule_resume_impl(task, &amp;work-&gt;tw, &amp;lrumap, process_work, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/task_work_fail.c b/tools/testing/selftests/bpf/progs/task_work_fail.c<br/>new file mode 100644<br/>index 000000000000..1270953fd092<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/task_work_fail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/task_work_fail.c</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+const void *user_ptr = NULL;</div><div class='add'>+</div><div class='add'>+struct elem {</div><div class='add'>+	char data[128];</div><div class='add'>+	struct bpf_task_work tw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__uint(map_flags, BPF_F_NO_PREALLOC);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct elem);</div><div class='add'>+} hmap SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct elem);</div><div class='add'>+} arrmap SEC(".maps");</div><div class='add'>+</div><div class='add'>+static int process_work(struct bpf_map *map, void *key, void *value)</div><div class='add'>+{</div><div class='add'>+	struct elem *work = value;</div><div class='add'>+</div><div class='add'>+	bpf_copy_from_user_str(work-&gt;data, sizeof(work-&gt;data), (const void *)user_ptr, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int key = 0;</div><div class='add'>+</div><div class='add'>+SEC("perf_event")</div><div class='add'>+__failure __msg("doesn't match map pointer in R3")</div><div class='add'>+int mismatch_map(struct pt_regs *args)</div><div class='add'>+{</div><div class='add'>+	struct elem *work;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	work = bpf_map_lookup_elem(&amp;arrmap, &amp;key);</div><div class='add'>+	if (!work)</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_task_work_schedule_resume_impl(task, &amp;work-&gt;tw, &amp;hmap, process_work, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("perf_event")</div><div class='add'>+__failure __msg("arg#1 doesn't point to a map value")</div><div class='add'>+int no_map_task_work(struct pt_regs *args)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	struct bpf_task_work tw;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	bpf_task_work_schedule_resume_impl(task, &amp;tw, &amp;hmap, process_work, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("perf_event")</div><div class='add'>+__failure __msg("Possibly NULL pointer passed to trusted arg1")</div><div class='add'>+int task_work_null(struct pt_regs *args)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	bpf_task_work_schedule_resume_impl(task, NULL, &amp;hmap, process_work, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("perf_event")</div><div class='add'>+__failure __msg("Possibly NULL pointer passed to trusted arg2")</div><div class='add'>+int map_null(struct pt_regs *args)</div><div class='add'>+{</div><div class='add'>+	struct elem *work;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	work = bpf_map_lookup_elem(&amp;arrmap, &amp;key);</div><div class='add'>+	if (!work)</div><div class='add'>+		return 0;</div><div class='add'>+	bpf_task_work_schedule_resume_impl(task, &amp;work-&gt;tw, NULL, process_work, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/task_work_stress.c b/tools/testing/selftests/bpf/progs/task_work_stress.c<br/>new file mode 100644<br/>index 000000000000..55e555f7f41b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/task_work_stress.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/task_work_stress.c</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+#define ENTRIES 128</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+__u64 callback_scheduled = 0;</div><div class='add'>+__u64 callback_success = 0;</div><div class='add'>+__u64 schedule_error = 0;</div><div class='add'>+__u64 delete_success = 0;</div><div class='add'>+</div><div class='add'>+struct elem {</div><div class='add'>+	__u32 count;</div><div class='add'>+	struct bpf_task_work tw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__uint(map_flags, BPF_F_NO_PREALLOC);</div><div class='add'>+	__uint(max_entries, ENTRIES);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct elem);</div><div class='add'>+} hmap SEC(".maps");</div><div class='add'>+</div><div class='add'>+static int process_work(struct bpf_map *map, void *key, void *value)</div><div class='add'>+{</div><div class='add'>+	__sync_fetch_and_add(&amp;callback_success, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int schedule_task_work(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct elem empty_work = {.count = 0};</div><div class='add'>+	struct elem *work;</div><div class='add'>+	int key = 0, err;</div><div class='add'>+</div><div class='add'>+	key = bpf_ktime_get_ns() % ENTRIES;</div><div class='add'>+	work = bpf_map_lookup_elem(&amp;hmap, &amp;key);</div><div class='add'>+	if (!work) {</div><div class='add'>+		bpf_map_update_elem(&amp;hmap, &amp;key, &amp;empty_work, BPF_NOEXIST);</div><div class='add'>+		work = bpf_map_lookup_elem(&amp;hmap, &amp;key);</div><div class='add'>+		if (!work)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	err = bpf_task_work_schedule_signal_impl(bpf_get_current_task_btf(), &amp;work-&gt;tw, &amp;hmap,</div><div class='add'>+						 process_work, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		__sync_fetch_and_add(&amp;schedule_error, 1);</div><div class='add'>+	else</div><div class='add'>+		__sync_fetch_and_add(&amp;callback_scheduled, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int delete_task_work(void *ctx)</div><div class='add'>+{</div><div class='add'>+	int key = 0, err;</div><div class='add'>+</div><div class='add'>+	key = bpf_get_prandom_u32() % ENTRIES;</div><div class='add'>+	err = bpf_map_delete_elem(&amp;hmap, &amp;key);</div><div class='add'>+	if (!err)</div><div class='add'>+		__sync_fetch_and_add(&amp;delete_success, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/tcp_ca_write_sk_pacing.c b/tools/testing/selftests/bpf/progs/tcp_ca_write_sk_pacing.c<br/>index a58b5194fc89..022291f21dfb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tcp_ca_write_sk_pacing.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tcp_ca_write_sk_pacing.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tcp_ca_write_sk_pacing.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/tcp_ca_write_sk_pacing.c</a></div><div class='hunk'>@@ -8,8 +8,6 @@ char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='ctx'> #define USEC_PER_SEC 1000000UL</div><div class='ctx'> </div><div class='del'>-#define min(a, b) ((a) &lt; (b) ? (a) : (b))</div><div class='del'>-</div><div class='ctx'> static unsigned int tcp_left_out(const struct tcp_sock *tp)</div><div class='ctx'> {</div><div class='ctx'> 	return tp-&gt;sacked_out + tp-&gt;lost_out;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_btf_ext.c b/tools/testing/selftests/bpf/progs/test_btf_ext.c<br/>new file mode 100644<br/>index 000000000000..cdf20331db04<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_btf_ext.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_btf_ext.c</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms Inc. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+__noinline static void f0(void)</div><div class='add'>+{</div><div class='add'>+	__u64 a = 1;</div><div class='add'>+</div><div class='add'>+	__sink(a);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+__u64 global_func(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	f0();</div><div class='add'>+	return XDP_DROP;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_cgroup1_hierarchy.c b/tools/testing/selftests/bpf/progs/test_cgroup1_hierarchy.c<br/>index 44628865fe1d..4fee0fdc7607 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_cgroup1_hierarchy.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_cgroup1_hierarchy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_cgroup1_hierarchy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_cgroup1_hierarchy.c</a></div><div class='hunk'>@@ -51,13 +51,13 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("lsm/bpf")</div><div class='del'>-int BPF_PROG(lsm_run, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='add'>+int BPF_PROG(lsm_run, int cmd, union bpf_attr *attr, unsigned int size, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	return bpf_link_create_verify(cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("lsm.s/bpf")</div><div class='del'>-int BPF_PROG(lsm_s_run, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='add'>+int BPF_PROG(lsm_s_run, int cmd, union bpf_attr *attr, unsigned int size, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	return bpf_link_create_verify(cmd);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_check_mtu.c b/tools/testing/selftests/bpf/progs/test_check_mtu.c<br/>index 2ec1de11a3ae..7b6b2b342c1d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_check_mtu.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_check_mtu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_check_mtu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_check_mtu.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;stddef.h&gt;</div><div class='ctx'> #include &lt;stdint.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='hunk'>@@ -288,3 +289,14 @@ int tc_input_len_exceed(struct __sk_buff *ctx)</div><div class='ctx'> 	global_bpf_mtu_xdp = mtu_len;</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int tc_chk_segs_flag(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	__u32 mtu_len = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bpf_check_mtu(ctx, GLOBAL_USER_IFINDEX, &amp;mtu_len, 0, BPF_MTU_CHK_SEGS);</div><div class='add'>+</div><div class='add'>+	return err == -EINVAL ? BPF_OK : BPF_DROP;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_cls_redirect.c b/tools/testing/selftests/bpf/progs/test_cls_redirect.c<br/>index f344c6835e84..26a53e54b8fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_cls_redirect.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_cls_redirect.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_cls_redirect.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_cls_redirect.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "bpf_compiler.h"</div><div class='ctx'> #include "test_cls_redirect.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='ctx'> </div><div class='ctx'> #pragma GCC diagnostic ignored "-Waddress-of-packed-member"</div><div class='ctx'> </div><div class='hunk'>@@ -31,9 +32,6 @@</div><div class='ctx'> #define INLINING __always_inline</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define offsetofend(TYPE, MEMBER) \</div><div class='del'>-	(offsetof(TYPE, MEMBER) + sizeof((((TYPE *)0)-&gt;MEMBER)))</div><div class='del'>-</div><div class='ctx'> #define IP_OFFSET_MASK (0x1FFF)</div><div class='ctx'> #define IP_MF (0x2000)</div><div class='ctx'> </div><div class='hunk'>@@ -129,7 +127,7 @@ typedef uint8_t *net_ptr __attribute__((align_value(8)));</div><div class='ctx'> typedef struct buf {</div><div class='ctx'> 	struct __sk_buff *skb;</div><div class='ctx'> 	net_ptr head;</div><div class='del'>-	/* NB: tail musn't have alignment other than 1, otherwise</div><div class='add'>+	/* NB: tail mustn't have alignment other than 1, otherwise</div><div class='ctx'> 	* LLVM will go and eliminate code, e.g. when checking packet lengths.</div><div class='ctx'> 	*/</div><div class='ctx'> 	uint8_t *const tail;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c b/tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c<br/>index d0f7670351e5..dfd4a2710391 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c</a></div><div class='hunk'>@@ -494,7 +494,7 @@ static ret_t get_next_hop(struct bpf_dynptr *dynptr, __u64 *offset, encap_header</div><div class='ctx'> </div><div class='ctx'> 	*offset += sizeof(*next_hop);</div><div class='ctx'> </div><div class='del'>-	/* Skip the remainig next hops (may be zero). */</div><div class='add'>+	/* Skip the remaining next hops (may be zero). */</div><div class='ctx'> 	return skip_next_hops(offset, encap-&gt;unigue.hop_count - encap-&gt;unigue.next_hop - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c b/tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c<br/>index 51b3f79df523..448403634eea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@ struct {</div><div class='ctx'> </div><div class='ctx'> struct core_reloc_arrays_output {</div><div class='ctx'> 	int a2;</div><div class='add'>+	int a3;</div><div class='ctx'> 	char b123;</div><div class='ctx'> 	int c1c;</div><div class='ctx'> 	int d00d;</div><div class='hunk'>@@ -41,6 +42,7 @@ int test_core_arrays(void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct core_reloc_arrays *in = (void *)&amp;data.in;</div><div class='ctx'> 	struct core_reloc_arrays_output *out = (void *)&amp;data.out;</div><div class='add'>+	int *a;</div><div class='ctx'> </div><div class='ctx'> 	if (CORE_READ(&amp;out-&gt;a2, &amp;in-&gt;a[2]))</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -53,6 +55,9 @@ int test_core_arrays(void *ctx)</div><div class='ctx'> 	if (CORE_READ(&amp;out-&gt;f01c, &amp;in-&gt;f[0][1].c))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='add'>+	a = __builtin_preserve_access_index(({ in-&gt;a; }));</div><div class='add'>+	out-&gt;a3 = a[0] + a[1] + a[2] + a[3];</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_get_xattr.c b/tools/testing/selftests/bpf/progs/test_get_xattr.c<br/>index 66e737720f7c..54305f4c9f2d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_get_xattr.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_get_xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_get_xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_get_xattr.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='ctx'> #include "bpf_kfuncs.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='ctx'> </div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='hunk'>@@ -17,12 +18,23 @@ static const char expected_value[] = "hello";</div><div class='ctx'> char value1[32];</div><div class='ctx'> char value2[32];</div><div class='ctx'> </div><div class='add'>+/* Matches caller of test_get_xattr() in prog_tests/fs_kfuncs.c */</div><div class='add'>+static const char xattr_names[][64] = {</div><div class='add'>+	/* The following work. */</div><div class='add'>+	"user.kfuncs",</div><div class='add'>+	"security.bpf.xxx",</div><div class='add'>+</div><div class='add'>+	/* The following do not work. */</div><div class='add'>+	"security.bpf",</div><div class='add'>+	"security.selinux"</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> SEC("lsm.s/file_open")</div><div class='ctx'> int BPF_PROG(test_file_open, struct file *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_dynptr value_ptr;</div><div class='ctx'> 	__u32 pid;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, i;</div><div class='ctx'> </div><div class='ctx'> 	pid = bpf_get_current_pid_tgid() &gt;&gt; 32;</div><div class='ctx'> 	if (pid != monitored_pid)</div><div class='hunk'>@@ -30,7 +42,11 @@ int BPF_PROG(test_file_open, struct file *f)</div><div class='ctx'> </div><div class='ctx'> 	bpf_dynptr_from_mem(value1, sizeof(value1), 0, &amp;value_ptr);</div><div class='ctx'> </div><div class='del'>-	ret = bpf_get_file_xattr(f, "user.kfuncs", &amp;value_ptr);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(xattr_names); i++) {</div><div class='add'>+		ret = bpf_get_file_xattr(f, xattr_names[i], &amp;value_ptr);</div><div class='add'>+		if (ret == sizeof(expected_value))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> 	if (ret != sizeof(expected_value))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (bpf_strncmp(value1, ret, expected_value))</div><div class='hunk'>@@ -44,7 +60,7 @@ int BPF_PROG(test_inode_getxattr, struct dentry *dentry, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_dynptr value_ptr;</div><div class='ctx'> 	__u32 pid;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, i;</div><div class='ctx'> </div><div class='ctx'> 	pid = bpf_get_current_pid_tgid() &gt;&gt; 32;</div><div class='ctx'> 	if (pid != monitored_pid)</div><div class='hunk'>@@ -52,7 +68,11 @@ int BPF_PROG(test_inode_getxattr, struct dentry *dentry, char *name)</div><div class='ctx'> </div><div class='ctx'> 	bpf_dynptr_from_mem(value2, sizeof(value2), 0, &amp;value_ptr);</div><div class='ctx'> </div><div class='del'>-	ret = bpf_get_dentry_xattr(dentry, "user.kfuncs", &amp;value_ptr);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(xattr_names); i++) {</div><div class='add'>+		ret = bpf_get_dentry_xattr(dentry, xattr_names[i], &amp;value_ptr);</div><div class='add'>+		if (ret == sizeof(expected_value))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> 	if (ret != sizeof(expected_value))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (bpf_strncmp(value2, ret, expected_value))</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_global_map_resize.c b/tools/testing/selftests/bpf/progs/test_global_map_resize.c<br/>index a3f220ba7025..ee65bad0436d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_global_map_resize.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_global_map_resize.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_global_map_resize.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_global_map_resize.c</a></div><div class='hunk'>@@ -32,6 +32,16 @@ int my_int_last SEC(".data.array_not_last");</div><div class='ctx'> </div><div class='ctx'> int percpu_arr[1] SEC(".data.percpu_arr");</div><div class='ctx'> </div><div class='add'>+/* at least one extern is included, to ensure that a specific</div><div class='add'>+ * regression is tested whereby resizing resulted in a free-after-use</div><div class='add'>+ * bug after type information is invalidated by the resize operation.</div><div class='add'>+ *</div><div class='add'>+ * There isn't a particularly good API to test for this specific condition,</div><div class='add'>+ * but by having externs for the resizing tests it will cover this path.</div><div class='add'>+ */</div><div class='add'>+extern int LINUX_KERNEL_VERSION __kconfig;</div><div class='add'>+long version_sink;</div><div class='add'>+</div><div class='ctx'> SEC("tp/syscalls/sys_enter_getpid")</div><div class='ctx'> int bss_array_sum(void *ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -44,6 +54,9 @@ int bss_array_sum(void *ctx)</div><div class='ctx'> 	for (size_t i = 0; i &lt; bss_array_len; ++i)</div><div class='ctx'> 		sum += array[i];</div><div class='ctx'> </div><div class='add'>+	/* see above; ensure this is not optimized out */</div><div class='add'>+	version_sink = LINUX_KERNEL_VERSION;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -59,6 +72,9 @@ int data_array_sum(void *ctx)</div><div class='ctx'> 	for (size_t i = 0; i &lt; data_array_len; ++i)</div><div class='ctx'> 		sum += my_array[i];</div><div class='ctx'> </div><div class='add'>+	/* see above; ensure this is not optimized out */</div><div class='add'>+	version_sink = LINUX_KERNEL_VERSION;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_kernel_flag.c b/tools/testing/selftests/bpf/progs/test_kernel_flag.c<br/>new file mode 100644<br/>index 000000000000..b45fab3be352<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_kernel_flag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_kernel_flag.c</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Microsoft Corporation</div><div class='add'>+ *</div><div class='add'>+ * Author: Blaise Boscaccy &lt;bboscaccy@linux.microsoft.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+__u32 monitored_tid;</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/bpf")</div><div class='add'>+int BPF_PROG(bpf, int cmd, union bpf_attr *attr, unsigned int size, bool kernel)</div><div class='add'>+{</div><div class='add'>+	__u32 tid;</div><div class='add'>+</div><div class='add'>+	tid = bpf_get_current_pid_tgid() &amp; 0xFFFFFFFF;</div><div class='add'>+	if (!kernel || tid != monitored_tid)</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c b/tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c<br/>index cd4d752bd089..061befb004c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@ char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='ctx'> SEC("?lsm.s/bpf")</div><div class='ctx'> __failure __msg("cannot pass in dynptr at an offset=-8")</div><div class='del'>-int BPF_PROG(not_valid_dynptr, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='add'>+int BPF_PROG(not_valid_dynptr, int cmd, union bpf_attr *attr, unsigned int size, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='hunk'>@@ -46,7 +46,7 @@ int BPF_PROG(not_valid_dynptr, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='ctx'> </div><div class='ctx'> SEC("?lsm.s/bpf")</div><div class='ctx'> __failure __msg("arg#0 expected pointer to stack or const struct bpf_dynptr")</div><div class='del'>-int BPF_PROG(not_ptr_to_stack, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='add'>+int BPF_PROG(not_ptr_to_stack, int cmd, union bpf_attr *attr, unsigned int size, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long val = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -55,7 +55,7 @@ int BPF_PROG(not_ptr_to_stack, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("lsm.s/bpf")</div><div class='del'>-int BPF_PROG(dynptr_data_null, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='add'>+int BPF_PROG(dynptr_data_null, int cmd, union bpf_attr *attr, unsigned int size, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_key *trusted_keyring;</div><div class='ctx'> 	struct bpf_dynptr ptr;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_lookup_key.c b/tools/testing/selftests/bpf/progs/test_lookup_key.c<br/>index c73776990ae3..1f7e1e59b073 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_lookup_key.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_lookup_key.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_lookup_key.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_lookup_key.c</a></div><div class='hunk'>@@ -14,16 +14,16 @@</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='ctx'> __u32 monitored_pid;</div><div class='del'>-__u32 key_serial;</div><div class='add'>+__s32 key_serial;</div><div class='ctx'> __u32 key_id;</div><div class='ctx'> __u64 flags;</div><div class='ctx'> </div><div class='del'>-extern struct bpf_key *bpf_lookup_user_key(__u32 serial, __u64 flags) __ksym;</div><div class='add'>+extern struct bpf_key *bpf_lookup_user_key(__s32 serial, __u64 flags) __ksym;</div><div class='ctx'> extern struct bpf_key *bpf_lookup_system_key(__u64 id) __ksym;</div><div class='ctx'> extern void bpf_key_put(struct bpf_key *key) __ksym;</div><div class='ctx'> </div><div class='ctx'> SEC("lsm.s/bpf")</div><div class='del'>-int BPF_PROG(bpf, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='add'>+int BPF_PROG(bpf, int cmd, union bpf_attr *attr, unsigned int size, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_key *bkey;</div><div class='ctx'> 	__u32 pid;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_module_attach.c b/tools/testing/selftests/bpf/progs/test_module_attach.c<br/>index fb07f5773888..03d7f89787a1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_module_attach.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_module_attach.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_module_attach.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_module_attach.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@ int BPF_PROG(handle_raw_tp,</div><div class='ctx'> </div><div class='ctx'> __u32 raw_tp_bare_write_sz = 0;</div><div class='ctx'> </div><div class='del'>-SEC("raw_tp/bpf_testmod_test_write_bare")</div><div class='add'>+SEC("raw_tp/bpf_testmod_test_write_bare_tp")</div><div class='ctx'> int BPF_PROG(handle_raw_tp_bare,</div><div class='ctx'> 	     struct task_struct *task, struct bpf_testmod_test_write_ctx *write_ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -31,7 +31,7 @@ int raw_tp_writable_bare_in_val = 0;</div><div class='ctx'> int raw_tp_writable_bare_early_ret = 0;</div><div class='ctx'> int raw_tp_writable_bare_out_val = 0;</div><div class='ctx'> </div><div class='del'>-SEC("raw_tp.w/bpf_testmod_test_writable_bare")</div><div class='add'>+SEC("raw_tp.w/bpf_testmod_test_writable_bare_tp")</div><div class='ctx'> int BPF_PROG(handle_raw_tp_writable_bare,</div><div class='ctx'> 	     struct bpf_testmod_test_writable_ctx *writable)</div><div class='ctx'> {</div><div class='hunk'>@@ -117,7 +117,7 @@ int BPF_PROG(handle_fexit_ret, int arg, struct file *ret)</div><div class='ctx'> </div><div class='ctx'> 	bpf_probe_read_kernel(&amp;buf, 8, ret);</div><div class='ctx'> 	bpf_probe_read_kernel(&amp;buf, 8, (char *)ret + 256);</div><div class='del'>-	*(volatile long long *)ret;</div><div class='add'>+	*(volatile int *)ret;</div><div class='ctx'> 	*(volatile int *)&amp;ret-&gt;f_mode;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_overhead.c b/tools/testing/selftests/bpf/progs/test_overhead.c<br/>index abb7344b531f..5edf3cdc213d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_overhead.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_overhead.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_overhead.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_overhead.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Copyright (c) 2019 Facebook */</div><div class='del'>-#include &lt;stdbool.h&gt;</div><div class='del'>-#include &lt;stddef.h&gt;</div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include "vmlinux.h"</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_perf_branches.c b/tools/testing/selftests/bpf/progs/test_perf_branches.c<br/>index a1ccc831c882..05ac9410cd68 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_perf_branches.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_perf_branches.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_perf_branches.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_perf_branches.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='ctx'> </div><div class='ctx'> int valid = 0;</div><div class='add'>+int run_cnt = 0;</div><div class='ctx'> int required_size_out = 0;</div><div class='ctx'> int written_stack_out = 0;</div><div class='ctx'> int written_global_out = 0;</div><div class='hunk'>@@ -24,6 +25,8 @@ int perf_branches(void *ctx)</div><div class='ctx'> 	__u64 entries[4 * 3] = {0};</div><div class='ctx'> 	int required_size, written_stack, written_global;</div><div class='ctx'> </div><div class='add'>+	++run_cnt;</div><div class='add'>+</div><div class='ctx'> 	/* write to stack */</div><div class='ctx'> 	written_stack = bpf_read_branch_records(ctx, entries, sizeof(entries), 0);</div><div class='ctx'> 	/* ignore spurious events */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_pinning_devmap.c b/tools/testing/selftests/bpf/progs/test_pinning_devmap.c<br/>new file mode 100644<br/>index 000000000000..c855f8f87eff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_pinning_devmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_pinning_devmap.c</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_DEVMAP);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u32);</div><div class='add'>+	__uint(pinning, LIBBPF_PIN_BY_NAME);</div><div class='add'>+} pinmap1 SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_DEVMAP);</div><div class='add'>+	__uint(max_entries, 2);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u32);</div><div class='add'>+	__uint(pinning, LIBBPF_PIN_BY_NAME);</div><div class='add'>+} pinmap2 SEC(".maps");</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_pinning_htab.c b/tools/testing/selftests/bpf/progs/test_pinning_htab.c<br/>new file mode 100644<br/>index 000000000000..ae227930c73c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_pinning_htab.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_pinning_htab.c</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct timer_val {</div><div class='add'>+	struct bpf_timer timer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, struct timer_val);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+} timer_prealloc SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, struct timer_val);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__uint(map_flags, BPF_F_NO_PREALLOC);</div><div class='add'>+} timer_no_prealloc SEC(".maps");</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_ptr_untrusted.c b/tools/testing/selftests/bpf/progs/test_ptr_untrusted.c<br/>index 2fdc44e76624..89b0cd5a3e06 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_ptr_untrusted.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_ptr_untrusted.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_ptr_untrusted.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_ptr_untrusted.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> char tp_name[128];</div><div class='ctx'> </div><div class='ctx'> SEC("lsm.s/bpf")</div><div class='del'>-int BPF_PROG(lsm_run, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='add'>+int BPF_PROG(lsm_run, int cmd, union bpf_attr *attr, unsigned int size, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case BPF_RAW_TRACEPOINT_OPEN:</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_ringbuf_overwrite.c b/tools/testing/selftests/bpf/progs/test_ringbuf_overwrite.c<br/>new file mode 100644<br/>index 000000000000..ff4aa67ddacc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_ringbuf_overwrite.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_ringbuf_overwrite.c</a></div><div class='hunk'>@@ -0,0 +1,98 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2025. Huawei Technologies Co., Ltd */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_RINGBUF);</div><div class='add'>+	__uint(map_flags, BPF_F_RB_OVERWRITE);</div><div class='add'>+} ringbuf SEC(".maps");</div><div class='add'>+</div><div class='add'>+int pid;</div><div class='add'>+</div><div class='add'>+const volatile unsigned long LEN1;</div><div class='add'>+const volatile unsigned long LEN2;</div><div class='add'>+const volatile unsigned long LEN3;</div><div class='add'>+const volatile unsigned long LEN4;</div><div class='add'>+const volatile unsigned long LEN5;</div><div class='add'>+</div><div class='add'>+long reserve1_fail = 0;</div><div class='add'>+long reserve2_fail = 0;</div><div class='add'>+long reserve3_fail = 0;</div><div class='add'>+long reserve4_fail = 0;</div><div class='add'>+long reserve5_fail = 0;</div><div class='add'>+</div><div class='add'>+unsigned long avail_data = 0;</div><div class='add'>+unsigned long ring_size = 0;</div><div class='add'>+unsigned long cons_pos = 0;</div><div class='add'>+unsigned long prod_pos = 0;</div><div class='add'>+unsigned long over_pos = 0;</div><div class='add'>+</div><div class='add'>+SEC("fentry/" SYS_PREFIX "sys_getpgid")</div><div class='add'>+int test_overwrite_ringbuf(void *ctx)</div><div class='add'>+{</div><div class='add'>+	char *rec1, *rec2, *rec3, *rec4, *rec5;</div><div class='add'>+	int cur_pid = bpf_get_current_pid_tgid() &gt;&gt; 32;</div><div class='add'>+</div><div class='add'>+	if (cur_pid != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rec1 = bpf_ringbuf_reserve(&amp;ringbuf, LEN1, 0);</div><div class='add'>+	if (!rec1) {</div><div class='add'>+		reserve1_fail = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rec2 = bpf_ringbuf_reserve(&amp;ringbuf, LEN2, 0);</div><div class='add'>+	if (!rec2) {</div><div class='add'>+		bpf_ringbuf_discard(rec1, 0);</div><div class='add'>+		reserve2_fail = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rec3 = bpf_ringbuf_reserve(&amp;ringbuf, LEN3, 0);</div><div class='add'>+	/* expect failure */</div><div class='add'>+	if (!rec3) {</div><div class='add'>+		reserve3_fail = 1;</div><div class='add'>+	} else {</div><div class='add'>+		bpf_ringbuf_discard(rec1, 0);</div><div class='add'>+		bpf_ringbuf_discard(rec2, 0);</div><div class='add'>+		bpf_ringbuf_discard(rec3, 0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rec4 = bpf_ringbuf_reserve(&amp;ringbuf, LEN4, 0);</div><div class='add'>+	if (!rec4) {</div><div class='add'>+		reserve4_fail = 1;</div><div class='add'>+		bpf_ringbuf_discard(rec1, 0);</div><div class='add'>+		bpf_ringbuf_discard(rec2, 0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bpf_ringbuf_submit(rec1, 0);</div><div class='add'>+	bpf_ringbuf_submit(rec2, 0);</div><div class='add'>+	bpf_ringbuf_submit(rec4, 0);</div><div class='add'>+</div><div class='add'>+	rec5 = bpf_ringbuf_reserve(&amp;ringbuf, LEN5, 0);</div><div class='add'>+	if (!rec5) {</div><div class='add'>+		reserve5_fail = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; LEN3; i++)</div><div class='add'>+		rec5[i] = 0xdd;</div><div class='add'>+</div><div class='add'>+	bpf_ringbuf_submit(rec5, 0);</div><div class='add'>+</div><div class='add'>+	ring_size = bpf_ringbuf_query(&amp;ringbuf, BPF_RB_RING_SIZE);</div><div class='add'>+	avail_data = bpf_ringbuf_query(&amp;ringbuf, BPF_RB_AVAIL_DATA);</div><div class='add'>+	cons_pos = bpf_ringbuf_query(&amp;ringbuf, BPF_RB_CONS_POS);</div><div class='add'>+	prod_pos = bpf_ringbuf_query(&amp;ringbuf, BPF_RB_PROD_POS);</div><div class='add'>+	over_pos = bpf_ringbuf_query(&amp;ringbuf, BPF_RB_OVERWRITE_POS);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_ringbuf_write.c b/tools/testing/selftests/bpf/progs/test_ringbuf_write.c<br/>index 350513c0e4c9..f063a0013f85 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_ringbuf_write.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_ringbuf_write.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_ringbuf_write.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_ringbuf_write.c</a></div><div class='hunk'>@@ -26,11 +26,11 @@ int test_ringbuf_write(void *ctx)</div><div class='ctx'> 	if (cur_pid != pid)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	sample1 = bpf_ringbuf_reserve(&amp;ringbuf, 0x3000, 0);</div><div class='add'>+	sample1 = bpf_ringbuf_reserve(&amp;ringbuf, 0x30000, 0);</div><div class='ctx'> 	if (!sample1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	/* first one can pass */</div><div class='del'>-	sample2 = bpf_ringbuf_reserve(&amp;ringbuf, 0x3000, 0);</div><div class='add'>+	sample2 = bpf_ringbuf_reserve(&amp;ringbuf, 0x30000, 0);</div><div class='ctx'> 	if (!sample2) {</div><div class='ctx'> 		bpf_ringbuf_discard(sample1, 0);</div><div class='ctx'> 		__sync_fetch_and_add(&amp;discarded, 1);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_select_reuseport_kern.c b/tools/testing/selftests/bpf/progs/test_select_reuseport_kern.c<br/>index 5eb25c6ad75b..a5be3267dbb0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_select_reuseport_kern.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_select_reuseport_kern.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_select_reuseport_kern.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_select_reuseport_kern.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Copyright (c) 2018 Facebook */</div><div class='ctx'> </div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_set_remove_xattr.c b/tools/testing/selftests/bpf/progs/test_set_remove_xattr.c<br/>new file mode 100644<br/>index 000000000000..6a612cf168d3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_set_remove_xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_set_remove_xattr.c</a></div><div class='hunk'>@@ -0,0 +1,133 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_kfuncs.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+__u32 monitored_pid;</div><div class='add'>+</div><div class='add'>+const char xattr_foo[] = "security.bpf.foo";</div><div class='add'>+const char xattr_bar[] = "security.bpf.bar";</div><div class='add'>+static const char xattr_selinux[] = "security.selinux";</div><div class='add'>+char value_bar[] = "world";</div><div class='add'>+char read_value[32];</div><div class='add'>+</div><div class='add'>+bool set_security_bpf_bar_success;</div><div class='add'>+bool remove_security_bpf_bar_success;</div><div class='add'>+bool set_security_selinux_fail;</div><div class='add'>+bool remove_security_selinux_fail;</div><div class='add'>+</div><div class='add'>+char name_buf[32];</div><div class='add'>+</div><div class='add'>+static inline bool name_match_foo(const char *name)</div><div class='add'>+{</div><div class='add'>+	bpf_probe_read_kernel(name_buf, sizeof(name_buf), name);</div><div class='add'>+</div><div class='add'>+	return !bpf_strncmp(name_buf, sizeof(xattr_foo), xattr_foo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test bpf_set_dentry_xattr and bpf_remove_dentry_xattr */</div><div class='add'>+SEC("lsm.s/inode_getxattr")</div><div class='add'>+int BPF_PROG(test_inode_getxattr, struct dentry *dentry, char *name)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr value_ptr;</div><div class='add'>+	__u32 pid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pid = bpf_get_current_pid_tgid() &gt;&gt; 32;</div><div class='add'>+	if (pid != monitored_pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Only do the following for security.bpf.foo */</div><div class='add'>+	if (!name_match_foo(name))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_mem(read_value, sizeof(read_value), 0, &amp;value_ptr);</div><div class='add'>+</div><div class='add'>+	/* read security.bpf.bar */</div><div class='add'>+	ret = bpf_get_dentry_xattr(dentry, xattr_bar, &amp;value_ptr);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		/* If security.bpf.bar doesn't exist, set it */</div><div class='add'>+		bpf_dynptr_from_mem(value_bar, sizeof(value_bar), 0, &amp;value_ptr);</div><div class='add'>+</div><div class='add'>+		ret = bpf_set_dentry_xattr(dentry, xattr_bar, &amp;value_ptr, 0);</div><div class='add'>+		if (!ret)</div><div class='add'>+			set_security_bpf_bar_success = true;</div><div class='add'>+		ret = bpf_set_dentry_xattr(dentry, xattr_selinux, &amp;value_ptr, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			set_security_selinux_fail = true;</div><div class='add'>+	} else {</div><div class='add'>+		/* If security.bpf.bar exists, remove it */</div><div class='add'>+		ret = bpf_remove_dentry_xattr(dentry, xattr_bar);</div><div class='add'>+		if (!ret)</div><div class='add'>+			remove_security_bpf_bar_success = true;</div><div class='add'>+</div><div class='add'>+		ret = bpf_remove_dentry_xattr(dentry, xattr_selinux);</div><div class='add'>+		if (ret)</div><div class='add'>+			remove_security_selinux_fail = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool locked_set_security_bpf_bar_success;</div><div class='add'>+bool locked_remove_security_bpf_bar_success;</div><div class='add'>+bool locked_set_security_selinux_fail;</div><div class='add'>+bool locked_remove_security_selinux_fail;</div><div class='add'>+</div><div class='add'>+/* Test bpf_set_dentry_xattr_locked and bpf_remove_dentry_xattr_locked.</div><div class='add'>+ * It not necessary to differentiate the _locked version and the</div><div class='add'>+ * not-_locked version in the BPF program. The verifier will fix them up</div><div class='add'>+ * properly.</div><div class='add'>+ */</div><div class='add'>+SEC("lsm.s/inode_setxattr")</div><div class='add'>+int BPF_PROG(test_inode_setxattr, struct mnt_idmap *idmap,</div><div class='add'>+	     struct dentry *dentry, const char *name,</div><div class='add'>+	     const void *value, size_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr value_ptr;</div><div class='add'>+	__u32 pid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pid = bpf_get_current_pid_tgid() &gt;&gt; 32;</div><div class='add'>+	if (pid != monitored_pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Only do the following for security.bpf.foo */</div><div class='add'>+	if (!name_match_foo(name))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_mem(read_value, sizeof(read_value), 0, &amp;value_ptr);</div><div class='add'>+</div><div class='add'>+	/* read security.bpf.bar */</div><div class='add'>+	ret = bpf_get_dentry_xattr(dentry, xattr_bar, &amp;value_ptr);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		/* If security.bpf.bar doesn't exist, set it */</div><div class='add'>+		bpf_dynptr_from_mem(value_bar, sizeof(value_bar), 0, &amp;value_ptr);</div><div class='add'>+</div><div class='add'>+		ret = bpf_set_dentry_xattr(dentry, xattr_bar, &amp;value_ptr, 0);</div><div class='add'>+		if (!ret)</div><div class='add'>+			locked_set_security_bpf_bar_success = true;</div><div class='add'>+		ret = bpf_set_dentry_xattr(dentry, xattr_selinux, &amp;value_ptr, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			locked_set_security_selinux_fail = true;</div><div class='add'>+	} else {</div><div class='add'>+		/* If security.bpf.bar exists, remove it */</div><div class='add'>+		ret = bpf_remove_dentry_xattr(dentry, xattr_bar);</div><div class='add'>+		if (!ret)</div><div class='add'>+			locked_remove_security_bpf_bar_success = true;</div><div class='add'>+</div><div class='add'>+		ret = bpf_remove_dentry_xattr(dentry, xattr_selinux);</div><div class='add'>+		if (ret)</div><div class='add'>+			locked_remove_security_selinux_fail = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_sig_in_xattr.c b/tools/testing/selftests/bpf/progs/test_sig_in_xattr.c<br/>index 8ef6b39335b6..34b30e2603f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_sig_in_xattr.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_sig_in_xattr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_sig_in_xattr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_sig_in_xattr.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@ char digest[MAGIC_SIZE + SIZEOF_STRUCT_FSVERITY_DIGEST + SHA256_DIGEST_SIZE];</div><div class='ctx'> __u32 monitored_pid;</div><div class='ctx'> char sig[MAX_SIG_SIZE];</div><div class='ctx'> __u32 sig_size;</div><div class='del'>-__u32 user_keyring_serial;</div><div class='add'>+__s32 user_keyring_serial;</div><div class='ctx'> </div><div class='ctx'> SEC("lsm.s/file_open")</div><div class='ctx'> int BPF_PROG(test_file_open, struct file *f)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_sockmap_change_tail.c b/tools/testing/selftests/bpf/progs/test_sockmap_change_tail.c<br/>index 2796dd8545eb..1c7941a4ad00 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_sockmap_change_tail.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_sockmap_change_tail.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_sockmap_change_tail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_sockmap_change_tail.c</a></div><div class='hunk'>@@ -1,8 +1,13 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Copyright (c) 2024 ByteDance */</div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include "vmlinux.h"</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifndef PAGE_SIZE</div><div class='add'>+#define PAGE_SIZE __PAGE_SIZE</div><div class='add'>+#endif</div><div class='add'>+#define BPF_SKB_MAX_LEN (PAGE_SIZE &lt;&lt; 2)</div><div class='add'>+</div><div class='ctx'> struct {</div><div class='ctx'> 	__uint(type, BPF_MAP_TYPE_SOCKMAP);</div><div class='ctx'> 	__uint(max_entries, 1);</div><div class='hunk'>@@ -31,7 +36,7 @@ int prog_skb_verdict(struct __sk_buff *skb)</div><div class='ctx'> 		change_tail_ret = bpf_skb_change_tail(skb, skb-&gt;len + 1, 0);</div><div class='ctx'> 		return SK_PASS;</div><div class='ctx'> 	} else if (data[0] == 'E') { /* Error */</div><div class='del'>-		change_tail_ret = bpf_skb_change_tail(skb, 65535, 0);</div><div class='add'>+		change_tail_ret = bpf_skb_change_tail(skb, BPF_SKB_MAX_LEN, 0);</div><div class='ctx'> 		return SK_PASS;</div><div class='ctx'> 	}</div><div class='ctx'> 	return SK_PASS;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_sockmap_ktls.c b/tools/testing/selftests/bpf/progs/test_sockmap_ktls.c<br/>new file mode 100644<br/>index 000000000000..83df4919c224<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_sockmap_ktls.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_sockmap_ktls.c</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_endian.h&gt;</div><div class='add'>+</div><div class='add'>+int cork_byte;</div><div class='add'>+int push_start;</div><div class='add'>+int push_end;</div><div class='add'>+int apply_bytes;</div><div class='add'>+int pop_start;</div><div class='add'>+int pop_end;</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_SOCKMAP);</div><div class='add'>+	__uint(max_entries, 20);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, int);</div><div class='add'>+} sock_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("sk_msg")</div><div class='add'>+int prog_sk_policy(struct sk_msg_md *msg)</div><div class='add'>+{</div><div class='add'>+	if (cork_byte &gt; 0)</div><div class='add'>+		bpf_msg_cork_bytes(msg, cork_byte);</div><div class='add'>+	if (push_start &gt; 0 &amp;&amp; push_end &gt; 0)</div><div class='add'>+		bpf_msg_push_data(msg, push_start, push_end, 0);</div><div class='add'>+	if (pop_start &gt;= 0 &amp;&amp; pop_end &gt; 0)</div><div class='add'>+		bpf_msg_pop_data(msg, pop_start, pop_end, 0);</div><div class='add'>+</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sk_msg")</div><div class='add'>+int prog_sk_policy_redir(struct sk_msg_md *msg)</div><div class='add'>+{</div><div class='add'>+	int two = 2;</div><div class='add'>+</div><div class='add'>+	bpf_msg_apply_bytes(msg, apply_bytes);</div><div class='add'>+	return bpf_msg_redirect_map(msg, &amp;sock_map, two, 0);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_sockmap_redir.c b/tools/testing/selftests/bpf/progs/test_sockmap_redir.c<br/>new file mode 100644<br/>index 000000000000..34d9f4f2f0a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_sockmap_redir.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_sockmap_redir.c</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+SEC(".maps") struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_SOCKMAP);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u64);</div><div class='add'>+} nop_map, sock_map;</div><div class='add'>+</div><div class='add'>+SEC(".maps") struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_SOCKHASH);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u64);</div><div class='add'>+} nop_hash, sock_hash;</div><div class='add'>+</div><div class='add'>+SEC(".maps") struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 2);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, unsigned int);</div><div class='add'>+} verdict_map;</div><div class='add'>+</div><div class='add'>+/* Set by user space */</div><div class='add'>+int redirect_type;</div><div class='add'>+int redirect_flags;</div><div class='add'>+</div><div class='add'>+#define redirect_map(__data)                                                   \</div><div class='add'>+	_Generic((__data),                                                     \</div><div class='add'>+		 struct __sk_buff * : bpf_sk_redirect_map,                     \</div><div class='add'>+		 struct sk_msg_md * : bpf_msg_redirect_map                     \</div><div class='add'>+	)((__data), &amp;sock_map, (__u32){0}, redirect_flags)</div><div class='add'>+</div><div class='add'>+#define redirect_hash(__data)                                                  \</div><div class='add'>+	_Generic((__data),                                                     \</div><div class='add'>+		 struct __sk_buff * : bpf_sk_redirect_hash,                    \</div><div class='add'>+		 struct sk_msg_md * : bpf_msg_redirect_hash                    \</div><div class='add'>+	)((__data), &amp;sock_hash, &amp;(__u32){0}, redirect_flags)</div><div class='add'>+</div><div class='add'>+#define DEFINE_PROG(__type, __param)                                           \</div><div class='add'>+SEC("sk_" XSTR(__type))                                                        \</div><div class='add'>+int prog_ ## __type ## _verdict(__param data)                                  \</div><div class='add'>+{                                                                              \</div><div class='add'>+	unsigned int *count;                                                   \</div><div class='add'>+	int verdict;                                                           \</div><div class='add'>+									       \</div><div class='add'>+	if (redirect_type == BPF_MAP_TYPE_SOCKMAP)                             \</div><div class='add'>+		verdict = redirect_map(data);                                  \</div><div class='add'>+	else if (redirect_type == BPF_MAP_TYPE_SOCKHASH)                       \</div><div class='add'>+		verdict = redirect_hash(data);                                 \</div><div class='add'>+	else                                                                   \</div><div class='add'>+		verdict = redirect_type - __MAX_BPF_MAP_TYPE;                  \</div><div class='add'>+									       \</div><div class='add'>+	count = bpf_map_lookup_elem(&amp;verdict_map, &amp;verdict);                   \</div><div class='add'>+	if (count)                                                             \</div><div class='add'>+		(*count)++;                                                    \</div><div class='add'>+									       \</div><div class='add'>+	return verdict;                                                        \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_PROG(skb, struct __sk_buff *);</div><div class='add'>+DEFINE_PROG(msg, struct sk_msg_md *);</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_sockmap_strp.c b/tools/testing/selftests/bpf/progs/test_sockmap_strp.c<br/>new file mode 100644<br/>index 000000000000..dde3d5bec515<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_sockmap_strp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_sockmap_strp.c</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_endian.h&gt;</div><div class='add'>+int verdict_max_size = 10000;</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_SOCKMAP);</div><div class='add'>+	__uint(max_entries, 20);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, int);</div><div class='add'>+} sock_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("sk_skb/stream_verdict")</div><div class='add'>+int prog_skb_verdict(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	__u32 one = 1;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &gt; verdict_max_size)</div><div class='add'>+		return SK_PASS;</div><div class='add'>+</div><div class='add'>+	return bpf_sk_redirect_map(skb, &amp;sock_map, one, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sk_skb/stream_verdict")</div><div class='add'>+int prog_skb_verdict_pass(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return SK_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sk_skb/stream_parser")</div><div class='add'>+int prog_skb_parser(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return skb-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sk_skb/stream_parser")</div><div class='add'>+int prog_skb_parser_partial(struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* agreement with the test program on a 4-byte size header</div><div class='add'>+	 * and 6-byte body.</div><div class='add'>+	 */</div><div class='add'>+	if (skb-&gt;len &lt; 4) {</div><div class='add'>+		/* need more header to determine full length */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/* return full length decoded from header.</div><div class='add'>+	 * the return value may be larger than skb-&gt;len which</div><div class='add'>+	 * means framework must wait body coming.</div><div class='add'>+	 */</div><div class='add'>+	return 10;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_spin_lock_fail.c b/tools/testing/selftests/bpf/progs/test_spin_lock_fail.c<br/>index 1c8b678e2e9a..f678ee6bd7ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_spin_lock_fail.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_spin_lock_fail.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_spin_lock_fail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_spin_lock_fail.c</a></div><div class='hunk'>@@ -245,4 +245,73 @@ int lock_global_subprog_call2(struct __sk_buff *ctx)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int __noinline</div><div class='add'>+global_subprog_int(int i)</div><div class='add'>+{</div><div class='add'>+	if (i)</div><div class='add'>+		bpf_printk("%p", &amp;i);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_sleepable_helper_subprog(int i)</div><div class='add'>+{</div><div class='add'>+	if (i)</div><div class='add'>+		bpf_copy_from_user(&amp;i, sizeof(i), NULL);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_sleepable_kfunc_subprog(int i)</div><div class='add'>+{</div><div class='add'>+	if (i)</div><div class='add'>+		bpf_copy_from_user_str(&amp;i, sizeof(i), NULL, 0);</div><div class='add'>+	global_subprog_int(i);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __noinline</div><div class='add'>+global_subprog_calling_sleepable_global(int i)</div><div class='add'>+{</div><div class='add'>+	if (!i)</div><div class='add'>+		global_sleepable_kfunc_subprog(i);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?syscall")</div><div class='add'>+int lock_global_sleepable_helper_subprog(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;lockA);</div><div class='add'>+	if (ctx-&gt;mark == 42)</div><div class='add'>+		ret = global_sleepable_helper_subprog(ctx-&gt;mark);</div><div class='add'>+	bpf_spin_unlock(&amp;lockA);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?syscall")</div><div class='add'>+int lock_global_sleepable_kfunc_subprog(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;lockA);</div><div class='add'>+	if (ctx-&gt;mark == 42)</div><div class='add'>+		ret = global_sleepable_kfunc_subprog(ctx-&gt;mark);</div><div class='add'>+	bpf_spin_unlock(&amp;lockA);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?syscall")</div><div class='add'>+int lock_global_sleepable_subprog_indirect(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	bpf_spin_lock(&amp;lockA);</div><div class='add'>+	if (ctx-&gt;mark == 42)</div><div class='add'>+		ret = global_subprog_calling_sleepable_global(ctx-&gt;mark);</div><div class='add'>+	bpf_spin_unlock(&amp;lockA);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_subprogs_extable.c b/tools/testing/selftests/bpf/progs/test_subprogs_extable.c<br/>index e2a21fbd4e44..dcac69f5928a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_subprogs_extable.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_subprogs_extable.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_subprogs_extable.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_subprogs_extable.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@ static __u64 test_cb(struct bpf_map *map, __u32 *key, __u64 *val, void *data)</div><div class='ctx'> SEC("fexit/bpf_testmod_return_ptr")</div><div class='ctx'> int BPF_PROG(handle_fexit_ret_subprogs, int arg, struct file *ret)</div><div class='ctx'> {</div><div class='del'>-	*(volatile long *)ret;</div><div class='add'>+	*(volatile int *)ret;</div><div class='ctx'> 	*(volatile int *)&amp;ret-&gt;f_mode;</div><div class='ctx'> 	bpf_for_each_map_elem(&amp;test_array, test_cb, NULL, 0);</div><div class='ctx'> 	triggered++;</div><div class='hunk'>@@ -31,7 +31,7 @@ int BPF_PROG(handle_fexit_ret_subprogs, int arg, struct file *ret)</div><div class='ctx'> SEC("fexit/bpf_testmod_return_ptr")</div><div class='ctx'> int BPF_PROG(handle_fexit_ret_subprogs2, int arg, struct file *ret)</div><div class='ctx'> {</div><div class='del'>-	*(volatile long *)ret;</div><div class='add'>+	*(volatile int *)ret;</div><div class='ctx'> 	*(volatile int *)&amp;ret-&gt;f_mode;</div><div class='ctx'> 	bpf_for_each_map_elem(&amp;test_array, test_cb, NULL, 0);</div><div class='ctx'> 	triggered++;</div><div class='hunk'>@@ -41,7 +41,7 @@ int BPF_PROG(handle_fexit_ret_subprogs2, int arg, struct file *ret)</div><div class='ctx'> SEC("fexit/bpf_testmod_return_ptr")</div><div class='ctx'> int BPF_PROG(handle_fexit_ret_subprogs3, int arg, struct file *ret)</div><div class='ctx'> {</div><div class='del'>-	*(volatile long *)ret;</div><div class='add'>+	*(volatile int *)ret;</div><div class='ctx'> 	*(volatile int *)&amp;ret-&gt;f_mode;</div><div class='ctx'> 	bpf_for_each_map_elem(&amp;test_array, test_cb, NULL, 0);</div><div class='ctx'> 	triggered++;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_task_local_data.c b/tools/testing/selftests/bpf/progs/test_task_local_data.c<br/>new file mode 100644<br/>index 000000000000..fffafc013044<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_task_local_data.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_task_local_data.c</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+#include "task_local_data.bpf.h"</div><div class='add'>+</div><div class='add'>+struct tld_keys {</div><div class='add'>+	tld_key_t value0;</div><div class='add'>+	tld_key_t value1;</div><div class='add'>+	tld_key_t value2;</div><div class='add'>+	tld_key_t value_not_exist;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct test_tld_struct {</div><div class='add'>+	__u64 a;</div><div class='add'>+	__u64 b;</div><div class='add'>+	__u64 c;</div><div class='add'>+	__u64 d;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int test_value0;</div><div class='add'>+int test_value1;</div><div class='add'>+struct test_tld_struct test_value2;</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+int task_main(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct tld_object tld_obj;</div><div class='add'>+	struct test_tld_struct *struct_p;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	int err, *int_p;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	err = tld_object_init(task, &amp;tld_obj);</div><div class='add'>+	if (err)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	int_p = tld_get_data(&amp;tld_obj, value0, "value0", sizeof(int));</div><div class='add'>+	if (int_p)</div><div class='add'>+		test_value0 = *int_p;</div><div class='add'>+	else</div><div class='add'>+		return 2;</div><div class='add'>+</div><div class='add'>+	int_p = tld_get_data(&amp;tld_obj, value1, "value1", sizeof(int));</div><div class='add'>+	if (int_p)</div><div class='add'>+		test_value1 = *int_p;</div><div class='add'>+	else</div><div class='add'>+		return 3;</div><div class='add'>+</div><div class='add'>+	struct_p = tld_get_data(&amp;tld_obj, value2, "value2", sizeof(struct test_tld_struct));</div><div class='add'>+	if (struct_p)</div><div class='add'>+		test_value2 = *struct_p;</div><div class='add'>+	else</div><div class='add'>+		return 4;</div><div class='add'>+</div><div class='add'>+	int_p = tld_get_data(&amp;tld_obj, value_not_exist, "value_not_exist", sizeof(int));</div><div class='add'>+	if (int_p)</div><div class='add'>+		return 5;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_task_under_cgroup.c b/tools/testing/selftests/bpf/progs/test_task_under_cgroup.c<br/>index 7e750309ce27..0b74b8bd22e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_task_under_cgroup.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_task_under_cgroup.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_task_under_cgroup.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_task_under_cgroup.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("lsm.s/bpf")</div><div class='del'>-int BPF_PROG(lsm_run, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='add'>+int BPF_PROG(lsm_run, int cmd, union bpf_attr *attr, unsigned int size, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	struct cgroup *cgrp = NULL;</div><div class='ctx'> 	struct task_struct *task;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_tc_change_tail.c b/tools/testing/selftests/bpf/progs/test_tc_change_tail.c<br/>index 28edafe803f0..fcba8299f0bc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tc_change_tail.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tc_change_tail.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tc_change_tail.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_tc_change_tail.c</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include "vmlinux.h"</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/udp.h&gt;</div><div class='del'>-#include &lt;linux/pkt_cls.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef PAGE_SIZE</div><div class='add'>+#define PAGE_SIZE __PAGE_SIZE</div><div class='add'>+#endif</div><div class='add'>+#define BPF_SKB_MAX_LEN (PAGE_SIZE &lt;&lt; 2)</div><div class='ctx'> </div><div class='ctx'> long change_tail_ret = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -94,7 +94,7 @@ int change_tail(struct __sk_buff *skb)</div><div class='ctx'> 			bpf_skb_change_tail(skb, len, 0);</div><div class='ctx'> 		return TCX_PASS;</div><div class='ctx'> 	} else if (payload[0] == 'E') { /* Error */</div><div class='del'>-		change_tail_ret = bpf_skb_change_tail(skb, 65535, 0);</div><div class='add'>+		change_tail_ret = bpf_skb_change_tail(skb, BPF_SKB_MAX_LEN, 0);</div><div class='ctx'> 		return TCX_PASS;</div><div class='ctx'> 	} else if (payload[0] == 'Z') { /* Zero */</div><div class='ctx'> 		change_tail_ret = bpf_skb_change_tail(skb, 0, 0);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_tc_edt.c b/tools/testing/selftests/bpf/progs/test_tc_edt.c<br/>index 950a70b61e74..4f6f03122d61 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tc_edt.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tc_edt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tc_edt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_tc_edt.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #define TIME_HORIZON_NS (2000 * 1000 * 1000)</div><div class='ctx'> #define NS_PER_SEC 1000000000</div><div class='ctx'> #define ECN_HORIZON_NS 5000000</div><div class='del'>-#define THROTTLE_RATE_BPS (5 * 1000 * 1000)</div><div class='ctx'> </div><div class='ctx'> /* flow_key =&gt; last_tstamp timestamp used */</div><div class='ctx'> struct {</div><div class='hunk'>@@ -24,12 +23,13 @@ struct {</div><div class='ctx'> 	__uint(max_entries, 1);</div><div class='ctx'> } flow_map SEC(".maps");</div><div class='ctx'> </div><div class='add'>+__uint64_t target_rate;</div><div class='add'>+</div><div class='ctx'> static inline int throttle_flow(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	int key = 0;</div><div class='ctx'> 	uint64_t *last_tstamp = bpf_map_lookup_elem(&amp;flow_map, &amp;key);</div><div class='del'>-	uint64_t delay_ns = ((uint64_t)skb-&gt;len) * NS_PER_SEC /</div><div class='del'>-			THROTTLE_RATE_BPS;</div><div class='add'>+	uint64_t delay_ns = ((uint64_t)skb-&gt;len) * NS_PER_SEC / target_rate;</div><div class='ctx'> 	uint64_t now = bpf_ktime_get_ns();</div><div class='ctx'> 	uint64_t tstamp, next_tstamp = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -70,7 +70,7 @@ static inline int handle_tcp(struct __sk_buff *skb, struct tcphdr *tcp)</div><div class='ctx'> 	if ((void *)(tcp + 1) &gt; data_end)</div><div class='ctx'> 		return TC_ACT_SHOT;</div><div class='ctx'> </div><div class='del'>-	if (tcp-&gt;dest == bpf_htons(9000))</div><div class='add'>+	if (tcp-&gt;source == bpf_htons(9000))</div><div class='ctx'> 		return throttle_flow(skb);</div><div class='ctx'> </div><div class='ctx'> 	return TC_ACT_OK;</div><div class='hunk'>@@ -99,7 +99,8 @@ static inline int handle_ipv4(struct __sk_buff *skb)</div><div class='ctx'> 	return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("cls_test") int tc_prog(struct __sk_buff *skb)</div><div class='add'>+SEC("tc")</div><div class='add'>+int tc_prog(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == bpf_htons(ETH_P_IP))</div><div class='ctx'> 		return handle_ipv4(skb);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c<br/>index 404124a93892..7330c61b5730 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tc_tunnel.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tc_tunnel.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tc_tunnel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_tc_tunnel.c</a></div><div class='hunk'>@@ -2,23 +2,11 @@</div><div class='ctx'> </div><div class='ctx'> /* In-place tunneling */</div><div class='ctx'> </div><div class='del'>-#include &lt;stdbool.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/ipv6.h&gt;</div><div class='del'>-#include &lt;linux/mpls.h&gt;</div><div class='del'>-#include &lt;linux/tcp.h&gt;</div><div class='del'>-#include &lt;linux/udp.h&gt;</div><div class='del'>-#include &lt;linux/pkt_cls.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;bpf/bpf_endian.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_endian.h&gt;</div><div class='add'>+#include "bpf_tracing_net.h"</div><div class='ctx'> #include "bpf_compiler.h"</div><div class='ctx'> </div><div class='ctx'> #pragma GCC diagnostic ignored "-Waddress-of-packed-member"</div><div class='hunk'>@@ -27,6 +15,14 @@ static const int cfg_port = 8000;</div><div class='ctx'> </div><div class='ctx'> static const int cfg_udp_src = 20000;</div><div class='ctx'> </div><div class='add'>+#define ETH_P_MPLS_UC	0x8847</div><div class='add'>+#define ETH_P_TEB	0x6558</div><div class='add'>+</div><div class='add'>+#define MPLS_LS_S_MASK	0x00000100</div><div class='add'>+#define BPF_F_ADJ_ROOM_ENCAP_L2(len)			\</div><div class='add'>+	(((__u64)len &amp; BPF_ADJ_ROOM_ENCAP_L2_MASK)	\</div><div class='add'>+	 &lt;&lt; BPF_ADJ_ROOM_ENCAP_L2_SHIFT)</div><div class='add'>+</div><div class='ctx'> #define	L2_PAD_SZ	(sizeof(struct vxlanhdr) + ETH_HLEN)</div><div class='ctx'> </div><div class='ctx'> #define	UDP_PORT		5555</div><div class='hunk'>@@ -36,10 +32,9 @@ static const int cfg_udp_src = 20000;</div><div class='ctx'> </div><div class='ctx'> #define	EXTPROTO_VXLAN	0x1</div><div class='ctx'> </div><div class='del'>-#define	VXLAN_N_VID     (1u &lt;&lt; 24)</div><div class='del'>-#define	VXLAN_VNI_MASK	bpf_htonl((VXLAN_N_VID - 1) &lt;&lt; 8)</div><div class='del'>-#define	VXLAN_FLAGS     0x8</div><div class='del'>-#define	VXLAN_VNI       1</div><div class='add'>+#define	VXLAN_FLAGS     bpf_htonl(1&lt;&lt;27)</div><div class='add'>+#define	VNI_ID		1</div><div class='add'>+#define	VXLAN_VNI	bpf_htonl(VNI_ID &lt;&lt; 8)</div><div class='ctx'> </div><div class='ctx'> #ifndef NEXTHDR_DEST</div><div class='ctx'> #define NEXTHDR_DEST	60</div><div class='hunk'>@@ -48,12 +43,6 @@ static const int cfg_udp_src = 20000;</div><div class='ctx'> /* MPLS label 1000 with S bit (last label) set and ttl of 255. */</div><div class='ctx'> static const __u32 mpls_label = __bpf_constant_htonl(1000 &lt;&lt; 12 |</div><div class='ctx'> 						     MPLS_LS_S_MASK | 0xff);</div><div class='del'>-</div><div class='del'>-struct vxlanhdr {</div><div class='del'>-	__be32 vx_flags;</div><div class='del'>-	__be32 vx_vni;</div><div class='del'>-} __attribute__((packed));</div><div class='del'>-</div><div class='ctx'> struct gre_hdr {</div><div class='ctx'> 	__be16 flags;</div><div class='ctx'> 	__be16 protocol;</div><div class='hunk'>@@ -94,8 +83,8 @@ static __always_inline void set_ipv4_csum(struct iphdr *iph)</div><div class='ctx'> static __always_inline int __encap_ipv4(struct __sk_buff *skb, __u8 encap_proto,</div><div class='ctx'> 					__u16 l2_proto, __u16 ext_proto)</div><div class='ctx'> {</div><div class='add'>+	struct iphdr iph_inner = {0};</div><div class='ctx'> 	__u16 udp_dst = UDP_PORT;</div><div class='del'>-	struct iphdr iph_inner;</div><div class='ctx'> 	struct v4hdr h_outer;</div><div class='ctx'> 	struct tcphdr tcph;</div><div class='ctx'> 	int olen, l2_len;</div><div class='hunk'>@@ -122,7 +111,6 @@ static __always_inline int __encap_ipv4(struct __sk_buff *skb, __u8 encap_proto,</div><div class='ctx'> 			return TC_ACT_OK;</div><div class='ctx'> </div><div class='ctx'> 		/* Derive the IPv4 header fields from the IPv6 header */</div><div class='del'>-		memset(&amp;iph_inner, 0, sizeof(iph_inner));</div><div class='ctx'> 		iph_inner.version = 4;</div><div class='ctx'> 		iph_inner.ihl = 5;</div><div class='ctx'> 		iph_inner.tot_len = bpf_htons(sizeof(iph6_inner) +</div><div class='hunk'>@@ -210,7 +198,7 @@ static __always_inline int __encap_ipv4(struct __sk_buff *skb, __u8 encap_proto,</div><div class='ctx'> 			struct vxlanhdr *vxlan_hdr = (struct vxlanhdr *)l2_hdr;</div><div class='ctx'> </div><div class='ctx'> 			vxlan_hdr-&gt;vx_flags = VXLAN_FLAGS;</div><div class='del'>-			vxlan_hdr-&gt;vx_vni = bpf_htonl((VXLAN_VNI &amp; VXLAN_VNI_MASK) &lt;&lt; 8);</div><div class='add'>+			vxlan_hdr-&gt;vx_vni = VXLAN_VNI;</div><div class='ctx'> </div><div class='ctx'> 			l2_hdr += sizeof(struct vxlanhdr);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -340,7 +328,7 @@ static __always_inline int __encap_ipv6(struct __sk_buff *skb, __u8 encap_proto,</div><div class='ctx'> 			struct vxlanhdr *vxlan_hdr = (struct vxlanhdr *)l2_hdr;</div><div class='ctx'> </div><div class='ctx'> 			vxlan_hdr-&gt;vx_flags = VXLAN_FLAGS;</div><div class='del'>-			vxlan_hdr-&gt;vx_vni = bpf_htonl((VXLAN_VNI &amp; VXLAN_VNI_MASK) &lt;&lt; 8);</div><div class='add'>+			vxlan_hdr-&gt;vx_vni = VXLAN_VNI;</div><div class='ctx'> </div><div class='ctx'> 			l2_hdr += sizeof(struct vxlanhdr);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -372,8 +360,8 @@ static __always_inline int __encap_ipv6(struct __sk_buff *skb, __u8 encap_proto,</div><div class='ctx'> </div><div class='ctx'> static int encap_ipv6_ipip6(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct v6hdr h_outer = {0};</div><div class='ctx'> 	struct iphdr iph_inner;</div><div class='del'>-	struct v6hdr h_outer;</div><div class='ctx'> 	struct tcphdr tcph;</div><div class='ctx'> 	struct ethhdr eth;</div><div class='ctx'> 	__u64 flags;</div><div class='hunk'>@@ -400,13 +388,12 @@ static int encap_ipv6_ipip6(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_SHOT;</div><div class='ctx'> </div><div class='ctx'> 	/* prepare new outer network header */</div><div class='del'>-	memset(&amp;h_outer.ip, 0, sizeof(h_outer.ip));</div><div class='ctx'> 	h_outer.ip.version = 6;</div><div class='ctx'> 	h_outer.ip.hop_limit = iph_inner.ttl;</div><div class='del'>-	h_outer.ip.saddr.s6_addr[1] = 0xfd;</div><div class='del'>-	h_outer.ip.saddr.s6_addr[15] = 1;</div><div class='del'>-	h_outer.ip.daddr.s6_addr[1] = 0xfd;</div><div class='del'>-	h_outer.ip.daddr.s6_addr[15] = 2;</div><div class='add'>+	h_outer.ip.saddr.in6_u.u6_addr8[1] = 0xfd;</div><div class='add'>+	h_outer.ip.saddr.in6_u.u6_addr8[15] = 1;</div><div class='add'>+	h_outer.ip.daddr.in6_u.u6_addr8[1] = 0xfd;</div><div class='add'>+	h_outer.ip.daddr.in6_u.u6_addr8[15] = 2;</div><div class='ctx'> 	h_outer.ip.payload_len = iph_inner.tot_len;</div><div class='ctx'> 	h_outer.ip.nexthdr = IPPROTO_IPIP;</div><div class='ctx'> </div><div class='hunk'>@@ -431,7 +418,7 @@ static __always_inline int encap_ipv6(struct __sk_buff *skb, __u8 encap_proto,</div><div class='ctx'> 	return __encap_ipv6(skb, encap_proto, l2_proto, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_ipip_none")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_ipip_none(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IP))</div><div class='hunk'>@@ -440,7 +427,7 @@ int __encap_ipip_none(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_gre_none")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_gre_none(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IP))</div><div class='hunk'>@@ -449,7 +436,7 @@ int __encap_gre_none(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_gre_mpls")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_gre_mpls(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IP))</div><div class='hunk'>@@ -458,7 +445,7 @@ int __encap_gre_mpls(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_gre_eth")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_gre_eth(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IP))</div><div class='hunk'>@@ -467,7 +454,7 @@ int __encap_gre_eth(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_udp_none")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_udp_none(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IP))</div><div class='hunk'>@@ -476,7 +463,7 @@ int __encap_udp_none(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_udp_mpls")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_udp_mpls(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IP))</div><div class='hunk'>@@ -485,7 +472,7 @@ int __encap_udp_mpls(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_udp_eth")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_udp_eth(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IP))</div><div class='hunk'>@@ -494,7 +481,7 @@ int __encap_udp_eth(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_vxlan_eth")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_vxlan_eth(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IP))</div><div class='hunk'>@@ -505,7 +492,7 @@ int __encap_vxlan_eth(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_sit_none")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_sit_none(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IPV6))</div><div class='hunk'>@@ -514,7 +501,7 @@ int __encap_sit_none(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_ip6tnl_none")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_ip6tnl_none(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IPV6))</div><div class='hunk'>@@ -523,7 +510,7 @@ int __encap_ip6tnl_none(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_ipip6_none")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_ipip6_none(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IP))</div><div class='hunk'>@@ -532,7 +519,7 @@ int __encap_ipip6_none(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_ip6gre_none")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_ip6gre_none(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IPV6))</div><div class='hunk'>@@ -541,7 +528,7 @@ int __encap_ip6gre_none(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_ip6gre_mpls")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_ip6gre_mpls(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IPV6))</div><div class='hunk'>@@ -550,7 +537,7 @@ int __encap_ip6gre_mpls(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_ip6gre_eth")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_ip6gre_eth(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IPV6))</div><div class='hunk'>@@ -559,7 +546,7 @@ int __encap_ip6gre_eth(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_ip6udp_none")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_ip6udp_none(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IPV6))</div><div class='hunk'>@@ -568,7 +555,7 @@ int __encap_ip6udp_none(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_ip6udp_mpls")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_ip6udp_mpls(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IPV6))</div><div class='hunk'>@@ -577,7 +564,7 @@ int __encap_ip6udp_mpls(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_ip6udp_eth")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_ip6udp_eth(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IPV6))</div><div class='hunk'>@@ -586,7 +573,7 @@ int __encap_ip6udp_eth(struct __sk_buff *skb)</div><div class='ctx'> 		return TC_ACT_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("encap_ip6vxlan_eth")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int __encap_ip6vxlan_eth(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;protocol == __bpf_constant_htons(ETH_P_IPV6))</div><div class='hunk'>@@ -693,7 +680,7 @@ static int decap_ipv6(struct __sk_buff *skb)</div><div class='ctx'> 			      iph_outer.nexthdr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("decap")</div><div class='add'>+SEC("tc")</div><div class='ctx'> int decap_f(struct __sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	switch (skb-&gt;protocol) {</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c b/tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c<br/>index eb5cca1fce16..7d5293de1952 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c</a></div><div class='hunk'>@@ -294,7 +294,9 @@ static int tcp_validate_sysctl(struct tcp_syncookie *ctx)</div><div class='ctx'> 	    (ctx-&gt;ipv6 &amp;&amp; ctx-&gt;attrs.mss != MSS_LOCAL_IPV6))</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	if (!ctx-&gt;attrs.wscale_ok || ctx-&gt;attrs.snd_wscale != 7)</div><div class='add'>+	if (!ctx-&gt;attrs.wscale_ok ||</div><div class='add'>+	    !ctx-&gt;attrs.snd_wscale ||</div><div class='add'>+	    ctx-&gt;attrs.snd_wscale &gt;= BPF_SYNCOOKIE_WSCALE_MASK)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ctx-&gt;attrs.tstamp_ok)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_tcp_hdr_options.c b/tools/testing/selftests/bpf/progs/test_tcp_hdr_options.c<br/>index 5f4e87ee949a..1ecdf4c54de4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tcp_hdr_options.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tcp_hdr_options.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tcp_hdr_options.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_tcp_hdr_options.c</a></div><div class='hunk'>@@ -14,10 +14,7 @@</div><div class='ctx'> #include &lt;bpf/bpf_endian.h&gt;</div><div class='ctx'> #define BPF_PROG_TEST_TCP_HDR_OPTIONS</div><div class='ctx'> #include "test_tcp_hdr_options.h"</div><div class='del'>-</div><div class='del'>-#ifndef sizeof_field</div><div class='del'>-#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)-&gt;MEMBER))</div><div class='del'>-#endif</div><div class='add'>+#include "bpf_misc.h"</div><div class='ctx'> </div><div class='ctx'> __u8 test_kind = TCPOPT_EXP;</div><div class='ctx'> __u16 test_magic = 0xeB9F;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c b/tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c<br/>index 540181c115a8..ef00d38b0a8d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@ struct {</div><div class='ctx'> </div><div class='ctx'> struct {</div><div class='ctx'> 	__uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);</div><div class='del'>-	__uint(max_entries, 2);</div><div class='ctx'> 	__type(key, int);</div><div class='ctx'> 	__type(value, __u32);</div><div class='ctx'> } perf_event_map SEC(".maps");</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c b/tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c<br/>index 39ff06f2c834..cf0547a613ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c</a></div><div class='hunk'>@@ -6,14 +6,14 @@</div><div class='ctx'> #include "../test_kmods/bpf_testmod.h"</div><div class='ctx'> #include "bpf_misc.h"</div><div class='ctx'> </div><div class='del'>-SEC("tp_btf/bpf_testmod_test_nullable_bare")</div><div class='add'>+SEC("tp_btf/bpf_testmod_test_nullable_bare_tp")</div><div class='ctx'> __failure __msg("R1 invalid mem access 'trusted_ptr_or_null_'")</div><div class='ctx'> int BPF_PROG(handle_tp_btf_nullable_bare1, struct bpf_testmod_test_read_ctx *nullable_ctx)</div><div class='ctx'> {</div><div class='ctx'> 	return nullable_ctx-&gt;len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("tp_btf/bpf_testmod_test_nullable_bare")</div><div class='add'>+SEC("tp_btf/bpf_testmod_test_nullable_bare_tp")</div><div class='ctx'> int BPF_PROG(handle_tp_btf_nullable_bare2, struct bpf_testmod_test_read_ctx *nullable_ctx)</div><div class='ctx'> {</div><div class='ctx'> 	if (nullable_ctx)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_uprobe.c b/tools/testing/selftests/bpf/progs/test_uprobe.c<br/>index 896c88a4960d..12f4065fca20 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_uprobe.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_uprobe.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_uprobe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_uprobe.c</a></div><div class='hunk'>@@ -59,3 +59,41 @@ int BPF_UPROBE(test4)</div><div class='ctx'> 	test4_result = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#if defined(__TARGET_ARCH_x86)</div><div class='add'>+struct pt_regs regs;</div><div class='add'>+</div><div class='add'>+SEC("uprobe")</div><div class='add'>+int BPF_UPROBE(test_regs_change)</div><div class='add'>+{</div><div class='add'>+	pid_t pid = bpf_get_current_pid_tgid() &gt;&gt; 32;</div><div class='add'>+</div><div class='add'>+	if (pid != my_pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ax  = regs.ax;</div><div class='add'>+	ctx-&gt;cx  = regs.cx;</div><div class='add'>+	ctx-&gt;dx  = regs.dx;</div><div class='add'>+	ctx-&gt;r8  = regs.r8;</div><div class='add'>+	ctx-&gt;r9  = regs.r9;</div><div class='add'>+	ctx-&gt;r10 = regs.r10;</div><div class='add'>+	ctx-&gt;r11 = regs.r11;</div><div class='add'>+	ctx-&gt;di  = regs.di;</div><div class='add'>+	ctx-&gt;si  = regs.si;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long ip;</div><div class='add'>+</div><div class='add'>+SEC("uprobe")</div><div class='add'>+int BPF_UPROBE(test_regs_change_ip)</div><div class='add'>+{</div><div class='add'>+	pid_t pid = bpf_get_current_pid_tgid() &gt;&gt; 32;</div><div class='add'>+</div><div class='add'>+	if (pid != my_pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;ip = ip;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_usdt.c b/tools/testing/selftests/bpf/progs/test_usdt.c<br/>index 505aab9a5234..a78c87537b07 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_usdt.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_usdt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_usdt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_usdt.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@ int usdt0_called;</div><div class='ctx'> u64 usdt0_cookie;</div><div class='ctx'> int usdt0_arg_cnt;</div><div class='ctx'> int usdt0_arg_ret;</div><div class='add'>+int usdt0_arg_size;</div><div class='ctx'> </div><div class='ctx'> SEC("usdt")</div><div class='ctx'> int usdt0(struct pt_regs *ctx)</div><div class='hunk'>@@ -26,6 +27,7 @@ int usdt0(struct pt_regs *ctx)</div><div class='ctx'> 	usdt0_arg_cnt = bpf_usdt_arg_cnt(ctx);</div><div class='ctx'> 	/* should return -ENOENT for any arg_num */</div><div class='ctx'> 	usdt0_arg_ret = bpf_usdt_arg(ctx, bpf_get_prandom_u32(), &amp;tmp);</div><div class='add'>+	usdt0_arg_size = bpf_usdt_arg_size(ctx, bpf_get_prandom_u32());</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -34,6 +36,7 @@ u64 usdt3_cookie;</div><div class='ctx'> int usdt3_arg_cnt;</div><div class='ctx'> int usdt3_arg_rets[3];</div><div class='ctx'> u64 usdt3_args[3];</div><div class='add'>+int usdt3_arg_sizes[3];</div><div class='ctx'> </div><div class='ctx'> SEC("usdt//proc/self/exe:test:usdt3")</div><div class='ctx'> int usdt3(struct pt_regs *ctx)</div><div class='hunk'>@@ -50,12 +53,15 @@ int usdt3(struct pt_regs *ctx)</div><div class='ctx'> </div><div class='ctx'> 	usdt3_arg_rets[0] = bpf_usdt_arg(ctx, 0, &amp;tmp);</div><div class='ctx'> 	usdt3_args[0] = (int)tmp;</div><div class='add'>+	usdt3_arg_sizes[0] = bpf_usdt_arg_size(ctx, 0);</div><div class='ctx'> </div><div class='ctx'> 	usdt3_arg_rets[1] = bpf_usdt_arg(ctx, 1, &amp;tmp);</div><div class='ctx'> 	usdt3_args[1] = (long)tmp;</div><div class='add'>+	usdt3_arg_sizes[1] = bpf_usdt_arg_size(ctx, 1);</div><div class='ctx'> </div><div class='ctx'> 	usdt3_arg_rets[2] = bpf_usdt_arg(ctx, 2, &amp;tmp);</div><div class='ctx'> 	usdt3_args[2] = (uintptr_t)tmp;</div><div class='add'>+	usdt3_arg_sizes[2] = bpf_usdt_arg_size(ctx, 2);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -64,12 +70,15 @@ int usdt12_called;</div><div class='ctx'> u64 usdt12_cookie;</div><div class='ctx'> int usdt12_arg_cnt;</div><div class='ctx'> u64 usdt12_args[12];</div><div class='add'>+int usdt12_arg_sizes[12];</div><div class='ctx'> </div><div class='ctx'> SEC("usdt//proc/self/exe:test:usdt12")</div><div class='ctx'> int BPF_USDT(usdt12, int a1, int a2, long a3, long a4, unsigned a5,</div><div class='ctx'> 		     long a6, __u64 a7, uintptr_t a8, int a9, short a10,</div><div class='ctx'> 		     short a11, signed char a12)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	if (my_pid != (bpf_get_current_pid_tgid() &gt;&gt; 32))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +99,42 @@ int BPF_USDT(usdt12, int a1, int a2, long a3, long a4, unsigned a5,</div><div class='ctx'> 	usdt12_args[9] = a10;</div><div class='ctx'> 	usdt12_args[10] = a11;</div><div class='ctx'> 	usdt12_args[11] = a12;</div><div class='add'>+</div><div class='add'>+	bpf_for(i, 0, 12) {</div><div class='add'>+		usdt12_arg_sizes[i] = bpf_usdt_arg_size(ctx, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int usdt_sib_called;</div><div class='add'>+u64 usdt_sib_cookie;</div><div class='add'>+int usdt_sib_arg_cnt;</div><div class='add'>+int usdt_sib_arg_ret;</div><div class='add'>+short usdt_sib_arg;</div><div class='add'>+int usdt_sib_arg_size;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * usdt_sib is only tested on x86-related architectures, so it requires</div><div class='add'>+ * manual attach since auto-attach will panic tests under other architectures</div><div class='add'>+ */</div><div class='add'>+SEC("usdt")</div><div class='add'>+int usdt_sib(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	long tmp;</div><div class='add'>+</div><div class='add'>+	if (my_pid != (bpf_get_current_pid_tgid() &gt;&gt; 32))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	__sync_fetch_and_add(&amp;usdt_sib_called, 1);</div><div class='add'>+</div><div class='add'>+	usdt_sib_cookie = bpf_usdt_cookie(ctx);</div><div class='add'>+	usdt_sib_arg_cnt = bpf_usdt_arg_cnt(ctx);</div><div class='add'>+</div><div class='add'>+	usdt_sib_arg_ret = bpf_usdt_arg(ctx, 0, &amp;tmp);</div><div class='add'>+	usdt_sib_arg = (short)tmp;</div><div class='add'>+	usdt_sib_arg_size = bpf_usdt_arg_size(ctx, 0);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_verify_pkcs7_sig.c b/tools/testing/selftests/bpf/progs/test_verify_pkcs7_sig.c<br/>index 12034a73ee2d..ff8d755548b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_verify_pkcs7_sig.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_verify_pkcs7_sig.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_verify_pkcs7_sig.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_verify_pkcs7_sig.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #define MAX_SIG_SIZE 1024</div><div class='ctx'> </div><div class='ctx'> __u32 monitored_pid;</div><div class='del'>-__u32 user_keyring_serial;</div><div class='add'>+__s32 user_keyring_serial;</div><div class='ctx'> __u64 system_keyring_id;</div><div class='ctx'> </div><div class='ctx'> struct data {</div><div class='hunk'>@@ -37,7 +37,7 @@ struct {</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='ctx'> SEC("lsm.s/bpf")</div><div class='del'>-int BPF_PROG(bpf, int cmd, union bpf_attr *attr, unsigned int size)</div><div class='add'>+int BPF_PROG(bpf, int cmd, union bpf_attr *attr, unsigned int size, bool kernel)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_dynptr data_ptr, sig_ptr;</div><div class='ctx'> 	struct data *data_val;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c b/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c<br/>index dc74d8cf9e3f..5904f45cfbc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c</a></div><div class='hunk'>@@ -19,7 +19,9 @@ int _xdp_adjust_tail_grow(struct xdp_md *xdp)</div><div class='ctx'> 	/* Data length determine test case */</div><div class='ctx'> </div><div class='ctx'> 	if (data_len == 54) { /* sizeof(pkt_v4) */</div><div class='del'>-		offset = 4096; /* test too large offset */</div><div class='add'>+		offset = 4096; /* test too large offset, 4k page size */</div><div class='add'>+	} else if (data_len == 53) { /* sizeof(pkt_v4) - 1 */</div><div class='add'>+		offset = 65536; /* test too large offset, 64k page size */</div><div class='ctx'> 	} else if (data_len == 74) { /* sizeof(pkt_v6) */</div><div class='ctx'> 		offset = 40;</div><div class='ctx'> 	} else if (data_len == 64) {</div><div class='hunk'>@@ -31,6 +33,10 @@ int _xdp_adjust_tail_grow(struct xdp_md *xdp)</div><div class='ctx'> 		offset = 10;</div><div class='ctx'> 	} else if (data_len == 9001) {</div><div class='ctx'> 		offset = 4096;</div><div class='add'>+	} else if (data_len == 90000) {</div><div class='add'>+		offset = 10; /* test a small offset, 64k page size */</div><div class='add'>+	} else if (data_len == 90001) {</div><div class='add'>+		offset = 65536; /* test too large offset, 64k page size */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return XDP_ABORTED; /* No matching test */</div><div class='ctx'> 	}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_xdp_devmap_tailcall.c b/tools/testing/selftests/bpf/progs/test_xdp_devmap_tailcall.c<br/>new file mode 100644<br/>index 000000000000..814e2a980e97<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_xdp_devmap_tailcall.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_xdp_devmap_tailcall.c</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int xdp_devmap(struct xdp_md *ctx)</div><div class='add'>+{</div><div class='add'>+	return ctx-&gt;egress_ifindex;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_PROG_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__uint(key_size, sizeof(__u32));</div><div class='add'>+	__array(values, int (void *));</div><div class='add'>+} xdp_map SEC(".maps") = {</div><div class='add'>+	.values = {</div><div class='add'>+		[0] = (void *)&amp;xdp_devmap,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int xdp_entry(struct xdp_md *ctx)</div><div class='add'>+{</div><div class='add'>+	bpf_tail_call(ctx, &amp;xdp_map, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_xdp_meta.c b/tools/testing/selftests/bpf/progs/test_xdp_meta.c<br/>index fe2d71ae0e71..0a0f371a2dec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_xdp_meta.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_xdp_meta.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_xdp_meta.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_xdp_meta.c</a></div><div class='hunk'>@@ -1,40 +1,320 @@</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/pkt_cls.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;bpf/bpf_endian.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_kfuncs.h"</div><div class='add'>+</div><div class='add'>+#define META_SIZE 32</div><div class='ctx'> </div><div class='del'>-#define __round_mask(x, y) ((__typeof__(x))((y) - 1))</div><div class='del'>-#define round_up(x, y) ((((x) - 1) | __round_mask(x, y)) + 1)</div><div class='ctx'> #define ctx_ptr(ctx, mem) (void *)(unsigned long)ctx-&gt;mem</div><div class='ctx'> </div><div class='add'>+/* Demonstrate passing metadata from XDP to TC using bpf_xdp_adjust_meta.</div><div class='add'>+ *</div><div class='add'>+ * The XDP program extracts a fixed-size payload following the Ethernet header</div><div class='add'>+ * and stores it as packet metadata to test the driver's metadata support. The</div><div class='add'>+ * TC program then verifies if the passed metadata is correct.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+bool test_pass;</div><div class='add'>+</div><div class='add'>+static const __u8 smac_want[ETH_ALEN] = {</div><div class='add'>+	0x12, 0x34, 0xDE, 0xAD, 0xBE, 0xEF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const __u8 meta_want[META_SIZE] = {</div><div class='add'>+	0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,</div><div class='add'>+	0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,</div><div class='add'>+	0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,</div><div class='add'>+	0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool check_smac(const struct ethhdr *eth)</div><div class='add'>+{</div><div class='add'>+	return !__builtin_memcmp(eth-&gt;h_source, smac_want, ETH_ALEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_metadata(const char *file, int line, __u8 *meta_have)</div><div class='add'>+{</div><div class='add'>+	if (!__builtin_memcmp(meta_have, meta_want, META_SIZE))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	bpf_stream_printk(BPF_STREAM_STDERR,</div><div class='add'>+			  "FAIL:%s:%d: metadata mismatch\n"</div><div class='add'>+			  "  have:\n    %pI6\n    %pI6\n"</div><div class='add'>+			  "  want:\n    %pI6\n    %pI6\n",</div><div class='add'>+			  file, line,</div><div class='add'>+			  &amp;meta_have[0x00], &amp;meta_have[0x10],</div><div class='add'>+			  &amp;meta_want[0x00], &amp;meta_want[0x10]);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define check_metadata(meta_have) check_metadata(__FILE__, __LINE__, meta_have)</div><div class='add'>+</div><div class='add'>+static bool check_skb_metadata(const char *file, int line, struct __sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	__u8 *data_meta = ctx_ptr(skb, data_meta);</div><div class='add'>+	__u8 *data = ctx_ptr(skb, data);</div><div class='add'>+</div><div class='add'>+	return data_meta + META_SIZE &lt;= data &amp;&amp; (check_metadata)(file, line, data_meta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define check_skb_metadata(skb) check_skb_metadata(__FILE__, __LINE__, skb)</div><div class='add'>+</div><div class='ctx'> SEC("tc")</div><div class='ctx'> int ing_cls(struct __sk_buff *ctx)</div><div class='ctx'> {</div><div class='del'>-	__u8 *data, *data_meta, *data_end;</div><div class='del'>-	__u32 diff = 0;</div><div class='add'>+	__u8 *meta_have = ctx_ptr(ctx, data_meta);</div><div class='add'>+	__u8 *data = ctx_ptr(ctx, data);</div><div class='ctx'> </div><div class='del'>-	data_meta = ctx_ptr(ctx, data_meta);</div><div class='del'>-	data_end  = ctx_ptr(ctx, data_end);</div><div class='del'>-	data      = ctx_ptr(ctx, data);</div><div class='add'>+	if (meta_have + META_SIZE &gt; data)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read from metadata using bpf_dynptr_read helper */</div><div class='add'>+SEC("tc")</div><div class='add'>+int ing_cls_dynptr_read(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	__u8 meta_have[META_SIZE];</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+	bpf_dynptr_read(meta_have, META_SIZE, &amp;meta, 0, 0);</div><div class='add'>+</div><div class='add'>+	if (!check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (data + ETH_ALEN &gt; data_end ||</div><div class='del'>-	    data_meta + round_up(ETH_ALEN, 4) &gt; data)</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write to metadata using bpf_dynptr_write helper */</div><div class='add'>+SEC("tc")</div><div class='add'>+int ing_cls_dynptr_write(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr data, meta;</div><div class='add'>+	__u8 *src;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb(ctx, 0, &amp;data);</div><div class='add'>+	src = bpf_dynptr_slice(&amp;data, sizeof(struct ethhdr), NULL, META_SIZE);</div><div class='add'>+	if (!src)</div><div class='ctx'> 		return TC_ACT_SHOT;</div><div class='ctx'> </div><div class='del'>-	diff |= ((__u32 *)data_meta)[0] ^ ((__u32 *)data)[0];</div><div class='del'>-	diff |= ((__u16 *)data_meta)[2] ^ ((__u16 *)data)[2];</div><div class='add'>+	bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+	bpf_dynptr_write(&amp;meta, 0, src, META_SIZE, 0);</div><div class='ctx'> </div><div class='del'>-	return diff ? TC_ACT_SHOT : TC_ACT_OK;</div><div class='add'>+	return TC_ACT_UNSPEC; /* pass */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read from metadata using read-only dynptr slice */</div><div class='add'>+SEC("tc")</div><div class='add'>+int ing_cls_dynptr_slice(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 *meta_have;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+	meta_have = bpf_dynptr_slice(&amp;meta, 0, NULL, META_SIZE);</div><div class='add'>+	if (!meta_have)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write to metadata using writeable dynptr slice */</div><div class='add'>+SEC("tc")</div><div class='add'>+int ing_cls_dynptr_slice_rdwr(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr data, meta;</div><div class='add'>+	__u8 *src, *dst;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb(ctx, 0, &amp;data);</div><div class='add'>+	src = bpf_dynptr_slice(&amp;data, sizeof(struct ethhdr), NULL, META_SIZE);</div><div class='add'>+	if (!src)</div><div class='add'>+		return TC_ACT_SHOT;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+	dst = bpf_dynptr_slice_rdwr(&amp;meta, 0, NULL, META_SIZE);</div><div class='add'>+	if (!dst)</div><div class='add'>+		return TC_ACT_SHOT;</div><div class='add'>+</div><div class='add'>+	__builtin_memcpy(dst, src, META_SIZE);</div><div class='add'>+</div><div class='add'>+	return TC_ACT_UNSPEC; /* pass */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read skb metadata in chunks from various offsets in different ways. */</div><div class='add'>+SEC("tc")</div><div class='add'>+int ing_cls_dynptr_offset_rd(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	const __u32 chunk_len = META_SIZE / 4;</div><div class='add'>+	__u8 meta_have[META_SIZE];</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 *dst, *src;</div><div class='add'>+</div><div class='add'>+	dst = meta_have;</div><div class='add'>+</div><div class='add'>+	/* 1. Regular read */</div><div class='add'>+	bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+	bpf_dynptr_read(dst, chunk_len, &amp;meta, 0, 0);</div><div class='add'>+	dst += chunk_len;</div><div class='add'>+</div><div class='add'>+	/* 2. Read from an offset-adjusted dynptr */</div><div class='add'>+	bpf_dynptr_adjust(&amp;meta, chunk_len, bpf_dynptr_size(&amp;meta));</div><div class='add'>+	bpf_dynptr_read(dst, chunk_len, &amp;meta, 0, 0);</div><div class='add'>+	dst += chunk_len;</div><div class='add'>+</div><div class='add'>+	/* 3. Read at an offset */</div><div class='add'>+	bpf_dynptr_read(dst, chunk_len, &amp;meta, chunk_len, 0);</div><div class='add'>+	dst += chunk_len;</div><div class='add'>+</div><div class='add'>+	/* 4. Read from a slice starting at an offset */</div><div class='add'>+	src = bpf_dynptr_slice(&amp;meta, 2 * chunk_len, NULL, chunk_len);</div><div class='add'>+	if (!src)</div><div class='add'>+		goto out;</div><div class='add'>+	__builtin_memcpy(dst, src, chunk_len);</div><div class='add'>+</div><div class='add'>+	if (!check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write skb metadata in chunks at various offsets in different ways. */</div><div class='add'>+SEC("tc")</div><div class='add'>+int ing_cls_dynptr_offset_wr(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	const __u32 chunk_len = META_SIZE / 4;</div><div class='add'>+	__u8 payload[META_SIZE];</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 *dst, *src;</div><div class='add'>+</div><div class='add'>+	bpf_skb_load_bytes(ctx, sizeof(struct ethhdr), payload, sizeof(payload));</div><div class='add'>+	src = payload;</div><div class='add'>+</div><div class='add'>+	/* 1. Regular write */</div><div class='add'>+	bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+	bpf_dynptr_write(&amp;meta, 0, src, chunk_len, 0);</div><div class='add'>+	src += chunk_len;</div><div class='add'>+</div><div class='add'>+	/* 2. Write to an offset-adjusted dynptr */</div><div class='add'>+	bpf_dynptr_adjust(&amp;meta, chunk_len, bpf_dynptr_size(&amp;meta));</div><div class='add'>+	bpf_dynptr_write(&amp;meta, 0, src, chunk_len, 0);</div><div class='add'>+	src += chunk_len;</div><div class='add'>+</div><div class='add'>+	/* 3. Write at an offset */</div><div class='add'>+	bpf_dynptr_write(&amp;meta, chunk_len, src, chunk_len, 0);</div><div class='add'>+	src += chunk_len;</div><div class='add'>+</div><div class='add'>+	/* 4. Write to a slice starting at an offset */</div><div class='add'>+	dst = bpf_dynptr_slice_rdwr(&amp;meta, 2 * chunk_len, NULL, chunk_len);</div><div class='add'>+	if (!dst)</div><div class='add'>+		return TC_ACT_SHOT;</div><div class='add'>+	__builtin_memcpy(dst, src, chunk_len);</div><div class='add'>+</div><div class='add'>+	return TC_ACT_UNSPEC; /* pass */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Pass an OOB offset to dynptr read, write, adjust, slice. */</div><div class='add'>+SEC("tc")</div><div class='add'>+int ing_cls_dynptr_offset_oob(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr meta;</div><div class='add'>+	__u8 md, *p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+	if (err)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* read offset OOB */</div><div class='add'>+	err = bpf_dynptr_read(&amp;md, sizeof(md), &amp;meta, META_SIZE, 0);</div><div class='add'>+	if (err != -E2BIG)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* write offset OOB */</div><div class='add'>+	err = bpf_dynptr_write(&amp;meta, META_SIZE, &amp;md, sizeof(md), 0);</div><div class='add'>+	if (err != -E2BIG)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* adjust end offset OOB */</div><div class='add'>+	err = bpf_dynptr_adjust(&amp;meta, 0, META_SIZE + 1);</div><div class='add'>+	if (err != -ERANGE)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* adjust start offset OOB */</div><div class='add'>+	err = bpf_dynptr_adjust(&amp;meta, META_SIZE + 1, META_SIZE + 1);</div><div class='add'>+	if (err != -ERANGE)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* slice offset OOB */</div><div class='add'>+	p = bpf_dynptr_slice(&amp;meta, META_SIZE, NULL, sizeof(*p));</div><div class='add'>+	if (p)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* slice rdwr offset OOB */</div><div class='add'>+	p = bpf_dynptr_slice_rdwr(&amp;meta, META_SIZE, NULL, sizeof(*p));</div><div class='add'>+	if (p)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	return TC_ACT_UNSPEC;</div><div class='add'>+fail:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reserve and clear space for metadata but don't populate it */</div><div class='add'>+SEC("xdp")</div><div class='add'>+int ing_xdp_zalloc_meta(struct xdp_md *ctx)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *eth = ctx_ptr(ctx, data);</div><div class='add'>+	__u8 *meta;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Drop any non-test packets */</div><div class='add'>+	if (eth + 1 &gt; ctx_ptr(ctx, data_end))</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+	if (!check_smac(eth))</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	ret = bpf_xdp_adjust_meta(ctx, -META_SIZE);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	meta = ctx_ptr(ctx, data_meta);</div><div class='add'>+	if (meta + META_SIZE &gt; ctx_ptr(ctx, data))</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	__builtin_memset(meta, 0, META_SIZE);</div><div class='add'>+</div><div class='add'>+	return XDP_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("xdp")</div><div class='ctx'> int ing_xdp(struct xdp_md *ctx)</div><div class='ctx'> {</div><div class='del'>-	__u8 *data, *data_meta, *data_end;</div><div class='add'>+	__u8 *data, *data_meta, *data_end, *payload;</div><div class='add'>+	struct ethhdr *eth;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = bpf_xdp_adjust_meta(ctx, -round_up(ETH_ALEN, 4));</div><div class='add'>+	ret = bpf_xdp_adjust_meta(ctx, -META_SIZE);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return XDP_DROP;</div><div class='ctx'> </div><div class='hunk'>@@ -42,12 +322,352 @@ int ing_xdp(struct xdp_md *ctx)</div><div class='ctx'> 	data_end  = ctx_ptr(ctx, data_end);</div><div class='ctx'> 	data      = ctx_ptr(ctx, data);</div><div class='ctx'> </div><div class='del'>-	if (data + ETH_ALEN &gt; data_end ||</div><div class='del'>-	    data_meta + round_up(ETH_ALEN, 4) &gt; data)</div><div class='add'>+	eth = (struct ethhdr *)data;</div><div class='add'>+	payload = data + sizeof(struct ethhdr);</div><div class='add'>+</div><div class='add'>+	if (payload + META_SIZE &gt; data_end ||</div><div class='add'>+	    data_meta + META_SIZE &gt; data)</div><div class='ctx'> 		return XDP_DROP;</div><div class='ctx'> </div><div class='del'>-	__builtin_memcpy(data_meta, data, ETH_ALEN);</div><div class='add'>+	/* The Linux networking stack may send other packets on the test</div><div class='add'>+	 * interface that interfere with the test. Just drop them.</div><div class='add'>+	 * The test packets can be recognized by their source MAC address.</div><div class='add'>+	 */</div><div class='add'>+	if (!check_smac(eth))</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	__builtin_memcpy(data_meta, payload, META_SIZE);</div><div class='ctx'> 	return XDP_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Check that, when operating on a cloned packet, skb-&gt;data_meta..skb-&gt;data is</div><div class='add'>+ * kept intact if prog writes to packet _payload_ using packet pointers.</div><div class='add'>+ */</div><div class='add'>+SEC("tc")</div><div class='add'>+int clone_data_meta_survives_data_write(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	__u8 *meta_have = ctx_ptr(ctx, data_meta);</div><div class='add'>+	struct ethhdr *eth = ctx_ptr(ctx, data);</div><div class='add'>+</div><div class='add'>+	if (eth + 1 &gt; ctx_ptr(ctx, data_end))</div><div class='add'>+		goto out;</div><div class='add'>+	/* Ignore non-test packets */</div><div class='add'>+	if (!check_smac(eth))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (meta_have + META_SIZE &gt; eth)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Packet write to trigger unclone in prologue */</div><div class='add'>+	eth-&gt;h_proto = 42;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check that, when operating on a cloned packet, skb-&gt;data_meta..skb-&gt;data is</div><div class='add'>+ * kept intact if prog writes to packet _metadata_ using packet pointers.</div><div class='add'>+ */</div><div class='add'>+SEC("tc")</div><div class='add'>+int clone_data_meta_survives_meta_write(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	__u8 *meta_have = ctx_ptr(ctx, data_meta);</div><div class='add'>+	struct ethhdr *eth = ctx_ptr(ctx, data);</div><div class='add'>+</div><div class='add'>+	if (eth + 1 &gt; ctx_ptr(ctx, data_end))</div><div class='add'>+		goto out;</div><div class='add'>+	/* Ignore non-test packets */</div><div class='add'>+	if (!check_smac(eth))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (meta_have + META_SIZE &gt; eth)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Metadata write to trigger unclone in prologue */</div><div class='add'>+	*meta_have = 42;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check that, when operating on a cloned packet, metadata remains intact if</div><div class='add'>+ * prog creates a r/w slice to packet _payload_.</div><div class='add'>+ */</div><div class='add'>+SEC("tc")</div><div class='add'>+int clone_meta_dynptr_survives_data_slice_write(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr data, meta;</div><div class='add'>+	__u8 meta_have[META_SIZE];</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb(ctx, 0, &amp;data);</div><div class='add'>+	eth = bpf_dynptr_slice_rdwr(&amp;data, 0, NULL, sizeof(*eth));</div><div class='add'>+	if (!eth)</div><div class='add'>+		goto out;</div><div class='add'>+	/* Ignore non-test packets */</div><div class='add'>+	if (!check_smac(eth))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+	bpf_dynptr_read(meta_have, META_SIZE, &amp;meta, 0, 0);</div><div class='add'>+	if (!check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check that, when operating on a cloned packet, metadata remains intact if</div><div class='add'>+ * prog creates an r/w slice to packet _metadata_.</div><div class='add'>+ */</div><div class='add'>+SEC("tc")</div><div class='add'>+int clone_meta_dynptr_survives_meta_slice_write(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr data, meta;</div><div class='add'>+	const struct ethhdr *eth;</div><div class='add'>+	__u8 *meta_have;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb(ctx, 0, &amp;data);</div><div class='add'>+	eth = bpf_dynptr_slice(&amp;data, 0, NULL, sizeof(*eth));</div><div class='add'>+	if (!eth)</div><div class='add'>+		goto out;</div><div class='add'>+	/* Ignore non-test packets */</div><div class='add'>+	if (!check_smac(eth))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+	meta_have = bpf_dynptr_slice_rdwr(&amp;meta, 0, NULL, META_SIZE);</div><div class='add'>+	if (!meta_have)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check that, when operating on a cloned packet, skb_meta dynptr is read-write</div><div class='add'>+ * before prog writes to packet _payload_ using dynptr_write helper and metadata</div><div class='add'>+ * remains intact before and after the write.</div><div class='add'>+ */</div><div class='add'>+SEC("tc")</div><div class='add'>+int clone_meta_dynptr_rw_before_data_dynptr_write(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr data, meta;</div><div class='add'>+	__u8 meta_have[META_SIZE];</div><div class='add'>+	const struct ethhdr *eth;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb(ctx, 0, &amp;data);</div><div class='add'>+	eth = bpf_dynptr_slice(&amp;data, 0, NULL, sizeof(*eth));</div><div class='add'>+	if (!eth)</div><div class='add'>+		goto out;</div><div class='add'>+	/* Ignore non-test packets */</div><div class='add'>+	if (!check_smac(eth))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Expect read-write metadata before unclone */</div><div class='add'>+	bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+	if (bpf_dynptr_is_rdonly(&amp;meta))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_read(meta_have, META_SIZE, &amp;meta, 0, 0);</div><div class='add'>+	if (err || !check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Helper write to payload will unclone the packet */</div><div class='add'>+	bpf_dynptr_write(&amp;data, offsetof(struct ethhdr, h_proto), "x", 1, 0);</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_read(meta_have, META_SIZE, &amp;meta, 0, 0);</div><div class='add'>+	if (err || !check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check that, when operating on a cloned packet, skb_meta dynptr is read-write</div><div class='add'>+ * before prog writes to packet _metadata_ using dynptr_write helper and</div><div class='add'>+ * metadata remains intact before and after the write.</div><div class='add'>+ */</div><div class='add'>+SEC("tc")</div><div class='add'>+int clone_meta_dynptr_rw_before_meta_dynptr_write(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	struct bpf_dynptr data, meta;</div><div class='add'>+	__u8 meta_have[META_SIZE];</div><div class='add'>+	const struct ethhdr *eth;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bpf_dynptr_from_skb(ctx, 0, &amp;data);</div><div class='add'>+	eth = bpf_dynptr_slice(&amp;data, 0, NULL, sizeof(*eth));</div><div class='add'>+	if (!eth)</div><div class='add'>+		goto out;</div><div class='add'>+	/* Ignore non-test packets */</div><div class='add'>+	if (!check_smac(eth))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Expect read-write metadata before unclone */</div><div class='add'>+	bpf_dynptr_from_skb_meta(ctx, 0, &amp;meta);</div><div class='add'>+	if (bpf_dynptr_is_rdonly(&amp;meta))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_read(meta_have, META_SIZE, &amp;meta, 0, 0);</div><div class='add'>+	if (err || !check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Helper write to metadata will unclone the packet */</div><div class='add'>+	bpf_dynptr_write(&amp;meta, 0, &amp;meta_have[0], 1, 0);</div><div class='add'>+</div><div class='add'>+	err = bpf_dynptr_read(meta_have, META_SIZE, &amp;meta, 0, 0);</div><div class='add'>+	if (err || !check_metadata(meta_have))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int helper_skb_vlan_push_pop(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* bpf_skb_vlan_push assumes HW offload for primary VLAN tag. Only</div><div class='add'>+	 * secondary tag push triggers an actual MAC header modification.</div><div class='add'>+	 */</div><div class='add'>+	err = bpf_skb_vlan_push(ctx, 0, 42);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = bpf_skb_vlan_push(ctx, 0, 207);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_skb_metadata(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_skb_vlan_pop(ctx);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = bpf_skb_vlan_pop(ctx);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_skb_metadata(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int helper_skb_adjust_room(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Grow a 1 byte hole after the MAC header */</div><div class='add'>+	err = bpf_skb_adjust_room(ctx, 1, BPF_ADJ_ROOM_MAC, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_skb_metadata(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Shrink a 1 byte hole after the MAC header */</div><div class='add'>+	err = bpf_skb_adjust_room(ctx, -1, BPF_ADJ_ROOM_MAC, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_skb_metadata(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Grow a 256 byte hole to trigger head reallocation */</div><div class='add'>+	err = bpf_skb_adjust_room(ctx, 256, BPF_ADJ_ROOM_MAC, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_skb_metadata(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int helper_skb_change_head_tail(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Reserve 1 extra in the front for packet data */</div><div class='add'>+	err = bpf_skb_change_head(ctx, 1, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_skb_metadata(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Reserve 256 extra bytes in the front to trigger head reallocation */</div><div class='add'>+	err = bpf_skb_change_head(ctx, 256, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_skb_metadata(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Reserve 4k extra bytes in the back to trigger head reallocation */</div><div class='add'>+	err = bpf_skb_change_tail(ctx, ctx-&gt;len + 4096, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_skb_metadata(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+int helper_skb_change_proto(struct __sk_buff *ctx)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bpf_skb_change_proto(ctx, bpf_htons(ETH_P_IPV6), 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_skb_metadata(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = bpf_skb_change_proto(ctx, bpf_htons(ETH_P_IP), 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!check_skb_metadata(ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	test_pass = true;</div><div class='add'>+out:</div><div class='add'>+	return TC_ACT_SHOT;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_xdp_pull_data.c b/tools/testing/selftests/bpf/progs/test_xdp_pull_data.c<br/>new file mode 100644<br/>index 000000000000..c41a21413eaa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_xdp_pull_data.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_xdp_pull_data.c</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include "vmlinux.h"</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+</div><div class='add'>+int xdpf_sz;</div><div class='add'>+int sinfo_sz;</div><div class='add'>+int data_len;</div><div class='add'>+int pull_len;</div><div class='add'>+</div><div class='add'>+#define XDP_PACKET_HEADROOM 256</div><div class='add'>+</div><div class='add'>+SEC("xdp.frags")</div><div class='add'>+int xdp_find_sizes(struct xdp_md *ctx)</div><div class='add'>+{</div><div class='add'>+	xdpf_sz = sizeof(struct xdp_frame);</div><div class='add'>+	sinfo_sz = __PAGE_SIZE - XDP_PACKET_HEADROOM -</div><div class='add'>+		   (ctx-&gt;data_end - ctx-&gt;data);</div><div class='add'>+</div><div class='add'>+	return XDP_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp.frags")</div><div class='add'>+int xdp_pull_data_prog(struct xdp_md *ctx)</div><div class='add'>+{</div><div class='add'>+	__u8 *data_end = (void *)(long)ctx-&gt;data_end;</div><div class='add'>+	__u8 *data = (void *)(long)ctx-&gt;data;</div><div class='add'>+	__u8 *val_p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (data_len != data_end - data)</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	err = bpf_xdp_pull_data(ctx, pull_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	val_p = (void *)(long)ctx-&gt;data + 1024;</div><div class='add'>+	if (val_p + 1 &gt; (void *)(long)ctx-&gt;data_end)</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	if (*val_p != 0xbb)</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	return XDP_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/test_xdp_vlan.c b/tools/testing/selftests/bpf/progs/test_xdp_vlan.c<br/>index a7588302268d..a80cc5f2f4f2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_xdp_vlan.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/test_xdp_vlan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/test_xdp_vlan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/test_xdp_vlan.c</a></div><div class='hunk'>@@ -102,8 +102,8 @@ bool parse_eth_frame(struct ethhdr *eth, void *data_end, struct parse_pkt *pkt)</div><div class='ctx'> #define TESTVLAN 4011 /* 0xFAB */</div><div class='ctx'> // #define TO_VLAN  4000 /* 0xFA0 (hint 0xOA0 = 160) */</div><div class='ctx'> </div><div class='del'>-SEC("xdp_drop_vlan_4011")</div><div class='del'>-int  xdp_prognum0(struct xdp_md *ctx)</div><div class='add'>+SEC("xdp")</div><div class='add'>+int xdp_drop_vlan_4011(struct xdp_md *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	void *data_end = (void *)(long)ctx-&gt;data_end;</div><div class='ctx'> 	void *data     = (void *)(long)ctx-&gt;data;</div><div class='hunk'>@@ -144,8 +144,8 @@ Load prog with ip tool:</div><div class='ctx'> /* Changing VLAN to zero, have same practical effect as removing the VLAN. */</div><div class='ctx'> #define TO_VLAN	0</div><div class='ctx'> </div><div class='del'>-SEC("xdp_vlan_change")</div><div class='del'>-int  xdp_prognum1(struct xdp_md *ctx)</div><div class='add'>+SEC("xdp")</div><div class='add'>+int xdp_vlan_change(struct xdp_md *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	void *data_end = (void *)(long)ctx-&gt;data_end;</div><div class='ctx'> 	void *data     = (void *)(long)ctx-&gt;data;</div><div class='hunk'>@@ -178,8 +178,8 @@ int  xdp_prognum1(struct xdp_md *ctx)</div><div class='ctx'> #endif</div><div class='ctx'> #define VLAN_HDR_SZ	4	/* bytes */</div><div class='ctx'> </div><div class='del'>-SEC("xdp_vlan_remove_outer")</div><div class='del'>-int  xdp_prognum2(struct xdp_md *ctx)</div><div class='add'>+SEC("xdp")</div><div class='add'>+int xdp_vlan_remove_outer(struct xdp_md *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	void *data_end = (void *)(long)ctx-&gt;data_end;</div><div class='ctx'> 	void *data     = (void *)(long)ctx-&gt;data;</div><div class='hunk'>@@ -224,8 +224,8 @@ void shift_mac_4bytes_32bit(void *data)</div><div class='ctx'> 	p[1] = p[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("xdp_vlan_remove_outer2")</div><div class='del'>-int  xdp_prognum3(struct xdp_md *ctx)</div><div class='add'>+SEC("xdp")</div><div class='add'>+int xdp_vlan_remove_outer2(struct xdp_md *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	void *data_end = (void *)(long)ctx-&gt;data_end;</div><div class='ctx'> 	void *data     = (void *)(long)ctx-&gt;data;</div><div class='hunk'>@@ -254,8 +254,8 @@ int  xdp_prognum3(struct xdp_md *ctx)</div><div class='ctx'>  * The TC-clsact eBPF programs (currently) need to be attach via TC commands</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-SEC("tc_vlan_push")</div><div class='del'>-int _tc_progA(struct __sk_buff *ctx)</div><div class='add'>+SEC("tc")</div><div class='add'>+int tc_vlan_push(struct __sk_buff *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	bpf_skb_vlan_push(ctx, bpf_htons(ETH_P_8021Q), TESTVLAN);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/timer_interrupt.c b/tools/testing/selftests/bpf/progs/timer_interrupt.c<br/>new file mode 100644<br/>index 000000000000..19180a455f40<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/timer_interrupt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/timer_interrupt.c</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+#define CLOCK_MONOTONIC		1</div><div class='add'>+</div><div class='add'>+int preempt_count;</div><div class='add'>+int in_interrupt;</div><div class='add'>+int in_interrupt_cb;</div><div class='add'>+</div><div class='add'>+struct elem {</div><div class='add'>+	struct bpf_timer t;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct elem);</div><div class='add'>+} array SEC(".maps");</div><div class='add'>+</div><div class='add'>+static int timer_in_interrupt(void *map, int *key, struct bpf_timer *timer)</div><div class='add'>+{</div><div class='add'>+	preempt_count = get_preempt_count();</div><div class='add'>+	in_interrupt_cb = bpf_in_interrupt();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry/bpf_fentry_test1")</div><div class='add'>+int BPF_PROG(test_timer_interrupt)</div><div class='add'>+{</div><div class='add'>+	struct bpf_timer *timer;</div><div class='add'>+	int key = 0;</div><div class='add'>+</div><div class='add'>+	timer = bpf_map_lookup_elem(&amp;array, &amp;key);</div><div class='add'>+	if (!timer)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	in_interrupt = bpf_in_interrupt();</div><div class='add'>+	bpf_timer_init(timer, &amp;array, CLOCK_MONOTONIC);</div><div class='add'>+	bpf_timer_set_callback(timer, timer_in_interrupt);</div><div class='add'>+	bpf_timer_start(timer, 0, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/tracing_failure.c b/tools/testing/selftests/bpf/progs/tracing_failure.c<br/>index d41665d2ec8c..65e485c4468c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tracing_failure.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tracing_failure.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tracing_failure.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/tracing_failure.c</a></div><div class='hunk'>@@ -18,3 +18,15 @@ int BPF_PROG(test_spin_unlock, struct bpf_spin_lock *lock)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+SEC("?fentry/__rcu_read_lock")</div><div class='add'>+int BPF_PROG(tracing_deny)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?fexit/do_exit")</div><div class='add'>+int BPF_PROG(fexit_noreturns)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/tracing_struct.c b/tools/testing/selftests/bpf/progs/tracing_struct.c<br/>index c435a3a8328a..d460732e2023 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tracing_struct.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/tracing_struct.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/tracing_struct.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/tracing_struct.c</a></div><div class='hunk'>@@ -18,6 +18,18 @@ struct bpf_testmod_struct_arg_3 {</div><div class='ctx'> 	int b[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+union bpf_testmod_union_arg_1 {</div><div class='add'>+	char a;</div><div class='add'>+	short b;</div><div class='add'>+	struct bpf_testmod_struct_arg_1 arg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union bpf_testmod_union_arg_2 {</div><div class='add'>+	int a;</div><div class='add'>+	long b;</div><div class='add'>+	struct bpf_testmod_struct_arg_2 arg;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> long t1_a_a, t1_a_b, t1_b, t1_c, t1_ret, t1_nregs;</div><div class='ctx'> __u64 t1_reg0, t1_reg1, t1_reg2, t1_reg3;</div><div class='ctx'> long t2_a, t2_b_a, t2_b_b, t2_c, t2_ret;</div><div class='hunk'>@@ -26,6 +38,9 @@ long t4_a_a, t4_b, t4_c, t4_d, t4_e_a, t4_e_b, t4_ret;</div><div class='ctx'> long t5_ret;</div><div class='ctx'> int t6;</div><div class='ctx'> </div><div class='add'>+long ut1_a_a, ut1_b, ut1_c;</div><div class='add'>+long ut2_a, ut2_b_a, ut2_b_b;</div><div class='add'>+</div><div class='ctx'> SEC("fentry/bpf_testmod_test_struct_arg_1")</div><div class='ctx'> int BPF_PROG2(test_struct_arg_1, struct bpf_testmod_struct_arg_2, a, int, b, int, c)</div><div class='ctx'> {</div><div class='hunk'>@@ -130,4 +145,22 @@ int BPF_PROG2(test_struct_arg_11, struct bpf_testmod_struct_arg_3 *, a)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("fexit/bpf_testmod_test_union_arg_1")</div><div class='add'>+int BPF_PROG2(test_union_arg_1, union bpf_testmod_union_arg_1, a, int, b, int, c)</div><div class='add'>+{</div><div class='add'>+	ut1_a_a = a.arg.a;</div><div class='add'>+	ut1_b = b;</div><div class='add'>+	ut1_c = c;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fexit/bpf_testmod_test_union_arg_2")</div><div class='add'>+int BPF_PROG2(test_union_arg_2, int, a, union bpf_testmod_union_arg_2, b)</div><div class='add'>+{</div><div class='add'>+	ut2_a = a;</div><div class='add'>+	ut2_b_a = b.arg.a;</div><div class='add'>+	ut2_b_b = b.arg.b;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/trigger_bench.c b/tools/testing/selftests/bpf/progs/trigger_bench.c<br/>index 044a6d78923e..2898b3749d07 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/trigger_bench.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/trigger_bench.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/trigger_bench.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/trigger_bench.c</a></div><div class='hunk'>@@ -42,12 +42,14 @@ int bench_trigger_uprobe_multi(void *ctx)</div><div class='ctx'> const volatile int batch_iters = 0;</div><div class='ctx'> </div><div class='ctx'> SEC("?raw_tp")</div><div class='del'>-int trigger_count(void *ctx)</div><div class='add'>+int trigger_kernel_count(void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; batch_iters; i++)</div><div class='add'>+	for (i = 0; i &lt; batch_iters; i++) {</div><div class='ctx'> 		inc_counter();</div><div class='add'>+		bpf_get_numa_node_id();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -97,6 +99,12 @@ int bench_trigger_kprobe_multi(void *ctx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("?kprobe.multi/bpf_get_numa_node_id")</div><div class='add'>+int bench_kprobe_multi_empty(void *ctx)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> SEC("?kretprobe.multi/bpf_get_numa_node_id")</div><div class='ctx'> int bench_trigger_kretprobe_multi(void *ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -104,6 +112,12 @@ int bench_trigger_kretprobe_multi(void *ctx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("?kretprobe.multi/bpf_get_numa_node_id")</div><div class='add'>+int bench_kretprobe_multi_empty(void *ctx)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> SEC("?fentry/bpf_get_numa_node_id")</div><div class='ctx'> int bench_trigger_fentry(void *ctx)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/uprobe_syscall.c b/tools/testing/selftests/bpf/progs/uprobe_syscall.c<br/>index 8a4fa6c7ef59..e08c31669e5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/uprobe_syscall.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/uprobe_syscall.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/uprobe_syscall.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/uprobe_syscall.c</a></div><div class='hunk'>@@ -7,8 +7,8 @@ struct pt_regs regs;</div><div class='ctx'> </div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='del'>-SEC("uretprobe//proc/self/exe:uretprobe_regs_trigger")</div><div class='del'>-int uretprobe(struct pt_regs *ctx)</div><div class='add'>+SEC("uprobe")</div><div class='add'>+int probe(struct pt_regs *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	__builtin_memcpy(&amp;regs, ctx, sizeof(regs));</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/uprobe_syscall_executed.c b/tools/testing/selftests/bpf/progs/uprobe_syscall_executed.c<br/>index 0d7f1a7db2e2..915d38591bf6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/uprobe_syscall_executed.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/uprobe_syscall_executed.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/uprobe_syscall_executed.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/uprobe_syscall_executed.c</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include "vmlinux.h"</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include &lt;bpf/usdt.bpf.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct pt_regs regs;</div><div class='hunk'>@@ -8,10 +10,64 @@ struct pt_regs regs;</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='ctx'> </div><div class='ctx'> int executed = 0;</div><div class='add'>+int pid;</div><div class='add'>+</div><div class='add'>+SEC("uprobe")</div><div class='add'>+int BPF_UPROBE(test_uprobe)</div><div class='add'>+{</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	executed++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("uretprobe")</div><div class='add'>+int BPF_URETPROBE(test_uretprobe)</div><div class='add'>+{</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	executed++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("uprobe.multi")</div><div class='add'>+int test_uprobe_multi(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	executed++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> SEC("uretprobe.multi")</div><div class='del'>-int test(struct pt_regs *regs)</div><div class='add'>+int test_uretprobe_multi(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	executed++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("uprobe.session")</div><div class='add'>+int test_uprobe_session(struct pt_regs *ctx)</div><div class='ctx'> {</div><div class='del'>-	executed = 1;</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	executed++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("usdt")</div><div class='add'>+int test_usdt(struct pt_regs *ctx)</div><div class='add'>+{</div><div class='add'>+	if (bpf_get_current_pid_tgid() &gt;&gt; 32 != pid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	executed++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/uretprobe_stack.c b/tools/testing/selftests/bpf/progs/uretprobe_stack.c<br/>index 9fdcf396b8f4..a2951e2f1711 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/uretprobe_stack.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/uretprobe_stack.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/uretprobe_stack.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/uretprobe_stack.c</a></div><div class='hunk'>@@ -26,8 +26,8 @@ int usdt_len;</div><div class='ctx'> SEC("uprobe//proc/self/exe:target_1")</div><div class='ctx'> int BPF_UPROBE(uprobe_1)</div><div class='ctx'> {</div><div class='del'>-	/* target_1 is recursive wit depth of 2, so we capture two separate</div><div class='del'>-	 * stack traces, depending on which occurence it is</div><div class='add'>+	/* target_1 is recursive with depth of 2, so we capture two separate</div><div class='add'>+	 * stack traces, depending on which occurrence it is</div><div class='ctx'> 	 */</div><div class='ctx'> 	static bool recur = false;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_and.c b/tools/testing/selftests/bpf/progs/verifier_and.c<br/>index e97e518516b6..2b4fdca162be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_and.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_and.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_and.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_and.c</a></div><div class='hunk'>@@ -85,8 +85,14 @@ l0_%=:	r0 = r0;					\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("check known subreg with unknown reg")</div><div class='del'>-__success __failure_unpriv __msg_unpriv("R1 !read_ok")</div><div class='add'>+__success __success_unpriv</div><div class='ctx'> __retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("if w0 &lt; 0x1 goto pc+2")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `R1 !read_ok'` */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* `r1 = *(u32*)(r1 + 512)`, sanitized dead code */</div><div class='add'>+__xlated_unpriv("r0 = 0")</div><div class='add'>+#endif</div><div class='ctx'> __naked void known_subreg_with_unknown_reg(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_arena.c b/tools/testing/selftests/bpf/progs/verifier_arena.c<br/>index 67509c5d3982..7f4827eede3c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_arena.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_arena.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_arena.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_arena.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #define BPF_NO_KFUNC_PROTOTYPES</div><div class='ctx'> #include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='hunk'>@@ -114,6 +115,111 @@ int basic_alloc3(void *ctx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("syscall")</div><div class='add'>+__success __retval(0)</div><div class='add'>+int basic_reserve1(void *ctx)</div><div class='add'>+{</div><div class='add'>+#if defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='add'>+	char __arena *page;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	page = bpf_arena_alloc_pages(&amp;arena, NULL, 1, NUMA_NO_NODE, 0);</div><div class='add'>+	if (!page)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	page += __PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	/* Reserve the second page */</div><div class='add'>+	ret = bpf_arena_reserve_pages(&amp;arena, page, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 2;</div><div class='add'>+</div><div class='add'>+	/* Try to explicitly allocate the reserved page. */</div><div class='add'>+	page = bpf_arena_alloc_pages(&amp;arena, page, 1, NUMA_NO_NODE, 0);</div><div class='add'>+	if (page)</div><div class='add'>+		return 3;</div><div class='add'>+</div><div class='add'>+	/* Try to implicitly allocate the page (since there's only 2 of them). */</div><div class='add'>+	page = bpf_arena_alloc_pages(&amp;arena, NULL, 1, NUMA_NO_NODE, 0);</div><div class='add'>+	if (page)</div><div class='add'>+		return 4;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__success __retval(0)</div><div class='add'>+int basic_reserve2(void *ctx)</div><div class='add'>+{</div><div class='add'>+#if defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='add'>+	char __arena *page;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	page = arena_base(&amp;arena);</div><div class='add'>+	ret = bpf_arena_reserve_pages(&amp;arena, page, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	page = bpf_arena_alloc_pages(&amp;arena, page, 1, NUMA_NO_NODE, 0);</div><div class='add'>+	if ((u64)page)</div><div class='add'>+		return 2;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reserve the same page twice, should return -EBUSY. */</div><div class='add'>+SEC("syscall")</div><div class='add'>+__success __retval(0)</div><div class='add'>+int reserve_twice(void *ctx)</div><div class='add'>+{</div><div class='add'>+#if defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='add'>+	char __arena *page;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	page = arena_base(&amp;arena);</div><div class='add'>+</div><div class='add'>+	ret = bpf_arena_reserve_pages(&amp;arena, page, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	ret = bpf_arena_reserve_pages(&amp;arena, page, 1);</div><div class='add'>+	if (ret != -EBUSY)</div><div class='add'>+		return 2;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Try to reserve past the end of the arena. */</div><div class='add'>+SEC("syscall")</div><div class='add'>+__success __retval(0)</div><div class='add'>+int reserve_invalid_region(void *ctx)</div><div class='add'>+{</div><div class='add'>+#if defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='add'>+	char __arena *page;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Try a NULL pointer. */</div><div class='add'>+	ret = bpf_arena_reserve_pages(&amp;arena, NULL, 3);</div><div class='add'>+	if (ret != -EINVAL)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	page = arena_base(&amp;arena);</div><div class='add'>+</div><div class='add'>+	ret = bpf_arena_reserve_pages(&amp;arena, page, 3);</div><div class='add'>+	if (ret != -EINVAL)</div><div class='add'>+		return 2;</div><div class='add'>+</div><div class='add'>+	ret = bpf_arena_reserve_pages(&amp;arena, page, 4096);</div><div class='add'>+	if (ret != -EINVAL)</div><div class='add'>+		return 3;</div><div class='add'>+</div><div class='add'>+	ret = bpf_arena_reserve_pages(&amp;arena, page, (1ULL &lt;&lt; 32) - 1);</div><div class='add'>+	if (ret != -EINVAL)</div><div class='add'>+		return 4;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> SEC("iter.s/bpf_map")</div><div class='ctx'> __success __log_level(2)</div><div class='ctx'> int iter_maps1(struct bpf_iter__bpf_map *ctx)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_arena_large.c b/tools/testing/selftests/bpf/progs/verifier_arena_large.c<br/>index f94f30cf1bb8..f19e15400b3e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_arena_large.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_arena_large.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_arena_large.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_arena_large.c</a></div><div class='hunk'>@@ -67,6 +67,104 @@ int big_alloc1(void *ctx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Try to access a reserved page. Behavior should be identical with accessing unallocated pages. */</div><div class='add'>+SEC("syscall")</div><div class='add'>+__success __retval(0)</div><div class='add'>+int access_reserved(void *ctx)</div><div class='add'>+{</div><div class='add'>+#if defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='add'>+	volatile char __arena *page;</div><div class='add'>+	char __arena *base;</div><div class='add'>+	const size_t len = 4;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	/* Get a separate region of the arena. */</div><div class='add'>+	page = base = arena_base(&amp;arena) + 16384 * PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	ret = bpf_arena_reserve_pages(&amp;arena, base, len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* Try to dirty reserved memory. */</div><div class='add'>+	for (i = 0; i &lt; len &amp;&amp; can_loop; i++)</div><div class='add'>+		*page = 0x5a;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len &amp;&amp; can_loop; i++) {</div><div class='add'>+		page = (volatile char __arena *)(base + i * PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Error out in case either the write went through,</div><div class='add'>+		 * or the address has random garbage.</div><div class='add'>+		 */</div><div class='add'>+		if (*page == 0x5a)</div><div class='add'>+			return 2 + 2 * i;</div><div class='add'>+</div><div class='add'>+		if (*page)</div><div class='add'>+			return 2 + 2 * i + 1;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Try to allocate a region overlapping with a reservation. */</div><div class='add'>+SEC("syscall")</div><div class='add'>+__success __retval(0)</div><div class='add'>+int request_partially_reserved(void *ctx)</div><div class='add'>+{</div><div class='add'>+#if defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='add'>+	volatile char __arena *page;</div><div class='add'>+	char __arena *base;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Add an arbitrary page offset. */</div><div class='add'>+	page = base = arena_base(&amp;arena) + 4096 * __PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	ret = bpf_arena_reserve_pages(&amp;arena, base + 3 * __PAGE_SIZE, 4);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	page = bpf_arena_alloc_pages(&amp;arena, base, 5, NUMA_NO_NODE, 0);</div><div class='add'>+	if ((u64)page != 0ULL)</div><div class='add'>+		return 2;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__success __retval(0)</div><div class='add'>+int free_reserved(void *ctx)</div><div class='add'>+{</div><div class='add'>+#if defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='add'>+	char __arena *addr;</div><div class='add'>+	char __arena *page;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Add an arbitrary page offset. */</div><div class='add'>+	addr = arena_base(&amp;arena) + 32768 * __PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+	page = bpf_arena_alloc_pages(&amp;arena, addr, 2, NUMA_NO_NODE, 0);</div><div class='add'>+	if (!page)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	ret = bpf_arena_reserve_pages(&amp;arena, addr + 2 * __PAGE_SIZE, 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 2;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reserved and allocated pages should be interchangeable for</div><div class='add'>+	 * bpf_arena_free_pages(). Free a reserved and an allocated</div><div class='add'>+	 * page with a single call.</div><div class='add'>+	 */</div><div class='add'>+	bpf_arena_free_pages(&amp;arena, addr + __PAGE_SIZE , 2);</div><div class='add'>+</div><div class='add'>+	/* The free call above should have succeeded, so this allocation should too. */</div><div class='add'>+	page = bpf_arena_alloc_pages(&amp;arena, addr + __PAGE_SIZE, 2, NUMA_NO_NODE, 0);</div><div class='add'>+	if (!page)</div><div class='add'>+		return 3;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #if defined(__BPF_FEATURE_ADDR_SPACE_CAST)</div><div class='ctx'> #define PAGE_CNT 100</div><div class='ctx'> __u8 __arena * __arena page[PAGE_CNT]; /* occupies the first page */</div><div class='hunk'>@@ -142,6 +240,7 @@ int big_alloc2(void *ctx)</div><div class='ctx'> 			return 5;</div><div class='ctx'> 		bpf_arena_free_pages(&amp;arena, (void __arena *)pg, 2);</div><div class='ctx'> 		page[i] = NULL;</div><div class='add'>+		barrier();</div><div class='ctx'> 		page[i + 1] = NULL;</div><div class='ctx'> 		cond_break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_array_access.c b/tools/testing/selftests/bpf/progs/verifier_array_access.c<br/>index 29eb9568633f..0a187ff725cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_array_access.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_array_access.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_array_access.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_array_access.c</a></div><div class='hunk'>@@ -713,4 +713,19 @@ unsigned int non_stack_key_lookup(void)</div><div class='ctx'> 	return val-&gt;index;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("socket")</div><div class='add'>+__description("doesn't reject UINT64_MAX as s64 for irrelevant maps")</div><div class='add'>+__success __retval(42)</div><div class='add'>+unsigned int doesnt_reject_irrelevant_maps(void)</div><div class='add'>+{</div><div class='add'>+	__u64 key = 0xFFFFFFFFFFFFFFFF;</div><div class='add'>+	struct test_val *val;</div><div class='add'>+</div><div class='add'>+	val = bpf_map_lookup_elem(&amp;map_hash_48b, &amp;key);</div><div class='add'>+	if (val)</div><div class='add'>+		return val-&gt;index;</div><div class='add'>+</div><div class='add'>+	return 42;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_async_cb_context.c b/tools/testing/selftests/bpf/progs/verifier_async_cb_context.c<br/>new file mode 100644<br/>index 000000000000..7efa9521105e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_async_cb_context.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_async_cb_context.c</a></div><div class='hunk'>@@ -0,0 +1,181 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "bpf_experimental.h"</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='add'>+</div><div class='add'>+/* Timer tests */</div><div class='add'>+</div><div class='add'>+struct timer_elem {</div><div class='add'>+	struct bpf_timer t;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct timer_elem);</div><div class='add'>+} timer_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+static int timer_cb(void *map, int *key, struct bpf_timer *timer)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	/* Timer callbacks are never sleepable, even from non-sleepable programs */</div><div class='add'>+	bpf_copy_from_user(&amp;data, sizeof(data), NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry/bpf_fentry_test1")</div><div class='add'>+__failure __msg("helper call might sleep in a non-sleepable prog")</div><div class='add'>+int timer_non_sleepable_prog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct timer_elem *val;</div><div class='add'>+	int key = 0;</div><div class='add'>+</div><div class='add'>+	val = bpf_map_lookup_elem(&amp;timer_map, &amp;key);</div><div class='add'>+	if (!val)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_timer_init(&amp;val-&gt;t, &amp;timer_map, 0);</div><div class='add'>+	bpf_timer_set_callback(&amp;val-&gt;t, timer_cb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/file_open")</div><div class='add'>+__failure __msg("helper call might sleep in a non-sleepable prog")</div><div class='add'>+int timer_sleepable_prog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct timer_elem *val;</div><div class='add'>+	int key = 0;</div><div class='add'>+</div><div class='add'>+	val = bpf_map_lookup_elem(&amp;timer_map, &amp;key);</div><div class='add'>+	if (!val)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_timer_init(&amp;val-&gt;t, &amp;timer_map, 0);</div><div class='add'>+	bpf_timer_set_callback(&amp;val-&gt;t, timer_cb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Workqueue tests */</div><div class='add'>+</div><div class='add'>+struct wq_elem {</div><div class='add'>+	struct bpf_wq w;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct wq_elem);</div><div class='add'>+} wq_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+static int wq_cb(void *map, int *key, void *value)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	/* Workqueue callbacks are always sleepable, even from non-sleepable programs */</div><div class='add'>+	bpf_copy_from_user(&amp;data, sizeof(data), NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry/bpf_fentry_test1")</div><div class='add'>+__success</div><div class='add'>+int wq_non_sleepable_prog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct wq_elem *val;</div><div class='add'>+	int key = 0;</div><div class='add'>+</div><div class='add'>+	val = bpf_map_lookup_elem(&amp;wq_map, &amp;key);</div><div class='add'>+	if (!val)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (bpf_wq_init(&amp;val-&gt;w, &amp;wq_map, 0) != 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_wq_set_callback_impl(&amp;val-&gt;w, wq_cb, 0, NULL) != 0)</div><div class='add'>+		return 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/file_open")</div><div class='add'>+__success</div><div class='add'>+int wq_sleepable_prog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct wq_elem *val;</div><div class='add'>+	int key = 0;</div><div class='add'>+</div><div class='add'>+	val = bpf_map_lookup_elem(&amp;wq_map, &amp;key);</div><div class='add'>+	if (!val)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (bpf_wq_init(&amp;val-&gt;w, &amp;wq_map, 0) != 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (bpf_wq_set_callback_impl(&amp;val-&gt;w, wq_cb, 0, NULL) != 0)</div><div class='add'>+		return 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Task work tests */</div><div class='add'>+</div><div class='add'>+struct task_work_elem {</div><div class='add'>+	struct bpf_task_work tw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, struct task_work_elem);</div><div class='add'>+} task_work_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+static int task_work_cb(struct bpf_map *map, void *key, void *value)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	/* Task work callbacks are always sleepable, even from non-sleepable programs */</div><div class='add'>+	bpf_copy_from_user(&amp;data, sizeof(data), NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("fentry/bpf_fentry_test1")</div><div class='add'>+__success</div><div class='add'>+int task_work_non_sleepable_prog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_work_elem *val;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	int key = 0;</div><div class='add'>+</div><div class='add'>+	val = bpf_map_lookup_elem(&amp;task_work_map, &amp;key);</div><div class='add'>+	if (!val)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	if (!task)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_task_work_schedule_resume_impl(task, &amp;val-&gt;tw, &amp;task_work_map, task_work_cb, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/file_open")</div><div class='add'>+__success</div><div class='add'>+int task_work_sleepable_prog(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct task_work_elem *val;</div><div class='add'>+	struct task_struct *task;</div><div class='add'>+	int key = 0;</div><div class='add'>+</div><div class='add'>+	val = bpf_map_lookup_elem(&amp;task_work_map, &amp;key);</div><div class='add'>+	if (!val)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	task = bpf_get_current_task_btf();</div><div class='add'>+	if (!task)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bpf_task_work_schedule_resume_impl(task, &amp;val-&gt;tw, &amp;task_work_map, task_work_cb, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_bounds.c b/tools/testing/selftests/bpf/progs/verifier_bounds.c<br/>index 0eb33bb801b5..411a18437d7e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_bounds.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_bounds.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_bounds.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_bounds.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /* Converted from tools/testing/selftests/bpf/verifier/bounds.c */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;../../../include/linux/filter.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='ctx'> </div><div class='hunk'>@@ -620,8 +621,14 @@ l1_%=:	exit;						\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("bounds check mixed 32bit and 64bit arithmetic. test1")</div><div class='del'>-__success __failure_unpriv __msg_unpriv("R0 invalid mem access 'scalar'")</div><div class='add'>+__success __success_unpriv</div><div class='ctx'> __retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("goto pc+2")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `R0 invalid mem access 'scalar'` */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* sanitized dead code */</div><div class='add'>+__xlated_unpriv("exit")</div><div class='add'>+#endif</div><div class='ctx'> __naked void _32bit_and_64bit_arithmetic_test1(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -643,8 +650,14 @@ l1_%=:	exit;						\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("bounds check mixed 32bit and 64bit arithmetic. test2")</div><div class='del'>-__success __failure_unpriv __msg_unpriv("R0 invalid mem access 'scalar'")</div><div class='add'>+__success __success_unpriv</div><div class='ctx'> __retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("goto pc+2")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `R0 invalid mem access 'scalar'` */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* sanitized dead code */</div><div class='add'>+__xlated_unpriv("exit")</div><div class='add'>+#endif</div><div class='ctx'> __naked void _32bit_and_64bit_arithmetic_test2(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -691,9 +704,14 @@ l0_%=:	r0 = 0;						\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("bounds check for reg = 0, reg xor 1")</div><div class='del'>-__success __failure_unpriv</div><div class='del'>-__msg_unpriv("R0 min value is outside of the allowed memory range")</div><div class='add'>+__success __success_unpriv</div><div class='ctx'> __retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("if r1 != 0x0 goto pc+2")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `R0 min value is outside of the allowed memory range` */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* sanitized dead code */</div><div class='add'>+__xlated_unpriv("r0 = 0")</div><div class='add'>+#endif</div><div class='ctx'> __naked void reg_0_reg_xor_1(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -719,9 +737,14 @@ l1_%=:	r0 = 0;						\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("bounds check for reg32 = 0, reg32 xor 1")</div><div class='del'>-__success __failure_unpriv</div><div class='del'>-__msg_unpriv("R0 min value is outside of the allowed memory range")</div><div class='add'>+__success __success_unpriv</div><div class='ctx'> __retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("if w1 != 0x0 goto pc+2")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `R0 min value is outside of the allowed memory range` */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* sanitized dead code */</div><div class='add'>+__xlated_unpriv("r0 = 0")</div><div class='add'>+#endif</div><div class='ctx'> __naked void reg32_0_reg32_xor_1(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -747,9 +770,14 @@ l1_%=:	r0 = 0;						\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("bounds check for reg = 2, reg xor 3")</div><div class='del'>-__success __failure_unpriv</div><div class='del'>-__msg_unpriv("R0 min value is outside of the allowed memory range")</div><div class='add'>+__success __success_unpriv</div><div class='ctx'> __retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("if r1 &gt; 0x0 goto pc+2")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `R0 min value is outside of the allowed memory range` */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* sanitized dead code */</div><div class='add'>+__xlated_unpriv("r0 = 0")</div><div class='add'>+#endif</div><div class='ctx'> __naked void reg_2_reg_xor_3(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -829,9 +857,14 @@ l1_%=:	r0 = 0;						\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("bounds check for reg &gt; 0, reg xor 3")</div><div class='del'>-__success __failure_unpriv</div><div class='del'>-__msg_unpriv("R0 min value is outside of the allowed memory range")</div><div class='add'>+__success __success_unpriv</div><div class='ctx'> __retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("if r1 &gt;= 0x0 goto pc+2")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `R0 min value is outside of the allowed memory range` */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* sanitized dead code */</div><div class='add'>+__xlated_unpriv("r0 = 0")</div><div class='add'>+#endif</div><div class='ctx'> __naked void reg_0_reg_xor_3(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -858,9 +891,14 @@ l1_%=:	r0 = 0;						\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("bounds check for reg32 &gt; 0, reg32 xor 3")</div><div class='del'>-__success __failure_unpriv</div><div class='del'>-__msg_unpriv("R0 min value is outside of the allowed memory range")</div><div class='add'>+__success __success_unpriv</div><div class='ctx'> __retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("if w1 &gt;= 0x0 goto pc+2")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `R0 min value is outside of the allowed memory range` */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* sanitized dead code */</div><div class='add'>+__xlated_unpriv("r0 = 0")</div><div class='add'>+#endif</div><div class='ctx'> __naked void reg32_0_reg32_xor_3(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -888,7 +926,7 @@ l1_%=:	r0 = 0;						\</div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("bounds check for non const xor src dst")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("5: (af) r0 ^= r6                      ; R0_w=scalar(smin=smin32=0,smax=umax=smax32=umax32=431,var_off=(0x0; 0x1af))")</div><div class='add'>+__msg("5: (af) r0 ^= r6                      ; R0=scalar(smin=smin32=0,smax=umax=smax32=umax32=431,var_off=(0x0; 0x1af))")</div><div class='ctx'> __naked void non_const_xor_src_dst(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -909,7 +947,7 @@ __naked void non_const_xor_src_dst(void)</div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("bounds check for non const or src dst")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("5: (4f) r0 |= r6                      ; R0_w=scalar(smin=smin32=0,smax=umax=smax32=umax32=431,var_off=(0x0; 0x1af))")</div><div class='add'>+__msg("5: (4f) r0 |= r6                      ; R0=scalar(smin=smin32=0,smax=umax=smax32=umax32=431,var_off=(0x0; 0x1af))")</div><div class='ctx'> __naked void non_const_or_src_dst(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -930,7 +968,7 @@ __naked void non_const_or_src_dst(void)</div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("bounds check for non const mul regs")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("5: (2f) r0 *= r6                      ; R0_w=scalar(smin=smin32=0,smax=umax=smax32=umax32=3825,var_off=(0x0; 0xfff))")</div><div class='add'>+__msg("5: (2f) r0 *= r6                      ; R0=scalar(smin=smin32=0,smax=umax=smax32=umax32=3825,var_off=(0x0; 0xfff))")</div><div class='ctx'> __naked void non_const_mul_regs(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -1028,7 +1066,7 @@ l0_%=:	r0 = 0;						\</div><div class='ctx'> SEC("xdp")</div><div class='ctx'> __description("bound check with JMP_JSLT for crossing 64-bit signed boundary")</div><div class='ctx'> __success __retval(0)</div><div class='del'>-__flag(!BPF_F_TEST_REG_INVARIANTS) /* known invariants violation */</div><div class='add'>+__flag(BPF_F_TEST_REG_INVARIANTS)</div><div class='ctx'> __naked void crossing_64_bit_signed_boundary_2(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -1203,7 +1241,7 @@ l0_%=:	r0 = 0;						\</div><div class='ctx'> SEC("tc")</div><div class='ctx'> __description("multiply mixed sign bounds. test 1")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("r6 *= r7 {{.*}}; R6_w=scalar(smin=umin=0x1bc16d5cd4927ee1,smax=umax=0x1bc16d674ec80000,smax32=0x7ffffeff,umax32=0xfffffeff,var_off=(0x1bc16d4000000000; 0x3ffffffeff))")</div><div class='add'>+__msg("r6 *= r7 {{.*}}; R6=scalar(smin=umin=0x1bc16d5cd4927ee1,smax=umax=0x1bc16d674ec80000,smax32=0x7ffffeff,umax32=0xfffffeff,var_off=(0x1bc16d4000000000; 0x3ffffffeff))")</div><div class='ctx'> __naked void mult_mixed0_sign(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -1226,7 +1264,7 @@ __naked void mult_mixed0_sign(void)</div><div class='ctx'> SEC("tc")</div><div class='ctx'> __description("multiply mixed sign bounds. test 2")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("r6 *= r7 {{.*}}; R6_w=scalar(smin=smin32=-100,smax=smax32=200)")</div><div class='add'>+__msg("r6 *= r7 {{.*}}; R6=scalar(smin=smin32=-100,smax=smax32=200)")</div><div class='ctx'> __naked void mult_mixed1_sign(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -1249,7 +1287,7 @@ __naked void mult_mixed1_sign(void)</div><div class='ctx'> SEC("tc")</div><div class='ctx'> __description("multiply negative bounds")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("r6 *= r7 {{.*}}; R6_w=scalar(smin=umin=smin32=umin32=0x3ff280b0,smax=umax=smax32=umax32=0x3fff0001,var_off=(0x3ff00000; 0xf81ff))")</div><div class='add'>+__msg("r6 *= r7 {{.*}}; R6=scalar(smin=umin=smin32=umin32=0x3ff280b0,smax=umax=smax32=umax32=0x3fff0001,var_off=(0x3ff00000; 0xf81ff))")</div><div class='ctx'> __naked void mult_sign_bounds(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -1273,7 +1311,7 @@ __naked void mult_sign_bounds(void)</div><div class='ctx'> SEC("tc")</div><div class='ctx'> __description("multiply bounds that don't cross signed boundary")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("r8 *= r6 {{.*}}; R6_w=scalar(smin=smin32=0,smax=umax=smax32=umax32=11,var_off=(0x0; 0xb)) R8_w=scalar(smin=0,smax=umax=0x7b96bb0a94a3a7cd,var_off=(0x0; 0x7fffffffffffffff))")</div><div class='add'>+__msg("r8 *= r6 {{.*}}; R6=scalar(smin=smin32=0,smax=umax=smax32=umax32=11,var_off=(0x0; 0xb)) R8=scalar(smin=0,smax=umax=0x7b96bb0a94a3a7cd,var_off=(0x0; 0x7fffffffffffffff))")</div><div class='ctx'> __naked void mult_no_sign_crossing(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -1293,7 +1331,7 @@ __naked void mult_no_sign_crossing(void)</div><div class='ctx'> SEC("tc")</div><div class='ctx'> __description("multiplication overflow, result in unbounded reg. test 1")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("r6 *= r7 {{.*}}; R6_w=scalar()")</div><div class='add'>+__msg("r6 *= r7 {{.*}}; R6=scalar()")</div><div class='ctx'> __naked void mult_unsign_ovf(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -1315,7 +1353,7 @@ __naked void mult_unsign_ovf(void)</div><div class='ctx'> SEC("tc")</div><div class='ctx'> __description("multiplication overflow, result in unbounded reg. test 2")</div><div class='ctx'> __success __log_level(2)</div><div class='del'>-__msg("r6 *= r7 {{.*}}; R6_w=scalar()")</div><div class='add'>+__msg("r6 *= r7 {{.*}}; R6=scalar()")</div><div class='ctx'> __naked void mult_sign_ovf(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -1334,4 +1372,495 @@ __naked void mult_sign_ovf(void)</div><div class='ctx'> 	  __imm(bpf_skb_store_bytes)</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("64-bit addition, all outcomes overflow")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("5: (0f) r3 += r3 {{.*}} R3=scalar(umin=0x4000000000000000,umax=0xfffffffffffffffe)")</div><div class='add'>+__retval(0)</div><div class='add'>+__naked void add64_full_overflow(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"call %[bpf_get_prandom_u32];"</div><div class='add'>+	"r4 = r0;"</div><div class='add'>+	"r3 = 0xa000000000000000 ll;"</div><div class='add'>+	"r3 |= r4;"</div><div class='add'>+	"r3 += r3;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("64-bit addition, partial overflow, result in unbounded reg")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("4: (0f) r3 += r3 {{.*}} R3=scalar()")</div><div class='add'>+__retval(0)</div><div class='add'>+__naked void add64_partial_overflow(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"call %[bpf_get_prandom_u32];"</div><div class='add'>+	"r4 = r0;"</div><div class='add'>+	"r3 = 2;"</div><div class='add'>+	"r3 |= r4;"</div><div class='add'>+	"r3 += r3;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("32-bit addition overflow, all outcomes overflow")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("4: (0c) w3 += w3 {{.*}} R3=scalar(smin=umin=umin32=0x40000000,smax=umax=umax32=0xfffffffe,var_off=(0x0; 0xffffffff))")</div><div class='add'>+__retval(0)</div><div class='add'>+__naked void add32_full_overflow(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"call %[bpf_get_prandom_u32];"</div><div class='add'>+	"w4 = w0;"</div><div class='add'>+	"w3 = 0xa0000000;"</div><div class='add'>+	"w3 |= w4;"</div><div class='add'>+	"w3 += w3;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("32-bit addition, partial overflow, result in unbounded u32 bounds")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("4: (0c) w3 += w3 {{.*}} R3=scalar(smin=0,smax=umax=0xffffffff,var_off=(0x0; 0xffffffff))")</div><div class='add'>+__retval(0)</div><div class='add'>+__naked void add32_partial_overflow(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"call %[bpf_get_prandom_u32];"</div><div class='add'>+	"w4 = w0;"</div><div class='add'>+	"w3 = 2;"</div><div class='add'>+	"w3 |= w4;"</div><div class='add'>+	"w3 += w3;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("64-bit subtraction, all outcomes underflow")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("6: (1f) r3 -= r1 {{.*}} R3=scalar(umin=1,umax=0x8000000000000000)")</div><div class='add'>+__retval(0)</div><div class='add'>+__naked void sub64_full_overflow(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"call %[bpf_get_prandom_u32];"</div><div class='add'>+	"r1 = r0;"</div><div class='add'>+	"r2 = 0x8000000000000000 ll;"</div><div class='add'>+	"r1 |= r2;"</div><div class='add'>+	"r3 = 0;"</div><div class='add'>+	"r3 -= r1;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("64-bit subtraction, partial overflow, result in unbounded reg")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("3: (1f) r3 -= r2 {{.*}} R3=scalar()")</div><div class='add'>+__retval(0)</div><div class='add'>+__naked void sub64_partial_overflow(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"call %[bpf_get_prandom_u32];"</div><div class='add'>+	"r3 = r0;"</div><div class='add'>+	"r2 = 1;"</div><div class='add'>+	"r3 -= r2;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("32-bit subtraction overflow, all outcomes underflow")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("5: (1c) w3 -= w1 {{.*}} R3=scalar(smin=umin=umin32=1,smax=umax=umax32=0x80000000,var_off=(0x0; 0xffffffff))")</div><div class='add'>+__retval(0)</div><div class='add'>+__naked void sub32_full_overflow(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"call %[bpf_get_prandom_u32];"</div><div class='add'>+	"w1 = w0;"</div><div class='add'>+	"w2 = 0x80000000;"</div><div class='add'>+	"w1 |= w2;"</div><div class='add'>+	"w3 = 0;"</div><div class='add'>+	"w3 -= w1;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("32-bit subtraction, partial overflow, result in unbounded u32 bounds")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("3: (1c) w3 -= w2 {{.*}} R3=scalar(smin=0,smax=umax=0xffffffff,var_off=(0x0; 0xffffffff))")</div><div class='add'>+__retval(0)</div><div class='add'>+__naked void sub32_partial_overflow(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"call %[bpf_get_prandom_u32];"</div><div class='add'>+	"w3 = w0;"</div><div class='add'>+	"w2 = 1;"</div><div class='add'>+	"w3 -= w2;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("dead branch on jset, does not result in invariants violation error")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__retval(0) __flag(BPF_F_TEST_REG_INVARIANTS)</div><div class='add'>+__naked void jset_range_analysis(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("			\</div><div class='add'>+	call %[bpf_get_netns_cookie];	\</div><div class='add'>+	if r0 == 0 goto l0_%=;		\</div><div class='add'>+	if r0 &amp; 0xffffffff goto +0; 	\</div><div class='add'>+l0_%=:	r0 = 0;				\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_netns_cookie)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This test covers the bounds deduction on 64bits when the s64 and u64 ranges</div><div class='add'>+ * overlap on the negative side. At instruction 7, the ranges look as follows:</div><div class='add'>+ *</div><div class='add'>+ * 0          umin=0xfffffcf1                 umax=0xff..ff6e  U64_MAX</div><div class='add'>+ * |                [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]        |</div><div class='add'>+ * |----------------------------|------------------------------|</div><div class='add'>+ * |xxxxxxxxxx]                                   [xxxxxxxxxxxx|</div><div class='add'>+ * 0    smax=0xeffffeee                       smin=-655        -1</div><div class='add'>+ *</div><div class='add'>+ * We should therefore deduce the following new bounds:</div><div class='add'>+ *</div><div class='add'>+ * 0                             u64=[0xff..ffd71;0xff..ff6e]  U64_MAX</div><div class='add'>+ * |                                              [xxx]        |</div><div class='add'>+ * |----------------------------|------------------------------|</div><div class='add'>+ * |                                              [xxx]        |</div><div class='add'>+ * 0                                        s64=[-655;-146]    -1</div><div class='add'>+ *</div><div class='add'>+ * Without the deduction cross sign boundary, we end up with an invariant</div><div class='add'>+ * violation error.</div><div class='add'>+ */</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("bounds deduction cross sign boundary, negative overlap")</div><div class='add'>+__success __log_level(2) __flag(BPF_F_TEST_REG_INVARIANTS)</div><div class='add'>+__msg("7: (1f) r0 -= r6 {{.*}} R0=scalar(smin=smin32=-655,smax=smax32=-146,umin=0xfffffffffffffd71,umax=0xffffffffffffff6e,umin32=0xfffffd71,umax32=0xffffff6e,var_off=(0xfffffffffffffc00; 0x3ff))")</div><div class='add'>+__retval(0)</div><div class='add'>+__naked void bounds_deduct_negative_overlap(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile("			\</div><div class='add'>+	call %[bpf_get_prandom_u32];	\</div><div class='add'>+	w3 = w0;			\</div><div class='add'>+	w6 = (s8)w0;			\</div><div class='add'>+	r0 = (s8)r0;			\</div><div class='add'>+	if w6 &gt;= 0xf0000000 goto l0_%=;	\</div><div class='add'>+	r0 += r6;			\</div><div class='add'>+	r6 += 400;			\</div><div class='add'>+	r0 -= r6;			\</div><div class='add'>+	if r3 &lt; r0 goto l0_%=;		\</div><div class='add'>+l0_%=:	r0 = 0;				\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This test covers the bounds deduction on 64bits when the s64 and u64 ranges</div><div class='add'>+ * overlap on the positive side. At instruction 3, the ranges look as follows:</div><div class='add'>+ *</div><div class='add'>+ * 0 umin=0                      umax=0xffffffffffffff00       U64_MAX</div><div class='add'>+ * [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]            |</div><div class='add'>+ * |----------------------------|------------------------------|</div><div class='add'>+ * |xxxxxxxx]                                         [xxxxxxxx|</div><div class='add'>+ * 0      smax=127                                smin=-128    -1</div><div class='add'>+ *</div><div class='add'>+ * We should therefore deduce the following new bounds:</div><div class='add'>+ *</div><div class='add'>+ * 0  u64=[0;127]                                              U64_MAX</div><div class='add'>+ * [xxxxxxxx]                                                  |</div><div class='add'>+ * |----------------------------|------------------------------|</div><div class='add'>+ * [xxxxxxxx]                                                  |</div><div class='add'>+ * 0  s64=[0;127]                                              -1</div><div class='add'>+ *</div><div class='add'>+ * Without the deduction cross sign boundary, the program is rejected due to</div><div class='add'>+ * the frame pointer write.</div><div class='add'>+ */</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("bounds deduction cross sign boundary, positive overlap")</div><div class='add'>+__success __log_level(2) __flag(BPF_F_TEST_REG_INVARIANTS)</div><div class='add'>+__msg("3: (2d) if r0 &gt; r1 {{.*}} R0=scalar(smin=smin32=0,smax=umax=smax32=umax32=127,var_off=(0x0; 0x7f))")</div><div class='add'>+__retval(0)</div><div class='add'>+__naked void bounds_deduct_positive_overlap(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile("			\</div><div class='add'>+	call %[bpf_get_prandom_u32];	\</div><div class='add'>+	r0 = (s8)r0;			\</div><div class='add'>+	r1 = 0xffffffffffffff00;	\</div><div class='add'>+	if r0 &gt; r1 goto l0_%=;		\</div><div class='add'>+	if r0 &lt; 128 goto l0_%=;		\</div><div class='add'>+	r10 = 0;			\</div><div class='add'>+l0_%=:	r0 = 0;				\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This test is the same as above, but the s64 and u64 ranges overlap in two</div><div class='add'>+ * places. At instruction 3, the ranges look as follows:</div><div class='add'>+ *</div><div class='add'>+ * 0 umin=0                           umax=0xffffffffffffff80  U64_MAX</div><div class='add'>+ * [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]        |</div><div class='add'>+ * |----------------------------|------------------------------|</div><div class='add'>+ * |xxxxxxxx]                                         [xxxxxxxx|</div><div class='add'>+ * 0      smax=127                                smin=-128    -1</div><div class='add'>+ *</div><div class='add'>+ * 0xffffffffffffff80 = (u64)-128. We therefore can't deduce anything new and</div><div class='add'>+ * the program should fail due to the frame pointer write.</div><div class='add'>+ */</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("bounds deduction cross sign boundary, two overlaps")</div><div class='add'>+__failure __flag(BPF_F_TEST_REG_INVARIANTS)</div><div class='add'>+__msg("3: (2d) if r0 &gt; r1 {{.*}} R0=scalar(smin=smin32=-128,smax=smax32=127,umax=0xffffffffffffff80)")</div><div class='add'>+__msg("frame pointer is read only")</div><div class='add'>+__naked void bounds_deduct_two_overlaps(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile("			\</div><div class='add'>+	call %[bpf_get_prandom_u32];	\</div><div class='add'>+	r0 = (s8)r0;			\</div><div class='add'>+	r1 = 0xffffffffffffff80;	\</div><div class='add'>+	if r0 &gt; r1 goto l0_%=;		\</div><div class='add'>+	if r0 &lt; 128 goto l0_%=;		\</div><div class='add'>+	r10 = 0;			\</div><div class='add'>+l0_%=:	r0 = 0;				\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("dead jne branch due to disagreeing tnums")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__naked void jne_disagreeing_tnums(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile("			\</div><div class='add'>+	call %[bpf_get_prandom_u32];	\</div><div class='add'>+	w0 = w0;			\</div><div class='add'>+	r0 &gt;&gt;= 30;			\</div><div class='add'>+	r0 &lt;&lt;= 30;			\</div><div class='add'>+	r1 = r0;			\</div><div class='add'>+	r1 += 1024;			\</div><div class='add'>+	if r1 != r0 goto +1;		\</div><div class='add'>+	r10 = 0;			\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("dead jeq branch due to disagreeing tnums")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__naked void jeq_disagreeing_tnums(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile("			\</div><div class='add'>+	call %[bpf_get_prandom_u32];	\</div><div class='add'>+	w0 = w0;			\</div><div class='add'>+	r0 &gt;&gt;= 30;			\</div><div class='add'>+	r0 &lt;&lt;= 30;			\</div><div class='add'>+	r1 = r0;			\</div><div class='add'>+	r1 += 1024;			\</div><div class='add'>+	if r1 == r0 goto +1;		\</div><div class='add'>+	exit;				\</div><div class='add'>+	r10 = 0;			\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("conditional jump on same register, branch taken")</div><div class='add'>+__not_msg("20: (b7) r0 = 1 {{.*}} R0=1")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__retval(0) __flag(BPF_F_TEST_REG_INVARIANTS)</div><div class='add'>+__naked void condition_jump_on_same_register(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile("			\</div><div class='add'>+	call %[bpf_get_prandom_u32];	\</div><div class='add'>+	w8 = 0x80000000;		\</div><div class='add'>+	r0 &amp;= r8;			\</div><div class='add'>+	if r0 == r0 goto +1;		\</div><div class='add'>+	goto l1_%=;			\</div><div class='add'>+	if r0 &gt;= r0 goto +1;		\</div><div class='add'>+	goto l1_%=;			\</div><div class='add'>+	if r0 s&gt;= r0 goto +1;		\</div><div class='add'>+	goto l1_%=;			\</div><div class='add'>+	if r0 &lt;= r0 goto +1;		\</div><div class='add'>+	goto l1_%=;			\</div><div class='add'>+	if r0 s&lt;= r0 goto +1;		\</div><div class='add'>+	goto l1_%=;			\</div><div class='add'>+	if r0 != r0 goto l1_%=;		\</div><div class='add'>+	if r0 &gt;  r0 goto l1_%=;		\</div><div class='add'>+	if r0 s&gt; r0 goto l1_%=;		\</div><div class='add'>+	if r0 &lt;  r0 goto l1_%=;		\</div><div class='add'>+	if r0 s&lt; r0 goto l1_%=;		\</div><div class='add'>+l0_%=:	r0 = 0;				\</div><div class='add'>+	exit;				\</div><div class='add'>+l1_%=:	r0 = 1;				\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("jset on same register, constant value branch taken")</div><div class='add'>+__not_msg("7: (b7) r0 = 1 {{.*}} R0=1")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__retval(0) __flag(BPF_F_TEST_REG_INVARIANTS)</div><div class='add'>+__naked void jset_on_same_register_1(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile("			\</div><div class='add'>+	r0 = 0;				\</div><div class='add'>+	if r0 &amp; r0 goto l1_%=;		\</div><div class='add'>+	r0 = 1;				\</div><div class='add'>+	if r0 &amp; r0 goto +1;		\</div><div class='add'>+	goto l1_%=;			\</div><div class='add'>+l0_%=:	r0 = 0;				\</div><div class='add'>+	exit;				\</div><div class='add'>+l1_%=:	r0 = 1;				\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("jset on same register, scalar value branch taken")</div><div class='add'>+__not_msg("12: (b7) r0 = 1 {{.*}} R0=1")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__retval(0) __flag(BPF_F_TEST_REG_INVARIANTS)</div><div class='add'>+__naked void jset_on_same_register_2(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile("			\</div><div class='add'>+	/* range [1;2] */		\</div><div class='add'>+	call %[bpf_get_prandom_u32];	\</div><div class='add'>+	r0 &amp;= 0x1;			\</div><div class='add'>+	r0 += 1;			\</div><div class='add'>+	if r0 &amp; r0 goto +1;		\</div><div class='add'>+	goto l1_%=;			\</div><div class='add'>+	/* range [-2;-1] */		\</div><div class='add'>+	call %[bpf_get_prandom_u32];	\</div><div class='add'>+	r0 &amp;= 0x1;			\</div><div class='add'>+	r0 -= 2;			\</div><div class='add'>+	if r0 &amp; r0 goto +1;		\</div><div class='add'>+	goto l1_%=;			\</div><div class='add'>+l0_%=:	r0 = 0;				\</div><div class='add'>+	exit;				\</div><div class='add'>+l1_%=:	r0 = 1;				\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("jset on same register, scalar value unknown branch 1")</div><div class='add'>+__msg("3: (b7) r0 = 0 {{.*}} R0=0")</div><div class='add'>+__msg("5: (b7) r0 = 1 {{.*}} R0=1")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__flag(BPF_F_TEST_REG_INVARIANTS)</div><div class='add'>+__naked void jset_on_same_register_3(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile("			\</div><div class='add'>+	/* range [0;1] */		\</div><div class='add'>+	call %[bpf_get_prandom_u32];	\</div><div class='add'>+	r0 &amp;= 0x1;			\</div><div class='add'>+	if r0 &amp; r0 goto l1_%=;		\</div><div class='add'>+l0_%=:	r0 = 0;				\</div><div class='add'>+	exit;				\</div><div class='add'>+l1_%=:	r0 = 1;				\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("jset on same register, scalar value unknown branch 2")</div><div class='add'>+__msg("4: (b7) r0 = 0 {{.*}} R0=0")</div><div class='add'>+__msg("6: (b7) r0 = 1 {{.*}} R0=1")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__flag(BPF_F_TEST_REG_INVARIANTS)</div><div class='add'>+__naked void jset_on_same_register_4(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile("			\</div><div class='add'>+	/* range [-1;0] */		\</div><div class='add'>+	call %[bpf_get_prandom_u32];	\</div><div class='add'>+	r0 &amp;= 0x1;			\</div><div class='add'>+	r0 -= 1;			\</div><div class='add'>+	if r0 &amp; r0 goto l1_%=;		\</div><div class='add'>+l0_%=:	r0 = 0;				\</div><div class='add'>+	exit;				\</div><div class='add'>+l1_%=:	r0 = 1;				\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("jset on same register, scalar value unknown branch 3")</div><div class='add'>+__msg("4: (b7) r0 = 0 {{.*}} R0=0")</div><div class='add'>+__msg("6: (b7) r0 = 1 {{.*}} R0=1")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__flag(BPF_F_TEST_REG_INVARIANTS)</div><div class='add'>+__naked void jset_on_same_register_5(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile("			\</div><div class='add'>+	/* range [-1;1] */		\</div><div class='add'>+	call %[bpf_get_prandom_u32];	\</div><div class='add'>+	r0 &amp;= 0x2;			\</div><div class='add'>+	r0 -= 1;			\</div><div class='add'>+	if r0 &amp; r0 goto l1_%=;		\</div><div class='add'>+l0_%=:	r0 = 0;				\</div><div class='add'>+	exit;				\</div><div class='add'>+l1_%=:	r0 = 1;				\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_bounds_deduction.c b/tools/testing/selftests/bpf/progs/verifier_bounds_deduction.c<br/>index c506afbdd936..260a6df264e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_bounds_deduction.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_bounds_deduction.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_bounds_deduction.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_bounds_deduction.c</a></div><div class='hunk'>@@ -159,13 +159,16 @@ __failure_unpriv</div><div class='ctx'> __naked void deducing_bounds_from_const_10(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='add'>+	r6 = r1;					\</div><div class='ctx'> 	r0 = 0;						\</div><div class='ctx'> 	if r0 s&lt;= 0 goto l0_%=;				\</div><div class='del'>-l0_%=:	/* Marks reg as unknown. */			\</div><div class='del'>-	r0 = -r0;					\</div><div class='del'>-	r0 -= r1;					\</div><div class='add'>+l0_%=: /* Marks r0 as unknown. */			\</div><div class='add'>+	call %[bpf_get_prandom_u32];			\</div><div class='add'>+	r0 -= r6;					\</div><div class='ctx'> 	exit;						\</div><div class='del'>-"	::: __clobber_all);</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c b/tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c<br/>index 5094c288cfd7..fb4fa465d67c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@ SEC("raw_tp")</div><div class='ctx'> __arch_x86_64</div><div class='ctx'> __log_level(4) __msg("stack depth 8")</div><div class='ctx'> __xlated("4: r5 = 5")</div><div class='del'>-__xlated("5: w0 = ")</div><div class='add'>+__xlated("5: r0 = ")</div><div class='ctx'> __xlated("6: r0 = &amp;(void __percpu *)(r0)")</div><div class='ctx'> __xlated("7: r0 = *(u32 *)(r0 +0)")</div><div class='ctx'> __xlated("8: exit")</div><div class='hunk'>@@ -620,23 +620,66 @@ __naked void helper_call_does_not_prevent_bpf_fastcall(void)</div><div class='ctx'> </div><div class='ctx'> SEC("raw_tp")</div><div class='ctx'> __arch_x86_64</div><div class='del'>-__log_level(4) __msg("stack depth 16")</div><div class='del'>-/* may_goto counter at -16 */</div><div class='del'>-__xlated("0: *(u64 *)(r10 -16) =")</div><div class='del'>-__xlated("1: r1 = 1")</div><div class='add'>+__log_level(4) __msg("stack depth 24")</div><div class='add'>+/* may_goto counter at -24 */</div><div class='add'>+__xlated("0: *(u64 *)(r10 -24) =")</div><div class='add'>+/* may_goto timestamp at -16 */</div><div class='add'>+__xlated("1: *(u64 *)(r10 -16) =")</div><div class='add'>+__xlated("2: r1 = 1")</div><div class='ctx'> __xlated("...")</div><div class='del'>-__xlated("3: r0 = &amp;(void __percpu *)(r0)")</div><div class='add'>+__xlated("4: r0 = &amp;(void __percpu *)(r0)")</div><div class='ctx'> __xlated("...")</div><div class='ctx'> /* may_goto expansion starts */</div><div class='del'>-__xlated("5: r11 = *(u64 *)(r10 -16)")</div><div class='del'>-__xlated("6: if r11 == 0x0 goto pc+3")</div><div class='del'>-__xlated("7: r11 -= 1")</div><div class='del'>-__xlated("8: *(u64 *)(r10 -16) = r11")</div><div class='add'>+__xlated("6: r11 = *(u64 *)(r10 -24)")</div><div class='add'>+__xlated("7: if r11 == 0x0 goto pc+6")</div><div class='add'>+__xlated("8: r11 -= 1")</div><div class='add'>+__xlated("9: if r11 != 0x0 goto pc+2")</div><div class='add'>+__xlated("10: r11 = -24")</div><div class='add'>+__xlated("11: call unknown")</div><div class='add'>+__xlated("12: *(u64 *)(r10 -24) = r11")</div><div class='ctx'> /* may_goto expansion ends */</div><div class='del'>-__xlated("9: *(u64 *)(r10 -8) = r1")</div><div class='del'>-__xlated("10: exit")</div><div class='add'>+__xlated("13: *(u64 *)(r10 -8) = r1")</div><div class='add'>+__xlated("14: exit")</div><div class='add'>+__success</div><div class='add'>+__naked void may_goto_interaction_x86_64(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = 1;"</div><div class='add'>+	"*(u64 *)(r10 - 16) = r1;"</div><div class='add'>+	"call %[bpf_get_smp_processor_id];"</div><div class='add'>+	"r1 = *(u64 *)(r10 - 16);"</div><div class='add'>+	".8byte %[may_goto];"</div><div class='add'>+	/* just touch some stack at -8 */</div><div class='add'>+	"*(u64 *)(r10 - 8) = r1;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_smp_processor_id),</div><div class='add'>+	  __imm_insn(may_goto, BPF_RAW_INSN(BPF_JMP | BPF_JCOND, 0, 0, +1 /* offset */, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("raw_tp")</div><div class='add'>+__arch_arm64</div><div class='add'>+__log_level(4) __msg("stack depth 24")</div><div class='add'>+/* may_goto counter at -24 */</div><div class='add'>+__xlated("0: *(u64 *)(r10 -24) =")</div><div class='add'>+/* may_goto timestamp at -16 */</div><div class='add'>+__xlated("1: *(u64 *)(r10 -16) =")</div><div class='add'>+__xlated("2: r1 = 1")</div><div class='add'>+__xlated("3: call bpf_get_smp_processor_id")</div><div class='add'>+/* may_goto expansion starts */</div><div class='add'>+__xlated("4: r11 = *(u64 *)(r10 -24)")</div><div class='add'>+__xlated("5: if r11 == 0x0 goto pc+6")</div><div class='add'>+__xlated("6: r11 -= 1")</div><div class='add'>+__xlated("7: if r11 != 0x0 goto pc+2")</div><div class='add'>+__xlated("8: r11 = -24")</div><div class='add'>+__xlated("9: call unknown")</div><div class='add'>+__xlated("10: *(u64 *)(r10 -24) = r11")</div><div class='add'>+/* may_goto expansion ends */</div><div class='add'>+__xlated("11: *(u64 *)(r10 -8) = r1")</div><div class='add'>+__xlated("12: exit")</div><div class='ctx'> __success</div><div class='del'>-__naked void may_goto_interaction(void)</div><div class='add'>+__naked void may_goto_interaction_arm64(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='ctx'> 	"r1 = 1;"</div><div class='hunk'>@@ -666,7 +709,7 @@ SEC("raw_tp")</div><div class='ctx'> __arch_x86_64</div><div class='ctx'> __log_level(4) __msg("stack depth 32+0")</div><div class='ctx'> __xlated("2: r1 = 1")</div><div class='del'>-__xlated("3: w0 =")</div><div class='add'>+__xlated("3: r0 =")</div><div class='ctx'> __xlated("4: r0 = &amp;(void __percpu *)(r0)")</div><div class='ctx'> __xlated("5: r0 = *(u32 *)(r0 +0)")</div><div class='ctx'> /* bpf_loop params setup */</div><div class='hunk'>@@ -715,7 +758,7 @@ __arch_x86_64</div><div class='ctx'> __log_level(4) __msg("stack depth 40+0")</div><div class='ctx'> /* call bpf_get_smp_processor_id */</div><div class='ctx'> __xlated("2: r1 = 42")</div><div class='del'>-__xlated("3: w0 =")</div><div class='add'>+__xlated("3: r0 =")</div><div class='ctx'> __xlated("4: r0 = &amp;(void __percpu *)(r0)")</div><div class='ctx'> __xlated("5: r0 = *(u32 *)(r0 +0)")</div><div class='ctx'> /* call bpf_get_prandom_u32 */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_bpf_trap.c b/tools/testing/selftests/bpf/progs/verifier_bpf_trap.c<br/>new file mode 100644<br/>index 000000000000..35e2cdc00a01<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_bpf_trap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_bpf_trap.c</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+#if __clang_major__ &gt;= 21 &amp;&amp; 0</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("__builtin_trap with simple c code")</div><div class='add'>+__failure __msg("unexpected __bpf_trap() due to uninitialized variable?")</div><div class='add'>+void bpf_builtin_trap_with_simple_c(void)</div><div class='add'>+{</div><div class='add'>+	__builtin_trap();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("__bpf_trap with simple c code")</div><div class='add'>+__failure __msg("unexpected __bpf_trap() due to uninitialized variable?")</div><div class='add'>+void bpf_trap_with_simple_c(void)</div><div class='add'>+{</div><div class='add'>+	__bpf_trap();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("__bpf_trap as the second-from-last insn")</div><div class='add'>+__failure __msg("unexpected __bpf_trap() due to uninitialized variable?")</div><div class='add'>+__naked void bpf_trap_at_func_end(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"call %[__bpf_trap];"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm(__bpf_trap)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("dead code __bpf_trap in the middle of code")</div><div class='add'>+__success</div><div class='add'>+__naked void dead_bpf_trap_in_middle(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"if r0 == 0 goto +1;"</div><div class='add'>+	"call %[__bpf_trap];"</div><div class='add'>+	"r0 = 2;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm(__bpf_trap)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("reachable __bpf_trap in the middle of code")</div><div class='add'>+__failure __msg("unexpected __bpf_trap() due to uninitialized variable?")</div><div class='add'>+__naked void live_bpf_trap_in_middle(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"if r0 == 1 goto +1;"</div><div class='add'>+	"call %[__bpf_trap];"</div><div class='add'>+	"r0 = 2;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm(__bpf_trap)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c b/tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c<br/>index 28b939572cda..03942cec07e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c</a></div><div class='hunk'>@@ -65,4 +65,16 @@ __naked void ctx_access_u32_pointer_reject_8(void)</div><div class='ctx'> "	::: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("fentry/bpf_fentry_test10")</div><div class='add'>+__description("btf_ctx_access const void pointer accept")</div><div class='add'>+__success __retval(0)</div><div class='add'>+__naked void ctx_access_const_void_pointer_accept(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r2 = *(u64 *)(r1 + 0);		/* load 1st argument value (const void pointer) */\</div><div class='add'>+	r0 = 0;						\</div><div class='add'>+	exit;						\</div><div class='add'>+"	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_ctx.c b/tools/testing/selftests/bpf/progs/verifier_ctx.c<br/>index a83809a1dbbf..5ebf7d9bcc55 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_ctx.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_ctx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_ctx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_ctx.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Converted from tools/testing/selftests/bpf/verifier/ctx.c */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include "vmlinux.h"</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='ctx'> </div><div class='hunk'>@@ -218,4 +218,78 @@ __naked void null_check_8_null_bind(void)</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define narrow_load(type, ctx, field)					\</div><div class='add'>+	SEC(type)							\</div><div class='add'>+	__description("narrow load on field " #field " of " #ctx)	\</div><div class='add'>+	__failure __msg("invalid bpf_context access")			\</div><div class='add'>+	__naked void invalid_narrow_load##ctx##field(void)		\</div><div class='add'>+	{								\</div><div class='add'>+		asm volatile ("						\</div><div class='add'>+		r1 = *(u32 *)(r1 + %[off]);				\</div><div class='add'>+		r0 = 0;							\</div><div class='add'>+		exit;"							\</div><div class='add'>+		:							\</div><div class='add'>+		: __imm_const(off, offsetof(struct ctx, field) + 4)	\</div><div class='add'>+		: __clobber_all);					\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+narrow_load("cgroup/getsockopt", bpf_sockopt, sk);</div><div class='add'>+narrow_load("cgroup/getsockopt", bpf_sockopt, optval);</div><div class='add'>+narrow_load("cgroup/getsockopt", bpf_sockopt, optval_end);</div><div class='add'>+narrow_load("tc", __sk_buff, sk);</div><div class='add'>+narrow_load("cgroup/bind4", bpf_sock_addr, sk);</div><div class='add'>+narrow_load("sockops", bpf_sock_ops, sk);</div><div class='add'>+narrow_load("sockops", bpf_sock_ops, skb_data);</div><div class='add'>+narrow_load("sockops", bpf_sock_ops, skb_data_end);</div><div class='add'>+narrow_load("sockops", bpf_sock_ops, skb_hwtstamp);</div><div class='add'>+</div><div class='add'>+#define unaligned_access(type, ctx, field)					\</div><div class='add'>+	SEC(type)								\</div><div class='add'>+	__description("unaligned access on field " #field " of " #ctx)		\</div><div class='add'>+	__failure __msg("invalid bpf_context access")				\</div><div class='add'>+	__naked void unaligned_ctx_access_##ctx##field(void)			\</div><div class='add'>+	{									\</div><div class='add'>+		asm volatile ("							\</div><div class='add'>+		r1 = *(u%[size] *)(r1 + %[off]);				\</div><div class='add'>+		r0 = 0;								\</div><div class='add'>+		exit;"								\</div><div class='add'>+		:								\</div><div class='add'>+		: __imm_const(size, sizeof_field(struct ctx, field) * 8),	\</div><div class='add'>+		  __imm_const(off, offsetof(struct ctx, field) + 1)		\</div><div class='add'>+		: __clobber_all);						\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unaligned_access("flow_dissector", __sk_buff, data);</div><div class='add'>+unaligned_access("netfilter", bpf_nf_ctx, skb);</div><div class='add'>+</div><div class='add'>+#define padding_access(type, ctx, prev_field, sz)			\</div><div class='add'>+	SEC(type)							\</div><div class='add'>+	__description("access on " #ctx " padding after " #prev_field)	\</div><div class='add'>+	__naked void padding_ctx_access_##ctx(void)			\</div><div class='add'>+	{								\</div><div class='add'>+		asm volatile ("						\</div><div class='add'>+		r1 = *(u%[size] *)(r1 + %[off]);			\</div><div class='add'>+		r0 = 0;							\</div><div class='add'>+		exit;"							\</div><div class='add'>+		:							\</div><div class='add'>+		: __imm_const(size, sz * 8),				\</div><div class='add'>+		  __imm_const(off, offsetofend(struct ctx, prev_field))	\</div><div class='add'>+		: __clobber_all);					\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+__failure __msg("invalid bpf_context access")</div><div class='add'>+padding_access("cgroup/bind4", bpf_sock_addr, msg_src_ip6[3], 4);</div><div class='add'>+</div><div class='add'>+__success</div><div class='add'>+padding_access("sk_lookup", bpf_sk_lookup, remote_port, 2);</div><div class='add'>+</div><div class='add'>+__failure __msg("invalid bpf_context access")</div><div class='add'>+padding_access("tc", __sk_buff, tstamp_type, 2);</div><div class='add'>+</div><div class='add'>+__failure __msg("invalid bpf_context access")</div><div class='add'>+padding_access("cgroup/post_bind4", bpf_sock, dst_port, 2);</div><div class='add'>+</div><div class='add'>+__failure __msg("invalid bpf_context access")</div><div class='add'>+padding_access("sk_reuseport", sk_reuseport_md, hash, 4);</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c b/tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c<br/>index 28b602ac9cbe..911caa8fd1b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Converted from tools/testing/selftests/bpf/verifier/direct_packet_access.c */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='hunk'>@@ -800,4 +801,62 @@ l0_%=:	/* exit(0) */					\</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define access_test_non_linear(name, type, desc, retval, linear_sz, off)			\</div><div class='add'>+	SEC(type)										\</div><div class='add'>+	__description("direct packet access: " #name " (non-linear, " type ", " desc ")")	\</div><div class='add'>+	__success __retval(retval)								\</div><div class='add'>+	__linear_size(linear_sz)								\</div><div class='add'>+	__naked void access_non_linear_##name(void)						\</div><div class='add'>+	{											\</div><div class='add'>+		asm volatile ("									\</div><div class='add'>+		r2 = *(u32*)(r1 + %[skb_data]);							\</div><div class='add'>+		r3 = *(u32*)(r1 + %[skb_data_end]);						\</div><div class='add'>+		r0 = r2;									\</div><div class='add'>+		r0 += %[offset];								\</div><div class='add'>+		if r0 &gt; r3 goto l0_%=;								\</div><div class='add'>+		r0 = *(u8*)(r0 - 1);								\</div><div class='add'>+		r0 = 0;										\</div><div class='add'>+		exit;										\</div><div class='add'>+	l0_%=:	r0 = 1;										\</div><div class='add'>+		exit;										\</div><div class='add'>+	"	:										\</div><div class='add'>+		: __imm_const(skb_data, offsetof(struct __sk_buff, data)),			\</div><div class='add'>+		  __imm_const(skb_data_end, offsetof(struct __sk_buff, data_end)),		\</div><div class='add'>+		  __imm_const(offset, off)							\</div><div class='add'>+		: __clobber_all);								\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+access_test_non_linear(test31, "tc", "too short eth", 1, ETH_HLEN, 22);</div><div class='add'>+access_test_non_linear(test32, "tc", "too short 1", 1, 1, 22);</div><div class='add'>+access_test_non_linear(test33, "tc", "long enough", 0, 22, 22);</div><div class='add'>+access_test_non_linear(test34, "cgroup_skb/ingress", "too short eth", 1, ETH_HLEN, 8);</div><div class='add'>+access_test_non_linear(test35, "cgroup_skb/ingress", "too short 1", 1, 1, 8);</div><div class='add'>+access_test_non_linear(test36, "cgroup_skb/ingress", "long enough", 0, 22, 8);</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+__description("direct packet access: test37 (non-linear, linearized)")</div><div class='add'>+__success __retval(0)</div><div class='add'>+__linear_size(ETH_HLEN)</div><div class='add'>+__naked void access_non_linear_linearized(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("				\</div><div class='add'>+	r6 = r1;				\</div><div class='add'>+	r2 = 22;				\</div><div class='add'>+	call %[bpf_skb_pull_data];		\</div><div class='add'>+	r2 = *(u32*)(r6 + %[skb_data]);		\</div><div class='add'>+	r3 = *(u32*)(r6 + %[skb_data_end]);	\</div><div class='add'>+	r0 = r2;				\</div><div class='add'>+	r0 += 22;				\</div><div class='add'>+	if r0 &gt; r3 goto l0_%=;			\</div><div class='add'>+	r0 = *(u8*)(r0 - 1);			\</div><div class='add'>+	exit;					\</div><div class='add'>+l0_%=:	r0 = 1;					\</div><div class='add'>+	exit;					\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_skb_pull_data),</div><div class='add'>+	  __imm_const(skb_data, offsetof(struct __sk_buff, data)),</div><div class='add'>+	  __imm_const(skb_data_end, offsetof(struct __sk_buff, data_end))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_div_overflow.c b/tools/testing/selftests/bpf/progs/verifier_div_overflow.c<br/>index 458984da804c..34e0c012ee76 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_div_overflow.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_div_overflow.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_div_overflow.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_div_overflow.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ l0_%=:	exit;						\</div><div class='ctx'> </div><div class='ctx'> SEC("tc")</div><div class='ctx'> __description("MOD32 overflow, check 1")</div><div class='del'>-__success __retval(INT_MIN)</div><div class='add'>+__success __retval(_INT_MIN)</div><div class='ctx'> __naked void mod32_overflow_check_1(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -92,7 +92,7 @@ __naked void mod32_overflow_check_1(void)</div><div class='ctx'> </div><div class='ctx'> SEC("tc")</div><div class='ctx'> __description("MOD32 overflow, check 2")</div><div class='del'>-__success __retval(INT_MIN)</div><div class='add'>+__success __retval(_INT_MIN)</div><div class='ctx'> __naked void mod32_overflow_check_2(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_global_ptr_args.c b/tools/testing/selftests/bpf/progs/verifier_global_ptr_args.c<br/>index 4ab0ef18d7eb..1204fbc58178 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_global_ptr_args.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_global_ptr_args.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_global_ptr_args.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_global_ptr_args.c</a></div><div class='hunk'>@@ -179,4 +179,132 @@ int BPF_PROG(trusted_acq_rel, struct task_struct *task, u64 clone_flags)</div><div class='ctx'> 	return subprog_trusted_acq_rel(task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+__weak int subprog_untrusted_bad_tags(struct task_struct *task __arg_untrusted __arg_nullable)</div><div class='add'>+{</div><div class='add'>+	return task-&gt;pid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/sys_enter")</div><div class='add'>+__failure</div><div class='add'>+__msg("arg#0 untrusted cannot be combined with any other tags")</div><div class='add'>+int untrusted_bad_tags(void *ctx)</div><div class='add'>+{</div><div class='add'>+	return subprog_untrusted_bad_tags(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct local_type_wont_be_accepted {};</div><div class='add'>+</div><div class='add'>+__weak int subprog_untrusted_bad_type(struct local_type_wont_be_accepted *p __arg_untrusted)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/sys_enter")</div><div class='add'>+__failure</div><div class='add'>+__msg("arg#0 reference type('STRUCT local_type_wont_be_accepted') has no matches")</div><div class='add'>+int untrusted_bad_type(void *ctx)</div><div class='add'>+{</div><div class='add'>+	return subprog_untrusted_bad_type(bpf_rdonly_cast(0, 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__weak int subprog_untrusted(const volatile struct task_struct *restrict task __arg_untrusted)</div><div class='add'>+{</div><div class='add'>+	return task-&gt;pid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/sys_enter")</div><div class='add'>+__success</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("r1 = {{.*}}; {{.*}}R1=trusted_ptr_task_struct()")</div><div class='add'>+__msg("Func#1 ('subprog_untrusted') is global and assumed valid.")</div><div class='add'>+__msg("Validating subprog_untrusted() func#1...")</div><div class='add'>+__msg(": R1=untrusted_ptr_task_struct")</div><div class='add'>+int trusted_to_untrusted(void *ctx)</div><div class='add'>+{</div><div class='add'>+	return subprog_untrusted(bpf_get_current_task_btf());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char mem[16];</div><div class='add'>+u32 offset;</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/sys_enter")</div><div class='add'>+__success</div><div class='add'>+int anything_to_untrusted(void *ctx)</div><div class='add'>+{</div><div class='add'>+	/* untrusted to untrusted */</div><div class='add'>+	subprog_untrusted(bpf_core_cast(0, struct task_struct));</div><div class='add'>+	/* wrong type to untrusted */</div><div class='add'>+	subprog_untrusted((void *)bpf_core_cast(0, struct bpf_verifier_env));</div><div class='add'>+	/* map value to untrusted */</div><div class='add'>+	subprog_untrusted((void *)mem);</div><div class='add'>+	/* scalar to untrusted */</div><div class='add'>+	subprog_untrusted(0);</div><div class='add'>+	/* variable offset to untrusted (map) */</div><div class='add'>+	subprog_untrusted((void *)mem + offset);</div><div class='add'>+	/* variable offset to untrusted (trusted) */</div><div class='add'>+	subprog_untrusted((void *)bpf_get_current_task_btf() + offset);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__weak int subprog_untrusted2(struct task_struct *task __arg_untrusted)</div><div class='add'>+{</div><div class='add'>+	return subprog_trusted_task_nullable(task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/sys_enter")</div><div class='add'>+__failure</div><div class='add'>+__msg("R1 type=untrusted_ptr_ expected=ptr_, trusted_ptr_, rcu_ptr_")</div><div class='add'>+__msg("Caller passes invalid args into func#{{.*}} ('subprog_trusted_task_nullable')")</div><div class='add'>+int untrusted_to_trusted(void *ctx)</div><div class='add'>+{</div><div class='add'>+	return subprog_untrusted2(bpf_get_current_task_btf());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__weak int subprog_void_untrusted(void *p __arg_untrusted)</div><div class='add'>+{</div><div class='add'>+	return *(int *)p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__weak int subprog_char_untrusted(char *p __arg_untrusted)</div><div class='add'>+{</div><div class='add'>+	return *(int *)p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__weak int subprog_enum_untrusted(enum bpf_attach_type *p __arg_untrusted)</div><div class='add'>+{</div><div class='add'>+	return *(int *)p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/sys_enter")</div><div class='add'>+__success</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("r1 = {{.*}}; {{.*}}R1=trusted_ptr_task_struct()")</div><div class='add'>+__msg("Func#1 ('subprog_void_untrusted') is global and assumed valid.")</div><div class='add'>+__msg("Validating subprog_void_untrusted() func#1...")</div><div class='add'>+__msg(": R1=rdonly_untrusted_mem(sz=0)")</div><div class='add'>+int trusted_to_untrusted_mem(void *ctx)</div><div class='add'>+{</div><div class='add'>+	return subprog_void_untrusted(bpf_get_current_task_btf());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("tp_btf/sys_enter")</div><div class='add'>+__success</div><div class='add'>+int anything_to_untrusted_mem(void *ctx)</div><div class='add'>+{</div><div class='add'>+	/* untrusted to untrusted mem */</div><div class='add'>+	subprog_void_untrusted(bpf_core_cast(0, struct task_struct));</div><div class='add'>+	/* map value to untrusted mem */</div><div class='add'>+	subprog_void_untrusted(mem);</div><div class='add'>+	/* scalar to untrusted mem */</div><div class='add'>+	subprog_void_untrusted(0);</div><div class='add'>+	/* variable offset to untrusted mem (map) */</div><div class='add'>+	subprog_void_untrusted((void *)mem + offset);</div><div class='add'>+	/* variable offset to untrusted mem (trusted) */</div><div class='add'>+	subprog_void_untrusted(bpf_get_current_task_btf() + offset);</div><div class='add'>+	/* variable offset to untrusted char/enum (map) */</div><div class='add'>+	subprog_char_untrusted(mem + offset);</div><div class='add'>+	subprog_enum_untrusted((void *)mem + offset);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_gotol.c b/tools/testing/selftests/bpf/progs/verifier_gotol.c<br/>index 05a329ee45ee..d5d8f24df394 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_gotol.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_gotol.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_gotol.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_gotol.c</a></div><div class='hunk'>@@ -4,11 +4,7 @@</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='ctx'> </div><div class='del'>-#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \</div><div class='del'>-	(defined(__TARGET_ARCH_riscv) &amp;&amp; __riscv_xlen == 64) || \</div><div class='del'>-	defined(__TARGET_ARCH_arm) || defined(__TARGET_ARCH_s390) || \</div><div class='del'>-	defined(__TARGET_ARCH_loongarch)) &amp;&amp; \</div><div class='del'>-	__clang_major__ &gt;= 18</div><div class='add'>+#ifdef CAN_USE_GOTOL</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("gotol, small_imm")</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_gotox.c b/tools/testing/selftests/bpf/progs/verifier_gotox.c<br/>new file mode 100644<br/>index 000000000000..607dad058ca1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_gotox.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_gotox.c</a></div><div class='hunk'>@@ -0,0 +1,389 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Isovalent */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+#include "../../../include/linux/filter.h"</div><div class='add'>+</div><div class='add'>+#if defined(__TARGET_ARCH_x86) || defined(__TARGET_ARCH_arm64)</div><div class='add'>+</div><div class='add'>+#define DEFINE_SIMPLE_JUMP_TABLE_PROG(NAME, SRC_REG, OFF, IMM, OUTCOME)	\</div><div class='add'>+									\</div><div class='add'>+	SEC("socket")							\</div><div class='add'>+	OUTCOME								\</div><div class='add'>+	__naked void jump_table_ ## NAME(void)				\</div><div class='add'>+	{								\</div><div class='add'>+		asm volatile ("						\</div><div class='add'>+		.pushsection .jumptables,\"\",@progbits;		\</div><div class='add'>+	jt0_%=:								\</div><div class='add'>+		.quad ret0_%= - socket;					\</div><div class='add'>+		.quad ret1_%= - socket;					\</div><div class='add'>+		.size jt0_%=, 16;					\</div><div class='add'>+		.global jt0_%=;						\</div><div class='add'>+		.popsection;						\</div><div class='add'>+									\</div><div class='add'>+		r0 = jt0_%= ll;						\</div><div class='add'>+		r0 += 8;						\</div><div class='add'>+		r0 = *(u64 *)(r0 + 0);					\</div><div class='add'>+		.8byte %[gotox_r0];					\</div><div class='add'>+		ret0_%=:						\</div><div class='add'>+		r0 = 0;							\</div><div class='add'>+		exit;							\</div><div class='add'>+		ret1_%=:						\</div><div class='add'>+		r0 = 1;							\</div><div class='add'>+		exit;							\</div><div class='add'>+	"	:							\</div><div class='add'>+		: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_0, (SRC_REG), (OFF) , (IMM))) \</div><div class='add'>+		: __clobber_all);					\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The first program which doesn't use reserved fields</div><div class='add'>+ * loads and works properly. The rest fail to load.</div><div class='add'>+ */</div><div class='add'>+DEFINE_SIMPLE_JUMP_TABLE_PROG(ok,                          BPF_REG_0, 0, 0, __success __retval(1))</div><div class='add'>+DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_src_reg,      BPF_REG_1, 0, 0, __failure __msg("BPF_JA|BPF_X uses reserved fields"))</div><div class='add'>+DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_non_zero_off, BPF_REG_0, 1, 0, __failure __msg("BPF_JA|BPF_X uses reserved fields"))</div><div class='add'>+DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_non_zero_imm, BPF_REG_0, 0, 1, __failure __msg("BPF_JA|BPF_X uses reserved fields"))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Gotox is forbidden when there is no jump table loaded</div><div class='add'>+ * which points to the sub-function where the gotox is used</div><div class='add'>+ */</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure __msg("no jump tables found for subprog starting at 0")</div><div class='add'>+__naked void jump_table_no_jump_table(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("						\</div><div class='add'>+	.8byte %[gotox_r0];					\</div><div class='add'>+	r0 = 1;							\</div><div class='add'>+	exit;							\</div><div class='add'>+"	:							\</div><div class='add'>+	: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_0, 0, 0 , 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Incorrect type of the target register, only PTR_TO_INSN allowed</div><div class='add'>+ */</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure __msg("R1 has type scalar, expected PTR_TO_INSN")</div><div class='add'>+__naked void jump_table_incorrect_dst_reg_type(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("						\</div><div class='add'>+	.pushsection .jumptables,\"\",@progbits;		\</div><div class='add'>+jt0_%=:								\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.size jt0_%=, 16;					\</div><div class='add'>+	.global jt0_%=;						\</div><div class='add'>+	.popsection;						\</div><div class='add'>+								\</div><div class='add'>+	r0 = jt0_%= ll;						\</div><div class='add'>+	r0 += 8;						\</div><div class='add'>+	r0 = *(u64 *)(r0 + 0);					\</div><div class='add'>+	r1 = 42;						\</div><div class='add'>+	.8byte %[gotox_r1];					\</div><div class='add'>+	ret0_%=:						\</div><div class='add'>+	r0 = 0;							\</div><div class='add'>+	exit;							\</div><div class='add'>+	ret1_%=:						\</div><div class='add'>+	r0 = 1;							\</div><div class='add'>+	exit;							\</div><div class='add'>+"	:							\</div><div class='add'>+	: __imm_insn(gotox_r1, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_1, 0, 0 , 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DEFINE_INVALID_SIZE_PROG(READ_SIZE, OUTCOME)			\</div><div class='add'>+									\</div><div class='add'>+	SEC("socket")							\</div><div class='add'>+	OUTCOME								\</div><div class='add'>+	__naked void jump_table_invalid_read_size_ ## READ_SIZE(void)	\</div><div class='add'>+	{								\</div><div class='add'>+		asm volatile ("						\</div><div class='add'>+		.pushsection .jumptables,\"\",@progbits;		\</div><div class='add'>+	jt0_%=:								\</div><div class='add'>+		.quad ret0_%= - socket;					\</div><div class='add'>+		.quad ret1_%= - socket;					\</div><div class='add'>+		.size jt0_%=, 16;					\</div><div class='add'>+		.global jt0_%=;						\</div><div class='add'>+		.popsection;						\</div><div class='add'>+									\</div><div class='add'>+		r0 = jt0_%= ll;						\</div><div class='add'>+		r0 += 8;						\</div><div class='add'>+		r0 = *(" #READ_SIZE " *)(r0 + 0);			\</div><div class='add'>+		.8byte %[gotox_r0];					\</div><div class='add'>+		ret0_%=:						\</div><div class='add'>+		r0 = 0;							\</div><div class='add'>+		exit;							\</div><div class='add'>+		ret1_%=:						\</div><div class='add'>+		r0 = 1;							\</div><div class='add'>+		exit;							\</div><div class='add'>+	"	:							\</div><div class='add'>+		: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_0, 0, 0 , 0)) \</div><div class='add'>+		: __clobber_all);					\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+DEFINE_INVALID_SIZE_PROG(u32, __failure __msg("Invalid read of 4 bytes from insn_array"))</div><div class='add'>+DEFINE_INVALID_SIZE_PROG(u16, __failure __msg("Invalid read of 2 bytes from insn_array"))</div><div class='add'>+DEFINE_INVALID_SIZE_PROG(u8,  __failure __msg("Invalid read of 1 bytes from insn_array"))</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure __msg("misaligned value access off 0+1+0 size 8")</div><div class='add'>+__naked void jump_table_misaligned_access(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("						\</div><div class='add'>+	.pushsection .jumptables,\"\",@progbits;		\</div><div class='add'>+jt0_%=:								\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.size jt0_%=, 16;					\</div><div class='add'>+	.global jt0_%=;						\</div><div class='add'>+	.popsection;						\</div><div class='add'>+								\</div><div class='add'>+	r0 = jt0_%= ll;						\</div><div class='add'>+	r0 += 1;						\</div><div class='add'>+	r0 = *(u64 *)(r0 + 0);					\</div><div class='add'>+	.8byte %[gotox_r0];					\</div><div class='add'>+	ret0_%=:						\</div><div class='add'>+	r0 = 0;							\</div><div class='add'>+	exit;							\</div><div class='add'>+	ret1_%=:						\</div><div class='add'>+	r0 = 1;							\</div><div class='add'>+	exit;							\</div><div class='add'>+"	:							\</div><div class='add'>+	: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_0, 0, 0 , 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure __msg("invalid access to map value, value_size=16 off=24 size=8")</div><div class='add'>+__naked void jump_table_invalid_mem_acceess_pos(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("						\</div><div class='add'>+	.pushsection .jumptables,\"\",@progbits;		\</div><div class='add'>+jt0_%=:								\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.size jt0_%=, 16;					\</div><div class='add'>+	.global jt0_%=;						\</div><div class='add'>+	.popsection;						\</div><div class='add'>+								\</div><div class='add'>+	r0 = jt0_%= ll;						\</div><div class='add'>+	r0 += 24;						\</div><div class='add'>+	r0 = *(u64 *)(r0 + 0);					\</div><div class='add'>+	.8byte %[gotox_r0];					\</div><div class='add'>+	ret0_%=:						\</div><div class='add'>+	r0 = 0;							\</div><div class='add'>+	exit;							\</div><div class='add'>+	ret1_%=:						\</div><div class='add'>+	r0 = 1;							\</div><div class='add'>+	exit;							\</div><div class='add'>+"	:							\</div><div class='add'>+	: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_0, 0, 0 , 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure __msg("invalid access to map value, value_size=16 off=-24 size=8")</div><div class='add'>+__naked void jump_table_invalid_mem_acceess_neg(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("						\</div><div class='add'>+	.pushsection .jumptables,\"\",@progbits;		\</div><div class='add'>+jt0_%=:								\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.size jt0_%=, 16;					\</div><div class='add'>+	.global jt0_%=;						\</div><div class='add'>+	.popsection;						\</div><div class='add'>+								\</div><div class='add'>+	r0 = jt0_%= ll;						\</div><div class='add'>+	r0 -= 24;						\</div><div class='add'>+	r0 = *(u64 *)(r0 + 0);					\</div><div class='add'>+	.8byte %[gotox_r0];					\</div><div class='add'>+	ret0_%=:						\</div><div class='add'>+	r0 = 0;							\</div><div class='add'>+	exit;							\</div><div class='add'>+	ret1_%=:						\</div><div class='add'>+	r0 = 1;							\</div><div class='add'>+	exit;							\</div><div class='add'>+"	:							\</div><div class='add'>+	: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_0, 0, 0 , 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__success __retval(1)</div><div class='add'>+__naked void jump_table_add_sub_ok(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("						\</div><div class='add'>+	.pushsection .jumptables,\"\",@progbits;		\</div><div class='add'>+jt0_%=:								\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.size jt0_%=, 16;					\</div><div class='add'>+	.global jt0_%=;						\</div><div class='add'>+	.popsection;						\</div><div class='add'>+								\</div><div class='add'>+	r0 = jt0_%= ll;						\</div><div class='add'>+	r0 -= 24;						\</div><div class='add'>+	r0 += 32;						\</div><div class='add'>+	r0 = *(u64 *)(r0 + 0);					\</div><div class='add'>+	.8byte %[gotox_r0];					\</div><div class='add'>+	ret0_%=:						\</div><div class='add'>+	r0 = 0;							\</div><div class='add'>+	exit;							\</div><div class='add'>+	ret1_%=:						\</div><div class='add'>+	r0 = 1;							\</div><div class='add'>+	exit;							\</div><div class='add'>+"	:							\</div><div class='add'>+	: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_0, 0, 0 , 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure __msg("write into map forbidden, value_size=16 off=8 size=8")</div><div class='add'>+__naked void jump_table_no_writes(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("						\</div><div class='add'>+	.pushsection .jumptables,\"\",@progbits;		\</div><div class='add'>+jt0_%=:								\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.size jt0_%=, 16;					\</div><div class='add'>+	.global jt0_%=;						\</div><div class='add'>+	.popsection;						\</div><div class='add'>+								\</div><div class='add'>+	r0 = jt0_%= ll;						\</div><div class='add'>+	r0 += 8;						\</div><div class='add'>+	r1 = 0xbeef;						\</div><div class='add'>+	*(u64 *)(r0 + 0) = r1;					\</div><div class='add'>+	.8byte %[gotox_r0];					\</div><div class='add'>+	ret0_%=:						\</div><div class='add'>+	r0 = 0;							\</div><div class='add'>+	exit;							\</div><div class='add'>+	ret1_%=:						\</div><div class='add'>+	r0 = 1;							\</div><div class='add'>+	exit;							\</div><div class='add'>+"	:							\</div><div class='add'>+	: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_0, 0, 0 , 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DEFINE_JUMP_TABLE_USE_REG(REG)					\</div><div class='add'>+	SEC("socket")							\</div><div class='add'>+	__success __retval(1)						\</div><div class='add'>+	__naked void jump_table_use_reg_r ## REG(void)			\</div><div class='add'>+	{								\</div><div class='add'>+		asm volatile ("						\</div><div class='add'>+		.pushsection .jumptables,\"\",@progbits;		\</div><div class='add'>+	jt0_%=:								\</div><div class='add'>+		.quad ret0_%= - socket;					\</div><div class='add'>+		.quad ret1_%= - socket;					\</div><div class='add'>+		.size jt0_%=, 16;					\</div><div class='add'>+		.global jt0_%=;						\</div><div class='add'>+		.popsection;						\</div><div class='add'>+									\</div><div class='add'>+		r0 = jt0_%= ll;						\</div><div class='add'>+		r0 += 8;						\</div><div class='add'>+		r" #REG " = *(u64 *)(r0 + 0);				\</div><div class='add'>+		.8byte %[gotox_rX];					\</div><div class='add'>+		ret0_%=:						\</div><div class='add'>+		r0 = 0;							\</div><div class='add'>+		exit;							\</div><div class='add'>+		ret1_%=:						\</div><div class='add'>+		r0 = 1;							\</div><div class='add'>+		exit;							\</div><div class='add'>+	"	:							\</div><div class='add'>+		: __imm_insn(gotox_rX, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_ ## REG, 0, 0 , 0)) \</div><div class='add'>+		: __clobber_all);					\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+DEFINE_JUMP_TABLE_USE_REG(0)</div><div class='add'>+DEFINE_JUMP_TABLE_USE_REG(1)</div><div class='add'>+DEFINE_JUMP_TABLE_USE_REG(2)</div><div class='add'>+DEFINE_JUMP_TABLE_USE_REG(3)</div><div class='add'>+DEFINE_JUMP_TABLE_USE_REG(4)</div><div class='add'>+DEFINE_JUMP_TABLE_USE_REG(5)</div><div class='add'>+DEFINE_JUMP_TABLE_USE_REG(6)</div><div class='add'>+DEFINE_JUMP_TABLE_USE_REG(7)</div><div class='add'>+DEFINE_JUMP_TABLE_USE_REG(8)</div><div class='add'>+DEFINE_JUMP_TABLE_USE_REG(9)</div><div class='add'>+</div><div class='add'>+__used static int test_subprog(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure __msg("jump table for insn 4 points outside of the subprog [0,10]")</div><div class='add'>+__naked void jump_table_outside_subprog(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("						\</div><div class='add'>+	.pushsection .jumptables,\"\",@progbits;		\</div><div class='add'>+jt0_%=:								\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.quad ret_out_%= - socket;				\</div><div class='add'>+	.size jt0_%=, 24;					\</div><div class='add'>+	.global jt0_%=;						\</div><div class='add'>+	.popsection;						\</div><div class='add'>+								\</div><div class='add'>+	r0 = jt0_%= ll;						\</div><div class='add'>+	r0 += 8;						\</div><div class='add'>+	r0 = *(u64 *)(r0 + 0);					\</div><div class='add'>+	.8byte %[gotox_r0];					\</div><div class='add'>+	ret0_%=:						\</div><div class='add'>+	r0 = 0;							\</div><div class='add'>+	exit;							\</div><div class='add'>+	ret1_%=:						\</div><div class='add'>+	r0 = 1;							\</div><div class='add'>+	call test_subprog;					\</div><div class='add'>+	exit;							\</div><div class='add'>+	ret_out_%=:						\</div><div class='add'>+"	:							\</div><div class='add'>+	: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_0, 0, 0 , 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__success __retval(1)</div><div class='add'>+__naked void jump_table_contains_non_unique_values(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("						\</div><div class='add'>+	.pushsection .jumptables,\"\",@progbits;		\</div><div class='add'>+jt0_%=:								\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.quad ret0_%= - socket;					\</div><div class='add'>+	.quad ret1_%= - socket;					\</div><div class='add'>+	.size jt0_%=, 80;					\</div><div class='add'>+	.global jt0_%=;						\</div><div class='add'>+	.popsection;						\</div><div class='add'>+								\</div><div class='add'>+	r0 = jt0_%= ll;						\</div><div class='add'>+	r0 += 8;						\</div><div class='add'>+	r0 = *(u64 *)(r0 + 0);					\</div><div class='add'>+	.8byte %[gotox_r0];					\</div><div class='add'>+	ret0_%=:						\</div><div class='add'>+	r0 = 0;							\</div><div class='add'>+	exit;							\</div><div class='add'>+	ret1_%=:						\</div><div class='add'>+	r0 = 1;							\</div><div class='add'>+	exit;							\</div><div class='add'>+"	:							\</div><div class='add'>+	: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X, BPF_REG_0, 0, 0 , 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __TARGET_ARCH_x86 || __TARGET_ARCH_arm64 */</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c b/tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c<br/>index e54bb5385bc1..75dd922e4e9f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c</a></div><div class='hunk'>@@ -407,11 +407,7 @@ l0_%=:	call %[bpf_jiffies64];		\</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \</div><div class='del'>-	(defined(__TARGET_ARCH_riscv) &amp;&amp; __riscv_xlen == 64) || \</div><div class='del'>-	defined(__TARGET_ARCH_arm) || defined(__TARGET_ARCH_s390) || \</div><div class='del'>-	defined(__TARGET_ARCH_loongarch)) &amp;&amp; \</div><div class='del'>-	__clang_major__ &gt;= 18</div><div class='add'>+#ifdef CAN_USE_GOTOL</div><div class='ctx'> SEC("socket")</div><div class='ctx'> __success __retval(0)</div><div class='ctx'> __naked void gotol_and_may_goto(void)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_ldsx.c b/tools/testing/selftests/bpf/progs/verifier_ldsx.c<br/>index 52edee41caf6..c8494b682c31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_ldsx.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_ldsx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_ldsx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_ldsx.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='add'>+#include "bpf_arena_common.h"</div><div class='ctx'> </div><div class='ctx'> #if (defined(__TARGET_ARCH_arm64) || defined(__TARGET_ARCH_x86) || \</div><div class='ctx'> 	(defined(__TARGET_ARCH_riscv) &amp;&amp; __riscv_xlen == 64) || \</div><div class='hunk'>@@ -10,6 +11,12 @@</div><div class='ctx'> 	defined(__TARGET_ARCH_loongarch)) &amp;&amp; \</div><div class='ctx'> 	__clang_major__ &gt;= 18</div><div class='ctx'> </div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARENA);</div><div class='add'>+	__uint(map_flags, BPF_F_MMAPABLE);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+} arena SEC(".maps");</div><div class='add'>+</div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("LDSX, S8")</div><div class='ctx'> __success __success_unpriv __retval(-2)</div><div class='hunk'>@@ -65,7 +72,7 @@ __naked void ldsx_s32(void)</div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("LDSX, S8 range checking, privileged")</div><div class='ctx'> __log_level(2) __success __retval(1)</div><div class='del'>-__msg("R1_w=scalar(smin=smin32=-128,smax=smax32=127)")</div><div class='add'>+__msg("R1=scalar(smin=smin32=-128,smax=smax32=127)")</div><div class='ctx'> __naked void ldsx_s8_range_priv(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -256,6 +263,175 @@ __naked void ldsx_ctx_8(void)</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("syscall")</div><div class='add'>+__description("Arena LDSX Disasm")</div><div class='add'>+__success</div><div class='add'>+__arch_x86_64</div><div class='add'>+__jited("movslq	0x10(%rax,%r12), %r14")</div><div class='add'>+__jited("movswq	0x18(%rax,%r12), %r14")</div><div class='add'>+__jited("movsbq	0x20(%rax,%r12), %r14")</div><div class='add'>+__jited("movslq	0x10(%rdi,%r12), %r15")</div><div class='add'>+__jited("movswq	0x18(%rdi,%r12), %r15")</div><div class='add'>+__jited("movsbq	0x20(%rdi,%r12), %r15")</div><div class='add'>+__arch_arm64</div><div class='add'>+__jited("add	x11, x7, x28")</div><div class='add'>+__jited("ldrsw	x21, [x11, #0x10]")</div><div class='add'>+__jited("add	x11, x7, x28")</div><div class='add'>+__jited("ldrsh	x21, [x11, #0x18]")</div><div class='add'>+__jited("add	x11, x7, x28")</div><div class='add'>+__jited("ldrsb	x21, [x11, #0x20]")</div><div class='add'>+__jited("add	x11, x0, x28")</div><div class='add'>+__jited("ldrsw	x22, [x11, #0x10]")</div><div class='add'>+__jited("add	x11, x0, x28")</div><div class='add'>+__jited("ldrsh	x22, [x11, #0x18]")</div><div class='add'>+__jited("add	x11, x0, x28")</div><div class='add'>+__jited("ldrsb	x22, [x11, #0x20]")</div><div class='add'>+__naked void arena_ldsx_disasm(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = %[arena] ll;"</div><div class='add'>+	"r2 = 0;"</div><div class='add'>+	"r3 = 1;"</div><div class='add'>+	"r4 = %[numa_no_node];"</div><div class='add'>+	"r5 = 0;"</div><div class='add'>+	"call %[bpf_arena_alloc_pages];"</div><div class='add'>+	"r0 = addr_space_cast(r0, 0x0, 0x1);"</div><div class='add'>+	"r1 = r0;"</div><div class='add'>+	"r8 = *(s32 *)(r0 + 16);"</div><div class='add'>+	"r8 = *(s16 *)(r0 + 24);"</div><div class='add'>+	"r8 = *(s8  *)(r0 + 32);"</div><div class='add'>+	"r9 = *(s32 *)(r1 + 16);"</div><div class='add'>+	"r9 = *(s16 *)(r1 + 24);"</div><div class='add'>+	"r9 = *(s8  *)(r1 + 32);"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:: __imm(bpf_arena_alloc_pages),</div><div class='add'>+	   __imm_addr(arena),</div><div class='add'>+	   __imm_const(numa_no_node, NUMA_NO_NODE)</div><div class='add'>+	:  __clobber_all</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__description("Arena LDSX Exception")</div><div class='add'>+__success __retval(0)</div><div class='add'>+__arch_x86_64</div><div class='add'>+__arch_arm64</div><div class='add'>+__naked void arena_ldsx_exception(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = %[arena] ll;"</div><div class='add'>+	"r0 = 0xdeadbeef;"</div><div class='add'>+	"r0 = addr_space_cast(r0, 0x0, 0x1);"</div><div class='add'>+	"r1 = 0x3fe;"</div><div class='add'>+	"*(u64 *)(r0 + 0) = r1;"</div><div class='add'>+	"r0 = *(s8 *)(r0 + 0);"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	:  __imm_addr(arena)</div><div class='add'>+	:  __clobber_all</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__description("Arena LDSX, S8")</div><div class='add'>+__success __retval(-1)</div><div class='add'>+__arch_x86_64</div><div class='add'>+__arch_arm64</div><div class='add'>+__naked void arena_ldsx_s8(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = %[arena] ll;"</div><div class='add'>+	"r2 = 0;"</div><div class='add'>+	"r3 = 1;"</div><div class='add'>+	"r4 = %[numa_no_node];"</div><div class='add'>+	"r5 = 0;"</div><div class='add'>+	"call %[bpf_arena_alloc_pages];"</div><div class='add'>+	"r0 = addr_space_cast(r0, 0x0, 0x1);"</div><div class='add'>+	"r1 = 0x3fe;"</div><div class='add'>+	"*(u64 *)(r0 + 0) = r1;"</div><div class='add'>+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='add'>+	"r0 = *(s8 *)(r0 + 0);"</div><div class='add'>+#else</div><div class='add'>+	"r0 = *(s8 *)(r0 + 7);"</div><div class='add'>+#endif</div><div class='add'>+	"r0 &gt;&gt;= 1;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:: __imm(bpf_arena_alloc_pages),</div><div class='add'>+	   __imm_addr(arena),</div><div class='add'>+	   __imm_const(numa_no_node, NUMA_NO_NODE)</div><div class='add'>+	:  __clobber_all</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__description("Arena LDSX, S16")</div><div class='add'>+__success __retval(-1)</div><div class='add'>+__arch_x86_64</div><div class='add'>+__arch_arm64</div><div class='add'>+__naked void arena_ldsx_s16(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = %[arena] ll;"</div><div class='add'>+	"r2 = 0;"</div><div class='add'>+	"r3 = 1;"</div><div class='add'>+	"r4 = %[numa_no_node];"</div><div class='add'>+	"r5 = 0;"</div><div class='add'>+	"call %[bpf_arena_alloc_pages];"</div><div class='add'>+	"r0 = addr_space_cast(r0, 0x0, 0x1);"</div><div class='add'>+	"r1 = 0x3fffe;"</div><div class='add'>+	"*(u64 *)(r0 + 0) = r1;"</div><div class='add'>+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='add'>+	"r0 = *(s16 *)(r0 + 0);"</div><div class='add'>+#else</div><div class='add'>+	"r0 = *(s16 *)(r0 + 6);"</div><div class='add'>+#endif</div><div class='add'>+	"r0 &gt;&gt;= 1;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:: __imm(bpf_arena_alloc_pages),</div><div class='add'>+	   __imm_addr(arena),</div><div class='add'>+	   __imm_const(numa_no_node, NUMA_NO_NODE)</div><div class='add'>+	:  __clobber_all</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("syscall")</div><div class='add'>+__description("Arena LDSX, S32")</div><div class='add'>+__success __retval(-1)</div><div class='add'>+__arch_x86_64</div><div class='add'>+__arch_arm64</div><div class='add'>+__naked void arena_ldsx_s32(void *ctx)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = %[arena] ll;"</div><div class='add'>+	"r2 = 0;"</div><div class='add'>+	"r3 = 1;"</div><div class='add'>+	"r4 = %[numa_no_node];"</div><div class='add'>+	"r5 = 0;"</div><div class='add'>+	"call %[bpf_arena_alloc_pages];"</div><div class='add'>+	"r0 = addr_space_cast(r0, 0x0, 0x1);"</div><div class='add'>+	"r1 = 0xfffffffe;"</div><div class='add'>+	"*(u64 *)(r0 + 0) = r1;"</div><div class='add'>+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__</div><div class='add'>+	"r0 = *(s32 *)(r0 + 0);"</div><div class='add'>+#else</div><div class='add'>+	"r0 = *(s32 *)(r0 + 4);"</div><div class='add'>+#endif</div><div class='add'>+	"r0 &gt;&gt;= 1;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:: __imm(bpf_arena_alloc_pages),</div><div class='add'>+	   __imm_addr(arena),</div><div class='add'>+	   __imm_const(numa_no_node, NUMA_NO_NODE)</div><div class='add'>+	:  __clobber_all</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* to retain debug info for BTF generation */</div><div class='add'>+void kfunc_root(void)</div><div class='add'>+{</div><div class='add'>+	bpf_arena_alloc_pages(0, 0, 0, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_live_stack.c b/tools/testing/selftests/bpf/progs/verifier_live_stack.c<br/>new file mode 100644<br/>index 000000000000..2de105057bbc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_live_stack.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_live_stack.c</a></div><div class='hunk'>@@ -0,0 +1,344 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, long long);</div><div class='add'>+} map SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("(0) frame 0 insn 2 +written -8")</div><div class='add'>+__msg("(0) frame 0 insn 1 +live -24")</div><div class='add'>+__msg("(0) frame 0 insn 1 +written -8")</div><div class='add'>+__msg("(0) frame 0 insn 0 +live -8,-24")</div><div class='add'>+__msg("(0) frame 0 insn 0 +written -8")</div><div class='add'>+__msg("(0) live stack update done in 2 iterations")</div><div class='add'>+__naked void simple_read_simple_write(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = *(u64 *)(r10 - 8);"</div><div class='add'>+	"r2 = *(u64 *)(r10 - 24);"</div><div class='add'>+	"*(u64 *)(r10 - 8) = r1;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("(0) frame 0 insn 1 +live -8")</div><div class='add'>+__not_msg("(0) frame 0 insn 1 +written")</div><div class='add'>+__msg("(0) live stack update done in 2 iterations")</div><div class='add'>+__msg("(0) frame 0 insn 1 +live -16")</div><div class='add'>+__msg("(0) frame 0 insn 1 +written -32")</div><div class='add'>+__msg("(0) live stack update done in 2 iterations")</div><div class='add'>+__naked void read_write_join(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"call %[bpf_get_prandom_u32];"</div><div class='add'>+	"if r0 &gt; 42 goto 1f;"</div><div class='add'>+	"r0 = *(u64 *)(r10 - 8);"</div><div class='add'>+	"*(u64 *)(r10 - 32) = r0;"</div><div class='add'>+	"*(u64 *)(r10 - 40) = r0;"</div><div class='add'>+	"exit;"</div><div class='add'>+"1:"</div><div class='add'>+	"r0 = *(u64 *)(r10 - 16);"</div><div class='add'>+	"*(u64 *)(r10 - 32) = r0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("2: (25) if r0 &gt; 0x2a goto pc+1")</div><div class='add'>+__msg("7: (95) exit")</div><div class='add'>+__msg("(0) frame 0 insn 2 +written -16")</div><div class='add'>+__msg("(0) live stack update done in 2 iterations")</div><div class='add'>+__msg("7: (95) exit")</div><div class='add'>+__not_msg("(0) frame 0 insn 2")</div><div class='add'>+__msg("(0) live stack update done in 1 iterations")</div><div class='add'>+__naked void must_write_not_same_slot(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"call %[bpf_get_prandom_u32];"</div><div class='add'>+	"r1 = -8;"</div><div class='add'>+	"if r0 &gt; 42 goto 1f;"</div><div class='add'>+	"r1 = -16;"</div><div class='add'>+"1:"</div><div class='add'>+	"r2 = r10;"</div><div class='add'>+	"r2 += r1;"</div><div class='add'>+	"*(u64 *)(r2 + 0) = r0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("(0) frame 0 insn 0 +written -8,-16")</div><div class='add'>+__msg("(0) live stack update done in 2 iterations")</div><div class='add'>+__msg("(0) frame 0 insn 0 +written -8")</div><div class='add'>+__msg("(0) live stack update done in 2 iterations")</div><div class='add'>+__naked void must_write_not_same_type(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"*(u64*)(r10 - 8) = 0;"</div><div class='add'>+	"r2 = r10;"</div><div class='add'>+	"r2 += -8;"</div><div class='add'>+	"r1 = %[map] ll;"</div><div class='add'>+	"call %[bpf_map_lookup_elem];"</div><div class='add'>+	"if r0 != 0 goto 1f;"</div><div class='add'>+	"r0 = r10;"</div><div class='add'>+	"r0 += -16;"</div><div class='add'>+"1:"</div><div class='add'>+	"*(u64 *)(r0 + 0) = 42;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+        : __imm(bpf_get_prandom_u32),</div><div class='add'>+	  __imm(bpf_map_lookup_elem),</div><div class='add'>+	  __imm_addr(map)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+__msg("(2,4) frame 0 insn 4 +written -8")</div><div class='add'>+__msg("(2,4) live stack update done in 2 iterations")</div><div class='add'>+__msg("(0) frame 0 insn 2 +written -8")</div><div class='add'>+__msg("(0) live stack update done in 2 iterations")</div><div class='add'>+__naked void caller_stack_write(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = r10;"</div><div class='add'>+	"r1 += -8;"</div><div class='add'>+	"call write_first_param;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __used __naked void write_first_param(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"*(u64 *)(r1 + 0) = 7;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__log_level(2)</div><div class='add'>+/* caller_stack_read() function */</div><div class='add'>+__msg("2: .12345.... (85) call pc+4")</div><div class='add'>+__msg("5: .12345.... (85) call pc+1")</div><div class='add'>+__msg("6: 0......... (95) exit")</div><div class='add'>+/* read_first_param() function */</div><div class='add'>+__msg("7: .1........ (79) r0 = *(u64 *)(r1 +0)")</div><div class='add'>+__msg("8: 0......... (95) exit")</div><div class='add'>+/* update for callsite at (2) */</div><div class='add'>+__msg("(2,7) frame 0 insn 7 +live -8")</div><div class='add'>+__msg("(2,7) live stack update done in 2 iterations")</div><div class='add'>+__msg("(0) frame 0 insn 2 +live -8")</div><div class='add'>+__msg("(0) live stack update done in 2 iterations")</div><div class='add'>+/* update for callsite at (5) */</div><div class='add'>+__msg("(5,7) frame 0 insn 7 +live -16")</div><div class='add'>+__msg("(5,7) live stack update done in 2 iterations")</div><div class='add'>+__msg("(0) frame 0 insn 5 +live -16")</div><div class='add'>+__msg("(0) live stack update done in 2 iterations")</div><div class='add'>+__naked void caller_stack_read(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = r10;"</div><div class='add'>+	"r1 += -8;"</div><div class='add'>+	"call read_first_param;"</div><div class='add'>+	"r1 = r10;"</div><div class='add'>+	"r1 += -16;"</div><div class='add'>+	"call read_first_param;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __used __naked void read_first_param(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = *(u64 *)(r1 + 0);"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__flag(BPF_F_TEST_STATE_FREQ)</div><div class='add'>+__log_level(2)</div><div class='add'>+/* read_first_param2() function */</div><div class='add'>+__msg(" 9: .1........ (79) r0 = *(u64 *)(r1 +0)")</div><div class='add'>+__msg("10: .......... (b7) r0 = 0")</div><div class='add'>+__msg("11: 0......... (05) goto pc+0")</div><div class='add'>+__msg("12: 0......... (95) exit")</div><div class='add'>+/*</div><div class='add'>+ * The purpose of the test is to check that checkpoint in</div><div class='add'>+ * read_first_param2() stops path traversal. This will only happen if</div><div class='add'>+ * verifier understands that fp[0]-8 at insn (12) is not alive.</div><div class='add'>+ */</div><div class='add'>+__msg("12: safe")</div><div class='add'>+__msg("processed 20 insns")</div><div class='add'>+__naked void caller_stack_pruning(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"call %[bpf_get_prandom_u32];"</div><div class='add'>+	"if r0 == 42 goto 1f;"</div><div class='add'>+	"r0 = %[map] ll;"</div><div class='add'>+"1:"</div><div class='add'>+	"*(u64 *)(r10 - 8) = r0;"</div><div class='add'>+	"r1 = r10;"</div><div class='add'>+	"r1 += -8;"</div><div class='add'>+	/*</div><div class='add'>+	 * fp[0]-8 is either pointer to map or a scalar,</div><div class='add'>+	 * preventing state pruning at checkpoint created for call.</div><div class='add'>+	 */</div><div class='add'>+	"call read_first_param2;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32),</div><div class='add'>+	  __imm_addr(map)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __used __naked void read_first_param2(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = *(u64 *)(r1 + 0);"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	/*</div><div class='add'>+	 * Checkpoint at goto +0 should fire,</div><div class='add'>+	 * as caller stack fp[0]-8 is not alive at this point.</div><div class='add'>+	 */</div><div class='add'>+	"goto +0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__flag(BPF_F_TEST_STATE_FREQ)</div><div class='add'>+__failure</div><div class='add'>+__msg("R1 type=scalar expected=map_ptr")</div><div class='add'>+__naked void caller_stack_pruning_callback(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = %[map] ll;"</div><div class='add'>+	"*(u64 *)(r10 - 8) = r0;"</div><div class='add'>+	"r1 = 2;"</div><div class='add'>+	"r2 = loop_cb ll;"</div><div class='add'>+	"r3 = r10;"</div><div class='add'>+	"r3 += -8;"</div><div class='add'>+	"r4 = 0;"</div><div class='add'>+	/*</div><div class='add'>+	 * fp[0]-8 is either pointer to map or a scalar,</div><div class='add'>+	 * preventing state pruning at checkpoint created for call.</div><div class='add'>+	 */</div><div class='add'>+	"call %[bpf_loop];"</div><div class='add'>+	"r0 = 42;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32),</div><div class='add'>+	  __imm(bpf_loop),</div><div class='add'>+	  __imm_addr(map)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __used __naked void loop_cb(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	/*</div><div class='add'>+	 * Checkpoint at function entry should not fire, as caller</div><div class='add'>+	 * stack fp[0]-8 is alive at this point.</div><div class='add'>+	 */</div><div class='add'>+	"r6 = r2;"</div><div class='add'>+	"r1 = *(u64 *)(r6 + 0);"</div><div class='add'>+	"*(u64*)(r10 - 8) = 7;"</div><div class='add'>+	"r2 = r10;"</div><div class='add'>+	"r2 += -8;"</div><div class='add'>+	"call %[bpf_map_lookup_elem];"</div><div class='add'>+	/*</div><div class='add'>+	 * This should stop verifier on a second loop iteration,</div><div class='add'>+	 * but only if verifier correctly maintains that fp[0]-8</div><div class='add'>+	 * is still alive.</div><div class='add'>+	 */</div><div class='add'>+	"*(u64 *)(r6 + 0) = 0;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_map_lookup_elem),</div><div class='add'>+	  __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Because of a bug in verifier.c:compute_postorder()</div><div class='add'>+ * the program below overflowed traversal queue in that function.</div><div class='add'>+ */</div><div class='add'>+SEC("socket")</div><div class='add'>+__naked void syzbot_postorder_bug1(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"if r0 != 0 goto -1;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+        __uint(type, BPF_MAP_TYPE_PROG_ARRAY);</div><div class='add'>+        __uint(max_entries, 1);</div><div class='add'>+        __type(key, __u32);</div><div class='add'>+        __type(value, __u32);</div><div class='add'>+} map_array SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__failure __msg("invalid read from stack R2 off=-1024 size=8")</div><div class='add'>+__flag(BPF_F_TEST_STATE_FREQ)</div><div class='add'>+__naked unsigned long caller_stack_write_tail_call(void)</div><div class='add'>+{</div><div class='add'>+        asm volatile (</div><div class='add'>+	"r6 = r1;"</div><div class='add'>+	"*(u64 *)(r10 - 8) = -8;"</div><div class='add'>+        "call %[bpf_get_prandom_u32];"</div><div class='add'>+        "if r0 != 42 goto 1f;"</div><div class='add'>+        "goto 2f;"</div><div class='add'>+  "1:"</div><div class='add'>+        "*(u64 *)(r10 - 8) = -1024;"</div><div class='add'>+  "2:"</div><div class='add'>+        "r1 = r6;"</div><div class='add'>+        "r2 = r10;"</div><div class='add'>+        "r2 += -8;"</div><div class='add'>+        "call write_tail_call;"</div><div class='add'>+        "r1 = *(u64 *)(r10 - 8);"</div><div class='add'>+        "r2 = r10;"</div><div class='add'>+        "r2 += r1;"</div><div class='add'>+        "r0 = *(u64 *)(r2 + 0);"</div><div class='add'>+        "exit;"</div><div class='add'>+        :: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __used __naked unsigned long write_tail_call(void)</div><div class='add'>+{</div><div class='add'>+        asm volatile (</div><div class='add'>+        "r6 = r2;"</div><div class='add'>+        "r2 = %[map_array] ll;"</div><div class='add'>+        "r3 = 0;"</div><div class='add'>+        "call %[bpf_tail_call];"</div><div class='add'>+        "*(u64 *)(r6 + 0) = -16;"</div><div class='add'>+        "r0 = 0;"</div><div class='add'>+        "exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm(bpf_tail_call),</div><div class='add'>+          __imm_addr(map_array)</div><div class='add'>+        : __clobber_all);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_load_acquire.c b/tools/testing/selftests/bpf/progs/verifier_load_acquire.c<br/>new file mode 100644<br/>index 000000000000..74f4f19c10b8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_load_acquire.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_load_acquire.c</a></div><div class='hunk'>@@ -0,0 +1,234 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Google LLC. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "../../../include/linux/filter.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+#ifdef CAN_USE_LOAD_ACQ_STORE_REL</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("load-acquire, 8-bit")</div><div class='add'>+__success __success_unpriv __retval(0)</div><div class='add'>+__naked void load_acquire_8(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"w1 = 0xfe;"</div><div class='add'>+	"*(u8 *)(r10 - 1) = w1;"</div><div class='add'>+	".8byte %[load_acquire_insn];" // w2 = load_acquire((u8 *)(r10 - 1));</div><div class='add'>+	"if r2 == r1 goto 1f;"</div><div class='add'>+	"r0 = 1;"</div><div class='add'>+"1:"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_B, BPF_LOAD_ACQ, BPF_REG_2, BPF_REG_10, -1))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("load-acquire, 16-bit")</div><div class='add'>+__success __success_unpriv __retval(0)</div><div class='add'>+__naked void load_acquire_16(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"w1 = 0xfedc;"</div><div class='add'>+	"*(u16 *)(r10 - 2) = w1;"</div><div class='add'>+	".8byte %[load_acquire_insn];" // w2 = load_acquire((u16 *)(r10 - 2));</div><div class='add'>+	"if r2 == r1 goto 1f;"</div><div class='add'>+	"r0 = 1;"</div><div class='add'>+"1:"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_H, BPF_LOAD_ACQ, BPF_REG_2, BPF_REG_10, -2))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("load-acquire, 32-bit")</div><div class='add'>+__success __success_unpriv __retval(0)</div><div class='add'>+__naked void load_acquire_32(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"w1 = 0xfedcba09;"</div><div class='add'>+	"*(u32 *)(r10 - 4) = w1;"</div><div class='add'>+	".8byte %[load_acquire_insn];" // w2 = load_acquire((u32 *)(r10 - 4));</div><div class='add'>+	"if r2 == r1 goto 1f;"</div><div class='add'>+	"r0 = 1;"</div><div class='add'>+"1:"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_W, BPF_LOAD_ACQ, BPF_REG_2, BPF_REG_10, -4))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("load-acquire, 64-bit")</div><div class='add'>+__success __success_unpriv __retval(0)</div><div class='add'>+__naked void load_acquire_64(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"r1 = 0xfedcba0987654321 ll;"</div><div class='add'>+	"*(u64 *)(r10 - 8) = r1;"</div><div class='add'>+	".8byte %[load_acquire_insn];" // r2 = load_acquire((u64 *)(r10 - 8));</div><div class='add'>+	"if r2 == r1 goto 1f;"</div><div class='add'>+	"r0 = 1;"</div><div class='add'>+"1:"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_LOAD_ACQ, BPF_REG_2, BPF_REG_10, -8))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("load-acquire with uninitialized src_reg")</div><div class='add'>+__failure __failure_unpriv __msg("R2 !read_ok")</div><div class='add'>+__naked void load_acquire_with_uninitialized_src_reg(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	".8byte %[load_acquire_insn];" // r0 = load_acquire((u64 *)(r2 + 0));</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_LOAD_ACQ, BPF_REG_0, BPF_REG_2, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("load-acquire with non-pointer src_reg")</div><div class='add'>+__failure __failure_unpriv __msg("R1 invalid mem access 'scalar'")</div><div class='add'>+__naked void load_acquire_with_non_pointer_src_reg(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = 0;"</div><div class='add'>+	".8byte %[load_acquire_insn];" // r0 = load_acquire((u64 *)(r1 + 0));</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_LOAD_ACQ, BPF_REG_0, BPF_REG_1, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("misaligned load-acquire")</div><div class='add'>+__failure __failure_unpriv __msg("misaligned stack access off")</div><div class='add'>+__flag(BPF_F_ANY_ALIGNMENT)</div><div class='add'>+__naked void load_acquire_misaligned(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = 0;"</div><div class='add'>+	"*(u64 *)(r10 - 8) = r1;"</div><div class='add'>+	".8byte %[load_acquire_insn];" // w0 = load_acquire((u32 *)(r10 - 5));</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_W, BPF_LOAD_ACQ, BPF_REG_0, BPF_REG_10, -5))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("load-acquire from ctx pointer")</div><div class='add'>+__failure __failure_unpriv __msg("BPF_ATOMIC loads from R1 ctx is not allowed")</div><div class='add'>+__naked void load_acquire_from_ctx_pointer(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	".8byte %[load_acquire_insn];" // w0 = load_acquire((u8 *)(r1 + 0));</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_B, BPF_LOAD_ACQ, BPF_REG_0, BPF_REG_1, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+__description("load-acquire from pkt pointer")</div><div class='add'>+__failure __msg("BPF_ATOMIC loads from R2 pkt is not allowed")</div><div class='add'>+__naked void load_acquire_from_pkt_pointer(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r2 = *(u32 *)(r1 + %[xdp_md_data]);"</div><div class='add'>+	"r3 = *(u32 *)(r1 + %[xdp_md_data_end]);"</div><div class='add'>+	"r1 = r2;"</div><div class='add'>+	"r1 += 8;"</div><div class='add'>+	"if r1 &gt;= r3 goto l0_%=;"</div><div class='add'>+	".8byte %[load_acquire_insn];" // w0 = load_acquire((u8 *)(r2 + 0));</div><div class='add'>+"l0_%=:  r0 = 0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_const(xdp_md_data, offsetof(struct xdp_md, data)),</div><div class='add'>+	  __imm_const(xdp_md_data_end, offsetof(struct xdp_md, data_end)),</div><div class='add'>+	  __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_B, BPF_LOAD_ACQ, BPF_REG_0, BPF_REG_2, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("flow_dissector")</div><div class='add'>+__description("load-acquire from flow_keys pointer")</div><div class='add'>+__failure __msg("BPF_ATOMIC loads from R2 flow_keys is not allowed")</div><div class='add'>+__naked void load_acquire_from_flow_keys_pointer(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r2 = *(u64 *)(r1 + %[__sk_buff_flow_keys]);"</div><div class='add'>+	".8byte %[load_acquire_insn];" // w0 = load_acquire((u8 *)(r2 + 0));</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_const(__sk_buff_flow_keys,</div><div class='add'>+		      offsetof(struct __sk_buff, flow_keys)),</div><div class='add'>+	  __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_B, BPF_LOAD_ACQ, BPF_REG_0, BPF_REG_2, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sk_reuseport")</div><div class='add'>+__description("load-acquire from sock pointer")</div><div class='add'>+__failure __msg("BPF_ATOMIC loads from R2 sock is not allowed")</div><div class='add'>+__naked void load_acquire_from_sock_pointer(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r2 = *(u64 *)(r1 + %[sk_reuseport_md_sk]);"</div><div class='add'>+	// w0 = load_acquire((u8 *)(r2 + offsetof(struct bpf_sock, family)));</div><div class='add'>+	".8byte %[load_acquire_insn];"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_const(sk_reuseport_md_sk, offsetof(struct sk_reuseport_md, sk)),</div><div class='add'>+	  __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_B, BPF_LOAD_ACQ, BPF_REG_0, BPF_REG_2,</div><div class='add'>+				   offsetof(struct bpf_sock, family)))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("load-acquire with invalid register R15")</div><div class='add'>+__failure __failure_unpriv __msg("R15 is invalid")</div><div class='add'>+__naked void load_acquire_with_invalid_reg(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	".8byte %[load_acquire_insn];" // r0 = load_acquire((u64 *)(r15 + 0));</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_LOAD_ACQ, BPF_REG_0, 15 /* invalid reg */, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CAN_USE_LOAD_ACQ_STORE_REL */</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("Clang version &lt; 18, ENABLE_ATOMICS_TESTS not defined, and/or JIT doesn't support load-acquire, use a dummy test")</div><div class='add'>+__success</div><div class='add'>+int dummy_test(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CAN_USE_LOAD_ACQ_STORE_REL */</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_loops1.c b/tools/testing/selftests/bpf/progs/verifier_loops1.c<br/>index e07b43b78fd2..fbdde80e7b90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_loops1.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_loops1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_loops1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_loops1.c</a></div><div class='hunk'>@@ -283,4 +283,25 @@ exit_%=:						\</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This test case triggered a bug in verifier.c:maybe_exit_scc().</div><div class='add'>+ * Speculative execution path reaches stack access instruction,</div><div class='add'>+ * stops and triggers maybe_exit_scc() w/o accompanying maybe_enter_scc() call.</div><div class='add'>+ */</div><div class='add'>+SEC("socket")</div><div class='add'>+__arch_x86_64</div><div class='add'>+__caps_unpriv(CAP_BPF)</div><div class='add'>+__naked void maybe_exit_scc_bug1(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 100;"</div><div class='add'>+"1:"</div><div class='add'>+	/* Speculative execution path reaches and stops here. */</div><div class='add'>+	"*(u64 *)(r10 - 512) = r0;"</div><div class='add'>+	/* Condition is always false, but verifier speculatively executes the true branch. */</div><div class='add'>+	"if r0 &lt;= 0x0 goto 1b;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_lsm.c b/tools/testing/selftests/bpf/progs/verifier_lsm.c<br/>index 32e5e779cb96..6af9100a37ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_lsm.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_lsm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_lsm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_lsm.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='ctx'> </div><div class='del'>-SEC("lsm/file_alloc_security")</div><div class='add'>+SEC("lsm/file_permission")</div><div class='ctx'> __description("lsm bpf prog with -4095~0 retval. test 1")</div><div class='ctx'> __success</div><div class='ctx'> __naked int errno_zero_retval_test1(void *ctx)</div><div class='hunk'>@@ -15,7 +15,7 @@ __naked int errno_zero_retval_test1(void *ctx)</div><div class='ctx'> 	::: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-SEC("lsm/file_alloc_security")</div><div class='add'>+SEC("lsm/file_permission")</div><div class='ctx'> __description("lsm bpf prog with -4095~0 retval. test 2")</div><div class='ctx'> __success</div><div class='ctx'> __naked int errno_zero_retval_test2(void *ctx)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_map_in_map.c b/tools/testing/selftests/bpf/progs/verifier_map_in_map.c<br/>index 7d088ba99ea5..16b761e510f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_map_in_map.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_map_in_map.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_map_in_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_map_in_map.c</a></div><div class='hunk'>@@ -139,4 +139,122 @@ __naked void on_the_inner_map_pointer(void)</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("socket")</div><div class='add'>+__description("map_ptr is never null")</div><div class='add'>+__success</div><div class='add'>+__naked void map_ptr_is_never_null(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r0 = 0;						\</div><div class='add'>+	r1 = %[map_in_map] ll;				\</div><div class='add'>+	if r1 != 0 goto l0_%=;				\</div><div class='add'>+	r10 = 42;					\</div><div class='add'>+l0_%=:	exit;						\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_map_lookup_elem),</div><div class='add'>+	  __imm_addr(map_in_map)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("map_ptr is never null inner")</div><div class='add'>+__success</div><div class='add'>+__naked void map_ptr_is_never_null_inner(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r1 = 0;						\</div><div class='add'>+	*(u32*)(r10 - 4) = r1;				\</div><div class='add'>+	r2 = r10;					\</div><div class='add'>+	r2 += -4;					\</div><div class='add'>+	r1 = %[map_in_map] ll;				\</div><div class='add'>+	call %[bpf_map_lookup_elem];			\</div><div class='add'>+	if r0 == 0 goto l0_%=;				\</div><div class='add'>+	if r0 != 0 goto l0_%=;				\</div><div class='add'>+	r10 = 42;					\</div><div class='add'>+l0_%=:  exit;						\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_map_lookup_elem),</div><div class='add'>+	  __imm_addr(map_in_map)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("map_ptr is never null inner spill fill")</div><div class='add'>+__success</div><div class='add'>+__naked void map_ptr_is_never_null_inner_spill_fill(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r1 = 0;						\</div><div class='add'>+	*(u32*)(r10 - 4) = r1;				\</div><div class='add'>+	r2 = r10;					\</div><div class='add'>+	r2 += -4;					\</div><div class='add'>+	r1 = %[map_in_map] ll;				\</div><div class='add'>+	call %[bpf_map_lookup_elem];			\</div><div class='add'>+	if r0 != 0 goto l0_%=;				\</div><div class='add'>+	exit;						\</div><div class='add'>+l0_%=:	*(u64 *)(r10 -16) = r0;				\</div><div class='add'>+	r1 = *(u64 *)(r10 -16);				\</div><div class='add'>+	if r1 == 0 goto l1_%=;				\</div><div class='add'>+	exit;						\</div><div class='add'>+l1_%=:	r10 = 42;					\</div><div class='add'>+	exit;						\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_map_lookup_elem),</div><div class='add'>+	  __imm_addr(map_in_map)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, int);</div><div class='add'>+	__type(value, int);</div><div class='add'>+	__array(values, struct {</div><div class='add'>+		__uint(type, BPF_MAP_TYPE_RINGBUF);</div><div class='add'>+		__uint(max_entries, 64 * 1024);</div><div class='add'>+	});</div><div class='add'>+} rb_in_map SEC(".maps");</div><div class='add'>+</div><div class='add'>+struct rb_ctx {</div><div class='add'>+	void *rb;</div><div class='add'>+	struct bpf_dynptr dptr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __always_inline struct rb_ctx __rb_event_reserve(__u32 sz)</div><div class='add'>+{</div><div class='add'>+	struct rb_ctx rb_ctx = {};</div><div class='add'>+	void *rb;</div><div class='add'>+	__u32 cpu = bpf_get_smp_processor_id();</div><div class='add'>+	__u32 rb_slot = cpu &amp; 1;</div><div class='add'>+</div><div class='add'>+	rb = bpf_map_lookup_elem(&amp;rb_in_map, &amp;rb_slot);</div><div class='add'>+	if (!rb)</div><div class='add'>+		return rb_ctx;</div><div class='add'>+</div><div class='add'>+	rb_ctx.rb = rb;</div><div class='add'>+	bpf_ringbuf_reserve_dynptr(rb, sz, 0, &amp;rb_ctx.dptr);</div><div class='add'>+</div><div class='add'>+	return rb_ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __noinline void __rb_event_submit(struct rb_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	if (!ctx-&gt;rb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* If the verifier (incorrectly) concludes that ctx-&gt;rb can be</div><div class='add'>+	 * NULL at this point, we'll get "BPF_EXIT instruction in main</div><div class='add'>+	 * prog would lead to reference leak" error</div><div class='add'>+	 */</div><div class='add'>+	bpf_ringbuf_submit_dynptr(&amp;ctx-&gt;dptr, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+int map_ptr_is_never_null_rb(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct rb_ctx event_ctx = __rb_event_reserve(256);</div><div class='add'>+	__rb_event_submit(&amp;event_ctx);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_map_ptr.c b/tools/testing/selftests/bpf/progs/verifier_map_ptr.c<br/>index 11a079145966..e2767d27d8aa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_map_ptr.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_map_ptr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_map_ptr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_map_ptr.c</a></div><div class='hunk'>@@ -70,10 +70,13 @@ __naked void bpf_map_ptr_write_rejected(void)</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* The first element of struct bpf_map is a SHA256 hash of 32 bytes, accessing</div><div class='add'>+ * into this array is valid. The opts field is now at offset 33.</div><div class='add'>+ */</div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("bpf_map_ptr: read non-existent field rejected")</div><div class='ctx'> __failure</div><div class='del'>-__msg("cannot access ptr member ops with moff 0 in struct bpf_map with off 1 size 4")</div><div class='add'>+__msg("cannot access ptr member ops with moff 32 in struct bpf_map with off 33 size 4")</div><div class='ctx'> __failure_unpriv</div><div class='ctx'> __msg_unpriv("access is allowed only to CAP_PERFMON and CAP_SYS_ADMIN")</div><div class='ctx'> __flag(BPF_F_ANY_ALIGNMENT)</div><div class='hunk'>@@ -82,7 +85,7 @@ __naked void read_non_existent_field_rejected(void)</div><div class='ctx'> 	asm volatile ("					\</div><div class='ctx'> 	r6 = 0;						\</div><div class='ctx'> 	r1 = %[map_array_48b] ll;			\</div><div class='del'>-	r6 = *(u32*)(r1 + 1);				\</div><div class='add'>+	r6 = *(u32*)(r1 + 33);				\</div><div class='ctx'> 	r0 = 1;						\</div><div class='ctx'> 	exit;						\</div><div class='ctx'> "	:</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_may_goto_1.c b/tools/testing/selftests/bpf/progs/verifier_may_goto_1.c<br/>index e81097c96fe2..6d1edaef9213 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_may_goto_1.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_may_goto_1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_may_goto_1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_may_goto_1.c</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'> SEC("raw_tp")</div><div class='ctx'> __description("may_goto 0")</div><div class='ctx'> __arch_x86_64</div><div class='add'>+__arch_s390x</div><div class='add'>+__arch_arm64</div><div class='ctx'> __xlated("0: r0 = 1")</div><div class='ctx'> __xlated("1: exit")</div><div class='ctx'> __success</div><div class='hunk'>@@ -27,6 +29,8 @@ __naked void may_goto_simple(void)</div><div class='ctx'> SEC("raw_tp")</div><div class='ctx'> __description("batch 2 of may_goto 0")</div><div class='ctx'> __arch_x86_64</div><div class='add'>+__arch_s390x</div><div class='add'>+__arch_arm64</div><div class='ctx'> __xlated("0: r0 = 1")</div><div class='ctx'> __xlated("1: exit")</div><div class='ctx'> __success</div><div class='hunk'>@@ -47,6 +51,8 @@ __naked void may_goto_batch_0(void)</div><div class='ctx'> SEC("raw_tp")</div><div class='ctx'> __description("may_goto batch with offsets 2/1/0")</div><div class='ctx'> __arch_x86_64</div><div class='add'>+__arch_s390x</div><div class='add'>+__arch_arm64</div><div class='ctx'> __xlated("0: r0 = 1")</div><div class='ctx'> __xlated("1: exit")</div><div class='ctx'> __success</div><div class='hunk'>@@ -71,14 +77,20 @@ __naked void may_goto_batch_1(void)</div><div class='ctx'> SEC("raw_tp")</div><div class='ctx'> __description("may_goto batch with offsets 2/0")</div><div class='ctx'> __arch_x86_64</div><div class='del'>-__xlated("0: *(u64 *)(r10 -8) = 8388608")</div><div class='del'>-__xlated("1: r11 = *(u64 *)(r10 -8)")</div><div class='del'>-__xlated("2: if r11 == 0x0 goto pc+3")</div><div class='del'>-__xlated("3: r11 -= 1")</div><div class='del'>-__xlated("4: *(u64 *)(r10 -8) = r11")</div><div class='del'>-__xlated("5: r0 = 1")</div><div class='del'>-__xlated("6: r0 = 2")</div><div class='del'>-__xlated("7: exit")</div><div class='add'>+__arch_s390x</div><div class='add'>+__arch_arm64</div><div class='add'>+__xlated("0: *(u64 *)(r10 -16) = 65535")</div><div class='add'>+__xlated("1: *(u64 *)(r10 -8) = 0")</div><div class='add'>+__xlated("2: r11 = *(u64 *)(r10 -16)")</div><div class='add'>+__xlated("3: if r11 == 0x0 goto pc+6")</div><div class='add'>+__xlated("4: r11 -= 1")</div><div class='add'>+__xlated("5: if r11 != 0x0 goto pc+2")</div><div class='add'>+__xlated("6: r11 = -16")</div><div class='add'>+__xlated("7: call unknown")</div><div class='add'>+__xlated("8: *(u64 *)(r10 -16) = r11")</div><div class='add'>+__xlated("9: r0 = 1")</div><div class='add'>+__xlated("10: r0 = 2")</div><div class='add'>+__xlated("11: exit")</div><div class='ctx'> __success</div><div class='ctx'> __naked void may_goto_batch_2(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_movsx.c b/tools/testing/selftests/bpf/progs/verifier_movsx.c<br/>index 994bbc346d25..a4d8814eb5ed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_movsx.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_movsx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_movsx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_movsx.c</a></div><div class='hunk'>@@ -245,7 +245,13 @@ l0_%=:							\</div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("MOV32SX, S8, var_off not u32_max, positive after s8 extension")</div><div class='ctx'> __success __retval(0)</div><div class='del'>-__failure_unpriv __msg_unpriv("frame pointer is read only")</div><div class='add'>+__success_unpriv</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("w0 = 0")</div><div class='add'>+__xlated_unpriv("exit")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `frame pointer is read only` */</div><div class='add'>+__xlated_unpriv("goto pc-1")</div><div class='add'>+#endif</div><div class='ctx'> __naked void mov64sx_s32_varoff_2(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -267,7 +273,13 @@ l0_%=:							\</div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("MOV32SX, S8, var_off not u32_max, negative after s8 extension")</div><div class='ctx'> __success __retval(0)</div><div class='del'>-__failure_unpriv __msg_unpriv("frame pointer is read only")</div><div class='add'>+__success_unpriv</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("w0 = 0")</div><div class='add'>+__xlated_unpriv("exit")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `frame pointer is read only` */</div><div class='add'>+__xlated_unpriv("goto pc-1")</div><div class='add'>+#endif</div><div class='ctx'> __naked void mov64sx_s32_varoff_3(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_mul.c b/tools/testing/selftests/bpf/progs/verifier_mul.c<br/>new file mode 100644<br/>index 000000000000..7145fe3351d5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_mul.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_mul.c</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Nandakumar Edamana */</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_tracing.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+/* Intended to test the abstract multiplication technique(s) used by</div><div class='add'>+ * the verifier. Using assembly to avoid compiler optimizations.</div><div class='add'>+ */</div><div class='add'>+SEC("fentry/bpf_fentry_test1")</div><div class='add'>+void BPF_PROG(mul_precise, int x)</div><div class='add'>+{</div><div class='add'>+	/* First, force the verifier to be uncertain about the value:</div><div class='add'>+	 *     unsigned int a = (bpf_get_prandom_u32() &amp; 0x2) | 0x1;</div><div class='add'>+	 *</div><div class='add'>+	 * Assuming the verifier is using tnum, a must be tnum{.v=0x1, .m=0x2}.</div><div class='add'>+	 * Then a * 0x3 would be m0m1 (m for uncertain). Added imprecision</div><div class='add'>+	 * would cause the following to fail, because the required return value</div><div class='add'>+	 * is 0:</div><div class='add'>+	 *     return (a * 0x3) &amp; 0x4);</div><div class='add'>+	 */</div><div class='add'>+	asm volatile ("\</div><div class='add'>+	call %[bpf_get_prandom_u32];\</div><div class='add'>+	r0 &amp;= 0x2;\</div><div class='add'>+	r0 |= 0x1;\</div><div class='add'>+	r0 *= 0x3;\</div><div class='add'>+	r0 &amp;= 0x4;\</div><div class='add'>+	if r0 != 0 goto l0_%=;\</div><div class='add'>+	r0 = 0;\</div><div class='add'>+	goto l1_%=;\</div><div class='add'>+l0_%=:\</div><div class='add'>+	r0 = 1;\</div><div class='add'>+l1_%=:\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_get_prandom_u32)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_netfilter_ctx.c b/tools/testing/selftests/bpf/progs/verifier_netfilter_ctx.c<br/>index ab9f9f2620ed..e2cbc5bda65e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_netfilter_ctx.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_netfilter_ctx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_netfilter_ctx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_netfilter_ctx.c</a></div><div class='hunk'>@@ -79,11 +79,6 @@ int with_invalid_ctx_access_test5(struct bpf_nf_ctx *ctx)</div><div class='ctx'> 	return NF_ACCEPT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int bpf_dynptr_from_skb(struct __sk_buff *skb, __u64 flags,</div><div class='del'>-                               struct bpf_dynptr *ptr__uninit) __ksym;</div><div class='del'>-extern void *bpf_dynptr_slice(const struct bpf_dynptr *ptr, uint32_t offset,</div><div class='del'>-                                   void *buffer, uint32_t buffer__sz) __ksym;</div><div class='del'>-</div><div class='ctx'> SEC("netfilter")</div><div class='ctx'> __description("netfilter test prog with skb and state read access")</div><div class='ctx'> __success __failure_unpriv</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_precision.c b/tools/testing/selftests/bpf/progs/verifier_precision.c<br/>index 6b564d4c0986..1fe090cd6744 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_precision.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_precision.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_precision.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_precision.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /* Copyright (C) 2023 SUSE LLC */</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "../../../include/linux/filter.h"</div><div class='ctx'> #include "bpf_misc.h"</div><div class='ctx'> </div><div class='ctx'> SEC("?raw_tp")</div><div class='hunk'>@@ -90,27 +91,74 @@ __naked int bpf_end_bswap(void)</div><div class='ctx'> 		::: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CAN_USE_LOAD_ACQ_STORE_REL</div><div class='add'>+</div><div class='add'>+SEC("?raw_tp")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("mark_precise: frame0: regs=r2 stack= before 3: (bf) r3 = r10")</div><div class='add'>+__msg("mark_precise: frame0: regs=r2 stack= before 2: (db) r2 = load_acquire((u64 *)(r10 -8))")</div><div class='add'>+__msg("mark_precise: frame0: regs= stack=-8 before 1: (7b) *(u64 *)(r10 -8) = r1")</div><div class='add'>+__msg("mark_precise: frame0: regs=r1 stack= before 0: (b7) r1 = 8")</div><div class='add'>+__naked int bpf_load_acquire(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = 8;"</div><div class='add'>+	"*(u64 *)(r10 - 8) = r1;"</div><div class='add'>+	".8byte %[load_acquire_insn];" /* r2 = load_acquire((u64 *)(r10 - 8)); */</div><div class='add'>+	"r3 = r10;"</div><div class='add'>+	"r3 += r2;" /* mark_precise */</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(load_acquire_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_LOAD_ACQ, BPF_REG_2, BPF_REG_10, -8))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?raw_tp")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("mark_precise: frame0: regs=r1 stack= before 3: (bf) r2 = r10")</div><div class='add'>+__msg("mark_precise: frame0: regs=r1 stack= before 2: (79) r1 = *(u64 *)(r10 -8)")</div><div class='add'>+__msg("mark_precise: frame0: regs= stack=-8 before 1: (db) store_release((u64 *)(r10 -8), r1)")</div><div class='add'>+__msg("mark_precise: frame0: regs=r1 stack= before 0: (b7) r1 = 8")</div><div class='add'>+__naked int bpf_store_release(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = 8;"</div><div class='add'>+	".8byte %[store_release_insn];" /* store_release((u64 *)(r10 - 8), r1); */</div><div class='add'>+	"r1 = *(u64 *)(r10 - 8);"</div><div class='add'>+	"r2 = r10;"</div><div class='add'>+	"r2 += r1;" /* mark_precise */</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_STORE_REL, BPF_REG_10, BPF_REG_1, -8))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CAN_USE_LOAD_ACQ_STORE_REL */</div><div class='ctx'> #endif /* v4 instruction */</div><div class='ctx'> </div><div class='ctx'> SEC("?raw_tp")</div><div class='ctx'> __success __log_level(2)</div><div class='ctx'> /*</div><div class='ctx'>  * Without the bug fix there will be no history between "last_idx 3 first_idx 3"</div><div class='del'>- * and "parent state regs=" lines. "R0_w=6" parts are here to help anchor</div><div class='add'>+ * and "parent state regs=" lines. "R0=6" parts are here to help anchor</div><div class='ctx'>  * expected log messages to the one specific mark_chain_precision operation.</div><div class='ctx'>  *</div><div class='ctx'>  * This is quite fragile: if verifier checkpointing heuristic changes, this</div><div class='ctx'>  * might need adjusting.</div><div class='ctx'>  */</div><div class='del'>-__msg("2: (07) r0 += 1                       ; R0_w=6")</div><div class='add'>+__msg("2: (07) r0 += 1                       ; R0=6")</div><div class='ctx'> __msg("3: (35) if r0 &gt;= 0xa goto pc+1")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 3 first_idx 3 subseq_idx -1")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r0 stack= before 2: (07) r0 += 1")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r0 stack= before 1: (07) r0 += 1")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r0 stack= before 4: (05) goto pc-4")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r0 stack= before 3: (35) if r0 &gt;= 0xa goto pc+1")</div><div class='del'>-__msg("mark_precise: frame0: parent state regs= stack=:  R0_rw=P4")</div><div class='del'>-__msg("3: R0_w=6")</div><div class='add'>+__msg("mark_precise: frame0: parent state regs= stack=:  R0=P4")</div><div class='add'>+__msg("3: R0=6")</div><div class='ctx'> __naked int state_loop_first_last_equal(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -130,4 +178,127 @@ __naked int state_loop_first_last_equal(void)</div><div class='ctx'> 	);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+__used __naked static void __bpf_cond_op_r10(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r2 = 2314885393468386424 ll;"</div><div class='add'>+	"goto +0;"</div><div class='add'>+	"if r2 &lt;= r10 goto +3;"</div><div class='add'>+	"if r1 &gt;= -1835016 goto +0;"</div><div class='add'>+	"if r2 &lt;= 8 goto +0;"</div><div class='add'>+	"if r3 &lt;= 0 goto +0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?raw_tp")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("8: (bd) if r2 &lt;= r10 goto pc+3")</div><div class='add'>+__msg("9: (35) if r1 &gt;= 0xffe3fff8 goto pc+0")</div><div class='add'>+__msg("10: (b5) if r2 &lt;= 0x8 goto pc+0")</div><div class='add'>+__msg("mark_precise: frame1: last_idx 10 first_idx 0 subseq_idx -1")</div><div class='add'>+__msg("mark_precise: frame1: regs=r2 stack= before 9: (35) if r1 &gt;= 0xffe3fff8 goto pc+0")</div><div class='add'>+__msg("mark_precise: frame1: regs=r2 stack= before 8: (bd) if r2 &lt;= r10 goto pc+3")</div><div class='add'>+__msg("mark_precise: frame1: regs=r2 stack= before 7: (05) goto pc+0")</div><div class='add'>+__naked void bpf_cond_op_r10(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r3 = 0 ll;"</div><div class='add'>+	"call __bpf_cond_op_r10;"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?raw_tp")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("3: (bf) r3 = r10")</div><div class='add'>+__msg("4: (bd) if r3 &lt;= r2 goto pc+1")</div><div class='add'>+__msg("5: (b5) if r2 &lt;= 0x8 goto pc+2")</div><div class='add'>+__msg("mark_precise: frame0: last_idx 5 first_idx 0 subseq_idx -1")</div><div class='add'>+__msg("mark_precise: frame0: regs=r2 stack= before 4: (bd) if r3 &lt;= r2 goto pc+1")</div><div class='add'>+__msg("mark_precise: frame0: regs=r2 stack= before 3: (bf) r3 = r10")</div><div class='add'>+__naked void bpf_cond_op_not_r10(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"r2 = 2314885393468386424 ll;"</div><div class='add'>+	"r3 = r10;"</div><div class='add'>+	"if r3 &lt;= r2 goto +1;"</div><div class='add'>+	"if r2 &lt;= 8 goto +2;"</div><div class='add'>+	"r0 = 2 ll;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/socket_connect")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("0: (b7) r0 = 1                        ; R0=1")</div><div class='add'>+__msg("1: (84) w0 = -w0                      ; R0=0xffffffff")</div><div class='add'>+__msg("mark_precise: frame0: last_idx 2 first_idx 0 subseq_idx -1")</div><div class='add'>+__msg("mark_precise: frame0: regs=r0 stack= before 1: (84) w0 = -w0")</div><div class='add'>+__msg("mark_precise: frame0: regs=r0 stack= before 0: (b7) r0 = 1")</div><div class='add'>+__naked int bpf_neg_2(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * lsm.s/socket_connect requires a return value within [-4095, 0].</div><div class='add'>+	 * Returning -1 is allowed</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 1;"</div><div class='add'>+	"w0 = -w0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/socket_connect")</div><div class='add'>+__failure __msg("At program exit the register R0 has")</div><div class='add'>+__naked int bpf_neg_3(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * lsm.s/socket_connect requires a return value within [-4095, 0].</div><div class='add'>+	 * Returning -10000 is not allowed.</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 10000;"</div><div class='add'>+	"w0 = -w0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/socket_connect")</div><div class='add'>+__success __log_level(2)</div><div class='add'>+__msg("0: (b7) r0 = 1                        ; R0=1")</div><div class='add'>+__msg("1: (87) r0 = -r0                      ; R0=-1")</div><div class='add'>+__msg("mark_precise: frame0: last_idx 2 first_idx 0 subseq_idx -1")</div><div class='add'>+__msg("mark_precise: frame0: regs=r0 stack= before 1: (87) r0 = -r0")</div><div class='add'>+__msg("mark_precise: frame0: regs=r0 stack= before 0: (b7) r0 = 1")</div><div class='add'>+__naked int bpf_neg_4(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * lsm.s/socket_connect requires a return value within [-4095, 0].</div><div class='add'>+	 * Returning -1 is allowed</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 1;"</div><div class='add'>+	"r0 = -r0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("lsm.s/socket_connect")</div><div class='add'>+__failure __msg("At program exit the register R0 has")</div><div class='add'>+__naked int bpf_neg_5(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * lsm.s/socket_connect requires a return value within [-4095, 0].</div><div class='add'>+	 * Returning -10000 is not allowed.</div><div class='add'>+	 */</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 10000;"</div><div class='add'>+	"r0 = -r0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_private_stack.c b/tools/testing/selftests/bpf/progs/verifier_private_stack.c<br/>index b1fbdf119553..1ecd34ebde19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_private_stack.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_private_stack.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_private_stack.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_private_stack.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> /* From include/linux/filter.h */</div><div class='ctx'> #define MAX_BPF_STACK    512</div><div class='ctx'> </div><div class='del'>-#if defined(__TARGET_ARCH_x86)</div><div class='add'>+#if defined(__TARGET_ARCH_x86) || defined(__TARGET_ARCH_arm64)</div><div class='ctx'> </div><div class='ctx'> struct elem {</div><div class='ctx'> 	struct bpf_timer t;</div><div class='hunk'>@@ -27,9 +27,21 @@ __description("Private stack, single prog")</div><div class='ctx'> __success</div><div class='ctx'> __arch_x86_64</div><div class='ctx'> __jited("	movabsq	$0x{{.*}}, %r9")</div><div class='del'>-__jited("	addq	%gs:0x{{.*}}, %r9")</div><div class='add'>+__jited("	addq	%gs:{{.*}}, %r9")</div><div class='ctx'> __jited("	movl	$0x2a, %edi")</div><div class='ctx'> __jited("	movq	%rdi, -0x100(%r9)")</div><div class='add'>+__arch_arm64</div><div class='add'>+__jited("	stp	x25, x27, [sp, {{.*}}]!")</div><div class='add'>+__jited("	mov	x27, {{.*}}")</div><div class='add'>+__jited("	movk	x27, {{.*}}, lsl #16")</div><div class='add'>+__jited("	movk	x27, {{.*}}")</div><div class='add'>+__jited("	mrs	x10, TPIDR_EL{{[0-1]}}")</div><div class='add'>+__jited("	add	x27, x27, x10")</div><div class='add'>+__jited("	add	x25, x27, {{.*}}")</div><div class='add'>+__jited("	mov	x0, #0x2a")</div><div class='add'>+__jited("	str	x0, [x27]")</div><div class='add'>+__jited("...")</div><div class='add'>+__jited("	ldp	x25, x27, [sp], {{.*}}")</div><div class='ctx'> __naked void private_stack_single_prog(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("			\</div><div class='hunk'>@@ -45,6 +57,9 @@ __description("No private stack")</div><div class='ctx'> __success</div><div class='ctx'> __arch_x86_64</div><div class='ctx'> __jited("	subq	$0x8, %rsp")</div><div class='add'>+__arch_arm64</div><div class='add'>+__jited("	mov	x25, sp")</div><div class='add'>+__jited("	sub	sp, sp, #0x10")</div><div class='ctx'> __naked void no_private_stack_nested(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("			\</div><div class='hunk'>@@ -74,13 +89,26 @@ __success</div><div class='ctx'> __arch_x86_64</div><div class='ctx'> /* private stack fp for the main prog */</div><div class='ctx'> __jited("	movabsq	$0x{{.*}}, %r9")</div><div class='del'>-__jited("	addq	%gs:0x{{.*}}, %r9")</div><div class='add'>+__jited("	addq	%gs:{{.*}}, %r9")</div><div class='ctx'> __jited("	movl	$0x2a, %edi")</div><div class='ctx'> __jited("	movq	%rdi, -0x200(%r9)")</div><div class='ctx'> __jited("	pushq	%r9")</div><div class='ctx'> __jited("	callq	0x{{.*}}")</div><div class='ctx'> __jited("	popq	%r9")</div><div class='ctx'> __jited("	xorl	%eax, %eax")</div><div class='add'>+__arch_arm64</div><div class='add'>+__jited("	stp	x25, x27, [sp, {{.*}}]!")</div><div class='add'>+__jited("	mov	x27, {{.*}}")</div><div class='add'>+__jited("	movk	x27, {{.*}}, lsl #16")</div><div class='add'>+__jited("	movk	x27, {{.*}}")</div><div class='add'>+__jited("	mrs	x10, TPIDR_EL{{[0-1]}}")</div><div class='add'>+__jited("	add	x27, x27, x10")</div><div class='add'>+__jited("	add	x25, x27, {{.*}}")</div><div class='add'>+__jited("	mov	x0, #0x2a")</div><div class='add'>+__jited("	str	x0, [x27]")</div><div class='add'>+__jited("	bl	{{.*}}")</div><div class='add'>+__jited("...")</div><div class='add'>+__jited("	ldp	x25, x27, [sp], {{.*}}")</div><div class='ctx'> __naked void private_stack_nested_1(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("				\</div><div class='hunk'>@@ -122,7 +150,7 @@ __jited("	pushq	%rbp")</div><div class='ctx'> __jited("	movq	%rsp, %rbp")</div><div class='ctx'> __jited("	endbr64")</div><div class='ctx'> __jited("	movabsq	$0x{{.*}}, %r9")</div><div class='del'>-__jited("	addq	%gs:0x{{.*}}, %r9")</div><div class='add'>+__jited("	addq	%gs:{{.*}}, %r9")</div><div class='ctx'> __jited("	pushq	%r9")</div><div class='ctx'> __jited("	callq")</div><div class='ctx'> __jited("	popq	%r9")</div><div class='hunk'>@@ -131,6 +159,24 @@ __jited("	movq	%rdi, -0x200(%r9)")</div><div class='ctx'> __jited("	pushq	%r9")</div><div class='ctx'> __jited("	callq")</div><div class='ctx'> __jited("	popq	%r9")</div><div class='add'>+__arch_arm64</div><div class='add'>+__jited("func #1")</div><div class='add'>+__jited("...")</div><div class='add'>+__jited("	stp	x25, x27, [sp, {{.*}}]!")</div><div class='add'>+__jited("	mov	x27, {{.*}}")</div><div class='add'>+__jited("	movk	x27, {{.*}}, lsl #16")</div><div class='add'>+__jited("	movk	x27, {{.*}}")</div><div class='add'>+__jited("	mrs	x10, TPIDR_EL{{[0-1]}}")</div><div class='add'>+__jited("	add	x27, x27, x10")</div><div class='add'>+__jited("	add	x25, x27, {{.*}}")</div><div class='add'>+__jited("	bl	0x{{.*}}")</div><div class='add'>+__jited("	add	x7, x0, #0x0")</div><div class='add'>+__jited("	mov	x0, #0x2a")</div><div class='add'>+__jited("	str	x0, [x27]")</div><div class='add'>+__jited("	bl	0x{{.*}}")</div><div class='add'>+__jited("	add	x7, x0, #0x0")</div><div class='add'>+__jited("	mov	x7, #0x0")</div><div class='add'>+__jited("	ldp	x25, x27, [sp], {{.*}}")</div><div class='ctx'> __naked void private_stack_callback(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("			\</div><div class='hunk'>@@ -154,6 +200,28 @@ __arch_x86_64</div><div class='ctx'> __jited("	pushq	%r9")</div><div class='ctx'> __jited("	callq")</div><div class='ctx'> __jited("	popq	%r9")</div><div class='add'>+__arch_arm64</div><div class='add'>+__jited("	stp	x29, x30, [sp, #-0x10]!")</div><div class='add'>+__jited("	mov	x29, sp")</div><div class='add'>+__jited("	stp	xzr, x26, [sp, #-0x10]!")</div><div class='add'>+__jited("	mov	x26, sp")</div><div class='add'>+__jited("	stp	x19, x20, [sp, #-0x10]!")</div><div class='add'>+__jited("	stp	x21, x22, [sp, #-0x10]!")</div><div class='add'>+__jited("	stp	x23, x24, [sp, #-0x10]!")</div><div class='add'>+__jited("	stp	x25, x26, [sp, #-0x10]!")</div><div class='add'>+__jited("	stp	x27, x28, [sp, #-0x10]!")</div><div class='add'>+__jited("	mov	x27, {{.*}}")</div><div class='add'>+__jited("	movk	x27, {{.*}}, lsl #16")</div><div class='add'>+__jited("	movk	x27, {{.*}}")</div><div class='add'>+__jited("	mrs	x10, TPIDR_EL{{[0-1]}}")</div><div class='add'>+__jited("	add	x27, x27, x10")</div><div class='add'>+__jited("	add	x25, x27, {{.*}}")</div><div class='add'>+__jited("	mov	x0, #0x2a")</div><div class='add'>+__jited("	str	x0, [x27]")</div><div class='add'>+__jited("	mov	x0, #0x0")</div><div class='add'>+__jited("	bl	0x{{.*}}")</div><div class='add'>+__jited("	add	x7, x0, #0x0")</div><div class='add'>+__jited("	ldp	x27, x28, [sp], #0x10")</div><div class='ctx'> int private_stack_exception_main_prog(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("			\</div><div class='hunk'>@@ -179,6 +247,19 @@ __jited("	movq	%rdi, -0x200(%r9)")</div><div class='ctx'> __jited("	pushq	%r9")</div><div class='ctx'> __jited("	callq")</div><div class='ctx'> __jited("	popq	%r9")</div><div class='add'>+__arch_arm64</div><div class='add'>+__jited("	stp	x27, x28, [sp, #-0x10]!")</div><div class='add'>+__jited("	mov	x27, {{.*}}")</div><div class='add'>+__jited("	movk	x27, {{.*}}, lsl #16")</div><div class='add'>+__jited("	movk	x27, {{.*}}")</div><div class='add'>+__jited("	mrs	x10, TPIDR_EL{{[0-1]}}")</div><div class='add'>+__jited("	add	x27, x27, x10")</div><div class='add'>+__jited("	add	x25, x27, {{.*}}")</div><div class='add'>+__jited("	mov	x0, #0x2a")</div><div class='add'>+__jited("	str	x0, [x27]")</div><div class='add'>+__jited("	bl	0x{{.*}}")</div><div class='add'>+__jited("	add	x7, x0, #0x0")</div><div class='add'>+__jited("	ldp	x27, x28, [sp], #0x10")</div><div class='ctx'> int private_stack_exception_sub_prog(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("			\</div><div class='hunk'>@@ -220,6 +301,10 @@ __description("Private stack, async callback, not nested")</div><div class='ctx'> __success __retval(0)</div><div class='ctx'> __arch_x86_64</div><div class='ctx'> __jited("	movabsq	$0x{{.*}}, %r9")</div><div class='add'>+__arch_arm64</div><div class='add'>+__jited("	mrs	x10, TPIDR_EL{{[0-1]}}")</div><div class='add'>+__jited("	add	x27, x27, x10")</div><div class='add'>+__jited("	add	x25, x27, {{.*}}")</div><div class='ctx'> int private_stack_async_callback_1(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_timer *arr_timer;</div><div class='hunk'>@@ -241,6 +326,8 @@ __description("Private stack, async callback, potential nesting")</div><div class='ctx'> __success __retval(0)</div><div class='ctx'> __arch_x86_64</div><div class='ctx'> __jited("	subq	$0x100, %rsp")</div><div class='add'>+__arch_arm64</div><div class='add'>+__jited("	sub	sp, sp, #0x100")</div><div class='ctx'> int private_stack_async_callback_2(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_timer *arr_timer;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_ref_tracking.c b/tools/testing/selftests/bpf/progs/verifier_ref_tracking.c<br/>index 683a882b3e6d..910365201f68 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_ref_tracking.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_ref_tracking.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_ref_tracking.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_ref_tracking.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ struct bpf_key {} __attribute__((preserve_access_index));</div><div class='ctx'> </div><div class='ctx'> extern void bpf_key_put(struct bpf_key *key) __ksym;</div><div class='ctx'> extern struct bpf_key *bpf_lookup_system_key(__u64 id) __ksym;</div><div class='del'>-extern struct bpf_key *bpf_lookup_user_key(__u32 serial, __u64 flags) __ksym;</div><div class='add'>+extern struct bpf_key *bpf_lookup_user_key(__s32 serial, __u64 flags) __ksym;</div><div class='ctx'> </div><div class='ctx'> /* BTF FUNC records are not generated for kfuncs referenced</div><div class='ctx'>  * from inline assembly. These records are necessary for</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_scalar_ids.c b/tools/testing/selftests/bpf/progs/verifier_scalar_ids.c<br/>index 7c5e5e6d10eb..c0ce690ddb68 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_scalar_ids.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_scalar_ids.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_scalar_ids.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_scalar_ids.c</a></div><div class='hunk'>@@ -349,11 +349,11 @@ __naked void precision_two_ids(void)</div><div class='ctx'> SEC("socket")</div><div class='ctx'> __success __log_level(2)</div><div class='ctx'> __flag(BPF_F_TEST_STATE_FREQ)</div><div class='del'>-/* check thar r0 and r6 have different IDs after 'if',</div><div class='add'>+/* check that r0 and r6 have different IDs after 'if',</div><div class='ctx'>  * collect_linked_regs() can't tie more than 6 registers for a single insn.</div><div class='ctx'>  */</div><div class='ctx'> __msg("8: (25) if r0 &gt; 0x7 goto pc+0         ; R0=scalar(id=1")</div><div class='del'>-__msg("9: (bf) r6 = r6                       ; R6_w=scalar(id=2")</div><div class='add'>+__msg("9: (bf) r6 = r6                       ; R6=scalar(id=2")</div><div class='ctx'> /* check that r{0-5} are marked precise after 'if' */</div><div class='ctx'> __msg("frame0: regs=r0 stack= before 8: (25) if r0 &gt; 0x7 goto pc+0")</div><div class='ctx'> __msg("frame0: parent state regs=r0,r1,r2,r3,r4,r5 stack=:")</div><div class='hunk'>@@ -779,12 +779,12 @@ __success</div><div class='ctx'> __retval(0)</div><div class='ctx'> /* Check that verifier believes r1/r0 are zero at exit */</div><div class='ctx'> __log_level(2)</div><div class='del'>-__msg("4: (77) r1 &gt;&gt;= 32                     ; R1_w=0")</div><div class='del'>-__msg("5: (bf) r0 = r1                       ; R0_w=0 R1_w=0")</div><div class='add'>+__msg("4: (77) r1 &gt;&gt;= 32                     ; R1=0")</div><div class='add'>+__msg("5: (bf) r0 = r1                       ; R0=0 R1=0")</div><div class='ctx'> __msg("6: (95) exit")</div><div class='ctx'> __msg("from 3 to 4")</div><div class='del'>-__msg("4: (77) r1 &gt;&gt;= 32                     ; R1_w=0")</div><div class='del'>-__msg("5: (bf) r0 = r1                       ; R0_w=0 R1_w=0")</div><div class='add'>+__msg("4: (77) r1 &gt;&gt;= 32                     ; R1=0")</div><div class='add'>+__msg("5: (bf) r0 = r1                       ; R0=0 R1=0")</div><div class='ctx'> __msg("6: (95) exit")</div><div class='ctx'> /* Verify that statements to randomize upper half of r1 had not been</div><div class='ctx'>  * generated.</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_sock.c b/tools/testing/selftests/bpf/progs/verifier_sock.c<br/>index 0d5e56dffabb..a2132c72d3b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_sock.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_sock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_sock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_sock.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Converted from tools/testing/selftests/bpf/verifier/sock.c */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include "vmlinux.h"</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include "bpf_misc.h"</div><div class='ctx'> </div><div class='del'>-#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)-&gt;MEMBER))</div><div class='del'>-#define offsetofend(TYPE, MEMBER) \</div><div class='del'>-	(offsetof(TYPE, MEMBER)	+ sizeof_field(TYPE, MEMBER))</div><div class='del'>-</div><div class='ctx'> struct {</div><div class='ctx'> 	__uint(type, BPF_MAP_TYPE_REUSEPORT_SOCKARRAY);</div><div class='ctx'> 	__uint(max_entries, 1);</div><div class='hunk'>@@ -1073,16 +1069,65 @@ int invalidate_pkt_pointers_from_global_func(struct __sk_buff *sk)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> __noinline</div><div class='add'>+long xdp_pull_data2(struct xdp_md *x, __u32 len)</div><div class='add'>+{</div><div class='add'>+	return bpf_xdp_pull_data(x, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__noinline</div><div class='add'>+long xdp_pull_data1(struct xdp_md *x, __u32 len)</div><div class='add'>+{</div><div class='add'>+	return xdp_pull_data2(x, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* global function calls bpf_xdp_pull_data(), which invalidates packet</div><div class='add'>+ * pointers established before global function call.</div><div class='add'>+ */</div><div class='add'>+SEC("xdp")</div><div class='add'>+__failure __msg("invalid mem access")</div><div class='add'>+int invalidate_xdp_pkt_pointers_from_global_func(struct xdp_md *x)</div><div class='add'>+{</div><div class='add'>+	int *p = (void *)(long)x-&gt;data;</div><div class='add'>+</div><div class='add'>+	if ((void *)(p + 1) &gt; (void *)(long)x-&gt;data_end)</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+	xdp_pull_data1(x, 0);</div><div class='add'>+	*p = 42; /* this is unsafe */</div><div class='add'>+	return XDP_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* XDP packet changing kfunc calls invalidate packet pointers */</div><div class='add'>+SEC("xdp")</div><div class='add'>+__failure __msg("invalid mem access")</div><div class='add'>+int invalidate_xdp_pkt_pointers(struct xdp_md *x)</div><div class='add'>+{</div><div class='add'>+	int *p = (void *)(long)x-&gt;data;</div><div class='add'>+</div><div class='add'>+	if ((void *)(p + 1) &gt; (void *)(long)x-&gt;data_end)</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+	bpf_xdp_pull_data(x, 0);</div><div class='add'>+	*p = 42; /* this is unsafe */</div><div class='add'>+	return XDP_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__noinline</div><div class='ctx'> int tail_call(struct __sk_buff *sk)</div><div class='ctx'> {</div><div class='ctx'> 	bpf_tail_call_static(sk, &amp;jmp_table, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Tail calls invalidate packet pointers. */</div><div class='add'>+static __noinline</div><div class='add'>+int static_tail_call(struct __sk_buff *sk)</div><div class='add'>+{</div><div class='add'>+	bpf_tail_call_static(sk, &amp;jmp_table, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Tail calls in sub-programs invalidate packet pointers. */</div><div class='ctx'> SEC("tc")</div><div class='ctx'> __failure __msg("invalid mem access")</div><div class='del'>-int invalidate_pkt_pointers_by_tail_call(struct __sk_buff *sk)</div><div class='add'>+int invalidate_pkt_pointers_by_global_tail_call(struct __sk_buff *sk)</div><div class='ctx'> {</div><div class='ctx'> 	int *p = (void *)(long)sk-&gt;data;</div><div class='ctx'> </div><div class='hunk'>@@ -1093,4 +1138,32 @@ int invalidate_pkt_pointers_by_tail_call(struct __sk_buff *sk)</div><div class='ctx'> 	return TCX_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Tail calls in static sub-programs invalidate packet pointers. */</div><div class='add'>+SEC("tc")</div><div class='add'>+__failure __msg("invalid mem access")</div><div class='add'>+int invalidate_pkt_pointers_by_static_tail_call(struct __sk_buff *sk)</div><div class='add'>+{</div><div class='add'>+	int *p = (void *)(long)sk-&gt;data;</div><div class='add'>+</div><div class='add'>+	if ((void *)(p + 1) &gt; (void *)(long)sk-&gt;data_end)</div><div class='add'>+		return TCX_DROP;</div><div class='add'>+	static_tail_call(sk);</div><div class='add'>+	*p = 42; /* this is unsafe */</div><div class='add'>+	return TCX_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Direct tail calls do not invalidate packet pointers. */</div><div class='add'>+SEC("tc")</div><div class='add'>+__success</div><div class='add'>+int invalidate_pkt_pointers_by_tail_call(struct __sk_buff *sk)</div><div class='add'>+{</div><div class='add'>+	int *p = (void *)(long)sk-&gt;data;</div><div class='add'>+</div><div class='add'>+	if ((void *)(p + 1) &gt; (void *)(long)sk-&gt;data_end)</div><div class='add'>+		return TCX_DROP;</div><div class='add'>+	bpf_tail_call_static(sk, &amp;jmp_table, 0);</div><div class='add'>+	*p = 42; /* this is NOT unsafe: tail calls don't return */</div><div class='add'>+	return TCX_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_spill_fill.c b/tools/testing/selftests/bpf/progs/verifier_spill_fill.c<br/>index 1e5a511e8494..7a13dbd794b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_spill_fill.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_spill_fill.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_spill_fill.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_spill_fill.c</a></div><div class='hunk'>@@ -506,17 +506,17 @@ SEC("raw_tp")</div><div class='ctx'> __log_level(2)</div><div class='ctx'> __success</div><div class='ctx'> /* fp-8 is spilled IMPRECISE value zero (represented by a zero value fake reg) */</div><div class='del'>-__msg("2: (7a) *(u64 *)(r10 -8) = 0          ; R10=fp0 fp-8_w=0")</div><div class='add'>+__msg("2: (7a) *(u64 *)(r10 -8) = 0          ; R10=fp0 fp-8=0")</div><div class='ctx'> /* but fp-16 is spilled IMPRECISE zero const reg */</div><div class='del'>-__msg("4: (7b) *(u64 *)(r10 -16) = r0        ; R0_w=0 R10=fp0 fp-16_w=0")</div><div class='add'>+__msg("4: (7b) *(u64 *)(r10 -16) = r0        ; R0=0 R10=fp0 fp-16=0")</div><div class='ctx'> /* validate that assigning R2 from STACK_SPILL with zero value  doesn't mark register</div><div class='ctx'>  * precise immediately; if necessary, it will be marked precise later</div><div class='ctx'>  */</div><div class='del'>-__msg("6: (71) r2 = *(u8 *)(r10 -1)          ; R2_w=0 R10=fp0 fp-8_w=0")</div><div class='add'>+__msg("6: (71) r2 = *(u8 *)(r10 -1)          ; R2=0 R10=fp0 fp-8=0")</div><div class='ctx'> /* similarly, when R2 is assigned from spilled register, it is initially</div><div class='ctx'>  * imprecise, but will be marked precise later once it is used in precise context</div><div class='ctx'>  */</div><div class='del'>-__msg("10: (71) r2 = *(u8 *)(r10 -9)         ; R2_w=0 R10=fp0 fp-16_w=0")</div><div class='add'>+__msg("10: (71) r2 = *(u8 *)(r10 -9)         ; R2=0 R10=fp0 fp-16=0")</div><div class='ctx'> __msg("11: (0f) r1 += r2")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 11 first_idx 0 subseq_idx -1")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r2 stack= before 10: (71) r2 = *(u8 *)(r10 -9)")</div><div class='hunk'>@@ -598,7 +598,7 @@ __log_level(2)</div><div class='ctx'> __success</div><div class='ctx'> /* fp-4 is STACK_ZERO */</div><div class='ctx'> __msg("2: (62) *(u32 *)(r10 -4) = 0          ; R10=fp0 fp-8=0000????")</div><div class='del'>-__msg("4: (71) r2 = *(u8 *)(r10 -1)          ; R2_w=0 R10=fp0 fp-8=0000????")</div><div class='add'>+__msg("4: (71) r2 = *(u8 *)(r10 -1)          ; R2=0 R10=fp0 fp-8=0000????")</div><div class='ctx'> __msg("5: (0f) r1 += r2")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 5 first_idx 0 subseq_idx -1")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r2 stack= before 4: (71) r2 = *(u8 *)(r10 -1)")</div><div class='hunk'>@@ -640,25 +640,25 @@ SEC("raw_tp")</div><div class='ctx'> __log_level(2) __flag(BPF_F_TEST_STATE_FREQ)</div><div class='ctx'> __success</div><div class='ctx'> /* make sure fp-8 is IMPRECISE fake register spill */</div><div class='del'>-__msg("3: (7a) *(u64 *)(r10 -8) = 1          ; R10=fp0 fp-8_w=1")</div><div class='add'>+__msg("3: (7a) *(u64 *)(r10 -8) = 1          ; R10=fp0 fp-8=1")</div><div class='ctx'> /* and fp-16 is spilled IMPRECISE const reg */</div><div class='del'>-__msg("5: (7b) *(u64 *)(r10 -16) = r0        ; R0_w=1 R10=fp0 fp-16_w=1")</div><div class='add'>+__msg("5: (7b) *(u64 *)(r10 -16) = r0        ; R0=1 R10=fp0 fp-16=1")</div><div class='ctx'> /* validate load from fp-8, which was initialized using BPF_ST_MEM */</div><div class='del'>-__msg("8: (79) r2 = *(u64 *)(r10 -8)         ; R2_w=1 R10=fp0 fp-8=1")</div><div class='add'>+__msg("8: (79) r2 = *(u64 *)(r10 -8)         ; R2=1 R10=fp0 fp-8=1")</div><div class='ctx'> __msg("9: (0f) r1 += r2")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 9 first_idx 7 subseq_idx -1")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r2 stack= before 8: (79) r2 = *(u64 *)(r10 -8)")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-8 before 7: (bf) r1 = r6")</div><div class='ctx'> /* note, fp-8 is precise, fp-16 is not yet precise, we'll get there */</div><div class='del'>-__msg("mark_precise: frame0: parent state regs= stack=-8:  R0_w=1 R1=ctx() R6_r=map_value(map=.data.two_byte_,ks=4,vs=2) R10=fp0 fp-8_rw=P1 fp-16_w=1")</div><div class='add'>+__msg("mark_precise: frame0: parent state regs= stack=-8:  R0=1 R1=ctx() R6=map_value(map=.data.two_byte_,ks=4,vs=2) R10=fp0 fp-8=P1 fp-16=1")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 6 first_idx 3 subseq_idx 7")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-8 before 6: (05) goto pc+0")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-8 before 5: (7b) *(u64 *)(r10 -16) = r0")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-8 before 4: (b7) r0 = 1")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-8 before 3: (7a) *(u64 *)(r10 -8) = 1")</div><div class='del'>-__msg("10: R1_w=map_value(map=.data.two_byte_,ks=4,vs=2,off=1) R2_w=1")</div><div class='add'>+__msg("10: R1=map_value(map=.data.two_byte_,ks=4,vs=2,off=1) R2=1")</div><div class='ctx'> /* validate load from fp-16, which was initialized using BPF_STX_MEM */</div><div class='del'>-__msg("12: (79) r2 = *(u64 *)(r10 -16)       ; R2_w=1 R10=fp0 fp-16=1")</div><div class='add'>+__msg("12: (79) r2 = *(u64 *)(r10 -16)       ; R2=1 R10=fp0 fp-16=1")</div><div class='ctx'> __msg("13: (0f) r1 += r2")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 13 first_idx 7 subseq_idx -1")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r2 stack= before 12: (79) r2 = *(u64 *)(r10 -16)")</div><div class='hunk'>@@ -668,12 +668,12 @@ __msg("mark_precise: frame0: regs= stack=-16 before 9: (0f) r1 += r2")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-16 before 8: (79) r2 = *(u64 *)(r10 -8)")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-16 before 7: (bf) r1 = r6")</div><div class='ctx'> /* now both fp-8 and fp-16 are precise, very good */</div><div class='del'>-__msg("mark_precise: frame0: parent state regs= stack=-16:  R0_w=1 R1=ctx() R6_r=map_value(map=.data.two_byte_,ks=4,vs=2) R10=fp0 fp-8_rw=P1 fp-16_rw=P1")</div><div class='add'>+__msg("mark_precise: frame0: parent state regs= stack=-16:  R0=1 R1=ctx() R6=map_value(map=.data.two_byte_,ks=4,vs=2) R10=fp0 fp-8=P1 fp-16=P1")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 6 first_idx 3 subseq_idx 7")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-16 before 6: (05) goto pc+0")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-16 before 5: (7b) *(u64 *)(r10 -16) = r0")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r0 stack= before 4: (b7) r0 = 1")</div><div class='del'>-__msg("14: R1_w=map_value(map=.data.two_byte_,ks=4,vs=2,off=1) R2_w=1")</div><div class='add'>+__msg("14: R1=map_value(map=.data.two_byte_,ks=4,vs=2,off=1) R2=1")</div><div class='ctx'> __naked void stack_load_preserves_const_precision(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -719,22 +719,22 @@ __success</div><div class='ctx'> /* make sure fp-8 is 32-bit FAKE subregister spill */</div><div class='ctx'> __msg("3: (62) *(u32 *)(r10 -8) = 1          ; R10=fp0 fp-8=????1")</div><div class='ctx'> /* but fp-16 is spilled IMPRECISE zero const reg */</div><div class='del'>-__msg("5: (63) *(u32 *)(r10 -16) = r0        ; R0_w=1 R10=fp0 fp-16=????1")</div><div class='add'>+__msg("5: (63) *(u32 *)(r10 -16) = r0        ; R0=1 R10=fp0 fp-16=????1")</div><div class='ctx'> /* validate load from fp-8, which was initialized using BPF_ST_MEM */</div><div class='del'>-__msg("8: (61) r2 = *(u32 *)(r10 -8)         ; R2_w=1 R10=fp0 fp-8=????1")</div><div class='add'>+__msg("8: (61) r2 = *(u32 *)(r10 -8)         ; R2=1 R10=fp0 fp-8=????1")</div><div class='ctx'> __msg("9: (0f) r1 += r2")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 9 first_idx 7 subseq_idx -1")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r2 stack= before 8: (61) r2 = *(u32 *)(r10 -8)")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-8 before 7: (bf) r1 = r6")</div><div class='del'>-__msg("mark_precise: frame0: parent state regs= stack=-8:  R0_w=1 R1=ctx() R6_r=map_value(map=.data.two_byte_,ks=4,vs=2) R10=fp0 fp-8_r=????P1 fp-16=????1")</div><div class='add'>+__msg("mark_precise: frame0: parent state regs= stack=-8:  R0=1 R1=ctx() R6=map_value(map=.data.two_byte_,ks=4,vs=2) R10=fp0 fp-8=????P1 fp-16=????1")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 6 first_idx 3 subseq_idx 7")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-8 before 6: (05) goto pc+0")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-8 before 5: (63) *(u32 *)(r10 -16) = r0")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-8 before 4: (b7) r0 = 1")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-8 before 3: (62) *(u32 *)(r10 -8) = 1")</div><div class='del'>-__msg("10: R1_w=map_value(map=.data.two_byte_,ks=4,vs=2,off=1) R2_w=1")</div><div class='add'>+__msg("10: R1=map_value(map=.data.two_byte_,ks=4,vs=2,off=1) R2=1")</div><div class='ctx'> /* validate load from fp-16, which was initialized using BPF_STX_MEM */</div><div class='del'>-__msg("12: (61) r2 = *(u32 *)(r10 -16)       ; R2_w=1 R10=fp0 fp-16=????1")</div><div class='add'>+__msg("12: (61) r2 = *(u32 *)(r10 -16)       ; R2=1 R10=fp0 fp-16=????1")</div><div class='ctx'> __msg("13: (0f) r1 += r2")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 13 first_idx 7 subseq_idx -1")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r2 stack= before 12: (61) r2 = *(u32 *)(r10 -16)")</div><div class='hunk'>@@ -743,12 +743,12 @@ __msg("mark_precise: frame0: regs= stack=-16 before 10: (73) *(u8 *)(r1 +0) = r2</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-16 before 9: (0f) r1 += r2")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-16 before 8: (61) r2 = *(u32 *)(r10 -8)")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-16 before 7: (bf) r1 = r6")</div><div class='del'>-__msg("mark_precise: frame0: parent state regs= stack=-16:  R0_w=1 R1=ctx() R6_r=map_value(map=.data.two_byte_,ks=4,vs=2) R10=fp0 fp-8_r=????P1 fp-16_r=????P1")</div><div class='add'>+__msg("mark_precise: frame0: parent state regs= stack=-16:  R0=1 R1=ctx() R6=map_value(map=.data.two_byte_,ks=4,vs=2) R10=fp0 fp-8=????P1 fp-16=????P1")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 6 first_idx 3 subseq_idx 7")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-16 before 6: (05) goto pc+0")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-16 before 5: (63) *(u32 *)(r10 -16) = r0")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r0 stack= before 4: (b7) r0 = 1")</div><div class='del'>-__msg("14: R1_w=map_value(map=.data.two_byte_,ks=4,vs=2,off=1) R2_w=1")</div><div class='add'>+__msg("14: R1=map_value(map=.data.two_byte_,ks=4,vs=2,off=1) R2=1")</div><div class='ctx'> __naked void stack_load_preserves_const_precision_subreg(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_stack_ptr.c b/tools/testing/selftests/bpf/progs/verifier_stack_ptr.c<br/>index 417c61cd4b19..24aabc6083fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_stack_ptr.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_stack_ptr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_stack_ptr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_stack_ptr.c</a></div><div class='hunk'>@@ -481,4 +481,56 @@ l1_%=:	r0 = 42;					\</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("socket")</div><div class='add'>+__description("PTR_TO_STACK stack size &gt; 512")</div><div class='add'>+__failure __msg("invalid write to stack R1 off=-520 size=8")</div><div class='add'>+__naked void stack_check_size_gt_512(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r1 = r10;					\</div><div class='add'>+	r1 += -520;					\</div><div class='add'>+	r0 = 42;					\</div><div class='add'>+	*(u64*)(r1 + 0) = r0;				\</div><div class='add'>+	exit;						\</div><div class='add'>+"	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef __BPF_FEATURE_MAY_GOTO</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("PTR_TO_STACK stack size 512 with may_goto with jit")</div><div class='add'>+__load_if_JITed()</div><div class='add'>+__success __retval(42)</div><div class='add'>+__naked void stack_check_size_512_with_may_goto_jit(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r1 = r10;					\</div><div class='add'>+	r1 += -512;					\</div><div class='add'>+	r0 = 42;					\</div><div class='add'>+	*(u32*)(r1 + 0) = r0;				\</div><div class='add'>+	may_goto l0_%=;					\</div><div class='add'>+	r2 = 100;					\</div><div class='add'>+	l0_%=:						\</div><div class='add'>+	exit;						\</div><div class='add'>+"	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("PTR_TO_STACK stack size 512 with may_goto without jit")</div><div class='add'>+__load_if_no_JITed()</div><div class='add'>+__failure __msg("stack size 520(extra 8) is too large")</div><div class='add'>+__naked void stack_check_size_512_with_may_goto(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r1 = r10;					\</div><div class='add'>+	r1 += -512;					\</div><div class='add'>+	r0 = 42;					\</div><div class='add'>+	*(u32*)(r1 + 0) = r0;				\</div><div class='add'>+	may_goto l0_%=;					\</div><div class='add'>+	r2 = 100;					\</div><div class='add'>+	l0_%=:						\</div><div class='add'>+	exit;						\</div><div class='add'>+"	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_store_release.c b/tools/testing/selftests/bpf/progs/verifier_store_release.c<br/>new file mode 100644<br/>index 000000000000..72f1eb006074<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_store_release.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_store_release.c</a></div><div class='hunk'>@@ -0,0 +1,301 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Google LLC. */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "../../../include/linux/filter.h"</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+#ifdef CAN_USE_LOAD_ACQ_STORE_REL</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("store-release, 8-bit")</div><div class='add'>+__success __success_unpriv __retval(0)</div><div class='add'>+__naked void store_release_8(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"w1 = 0x12;"</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u8 *)(r10 - 1), w1);</div><div class='add'>+	"w2 = *(u8 *)(r10 - 1);"</div><div class='add'>+	"if r2 == r1 goto 1f;"</div><div class='add'>+	"r0 = 1;"</div><div class='add'>+"1:"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_B, BPF_STORE_REL, BPF_REG_10, BPF_REG_1, -1))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("store-release, 16-bit")</div><div class='add'>+__success __success_unpriv __retval(0)</div><div class='add'>+__naked void store_release_16(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"w1 = 0x1234;"</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u16 *)(r10 - 2), w1);</div><div class='add'>+	"w2 = *(u16 *)(r10 - 2);"</div><div class='add'>+	"if r2 == r1 goto 1f;"</div><div class='add'>+	"r0 = 1;"</div><div class='add'>+"1:"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_H, BPF_STORE_REL, BPF_REG_10, BPF_REG_1, -2))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("store-release, 32-bit")</div><div class='add'>+__success __success_unpriv __retval(0)</div><div class='add'>+__naked void store_release_32(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"w1 = 0x12345678;"</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u32 *)(r10 - 4), w1);</div><div class='add'>+	"w2 = *(u32 *)(r10 - 4);"</div><div class='add'>+	"if r2 == r1 goto 1f;"</div><div class='add'>+	"r0 = 1;"</div><div class='add'>+"1:"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_W, BPF_STORE_REL, BPF_REG_10, BPF_REG_1, -4))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("store-release, 64-bit")</div><div class='add'>+__success __success_unpriv __retval(0)</div><div class='add'>+__naked void store_release_64(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"r1 = 0x1234567890abcdef ll;"</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u64 *)(r10 - 8), r1);</div><div class='add'>+	"r2 = *(u64 *)(r10 - 8);"</div><div class='add'>+	"if r2 == r1 goto 1f;"</div><div class='add'>+	"r0 = 1;"</div><div class='add'>+"1:"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_STORE_REL, BPF_REG_10, BPF_REG_1, -8))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("store-release with uninitialized src_reg")</div><div class='add'>+__failure __failure_unpriv __msg("R2 !read_ok")</div><div class='add'>+__naked void store_release_with_uninitialized_src_reg(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u64 *)(r10 - 8), r2);</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_STORE_REL, BPF_REG_10, BPF_REG_2, -8))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("store-release with uninitialized dst_reg")</div><div class='add'>+__failure __failure_unpriv __msg("R2 !read_ok")</div><div class='add'>+__naked void store_release_with_uninitialized_dst_reg(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = 0;"</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u64 *)(r2 - 8), r1);</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_STORE_REL, BPF_REG_2, BPF_REG_1, -8))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("store-release with non-pointer dst_reg")</div><div class='add'>+__failure __failure_unpriv __msg("R1 invalid mem access 'scalar'")</div><div class='add'>+__naked void store_release_with_non_pointer_dst_reg(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r1 = 0;"</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u64 *)(r1 + 0), r1);</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_STORE_REL, BPF_REG_1, BPF_REG_1, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("misaligned store-release")</div><div class='add'>+__failure __failure_unpriv __msg("misaligned stack access off")</div><div class='add'>+__flag(BPF_F_ANY_ALIGNMENT)</div><div class='add'>+__naked void store_release_misaligned(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"w0 = 0;"</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u32 *)(r10 - 5), w0);</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_W, BPF_STORE_REL, BPF_REG_10, BPF_REG_0, -5))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("store-release to ctx pointer")</div><div class='add'>+__failure __failure_unpriv __msg("BPF_ATOMIC stores into R1 ctx is not allowed")</div><div class='add'>+__naked void store_release_to_ctx_pointer(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"w0 = 0;"</div><div class='add'>+	// store_release((u8 *)(r1 + offsetof(struct __sk_buff, cb[0])), w0);</div><div class='add'>+	".8byte %[store_release_insn];"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_B, BPF_STORE_REL, BPF_REG_1, BPF_REG_0,</div><div class='add'>+				   offsetof(struct __sk_buff, cb[0])))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+__description("store-release to pkt pointer")</div><div class='add'>+__failure __msg("BPF_ATOMIC stores into R2 pkt is not allowed")</div><div class='add'>+__naked void store_release_to_pkt_pointer(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"w0 = 0;"</div><div class='add'>+	"r2 = *(u32 *)(r1 + %[xdp_md_data]);"</div><div class='add'>+	"r3 = *(u32 *)(r1 + %[xdp_md_data_end]);"</div><div class='add'>+	"r1 = r2;"</div><div class='add'>+	"r1 += 8;"</div><div class='add'>+	"if r1 &gt;= r3 goto l0_%=;"</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u8 *)(r2 + 0), w0);</div><div class='add'>+"l0_%=:  r0 = 0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_const(xdp_md_data, offsetof(struct xdp_md, data)),</div><div class='add'>+	  __imm_const(xdp_md_data_end, offsetof(struct xdp_md, data_end)),</div><div class='add'>+	  __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_B, BPF_STORE_REL, BPF_REG_2, BPF_REG_0, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("flow_dissector")</div><div class='add'>+__description("store-release to flow_keys pointer")</div><div class='add'>+__failure __msg("BPF_ATOMIC stores into R2 flow_keys is not allowed")</div><div class='add'>+__naked void store_release_to_flow_keys_pointer(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"w0 = 0;"</div><div class='add'>+	"r2 = *(u64 *)(r1 + %[__sk_buff_flow_keys]);"</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u8 *)(r2 + 0), w0);</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_const(__sk_buff_flow_keys,</div><div class='add'>+		      offsetof(struct __sk_buff, flow_keys)),</div><div class='add'>+	  __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_B, BPF_STORE_REL, BPF_REG_2, BPF_REG_0, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("sk_reuseport")</div><div class='add'>+__description("store-release to sock pointer")</div><div class='add'>+__failure __msg("R2 cannot write into sock")</div><div class='add'>+__naked void store_release_to_sock_pointer(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"w0 = 0;"</div><div class='add'>+	"r2 = *(u64 *)(r1 + %[sk_reuseport_md_sk]);"</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u8 *)(r2 + 0), w0);</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_const(sk_reuseport_md_sk, offsetof(struct sk_reuseport_md, sk)),</div><div class='add'>+	  __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_B, BPF_STORE_REL, BPF_REG_2, BPF_REG_0, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("store-release, leak pointer to stack")</div><div class='add'>+__success __success_unpriv __retval(0)</div><div class='add'>+__naked void store_release_leak_pointer_to_stack(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u64 *)(r10 - 8), r1);</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_STORE_REL, BPF_REG_10, BPF_REG_1, -8))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, long long);</div><div class='add'>+	__type(value, long long);</div><div class='add'>+} map_hash_8b SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("store-release, leak pointer to map")</div><div class='add'>+__success __retval(0)</div><div class='add'>+__failure_unpriv __msg_unpriv("R6 leaks addr into map")</div><div class='add'>+__naked void store_release_leak_pointer_to_map(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	"r6 = r1;"</div><div class='add'>+	"r1 = %[map_hash_8b] ll;"</div><div class='add'>+	"r2 = 0;"</div><div class='add'>+	"*(u64 *)(r10 - 8) = r2;"</div><div class='add'>+	"r2 = r10;"</div><div class='add'>+	"r2 += -8;"</div><div class='add'>+	"call %[bpf_map_lookup_elem];"</div><div class='add'>+	"if r0 == 0 goto l0_%=;"</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u64 *)(r0 + 0), r6);</div><div class='add'>+"l0_%=:"</div><div class='add'>+	"r0 = 0;"</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_addr(map_hash_8b),</div><div class='add'>+	  __imm(bpf_map_lookup_elem),</div><div class='add'>+	  __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_STORE_REL, BPF_REG_0, BPF_REG_6, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("store-release with invalid register R15")</div><div class='add'>+__failure __failure_unpriv __msg("R15 is invalid")</div><div class='add'>+__naked void store_release_with_invalid_reg(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+	".8byte %[store_release_insn];" // store_release((u64 *)(r15 + 0), r1);</div><div class='add'>+	"exit;"</div><div class='add'>+	:</div><div class='add'>+	: __imm_insn(store_release_insn,</div><div class='add'>+		     BPF_ATOMIC_OP(BPF_DW, BPF_STORE_REL, 15 /* invalid reg */, BPF_REG_1, 0))</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CAN_USE_LOAD_ACQ_STORE_REL */</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("Clang version &lt; 18, ENABLE_ATOMICS_TESTS not defined, and/or JIT doesn't support store-release, use a dummy test")</div><div class='add'>+__success</div><div class='add'>+int dummy_test(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CAN_USE_LOAD_ACQ_STORE_REL */</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_subprog_precision.c b/tools/testing/selftests/bpf/progs/verifier_subprog_precision.c<br/>index 9d415f7ce599..61886ed554de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_subprog_precision.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_subprog_precision.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_subprog_precision.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_subprog_precision.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ __msg("mark_precise: frame0: regs=r0 stack= before 4: (27) r0 *= 4")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r0 stack= before 3: (57) r0 &amp;= 3")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r0 stack= before 10: (95) exit")</div><div class='ctx'> __msg("mark_precise: frame1: regs=r0 stack= before 9: (bf) r0 = (s8)r10")</div><div class='del'>-__msg("7: R0_w=scalar")</div><div class='add'>+__msg("7: R0=scalar")</div><div class='ctx'> __naked int fp_precise_subprog_result(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -141,7 +141,7 @@ __msg("mark_precise: frame1: regs=r0 stack= before 10: (bf) r0 = (s8)r1")</div><div class='ctx'>  * anyways, at which point we'll break precision chain</div><div class='ctx'>  */</div><div class='ctx'> __msg("mark_precise: frame1: regs=r1 stack= before 9: (bf) r1 = r10")</div><div class='del'>-__msg("7: R0_w=scalar")</div><div class='add'>+__msg("7: R0=scalar")</div><div class='ctx'> __naked int sneaky_fp_precise_subprog_result(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile (</div><div class='hunk'>@@ -681,7 +681,7 @@ __msg("mark_precise: frame0: last_idx 10 first_idx 7 subseq_idx -1")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r7 stack= before 9: (bf) r1 = r8")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r7 stack= before 8: (27) r7 *= 4")</div><div class='ctx'> __msg("mark_precise: frame0: regs=r7 stack= before 7: (79) r7 = *(u64 *)(r10 -8)")</div><div class='del'>-__msg("mark_precise: frame0: parent state regs= stack=-8:  R0_w=2 R6_w=1 R8_rw=map_value(map=.data.vals,ks=4,vs=16) R10=fp0 fp-8_rw=P1")</div><div class='add'>+__msg("mark_precise: frame0: parent state regs= stack=-8:  R0=2 R6=1 R8=map_value(map=.data.vals,ks=4,vs=16) R10=fp0 fp-8=P1")</div><div class='ctx'> __msg("mark_precise: frame0: last_idx 18 first_idx 0 subseq_idx 7")</div><div class='ctx'> __msg("mark_precise: frame0: regs= stack=-8 before 18: (95) exit")</div><div class='ctx'> __msg("mark_precise: frame1: regs= stack= before 17: (0f) r0 += r2")</div><div class='hunk'>@@ -793,4 +793,57 @@ __naked int stack_slot_aliases_precision(void)</div><div class='ctx'> 	);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct {</div><div class='add'>+        __uint(type, BPF_MAP_TYPE_PROG_ARRAY);</div><div class='add'>+        __uint(max_entries, 1);</div><div class='add'>+        __type(key, __u32);</div><div class='add'>+        __type(value, __u32);</div><div class='add'>+} map_array SEC(".maps");</div><div class='add'>+</div><div class='add'>+__naked __noinline __used</div><div class='add'>+static unsigned long identity_tail_call(void)</div><div class='add'>+{</div><div class='add'>+	/* the simplest identity function involving a tail call */</div><div class='add'>+        asm volatile (</div><div class='add'>+		"r6 = r2;"</div><div class='add'>+		"r2 = %[map_array] ll;"</div><div class='add'>+		"r3 = 0;"</div><div class='add'>+		"call %[bpf_tail_call];"</div><div class='add'>+		"r0 = r6;"</div><div class='add'>+		"exit;"</div><div class='add'>+		:</div><div class='add'>+		: __imm(bpf_tail_call),</div><div class='add'>+		  __imm_addr(map_array)</div><div class='add'>+		: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("?raw_tp")</div><div class='add'>+__failure __log_level(2)</div><div class='add'>+__msg("13: (85) call bpf_tail_call#12")</div><div class='add'>+__msg("mark_precise: frame1: last_idx 13 first_idx 0 subseq_idx -1 ")</div><div class='add'>+__msg("returning from callee:")</div><div class='add'>+__msg("frame1: R0=scalar() R6=3 R10=fp0")</div><div class='add'>+__msg("to caller at 4:")</div><div class='add'>+__msg("R0=scalar() R6=map_value(map=.data.vals,ks=4,vs=16) R10=fp0")</div><div class='add'>+__msg("6: (0f) r1 += r0")</div><div class='add'>+__msg("mark_precise: frame0: regs=r0 stack= before 5: (bf) r1 = r6")</div><div class='add'>+__msg("mark_precise: frame0: regs=r0 stack= before 4: (27) r0 *= 4")</div><div class='add'>+__msg("mark_precise: frame0: parent state regs=r0 stack=:  R0=Pscalar() R6=map_value(map=.data.vals,ks=4,vs=16) R10=fp0")</div><div class='add'>+__msg("math between map_value pointer and register with unbounded min value is not allowed")</div><div class='add'>+__naked int subprog_result_tail_call(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile (</div><div class='add'>+		"r2 = 3;"</div><div class='add'>+		"call identity_tail_call;"</div><div class='add'>+		"r0 *= 4;"</div><div class='add'>+		"r1 = %[vals];"</div><div class='add'>+		"r1 += r0;"</div><div class='add'>+		"r0 = *(u32 *)(r1 + 0);"</div><div class='add'>+		"exit;"</div><div class='add'>+		:</div><div class='add'>+		: __imm_ptr(vals)</div><div class='add'>+		: __clobber_common</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_tailcall.c b/tools/testing/selftests/bpf/progs/verifier_tailcall.c<br/>new file mode 100644<br/>index 000000000000..b4acce60fb9b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_tailcall.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_tailcall.c</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "bpf_misc.h"</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u32);</div><div class='add'>+} map_array SEC(".maps");</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("invalid map type for tail call")</div><div class='add'>+__failure __msg("expected prog array map for tail call")</div><div class='add'>+__failure_unpriv</div><div class='add'>+__naked void invalid_map_for_tail_call(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("			\</div><div class='add'>+	r2 = %[map_array] ll;	\</div><div class='add'>+	r3 = 0;				\</div><div class='add'>+	call %[bpf_tail_call];		\</div><div class='add'>+	exit;				\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_tail_call),</div><div class='add'>+	  __imm_addr(map_array)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_unpriv.c b/tools/testing/selftests/bpf/progs/verifier_unpriv.c<br/>index a4a5e2071604..28b4f7035ceb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_unpriv.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_unpriv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_unpriv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_unpriv.c</a></div><div class='hunk'>@@ -572,8 +572,14 @@ l0_%=:	exit;						\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("alu32: mov u32 const")</div><div class='del'>-__success __failure_unpriv __msg_unpriv("R7 invalid mem access 'scalar'")</div><div class='add'>+__success __success_unpriv</div><div class='ctx'> __retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("if r0 == 0x0 goto pc+2")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `R7 invalid mem access 'scalar'` */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* sanitized dead code */</div><div class='add'>+__xlated_unpriv("exit")</div><div class='add'>+#endif</div><div class='ctx'> __naked void alu32_mov_u32_const(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='hunk'>@@ -619,12 +625,11 @@ __naked void pass_pointer_to_tail_call(void)</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("unpriv: cmp map pointer with zero")</div><div class='del'>-__success __failure_unpriv __msg_unpriv("R1 pointer comparison")</div><div class='add'>+__success __success_unpriv</div><div class='ctx'> __retval(0)</div><div class='ctx'> __naked void cmp_map_pointer_with_zero(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='del'>-	r1 = 0;						\</div><div class='ctx'> 	r1 = %[map_hash_8b] ll;				\</div><div class='ctx'> 	if r1 == 0 goto l0_%=;				\</div><div class='ctx'> l0_%=:	r0 = 0;						\</div><div class='hunk'>@@ -635,6 +640,22 @@ l0_%=:	r0 = 0;						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='add'>+__description("unpriv: cmp map pointer with const")</div><div class='add'>+__success __failure_unpriv __msg_unpriv("R1 pointer comparison prohibited")</div><div class='add'>+__retval(0)</div><div class='add'>+__naked void cmp_map_pointer_with_const(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r1 = %[map_hash_8b] ll;				\</div><div class='add'>+	if r1 == 0x0000beef goto l0_%=;			\</div><div class='add'>+l0_%=:	r0 = 0;						\</div><div class='add'>+	exit;						\</div><div class='add'>+"	:</div><div class='add'>+	: __imm_addr(map_hash_8b)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='ctx'> __description("unpriv: write into frame pointer")</div><div class='ctx'> __failure __msg("frame pointer is read only")</div><div class='ctx'> __failure_unpriv</div><div class='hunk'>@@ -723,4 +744,210 @@ l0_%=:	r0 = 0;						\</div><div class='ctx'> "	::: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("socket")</div><div class='add'>+__description("unpriv: Spectre v1 path-based type confusion of scalar as stack-ptr")</div><div class='add'>+__success __success_unpriv __retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("if r0 != 0x1 goto pc+2")</div><div class='add'>+/* This nospec prevents the exploit because it forces the mispredicted (not</div><div class='add'>+ * taken) `if r0 != 0x0 goto l0_%=` to resolve before using r6 as a pointer.</div><div class='add'>+ * This causes the CPU to realize that `r6 = r9` should have never executed. It</div><div class='add'>+ * ensures that r6 always contains a readable stack slot ptr when the insn after</div><div class='add'>+ * the nospec executes.</div><div class='add'>+ */</div><div class='add'>+__xlated_unpriv("nospec")</div><div class='add'>+__xlated_unpriv("r9 = *(u8 *)(r6 +0)")</div><div class='add'>+#endif</div><div class='add'>+__naked void unpriv_spec_v1_type_confusion(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r1 = 0;						\</div><div class='add'>+	*(u64*)(r10 - 8) = r1;				\</div><div class='add'>+	r2 = r10;					\</div><div class='add'>+	r2 += -8;					\</div><div class='add'>+	r1 = %[map_hash_8b] ll;				\</div><div class='add'>+	call %[bpf_map_lookup_elem];			\</div><div class='add'>+	if r0 == 0 goto l2_%=;				\</div><div class='add'>+	/* r0: pointer to a map array entry */		\</div><div class='add'>+	r2 = r10;					\</div><div class='add'>+	r2 += -8;					\</div><div class='add'>+	r1 = %[map_hash_8b] ll;				\</div><div class='add'>+	/* r1, r2: prepared call args */		\</div><div class='add'>+	r6 = r10;					\</div><div class='add'>+	r6 += -8;					\</div><div class='add'>+	/* r6: pointer to readable stack slot */	\</div><div class='add'>+	r9 = 0xffffc900;				\</div><div class='add'>+	r9 &lt;&lt;= 32;					\</div><div class='add'>+	/* r9: scalar controlled by attacker */		\</div><div class='add'>+	r0 = *(u64 *)(r0 + 0); /* cache miss */		\</div><div class='add'>+	if r0 != 0x0 goto l0_%=;			\</div><div class='add'>+	r6 = r9;					\</div><div class='add'>+l0_%=:	if r0 != 0x1 goto l1_%=;			\</div><div class='add'>+	r9 = *(u8 *)(r6 + 0);				\</div><div class='add'>+l1_%=:  /* leak r9 */					\</div><div class='add'>+	r9 &amp;= 1;					\</div><div class='add'>+	r9 &lt;&lt;= 9;					\</div><div class='add'>+	*(u64*)(r10 - 8) = r9;				\</div><div class='add'>+	call %[bpf_map_lookup_elem];			\</div><div class='add'>+	if r0 == 0 goto l2_%=;				\</div><div class='add'>+	/* leak secret into is_cached(map[0|512]): */	\</div><div class='add'>+	r0 = *(u64 *)(r0 + 0);				\</div><div class='add'>+l2_%=:							\</div><div class='add'>+	r0 = 0;						\</div><div class='add'>+	exit;						\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_map_lookup_elem),</div><div class='add'>+	  __imm_addr(map_hash_8b)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("unpriv: ldimm64 before Spectre v4 barrier")</div><div class='add'>+__success __success_unpriv</div><div class='add'>+__retval(0)</div><div class='add'>+#ifdef SPEC_V4</div><div class='add'>+__xlated_unpriv("r1 = 0x2020200005642020") /* should not matter */</div><div class='add'>+__xlated_unpriv("*(u64 *)(r10 -8) = r1")</div><div class='add'>+__xlated_unpriv("nospec")</div><div class='add'>+#endif</div><div class='add'>+__naked void unpriv_ldimm64_spectre_v4(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r1 = 0x2020200005642020 ll;			\</div><div class='add'>+	*(u64 *)(r10 -8) = r1;				\</div><div class='add'>+	r0 = 0;						\</div><div class='add'>+	exit;						\</div><div class='add'>+"	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("unpriv: Spectre v1 and v4 barrier")</div><div class='add'>+__success __success_unpriv</div><div class='add'>+__retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+#ifdef SPEC_V4</div><div class='add'>+/* starts with r0 == r8 == r9 == 0 */</div><div class='add'>+__xlated_unpriv("if r8 != 0x0 goto pc+1")</div><div class='add'>+__xlated_unpriv("goto pc+2")</div><div class='add'>+__xlated_unpriv("if r9 == 0x0 goto pc+4")</div><div class='add'>+__xlated_unpriv("r2 = r0")</div><div class='add'>+/* Following nospec required to prevent following dangerous `*(u64 *)(NOT_FP -64)</div><div class='add'>+ * = r1` iff `if r9 == 0 goto pc+4` was mispredicted because of Spectre v1. The</div><div class='add'>+ * test therefore ensures the Spectre-v4--induced nospec does not prevent the</div><div class='add'>+ * Spectre-v1--induced speculative path from being fully analyzed.</div><div class='add'>+ */</div><div class='add'>+__xlated_unpriv("nospec") /* Spectre v1 */</div><div class='add'>+__xlated_unpriv("*(u64 *)(r2 -64) = r1") /* could be used to leak r2 */</div><div class='add'>+__xlated_unpriv("nospec") /* Spectre v4 */</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+__naked void unpriv_spectre_v1_and_v4(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r1 = 0;						\</div><div class='add'>+	*(u64*)(r10 - 8) = r1;				\</div><div class='add'>+	r2 = r10;					\</div><div class='add'>+	r2 += -8;					\</div><div class='add'>+	r1 = %[map_hash_8b] ll;				\</div><div class='add'>+	call %[bpf_map_lookup_elem];			\</div><div class='add'>+	r8 = r0;					\</div><div class='add'>+	r2 = r10;					\</div><div class='add'>+	r2 += -8;					\</div><div class='add'>+	r1 = %[map_hash_8b] ll;				\</div><div class='add'>+	call %[bpf_map_lookup_elem];			\</div><div class='add'>+	r9 = r0;					\</div><div class='add'>+	r0 = r10;					\</div><div class='add'>+	r1 = 0;						\</div><div class='add'>+	r2 = r10;					\</div><div class='add'>+	if r8 != 0 goto l0_%=;				\</div><div class='add'>+	if r9 != 0 goto l0_%=;				\</div><div class='add'>+	r0 = 0;						\</div><div class='add'>+l0_%=:	if r8 != 0 goto l1_%=;				\</div><div class='add'>+	goto l2_%=;					\</div><div class='add'>+l1_%=:	if r9 == 0 goto l3_%=;				\</div><div class='add'>+	r2 = r0;					\</div><div class='add'>+l2_%=:	*(u64 *)(r2 -64) = r1;				\</div><div class='add'>+l3_%=:	r0 = 0;						\</div><div class='add'>+	exit;						\</div><div class='add'>+"	:</div><div class='add'>+	: __imm(bpf_map_lookup_elem),</div><div class='add'>+	  __imm_addr(map_hash_8b)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("unpriv: Spectre v1 and v4 barrier (simple)")</div><div class='add'>+__success __success_unpriv</div><div class='add'>+__retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+#ifdef SPEC_V4</div><div class='add'>+__xlated_unpriv("if r8 != 0x0 goto pc+1")</div><div class='add'>+__xlated_unpriv("goto pc+2")</div><div class='add'>+__xlated_unpriv("goto pc-1") /* if r9 == 0 goto l3_%= */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* r2 = r0 */</div><div class='add'>+__xlated_unpriv("nospec")</div><div class='add'>+__xlated_unpriv("*(u64 *)(r2 -64) = r1")</div><div class='add'>+__xlated_unpriv("nospec")</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+__naked void unpriv_spectre_v1_and_v4_simple(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r8 = 0;						\</div><div class='add'>+	r9 = 0;						\</div><div class='add'>+	r0 = r10;					\</div><div class='add'>+	r1 = 0;						\</div><div class='add'>+	r2 = r10;					\</div><div class='add'>+	if r8 != 0 goto l0_%=;				\</div><div class='add'>+	if r9 != 0 goto l0_%=;				\</div><div class='add'>+	r0 = 0;						\</div><div class='add'>+l0_%=:	if r8 != 0 goto l1_%=;				\</div><div class='add'>+	goto l2_%=;					\</div><div class='add'>+l1_%=:	if r9 == 0 goto l3_%=;				\</div><div class='add'>+	r2 = r0;					\</div><div class='add'>+l2_%=:	*(u64 *)(r2 -64) = r1;				\</div><div class='add'>+l3_%=:	r0 = 0;						\</div><div class='add'>+	exit;						\</div><div class='add'>+"	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("socket")</div><div class='add'>+__description("unpriv: ldimm64 before Spectre v1 and v4 barrier (simple)")</div><div class='add'>+__success __success_unpriv</div><div class='add'>+__retval(0)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+#ifdef SPEC_V4</div><div class='add'>+__xlated_unpriv("if r8 != 0x0 goto pc+1")</div><div class='add'>+__xlated_unpriv("goto pc+4")</div><div class='add'>+__xlated_unpriv("goto pc-1") /* if r9 == 0 goto l3_%= */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* r2 = r0 */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* r1 = 0x2020200005642020 ll */</div><div class='add'>+__xlated_unpriv("goto pc-1") /* second part of ldimm64 */</div><div class='add'>+__xlated_unpriv("nospec")</div><div class='add'>+__xlated_unpriv("*(u64 *)(r2 -64) = r1")</div><div class='add'>+__xlated_unpriv("nospec")</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+__naked void unpriv_ldimm64_spectre_v1_and_v4_simple(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r8 = 0;						\</div><div class='add'>+	r9 = 0;						\</div><div class='add'>+	r0 = r10;					\</div><div class='add'>+	r1 = 0;						\</div><div class='add'>+	r2 = r10;					\</div><div class='add'>+	if r8 != 0 goto l0_%=;				\</div><div class='add'>+	if r9 != 0 goto l0_%=;				\</div><div class='add'>+	r0 = 0;						\</div><div class='add'>+l0_%=:	if r8 != 0 goto l1_%=;				\</div><div class='add'>+	goto l2_%=;					\</div><div class='add'>+l1_%=:	if r9 == 0 goto l3_%=;				\</div><div class='add'>+	r2 = r0;					\</div><div class='add'>+	r1 = 0x2020200005642020 ll;			\</div><div class='add'>+l2_%=:	*(u64 *)(r2 -64) = r1;				\</div><div class='add'>+l3_%=:	r0 = 0;						\</div><div class='add'>+	exit;						\</div><div class='add'>+"	::: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c b/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c<br/>index a9ab37d3b9e2..2129e4353fd9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include "../../../include/linux/filter.h"</div><div class='ctx'> #include "bpf_misc.h"</div><div class='ctx'> </div><div class='ctx'> #define MAX_ENTRIES 11</div><div class='hunk'>@@ -146,6 +147,24 @@ l0_%=:	exit;						\</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("socket")</div><div class='add'>+__description("map_ptr illegal alu op, map_ptr = -map_ptr")</div><div class='add'>+__failure __msg("R0 invalid mem access 'scalar'")</div><div class='add'>+__failure_unpriv __msg_unpriv("R0 pointer arithmetic prohibited")</div><div class='add'>+__flag(BPF_F_ANY_ALIGNMENT)</div><div class='add'>+__naked void map_ptr_illegal_alu_op(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("					\</div><div class='add'>+	r0 = %[map_hash_48b] ll;			\</div><div class='add'>+	r0 = -r0;					\</div><div class='add'>+	r1 = 22;					\</div><div class='add'>+	*(u64*)(r0 + 0) = r1;				\</div><div class='add'>+	exit;						\</div><div class='add'>+"	:</div><div class='add'>+	: __imm_addr(map_hash_48b)</div><div class='add'>+	: __clobber_all);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> SEC("flow_dissector")</div><div class='ctx'> __description("flow_keys illegal alu op with variable offset")</div><div class='ctx'> __failure __msg("R7 pointer arithmetic on flow_keys prohibited")</div><div class='hunk'>@@ -165,4 +184,32 @@ __naked void flow_keys_illegal_variable_offset_alu(void)</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define DEFINE_BAD_OFFSET_TEST(name, op, off, imm)	\</div><div class='add'>+	SEC("socket")					\</div><div class='add'>+	__failure __msg("BPF_ALU uses reserved fields") \</div><div class='add'>+	__naked void name(void)				\</div><div class='add'>+	{						\</div><div class='add'>+		asm volatile(				\</div><div class='add'>+			"r0 = 1;"			\</div><div class='add'>+			".8byte %[insn];"		\</div><div class='add'>+			"r0 = 0;"			\</div><div class='add'>+			"exit;"				\</div><div class='add'>+		:					\</div><div class='add'>+		: __imm_insn(insn, BPF_RAW_INSN((op), 0, 0, (off), (imm))) \</div><div class='add'>+		: __clobber_all);			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Offset fields of 0 and 1 are legal for BPF_{DIV,MOD} instructions.</div><div class='add'>+ * Offset fields of 0 are legal for the rest of ALU instructions.</div><div class='add'>+ * Test that error is reported for illegal offsets, assuming that tests</div><div class='add'>+ * for legal offsets exist.</div><div class='add'>+ */</div><div class='add'>+DEFINE_BAD_OFFSET_TEST(bad_offset_divx, BPF_ALU64 | BPF_DIV | BPF_X, -1, 0)</div><div class='add'>+DEFINE_BAD_OFFSET_TEST(bad_offset_modk, BPF_ALU64 | BPF_MOD | BPF_K, -1, 1)</div><div class='add'>+DEFINE_BAD_OFFSET_TEST(bad_offset_addx, BPF_ALU64 | BPF_ADD | BPF_X, -1, 0)</div><div class='add'>+DEFINE_BAD_OFFSET_TEST(bad_offset_divx2, BPF_ALU64 | BPF_DIV | BPF_X, 2, 0)</div><div class='add'>+DEFINE_BAD_OFFSET_TEST(bad_offset_modk2, BPF_ALU64 | BPF_MOD | BPF_K, 2, 1)</div><div class='add'>+DEFINE_BAD_OFFSET_TEST(bad_offset_addx2, BPF_ALU64 | BPF_ADD | BPF_X, 1, 0)</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c b/tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c<br/>index 5ba6e53571c8..af7938ce56cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c</a></div><div class='hunk'>@@ -231,6 +231,10 @@ __retval(1)</div><div class='ctx'> __naked void ptr_unknown_vs_unknown_lt(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='add'>+	r8 = r1;					\</div><div class='add'>+	call %[bpf_get_prandom_u32];			\</div><div class='add'>+	r9 = r0;					\</div><div class='add'>+	r1 = r8;					\</div><div class='ctx'> 	r0 = *(u32*)(r1 + %[__sk_buff_len]);		\</div><div class='ctx'> 	r1 = 0;						\</div><div class='ctx'> 	*(u64*)(r10 - 8) = r1;				\</div><div class='hunk'>@@ -245,11 +249,11 @@ l1_%=:	call %[bpf_map_lookup_elem];			\</div><div class='ctx'> 	r4 = *(u8*)(r0 + 0);				\</div><div class='ctx'> 	if r4 == 1 goto l3_%=;				\</div><div class='ctx'> 	r1 = 6;						\</div><div class='del'>-	r1 = -r1;					\</div><div class='add'>+	r1 = r9;					\</div><div class='ctx'> 	r1 &amp;= 0x3;					\</div><div class='ctx'> 	goto l4_%=;					\</div><div class='ctx'> l3_%=:	r1 = 6;						\</div><div class='del'>-	r1 = -r1;					\</div><div class='add'>+	r1 = r9;					\</div><div class='ctx'> 	r1 &amp;= 0x7;					\</div><div class='ctx'> l4_%=:	r1 += r0;					\</div><div class='ctx'> 	r0 = *(u8*)(r1 + 0);				\</div><div class='hunk'>@@ -259,7 +263,8 @@ l2_%=:	r0 = 1;						\</div><div class='ctx'> 	: __imm(bpf_map_lookup_elem),</div><div class='ctx'> 	  __imm_addr(map_array_48b),</div><div class='ctx'> 	  __imm_addr(map_hash_16b),</div><div class='del'>-	  __imm_const(__sk_buff_len, offsetof(struct __sk_buff, len))</div><div class='add'>+	  __imm_const(__sk_buff_len, offsetof(struct __sk_buff, len)),</div><div class='add'>+	  __imm(bpf_get_prandom_u32)</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -271,6 +276,10 @@ __retval(1)</div><div class='ctx'> __naked void ptr_unknown_vs_unknown_gt(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='add'>+	r8 = r1;					\</div><div class='add'>+	call %[bpf_get_prandom_u32];			\</div><div class='add'>+	r9 = r0;					\</div><div class='add'>+	r1 = r8;					\</div><div class='ctx'> 	r0 = *(u32*)(r1 + %[__sk_buff_len]);		\</div><div class='ctx'> 	r1 = 0;						\</div><div class='ctx'> 	*(u64*)(r10 - 8) = r1;				\</div><div class='hunk'>@@ -285,11 +294,11 @@ l1_%=:	call %[bpf_map_lookup_elem];			\</div><div class='ctx'> 	r4 = *(u8*)(r0 + 0);				\</div><div class='ctx'> 	if r4 == 1 goto l3_%=;				\</div><div class='ctx'> 	r1 = 6;						\</div><div class='del'>-	r1 = -r1;					\</div><div class='add'>+	r1 = r9;					\</div><div class='ctx'> 	r1 &amp;= 0x7;					\</div><div class='ctx'> 	goto l4_%=;					\</div><div class='ctx'> l3_%=:	r1 = 6;						\</div><div class='del'>-	r1 = -r1;					\</div><div class='add'>+	r1 = r9;					\</div><div class='ctx'> 	r1 &amp;= 0x3;					\</div><div class='ctx'> l4_%=:	r1 += r0;					\</div><div class='ctx'> 	r0 = *(u8*)(r1 + 0);				\</div><div class='hunk'>@@ -299,7 +308,8 @@ l2_%=:	r0 = 1;						\</div><div class='ctx'> 	: __imm(bpf_map_lookup_elem),</div><div class='ctx'> 	  __imm_addr(map_array_48b),</div><div class='ctx'> 	  __imm_addr(map_hash_16b),</div><div class='del'>-	  __imm_const(__sk_buff_len, offsetof(struct __sk_buff, len))</div><div class='add'>+	  __imm_const(__sk_buff_len, offsetof(struct __sk_buff, len)),</div><div class='add'>+	  __imm(bpf_get_prandom_u32)</div><div class='ctx'> 	: __clobber_all);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -398,7 +408,8 @@ l2_%=:	r0 = 1;						\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("map access: mixing value pointer and scalar, 1")</div><div class='del'>-__success __failure_unpriv __msg_unpriv("R2 pointer comparison prohibited")</div><div class='add'>+__success __failure_unpriv</div><div class='add'>+__msg_unpriv("R2 tried to add from different maps, paths or scalars, pointer arithmetic with it prohibited for !root")</div><div class='ctx'> __retval(0)</div><div class='ctx'> __naked void value_pointer_and_scalar_1(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -433,6 +444,7 @@ l2_%=:	/* common instruction */			\</div><div class='ctx'> l3_%=:	/* branch B */					\</div><div class='ctx'> 	r0 = 0x13371337;				\</div><div class='ctx'> 	/* verifier follows fall-through */		\</div><div class='add'>+	/* unpriv: nospec (inserted to prevent `R2 pointer comparison prohibited`) */\</div><div class='ctx'> 	if r2 != 0x100000 goto l4_%=;			\</div><div class='ctx'> 	r0 = 0;						\</div><div class='ctx'> 	exit;						\</div><div class='hunk'>@@ -450,7 +462,8 @@ l4_%=:	/* fake-dead code; targeted from branch A to	\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("map access: mixing value pointer and scalar, 2")</div><div class='del'>-__success __failure_unpriv __msg_unpriv("R0 invalid mem access 'scalar'")</div><div class='add'>+__success __failure_unpriv</div><div class='add'>+__msg_unpriv("R2 tried to add from different maps, paths or scalars, pointer arithmetic with it prohibited for !root")</div><div class='ctx'> __retval(0)</div><div class='ctx'> __naked void value_pointer_and_scalar_2(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -492,6 +505,7 @@ l4_%=:	/* fake-dead code; targeted from branch A to	\</div><div class='ctx'> 	 * prevent dead code sanitization, rejected	\</div><div class='ctx'> 	 * via branch B however				\</div><div class='ctx'> 	 */						\</div><div class='add'>+	/* unpriv: nospec (inserted to prevent `R0 invalid mem access 'scalar'`) */\</div><div class='ctx'> 	r0 = *(u8*)(r0 + 0);				\</div><div class='ctx'> 	r0 = 0;						\</div><div class='ctx'> 	exit;						\</div><div class='hunk'>@@ -1296,9 +1310,13 @@ l0_%=:	r0 = 1;						\</div><div class='ctx'> </div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("map access: value_ptr -= unknown scalar, 2")</div><div class='del'>-__success __failure_unpriv</div><div class='del'>-__msg_unpriv("R0 pointer arithmetic of map value goes out of range")</div><div class='add'>+__success __success_unpriv</div><div class='ctx'> __retval(1)</div><div class='add'>+#ifdef SPEC_V1</div><div class='add'>+__xlated_unpriv("r1 &amp;= 7")</div><div class='add'>+__xlated_unpriv("nospec") /* inserted to prevent `R0 pointer arithmetic of map value goes out of range` */</div><div class='add'>+__xlated_unpriv("r0 -= r1")</div><div class='add'>+#endif</div><div class='ctx'> __naked void value_ptr_unknown_scalar_2_2(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile ("					\</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_var_off.c b/tools/testing/selftests/bpf/progs/verifier_var_off.c<br/>index 1d36d01b746e..f345466bca68 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_var_off.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_var_off.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_var_off.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_var_off.c</a></div><div class='hunk'>@@ -114,8 +114,8 @@ __naked void stack_write_priv_vs_unpriv(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Similar to the previous test, but this time also perform a read from the</div><div class='del'>- * address written to with a variable offset. The read is allowed, showing that,</div><div class='del'>- * after a variable-offset write, a priviledged program can read the slots that</div><div class='add'>+ * address written to with a variable offet. The read is allowed, showing that,</div><div class='add'>+ * after a variable-offset write, a privileged program can read the slots that</div><div class='ctx'>  * were in the range of that write (even if the verifier doesn't actually know if</div><div class='ctx'>  * the slot being read was really written to or not.</div><div class='ctx'>  *</div><div class='hunk'>@@ -157,7 +157,7 @@ __naked void stack_write_followed_by_read(void)</div><div class='ctx'> SEC("socket")</div><div class='ctx'> __description("variable-offset stack write clobbers spilled regs")</div><div class='ctx'> __failure</div><div class='del'>-/* In the priviledged case, dereferencing a spilled-and-then-filled</div><div class='add'>+/* In the privileged case, dereferencing a spilled-and-then-filled</div><div class='ctx'>  * register is rejected because the previous variable offset stack</div><div class='ctx'>  * write might have overwritten the spilled pointer (i.e. we lose track</div><div class='ctx'>  * of the spilled register when we analyze the write).</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_vfs_accept.c b/tools/testing/selftests/bpf/progs/verifier_vfs_accept.c<br/>index a7c0a553aa50..55398c04290a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_vfs_accept.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_vfs_accept.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_vfs_accept.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_vfs_accept.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /* Copyright (c) 2024 Google LLC. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -69,7 +70,7 @@ __success</div><div class='ctx'> int BPF_PROG(path_d_path_from_file_argument, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	struct path *path;</div><div class='add'>+	const struct path *path;</div><div class='ctx'> </div><div class='ctx'> 	/* The f_path member is a path which is embedded directly within a</div><div class='ctx'> 	 * file. Therefore, a pointer to such embedded members are still</div><div class='hunk'>@@ -82,4 +83,21 @@ int BPF_PROG(path_d_path_from_file_argument, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("lsm.s/inode_rename")</div><div class='add'>+__success</div><div class='add'>+int BPF_PROG(inode_rename, struct inode *old_dir, struct dentry *old_dentry,</div><div class='add'>+	     struct inode *new_dir, struct dentry *new_dentry,</div><div class='add'>+	     unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = new_dentry-&gt;d_inode;</div><div class='add'>+	ino_t ino;</div><div class='add'>+</div><div class='add'>+	if (!inode)</div><div class='add'>+		return 0;</div><div class='add'>+	ino = inode-&gt;i_ino;</div><div class='add'>+	if (ino == 0)</div><div class='add'>+		return -EACCES;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/verifier_vfs_reject.c b/tools/testing/selftests/bpf/progs/verifier_vfs_reject.c<br/>index d6d3f4fcb24c..4b392c6c8fc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_vfs_reject.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/verifier_vfs_reject.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/verifier_vfs_reject.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/verifier_vfs_reject.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> /* Copyright (c) 2024 Google LLC. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;vmlinux.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_tracing.h&gt;</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='hunk'>@@ -158,4 +159,18 @@ int BPF_PROG(path_d_path_kfunc_non_lsm, struct path *path, struct file *f)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("lsm.s/inode_rename")</div><div class='add'>+__failure __msg("invalid mem access 'trusted_ptr_or_null_'")</div><div class='add'>+int BPF_PROG(inode_rename, struct inode *old_dir, struct dentry *old_dentry,</div><div class='add'>+	     struct inode *new_dir, struct dentry *new_dentry,</div><div class='add'>+	     unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = new_dentry-&gt;d_inode;</div><div class='add'>+	ino_t ino;</div><div class='add'>+</div><div class='add'>+	ino = inode-&gt;i_ino;</div><div class='add'>+	if (ino == 0)</div><div class='add'>+		return -EACCES;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/wq.c b/tools/testing/selftests/bpf/progs/wq.c<br/>index 2f1ba08c293e..25be2cd9d42c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/wq.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/wq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/wq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/wq.c</a></div><div class='hunk'>@@ -187,3 +187,20 @@ long test_call_lru_sleepable(void *ctx)</div><div class='ctx'> </div><div class='ctx'> 	return test_elem_callback(&amp;lru, &amp;key, wq_callback);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+long test_map_no_btf(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct elem *val;</div><div class='add'>+	struct bpf_wq *wq;</div><div class='add'>+	int key = 42;</div><div class='add'>+</div><div class='add'>+	val = bpf_map_lookup_elem(&amp;array, &amp;key);</div><div class='add'>+	if (!val)</div><div class='add'>+		return -2;</div><div class='add'>+</div><div class='add'>+	wq = &amp;val-&gt;w;</div><div class='add'>+	if (bpf_wq_init(wq, &amp;array, 0) != 0)</div><div class='add'>+		return -3;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/wq_failures.c b/tools/testing/selftests/bpf/progs/wq_failures.c<br/>index 4240211a1900..d06f6d40594a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/wq_failures.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/wq_failures.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/wq_failures.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/wq_failures.c</a></div><div class='hunk'>@@ -142,3 +142,26 @@ long test_wrong_wq_pointer_offset(void *ctx)</div><div class='ctx'> </div><div class='ctx'> 	return -22;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+SEC("tc")</div><div class='add'>+__log_level(2)</div><div class='add'>+__failure</div><div class='add'>+__msg(": (85) call bpf_wq_init#")</div><div class='add'>+__msg("R1 doesn't have constant offset. bpf_wq has to be at the constant offset")</div><div class='add'>+long test_bad_wq_off(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct elem *val;</div><div class='add'>+	struct bpf_wq *wq;</div><div class='add'>+	int key = 42;</div><div class='add'>+	u64 unknown;</div><div class='add'>+</div><div class='add'>+	val = bpf_map_lookup_elem(&amp;array, &amp;key);</div><div class='add'>+	if (!val)</div><div class='add'>+		return -2;</div><div class='add'>+</div><div class='add'>+	unknown = bpf_get_prandom_u32();</div><div class='add'>+	wq = &amp;val-&gt;w + unknown;</div><div class='add'>+	if (bpf_wq_init(wq, &amp;array, 0) != 0)</div><div class='add'>+		return -3;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/xdp_metadata.c b/tools/testing/selftests/bpf/progs/xdp_metadata.c<br/>index 31ca229bb3c0..09bb8a038d52 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/xdp_metadata.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/xdp_metadata.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/xdp_metadata.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/xdp_metadata.c</a></div><div class='hunk'>@@ -19,6 +19,13 @@ struct {</div><div class='ctx'> 	__type(value, __u32);</div><div class='ctx'> } prog_arr SEC(".maps");</div><div class='ctx'> </div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_DEVMAP);</div><div class='add'>+	__uint(key_size, sizeof(__u32));</div><div class='add'>+	__uint(value_size, sizeof(struct bpf_devmap_val));</div><div class='add'>+	__uint(max_entries, 1);</div><div class='add'>+} dev_map SEC(".maps");</div><div class='add'>+</div><div class='ctx'> extern int bpf_xdp_metadata_rx_timestamp(const struct xdp_md *ctx,</div><div class='ctx'> 					 __u64 *timestamp) __ksym;</div><div class='ctx'> extern int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx, __u32 *hash,</div><div class='hunk'>@@ -95,4 +102,10 @@ int rx(struct xdp_md *ctx)</div><div class='ctx'> 	return bpf_redirect_map(&amp;xsk, ctx-&gt;rx_queue_index, XDP_PASS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("xdp")</div><div class='add'>+int redirect(struct xdp_md *ctx)</div><div class='add'>+{</div><div class='add'>+	return bpf_redirect_map(&amp;dev_map, ctx-&gt;rx_queue_index, XDP_PASS);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/xdp_redirect_map.c b/tools/testing/selftests/bpf/progs/xdp_redirect_map.c<br/>index 682dda8dabbc..50c8958f94e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/xdp_redirect_map.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/xdp_redirect_map.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/xdp_redirect_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/xdp_redirect_map.c</a></div><div class='hunk'>@@ -1,7 +1,10 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='add'>+#include &lt;bpf/bpf_endian.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct {</div><div class='ctx'> 	__uint(type, BPF_MAP_TYPE_DEVMAP);</div><div class='hunk'>@@ -28,4 +31,89 @@ int xdp_redirect_map_2(struct xdp_md *xdp)</div><div class='ctx'> 	return bpf_redirect_map(&amp;tx_port, 2, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 3);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __u64);</div><div class='add'>+} rxcnt SEC(".maps");</div><div class='add'>+</div><div class='add'>+static int xdp_count(struct xdp_md *xdp, __u32 key)</div><div class='add'>+{</div><div class='add'>+	void *data_end = (void *)(long)xdp-&gt;data_end;</div><div class='add'>+	void *data = (void *)(long)xdp-&gt;data;</div><div class='add'>+	struct ethhdr *eth = data;</div><div class='add'>+	__u64 *count;</div><div class='add'>+</div><div class='add'>+	if (data + sizeof(*eth) &gt; data_end)</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	if (bpf_htons(eth-&gt;h_proto) == ETH_P_IP) {</div><div class='add'>+		/* We only count IPv4 packets */</div><div class='add'>+		count = bpf_map_lookup_elem(&amp;rxcnt, &amp;key);</div><div class='add'>+		if (count)</div><div class='add'>+			*count += 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return XDP_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int xdp_count_0(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	return xdp_count(xdp, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int xdp_count_1(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	return xdp_count(xdp, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int xdp_count_2(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	return xdp_count(xdp, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_ARRAY);</div><div class='add'>+	__uint(max_entries, 2);</div><div class='add'>+	__type(key, __u32);</div><div class='add'>+	__type(value, __be64);</div><div class='add'>+} rx_mac SEC(".maps");</div><div class='add'>+</div><div class='add'>+static int store_mac(struct xdp_md *xdp, __u32 id)</div><div class='add'>+{</div><div class='add'>+	void *data_end = (void *)(long)xdp-&gt;data_end;</div><div class='add'>+	void *data = (void *)(long)xdp-&gt;data;</div><div class='add'>+	struct ethhdr *eth = data;</div><div class='add'>+	__u32 key = id;</div><div class='add'>+	__be64 mac = 0;</div><div class='add'>+</div><div class='add'>+	if (data + sizeof(*eth) &gt; data_end)</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	/* Only store IPv4 MAC to avoid being polluted by IPv6 packets */</div><div class='add'>+	if (eth-&gt;h_proto == bpf_htons(ETH_P_IP)) {</div><div class='add'>+		__builtin_memcpy(&amp;mac, eth-&gt;h_source, ETH_ALEN);</div><div class='add'>+		bpf_map_update_elem(&amp;rx_mac, &amp;key, &amp;mac, 0);</div><div class='add'>+		bpf_printk("%s - %x", __func__, mac);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return XDP_PASS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int store_mac_1(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	return store_mac(xdp, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+SEC("xdp")</div><div class='add'>+int store_mac_2(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	return store_mac(xdp, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c b/tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c<br/>index 97b26a30b59a..bc2945ed8a80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c</a></div><div class='hunk'>@@ -34,6 +34,14 @@ struct {</div><div class='ctx'> 	__uint(max_entries, 128);</div><div class='ctx'> } mac_map SEC(".maps");</div><div class='ctx'> </div><div class='add'>+/* map to store redirect flags for each protocol*/</div><div class='add'>+struct {</div><div class='add'>+	__uint(type, BPF_MAP_TYPE_HASH);</div><div class='add'>+	__type(key, __u16);</div><div class='add'>+	__type(value, __u64);</div><div class='add'>+	__uint(max_entries, 16);</div><div class='add'>+} redirect_flags SEC(".maps");</div><div class='add'>+</div><div class='ctx'> SEC("xdp")</div><div class='ctx'> int xdp_redirect_map_multi_prog(struct xdp_md *ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -41,25 +49,34 @@ int xdp_redirect_map_multi_prog(struct xdp_md *ctx)</div><div class='ctx'> 	void *data = (void *)(long)ctx-&gt;data;</div><div class='ctx'> 	int if_index = ctx-&gt;ingress_ifindex;</div><div class='ctx'> 	struct ethhdr *eth = data;</div><div class='add'>+	__u64 *flags_from_map;</div><div class='ctx'> 	__u16 h_proto;</div><div class='ctx'> 	__u64 nh_off;</div><div class='add'>+	__u64 flags;</div><div class='ctx'> </div><div class='ctx'> 	nh_off = sizeof(*eth);</div><div class='ctx'> 	if (data + nh_off &gt; data_end)</div><div class='ctx'> 		return XDP_DROP;</div><div class='ctx'> </div><div class='del'>-	h_proto = eth-&gt;h_proto;</div><div class='del'>-</div><div class='del'>-	/* Using IPv4 for (BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS) testing */</div><div class='del'>-	if (h_proto == bpf_htons(ETH_P_IP))</div><div class='del'>-		return bpf_redirect_map(&amp;map_all, 0,</div><div class='del'>-					BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS);</div><div class='del'>-	/* Using IPv6 for none flag testing */</div><div class='del'>-	else if (h_proto == bpf_htons(ETH_P_IPV6))</div><div class='del'>-		return bpf_redirect_map(&amp;map_all, if_index, 0);</div><div class='del'>-	/* All others for BPF_F_BROADCAST testing */</div><div class='del'>-	else</div><div class='del'>-		return bpf_redirect_map(&amp;map_all, 0, BPF_F_BROADCAST);</div><div class='add'>+	h_proto = bpf_htons(eth-&gt;h_proto);</div><div class='add'>+</div><div class='add'>+	flags_from_map = bpf_map_lookup_elem(&amp;redirect_flags, &amp;h_proto);</div><div class='add'>+</div><div class='add'>+	/* Default flags for IPv4 : (BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS) */</div><div class='add'>+	if (h_proto == ETH_P_IP) {</div><div class='add'>+		flags = flags_from_map ? *flags_from_map : BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS;</div><div class='add'>+		return bpf_redirect_map(&amp;map_all, 0, flags);</div><div class='add'>+	}</div><div class='add'>+	/* Default flags for IPv6 : 0 */</div><div class='add'>+	if (h_proto == ETH_P_IPV6) {</div><div class='add'>+		flags = flags_from_map ? *flags_from_map : 0;</div><div class='add'>+		return bpf_redirect_map(&amp;map_all, if_index, flags);</div><div class='add'>+	}</div><div class='add'>+	/* Default flags for others BPF_F_BROADCAST : 0 */</div><div class='add'>+	else {</div><div class='add'>+		flags = flags_from_map ? *flags_from_map : BPF_F_BROADCAST;</div><div class='add'>+		return bpf_redirect_map(&amp;map_all, 0, flags);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The following 2 progs are for 2nd devmap prog testing */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/progs/xsk_xdp_progs.c b/tools/testing/selftests/bpf/progs/xsk_xdp_progs.c<br/>index ccde6a4c6319..683306db8594 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/xsk_xdp_progs.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/progs/xsk_xdp_progs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/progs/xsk_xdp_progs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/progs/xsk_xdp_progs.c</a></div><div class='hunk'>@@ -4,6 +4,8 @@</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;bpf/bpf_helpers.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include "xsk_xdp_common.h"</div><div class='ctx'> </div><div class='ctx'> struct {</div><div class='hunk'>@@ -14,6 +16,7 @@ struct {</div><div class='ctx'> } xsk SEC(".maps");</div><div class='ctx'> </div><div class='ctx'> static unsigned int idx;</div><div class='add'>+int adjust_value = 0;</div><div class='ctx'> int count = 0;</div><div class='ctx'> </div><div class='ctx'> SEC("xdp.frags") int xsk_def_prog(struct xdp_md *xdp)</div><div class='hunk'>@@ -70,4 +73,51 @@ SEC("xdp") int xsk_xdp_shared_umem(struct xdp_md *xdp)</div><div class='ctx'> 	return bpf_redirect_map(&amp;xsk, idx, XDP_DROP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SEC("xdp.frags") int xsk_xdp_adjust_tail(struct xdp_md *xdp)</div><div class='add'>+{</div><div class='add'>+	__u32 buff_len, curr_buff_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buff_len = bpf_xdp_get_buff_len(xdp);</div><div class='add'>+	if (buff_len == 0)</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	ret = bpf_xdp_adjust_tail(xdp, adjust_value);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		/* Handle unsupported cases */</div><div class='add'>+		if (ret == -EOPNOTSUPP) {</div><div class='add'>+			/* Set adjust_value to -EOPNOTSUPP to indicate to userspace that this case</div><div class='add'>+			 * is unsupported</div><div class='add'>+			 */</div><div class='add'>+			adjust_value = -EOPNOTSUPP;</div><div class='add'>+			return bpf_redirect_map(&amp;xsk, 0, XDP_DROP);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	curr_buff_len = bpf_xdp_get_buff_len(xdp);</div><div class='add'>+	if (curr_buff_len != buff_len + adjust_value)</div><div class='add'>+		return XDP_DROP;</div><div class='add'>+</div><div class='add'>+	if (curr_buff_len &gt; buff_len) {</div><div class='add'>+		__u32 *pkt_data = (void *)(long)xdp-&gt;data;</div><div class='add'>+		__u32 len, words_to_end, seq_num;</div><div class='add'>+</div><div class='add'>+		len = curr_buff_len - PKT_HDR_ALIGN;</div><div class='add'>+		words_to_end = len / sizeof(*pkt_data) - 1;</div><div class='add'>+		seq_num = words_to_end;</div><div class='add'>+</div><div class='add'>+		/* Convert sequence number to network byte order. Store this in the last 4 bytes of</div><div class='add'>+		 * the packet. Use 'adjust_value' to determine the position at the end of the</div><div class='add'>+		 * packet for storing the sequence number.</div><div class='add'>+		 */</div><div class='add'>+		seq_num = __constant_htonl(words_to_end);</div><div class='add'>+		bpf_xdp_store_bytes(xdp, curr_buff_len - sizeof(seq_num), &amp;seq_num,</div><div class='add'>+				    sizeof(seq_num));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bpf_redirect_map(&amp;xsk, 0, XDP_DROP);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> char _license[] SEC("license") = "GPL";</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_bpftool_build.sh b/tools/testing/selftests/bpf/test_bpftool_build.sh<br/>index 1453a53ed547..b03a87571592 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_bpftool_build.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_bpftool_build.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_bpftool_build.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_bpftool_build.sh</a></div><div class='hunk'>@@ -90,10 +90,6 @@ echo -e "... through kbuild\n"</div><div class='ctx'> </div><div class='ctx'> if [ -f ".config" ] ; then</div><div class='ctx'> 	make_and_clean tools/bpf</div><div class='del'>-	## "make tools/bpf" sets $(OUTPUT) to ...tools/bpf/runqslower for</div><div class='del'>-	## runqslower, but the default (used for the "clean" target) is .output.</div><div class='del'>-	## Let's make sure we clean runqslower's directory properly.</div><div class='del'>-	make -C tools/bpf/runqslower OUTPUT=${KDIR_ROOT_DIR}/tools/bpf/runqslower/ clean</div><div class='ctx'> </div><div class='ctx'> 	## $OUTPUT is overwritten in kbuild Makefile, and thus cannot be passed</div><div class='ctx'> 	## down from toplevel Makefile to bpftool's Makefile.</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_bpftool_map.sh b/tools/testing/selftests/bpf/test_bpftool_map.sh<br/>new file mode 100755<br/>index 000000000000..515b1df0501e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_bpftool_map.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_bpftool_map.sh</a></div><div class='hunk'>@@ -0,0 +1,398 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+# Kselftest framework requirement - SKIP code is 4.</div><div class='add'>+ksft_skip=4</div><div class='add'>+</div><div class='add'>+TESTNAME="bpftool_map"</div><div class='add'>+BPF_FILE="security_bpf_map.bpf.o"</div><div class='add'>+BPF_ITER_FILE="bpf_iter_map_elem.bpf.o"</div><div class='add'>+PROTECTED_MAP_NAME="prot_map"</div><div class='add'>+NOT_PROTECTED_MAP_NAME="not_prot_map"</div><div class='add'>+BPF_FS_TMP_PARENT="/tmp"</div><div class='add'>+BPF_FS_PARENT=$(awk '$3 == "bpf" {print $2; exit}' /proc/mounts)</div><div class='add'>+BPF_FS_PARENT=${BPF_FS_PARENT:-$BPF_FS_TMP_PARENT}</div><div class='add'>+# bpftool will mount bpf file system under BPF_DIR if it is not mounted</div><div class='add'>+# under BPF_FS_PARENT.</div><div class='add'>+BPF_DIR="$BPF_FS_PARENT/test_$TESTNAME"</div><div class='add'>+SCRIPT_DIR=$(dirname $(realpath "$0"))</div><div class='add'>+BPF_FILE_PATH="$SCRIPT_DIR/$BPF_FILE"</div><div class='add'>+BPF_ITER_FILE_PATH="$SCRIPT_DIR/$BPF_ITER_FILE"</div><div class='add'>+BPFTOOL_PATH="bpftool"</div><div class='add'>+# Assume the script is located under tools/testing/selftests/bpf/</div><div class='add'>+KDIR_ROOT_DIR=$(realpath "$SCRIPT_DIR"/../../../../)</div><div class='add'>+</div><div class='add'>+_cleanup()</div><div class='add'>+{</div><div class='add'>+	set +eu</div><div class='add'>+</div><div class='add'>+	# If BPF_DIR is a mount point this will not remove the mount point itself.</div><div class='add'>+	[ -d "$BPF_DIR" ] &amp;&amp; rm -rf "$BPF_DIR" 2&gt; /dev/null</div><div class='add'>+</div><div class='add'>+	# Unmount if BPF filesystem was temporarily created.</div><div class='add'>+	if [ "$BPF_FS_PARENT" = "$BPF_FS_TMP_PARENT" ]; then</div><div class='add'>+		# A loop and recursive unmount are required as bpftool might</div><div class='add'>+		# create multiple mounts. For example, a bind mount of the directory</div><div class='add'>+		# to itself. The bind mount is created to change mount propagation</div><div class='add'>+		# flags on an actual mount point.</div><div class='add'>+		max_attempts=3</div><div class='add'>+		attempt=0</div><div class='add'>+		while mountpoint -q "$BPF_DIR" &amp;&amp; [ $attempt -lt $max_attempts ]; do</div><div class='add'>+			umount -R "$BPF_DIR" 2&gt;/dev/null</div><div class='add'>+			attempt=$((attempt+1))</div><div class='add'>+		done</div><div class='add'>+</div><div class='add'>+		# The directory still exists. Remove it now.</div><div class='add'>+		[ -d "$BPF_DIR" ] &amp;&amp; rm -rf "$BPF_DIR" 2&gt;/dev/null</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+cleanup_skip()</div><div class='add'>+{</div><div class='add'>+	echo "selftests: $TESTNAME [SKIP]"</div><div class='add'>+	_cleanup</div><div class='add'>+</div><div class='add'>+	exit $ksft_skip</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+cleanup()</div><div class='add'>+{</div><div class='add'>+	if [ "$?" = 0 ]; then</div><div class='add'>+		echo "selftests: $TESTNAME [PASS]"</div><div class='add'>+	else</div><div class='add'>+		echo "selftests: $TESTNAME [FAILED]"</div><div class='add'>+	fi</div><div class='add'>+	_cleanup</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+check_root_privileges() {</div><div class='add'>+	if [ $(id -u) -ne 0 ]; then</div><div class='add'>+		echo "Need root privileges"</div><div class='add'>+		exit $ksft_skip</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Function to verify bpftool path.</div><div class='add'>+# Parameters:</div><div class='add'>+#   $1: bpftool path</div><div class='add'>+verify_bpftool_path() {</div><div class='add'>+	local bpftool_path="$1"</div><div class='add'>+	if ! "$bpftool_path" version &gt; /dev/null 2&gt;&amp;1; then</div><div class='add'>+		echo "Could not run test without bpftool"</div><div class='add'>+		exit $ksft_skip</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Function to verify BTF support.</div><div class='add'>+# The test requires BTF support for fmod_ret programs.</div><div class='add'>+verify_btf_support() {</div><div class='add'>+	if [ ! -f /sys/kernel/btf/vmlinux ]; then</div><div class='add'>+		echo "Could not run test without BTF support"</div><div class='add'>+		exit $ksft_skip</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Function to initialize map entries with keys [0..2] and values set to 0.</div><div class='add'>+# Parameters:</div><div class='add'>+#  $1: Map name</div><div class='add'>+#  $2: bpftool path</div><div class='add'>+initialize_map_entries() {</div><div class='add'>+	local map_name="$1"</div><div class='add'>+	local bpftool_path="$2"</div><div class='add'>+</div><div class='add'>+	for key in 0 1 2; do</div><div class='add'>+		"$bpftool_path" map update name "$map_name" key $key 0 0 0 value 0 0 0 $key</div><div class='add'>+	done</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Test read access to the map.</div><div class='add'>+# Parameters:</div><div class='add'>+#   $1: Name command (name/pinned)</div><div class='add'>+#   $2: Map name</div><div class='add'>+#   $3: bpftool path</div><div class='add'>+#   $4: key</div><div class='add'>+access_for_read() {</div><div class='add'>+	local name_cmd="$1"</div><div class='add'>+	local map_name="$2"</div><div class='add'>+	local bpftool_path="$3"</div><div class='add'>+	local key="$4"</div><div class='add'>+</div><div class='add'>+	# Test read access to the map.</div><div class='add'>+	if ! "$bpftool_path" map lookup "$name_cmd" "$map_name" key $key 1&gt;/dev/null; then</div><div class='add'>+		echo " Read access to $key in $map_name failed"</div><div class='add'>+		exit 1</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# Test read access to map's BTF data.</div><div class='add'>+	if ! "$bpftool_path" btf dump map "$name_cmd" "$map_name" 1&gt;/dev/null; then</div><div class='add'>+		echo " Read access to $map_name for BTF data failed"</div><div class='add'>+		exit 1</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Test write access to the map.</div><div class='add'>+# Parameters:</div><div class='add'>+#   $1: Name command (name/pinned)</div><div class='add'>+#   $2: Map name</div><div class='add'>+#   $3: bpftool path</div><div class='add'>+#   $4: key</div><div class='add'>+#   $5: Whether write should succeed (true/false)</div><div class='add'>+access_for_write() {</div><div class='add'>+	local name_cmd="$1"</div><div class='add'>+	local map_name="$2"</div><div class='add'>+	local bpftool_path="$3"</div><div class='add'>+	local key="$4"</div><div class='add'>+	local write_should_succeed="$5"</div><div class='add'>+	local value="1 1 1 1"</div><div class='add'>+</div><div class='add'>+	if "$bpftool_path" map update "$name_cmd" "$map_name" key $key value \</div><div class='add'>+			$value 2&gt;/dev/null; then</div><div class='add'>+		if [ "$write_should_succeed" = "false" ]; then</div><div class='add'>+			echo " Write access to $key in $map_name succeeded but should have failed"</div><div class='add'>+			exit 1</div><div class='add'>+		fi</div><div class='add'>+	else</div><div class='add'>+		if [ "$write_should_succeed" = "true" ]; then</div><div class='add'>+			echo " Write access to $key in $map_name failed but should have succeeded"</div><div class='add'>+			exit 1</div><div class='add'>+		fi</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Test entry deletion for the map.</div><div class='add'>+# Parameters:</div><div class='add'>+#   $1: Name command (name/pinned)</div><div class='add'>+#   $2: Map name</div><div class='add'>+#   $3: bpftool path</div><div class='add'>+#   $4: key</div><div class='add'>+#   $5: Whether write should succeed (true/false)</div><div class='add'>+access_for_deletion() {</div><div class='add'>+	local name_cmd="$1"</div><div class='add'>+	local map_name="$2"</div><div class='add'>+	local bpftool_path="$3"</div><div class='add'>+	local key="$4"</div><div class='add'>+	local write_should_succeed="$5"</div><div class='add'>+	local value="1 1 1 1"</div><div class='add'>+</div><div class='add'>+	# Test deletion by key for the map.</div><div class='add'>+	# Before deleting, check the key exists.</div><div class='add'>+	if ! "$bpftool_path" map lookup "$name_cmd" "$map_name" key $key 1&gt;/dev/null; then</div><div class='add'>+		echo " Key $key does not exist in $map_name"</div><div class='add'>+		exit 1</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# Delete by key.</div><div class='add'>+	if "$bpftool_path" map delete "$name_cmd" "$map_name" key $key 2&gt;/dev/null; then</div><div class='add'>+		if [ "$write_should_succeed" = "false" ]; then</div><div class='add'>+			echo " Deletion for $key in $map_name succeeded but should have failed"</div><div class='add'>+			exit 1</div><div class='add'>+		fi</div><div class='add'>+	else</div><div class='add'>+		if [ "$write_should_succeed" = "true" ]; then</div><div class='add'>+			echo " Deletion for $key in $map_name failed but should have succeeded"</div><div class='add'>+			exit 1</div><div class='add'>+		fi</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# After deleting, check the entry existence according to the expected status.</div><div class='add'>+	if "$bpftool_path" map lookup "$name_cmd" "$map_name" key $key 1&gt;/dev/null; then</div><div class='add'>+		if [ "$write_should_succeed" = "true" ]; then</div><div class='add'>+			echo " Key $key for $map_name was not deleted but should have been deleted"</div><div class='add'>+			exit 1</div><div class='add'>+		fi</div><div class='add'>+	else</div><div class='add'>+		if [ "$write_should_succeed" = "false" ]; then</div><div class='add'>+			echo "Key $key for $map_name was deleted but should have not been deleted"</div><div class='add'>+			exit 1</div><div class='add'>+		fi</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# Test creation of map's deleted entry, if deletion was successful.</div><div class='add'>+	# Otherwise, the entry exists.</div><div class='add'>+	if "$bpftool_path" map update "$name_cmd" "$map_name" key $key value \</div><div class='add'>+				$value 2&gt;/dev/null; then</div><div class='add'>+		if [ "$write_should_succeed" = "false" ]; then</div><div class='add'>+			echo " Write access to $key in $map_name succeeded after deletion attempt but should have failed"</div><div class='add'>+			exit 1</div><div class='add'>+		fi</div><div class='add'>+	else</div><div class='add'>+		if [ "$write_should_succeed" = "true" ]; then</div><div class='add'>+			echo " Write access to $key in $map_name failed after deletion attempt but should have succeeded"</div><div class='add'>+			exit 1</div><div class='add'>+		fi</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Test map elements iterator.</div><div class='add'>+# Parameters:</div><div class='add'>+#   $1: Name command (name/pinned)</div><div class='add'>+#   $2: Map name</div><div class='add'>+#   $3: bpftool path</div><div class='add'>+#   $4: BPF_DIR</div><div class='add'>+#   $5: bpf iterator object file path</div><div class='add'>+iterate_map_elem() {</div><div class='add'>+	local name_cmd="$1"</div><div class='add'>+	local map_name="$2"</div><div class='add'>+	local bpftool_path="$3"</div><div class='add'>+	local bpf_dir="$4"</div><div class='add'>+	local bpf_file="$5"</div><div class='add'>+	local pin_path="$bpf_dir/map_iterator"</div><div class='add'>+</div><div class='add'>+	"$bpftool_path" iter pin "$bpf_file" "$pin_path" map "$name_cmd" "$map_name"</div><div class='add'>+	if [ ! -f "$pin_path" ]; then</div><div class='add'>+		echo " Failed to pin iterator to $pin_path"</div><div class='add'>+		exit 1</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	cat "$pin_path" 1&gt;/dev/null</div><div class='add'>+	rm "$pin_path" 2&gt;/dev/null</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Function to test map access with configurable write expectations</div><div class='add'>+# Parameters:</div><div class='add'>+#   $1: Name command (name/pinned)</div><div class='add'>+#   $2: Map name</div><div class='add'>+#   $3: bpftool path</div><div class='add'>+#   $4: key for rw</div><div class='add'>+#   $5: key to delete</div><div class='add'>+#   $6: Whether write should succeed (true/false)</div><div class='add'>+#   $7: BPF_DIR</div><div class='add'>+#   $8: bpf iterator object file path</div><div class='add'>+access_map() {</div><div class='add'>+	local name_cmd="$1"</div><div class='add'>+	local map_name="$2"</div><div class='add'>+	local bpftool_path="$3"</div><div class='add'>+	local key_for_rw="$4"</div><div class='add'>+	local key_to_del="$5"</div><div class='add'>+	local write_should_succeed="$6"</div><div class='add'>+	local bpf_dir="$7"</div><div class='add'>+	local bpf_iter_file_path="$8"</div><div class='add'>+</div><div class='add'>+	access_for_read "$name_cmd" "$map_name" "$bpftool_path" "$key_for_rw"</div><div class='add'>+	access_for_write "$name_cmd" "$map_name" "$bpftool_path" "$key_for_rw" \</div><div class='add'>+		"$write_should_succeed"</div><div class='add'>+	access_for_deletion "$name_cmd" "$map_name" "$bpftool_path" "$key_to_del" \</div><div class='add'>+		"$write_should_succeed"</div><div class='add'>+	iterate_map_elem "$name_cmd" "$map_name" "$bpftool_path" "$bpf_dir" \</div><div class='add'>+		"$bpf_iter_file_path"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Function to test map access with configurable write expectations</div><div class='add'>+# Parameters:</div><div class='add'>+#   $1: Map name</div><div class='add'>+#   $2: bpftool path</div><div class='add'>+#   $3: BPF_DIR</div><div class='add'>+#   $4: Whether write should succeed (true/false)</div><div class='add'>+#   $5: bpf iterator object file path</div><div class='add'>+test_map_access() {</div><div class='add'>+	local map_name="$1"</div><div class='add'>+	local bpftool_path="$2"</div><div class='add'>+	local bpf_dir="$3"</div><div class='add'>+	local pin_path="$bpf_dir/${map_name}_pinned"</div><div class='add'>+	local write_should_succeed="$4"</div><div class='add'>+	local bpf_iter_file_path="$5"</div><div class='add'>+</div><div class='add'>+	# Test access to the map by name.</div><div class='add'>+	access_map "name" "$map_name" "$bpftool_path" "0 0 0 0" "1 0 0 0" \</div><div class='add'>+		"$write_should_succeed" "$bpf_dir" "$bpf_iter_file_path"</div><div class='add'>+</div><div class='add'>+	# Pin the map to the BPF filesystem</div><div class='add'>+	"$bpftool_path" map pin name "$map_name" "$pin_path"</div><div class='add'>+	if [ ! -e "$pin_path" ]; then</div><div class='add'>+		echo " Failed to pin $map_name"</div><div class='add'>+		exit 1</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# Test access to the pinned map.</div><div class='add'>+	access_map "pinned" "$pin_path" "$bpftool_path" "0 0 0 0" "2 0 0 0" \</div><div class='add'>+		"$write_should_succeed" "$bpf_dir" "$bpf_iter_file_path"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Function to test map creation and map-of-maps</div><div class='add'>+# Parameters:</div><div class='add'>+#   $1: bpftool path</div><div class='add'>+#   $2: BPF_DIR</div><div class='add'>+test_map_creation_and_map_of_maps() {</div><div class='add'>+	local bpftool_path="$1"</div><div class='add'>+	local bpf_dir="$2"</div><div class='add'>+	local outer_map_name="outer_map_tt"</div><div class='add'>+	local inner_map_name="inner_map_tt"</div><div class='add'>+</div><div class='add'>+	"$bpftool_path" map create "$bpf_dir/$inner_map_name" type array key 4 \</div><div class='add'>+		value 4 entries 4 name "$inner_map_name"</div><div class='add'>+	if [ ! -f "$bpf_dir/$inner_map_name" ]; then</div><div class='add'>+		echo " Failed to create inner map file at $bpf_dir/$outer_map_name"</div><div class='add'>+		return 1</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	"$bpftool_path" map create "$bpf_dir/$outer_map_name" type hash_of_maps \</div><div class='add'>+		key 4 value 4 entries 2 name "$outer_map_name" inner_map name "$inner_map_name"</div><div class='add'>+	if [ ! -f "$bpf_dir/$outer_map_name" ]; then</div><div class='add'>+		echo " Failed to create outer map file at $bpf_dir/$outer_map_name"</div><div class='add'>+		return 1</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# Add entries to the outer map by name and by pinned path.</div><div class='add'>+	"$bpftool_path" map update pinned "$bpf_dir/$outer_map_name" key 0 0 0 0 \</div><div class='add'>+		value pinned "$bpf_dir/$inner_map_name"</div><div class='add'>+	"$bpftool_path" map update name "$outer_map_name" key 1 0 0 0 value \</div><div class='add'>+		name "$inner_map_name"</div><div class='add'>+</div><div class='add'>+	# The outer map should be full by now.</div><div class='add'>+	# The following map update command is expected to fail.</div><div class='add'>+	if "$bpftool_path" map update name "$outer_map_name" key 2 0 0 0 value name \</div><div class='add'>+		"$inner_map_name" 2&gt;/dev/null; then</div><div class='add'>+		echo " Update for $outer_map_name succeeded but should have failed"</div><div class='add'>+		exit 1</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Function to test map access with the btf list command</div><div class='add'>+# Parameters:</div><div class='add'>+#   $1: bpftool path</div><div class='add'>+test_map_access_with_btf_list() {</div><div class='add'>+	local bpftool_path="$1"</div><div class='add'>+</div><div class='add'>+	# The btf list command iterates over maps for</div><div class='add'>+	# loaded BPF programs.</div><div class='add'>+	if ! "$bpftool_path" btf list 1&gt;/dev/null; then</div><div class='add'>+		echo " Failed to access btf data"</div><div class='add'>+		exit 1</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+set -eu</div><div class='add'>+</div><div class='add'>+trap cleanup_skip EXIT</div><div class='add'>+</div><div class='add'>+check_root_privileges</div><div class='add'>+</div><div class='add'>+verify_bpftool_path "$BPFTOOL_PATH"</div><div class='add'>+</div><div class='add'>+verify_btf_support</div><div class='add'>+</div><div class='add'>+trap cleanup EXIT</div><div class='add'>+</div><div class='add'>+# Load and attach the BPF programs to control maps access.</div><div class='add'>+"$BPFTOOL_PATH" prog loadall "$BPF_FILE_PATH" "$BPF_DIR" autoattach</div><div class='add'>+</div><div class='add'>+initialize_map_entries "$PROTECTED_MAP_NAME" "$BPFTOOL_PATH"</div><div class='add'>+initialize_map_entries "$NOT_PROTECTED_MAP_NAME" "$BPFTOOL_PATH"</div><div class='add'>+</div><div class='add'>+# Activate the map protection mechanism. Protection status is controlled</div><div class='add'>+# by a value stored in the prot_status_map at index 0.</div><div class='add'>+"$BPFTOOL_PATH" map update name prot_status_map key 0 0 0 0 value 1 0 0 0</div><div class='add'>+</div><div class='add'>+# Test protected map (write should fail).</div><div class='add'>+test_map_access "$PROTECTED_MAP_NAME" "$BPFTOOL_PATH" "$BPF_DIR" "false" \</div><div class='add'>+ "$BPF_ITER_FILE_PATH"</div><div class='add'>+</div><div class='add'>+# Test not protected map (write should succeed).</div><div class='add'>+test_map_access "$NOT_PROTECTED_MAP_NAME" "$BPFTOOL_PATH" "$BPF_DIR" "true" \</div><div class='add'>+ "$BPF_ITER_FILE_PATH"</div><div class='add'>+</div><div class='add'>+test_map_creation_and_map_of_maps "$BPFTOOL_PATH" "$BPF_DIR"</div><div class='add'>+</div><div class='add'>+test_map_access_with_btf_list "$BPFTOOL_PATH"</div><div class='add'>+</div><div class='add'>+exit 0</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_btf.h b/tools/testing/selftests/bpf/test_btf.h<br/>index fb4f4714eeb4..e65889ab4adf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_btf.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_btf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_btf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_btf.h</a></div><div class='hunk'>@@ -72,9 +72,15 @@</div><div class='ctx'> #define BTF_TYPE_FLOAT_ENC(name, sz) \</div><div class='ctx'> 	BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_FLOAT, 0, 0), sz)</div><div class='ctx'> </div><div class='add'>+#define BTF_DECL_ATTR_ENC(value, type, component_idx)	\</div><div class='add'>+	BTF_TYPE_ENC(value, BTF_INFO_ENC(BTF_KIND_DECL_TAG, 1, 0), type), (component_idx)</div><div class='add'>+</div><div class='ctx'> #define BTF_DECL_TAG_ENC(value, type, component_idx)	\</div><div class='ctx'> 	BTF_TYPE_ENC(value, BTF_INFO_ENC(BTF_KIND_DECL_TAG, 0, 0), type), (component_idx)</div><div class='ctx'> </div><div class='add'>+#define BTF_TYPE_ATTR_ENC(value, type)	\</div><div class='add'>+	BTF_TYPE_ENC(value, BTF_INFO_ENC(BTF_KIND_TYPE_TAG, 1, 0), type)</div><div class='add'>+</div><div class='ctx'> #define BTF_TYPE_TAG_ENC(value, type)	\</div><div class='ctx'> 	BTF_TYPE_ENC(value, BTF_INFO_ENC(BTF_KIND_TYPE_TAG, 0, 0), type)</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_kmods/Makefile b/tools/testing/selftests/bpf/test_kmods/Makefile<br/>index d4e50c4509c9..63c4d3f6a12f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_kmods/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_kmods/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_kmods/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_kmods/Makefile</a></div><div class='hunk'>@@ -8,7 +8,7 @@ Q = @</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> MODULES = bpf_testmod.ko bpf_test_no_cfi.ko bpf_test_modorder_x.ko \</div><div class='del'>-	bpf_test_modorder_y.ko</div><div class='add'>+	bpf_test_modorder_y.ko bpf_test_rqspinlock.ko</div><div class='ctx'> </div><div class='ctx'> $(foreach m,$(MODULES),$(eval obj-m += $(m:.ko=.o)))</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_kmods/bpf_test_rqspinlock.c b/tools/testing/selftests/bpf/test_kmods/bpf_test_rqspinlock.c<br/>new file mode 100644<br/>index 000000000000..7b4ae5e81d32<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_kmods/bpf_test_rqspinlock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_kmods/bpf_test_rqspinlock.c</a></div><div class='hunk'>@@ -0,0 +1,393 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/prandom.h&gt;</div><div class='add'>+#include &lt;linux/ktime.h&gt;</div><div class='add'>+#include &lt;asm/rqspinlock.h&gt;</div><div class='add'>+#include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+static struct perf_event_attr hw_attr = {</div><div class='add'>+	.type		= PERF_TYPE_HARDWARE,</div><div class='add'>+	.config		= PERF_COUNT_HW_CPU_CYCLES,</div><div class='add'>+	.size		= sizeof(struct perf_event_attr),</div><div class='add'>+	.pinned		= 1,</div><div class='add'>+	.disabled	= 1,</div><div class='add'>+	.sample_period	= 100000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static rqspinlock_t lock_a;</div><div class='add'>+static rqspinlock_t lock_b;</div><div class='add'>+static rqspinlock_t lock_c;</div><div class='add'>+</div><div class='add'>+#define RQSL_SLOW_THRESHOLD_MS 10</div><div class='add'>+static const unsigned int rqsl_hist_ms[] = {</div><div class='add'>+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10,</div><div class='add'>+	12, 14, 16, 18, 20, 25, 30, 40, 50, 75,</div><div class='add'>+	100, 150, 200, 250, 1000,</div><div class='add'>+};</div><div class='add'>+#define RQSL_NR_HIST_BUCKETS ARRAY_SIZE(rqsl_hist_ms)</div><div class='add'>+</div><div class='add'>+enum rqsl_context {</div><div class='add'>+	RQSL_CTX_NORMAL = 0,</div><div class='add'>+	RQSL_CTX_NMI,</div><div class='add'>+	RQSL_CTX_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rqsl_cpu_hist {</div><div class='add'>+	atomic64_t hist[RQSL_CTX_MAX][RQSL_NR_HIST_BUCKETS];</div><div class='add'>+	atomic64_t success[RQSL_CTX_MAX];</div><div class='add'>+	atomic64_t failure[RQSL_CTX_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_PER_CPU(struct rqsl_cpu_hist, rqsl_cpu_hists);</div><div class='add'>+</div><div class='add'>+enum rqsl_mode {</div><div class='add'>+	RQSL_MODE_AA = 0,</div><div class='add'>+	RQSL_MODE_ABBA,</div><div class='add'>+	RQSL_MODE_ABBCCA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int test_mode = RQSL_MODE_AA;</div><div class='add'>+module_param(test_mode, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(test_mode,</div><div class='add'>+		 "rqspinlock test mode: 0 = AA, 1 = ABBA, 2 = ABBCCA");</div><div class='add'>+</div><div class='add'>+static int normal_delay = 20;</div><div class='add'>+module_param(normal_delay, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(normal_delay,</div><div class='add'>+		 "rqspinlock critical section length for normal context (20ms default)");</div><div class='add'>+</div><div class='add'>+static int nmi_delay = 10;</div><div class='add'>+module_param(nmi_delay, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(nmi_delay,</div><div class='add'>+		 "rqspinlock critical section length for NMI context (10ms default)");</div><div class='add'>+</div><div class='add'>+static struct perf_event **rqsl_evts;</div><div class='add'>+static int rqsl_nevts;</div><div class='add'>+</div><div class='add'>+static struct task_struct **rqsl_threads;</div><div class='add'>+static int rqsl_nthreads;</div><div class='add'>+static atomic_t rqsl_ready_cpus = ATOMIC_INIT(0);</div><div class='add'>+</div><div class='add'>+static int pause = 0;</div><div class='add'>+</div><div class='add'>+static const char *rqsl_mode_names[] = {</div><div class='add'>+	[RQSL_MODE_AA] = "AA",</div><div class='add'>+	[RQSL_MODE_ABBA] = "ABBA",</div><div class='add'>+	[RQSL_MODE_ABBCCA] = "ABBCCA",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rqsl_lock_pair {</div><div class='add'>+	rqspinlock_t *worker_lock;</div><div class='add'>+	rqspinlock_t *nmi_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rqsl_lock_pair rqsl_get_lock_pair(int cpu)</div><div class='add'>+{</div><div class='add'>+	int mode = READ_ONCE(test_mode);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	default:</div><div class='add'>+	case RQSL_MODE_AA:</div><div class='add'>+		return (struct rqsl_lock_pair){ &amp;lock_a, &amp;lock_a };</div><div class='add'>+	case RQSL_MODE_ABBA:</div><div class='add'>+		if (cpu &amp; 1)</div><div class='add'>+			return (struct rqsl_lock_pair){ &amp;lock_b, &amp;lock_a };</div><div class='add'>+		return (struct rqsl_lock_pair){ &amp;lock_a, &amp;lock_b };</div><div class='add'>+	case RQSL_MODE_ABBCCA:</div><div class='add'>+		switch (cpu % 3) {</div><div class='add'>+		case 0:</div><div class='add'>+			return (struct rqsl_lock_pair){ &amp;lock_a, &amp;lock_b };</div><div class='add'>+		case 1:</div><div class='add'>+			return (struct rqsl_lock_pair){ &amp;lock_b, &amp;lock_c };</div><div class='add'>+		default:</div><div class='add'>+			return (struct rqsl_lock_pair){ &amp;lock_c, &amp;lock_a };</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 rqsl_hist_bucket_idx(u32 delta_ms)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RQSL_NR_HIST_BUCKETS; i++) {</div><div class='add'>+		if (delta_ms &lt;= rqsl_hist_ms[i])</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return RQSL_NR_HIST_BUCKETS - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rqsl_record_lock_result(u64 delta_ns, enum rqsl_context ctx, int ret)</div><div class='add'>+{</div><div class='add'>+	struct rqsl_cpu_hist *hist = this_cpu_ptr(&amp;rqsl_cpu_hists);</div><div class='add'>+	u32 delta_ms = DIV_ROUND_UP_ULL(delta_ns, NSEC_PER_MSEC);</div><div class='add'>+	u32 bucket = rqsl_hist_bucket_idx(delta_ms);</div><div class='add'>+	atomic64_t *buckets = hist-&gt;hist[ctx];</div><div class='add'>+</div><div class='add'>+	atomic64_inc(&amp;buckets[bucket]);</div><div class='add'>+	if (!ret)</div><div class='add'>+		atomic64_inc(&amp;hist-&gt;success[ctx]);</div><div class='add'>+	else</div><div class='add'>+		atomic64_inc(&amp;hist-&gt;failure[ctx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rqspinlock_worker_fn(void *arg)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u64 start_ns;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (cpu) {</div><div class='add'>+		atomic_inc(&amp;rqsl_ready_cpus);</div><div class='add'>+</div><div class='add'>+		while (!kthread_should_stop()) {</div><div class='add'>+			struct rqsl_lock_pair locks = rqsl_get_lock_pair(cpu);</div><div class='add'>+			rqspinlock_t *worker_lock = locks.worker_lock;</div><div class='add'>+</div><div class='add'>+			if (READ_ONCE(pause)) {</div><div class='add'>+				msleep(1000);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			start_ns = ktime_get_mono_fast_ns();</div><div class='add'>+			ret = raw_res_spin_lock_irqsave(worker_lock, flags);</div><div class='add'>+			rqsl_record_lock_result(ktime_get_mono_fast_ns() - start_ns,</div><div class='add'>+						RQSL_CTX_NORMAL, ret);</div><div class='add'>+			mdelay(normal_delay);</div><div class='add'>+			if (!ret)</div><div class='add'>+				raw_res_spin_unlock_irqrestore(worker_lock, flags);</div><div class='add'>+			cpu_relax();</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (!kthread_should_stop()) {</div><div class='add'>+		int expected = rqsl_nthreads &gt; 0 ? rqsl_nthreads - 1 : 0;</div><div class='add'>+		int ready = atomic_read(&amp;rqsl_ready_cpus);</div><div class='add'>+</div><div class='add'>+		if (ready == expected &amp;&amp; !READ_ONCE(pause)) {</div><div class='add'>+			for (int i = 0; i &lt; rqsl_nevts; i++)</div><div class='add'>+				perf_event_enable(rqsl_evts[i]);</div><div class='add'>+			pr_err("Waiting 5 secs to pause the test\n");</div><div class='add'>+			msleep(1000 * 5);</div><div class='add'>+			WRITE_ONCE(pause, 1);</div><div class='add'>+			pr_err("Paused the test\n");</div><div class='add'>+		} else {</div><div class='add'>+			msleep(1000);</div><div class='add'>+			cpu_relax();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nmi_cb(struct perf_event *event, struct perf_sample_data *data,</div><div class='add'>+		   struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct rqsl_lock_pair locks;</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u64 start_ns;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!cpu || READ_ONCE(pause))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	locks = rqsl_get_lock_pair(cpu);</div><div class='add'>+	start_ns = ktime_get_mono_fast_ns();</div><div class='add'>+	ret = raw_res_spin_lock_irqsave(locks.nmi_lock, flags);</div><div class='add'>+	rqsl_record_lock_result(ktime_get_mono_fast_ns() - start_ns,</div><div class='add'>+				RQSL_CTX_NMI, ret);</div><div class='add'>+</div><div class='add'>+	mdelay(nmi_delay);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		raw_res_spin_unlock_irqrestore(locks.nmi_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_rqsl_threads(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (rqsl_threads) {</div><div class='add'>+		for_each_online_cpu(i) {</div><div class='add'>+			if (rqsl_threads[i])</div><div class='add'>+				kthread_stop(rqsl_threads[i]);</div><div class='add'>+		}</div><div class='add'>+		kfree(rqsl_threads);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_rqsl_evts(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (rqsl_evts) {</div><div class='add'>+		for (i = 0; i &lt; rqsl_nevts; i++) {</div><div class='add'>+			if (rqsl_evts[i])</div><div class='add'>+				perf_event_release_kernel(rqsl_evts[i]);</div><div class='add'>+		}</div><div class='add'>+		kfree(rqsl_evts);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_test_rqspinlock_init(void)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+	int ncpus = num_online_cpus();</div><div class='add'>+</div><div class='add'>+	if (test_mode &lt; RQSL_MODE_AA || test_mode &gt; RQSL_MODE_ABBCCA) {</div><div class='add'>+		pr_err("Invalid mode %d\n", test_mode);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_err("Mode = %s\n", rqsl_mode_names[test_mode]);</div><div class='add'>+</div><div class='add'>+	if (ncpus &lt; test_mode + 2)</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	raw_res_spin_lock_init(&amp;lock_a);</div><div class='add'>+	raw_res_spin_lock_init(&amp;lock_b);</div><div class='add'>+	raw_res_spin_lock_init(&amp;lock_c);</div><div class='add'>+</div><div class='add'>+	rqsl_evts = kcalloc(ncpus - 1, sizeof(*rqsl_evts), GFP_KERNEL);</div><div class='add'>+	if (!rqsl_evts)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	rqsl_nevts = ncpus - 1;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; ncpus; i++) {</div><div class='add'>+		struct perf_event *e;</div><div class='add'>+</div><div class='add'>+		e = perf_event_create_kernel_counter(&amp;hw_attr, i, NULL, nmi_cb, NULL);</div><div class='add'>+		if (IS_ERR(e)) {</div><div class='add'>+			ret = PTR_ERR(e);</div><div class='add'>+			goto err_perf_events;</div><div class='add'>+		}</div><div class='add'>+		rqsl_evts[i - 1] = e;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rqsl_threads = kcalloc(ncpus, sizeof(*rqsl_threads), GFP_KERNEL);</div><div class='add'>+	if (!rqsl_threads) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_perf_events;</div><div class='add'>+	}</div><div class='add'>+	rqsl_nthreads = ncpus;</div><div class='add'>+</div><div class='add'>+	for_each_online_cpu(i) {</div><div class='add'>+		struct task_struct *t;</div><div class='add'>+</div><div class='add'>+		t = kthread_create(rqspinlock_worker_fn, NULL, "rqsl_w/%d", i);</div><div class='add'>+		if (IS_ERR(t)) {</div><div class='add'>+			ret = PTR_ERR(t);</div><div class='add'>+			goto err_threads_create;</div><div class='add'>+		}</div><div class='add'>+		kthread_bind(t, i);</div><div class='add'>+		rqsl_threads[i] = t;</div><div class='add'>+		wake_up_process(t);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_threads_create:</div><div class='add'>+	free_rqsl_threads();</div><div class='add'>+err_perf_events:</div><div class='add'>+	free_rqsl_evts();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(bpf_test_rqspinlock_init);</div><div class='add'>+</div><div class='add'>+static void rqsl_print_histograms(void)</div><div class='add'>+{</div><div class='add'>+	int cpu, i;</div><div class='add'>+</div><div class='add'>+	pr_err("rqspinlock acquisition latency histogram (ms):\n");</div><div class='add'>+</div><div class='add'>+	for_each_online_cpu(cpu) {</div><div class='add'>+		struct rqsl_cpu_hist *hist = per_cpu_ptr(&amp;rqsl_cpu_hists, cpu);</div><div class='add'>+		u64 norm_counts[RQSL_NR_HIST_BUCKETS];</div><div class='add'>+		u64 nmi_counts[RQSL_NR_HIST_BUCKETS];</div><div class='add'>+		u64 total_counts[RQSL_NR_HIST_BUCKETS];</div><div class='add'>+		u64 norm_success, nmi_success, success_total;</div><div class='add'>+		u64 norm_failure, nmi_failure, failure_total;</div><div class='add'>+		u64 norm_total = 0, nmi_total = 0, total = 0;</div><div class='add'>+		bool has_slow = false;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; RQSL_NR_HIST_BUCKETS; i++) {</div><div class='add'>+			norm_counts[i] = atomic64_read(&amp;hist-&gt;hist[RQSL_CTX_NORMAL][i]);</div><div class='add'>+			nmi_counts[i] = atomic64_read(&amp;hist-&gt;hist[RQSL_CTX_NMI][i]);</div><div class='add'>+			total_counts[i] = norm_counts[i] + nmi_counts[i];</div><div class='add'>+			norm_total += norm_counts[i];</div><div class='add'>+			nmi_total += nmi_counts[i];</div><div class='add'>+			total += total_counts[i];</div><div class='add'>+			if (rqsl_hist_ms[i] &gt; RQSL_SLOW_THRESHOLD_MS &amp;&amp;</div><div class='add'>+			    total_counts[i])</div><div class='add'>+				has_slow = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		norm_success = atomic64_read(&amp;hist-&gt;success[RQSL_CTX_NORMAL]);</div><div class='add'>+		nmi_success = atomic64_read(&amp;hist-&gt;success[RQSL_CTX_NMI]);</div><div class='add'>+		norm_failure = atomic64_read(&amp;hist-&gt;failure[RQSL_CTX_NORMAL]);</div><div class='add'>+		nmi_failure = atomic64_read(&amp;hist-&gt;failure[RQSL_CTX_NMI]);</div><div class='add'>+		success_total = norm_success + nmi_success;</div><div class='add'>+		failure_total = norm_failure + nmi_failure;</div><div class='add'>+</div><div class='add'>+		if (!total)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!has_slow) {</div><div class='add'>+			pr_err(" cpu%d: total %llu (normal %llu, nmi %llu) | "</div><div class='add'>+			       "success %llu (normal %llu, nmi %llu) | "</div><div class='add'>+			       "failure %llu (normal %llu, nmi %llu), all within 0-%ums\n",</div><div class='add'>+			       cpu, total, norm_total, nmi_total,</div><div class='add'>+			       success_total, norm_success, nmi_success,</div><div class='add'>+			       failure_total, norm_failure, nmi_failure,</div><div class='add'>+			       RQSL_SLOW_THRESHOLD_MS);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pr_err(" cpu%d: total %llu (normal %llu, nmi %llu) | "</div><div class='add'>+		       "success %llu (normal %llu, nmi %llu) | "</div><div class='add'>+		       "failure %llu (normal %llu, nmi %llu)\n",</div><div class='add'>+		       cpu, total, norm_total, nmi_total,</div><div class='add'>+		       success_total, norm_success, nmi_success,</div><div class='add'>+		       failure_total, norm_failure, nmi_failure);</div><div class='add'>+		for (i = 0; i &lt; RQSL_NR_HIST_BUCKETS; i++) {</div><div class='add'>+			unsigned int start_ms;</div><div class='add'>+</div><div class='add'>+			if (!total_counts[i])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			start_ms = i == 0 ? 0 : rqsl_hist_ms[i - 1] + 1;</div><div class='add'>+			if (i == RQSL_NR_HIST_BUCKETS - 1) {</div><div class='add'>+				pr_err("   &gt;= %ums: total %llu (normal %llu, nmi %llu)\n",</div><div class='add'>+				       start_ms, total_counts[i],</div><div class='add'>+				       norm_counts[i], nmi_counts[i]);</div><div class='add'>+			} else {</div><div class='add'>+				pr_err("   %u-%ums: total %llu (normal %llu, nmi %llu)\n",</div><div class='add'>+				       start_ms, rqsl_hist_ms[i],</div><div class='add'>+				       total_counts[i],</div><div class='add'>+				       norm_counts[i], nmi_counts[i]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bpf_test_rqspinlock_exit(void)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(pause, 1);</div><div class='add'>+	free_rqsl_threads();</div><div class='add'>+	free_rqsl_evts();</div><div class='add'>+	rqsl_print_histograms();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_exit(bpf_test_rqspinlock_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Kumar Kartikeya Dwivedi");</div><div class='add'>+MODULE_DESCRIPTION("BPF rqspinlock stress test module");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c<br/>index cc9dde507aba..1669a7eeda26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_kmods/bpf_testmod.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_kmods/bpf_testmod.c</a></div><div class='hunk'>@@ -62,6 +62,18 @@ struct bpf_testmod_struct_arg_5 {</div><div class='ctx'> 	long d;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+union bpf_testmod_union_arg_1 {</div><div class='add'>+	char a;</div><div class='add'>+	short b;</div><div class='add'>+	struct bpf_testmod_struct_arg_1 arg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union bpf_testmod_union_arg_2 {</div><div class='add'>+	int a;</div><div class='add'>+	long b;</div><div class='add'>+	struct bpf_testmod_struct_arg_2 arg;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> __bpf_hook_start();</div><div class='ctx'> </div><div class='ctx'> noinline int</div><div class='hunk'>@@ -129,11 +141,29 @@ bpf_testmod_test_struct_arg_9(u64 a, void *b, short c, int d, void *e, char f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> noinline int</div><div class='add'>+bpf_testmod_test_union_arg_1(union bpf_testmod_union_arg_1 a, int b, int c)</div><div class='add'>+{</div><div class='add'>+	bpf_testmod_test_struct_arg_result = a.arg.a + b + c;</div><div class='add'>+	return bpf_testmod_test_struct_arg_result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline int</div><div class='add'>+bpf_testmod_test_union_arg_2(int a, union bpf_testmod_union_arg_2 b)</div><div class='add'>+{</div><div class='add'>+	bpf_testmod_test_struct_arg_result = a + b.arg.a + b.arg.b;</div><div class='add'>+	return bpf_testmod_test_struct_arg_result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline int</div><div class='ctx'> bpf_testmod_test_arg_ptr_to_struct(struct bpf_testmod_struct_arg_1 *a) {</div><div class='ctx'> 	bpf_testmod_test_struct_arg_result = a-&gt;a;</div><div class='ctx'> 	return bpf_testmod_test_struct_arg_result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+__weak noinline void bpf_testmod_looooooooooooooooooooooooooooooong_name(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> __bpf_kfunc void</div><div class='ctx'> bpf_testmod_test_mod_kfunc(int i)</div><div class='ctx'> {</div><div class='hunk'>@@ -214,6 +244,16 @@ __bpf_kfunc void bpf_kfunc_rcu_task_test(struct task_struct *ptr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+__bpf_kfunc struct task_struct *bpf_kfunc_ret_rcu_test(void)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__bpf_kfunc int *bpf_kfunc_ret_rcu_test_nostruct(int rdonly_buf_size)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> __bpf_kfunc struct bpf_testmod_ctx *</div><div class='ctx'> bpf_testmod_ctx_create(int *err)</div><div class='ctx'> {</div><div class='hunk'>@@ -377,11 +417,35 @@ noinline int bpf_testmod_fentry_test11(u64 a, void *b, short c, int d,</div><div class='ctx'> 	return a + (long)b + c + d + (long)e + f + g + h + i + j + k;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+noinline void bpf_testmod_stacktrace_test(void)</div><div class='add'>+{</div><div class='add'>+	/* used for stacktrace test as attach function */</div><div class='add'>+	asm volatile ("");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline void bpf_testmod_stacktrace_test_3(void)</div><div class='add'>+{</div><div class='add'>+	bpf_testmod_stacktrace_test();</div><div class='add'>+	asm volatile ("");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline void bpf_testmod_stacktrace_test_2(void)</div><div class='add'>+{</div><div class='add'>+	bpf_testmod_stacktrace_test_3();</div><div class='add'>+	asm volatile ("");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noinline void bpf_testmod_stacktrace_test_1(void)</div><div class='add'>+{</div><div class='add'>+	bpf_testmod_stacktrace_test_2();</div><div class='add'>+	asm volatile ("");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int bpf_testmod_fentry_ok;</div><div class='ctx'> </div><div class='ctx'> noinline ssize_t</div><div class='ctx'> bpf_testmod_test_read(struct file *file, struct kobject *kobj,</div><div class='del'>-		      struct bin_attribute *bin_attr,</div><div class='add'>+		      const struct bin_attribute *bin_attr,</div><div class='ctx'> 		      char *buf, loff_t off, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_testmod_test_read_ctx ctx = {</div><div class='hunk'>@@ -394,6 +458,8 @@ bpf_testmod_test_read(struct file *file, struct kobject *kobj,</div><div class='ctx'> 	struct bpf_testmod_struct_arg_3 *struct_arg3;</div><div class='ctx'> 	struct bpf_testmod_struct_arg_4 struct_arg4 = {21, 22};</div><div class='ctx'> 	struct bpf_testmod_struct_arg_5 struct_arg5 = {23, 24, 25, 26};</div><div class='add'>+	union bpf_testmod_union_arg_1 union_arg1 = { .arg = {1} };</div><div class='add'>+	union bpf_testmod_union_arg_2 union_arg2 = { .arg = {2, 3} };</div><div class='ctx'> 	int i = 1;</div><div class='ctx'> </div><div class='ctx'> 	while (bpf_testmod_return_ptr(i))</div><div class='hunk'>@@ -411,9 +477,12 @@ bpf_testmod_test_read(struct file *file, struct kobject *kobj,</div><div class='ctx'> 	(void)bpf_testmod_test_struct_arg_9(16, (void *)17, 18, 19, (void *)20,</div><div class='ctx'> 					    21, 22, struct_arg5, 27);</div><div class='ctx'> </div><div class='add'>+	(void)bpf_testmod_test_union_arg_1(union_arg1, 4, 5);</div><div class='add'>+	(void)bpf_testmod_test_union_arg_2(6, union_arg2);</div><div class='add'>+</div><div class='ctx'> 	(void)bpf_testmod_test_arg_ptr_to_struct(&amp;struct_arg1_2);</div><div class='ctx'> </div><div class='del'>-	(void)trace_bpf_testmod_test_raw_tp_null(NULL);</div><div class='add'>+	(void)trace_bpf_testmod_test_raw_tp_null_tp(NULL);</div><div class='ctx'> </div><div class='ctx'> 	bpf_testmod_test_struct_ops3();</div><div class='ctx'> </div><div class='hunk'>@@ -431,14 +500,14 @@ bpf_testmod_test_read(struct file *file, struct kobject *kobj,</div><div class='ctx'> 	if (bpf_testmod_loop_test(101) &gt; 100)</div><div class='ctx'> 		trace_bpf_testmod_test_read(current, &amp;ctx);</div><div class='ctx'> </div><div class='del'>-	trace_bpf_testmod_test_nullable_bare(NULL);</div><div class='add'>+	trace_bpf_testmod_test_nullable_bare_tp(NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Magic number to enable writable tp */</div><div class='ctx'> 	if (len == 64) {</div><div class='ctx'> 		struct bpf_testmod_test_writable_ctx writable = {</div><div class='ctx'> 			.val = 1024,</div><div class='ctx'> 		};</div><div class='del'>-		trace_bpf_testmod_test_writable_bare(&amp;writable);</div><div class='add'>+		trace_bpf_testmod_test_writable_bare_tp(&amp;writable);</div><div class='ctx'> 		if (writable.early_ret)</div><div class='ctx'> 			return snprintf(buf, len, "%d\n", writable.val);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -452,6 +521,8 @@ bpf_testmod_test_read(struct file *file, struct kobject *kobj,</div><div class='ctx'> 			21, 22, 23, 24, 25, 26) != 231)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	bpf_testmod_stacktrace_test_1();</div><div class='add'>+</div><div class='ctx'> 	bpf_testmod_fentry_ok = 1;</div><div class='ctx'> out:</div><div class='ctx'> 	return -EIO; /* always fail */</div><div class='hunk'>@@ -461,7 +532,7 @@ ALLOW_ERROR_INJECTION(bpf_testmod_test_read, ERRNO);</div><div class='ctx'> </div><div class='ctx'> noinline ssize_t</div><div class='ctx'> bpf_testmod_test_write(struct file *file, struct kobject *kobj,</div><div class='del'>-		      struct bin_attribute *bin_attr,</div><div class='add'>+		      const struct bin_attribute *bin_attr,</div><div class='ctx'> 		      char *buf, loff_t off, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_testmod_test_write_ctx ctx = {</div><div class='hunk'>@@ -470,7 +541,7 @@ bpf_testmod_test_write(struct file *file, struct kobject *kobj,</div><div class='ctx'> 		.len = len,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	trace_bpf_testmod_test_write_bare(current, &amp;ctx);</div><div class='add'>+	trace_bpf_testmod_test_write_bare_tp(current, &amp;ctx);</div><div class='ctx'> </div><div class='ctx'> 	return -EIO; /* always fail */</div><div class='ctx'> }</div><div class='hunk'>@@ -497,14 +568,20 @@ static struct bin_attribute bin_attr_bpf_testmod_file __ro_after_init = {</div><div class='ctx'> #ifdef __x86_64__</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+uprobe_handler(struct uprobe_consumer *self, struct pt_regs *regs, __u64 *data)</div><div class='add'>+{</div><div class='add'>+	regs-&gt;cx = 0x87654321feebdaed;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> uprobe_ret_handler(struct uprobe_consumer *self, unsigned long func,</div><div class='ctx'> 		   struct pt_regs *regs, __u64 *data)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'> 	regs-&gt;ax  = 0x12345678deadbeef;</div><div class='del'>-	regs-&gt;cx  = 0x87654321feebdaed;</div><div class='ctx'> 	regs-&gt;r11 = (u64) -1;</div><div class='del'>-	return true;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct testmod_uprobe {</div><div class='hunk'>@@ -516,6 +593,7 @@ struct testmod_uprobe {</div><div class='ctx'> static DEFINE_MUTEX(testmod_uprobe_mutex);</div><div class='ctx'> </div><div class='ctx'> static struct testmod_uprobe uprobe = {</div><div class='add'>+	.consumer.handler = uprobe_handler,</div><div class='ctx'> 	.consumer.ret_handler = uprobe_ret_handler,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -563,7 +641,7 @@ static void testmod_unregister_uprobe(void)</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> bpf_testmod_uprobe_write(struct file *file, struct kobject *kobj,</div><div class='del'>-			 struct bin_attribute *bin_attr,</div><div class='add'>+			 const struct bin_attribute *bin_attr,</div><div class='ctx'> 			 char *buf, loff_t off, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long offset = 0;</div><div class='hunk'>@@ -619,6 +697,8 @@ BTF_ID_FLAGS(func, bpf_kfunc_trusted_vma_test, KF_TRUSTED_ARGS)</div><div class='ctx'> BTF_ID_FLAGS(func, bpf_kfunc_trusted_task_test, KF_TRUSTED_ARGS)</div><div class='ctx'> BTF_ID_FLAGS(func, bpf_kfunc_trusted_num_test, KF_TRUSTED_ARGS)</div><div class='ctx'> BTF_ID_FLAGS(func, bpf_kfunc_rcu_task_test, KF_RCU)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_kfunc_ret_rcu_test, KF_RET_NULL | KF_RCU_PROTECTED)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_kfunc_ret_rcu_test_nostruct, KF_RET_NULL | KF_RCU_PROTECTED)</div><div class='ctx'> BTF_ID_FLAGS(func, bpf_testmod_ctx_create, KF_ACQUIRE | KF_RET_NULL)</div><div class='ctx'> BTF_ID_FLAGS(func, bpf_testmod_ctx_release, KF_RELEASE)</div><div class='ctx'> BTF_ID_FLAGS(func, bpf_testmod_ops3_call_test_1)</div><div class='hunk'>@@ -846,7 +926,7 @@ __bpf_kfunc int bpf_kfunc_call_kernel_connect(struct addr_args *args)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = kernel_connect(sock, (struct sockaddr *)&amp;args-&gt;addr,</div><div class='add'>+	err = kernel_connect(sock, (struct sockaddr_unsized *)&amp;args-&gt;addr,</div><div class='ctx'> 			     args-&gt;addrlen, 0);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;sock_lock);</div><div class='hunk'>@@ -869,7 +949,7 @@ __bpf_kfunc int bpf_kfunc_call_kernel_bind(struct addr_args *args)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = kernel_bind(sock, (struct sockaddr *)&amp;args-&gt;addr, args-&gt;addrlen);</div><div class='add'>+	err = kernel_bind(sock, (struct sockaddr_unsized *)&amp;args-&gt;addr, args-&gt;addrlen);</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;sock_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1053,6 +1133,8 @@ __bpf_kfunc int bpf_kfunc_st_ops_inc10(struct st_ops_args *args)</div><div class='ctx'> 	return args-&gt;a;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+__bpf_kfunc int bpf_kfunc_multi_st_ops_test_1(struct st_ops_args *args, u32 id);</div><div class='add'>+</div><div class='ctx'> BTF_KFUNCS_START(bpf_testmod_check_kfunc_ids)</div><div class='ctx'> BTF_ID_FLAGS(func, bpf_testmod_test_mod_kfunc)</div><div class='ctx'> BTF_ID_FLAGS(func, bpf_kfunc_call_test1)</div><div class='hunk'>@@ -1093,6 +1175,7 @@ BTF_ID_FLAGS(func, bpf_kfunc_st_ops_test_prologue, KF_TRUSTED_ARGS | KF_SLEEPABL</div><div class='ctx'> BTF_ID_FLAGS(func, bpf_kfunc_st_ops_test_epilogue, KF_TRUSTED_ARGS | KF_SLEEPABLE)</div><div class='ctx'> BTF_ID_FLAGS(func, bpf_kfunc_st_ops_test_pro_epilogue, KF_TRUSTED_ARGS | KF_SLEEPABLE)</div><div class='ctx'> BTF_ID_FLAGS(func, bpf_kfunc_st_ops_inc10, KF_TRUSTED_ARGS)</div><div class='add'>+BTF_ID_FLAGS(func, bpf_kfunc_multi_st_ops_test_1, KF_TRUSTED_ARGS)</div><div class='ctx'> BTF_KFUNCS_END(bpf_testmod_check_kfunc_ids)</div><div class='ctx'> </div><div class='ctx'> static int bpf_testmod_ops_init(struct btf *btf)</div><div class='hunk'>@@ -1130,6 +1213,7 @@ static const struct btf_kfunc_id_set bpf_testmod_kfunc_set = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bpf_verifier_ops bpf_testmod_verifier_ops = {</div><div class='add'>+	.get_func_proto	 = bpf_base_func_proto,</div><div class='ctx'> 	.is_valid_access = bpf_testmod_ops_is_valid_access,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1176,10 +1260,25 @@ static int bpf_testmod_ops__test_maybe_null(int dummy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bpf_testmod_ops__test_refcounted(int dummy,</div><div class='add'>+					    struct task_struct *task__ref)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct task_struct *</div><div class='add'>+bpf_testmod_ops__test_return_ref_kptr(int dummy, struct task_struct *task__ref,</div><div class='add'>+				      struct cgroup *cgrp)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct bpf_testmod_ops __bpf_testmod_ops = {</div><div class='ctx'> 	.test_1 = bpf_testmod_test_1,</div><div class='ctx'> 	.test_2 = bpf_testmod_test_2,</div><div class='ctx'> 	.test_maybe_null = bpf_testmod_ops__test_maybe_null,</div><div class='add'>+	.test_refcounted = bpf_testmod_ops__test_refcounted,</div><div class='add'>+	.test_return_ref_kptr = bpf_testmod_ops__test_return_ref_kptr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bpf_struct_ops bpf_bpf_testmod_ops = {</div><div class='hunk'>@@ -1293,6 +1392,85 @@ static int bpf_test_mod_st_ops__test_pro_epilogue(struct st_ops_args *args)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bpf_cgroup_from_id_id;</div><div class='add'>+static int bpf_cgroup_release_id;</div><div class='add'>+</div><div class='add'>+static int st_ops_gen_prologue_with_kfunc(struct bpf_insn *insn_buf, bool direct_write,</div><div class='add'>+					  const struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn *insn = insn_buf;</div><div class='add'>+</div><div class='add'>+	/* r8 = r1; // r8 will be "u64 *ctx".</div><div class='add'>+	 * r1 = 0;</div><div class='add'>+	 * r0 = bpf_cgroup_from_id(r1);</div><div class='add'>+	 * if r0 != 0 goto pc+5;</div><div class='add'>+	 * r6 = r8[0]; // r6 will be "struct st_ops *args".</div><div class='add'>+	 * r7 = r6-&gt;a;</div><div class='add'>+	 * r7 += 1000;</div><div class='add'>+	 * r6-&gt;a = r7;</div><div class='add'>+	 * goto pc+2;</div><div class='add'>+	 * r1 = r0;</div><div class='add'>+	 * bpf_cgroup_release(r1);</div><div class='add'>+	 * r1 = r8;</div><div class='add'>+	 */</div><div class='add'>+	*insn++ = BPF_MOV64_REG(BPF_REG_8, BPF_REG_1);</div><div class='add'>+	*insn++ = BPF_MOV64_IMM(BPF_REG_1, 0);</div><div class='add'>+	*insn++ = BPF_CALL_KFUNC(0, bpf_cgroup_from_id_id);</div><div class='add'>+	*insn++ = BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 5);</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_DW, BPF_REG_6, BPF_REG_8, 0);</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_6, offsetof(struct st_ops_args, a));</div><div class='add'>+	*insn++ = BPF_ALU64_IMM(BPF_ADD, BPF_REG_7, 1000);</div><div class='add'>+	*insn++ = BPF_STX_MEM(BPF_DW, BPF_REG_6, BPF_REG_7, offsetof(struct st_ops_args, a));</div><div class='add'>+	*insn++ = BPF_JMP_IMM(BPF_JA, 0, 0, 2);</div><div class='add'>+	*insn++ = BPF_MOV64_REG(BPF_REG_1, BPF_REG_0);</div><div class='add'>+	*insn++ = BPF_CALL_KFUNC(0, bpf_cgroup_release_id);</div><div class='add'>+	*insn++ = BPF_MOV64_REG(BPF_REG_1, BPF_REG_8);</div><div class='add'>+	*insn++ = prog-&gt;insnsi[0];</div><div class='add'>+</div><div class='add'>+	return insn - insn_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int st_ops_gen_epilogue_with_kfunc(struct bpf_insn *insn_buf, const struct bpf_prog *prog,</div><div class='add'>+					  s16 ctx_stack_off)</div><div class='add'>+{</div><div class='add'>+	struct bpf_insn *insn = insn_buf;</div><div class='add'>+</div><div class='add'>+	/* r1 = 0;</div><div class='add'>+	 * r6 = 0;</div><div class='add'>+	 * r0 = bpf_cgroup_from_id(r1);</div><div class='add'>+	 * if r0 != 0 goto pc+6;</div><div class='add'>+	 * r1 = stack[ctx_stack_off]; // r1 will be "u64 *ctx"</div><div class='add'>+	 * r1 = r1[0]; // r1 will be "struct st_ops *args"</div><div class='add'>+	 * r6 = r1-&gt;a;</div><div class='add'>+	 * r6 += 10000;</div><div class='add'>+	 * r1-&gt;a = r6;</div><div class='add'>+	 * goto pc+2</div><div class='add'>+	 * r1 = r0;</div><div class='add'>+	 * bpf_cgroup_release(r1);</div><div class='add'>+	 * r0 = r6;</div><div class='add'>+	 * r0 *= 2;</div><div class='add'>+	 * BPF_EXIT;</div><div class='add'>+	 */</div><div class='add'>+	*insn++ = BPF_MOV64_IMM(BPF_REG_1, 0);</div><div class='add'>+	*insn++ = BPF_MOV64_IMM(BPF_REG_6, 0);</div><div class='add'>+	*insn++ = BPF_CALL_KFUNC(0, bpf_cgroup_from_id_id);</div><div class='add'>+	*insn++ = BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 6);</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_DW, BPF_REG_1, BPF_REG_FP, ctx_stack_off);</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_DW, BPF_REG_1, BPF_REG_1, 0);</div><div class='add'>+	*insn++ = BPF_LDX_MEM(BPF_DW, BPF_REG_6, BPF_REG_1, offsetof(struct st_ops_args, a));</div><div class='add'>+	*insn++ = BPF_ALU64_IMM(BPF_ADD, BPF_REG_6, 10000);</div><div class='add'>+	*insn++ = BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_6, offsetof(struct st_ops_args, a));</div><div class='add'>+	*insn++ = BPF_JMP_IMM(BPF_JA, 0, 0, 2);</div><div class='add'>+	*insn++ = BPF_MOV64_REG(BPF_REG_1, BPF_REG_0);</div><div class='add'>+	*insn++ = BPF_CALL_KFUNC(0, bpf_cgroup_release_id);</div><div class='add'>+	*insn++ = BPF_MOV64_REG(BPF_REG_0, BPF_REG_6);</div><div class='add'>+	*insn++ = BPF_ALU64_IMM(BPF_MUL, BPF_REG_0, 2);</div><div class='add'>+	*insn++ = BPF_EXIT_INSN();</div><div class='add'>+</div><div class='add'>+	return insn - insn_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define KFUNC_PRO_EPI_PREFIX "test_kfunc_"</div><div class='ctx'> static int st_ops_gen_prologue(struct bpf_insn *insn_buf, bool direct_write,</div><div class='ctx'> 			       const struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='hunk'>@@ -1302,6 +1480,9 @@ static int st_ops_gen_prologue(struct bpf_insn *insn_buf, bool direct_write,</div><div class='ctx'> 	    strcmp(prog-&gt;aux-&gt;attach_func_name, "test_pro_epilogue"))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (!strncmp(prog-&gt;aux-&gt;name, KFUNC_PRO_EPI_PREFIX, strlen(KFUNC_PRO_EPI_PREFIX)))</div><div class='add'>+		return st_ops_gen_prologue_with_kfunc(insn_buf, direct_write, prog);</div><div class='add'>+</div><div class='ctx'> 	/* r6 = r1[0]; // r6 will be "struct st_ops *args". r1 is "u64 *ctx".</div><div class='ctx'> 	 * r7 = r6-&gt;a;</div><div class='ctx'> 	 * r7 += 1000;</div><div class='hunk'>@@ -1325,6 +1506,9 @@ static int st_ops_gen_epilogue(struct bpf_insn *insn_buf, const struct bpf_prog</div><div class='ctx'> 	    strcmp(prog-&gt;aux-&gt;attach_func_name, "test_pro_epilogue"))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (!strncmp(prog-&gt;aux-&gt;name, KFUNC_PRO_EPI_PREFIX, strlen(KFUNC_PRO_EPI_PREFIX)))</div><div class='add'>+		return st_ops_gen_epilogue_with_kfunc(insn_buf, prog, ctx_stack_off);</div><div class='add'>+</div><div class='ctx'> 	/* r1 = stack[ctx_stack_off]; // r1 will be "u64 *ctx"</div><div class='ctx'> 	 * r1 = r1[0]; // r1 will be "struct st_ops *args"</div><div class='ctx'> 	 * r6 = r1-&gt;a;</div><div class='hunk'>@@ -1395,6 +1579,13 @@ static void st_ops_unreg(void *kdata, struct bpf_link *link)</div><div class='ctx'> </div><div class='ctx'> static int st_ops_init(struct btf *btf)</div><div class='ctx'> {</div><div class='add'>+	struct btf *kfunc_btf;</div><div class='add'>+</div><div class='add'>+	bpf_cgroup_from_id_id = bpf_find_btf_id("bpf_cgroup_from_id", BTF_KIND_FUNC, &amp;kfunc_btf);</div><div class='add'>+	bpf_cgroup_release_id = bpf_find_btf_id("bpf_cgroup_release", BTF_KIND_FUNC, &amp;kfunc_btf);</div><div class='add'>+	if (bpf_cgroup_from_id_id &lt; 0 || bpf_cgroup_release_id &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1416,6 +1607,114 @@ static struct bpf_struct_ops testmod_st_ops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct hlist_head multi_st_ops_list;</div><div class='add'>+static DEFINE_SPINLOCK(multi_st_ops_lock);</div><div class='add'>+</div><div class='add'>+static int multi_st_ops_init(struct btf *btf)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init(&amp;multi_st_ops_lock);</div><div class='add'>+	INIT_HLIST_HEAD(&amp;multi_st_ops_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int multi_st_ops_init_member(const struct btf_type *t,</div><div class='add'>+				    const struct btf_member *member,</div><div class='add'>+				    void *kdata, const void *udata)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_testmod_multi_st_ops *multi_st_ops_find_nolock(u32 id)</div><div class='add'>+{</div><div class='add'>+	struct bpf_testmod_multi_st_ops *st_ops;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(st_ops, &amp;multi_st_ops_list, node) {</div><div class='add'>+		if (st_ops-&gt;id == id)</div><div class='add'>+			return st_ops;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bpf_kfunc_multi_st_ops_test_1(struct st_ops_args *args, u32 id)</div><div class='add'>+{</div><div class='add'>+	struct bpf_testmod_multi_st_ops *st_ops;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;multi_st_ops_lock, flags);</div><div class='add'>+	st_ops = multi_st_ops_find_nolock(id);</div><div class='add'>+	if (st_ops)</div><div class='add'>+		ret = st_ops-&gt;test_1(args);</div><div class='add'>+	spin_unlock_irqrestore(&amp;multi_st_ops_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int multi_st_ops_reg(void *kdata, struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	struct bpf_testmod_multi_st_ops *st_ops =</div><div class='add'>+		(struct bpf_testmod_multi_st_ops *)kdata;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	if (!st_ops-&gt;test_1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	id = bpf_struct_ops_id(kdata);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;multi_st_ops_lock, flags);</div><div class='add'>+	if (multi_st_ops_find_nolock(id)) {</div><div class='add'>+		pr_err("multi_st_ops(id:%d) has already been registered\n", id);</div><div class='add'>+		err = -EEXIST;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	st_ops-&gt;id = id;</div><div class='add'>+	hlist_add_head(&amp;st_ops-&gt;node, &amp;multi_st_ops_list);</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;multi_st_ops_lock, flags);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void multi_st_ops_unreg(void *kdata, struct bpf_link *link)</div><div class='add'>+{</div><div class='add'>+	struct bpf_testmod_multi_st_ops *st_ops;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	id = bpf_struct_ops_id(kdata);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;multi_st_ops_lock, flags);</div><div class='add'>+	st_ops = multi_st_ops_find_nolock(id);</div><div class='add'>+	if (st_ops)</div><div class='add'>+		hlist_del(&amp;st_ops-&gt;node);</div><div class='add'>+	spin_unlock_irqrestore(&amp;multi_st_ops_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bpf_testmod_multi_st_ops__test_1(struct st_ops_args *args)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bpf_testmod_multi_st_ops multi_st_ops_cfi_stubs = {</div><div class='add'>+	.test_1 = bpf_testmod_multi_st_ops__test_1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bpf_struct_ops testmod_multi_st_ops = {</div><div class='add'>+	.verifier_ops = &amp;bpf_testmod_verifier_ops,</div><div class='add'>+	.init = multi_st_ops_init,</div><div class='add'>+	.init_member = multi_st_ops_init_member,</div><div class='add'>+	.reg = multi_st_ops_reg,</div><div class='add'>+	.unreg = multi_st_ops_unreg,</div><div class='add'>+	.cfi_stubs = &amp;multi_st_ops_cfi_stubs,</div><div class='add'>+	.name = "bpf_testmod_multi_st_ops",</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> extern int bpf_fentry_test1(int a);</div><div class='ctx'> </div><div class='ctx'> static int bpf_testmod_init(void)</div><div class='hunk'>@@ -1438,6 +1737,7 @@ static int bpf_testmod_init(void)</div><div class='ctx'> 	ret = ret ?: register_bpf_struct_ops(&amp;bpf_testmod_ops2, bpf_testmod_ops2);</div><div class='ctx'> 	ret = ret ?: register_bpf_struct_ops(&amp;bpf_testmod_ops3, bpf_testmod_ops3);</div><div class='ctx'> 	ret = ret ?: register_bpf_struct_ops(&amp;testmod_st_ops, bpf_testmod_st_ops);</div><div class='add'>+	ret = ret ?: register_bpf_struct_ops(&amp;testmod_multi_st_ops, bpf_testmod_multi_st_ops);</div><div class='ctx'> 	ret = ret ?: register_btf_id_dtor_kfuncs(bpf_testmod_dtors,</div><div class='ctx'> 						 ARRAY_SIZE(bpf_testmod_dtors),</div><div class='ctx'> 						 THIS_MODULE);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.h b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.h<br/>index 356803d1c10e..f6e492f9d042 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_kmods/bpf_testmod.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_kmods/bpf_testmod.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_kmods/bpf_testmod.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_kmods/bpf_testmod.h</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct task_struct;</div><div class='add'>+struct cgroup;</div><div class='ctx'> </div><div class='ctx'> struct bpf_testmod_test_read_ctx {</div><div class='ctx'> 	char *buf;</div><div class='hunk'>@@ -36,6 +37,11 @@ struct bpf_testmod_ops {</div><div class='ctx'> 	/* Used to test nullable arguments. */</div><div class='ctx'> 	int (*test_maybe_null)(int dummy, struct task_struct *task);</div><div class='ctx'> 	int (*unsupported_ops)(void);</div><div class='add'>+	/* Used to test ref_acquired arguments. */</div><div class='add'>+	int (*test_refcounted)(int dummy, struct task_struct *task);</div><div class='add'>+	/* Used to test returning referenced kptr. */</div><div class='add'>+	struct task_struct *(*test_return_ref_kptr)(int dummy, struct task_struct *task,</div><div class='add'>+						    struct cgroup *cgrp);</div><div class='ctx'> </div><div class='ctx'> 	/* The following fields are used to test shadow copies. */</div><div class='ctx'> 	char onebyte;</div><div class='hunk'>@@ -110,4 +116,10 @@ struct bpf_testmod_st_ops {</div><div class='ctx'> 	struct module *owner;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct bpf_testmod_multi_st_ops {</div><div class='add'>+	int (*test_1)(struct st_ops_args *args);</div><div class='add'>+	struct hlist_node node;</div><div class='add'>+	int id;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* _BPF_TESTMOD_H */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h b/tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h<br/>index b58817938deb..4df6fa6a92cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h</a></div><div class='hunk'>@@ -158,5 +158,9 @@ void bpf_kfunc_trusted_vma_test(struct vm_area_struct *ptr) __ksym;</div><div class='ctx'> void bpf_kfunc_trusted_task_test(struct task_struct *ptr) __ksym;</div><div class='ctx'> void bpf_kfunc_trusted_num_test(int *ptr) __ksym;</div><div class='ctx'> void bpf_kfunc_rcu_task_test(struct task_struct *ptr) __ksym;</div><div class='add'>+struct task_struct *bpf_kfunc_ret_rcu_test(void) __ksym;</div><div class='add'>+int *bpf_kfunc_ret_rcu_test_nostruct(int rdonly_buf_size) __ksym;</div><div class='add'>+</div><div class='add'>+int bpf_kfunc_multi_st_ops_test_1(struct st_ops_args *args, u32 id) __ksym;</div><div class='ctx'> </div><div class='ctx'> #endif /* _BPF_TESTMOD_KFUNC_H */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_lirc_mode2_user.c b/tools/testing/selftests/bpf/test_lirc_mode2_user.c<br/>index 4694422aa76c..88e4aeab21b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_lirc_mode2_user.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_lirc_mode2_user.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_lirc_mode2_user.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_lirc_mode2_user.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ int main(int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> 	/* Let's try detach it before it was ever attached */</div><div class='ctx'> 	ret = bpf_prog_detach2(progfd, lircfd, BPF_LIRC_MODE2);</div><div class='del'>-	if (ret != -1 || errno != ENOENT) {</div><div class='add'>+	if (ret != -ENOENT) {</div><div class='ctx'> 		printf("bpf_prog_detach2 not attached should fail: %m\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_loader.c b/tools/testing/selftests/bpf/test_loader.c<br/>index 53b06647cf57..338c035c3688 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_loader.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_loader.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_loader.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_loader.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> /* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;regex.h&gt;</div><div class='ctx'> #include &lt;test_progs.h&gt;</div><div class='ctx'> #include &lt;bpf/btf.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -20,10 +19,12 @@</div><div class='ctx'> #define TEST_TAG_EXPECT_FAILURE "comment:test_expect_failure"</div><div class='ctx'> #define TEST_TAG_EXPECT_SUCCESS "comment:test_expect_success"</div><div class='ctx'> #define TEST_TAG_EXPECT_MSG_PFX "comment:test_expect_msg="</div><div class='add'>+#define TEST_TAG_EXPECT_NOT_MSG_PFX "comment:test_expect_not_msg="</div><div class='ctx'> #define TEST_TAG_EXPECT_XLATED_PFX "comment:test_expect_xlated="</div><div class='ctx'> #define TEST_TAG_EXPECT_FAILURE_UNPRIV "comment:test_expect_failure_unpriv"</div><div class='ctx'> #define TEST_TAG_EXPECT_SUCCESS_UNPRIV "comment:test_expect_success_unpriv"</div><div class='ctx'> #define TEST_TAG_EXPECT_MSG_PFX_UNPRIV "comment:test_expect_msg_unpriv="</div><div class='add'>+#define TEST_TAG_EXPECT_NOT_MSG_PFX_UNPRIV "comment:test_expect_not_msg_unpriv="</div><div class='ctx'> #define TEST_TAG_EXPECT_XLATED_PFX_UNPRIV "comment:test_expect_xlated_unpriv="</div><div class='ctx'> #define TEST_TAG_LOG_LEVEL_PFX "comment:test_log_level="</div><div class='ctx'> #define TEST_TAG_PROG_FLAGS_PFX "comment:test_prog_flags="</div><div class='hunk'>@@ -37,9 +38,15 @@</div><div class='ctx'> #define TEST_TAG_JITED_PFX "comment:test_jited="</div><div class='ctx'> #define TEST_TAG_JITED_PFX_UNPRIV "comment:test_jited_unpriv="</div><div class='ctx'> #define TEST_TAG_CAPS_UNPRIV "comment:test_caps_unpriv="</div><div class='add'>+#define TEST_TAG_LOAD_MODE_PFX "comment:load_mode="</div><div class='add'>+#define TEST_TAG_EXPECT_STDERR_PFX "comment:test_expect_stderr="</div><div class='add'>+#define TEST_TAG_EXPECT_STDERR_PFX_UNPRIV "comment:test_expect_stderr_unpriv="</div><div class='add'>+#define TEST_TAG_EXPECT_STDOUT_PFX "comment:test_expect_stdout="</div><div class='add'>+#define TEST_TAG_EXPECT_STDOUT_PFX_UNPRIV "comment:test_expect_stdout_unpriv="</div><div class='add'>+#define TEST_TAG_LINEAR_SIZE "comment:test_linear_size="</div><div class='ctx'> </div><div class='ctx'> /* Warning: duplicated in bpf_misc.h */</div><div class='del'>-#define POINTER_VALUE	0xcafe4all</div><div class='add'>+#define POINTER_VALUE	0xbadcafe</div><div class='ctx'> #define TEST_DATA_LEN	64</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS</div><div class='hunk'>@@ -55,16 +62,9 @@ enum mode {</div><div class='ctx'> 	UNPRIV = 2</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct expect_msg {</div><div class='del'>-	const char *substr; /* substring match */</div><div class='del'>-	regex_t regex;</div><div class='del'>-	bool is_regex;</div><div class='del'>-	bool on_next_line;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct expected_msgs {</div><div class='del'>-	struct expect_msg *patterns;</div><div class='del'>-	size_t cnt;</div><div class='add'>+enum load_mode {</div><div class='add'>+	JITED		= 1 &lt;&lt; 0,</div><div class='add'>+	NO_JITED	= 1 &lt;&lt; 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct test_subspec {</div><div class='hunk'>@@ -73,6 +73,8 @@ struct test_subspec {</div><div class='ctx'> 	struct expected_msgs expect_msgs;</div><div class='ctx'> 	struct expected_msgs expect_xlated;</div><div class='ctx'> 	struct expected_msgs jited;</div><div class='add'>+	struct expected_msgs stderr;</div><div class='add'>+	struct expected_msgs stdout;</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	bool execute;</div><div class='ctx'> 	__u64 caps;</div><div class='hunk'>@@ -87,6 +89,8 @@ struct test_spec {</div><div class='ctx'> 	int prog_flags;</div><div class='ctx'> 	int mode_mask;</div><div class='ctx'> 	int arch_mask;</div><div class='add'>+	int load_mask;</div><div class='add'>+	int linear_sz;</div><div class='ctx'> 	bool auxiliary;</div><div class='ctx'> 	bool valid;</div><div class='ctx'> };</div><div class='hunk'>@@ -132,6 +136,10 @@ static void free_test_spec(struct test_spec *spec)</div><div class='ctx'> 	free_msgs(&amp;spec-&gt;unpriv.expect_xlated);</div><div class='ctx'> 	free_msgs(&amp;spec-&gt;priv.jited);</div><div class='ctx'> 	free_msgs(&amp;spec-&gt;unpriv.jited);</div><div class='add'>+	free_msgs(&amp;spec-&gt;unpriv.stderr);</div><div class='add'>+	free_msgs(&amp;spec-&gt;priv.stderr);</div><div class='add'>+	free_msgs(&amp;spec-&gt;unpriv.stdout);</div><div class='add'>+	free_msgs(&amp;spec-&gt;priv.stdout);</div><div class='ctx'> </div><div class='ctx'> 	free(spec-&gt;priv.name);</div><div class='ctx'> 	free(spec-&gt;unpriv.name);</div><div class='hunk'>@@ -199,7 +207,8 @@ static int compile_regex(const char *pattern, regex_t *regex)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __push_msg(const char *pattern, bool on_next_line, struct expected_msgs *msgs)</div><div class='add'>+static int __push_msg(const char *pattern, bool on_next_line, bool negative,</div><div class='add'>+		      struct expected_msgs *msgs)</div><div class='ctx'> {</div><div class='ctx'> 	struct expect_msg *msg;</div><div class='ctx'> 	void *tmp;</div><div class='hunk'>@@ -215,6 +224,7 @@ static int __push_msg(const char *pattern, bool on_next_line, struct expected_ms</div><div class='ctx'> 	msg = &amp;msgs-&gt;patterns[msgs-&gt;cnt];</div><div class='ctx'> 	msg-&gt;on_next_line = on_next_line;</div><div class='ctx'> 	msg-&gt;substr = pattern;</div><div class='add'>+	msg-&gt;negative = negative;</div><div class='ctx'> 	msg-&gt;is_regex = false;</div><div class='ctx'> 	if (strstr(pattern, "{{")) {</div><div class='ctx'> 		err = compile_regex(pattern, &amp;msg-&gt;regex);</div><div class='hunk'>@@ -233,16 +243,16 @@ static int clone_msgs(struct expected_msgs *from, struct expected_msgs *to)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; from-&gt;cnt; i++) {</div><div class='ctx'> 		msg = &amp;from-&gt;patterns[i];</div><div class='del'>-		err = __push_msg(msg-&gt;substr, msg-&gt;on_next_line, to);</div><div class='add'>+		err = __push_msg(msg-&gt;substr, msg-&gt;on_next_line, msg-&gt;negative, to);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int push_msg(const char *substr, struct expected_msgs *msgs)</div><div class='add'>+static int push_msg(const char *substr, bool negative, struct expected_msgs *msgs)</div><div class='ctx'> {</div><div class='del'>-	return __push_msg(substr, false, msgs);</div><div class='add'>+	return __push_msg(substr, false, negative, msgs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int push_disasm_msg(const char *regex_str, bool *on_next_line, struct expected_msgs *msgs)</div><div class='hunk'>@@ -253,7 +263,7 @@ static int push_disasm_msg(const char *regex_str, bool *on_next_line, struct exp</div><div class='ctx'> 		*on_next_line = false;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	err = __push_msg(regex_str, *on_next_line, msgs);</div><div class='add'>+	err = __push_msg(regex_str, *on_next_line, false, msgs);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	*on_next_line = true;</div><div class='hunk'>@@ -311,20 +321,14 @@ static int parse_caps(const char *str, __u64 *val, const char *name)</div><div class='ctx'> </div><div class='ctx'> static int parse_retval(const char *str, int *val, const char *name)</div><div class='ctx'> {</div><div class='del'>-	struct {</div><div class='del'>-		char *name;</div><div class='del'>-		int val;</div><div class='del'>-	} named_values[] = {</div><div class='del'>-		{ "INT_MIN"      , INT_MIN },</div><div class='del'>-		{ "POINTER_VALUE", POINTER_VALUE },</div><div class='del'>-		{ "TEST_DATA_LEN", TEST_DATA_LEN },</div><div class='del'>-	};</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(named_values); ++i) {</div><div class='del'>-		if (strcmp(str, named_values[i].name) != 0)</div><div class='del'>-			continue;</div><div class='del'>-		*val = named_values[i].val;</div><div class='add'>+	/*</div><div class='add'>+	 * INT_MIN is defined as (-INT_MAX -1), i.e. it doesn't expand to a</div><div class='add'>+	 * single int and cannot be parsed with strtol, so we handle it</div><div class='add'>+	 * separately here. In addition, it expands to different expressions in</div><div class='add'>+	 * different compilers so we use a prefixed _INT_MIN instead.</div><div class='add'>+	 */</div><div class='add'>+	if (strcmp(str, "_INT_MIN") == 0) {</div><div class='add'>+		*val = INT_MIN;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -373,6 +377,7 @@ enum arch {</div><div class='ctx'> 	ARCH_X86_64	= 0x2,</div><div class='ctx'> 	ARCH_ARM64	= 0x4,</div><div class='ctx'> 	ARCH_RISCV64	= 0x8,</div><div class='add'>+	ARCH_S390X	= 0x10,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int get_current_arch(void)</div><div class='hunk'>@@ -383,6 +388,8 @@ static int get_current_arch(void)</div><div class='ctx'> 	return ARCH_ARM64;</div><div class='ctx'> #elif defined(__riscv) &amp;&amp; __riscv_xlen == 64</div><div class='ctx'> 	return ARCH_RISCV64;</div><div class='add'>+#elif defined(__s390x__)</div><div class='add'>+	return ARCH_S390X;</div><div class='ctx'> #endif</div><div class='ctx'> 	return ARCH_UNKNOWN;</div><div class='ctx'> }</div><div class='hunk'>@@ -403,9 +410,14 @@ static int parse_test_spec(struct test_loader *tester,</div><div class='ctx'> 	bool xlated_on_next_line = true;</div><div class='ctx'> 	bool unpriv_jit_on_next_line;</div><div class='ctx'> 	bool jit_on_next_line;</div><div class='add'>+	bool stderr_on_next_line = true;</div><div class='add'>+	bool unpriv_stderr_on_next_line = true;</div><div class='add'>+	bool stdout_on_next_line = true;</div><div class='add'>+	bool unpriv_stdout_on_next_line = true;</div><div class='ctx'> 	bool collect_jit = false;</div><div class='ctx'> 	int func_id, i, err = 0;</div><div class='ctx'> 	u32 arch_mask = 0;</div><div class='add'>+	u32 load_mask = 0;</div><div class='ctx'> 	struct btf *btf;</div><div class='ctx'> 	enum arch arch;</div><div class='ctx'> </div><div class='hunk'>@@ -463,12 +475,22 @@ static int parse_test_spec(struct test_loader *tester,</div><div class='ctx'> 			spec-&gt;auxiliary = true;</div><div class='ctx'> 			spec-&gt;mode_mask |= UNPRIV;</div><div class='ctx'> 		} else if ((msg = skip_dynamic_pfx(s, TEST_TAG_EXPECT_MSG_PFX))) {</div><div class='del'>-			err = push_msg(msg, &amp;spec-&gt;priv.expect_msgs);</div><div class='add'>+			err = push_msg(msg, false, &amp;spec-&gt;priv.expect_msgs);</div><div class='add'>+			if (err)</div><div class='add'>+				goto cleanup;</div><div class='add'>+			spec-&gt;mode_mask |= PRIV;</div><div class='add'>+		} else if ((msg = skip_dynamic_pfx(s, TEST_TAG_EXPECT_NOT_MSG_PFX))) {</div><div class='add'>+			err = push_msg(msg, true, &amp;spec-&gt;priv.expect_msgs);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto cleanup;</div><div class='ctx'> 			spec-&gt;mode_mask |= PRIV;</div><div class='ctx'> 		} else if ((msg = skip_dynamic_pfx(s, TEST_TAG_EXPECT_MSG_PFX_UNPRIV))) {</div><div class='del'>-			err = push_msg(msg, &amp;spec-&gt;unpriv.expect_msgs);</div><div class='add'>+			err = push_msg(msg, false, &amp;spec-&gt;unpriv.expect_msgs);</div><div class='add'>+			if (err)</div><div class='add'>+				goto cleanup;</div><div class='add'>+			spec-&gt;mode_mask |= UNPRIV;</div><div class='add'>+		} else if ((msg = skip_dynamic_pfx(s, TEST_TAG_EXPECT_NOT_MSG_PFX_UNPRIV))) {</div><div class='add'>+			err = push_msg(msg, true, &amp;spec-&gt;unpriv.expect_msgs);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto cleanup;</div><div class='ctx'> 			spec-&gt;mode_mask |= UNPRIV;</div><div class='hunk'>@@ -563,8 +585,10 @@ static int parse_test_spec(struct test_loader *tester,</div><div class='ctx'> 				arch = ARCH_ARM64;</div><div class='ctx'> 			} else if (strcmp(val, "RISCV64") == 0) {</div><div class='ctx'> 				arch = ARCH_RISCV64;</div><div class='add'>+			} else if (strcmp(val, "s390x") == 0) {</div><div class='add'>+				arch = ARCH_S390X;</div><div class='ctx'> 			} else {</div><div class='del'>-				PRINT_FAIL("bad arch spec: '%s'", val);</div><div class='add'>+				PRINT_FAIL("bad arch spec: '%s'\n", val);</div><div class='ctx'> 				err = -EINVAL;</div><div class='ctx'> 				goto cleanup;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -580,10 +604,57 @@ static int parse_test_spec(struct test_loader *tester,</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto cleanup;</div><div class='ctx'> 			spec-&gt;mode_mask |= UNPRIV;</div><div class='add'>+		} else if (str_has_pfx(s, TEST_TAG_LOAD_MODE_PFX)) {</div><div class='add'>+			val = s + sizeof(TEST_TAG_LOAD_MODE_PFX) - 1;</div><div class='add'>+			if (strcmp(val, "jited") == 0) {</div><div class='add'>+				load_mask = JITED;</div><div class='add'>+			} else if (strcmp(val, "no_jited") == 0) {</div><div class='add'>+				load_mask = NO_JITED;</div><div class='add'>+			} else {</div><div class='add'>+				PRINT_FAIL("bad load spec: '%s'", val);</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto cleanup;</div><div class='add'>+			}</div><div class='add'>+		} else if ((msg = skip_dynamic_pfx(s, TEST_TAG_EXPECT_STDERR_PFX))) {</div><div class='add'>+			err = push_disasm_msg(msg, &amp;stderr_on_next_line,</div><div class='add'>+					      &amp;spec-&gt;priv.stderr);</div><div class='add'>+			if (err)</div><div class='add'>+				goto cleanup;</div><div class='add'>+		} else if ((msg = skip_dynamic_pfx(s, TEST_TAG_EXPECT_STDERR_PFX_UNPRIV))) {</div><div class='add'>+			err = push_disasm_msg(msg, &amp;unpriv_stderr_on_next_line,</div><div class='add'>+					      &amp;spec-&gt;unpriv.stderr);</div><div class='add'>+			if (err)</div><div class='add'>+				goto cleanup;</div><div class='add'>+		} else if ((msg = skip_dynamic_pfx(s, TEST_TAG_EXPECT_STDOUT_PFX))) {</div><div class='add'>+			err = push_disasm_msg(msg, &amp;stdout_on_next_line,</div><div class='add'>+					      &amp;spec-&gt;priv.stdout);</div><div class='add'>+			if (err)</div><div class='add'>+				goto cleanup;</div><div class='add'>+		} else if ((msg = skip_dynamic_pfx(s, TEST_TAG_EXPECT_STDOUT_PFX_UNPRIV))) {</div><div class='add'>+			err = push_disasm_msg(msg, &amp;unpriv_stdout_on_next_line,</div><div class='add'>+					      &amp;spec-&gt;unpriv.stdout);</div><div class='add'>+			if (err)</div><div class='add'>+				goto cleanup;</div><div class='add'>+		} else if (str_has_pfx(s, TEST_TAG_LINEAR_SIZE)) {</div><div class='add'>+			switch (bpf_program__type(prog)) {</div><div class='add'>+			case BPF_PROG_TYPE_SCHED_ACT:</div><div class='add'>+			case BPF_PROG_TYPE_SCHED_CLS:</div><div class='add'>+			case BPF_PROG_TYPE_CGROUP_SKB:</div><div class='add'>+				val = s + sizeof(TEST_TAG_LINEAR_SIZE) - 1;</div><div class='add'>+				err = parse_int(val, &amp;spec-&gt;linear_sz, "test linear size");</div><div class='add'>+				if (err)</div><div class='add'>+					goto cleanup;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				PRINT_FAIL("__linear_size for unsupported program type");</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto cleanup;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spec-&gt;arch_mask = arch_mask ?: -1;</div><div class='add'>+	spec-&gt;load_mask = load_mask ?: (JITED | NO_JITED);</div><div class='ctx'> </div><div class='ctx'> 	if (spec-&gt;mode_mask == 0)</div><div class='ctx'> 		spec-&gt;mode_mask = PRIV;</div><div class='hunk'>@@ -632,6 +703,10 @@ static int parse_test_spec(struct test_loader *tester,</div><div class='ctx'> 			clone_msgs(&amp;spec-&gt;priv.expect_xlated, &amp;spec-&gt;unpriv.expect_xlated);</div><div class='ctx'> 		if (spec-&gt;unpriv.jited.cnt == 0)</div><div class='ctx'> 			clone_msgs(&amp;spec-&gt;priv.jited, &amp;spec-&gt;unpriv.jited);</div><div class='add'>+		if (spec-&gt;unpriv.stderr.cnt == 0)</div><div class='add'>+			clone_msgs(&amp;spec-&gt;priv.stderr, &amp;spec-&gt;unpriv.stderr);</div><div class='add'>+		if (spec-&gt;unpriv.stdout.cnt == 0)</div><div class='add'>+			clone_msgs(&amp;spec-&gt;priv.stdout, &amp;spec-&gt;unpriv.stdout);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spec-&gt;valid = true;</div><div class='hunk'>@@ -693,44 +768,155 @@ static void emit_jited(const char *jited, bool force)</div><div class='ctx'> 	fprintf(stdout, "JITED:\n=============\n%s=============\n", jited);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void validate_msgs(char *log_buf, struct expected_msgs *msgs,</div><div class='del'>-			  void (*emit_fn)(const char *buf, bool force))</div><div class='add'>+static void emit_stderr(const char *stderr, bool force)</div><div class='add'>+{</div><div class='add'>+	if (!force &amp;&amp; env.verbosity == VERBOSE_NONE)</div><div class='add'>+		return;</div><div class='add'>+	fprintf(stdout, "STDERR:\n=============\n%s=============\n", stderr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emit_stdout(const char *bpf_stdout, bool force)</div><div class='ctx'> {</div><div class='del'>-	const char *log = log_buf, *prev_match;</div><div class='add'>+	if (!force &amp;&amp; env.verbosity == VERBOSE_NONE)</div><div class='add'>+		return;</div><div class='add'>+	fprintf(stdout, "STDOUT:\n=============\n%s=============\n", bpf_stdout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *match_msg(struct expect_msg *msg, const char **log)</div><div class='add'>+{</div><div class='add'>+	const char *match = NULL;</div><div class='ctx'> 	regmatch_t reg_match[1];</div><div class='del'>-	int prev_match_line;</div><div class='del'>-	int match_line;</div><div class='del'>-	int i, j, err;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!msg-&gt;is_regex) {</div><div class='add'>+		match = strstr(*log, msg-&gt;substr);</div><div class='add'>+		if (match)</div><div class='add'>+			*log = match + strlen(msg-&gt;substr);</div><div class='add'>+	} else {</div><div class='add'>+		err = regexec(&amp;msg-&gt;regex, *log, 1, reg_match, 0);</div><div class='add'>+		if (err == 0) {</div><div class='add'>+			match = *log + reg_match[0].rm_so;</div><div class='add'>+			*log += reg_match[0].rm_eo;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return match;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int count_lines(const char *start, const char *end)</div><div class='add'>+{</div><div class='add'>+	const char *tmp;</div><div class='add'>+	int n = 0;</div><div class='add'>+</div><div class='add'>+	for (tmp = start; tmp &lt; end; ++tmp)</div><div class='add'>+		if (*tmp == '\n')</div><div class='add'>+			n++;</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct match {</div><div class='add'>+	const char *start;</div><div class='add'>+	const char *end;</div><div class='add'>+	int line;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Positive messages are matched sequentially, each next message</div><div class='add'>+ * is looked for starting from the end of a previous matched one.</div><div class='add'>+ */</div><div class='add'>+static void match_positive_msgs(const char *log, struct expected_msgs *msgs, struct match *matches)</div><div class='add'>+{</div><div class='add'>+	const char *prev_match;</div><div class='add'>+	int i, line;</div><div class='ctx'> </div><div class='del'>-	prev_match_line = -1;</div><div class='del'>-	match_line = 0;</div><div class='ctx'> 	prev_match = log;</div><div class='add'>+	line = 0;</div><div class='ctx'> 	for (i = 0; i &lt; msgs-&gt;cnt; i++) {</div><div class='ctx'> 		struct expect_msg *msg = &amp;msgs-&gt;patterns[i];</div><div class='del'>-		const char *match = NULL, *pat_status;</div><div class='del'>-		bool wrong_line = false;</div><div class='del'>-</div><div class='del'>-		if (!msg-&gt;is_regex) {</div><div class='del'>-			match = strstr(log, msg-&gt;substr);</div><div class='del'>-			if (match)</div><div class='del'>-				log = match + strlen(msg-&gt;substr);</div><div class='del'>-		} else {</div><div class='del'>-			err = regexec(&amp;msg-&gt;regex, log, 1, reg_match, 0);</div><div class='del'>-			if (err == 0) {</div><div class='del'>-				match = log + reg_match[0].rm_so;</div><div class='del'>-				log += reg_match[0].rm_eo;</div><div class='add'>+		const char *match = NULL;</div><div class='add'>+</div><div class='add'>+		if (msg-&gt;negative)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		match = match_msg(msg, &amp;log);</div><div class='add'>+		if (match) {</div><div class='add'>+			line += count_lines(prev_match, match);</div><div class='add'>+			matches[i].start = match;</div><div class='add'>+			matches[i].end   = log;</div><div class='add'>+			matches[i].line  = line;</div><div class='add'>+			prev_match = match;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Each negative messages N located between positive messages P1 and P2</div><div class='add'>+ * is matched in the span P1.end .. P2.start. Consequently, negative messages</div><div class='add'>+ * are unordered within the span.</div><div class='add'>+ */</div><div class='add'>+static void match_negative_msgs(const char *log, struct expected_msgs *msgs, struct match *matches)</div><div class='add'>+{</div><div class='add'>+	const char *start = log, *end, *next, *match;</div><div class='add'>+	const char *log_end = log + strlen(log);</div><div class='add'>+	int i, j, next_positive;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; msgs-&gt;cnt; i++) {</div><div class='add'>+		struct expect_msg *msg = &amp;msgs-&gt;patterns[i];</div><div class='add'>+</div><div class='add'>+		/* positive message bumps span start */</div><div class='add'>+		if (!msg-&gt;negative) {</div><div class='add'>+			start = matches[i].end ?: start;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* count stride of negative patterns and adjust span end */</div><div class='add'>+		end = log_end;</div><div class='add'>+		for (next_positive = i + 1; next_positive &lt; msgs-&gt;cnt; next_positive++) {</div><div class='add'>+			if (!msgs-&gt;patterns[next_positive].negative) {</div><div class='add'>+				end = matches[next_positive].start;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (match) {</div><div class='del'>-			for (; prev_match &lt; match; ++prev_match)</div><div class='del'>-				if (*prev_match == '\n')</div><div class='del'>-					++match_line;</div><div class='del'>-			wrong_line = msg-&gt;on_next_line &amp;&amp; prev_match_line &gt;= 0 &amp;&amp;</div><div class='del'>-				     prev_match_line + 1 != match_line;</div><div class='add'>+		/* try matching negative messages within identified span */</div><div class='add'>+		for (j = i; j &lt; next_positive; j++) {</div><div class='add'>+			next = start;</div><div class='add'>+			match = match_msg(msg, &amp;next);</div><div class='add'>+			if (match &amp;&amp; next &lt;= end) {</div><div class='add'>+				matches[j].start = match;</div><div class='add'>+				matches[j].end = next;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!match || wrong_line) {</div><div class='add'>+		/* -1 to account for i++ */</div><div class='add'>+		i = next_positive - 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void validate_msgs(const char *log_buf, struct expected_msgs *msgs,</div><div class='add'>+		   void (*emit_fn)(const char *buf, bool force))</div><div class='add'>+{</div><div class='add'>+	struct match matches[msgs-&gt;cnt];</div><div class='add'>+	struct match *prev_match = NULL;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	memset(matches, 0, sizeof(*matches) * msgs-&gt;cnt);</div><div class='add'>+	match_positive_msgs(log_buf, msgs, matches);</div><div class='add'>+	match_negative_msgs(log_buf, msgs, matches);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; msgs-&gt;cnt; i++) {</div><div class='add'>+		struct expect_msg *msg = &amp;msgs-&gt;patterns[i];</div><div class='add'>+		struct match *match = &amp;matches[i];</div><div class='add'>+		const char *pat_status;</div><div class='add'>+		bool unexpected;</div><div class='add'>+		bool wrong_line;</div><div class='add'>+		bool no_match;</div><div class='add'>+</div><div class='add'>+		no_match   = !msg-&gt;negative &amp;&amp; !match-&gt;start;</div><div class='add'>+		wrong_line = !msg-&gt;negative &amp;&amp;</div><div class='add'>+			     msg-&gt;on_next_line &amp;&amp;</div><div class='add'>+			     prev_match &amp;&amp; prev_match-&gt;line + 1 != match-&gt;line;</div><div class='add'>+		unexpected = msg-&gt;negative &amp;&amp; match-&gt;start;</div><div class='add'>+		if (no_match || wrong_line || unexpected) {</div><div class='ctx'> 			PRINT_FAIL("expect_msg\n");</div><div class='ctx'> 			if (env.verbosity == VERBOSE_NONE)</div><div class='ctx'> 				emit_fn(log_buf, true /*force*/);</div><div class='hunk'>@@ -740,8 +926,10 @@ static void validate_msgs(char *log_buf, struct expected_msgs *msgs,</div><div class='ctx'> 					pat_status = "MATCHED   ";</div><div class='ctx'> 				else if (wrong_line)</div><div class='ctx'> 					pat_status = "WRONG LINE";</div><div class='del'>-				else</div><div class='add'>+				else if (no_match)</div><div class='ctx'> 					pat_status = "EXPECTED  ";</div><div class='add'>+				else</div><div class='add'>+					pat_status = "UNEXPECTED";</div><div class='ctx'> 				msg = &amp;msgs-&gt;patterns[j];</div><div class='ctx'> 				fprintf(stderr, "%s %s: '%s'\n",</div><div class='ctx'> 					pat_status,</div><div class='hunk'>@@ -751,12 +939,13 @@ static void validate_msgs(char *log_buf, struct expected_msgs *msgs,</div><div class='ctx'> 			if (wrong_line) {</div><div class='ctx'> 				fprintf(stderr,</div><div class='ctx'> 					"expecting match at line %d, actual match is at line %d\n",</div><div class='del'>-					prev_match_line + 1, match_line);</div><div class='add'>+					prev_match-&gt;line + 1, match-&gt;line);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		prev_match_line = match_line;</div><div class='add'>+		if (!msg-&gt;negative)</div><div class='add'>+			prev_match = match;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -773,7 +962,7 @@ static int drop_capabilities(struct cap_state *caps)</div><div class='ctx'> </div><div class='ctx'> 	err = cap_disable_effective(caps_to_drop, &amp;caps-&gt;old_caps);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		PRINT_FAIL("failed to drop capabilities: %i, %s\n", err, strerror(err));</div><div class='add'>+		PRINT_FAIL("failed to drop capabilities: %i, %s\n", err, strerror(-err));</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -790,7 +979,7 @@ static int restore_capabilities(struct cap_state *caps)</div><div class='ctx'> </div><div class='ctx'> 	err = cap_enable_effective(caps-&gt;old_caps, NULL);</div><div class='ctx'> 	if (err)</div><div class='del'>-		PRINT_FAIL("failed to restore capabilities: %i, %s\n", err, strerror(err));</div><div class='add'>+		PRINT_FAIL("failed to restore capabilities: %i, %s\n", err, strerror(-err));</div><div class='ctx'> 	caps-&gt;initialized = false;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -835,10 +1024,11 @@ static bool is_unpriv_capable_map(struct bpf_map *map)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_prog_test_run(int fd_prog, int *retval, bool empty_opts)</div><div class='add'>+static int do_prog_test_run(int fd_prog, int *retval, bool empty_opts, int linear_sz)</div><div class='ctx'> {</div><div class='ctx'> 	__u8 tmp_out[TEST_DATA_LEN &lt;&lt; 2] = {};</div><div class='ctx'> 	__u8 tmp_in[TEST_DATA_LEN] = {};</div><div class='add'>+	struct __sk_buff ctx = {};</div><div class='ctx'> 	int err, saved_errno;</div><div class='ctx'> 	LIBBPF_OPTS(bpf_test_run_opts, topts,</div><div class='ctx'> 		.data_in = tmp_in,</div><div class='hunk'>@@ -848,6 +1038,12 @@ static int do_prog_test_run(int fd_prog, int *retval, bool empty_opts)</div><div class='ctx'> 		.repeat = 1,</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='add'>+	if (linear_sz) {</div><div class='add'>+		ctx.data_end = linear_sz;</div><div class='add'>+		topts.ctx_in = &amp;ctx;</div><div class='add'>+		topts.ctx_size_in = sizeof(ctx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (empty_opts) {</div><div class='ctx'> 		memset(&amp;topts, 0, sizeof(struct bpf_test_run_opts));</div><div class='ctx'> 		topts.sz = sizeof(struct bpf_test_run_opts);</div><div class='hunk'>@@ -915,6 +1111,19 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Read the bpf stream corresponding to the stream_id */</div><div class='add'>+static int get_stream(int stream_id, int prog_fd, char *text, size_t text_sz)</div><div class='add'>+{</div><div class='add'>+	LIBBPF_OPTS(bpf_prog_stream_read_opts, ropts);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bpf_prog_stream_read(prog_fd, stream_id, text, text_sz, &amp;ropts);</div><div class='add'>+	ASSERT_GT(ret, 0, "stream read");</div><div class='add'>+	text[ret] = '\0';</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* this function is forced noinline and has short generic name to look better</div><div class='ctx'>  * in test_progs output (in case of a failure)</div><div class='ctx'>  */</div><div class='hunk'>@@ -928,6 +1137,7 @@ void run_subtest(struct test_loader *tester,</div><div class='ctx'> 		 bool unpriv)</div><div class='ctx'> {</div><div class='ctx'> 	struct test_subspec *subspec = unpriv ? &amp;spec-&gt;unpriv : &amp;spec-&gt;priv;</div><div class='add'>+	int current_runtime = is_jit_enabled() ? JITED : NO_JITED;</div><div class='ctx'> 	struct bpf_program *tprog = NULL, *tprog_iter;</div><div class='ctx'> 	struct bpf_link *link, *links[32] = {};</div><div class='ctx'> 	struct test_spec *spec_iter;</div><div class='hunk'>@@ -946,6 +1156,11 @@ void run_subtest(struct test_loader *tester,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((current_runtime &amp; spec-&gt;load_mask) == 0) {</div><div class='add'>+		test__skip();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (unpriv) {</div><div class='ctx'> 		if (!can_execute_unpriv(tester, spec)) {</div><div class='ctx'> 			test__skip();</div><div class='hunk'>@@ -959,7 +1174,7 @@ void run_subtest(struct test_loader *tester,</div><div class='ctx'> 		if (subspec-&gt;caps) {</div><div class='ctx'> 			err = cap_enable_effective(subspec-&gt;caps, NULL);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				PRINT_FAIL("failed to set capabilities: %i, %s\n", err, strerror(err));</div><div class='add'>+				PRINT_FAIL("failed to set capabilities: %i, %s\n", err, strerror(-err));</div><div class='ctx'> 				goto subtest_cleanup;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1016,6 +1231,14 @@ void run_subtest(struct test_loader *tester,</div><div class='ctx'> 	emit_verifier_log(tester-&gt;log_buf, false /*force*/);</div><div class='ctx'> 	validate_msgs(tester-&gt;log_buf, &amp;subspec-&gt;expect_msgs, emit_verifier_log);</div><div class='ctx'> </div><div class='add'>+	/* Restore capabilities because the kernel will silently ignore requests</div><div class='add'>+	 * for program info (such as xlated program text) if we are not</div><div class='add'>+	 * bpf-capable. Also, for some reason test_verifier executes programs</div><div class='add'>+	 * with all capabilities restored. Do the same here.</div><div class='add'>+	 */</div><div class='add'>+	if (restore_capabilities(&amp;caps))</div><div class='add'>+		goto tobj_cleanup;</div><div class='add'>+</div><div class='ctx'> 	if (subspec-&gt;expect_xlated.cnt) {</div><div class='ctx'> 		err = get_xlated_program_text(bpf_program__fd(tprog),</div><div class='ctx'> 					      tester-&gt;log_buf, tester-&gt;log_buf_sz);</div><div class='hunk'>@@ -1041,12 +1264,6 @@ void run_subtest(struct test_loader *tester,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (should_do_test_run(spec, subspec)) {</div><div class='del'>-		/* For some reason test_verifier executes programs</div><div class='del'>-		 * with all capabilities restored. Do the same here.</div><div class='del'>-		 */</div><div class='del'>-		if (restore_capabilities(&amp;caps))</div><div class='del'>-			goto tobj_cleanup;</div><div class='del'>-</div><div class='ctx'> 		/* Do bpf_map__attach_struct_ops() for each struct_ops map.</div><div class='ctx'> 		 * This should trigger bpf_struct_ops-&gt;reg callback on kernel side.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1061,7 +1278,7 @@ void run_subtest(struct test_loader *tester,</div><div class='ctx'> 			link = bpf_map__attach_struct_ops(map);</div><div class='ctx'> 			if (!link) {</div><div class='ctx'> 				PRINT_FAIL("bpf_map__attach_struct_ops failed for map %s: err=%d\n",</div><div class='del'>-					   bpf_map__name(map), err);</div><div class='add'>+					   bpf_map__name(map), -errno);</div><div class='ctx'> 				goto tobj_cleanup;</div><div class='ctx'> 			}</div><div class='ctx'> 			links[links_cnt++] = link;</div><div class='hunk'>@@ -1075,12 +1292,38 @@ void run_subtest(struct test_loader *tester,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		do_prog_test_run(bpf_program__fd(tprog), &amp;retval,</div><div class='del'>-				 bpf_program__type(tprog) == BPF_PROG_TYPE_SYSCALL ? true : false);</div><div class='del'>-		if (retval != subspec-&gt;retval &amp;&amp; subspec-&gt;retval != POINTER_VALUE) {</div><div class='add'>+		err = do_prog_test_run(bpf_program__fd(tprog), &amp;retval,</div><div class='add'>+				       bpf_program__type(tprog) == BPF_PROG_TYPE_SYSCALL ? true : false,</div><div class='add'>+				       spec-&gt;linear_sz);</div><div class='add'>+		if (!err &amp;&amp; retval != subspec-&gt;retval &amp;&amp; subspec-&gt;retval != POINTER_VALUE) {</div><div class='ctx'> 			PRINT_FAIL("Unexpected retval: %d != %d\n", retval, subspec-&gt;retval);</div><div class='ctx'> 			goto tobj_cleanup;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (subspec-&gt;stderr.cnt) {</div><div class='add'>+			err = get_stream(2, bpf_program__fd(tprog),</div><div class='add'>+					 tester-&gt;log_buf, tester-&gt;log_buf_sz);</div><div class='add'>+			if (err &lt;= 0) {</div><div class='add'>+				PRINT_FAIL("Unexpected retval from get_stream(): %d, errno = %d\n",</div><div class='add'>+					   err, errno);</div><div class='add'>+				goto tobj_cleanup;</div><div class='add'>+			}</div><div class='add'>+			emit_stderr(tester-&gt;log_buf, false /*force*/);</div><div class='add'>+			validate_msgs(tester-&gt;log_buf, &amp;subspec-&gt;stderr, emit_stderr);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (subspec-&gt;stdout.cnt) {</div><div class='add'>+			err = get_stream(1, bpf_program__fd(tprog),</div><div class='add'>+					 tester-&gt;log_buf, tester-&gt;log_buf_sz);</div><div class='add'>+			if (err &lt;= 0) {</div><div class='add'>+				PRINT_FAIL("Unexpected retval from get_stream(): %d, errno = %d\n",</div><div class='add'>+					   err, errno);</div><div class='add'>+				goto tobj_cleanup;</div><div class='add'>+			}</div><div class='add'>+			emit_stdout(tester-&gt;log_buf, false /*force*/);</div><div class='add'>+			validate_msgs(tester-&gt;log_buf, &amp;subspec-&gt;stdout, emit_stdout);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* redo bpf_map__attach_struct_ops for each test */</div><div class='ctx'> 		while (links_cnt &gt; 0)</div><div class='ctx'> 			bpf_link__destroy(links[--links_cnt]);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_lru_map.c b/tools/testing/selftests/bpf/test_lru_map.c<br/>index fda7589c5023..0921939532c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_lru_map.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_lru_map.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_lru_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_lru_map.c</a></div><div class='hunk'>@@ -138,6 +138,18 @@ static int sched_next_online(int pid, int *next_to_try)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Derive target_free from map_size, same as bpf_common_lru_populate */</div><div class='add'>+static unsigned int __tgt_size(unsigned int map_size)</div><div class='add'>+{</div><div class='add'>+	return (map_size / nr_cpus) / 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Inverse of how bpf_common_lru_populate derives target_free from map_size. */</div><div class='add'>+static unsigned int __map_size(unsigned int tgt_free)</div><div class='add'>+{</div><div class='add'>+	return tgt_free * nr_cpus * 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Size of the LRU map is 2</div><div class='ctx'>  * Add key=1 (+1 key)</div><div class='ctx'>  * Add key=2 (+1 key)</div><div class='hunk'>@@ -231,11 +243,11 @@ static void test_lru_sanity0(int map_type, int map_flags)</div><div class='ctx'> 	printf("Pass\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Size of the LRU map is 1.5*tgt_free</div><div class='del'>- * Insert 1 to tgt_free (+tgt_free keys)</div><div class='del'>- * Lookup 1 to tgt_free/2</div><div class='del'>- * Insert 1+tgt_free to 2*tgt_free (+tgt_free keys)</div><div class='del'>- * =&gt; 1+tgt_free/2 to LOCALFREE_TARGET will be removed by LRU</div><div class='add'>+/* Verify that unreferenced elements are recycled before referenced ones.</div><div class='add'>+ * Insert elements.</div><div class='add'>+ * Reference a subset of these.</div><div class='add'>+ * Insert more, enough to trigger recycling.</div><div class='add'>+ * Verify that unreferenced are recycled.</div><div class='ctx'>  */</div><div class='ctx'> static void test_lru_sanity1(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> {</div><div class='hunk'>@@ -257,7 +269,7 @@ static void test_lru_sanity1(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> 	batch_size = tgt_free / 2;</div><div class='ctx'> 	assert(batch_size * 2 == tgt_free);</div><div class='ctx'> </div><div class='del'>-	map_size = tgt_free + batch_size;</div><div class='add'>+	map_size = __map_size(tgt_free) + batch_size;</div><div class='ctx'> 	lru_map_fd = create_map(map_type, map_flags, map_size);</div><div class='ctx'> 	assert(lru_map_fd != -1);</div><div class='ctx'> </div><div class='hunk'>@@ -266,13 +278,13 @@ static void test_lru_sanity1(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> </div><div class='ctx'> 	value[0] = 1234;</div><div class='ctx'> </div><div class='del'>-	/* Insert 1 to tgt_free (+tgt_free keys) */</div><div class='del'>-	end_key = 1 + tgt_free;</div><div class='add'>+	/* Insert map_size - batch_size keys */</div><div class='add'>+	end_key = 1 + __map_size(tgt_free);</div><div class='ctx'> 	for (key = 1; key &lt; end_key; key++)</div><div class='ctx'> 		assert(!bpf_map_update_elem(lru_map_fd, &amp;key, value,</div><div class='ctx'> 					    BPF_NOEXIST));</div><div class='ctx'> </div><div class='del'>-	/* Lookup 1 to tgt_free/2 */</div><div class='add'>+	/* Lookup 1 to batch_size */</div><div class='ctx'> 	end_key = 1 + batch_size;</div><div class='ctx'> 	for (key = 1; key &lt; end_key; key++) {</div><div class='ctx'> 		assert(!bpf_map_lookup_elem_with_ref_bit(lru_map_fd, key, value));</div><div class='hunk'>@@ -280,12 +292,13 @@ static void test_lru_sanity1(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> 					    BPF_NOEXIST));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Insert 1+tgt_free to 2*tgt_free</div><div class='del'>-	 * =&gt; 1+tgt_free/2 to LOCALFREE_TARGET will be</div><div class='add'>+	/* Insert another map_size - batch_size keys</div><div class='add'>+	 * Map will contain 1 to batch_size plus these latest, i.e.,</div><div class='add'>+	 * =&gt; previous 1+batch_size to map_size - batch_size will have been</div><div class='ctx'> 	 * removed by LRU</div><div class='ctx'> 	 */</div><div class='del'>-	key = 1 + tgt_free;</div><div class='del'>-	end_key = key + tgt_free;</div><div class='add'>+	key = 1 + __map_size(tgt_free);</div><div class='add'>+	end_key = key + __map_size(tgt_free);</div><div class='ctx'> 	for (; key &lt; end_key; key++) {</div><div class='ctx'> 		assert(!bpf_map_update_elem(lru_map_fd, &amp;key, value,</div><div class='ctx'> 					    BPF_NOEXIST));</div><div class='hunk'>@@ -301,17 +314,8 @@ static void test_lru_sanity1(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> 	printf("Pass\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Size of the LRU map 1.5 * tgt_free</div><div class='del'>- * Insert 1 to tgt_free (+tgt_free keys)</div><div class='del'>- * Update 1 to tgt_free/2</div><div class='del'>- *   =&gt; The original 1 to tgt_free/2 will be removed due to</div><div class='del'>- *      the LRU shrink process</div><div class='del'>- * Re-insert 1 to tgt_free/2 again and do a lookup immeidately</div><div class='del'>- * Insert 1+tgt_free to tgt_free*3/2</div><div class='del'>- * Insert 1+tgt_free*3/2 to tgt_free*5/2</div><div class='del'>- *   =&gt; Key 1+tgt_free to tgt_free*3/2</div><div class='del'>- *      will be removed from LRU because it has never</div><div class='del'>- *      been lookup and ref bit is not set</div><div class='add'>+/* Verify that insertions exceeding map size will recycle the oldest.</div><div class='add'>+ * Verify that unreferenced elements are recycled before referenced.</div><div class='ctx'>  */</div><div class='ctx'> static void test_lru_sanity2(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> {</div><div class='hunk'>@@ -334,7 +338,7 @@ static void test_lru_sanity2(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> 	batch_size = tgt_free / 2;</div><div class='ctx'> 	assert(batch_size * 2 == tgt_free);</div><div class='ctx'> </div><div class='del'>-	map_size = tgt_free + batch_size;</div><div class='add'>+	map_size = __map_size(tgt_free) + batch_size;</div><div class='ctx'> 	lru_map_fd = create_map(map_type, map_flags, map_size);</div><div class='ctx'> 	assert(lru_map_fd != -1);</div><div class='ctx'> </div><div class='hunk'>@@ -343,8 +347,8 @@ static void test_lru_sanity2(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> </div><div class='ctx'> 	value[0] = 1234;</div><div class='ctx'> </div><div class='del'>-	/* Insert 1 to tgt_free (+tgt_free keys) */</div><div class='del'>-	end_key = 1 + tgt_free;</div><div class='add'>+	/* Insert map_size - batch_size keys */</div><div class='add'>+	end_key = 1 + __map_size(tgt_free);</div><div class='ctx'> 	for (key = 1; key &lt; end_key; key++)</div><div class='ctx'> 		assert(!bpf_map_update_elem(lru_map_fd, &amp;key, value,</div><div class='ctx'> 					    BPF_NOEXIST));</div><div class='hunk'>@@ -357,8 +361,7 @@ static void test_lru_sanity2(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> 	 * shrink the inactive list to get tgt_free</div><div class='ctx'> 	 * number of free nodes.</div><div class='ctx'> 	 *</div><div class='del'>-	 * Hence, the oldest key 1 to tgt_free/2</div><div class='del'>-	 * are removed from the LRU list.</div><div class='add'>+	 * Hence, the oldest key is removed from the LRU list.</div><div class='ctx'> 	 */</div><div class='ctx'> 	key = 1;</div><div class='ctx'> 	if (map_type == BPF_MAP_TYPE_LRU_PERCPU_HASH) {</div><div class='hunk'>@@ -370,8 +373,7 @@ static void test_lru_sanity2(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> 					   BPF_EXIST));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Re-insert 1 to tgt_free/2 again and do a lookup</div><div class='del'>-	 * immeidately.</div><div class='add'>+	/* Re-insert 1 to batch_size again and do a lookup immediately.</div><div class='ctx'> 	 */</div><div class='ctx'> 	end_key = 1 + batch_size;</div><div class='ctx'> 	value[0] = 4321;</div><div class='hunk'>@@ -387,17 +389,18 @@ static void test_lru_sanity2(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> </div><div class='ctx'> 	value[0] = 1234;</div><div class='ctx'> </div><div class='del'>-	/* Insert 1+tgt_free to tgt_free*3/2 */</div><div class='del'>-	end_key = 1 + tgt_free + batch_size;</div><div class='del'>-	for (key = 1 + tgt_free; key &lt; end_key; key++)</div><div class='add'>+	/* Insert batch_size new elements */</div><div class='add'>+	key = 1 + __map_size(tgt_free);</div><div class='add'>+	end_key = key + batch_size;</div><div class='add'>+	for (; key &lt; end_key; key++)</div><div class='ctx'> 		/* These newly added but not referenced keys will be</div><div class='ctx'> 		 * gone during the next LRU shrink.</div><div class='ctx'> 		 */</div><div class='ctx'> 		assert(!bpf_map_update_elem(lru_map_fd, &amp;key, value,</div><div class='ctx'> 					    BPF_NOEXIST));</div><div class='ctx'> </div><div class='del'>-	/* Insert 1+tgt_free*3/2 to  tgt_free*5/2 */</div><div class='del'>-	end_key = key + tgt_free;</div><div class='add'>+	/* Insert map_size - batch_size elements */</div><div class='add'>+	end_key += __map_size(tgt_free);</div><div class='ctx'> 	for (; key &lt; end_key; key++) {</div><div class='ctx'> 		assert(!bpf_map_update_elem(lru_map_fd, &amp;key, value,</div><div class='ctx'> 					    BPF_NOEXIST));</div><div class='hunk'>@@ -413,12 +416,12 @@ static void test_lru_sanity2(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> 	printf("Pass\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Size of the LRU map is 2*tgt_free</div><div class='del'>- * It is to test the active/inactive list rotation</div><div class='del'>- * Insert 1 to 2*tgt_free (+2*tgt_free keys)</div><div class='del'>- * Lookup key 1 to tgt_free*3/2</div><div class='del'>- * Add 1+2*tgt_free to tgt_free*5/2 (+tgt_free/2 keys)</div><div class='del'>- *  =&gt; key 1+tgt_free*3/2 to 2*tgt_free are removed from LRU</div><div class='add'>+/* Test the active/inactive list rotation</div><div class='add'>+ *</div><div class='add'>+ * Fill the whole map, deplete the free list.</div><div class='add'>+ * Reference all except the last lru-&gt;target_free elements.</div><div class='add'>+ * Insert lru-&gt;target_free new elements. This triggers one shrink.</div><div class='add'>+ * Verify that the non-referenced elements are replaced.</div><div class='ctx'>  */</div><div class='ctx'> static void test_lru_sanity3(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> {</div><div class='hunk'>@@ -437,8 +440,7 @@ static void test_lru_sanity3(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> </div><div class='ctx'> 	assert(sched_next_online(0, &amp;next_cpu) != -1);</div><div class='ctx'> </div><div class='del'>-	batch_size = tgt_free / 2;</div><div class='del'>-	assert(batch_size * 2 == tgt_free);</div><div class='add'>+	batch_size = __tgt_size(tgt_free);</div><div class='ctx'> </div><div class='ctx'> 	map_size = tgt_free * 2;</div><div class='ctx'> 	lru_map_fd = create_map(map_type, map_flags, map_size);</div><div class='hunk'>@@ -449,23 +451,21 @@ static void test_lru_sanity3(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> </div><div class='ctx'> 	value[0] = 1234;</div><div class='ctx'> </div><div class='del'>-	/* Insert 1 to 2*tgt_free (+2*tgt_free keys) */</div><div class='del'>-	end_key = 1 + (2 * tgt_free);</div><div class='add'>+	/* Fill the map */</div><div class='add'>+	end_key = 1 + map_size;</div><div class='ctx'> 	for (key = 1; key &lt; end_key; key++)</div><div class='ctx'> 		assert(!bpf_map_update_elem(lru_map_fd, &amp;key, value,</div><div class='ctx'> 					    BPF_NOEXIST));</div><div class='ctx'> </div><div class='del'>-	/* Lookup key 1 to tgt_free*3/2 */</div><div class='del'>-	end_key = tgt_free + batch_size;</div><div class='add'>+	/* Reference all but the last batch_size */</div><div class='add'>+	end_key = 1 + map_size - batch_size;</div><div class='ctx'> 	for (key = 1; key &lt; end_key; key++) {</div><div class='ctx'> 		assert(!bpf_map_lookup_elem_with_ref_bit(lru_map_fd, key, value));</div><div class='ctx'> 		assert(!bpf_map_update_elem(expected_map_fd, &amp;key, value,</div><div class='ctx'> 					    BPF_NOEXIST));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Add 1+2*tgt_free to tgt_free*5/2</div><div class='del'>-	 * (+tgt_free/2 keys)</div><div class='del'>-	 */</div><div class='add'>+	/* Insert new batch_size: replaces the non-referenced elements */</div><div class='ctx'> 	key = 2 * tgt_free + 1;</div><div class='ctx'> 	end_key = key + batch_size;</div><div class='ctx'> 	for (; key &lt; end_key; key++) {</div><div class='hunk'>@@ -500,7 +500,8 @@ static void test_lru_sanity4(int map_type, int map_flags, unsigned int tgt_free)</div><div class='ctx'> 		lru_map_fd = create_map(map_type, map_flags,</div><div class='ctx'> 					3 * tgt_free * nr_cpus);</div><div class='ctx'> 	else</div><div class='del'>-		lru_map_fd = create_map(map_type, map_flags, 3 * tgt_free);</div><div class='add'>+		lru_map_fd = create_map(map_type, map_flags,</div><div class='add'>+					3 * __map_size(tgt_free));</div><div class='ctx'> 	assert(lru_map_fd != -1);</div><div class='ctx'> </div><div class='ctx'> 	expected_map_fd = create_map(BPF_MAP_TYPE_HASH, 0,</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_lwt_ip_encap.sh b/tools/testing/selftests/bpf/test_lwt_ip_encap.sh<br/>deleted file mode 100755<br/>index 1e565f47aca9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_lwt_ip_encap.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_lwt_ip_encap.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,476 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#</div><div class='del'>-# Setup/topology:</div><div class='del'>-#</div><div class='del'>-#    NS1             NS2             NS3</div><div class='del'>-#   veth1 &lt;---&gt; veth2   veth3 &lt;---&gt; veth4 (the top route)</div><div class='del'>-#   veth5 &lt;---&gt; veth6   veth7 &lt;---&gt; veth8 (the bottom route)</div><div class='del'>-#</div><div class='del'>-#   each vethN gets IPv[4|6]_N address</div><div class='del'>-#</div><div class='del'>-#   IPv*_SRC = IPv*_1</div><div class='del'>-#   IPv*_DST = IPv*_4</div><div class='del'>-#</div><div class='del'>-#   all tests test pings from IPv*_SRC to IPv*_DST</div><div class='del'>-#</div><div class='del'>-#   by default, routes are configured to allow packets to go</div><div class='del'>-#   IP*_1 &lt;=&gt; IP*_2 &lt;=&gt; IP*_3 &lt;=&gt; IP*_4 (the top route)</div><div class='del'>-#</div><div class='del'>-#   a GRE device is installed in NS3 with IPv*_GRE, and</div><div class='del'>-#   NS1/NS2 are configured to route packets to IPv*_GRE via IP*_8</div><div class='del'>-#   (the bottom route)</div><div class='del'>-#</div><div class='del'>-# Tests:</div><div class='del'>-#</div><div class='del'>-#   1. routes NS2-&gt;IPv*_DST are brought down, so the only way a ping</div><div class='del'>-#      from IP*_SRC to IP*_DST can work is via IPv*_GRE</div><div class='del'>-#</div><div class='del'>-#   2a. in an egress test, a bpf LWT_XMIT program is installed on veth1</div><div class='del'>-#       that encaps the packets with an IP/GRE header to route to IPv*_GRE</div><div class='del'>-#</div><div class='del'>-#       ping: SRC-&gt;[encap at veth1:egress]-&gt;GRE:decap-&gt;DST</div><div class='del'>-#       ping replies go DST-&gt;SRC directly</div><div class='del'>-#</div><div class='del'>-#   2b. in an ingress test, a bpf LWT_IN program is installed on veth2</div><div class='del'>-#       that encaps the packets with an IP/GRE header to route to IPv*_GRE</div><div class='del'>-#</div><div class='del'>-#       ping: SRC-&gt;[encap at veth2:ingress]-&gt;GRE:decap-&gt;DST</div><div class='del'>-#       ping replies go DST-&gt;SRC directly</div><div class='del'>-</div><div class='del'>-BPF_FILE="test_lwt_ip_encap.bpf.o"</div><div class='del'>-if [[ $EUID -ne 0 ]]; then</div><div class='del'>-	echo "This script must be run as root"</div><div class='del'>-	echo "FAIL"</div><div class='del'>-	exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-readonly NS1="ns1-$(mktemp -u XXXXXX)"</div><div class='del'>-readonly NS2="ns2-$(mktemp -u XXXXXX)"</div><div class='del'>-readonly NS3="ns3-$(mktemp -u XXXXXX)"</div><div class='del'>-</div><div class='del'>-readonly IPv4_1="172.16.1.100"</div><div class='del'>-readonly IPv4_2="172.16.2.100"</div><div class='del'>-readonly IPv4_3="172.16.3.100"</div><div class='del'>-readonly IPv4_4="172.16.4.100"</div><div class='del'>-readonly IPv4_5="172.16.5.100"</div><div class='del'>-readonly IPv4_6="172.16.6.100"</div><div class='del'>-readonly IPv4_7="172.16.7.100"</div><div class='del'>-readonly IPv4_8="172.16.8.100"</div><div class='del'>-readonly IPv4_GRE="172.16.16.100"</div><div class='del'>-</div><div class='del'>-readonly IPv4_SRC=$IPv4_1</div><div class='del'>-readonly IPv4_DST=$IPv4_4</div><div class='del'>-</div><div class='del'>-readonly IPv6_1="fb01::1"</div><div class='del'>-readonly IPv6_2="fb02::1"</div><div class='del'>-readonly IPv6_3="fb03::1"</div><div class='del'>-readonly IPv6_4="fb04::1"</div><div class='del'>-readonly IPv6_5="fb05::1"</div><div class='del'>-readonly IPv6_6="fb06::1"</div><div class='del'>-readonly IPv6_7="fb07::1"</div><div class='del'>-readonly IPv6_8="fb08::1"</div><div class='del'>-readonly IPv6_GRE="fb10::1"</div><div class='del'>-</div><div class='del'>-readonly IPv6_SRC=$IPv6_1</div><div class='del'>-readonly IPv6_DST=$IPv6_4</div><div class='del'>-</div><div class='del'>-TEST_STATUS=0</div><div class='del'>-TESTS_SUCCEEDED=0</div><div class='del'>-TESTS_FAILED=0</div><div class='del'>-</div><div class='del'>-TMPFILE=""</div><div class='del'>-</div><div class='del'>-process_test_results()</div><div class='del'>-{</div><div class='del'>-	if [[ "${TEST_STATUS}" -eq 0 ]] ; then</div><div class='del'>-		echo "PASS"</div><div class='del'>-		TESTS_SUCCEEDED=$((TESTS_SUCCEEDED+1))</div><div class='del'>-	else</div><div class='del'>-		echo "FAIL"</div><div class='del'>-		TESTS_FAILED=$((TESTS_FAILED+1))</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-print_test_summary_and_exit()</div><div class='del'>-{</div><div class='del'>-	echo "passed tests: ${TESTS_SUCCEEDED}"</div><div class='del'>-	echo "failed tests: ${TESTS_FAILED}"</div><div class='del'>-	if [ "${TESTS_FAILED}" -eq "0" ] ; then</div><div class='del'>-		exit 0</div><div class='del'>-	else</div><div class='del'>-		exit 1</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-setup()</div><div class='del'>-{</div><div class='del'>-	set -e  # exit on error</div><div class='del'>-	TEST_STATUS=0</div><div class='del'>-</div><div class='del'>-	# create devices and namespaces</div><div class='del'>-	ip netns add "${NS1}"</div><div class='del'>-	ip netns add "${NS2}"</div><div class='del'>-	ip netns add "${NS3}"</div><div class='del'>-</div><div class='del'>-	# rp_filter gets confused by what these tests are doing, so disable it</div><div class='del'>-	ip netns exec ${NS1} sysctl -wq net.ipv4.conf.all.rp_filter=0</div><div class='del'>-	ip netns exec ${NS2} sysctl -wq net.ipv4.conf.all.rp_filter=0</div><div class='del'>-	ip netns exec ${NS3} sysctl -wq net.ipv4.conf.all.rp_filter=0</div><div class='del'>-	ip netns exec ${NS1} sysctl -wq net.ipv4.conf.default.rp_filter=0</div><div class='del'>-	ip netns exec ${NS2} sysctl -wq net.ipv4.conf.default.rp_filter=0</div><div class='del'>-	ip netns exec ${NS3} sysctl -wq net.ipv4.conf.default.rp_filter=0</div><div class='del'>-</div><div class='del'>-	# disable IPv6 DAD because it sometimes takes too long and fails tests</div><div class='del'>-	ip netns exec ${NS1} sysctl -wq net.ipv6.conf.all.accept_dad=0</div><div class='del'>-	ip netns exec ${NS2} sysctl -wq net.ipv6.conf.all.accept_dad=0</div><div class='del'>-	ip netns exec ${NS3} sysctl -wq net.ipv6.conf.all.accept_dad=0</div><div class='del'>-	ip netns exec ${NS1} sysctl -wq net.ipv6.conf.default.accept_dad=0</div><div class='del'>-	ip netns exec ${NS2} sysctl -wq net.ipv6.conf.default.accept_dad=0</div><div class='del'>-	ip netns exec ${NS3} sysctl -wq net.ipv6.conf.default.accept_dad=0</div><div class='del'>-</div><div class='del'>-	ip link add veth1 type veth peer name veth2</div><div class='del'>-	ip link add veth3 type veth peer name veth4</div><div class='del'>-	ip link add veth5 type veth peer name veth6</div><div class='del'>-	ip link add veth7 type veth peer name veth8</div><div class='del'>-</div><div class='del'>-	ip netns exec ${NS2} sysctl -wq net.ipv4.ip_forward=1</div><div class='del'>-	ip netns exec ${NS2} sysctl -wq net.ipv6.conf.all.forwarding=1</div><div class='del'>-</div><div class='del'>-	ip link set veth1 netns ${NS1}</div><div class='del'>-	ip link set veth2 netns ${NS2}</div><div class='del'>-	ip link set veth3 netns ${NS2}</div><div class='del'>-	ip link set veth4 netns ${NS3}</div><div class='del'>-	ip link set veth5 netns ${NS1}</div><div class='del'>-	ip link set veth6 netns ${NS2}</div><div class='del'>-	ip link set veth7 netns ${NS2}</div><div class='del'>-	ip link set veth8 netns ${NS3}</div><div class='del'>-</div><div class='del'>-	if [ ! -z "${VRF}" ] ; then</div><div class='del'>-		ip -netns ${NS1} link add red type vrf table 1001</div><div class='del'>-		ip -netns ${NS1} link set red up</div><div class='del'>-		ip -netns ${NS1} route add table 1001 unreachable default metric 8192</div><div class='del'>-		ip -netns ${NS1} -6 route add table 1001 unreachable default metric 8192</div><div class='del'>-		ip -netns ${NS1} link set veth1 vrf red</div><div class='del'>-		ip -netns ${NS1} link set veth5 vrf red</div><div class='del'>-</div><div class='del'>-		ip -netns ${NS2} link add red type vrf table 1001</div><div class='del'>-		ip -netns ${NS2} link set red up</div><div class='del'>-		ip -netns ${NS2} route add table 1001 unreachable default metric 8192</div><div class='del'>-		ip -netns ${NS2} -6 route add table 1001 unreachable default metric 8192</div><div class='del'>-		ip -netns ${NS2} link set veth2 vrf red</div><div class='del'>-		ip -netns ${NS2} link set veth3 vrf red</div><div class='del'>-		ip -netns ${NS2} link set veth6 vrf red</div><div class='del'>-		ip -netns ${NS2} link set veth7 vrf red</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# configure addesses: the top route (1-2-3-4)</div><div class='del'>-	ip -netns ${NS1}    addr add ${IPv4_1}/24  dev veth1</div><div class='del'>-	ip -netns ${NS2}    addr add ${IPv4_2}/24  dev veth2</div><div class='del'>-	ip -netns ${NS2}    addr add ${IPv4_3}/24  dev veth3</div><div class='del'>-	ip -netns ${NS3}    addr add ${IPv4_4}/24  dev veth4</div><div class='del'>-	ip -netns ${NS1} -6 addr add ${IPv6_1}/128 nodad dev veth1</div><div class='del'>-	ip -netns ${NS2} -6 addr add ${IPv6_2}/128 nodad dev veth2</div><div class='del'>-	ip -netns ${NS2} -6 addr add ${IPv6_3}/128 nodad dev veth3</div><div class='del'>-	ip -netns ${NS3} -6 addr add ${IPv6_4}/128 nodad dev veth4</div><div class='del'>-</div><div class='del'>-	# configure addresses: the bottom route (5-6-7-8)</div><div class='del'>-	ip -netns ${NS1}    addr add ${IPv4_5}/24  dev veth5</div><div class='del'>-	ip -netns ${NS2}    addr add ${IPv4_6}/24  dev veth6</div><div class='del'>-	ip -netns ${NS2}    addr add ${IPv4_7}/24  dev veth7</div><div class='del'>-	ip -netns ${NS3}    addr add ${IPv4_8}/24  dev veth8</div><div class='del'>-	ip -netns ${NS1} -6 addr add ${IPv6_5}/128 nodad dev veth5</div><div class='del'>-	ip -netns ${NS2} -6 addr add ${IPv6_6}/128 nodad dev veth6</div><div class='del'>-	ip -netns ${NS2} -6 addr add ${IPv6_7}/128 nodad dev veth7</div><div class='del'>-	ip -netns ${NS3} -6 addr add ${IPv6_8}/128 nodad dev veth8</div><div class='del'>-</div><div class='del'>-	ip -netns ${NS1} link set dev veth1 up</div><div class='del'>-	ip -netns ${NS2} link set dev veth2 up</div><div class='del'>-	ip -netns ${NS2} link set dev veth3 up</div><div class='del'>-	ip -netns ${NS3} link set dev veth4 up</div><div class='del'>-	ip -netns ${NS1} link set dev veth5 up</div><div class='del'>-	ip -netns ${NS2} link set dev veth6 up</div><div class='del'>-	ip -netns ${NS2} link set dev veth7 up</div><div class='del'>-	ip -netns ${NS3} link set dev veth8 up</div><div class='del'>-</div><div class='del'>-	# configure routes: IP*_SRC -&gt; veth1/IP*_2 (= top route) default;</div><div class='del'>-	# the bottom route to specific bottom addresses</div><div class='del'>-</div><div class='del'>-	# NS1</div><div class='del'>-	# top route</div><div class='del'>-	ip -netns ${NS1}    route add ${IPv4_2}/32  dev veth1 ${VRF}</div><div class='del'>-	ip -netns ${NS1}    route add default dev veth1 via ${IPv4_2} ${VRF}  # go top by default</div><div class='del'>-	ip -netns ${NS1} -6 route add ${IPv6_2}/128 dev veth1 ${VRF}</div><div class='del'>-	ip -netns ${NS1} -6 route add default dev veth1 via ${IPv6_2} ${VRF}  # go top by default</div><div class='del'>-	# bottom route</div><div class='del'>-	ip -netns ${NS1}    route add ${IPv4_6}/32  dev veth5 ${VRF}</div><div class='del'>-	ip -netns ${NS1}    route add ${IPv4_7}/32  dev veth5 via ${IPv4_6} ${VRF}</div><div class='del'>-	ip -netns ${NS1}    route add ${IPv4_8}/32  dev veth5 via ${IPv4_6} ${VRF}</div><div class='del'>-	ip -netns ${NS1} -6 route add ${IPv6_6}/128 dev veth5 ${VRF}</div><div class='del'>-	ip -netns ${NS1} -6 route add ${IPv6_7}/128 dev veth5 via ${IPv6_6} ${VRF}</div><div class='del'>-	ip -netns ${NS1} -6 route add ${IPv6_8}/128 dev veth5 via ${IPv6_6} ${VRF}</div><div class='del'>-</div><div class='del'>-	# NS2</div><div class='del'>-	# top route</div><div class='del'>-	ip -netns ${NS2}    route add ${IPv4_1}/32  dev veth2 ${VRF}</div><div class='del'>-	ip -netns ${NS2}    route add ${IPv4_4}/32  dev veth3 ${VRF}</div><div class='del'>-	ip -netns ${NS2} -6 route add ${IPv6_1}/128 dev veth2 ${VRF}</div><div class='del'>-	ip -netns ${NS2} -6 route add ${IPv6_4}/128 dev veth3 ${VRF}</div><div class='del'>-	# bottom route</div><div class='del'>-	ip -netns ${NS2}    route add ${IPv4_5}/32  dev veth6 ${VRF}</div><div class='del'>-	ip -netns ${NS2}    route add ${IPv4_8}/32  dev veth7 ${VRF}</div><div class='del'>-	ip -netns ${NS2} -6 route add ${IPv6_5}/128 dev veth6 ${VRF}</div><div class='del'>-	ip -netns ${NS2} -6 route add ${IPv6_8}/128 dev veth7 ${VRF}</div><div class='del'>-</div><div class='del'>-	# NS3</div><div class='del'>-	# top route</div><div class='del'>-	ip -netns ${NS3}    route add ${IPv4_3}/32  dev veth4</div><div class='del'>-	ip -netns ${NS3}    route add ${IPv4_1}/32  dev veth4 via ${IPv4_3}</div><div class='del'>-	ip -netns ${NS3}    route add ${IPv4_2}/32  dev veth4 via ${IPv4_3}</div><div class='del'>-	ip -netns ${NS3} -6 route add ${IPv6_3}/128 dev veth4</div><div class='del'>-	ip -netns ${NS3} -6 route add ${IPv6_1}/128 dev veth4 via ${IPv6_3}</div><div class='del'>-	ip -netns ${NS3} -6 route add ${IPv6_2}/128 dev veth4 via ${IPv6_3}</div><div class='del'>-	# bottom route</div><div class='del'>-	ip -netns ${NS3}    route add ${IPv4_7}/32  dev veth8</div><div class='del'>-	ip -netns ${NS3}    route add ${IPv4_5}/32  dev veth8 via ${IPv4_7}</div><div class='del'>-	ip -netns ${NS3}    route add ${IPv4_6}/32  dev veth8 via ${IPv4_7}</div><div class='del'>-	ip -netns ${NS3} -6 route add ${IPv6_7}/128 dev veth8</div><div class='del'>-	ip -netns ${NS3} -6 route add ${IPv6_5}/128 dev veth8 via ${IPv6_7}</div><div class='del'>-	ip -netns ${NS3} -6 route add ${IPv6_6}/128 dev veth8 via ${IPv6_7}</div><div class='del'>-</div><div class='del'>-	# configure IPv4 GRE device in NS3, and a route to it via the "bottom" route</div><div class='del'>-	ip -netns ${NS3} tunnel add gre_dev mode gre remote ${IPv4_1} local ${IPv4_GRE} ttl 255</div><div class='del'>-	ip -netns ${NS3} link set gre_dev up</div><div class='del'>-	ip -netns ${NS3} addr add ${IPv4_GRE} dev gre_dev</div><div class='del'>-	ip -netns ${NS1} route add ${IPv4_GRE}/32 dev veth5 via ${IPv4_6} ${VRF}</div><div class='del'>-	ip -netns ${NS2} route add ${IPv4_GRE}/32 dev veth7 via ${IPv4_8} ${VRF}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	# configure IPv6 GRE device in NS3, and a route to it via the "bottom" route</div><div class='del'>-	ip -netns ${NS3} -6 tunnel add name gre6_dev mode ip6gre remote ${IPv6_1} local ${IPv6_GRE} ttl 255</div><div class='del'>-	ip -netns ${NS3} link set gre6_dev up</div><div class='del'>-	ip -netns ${NS3} -6 addr add ${IPv6_GRE} nodad dev gre6_dev</div><div class='del'>-	ip -netns ${NS1} -6 route add ${IPv6_GRE}/128 dev veth5 via ${IPv6_6} ${VRF}</div><div class='del'>-	ip -netns ${NS2} -6 route add ${IPv6_GRE}/128 dev veth7 via ${IPv6_8} ${VRF}</div><div class='del'>-</div><div class='del'>-	TMPFILE=$(mktemp /tmp/test_lwt_ip_encap.XXXXXX)</div><div class='del'>-</div><div class='del'>-	sleep 1  # reduce flakiness</div><div class='del'>-	set +e</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-cleanup()</div><div class='del'>-{</div><div class='del'>-	if [ -f ${TMPFILE} ] ; then</div><div class='del'>-		rm ${TMPFILE}</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	ip netns del ${NS1} 2&gt; /dev/null</div><div class='del'>-	ip netns del ${NS2} 2&gt; /dev/null</div><div class='del'>-	ip netns del ${NS3} 2&gt; /dev/null</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-trap cleanup EXIT</div><div class='del'>-</div><div class='del'>-remove_routes_to_gredev()</div><div class='del'>-{</div><div class='del'>-	ip -netns ${NS1} route del ${IPv4_GRE} dev veth5 ${VRF}</div><div class='del'>-	ip -netns ${NS2} route del ${IPv4_GRE} dev veth7 ${VRF}</div><div class='del'>-	ip -netns ${NS1} -6 route del ${IPv6_GRE}/128 dev veth5 ${VRF}</div><div class='del'>-	ip -netns ${NS2} -6 route del ${IPv6_GRE}/128 dev veth7 ${VRF}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-add_unreachable_routes_to_gredev()</div><div class='del'>-{</div><div class='del'>-	ip -netns ${NS1} route add unreachable ${IPv4_GRE}/32 ${VRF}</div><div class='del'>-	ip -netns ${NS2} route add unreachable ${IPv4_GRE}/32 ${VRF}</div><div class='del'>-	ip -netns ${NS1} -6 route add unreachable ${IPv6_GRE}/128 ${VRF}</div><div class='del'>-	ip -netns ${NS2} -6 route add unreachable ${IPv6_GRE}/128 ${VRF}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_ping()</div><div class='del'>-{</div><div class='del'>-	local readonly PROTO=$1</div><div class='del'>-	local readonly EXPECTED=$2</div><div class='del'>-	local RET=0</div><div class='del'>-</div><div class='del'>-	if [ "${PROTO}" == "IPv4" ] ; then</div><div class='del'>-		ip netns exec ${NS1} ping  -c 1 -W 1 -I veth1 ${IPv4_DST} 2&gt;&amp;1 &gt; /dev/null</div><div class='del'>-		RET=$?</div><div class='del'>-	elif [ "${PROTO}" == "IPv6" ] ; then</div><div class='del'>-		ip netns exec ${NS1} ping6 -c 1 -W 1 -I veth1 ${IPv6_DST} 2&gt;&amp;1 &gt; /dev/null</div><div class='del'>-		RET=$?</div><div class='del'>-	else</div><div class='del'>-		echo "    test_ping: unknown PROTO: ${PROTO}"</div><div class='del'>-		TEST_STATUS=1</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if [ "0" != "${RET}" ]; then</div><div class='del'>-		RET=1</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if [ "${EXPECTED}" != "${RET}" ] ; then</div><div class='del'>-		echo "    test_ping failed: expected: ${EXPECTED}; got ${RET}"</div><div class='del'>-		TEST_STATUS=1</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_gso()</div><div class='del'>-{</div><div class='del'>-	local readonly PROTO=$1</div><div class='del'>-	local readonly PKT_SZ=5000</div><div class='del'>-	local IP_DST=""</div><div class='del'>-	: &gt; ${TMPFILE}  # trim the capture file</div><div class='del'>-</div><div class='del'>-	# check that nc is present</div><div class='del'>-	command -v nc &gt;/dev/null 2&gt;&amp;1 || \</div><div class='del'>-		{ echo &gt;&amp;2 "nc is not available: skipping TSO tests"; return; }</div><div class='del'>-</div><div class='del'>-	# listen on port 9000, capture TCP into $TMPFILE</div><div class='del'>-	if [ "${PROTO}" == "IPv4" ] ; then</div><div class='del'>-		IP_DST=${IPv4_DST}</div><div class='del'>-		ip netns exec ${NS3} bash -c \</div><div class='del'>-			"nc -4 -l -p 9000 &gt; ${TMPFILE} &amp;"</div><div class='del'>-	elif [ "${PROTO}" == "IPv6" ] ; then</div><div class='del'>-		IP_DST=${IPv6_DST}</div><div class='del'>-		ip netns exec ${NS3} bash -c \</div><div class='del'>-			"nc -6 -l -p 9000 &gt; ${TMPFILE} &amp;"</div><div class='del'>-		RET=$?</div><div class='del'>-	else</div><div class='del'>-		echo "    test_gso: unknown PROTO: ${PROTO}"</div><div class='del'>-		TEST_STATUS=1</div><div class='del'>-	fi</div><div class='del'>-	sleep 1  # let nc start listening</div><div class='del'>-</div><div class='del'>-	# send a packet larger than MTU</div><div class='del'>-	ip netns exec ${NS1} bash -c \</div><div class='del'>-		"dd if=/dev/zero bs=$PKT_SZ count=1 &gt; /dev/tcp/${IP_DST}/9000 2&gt;/dev/null"</div><div class='del'>-	sleep 2 # let the packet get delivered</div><div class='del'>-</div><div class='del'>-	# verify we received all expected bytes</div><div class='del'>-	SZ=$(stat -c %s ${TMPFILE})</div><div class='del'>-	if [ "$SZ" != "$PKT_SZ" ] ; then</div><div class='del'>-		echo "    test_gso failed: ${PROTO}"</div><div class='del'>-		TEST_STATUS=1</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_egress()</div><div class='del'>-{</div><div class='del'>-	local readonly ENCAP=$1</div><div class='del'>-	echo "starting egress ${ENCAP} encap test ${VRF}"</div><div class='del'>-	setup</div><div class='del'>-</div><div class='del'>-	# by default, pings work</div><div class='del'>-	test_ping IPv4 0</div><div class='del'>-	test_ping IPv6 0</div><div class='del'>-</div><div class='del'>-	# remove NS2-&gt;DST routes, ping fails</div><div class='del'>-	ip -netns ${NS2}    route del ${IPv4_DST}/32  dev veth3 ${VRF}</div><div class='del'>-	ip -netns ${NS2} -6 route del ${IPv6_DST}/128 dev veth3 ${VRF}</div><div class='del'>-	test_ping IPv4 1</div><div class='del'>-	test_ping IPv6 1</div><div class='del'>-</div><div class='del'>-	# install replacement routes (LWT/eBPF), pings succeed</div><div class='del'>-	if [ "${ENCAP}" == "IPv4" ] ; then</div><div class='del'>-		ip -netns ${NS1} route add ${IPv4_DST} encap bpf xmit obj \</div><div class='del'>-			${BPF_FILE} sec encap_gre dev veth1 ${VRF}</div><div class='del'>-		ip -netns ${NS1} -6 route add ${IPv6_DST} encap bpf xmit obj \</div><div class='del'>-			${BPF_FILE} sec encap_gre dev veth1 ${VRF}</div><div class='del'>-	elif [ "${ENCAP}" == "IPv6" ] ; then</div><div class='del'>-		ip -netns ${NS1} route add ${IPv4_DST} encap bpf xmit obj \</div><div class='del'>-			${BPF_FILE} sec encap_gre6 dev veth1 ${VRF}</div><div class='del'>-		ip -netns ${NS1} -6 route add ${IPv6_DST} encap bpf xmit obj \</div><div class='del'>-			${BPF_FILE} sec encap_gre6 dev veth1 ${VRF}</div><div class='del'>-	else</div><div class='del'>-		echo "    unknown encap ${ENCAP}"</div><div class='del'>-		TEST_STATUS=1</div><div class='del'>-	fi</div><div class='del'>-	test_ping IPv4 0</div><div class='del'>-	test_ping IPv6 0</div><div class='del'>-</div><div class='del'>-	# skip GSO tests with VRF: VRF routing needs properly assigned</div><div class='del'>-	# source IP/device, which is easy to do with ping and hard with dd/nc.</div><div class='del'>-	if [ -z "${VRF}" ] ; then</div><div class='del'>-		test_gso IPv4</div><div class='del'>-		test_gso IPv6</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# a negative test: remove routes to GRE devices: ping fails</div><div class='del'>-	remove_routes_to_gredev</div><div class='del'>-	test_ping IPv4 1</div><div class='del'>-	test_ping IPv6 1</div><div class='del'>-</div><div class='del'>-	# another negative test</div><div class='del'>-	add_unreachable_routes_to_gredev</div><div class='del'>-	test_ping IPv4 1</div><div class='del'>-	test_ping IPv6 1</div><div class='del'>-</div><div class='del'>-	cleanup</div><div class='del'>-	process_test_results</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_ingress()</div><div class='del'>-{</div><div class='del'>-	local readonly ENCAP=$1</div><div class='del'>-	echo "starting ingress ${ENCAP} encap test ${VRF}"</div><div class='del'>-	setup</div><div class='del'>-</div><div class='del'>-	# need to wait a bit for IPv6 to autoconf, otherwise</div><div class='del'>-	# ping6 sometimes fails with "unable to bind to address"</div><div class='del'>-</div><div class='del'>-	# by default, pings work</div><div class='del'>-	test_ping IPv4 0</div><div class='del'>-	test_ping IPv6 0</div><div class='del'>-</div><div class='del'>-	# remove NS2-&gt;DST routes, pings fail</div><div class='del'>-	ip -netns ${NS2}    route del ${IPv4_DST}/32  dev veth3 ${VRF}</div><div class='del'>-	ip -netns ${NS2} -6 route del ${IPv6_DST}/128 dev veth3 ${VRF}</div><div class='del'>-	test_ping IPv4 1</div><div class='del'>-	test_ping IPv6 1</div><div class='del'>-</div><div class='del'>-	# install replacement routes (LWT/eBPF), pings succeed</div><div class='del'>-	if [ "${ENCAP}" == "IPv4" ] ; then</div><div class='del'>-		ip -netns ${NS2} route add ${IPv4_DST} encap bpf in obj \</div><div class='del'>-			${BPF_FILE} sec encap_gre dev veth2 ${VRF}</div><div class='del'>-		ip -netns ${NS2} -6 route add ${IPv6_DST} encap bpf in obj \</div><div class='del'>-			${BPF_FILE} sec encap_gre dev veth2 ${VRF}</div><div class='del'>-	elif [ "${ENCAP}" == "IPv6" ] ; then</div><div class='del'>-		ip -netns ${NS2} route add ${IPv4_DST} encap bpf in obj \</div><div class='del'>-			${BPF_FILE} sec encap_gre6 dev veth2 ${VRF}</div><div class='del'>-		ip -netns ${NS2} -6 route add ${IPv6_DST} encap bpf in obj \</div><div class='del'>-			${BPF_FILE} sec encap_gre6 dev veth2 ${VRF}</div><div class='del'>-	else</div><div class='del'>-		echo "FAIL: unknown encap ${ENCAP}"</div><div class='del'>-		TEST_STATUS=1</div><div class='del'>-	fi</div><div class='del'>-	test_ping IPv4 0</div><div class='del'>-	test_ping IPv6 0</div><div class='del'>-</div><div class='del'>-	# a negative test: remove routes to GRE devices: ping fails</div><div class='del'>-	remove_routes_to_gredev</div><div class='del'>-	test_ping IPv4 1</div><div class='del'>-	test_ping IPv6 1</div><div class='del'>-</div><div class='del'>-	# another negative test</div><div class='del'>-	add_unreachable_routes_to_gredev</div><div class='del'>-	test_ping IPv4 1</div><div class='del'>-	test_ping IPv6 1</div><div class='del'>-</div><div class='del'>-	cleanup</div><div class='del'>-	process_test_results</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-VRF=""</div><div class='del'>-test_egress IPv4</div><div class='del'>-test_egress IPv6</div><div class='del'>-test_ingress IPv4</div><div class='del'>-test_ingress IPv6</div><div class='del'>-</div><div class='del'>-VRF="vrf red"</div><div class='del'>-test_egress IPv4</div><div class='del'>-test_egress IPv6</div><div class='del'>-test_ingress IPv4</div><div class='del'>-test_ingress IPv6</div><div class='del'>-</div><div class='del'>-print_test_summary_and_exit</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_lwt_seg6local.sh b/tools/testing/selftests/bpf/test_lwt_seg6local.sh<br/>deleted file mode 100755<br/>index 0efea2292d6a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_lwt_seg6local.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_lwt_seg6local.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,156 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# Connects 6 network namespaces through veths.</div><div class='del'>-# Each NS may have different IPv6 global scope addresses :</div><div class='del'>-#   NS1 ---- NS2 ---- NS3 ---- NS4 ---- NS5 ---- NS6</div><div class='del'>-# fb00::1           fd00::1  fd00::2  fd00::3  fb00::6</div><div class='del'>-#                   fc42::1           fd00::4</div><div class='del'>-#</div><div class='del'>-# All IPv6 packets going to fb00::/16 through NS2 will be encapsulated in a</div><div class='del'>-# IPv6 header with a Segment Routing Header, with segments :</div><div class='del'>-# 	fd00::1 -&gt; fd00::2 -&gt; fd00::3 -&gt; fd00::4</div><div class='del'>-#</div><div class='del'>-# 3 fd00::/16 IPv6 addresses are binded to seg6local End.BPF actions :</div><div class='del'>-# - fd00::1 : add a TLV, change the flags and apply a End.X action to fc42::1</div><div class='del'>-# - fd00::2 : remove the TLV, change the flags, add a tag</div><div class='del'>-# - fd00::3 : apply an End.T action to fd00::4, through routing table 117</div><div class='del'>-#</div><div class='del'>-# fd00::4 is a simple Segment Routing node decapsulating the inner IPv6 packet.</div><div class='del'>-# Each End.BPF action will validate the operations applied on the SRH by the</div><div class='del'>-# previous BPF program in the chain, otherwise the packet is dropped.</div><div class='del'>-#</div><div class='del'>-# An UDP datagram is sent from fb00::1 to fb00::6. The test succeeds if this</div><div class='del'>-# datagram can be read on NS6 when binding to fb00::6.</div><div class='del'>-</div><div class='del'>-# Kselftest framework requirement - SKIP code is 4.</div><div class='del'>-ksft_skip=4</div><div class='del'>-BPF_FILE="test_lwt_seg6local.bpf.o"</div><div class='del'>-readonly NS1="ns1-$(mktemp -u XXXXXX)"</div><div class='del'>-readonly NS2="ns2-$(mktemp -u XXXXXX)"</div><div class='del'>-readonly NS3="ns3-$(mktemp -u XXXXXX)"</div><div class='del'>-readonly NS4="ns4-$(mktemp -u XXXXXX)"</div><div class='del'>-readonly NS5="ns5-$(mktemp -u XXXXXX)"</div><div class='del'>-readonly NS6="ns6-$(mktemp -u XXXXXX)"</div><div class='del'>-</div><div class='del'>-msg="skip all tests:"</div><div class='del'>-if [ $UID != 0 ]; then</div><div class='del'>-	echo $msg please run this as root &gt;&amp;2</div><div class='del'>-	exit $ksft_skip</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-TMP_FILE="/tmp/selftest_lwt_seg6local.txt"</div><div class='del'>-</div><div class='del'>-cleanup()</div><div class='del'>-{</div><div class='del'>-	if [ "$?" = "0" ]; then</div><div class='del'>-		echo "selftests: test_lwt_seg6local [PASS]";</div><div class='del'>-	else</div><div class='del'>-		echo "selftests: test_lwt_seg6local [FAILED]";</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	set +e</div><div class='del'>-	ip netns del ${NS1} 2&gt; /dev/null</div><div class='del'>-	ip netns del ${NS2} 2&gt; /dev/null</div><div class='del'>-	ip netns del ${NS3} 2&gt; /dev/null</div><div class='del'>-	ip netns del ${NS4} 2&gt; /dev/null</div><div class='del'>-	ip netns del ${NS5} 2&gt; /dev/null</div><div class='del'>-	ip netns del ${NS6} 2&gt; /dev/null</div><div class='del'>-	rm -f $TMP_FILE</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-set -e</div><div class='del'>-</div><div class='del'>-ip netns add ${NS1}</div><div class='del'>-ip netns add ${NS2}</div><div class='del'>-ip netns add ${NS3}</div><div class='del'>-ip netns add ${NS4}</div><div class='del'>-ip netns add ${NS5}</div><div class='del'>-ip netns add ${NS6}</div><div class='del'>-</div><div class='del'>-trap cleanup 0 2 3 6 9</div><div class='del'>-</div><div class='del'>-ip link add veth1 type veth peer name veth2</div><div class='del'>-ip link add veth3 type veth peer name veth4</div><div class='del'>-ip link add veth5 type veth peer name veth6</div><div class='del'>-ip link add veth7 type veth peer name veth8</div><div class='del'>-ip link add veth9 type veth peer name veth10</div><div class='del'>-</div><div class='del'>-ip link set veth1 netns ${NS1}</div><div class='del'>-ip link set veth2 netns ${NS2}</div><div class='del'>-ip link set veth3 netns ${NS2}</div><div class='del'>-ip link set veth4 netns ${NS3}</div><div class='del'>-ip link set veth5 netns ${NS3}</div><div class='del'>-ip link set veth6 netns ${NS4}</div><div class='del'>-ip link set veth7 netns ${NS4}</div><div class='del'>-ip link set veth8 netns ${NS5}</div><div class='del'>-ip link set veth9 netns ${NS5}</div><div class='del'>-ip link set veth10 netns ${NS6}</div><div class='del'>-</div><div class='del'>-ip netns exec ${NS1} ip link set dev veth1 up</div><div class='del'>-ip netns exec ${NS2} ip link set dev veth2 up</div><div class='del'>-ip netns exec ${NS2} ip link set dev veth3 up</div><div class='del'>-ip netns exec ${NS3} ip link set dev veth4 up</div><div class='del'>-ip netns exec ${NS3} ip link set dev veth5 up</div><div class='del'>-ip netns exec ${NS4} ip link set dev veth6 up</div><div class='del'>-ip netns exec ${NS4} ip link set dev veth7 up</div><div class='del'>-ip netns exec ${NS5} ip link set dev veth8 up</div><div class='del'>-ip netns exec ${NS5} ip link set dev veth9 up</div><div class='del'>-ip netns exec ${NS6} ip link set dev veth10 up</div><div class='del'>-ip netns exec ${NS6} ip link set dev lo up</div><div class='del'>-</div><div class='del'>-# All link scope addresses and routes required between veths</div><div class='del'>-ip netns exec ${NS1} ip -6 addr add fb00::12/16 dev veth1 scope link</div><div class='del'>-ip netns exec ${NS1} ip -6 route add fb00::21 dev veth1 scope link</div><div class='del'>-ip netns exec ${NS2} ip -6 addr add fb00::21/16 dev veth2 scope link</div><div class='del'>-ip netns exec ${NS2} ip -6 addr add fb00::34/16 dev veth3 scope link</div><div class='del'>-ip netns exec ${NS2} ip -6 route add fb00::43 dev veth3 scope link</div><div class='del'>-ip netns exec ${NS3} ip -6 route add fb00::65 dev veth5 scope link</div><div class='del'>-ip netns exec ${NS3} ip -6 addr add fb00::43/16 dev veth4 scope link</div><div class='del'>-ip netns exec ${NS3} ip -6 addr add fb00::56/16 dev veth5 scope link</div><div class='del'>-ip netns exec ${NS4} ip -6 addr add fb00::65/16 dev veth6 scope link</div><div class='del'>-ip netns exec ${NS4} ip -6 addr add fb00::78/16 dev veth7 scope link</div><div class='del'>-ip netns exec ${NS4} ip -6 route add fb00::87 dev veth7 scope link</div><div class='del'>-ip netns exec ${NS5} ip -6 addr add fb00::87/16 dev veth8 scope link</div><div class='del'>-ip netns exec ${NS5} ip -6 addr add fb00::910/16 dev veth9 scope link</div><div class='del'>-ip netns exec ${NS5} ip -6 route add fb00::109 dev veth9 scope link</div><div class='del'>-ip netns exec ${NS5} ip -6 route add fb00::109 table 117 dev veth9 scope link</div><div class='del'>-ip netns exec ${NS6} ip -6 addr add fb00::109/16 dev veth10 scope link</div><div class='del'>-</div><div class='del'>-ip netns exec ${NS1} ip -6 addr add fb00::1/16 dev lo</div><div class='del'>-ip netns exec ${NS1} ip -6 route add fb00::6 dev veth1 via fb00::21</div><div class='del'>-</div><div class='del'>-ip netns exec ${NS2} ip -6 route add fb00::6 encap bpf in obj ${BPF_FILE} sec encap_srh dev veth2</div><div class='del'>-ip netns exec ${NS2} ip -6 route add fd00::1 dev veth3 via fb00::43 scope link</div><div class='del'>-</div><div class='del'>-ip netns exec ${NS3} ip -6 route add fc42::1 dev veth5 via fb00::65</div><div class='del'>-ip netns exec ${NS3} ip -6 route add fd00::1 encap seg6local action End.BPF endpoint obj ${BPF_FILE} sec add_egr_x dev veth4</div><div class='del'>-</div><div class='del'>-ip netns exec ${NS4} ip -6 route add fd00::2 encap seg6local action End.BPF endpoint obj ${BPF_FILE} sec pop_egr dev veth6</div><div class='del'>-ip netns exec ${NS4} ip -6 addr add fc42::1 dev lo</div><div class='del'>-ip netns exec ${NS4} ip -6 route add fd00::3 dev veth7 via fb00::87</div><div class='del'>-</div><div class='del'>-ip netns exec ${NS5} ip -6 route add fd00::4 table 117 dev veth9 via fb00::109</div><div class='del'>-ip netns exec ${NS5} ip -6 route add fd00::3 encap seg6local action End.BPF endpoint obj ${BPF_FILE} sec inspect_t dev veth8</div><div class='del'>-</div><div class='del'>-ip netns exec ${NS6} ip -6 addr add fb00::6/16 dev lo</div><div class='del'>-ip netns exec ${NS6} ip -6 addr add fd00::4/16 dev lo</div><div class='del'>-</div><div class='del'>-ip netns exec ${NS1} sysctl net.ipv6.conf.all.forwarding=1 &gt; /dev/null</div><div class='del'>-ip netns exec ${NS2} sysctl net.ipv6.conf.all.forwarding=1 &gt; /dev/null</div><div class='del'>-ip netns exec ${NS3} sysctl net.ipv6.conf.all.forwarding=1 &gt; /dev/null</div><div class='del'>-ip netns exec ${NS4} sysctl net.ipv6.conf.all.forwarding=1 &gt; /dev/null</div><div class='del'>-ip netns exec ${NS5} sysctl net.ipv6.conf.all.forwarding=1 &gt; /dev/null</div><div class='del'>-</div><div class='del'>-ip netns exec ${NS6} sysctl net.ipv6.conf.all.seg6_enabled=1 &gt; /dev/null</div><div class='del'>-ip netns exec ${NS6} sysctl net.ipv6.conf.lo.seg6_enabled=1 &gt; /dev/null</div><div class='del'>-ip netns exec ${NS6} sysctl net.ipv6.conf.veth10.seg6_enabled=1 &gt; /dev/null</div><div class='del'>-</div><div class='del'>-ip netns exec ${NS6} nc -l -6 -u -d 7330 &gt; $TMP_FILE &amp;</div><div class='del'>-ip netns exec ${NS1} bash -c "echo 'foobar' | nc -w0 -6 -u -p 2121 -s fb00::1 fb00::6 7330"</div><div class='del'>-sleep 5 # wait enough time to ensure the UDP datagram arrived to the last segment</div><div class='del'>-kill -TERM $!</div><div class='del'>-</div><div class='del'>-if [[ $(&lt; $TMP_FILE) != "foobar" ]]; then</div><div class='del'>-	exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-exit 0</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c<br/>index 8b40e9496af1..ccc5acd55ff9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_maps.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_maps.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_maps.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_maps.c</a></div><div class='hunk'>@@ -535,7 +535,7 @@ static void test_devmap_hash(unsigned int task, void *data)</div><div class='ctx'> static void test_queuemap(unsigned int task, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	const int MAP_SIZE = 32;</div><div class='del'>-	__u32 vals[MAP_SIZE + MAP_SIZE/2], val;</div><div class='add'>+	__u32 vals[MAP_SIZE + MAP_SIZE/2], val = 0;</div><div class='ctx'> 	int fd, i;</div><div class='ctx'> </div><div class='ctx'> 	/* Fill test values to be used */</div><div class='hunk'>@@ -591,7 +591,7 @@ static void test_queuemap(unsigned int task, void *data)</div><div class='ctx'> static void test_stackmap(unsigned int task, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	const int MAP_SIZE = 32;</div><div class='del'>-	__u32 vals[MAP_SIZE + MAP_SIZE/2], val;</div><div class='add'>+	__u32 vals[MAP_SIZE + MAP_SIZE/2], val = 0;</div><div class='ctx'> 	int fd, i;</div><div class='ctx'> </div><div class='ctx'> 	/* Fill test values to be used */</div><div class='hunk'>@@ -1396,9 +1396,11 @@ static void test_map_stress(void)</div><div class='ctx'> #define MAX_DELAY_US 50000</div><div class='ctx'> #define MIN_DELAY_RANGE_US 5000</div><div class='ctx'> </div><div class='del'>-static bool retry_for_again_or_busy(int err)</div><div class='add'>+static bool can_retry(int err)</div><div class='ctx'> {</div><div class='del'>-	return (err == EAGAIN || err == EBUSY);</div><div class='add'>+	return (err == EAGAIN || err == EBUSY ||</div><div class='add'>+		((err == ENOMEM || err == E2BIG) &amp;&amp;</div><div class='add'>+		 map_opts.map_flags == BPF_F_NO_PREALLOC));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int map_update_retriable(int map_fd, const void *key, const void *value, int flags, int attempts,</div><div class='hunk'>@@ -1451,12 +1453,12 @@ static void test_update_delete(unsigned int fn, void *data)</div><div class='ctx'> </div><div class='ctx'> 		if (do_update) {</div><div class='ctx'> 			err = map_update_retriable(fd, &amp;key, &amp;value, BPF_NOEXIST, MAP_RETRIES,</div><div class='del'>-						   retry_for_again_or_busy);</div><div class='add'>+						   can_retry);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				printf("error %d %d\n", err, errno);</div><div class='ctx'> 			assert(err == 0);</div><div class='ctx'> 			err = map_update_retriable(fd, &amp;key, &amp;value, BPF_EXIST, MAP_RETRIES,</div><div class='del'>-						   retry_for_again_or_busy);</div><div class='add'>+						   can_retry);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				printf("error %d %d\n", err, errno);</div><div class='ctx'> 			assert(err == 0);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c<br/>index c9e745d49493..02a85dda30e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_progs.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_progs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_progs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_progs.c</a></div><div class='hunk'>@@ -14,12 +14,14 @@</div><div class='ctx'> #include &lt;netinet/in.h&gt;</div><div class='ctx'> #include &lt;sys/select.h&gt;</div><div class='ctx'> #include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;linux/keyctl.h&gt;</div><div class='ctx'> #include &lt;sys/un.h&gt;</div><div class='ctx'> #include &lt;bpf/btf.h&gt;</div><div class='ctx'> #include &lt;time.h&gt;</div><div class='ctx'> #include "json_writer.h"</div><div class='ctx'> </div><div class='ctx'> #include "network_helpers.h"</div><div class='add'>+#include "verification_cert.h"</div><div class='ctx'> </div><div class='ctx'> /* backtrace() and backtrace_symbols_fd() are glibc specific,</div><div class='ctx'>  * use header file when glibc is available and provide stub</div><div class='hunk'>@@ -88,7 +90,9 @@ static void stdio_hijack(char **log_buf, size_t *log_cnt)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void stdio_restore_cleanup(void)</div><div class='add'>+static pthread_mutex_t stdout_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='add'>+</div><div class='add'>+static void stdio_restore(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef __GLIBC__</div><div class='ctx'> 	if (verbose() &amp;&amp; env.worker_id == -1) {</div><div class='hunk'>@@ -98,34 +102,33 @@ static void stdio_restore_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> 	fflush(stdout);</div><div class='ctx'> </div><div class='add'>+	pthread_mutex_lock(&amp;stdout_lock);</div><div class='add'>+</div><div class='ctx'> 	if (env.subtest_state) {</div><div class='del'>-		fclose(env.subtest_state-&gt;stdout_saved);</div><div class='add'>+		if (env.subtest_state-&gt;stdout_saved)</div><div class='add'>+			fclose(env.subtest_state-&gt;stdout_saved);</div><div class='ctx'> 		env.subtest_state-&gt;stdout_saved = NULL;</div><div class='ctx'> 		stdout = env.test_state-&gt;stdout_saved;</div><div class='ctx'> 		stderr = env.test_state-&gt;stdout_saved;</div><div class='ctx'> 	} else {</div><div class='del'>-		fclose(env.test_state-&gt;stdout_saved);</div><div class='add'>+		if (env.test_state-&gt;stdout_saved)</div><div class='add'>+			fclose(env.test_state-&gt;stdout_saved);</div><div class='ctx'> 		env.test_state-&gt;stdout_saved = NULL;</div><div class='add'>+		stdout = env.stdout_saved;</div><div class='add'>+		stderr = env.stderr_saved;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	pthread_mutex_unlock(&amp;stdout_lock);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void stdio_restore(void)</div><div class='add'>+static int traffic_monitor_print_fn(const char *format, va_list args)</div><div class='ctx'> {</div><div class='del'>-#ifdef __GLIBC__</div><div class='del'>-	if (verbose() &amp;&amp; env.worker_id == -1) {</div><div class='del'>-		/* nothing to do, output to stdout by default */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (stdout == env.stdout_saved)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	stdio_restore_cleanup();</div><div class='add'>+	pthread_mutex_lock(&amp;stdout_lock);</div><div class='add'>+	vfprintf(stdout, format, args);</div><div class='add'>+	pthread_mutex_unlock(&amp;stdout_lock);</div><div class='ctx'> </div><div class='del'>-	stdout = env.stdout_saved;</div><div class='del'>-	stderr = env.stderr_saved;</div><div class='del'>-#endif</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Adapted from perf/util/string.c */</div><div class='hunk'>@@ -474,8 +477,6 @@ static void dump_test_log(const struct prog_test_def *test,</div><div class='ctx'> 	print_test_result(test, test_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void stdio_restore(void);</div><div class='del'>-</div><div class='ctx'> /* A bunch of tests set custom affinity per-thread and/or per-process. Reset</div><div class='ctx'>  * it after each test/sub-test.</div><div class='ctx'>  */</div><div class='hunk'>@@ -490,13 +491,11 @@ static void reset_affinity(void)</div><div class='ctx'> </div><div class='ctx'> 	err = sched_setaffinity(0, sizeof(cpuset), &amp;cpuset);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		stdio_restore();</div><div class='ctx'> 		fprintf(stderr, "Failed to reset process affinity: %d!\n", err);</div><div class='ctx'> 		exit(EXIT_ERR_SETUP_INFRA);</div><div class='ctx'> 	}</div><div class='ctx'> 	err = pthread_setaffinity_np(pthread_self(), sizeof(cpuset), &amp;cpuset);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		stdio_restore();</div><div class='ctx'> 		fprintf(stderr, "Failed to reset thread affinity: %d!\n", err);</div><div class='ctx'> 		exit(EXIT_ERR_SETUP_INFRA);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -514,7 +513,6 @@ static void save_netns(void)</div><div class='ctx'> static void restore_netns(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (setns(env.saved_netns_fd, CLONE_NEWNET) == -1) {</div><div class='del'>-		stdio_restore();</div><div class='ctx'> 		perror("setns(CLONE_NEWNS)");</div><div class='ctx'> 		exit(EXIT_ERR_SETUP_INFRA);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -541,7 +539,8 @@ void test__end_subtest(void)</div><div class='ctx'> 				   test_result(subtest_state-&gt;error_cnt,</div><div class='ctx'> 					       subtest_state-&gt;skipped));</div><div class='ctx'> </div><div class='del'>-	stdio_restore_cleanup();</div><div class='add'>+	stdio_restore();</div><div class='add'>+</div><div class='ctx'> 	env.subtest_state = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1270,8 +1269,10 @@ void crash_handler(int signum)</div><div class='ctx'> </div><div class='ctx'> 	sz = backtrace(bt, ARRAY_SIZE(bt));</div><div class='ctx'> </div><div class='del'>-	if (env.stdout_saved)</div><div class='del'>-		stdio_restore();</div><div class='add'>+	fflush(stdout);</div><div class='add'>+	stdout = env.stdout_saved;</div><div class='add'>+	stderr = env.stderr_saved;</div><div class='add'>+</div><div class='ctx'> 	if (env.test) {</div><div class='ctx'> 		env.test_state-&gt;error_cnt++;</div><div class='ctx'> 		dump_test_log(env.test, env.test_state, true, false, NULL);</div><div class='hunk'>@@ -1365,10 +1366,19 @@ static int recv_message(int sock, struct msg *msg)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ns_is_needed(const char *test_name)</div><div class='add'>+{</div><div class='add'>+	if (strlen(test_name) &lt; 3)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return !strncmp(test_name, "ns_", 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void run_one_test(int test_num)</div><div class='ctx'> {</div><div class='ctx'> 	struct prog_test_def *test = &amp;prog_test_defs[test_num];</div><div class='ctx'> 	struct test_state *state = &amp;test_states[test_num];</div><div class='add'>+	struct netns_obj *ns = NULL;</div><div class='ctx'> </div><div class='ctx'> 	env.test = test;</div><div class='ctx'> 	env.test_state = state;</div><div class='hunk'>@@ -1376,10 +1386,13 @@ static void run_one_test(int test_num)</div><div class='ctx'> 	stdio_hijack(&amp;state-&gt;log_buf, &amp;state-&gt;log_cnt);</div><div class='ctx'> </div><div class='ctx'> 	watchdog_start();</div><div class='add'>+	if (ns_is_needed(test-&gt;test_name))</div><div class='add'>+		ns = netns_new(test-&gt;test_name, true);</div><div class='ctx'> 	if (test-&gt;run_test)</div><div class='ctx'> 		test-&gt;run_test();</div><div class='ctx'> 	else if (test-&gt;run_serial_test)</div><div class='ctx'> 		test-&gt;run_serial_test();</div><div class='add'>+	netns_free(ns);</div><div class='ctx'> 	watchdog_stop();</div><div class='ctx'> </div><div class='ctx'> 	/* ensure last sub-test is finalized properly */</div><div class='hunk'>@@ -1388,6 +1401,8 @@ static void run_one_test(int test_num)</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;tested = true;</div><div class='ctx'> </div><div class='add'>+	stdio_restore();</div><div class='add'>+</div><div class='ctx'> 	if (verbose() &amp;&amp; env.worker_id == -1)</div><div class='ctx'> 		print_test_result(test, state);</div><div class='ctx'> </div><div class='hunk'>@@ -1396,7 +1411,6 @@ static void run_one_test(int test_num)</div><div class='ctx'> 	if (test-&gt;need_cgroup_cleanup)</div><div class='ctx'> 		cleanup_cgroup_environment();</div><div class='ctx'> </div><div class='del'>-	stdio_restore();</div><div class='ctx'> 	free(stop_libbpf_log_capture());</div><div class='ctx'> </div><div class='ctx'> 	dump_test_log(test, state, false, false, NULL);</div><div class='hunk'>@@ -1916,6 +1930,13 @@ static void free_test_states(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __u32 register_session_key(const char *key_data, size_t key_data_size)</div><div class='add'>+{</div><div class='add'>+	return syscall(__NR_add_key, "asymmetric", "libbpf_session_key",</div><div class='add'>+			(const void *)key_data, key_data_size,</div><div class='add'>+			KEY_SPEC_SESSION_KEYRING);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct argp argp = {</div><div class='hunk'>@@ -1931,6 +1952,9 @@ int main(int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> 	sigaction(SIGSEGV, &amp;sigact, NULL);</div><div class='ctx'> </div><div class='add'>+	env.stdout_saved = stdout;</div><div class='add'>+	env.stderr_saved = stderr;</div><div class='add'>+</div><div class='ctx'> 	env.secs_till_notify = 10;</div><div class='ctx'> 	env.secs_till_kill = 120;</div><div class='ctx'> 	err = argp_parse(&amp;argp, argc, argv, 0, NULL, &amp;env);</div><div class='hunk'>@@ -1946,6 +1970,12 @@ int main(int argc, char **argv)</div><div class='ctx'> 	/* Use libbpf 1.0 API mode */</div><div class='ctx'> 	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);</div><div class='ctx'> 	libbpf_set_print(libbpf_print_fn);</div><div class='add'>+	err = register_session_key((const char *)test_progs_verification_cert,</div><div class='add'>+				   test_progs_verification_cert_len);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	traffic_monitor_set_print(traffic_monitor_print_fn);</div><div class='ctx'> </div><div class='ctx'> 	srand(time(NULL));</div><div class='ctx'> </div><div class='hunk'>@@ -1957,9 +1987,6 @@ int main(int argc, char **argv)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	env.stdout_saved = stdout;</div><div class='del'>-	env.stderr_saved = stderr;</div><div class='del'>-</div><div class='ctx'> 	env.has_testmod = true;</div><div class='ctx'> 	if (!env.list_test_names) {</div><div class='ctx'> 		/* ensure previous instance of the module is unloaded */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h<br/>index 404d0d4915d5..eebfc18cdcd2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_progs.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_progs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_progs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_progs.h</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;assert.h&gt;</div><div class='add'>+#include &lt;regex.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='ctx'> #include &lt;time.h&gt;</div><div class='hunk'>@@ -427,6 +428,14 @@ void hexdump(const char *prefix, const void *buf, size_t len);</div><div class='ctx'> 			goto goto_label;				\</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='add'>+#define SYS_FAIL(goto_label, fmt, ...)					\</div><div class='add'>+	({								\</div><div class='add'>+		char cmd[1024];						\</div><div class='add'>+		snprintf(cmd, sizeof(cmd), fmt, ##__VA_ARGS__);		\</div><div class='add'>+		if (!ASSERT_NEQ(0, system(cmd), cmd))			\</div><div class='add'>+			goto goto_label;				\</div><div class='add'>+	})</div><div class='add'>+</div><div class='ctx'> #define ALL_TO_DEV_NULL " &gt;/dev/null 2&gt;&amp;1"</div><div class='ctx'> </div><div class='ctx'> #define SYS_NOFAIL(fmt, ...)						\</div><div class='hunk'>@@ -452,6 +461,34 @@ static inline void *u64_to_ptr(__u64 ptr)</div><div class='ctx'> 	return (void *) (unsigned long) ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline __u32 id_from_prog_fd(int fd)</div><div class='add'>+{</div><div class='add'>+	struct bpf_prog_info prog_info = {};</div><div class='add'>+	__u32 prog_info_len = sizeof(prog_info);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bpf_obj_get_info_by_fd(fd, &amp;prog_info, &amp;prog_info_len);</div><div class='add'>+	if (!ASSERT_OK(err, "id_from_prog_fd"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ASSERT_NEQ(prog_info.id, 0, "prog_info.id");</div><div class='add'>+	return prog_info.id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u32 id_from_link_fd(int fd)</div><div class='add'>+{</div><div class='add'>+	struct bpf_link_info link_info = {};</div><div class='add'>+	__u32 link_info_len = sizeof(link_info);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bpf_link_get_info_by_fd(fd, &amp;link_info, &amp;link_info_len);</div><div class='add'>+	if (!ASSERT_OK(err, "id_from_link_fd"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ASSERT_NEQ(link_info.id, 0, "link_info.id");</div><div class='add'>+	return link_info.id;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int bpf_find_map(const char *test, struct bpf_object *obj, const char *name);</div><div class='ctx'> int compare_map_keys(int map1_fd, int map2_fd);</div><div class='ctx'> int compare_stack_ips(int smap_fd, int amap_fd, int stack_trace_len);</div><div class='hunk'>@@ -510,4 +547,20 @@ extern void test_loader_fini(struct test_loader *tester);</div><div class='ctx'> 	test_loader_fini(&amp;tester);					       \</div><div class='ctx'> })</div><div class='ctx'> </div><div class='add'>+struct expect_msg {</div><div class='add'>+	const char *substr; /* substring match */</div><div class='add'>+	regex_t regex;</div><div class='add'>+	bool is_regex;</div><div class='add'>+	bool on_next_line;</div><div class='add'>+	bool negative;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct expected_msgs {</div><div class='add'>+	struct expect_msg *patterns;</div><div class='add'>+	size_t cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void validate_msgs(const char *log_buf, struct expected_msgs *msgs,</div><div class='add'>+		   void (*emit_fn)(const char *buf, bool force));</div><div class='add'>+</div><div class='ctx'> #endif /* __TEST_PROGS_H */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c<br/>index fd2da2234cc9..76568db7a664 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_sockmap.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_sockmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_sockmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_sockmap.c</a></div><div class='hunk'>@@ -1372,7 +1372,7 @@ run:</div><div class='ctx'> 	} else</div><div class='ctx'> 		fprintf(stderr, "unknown test\n");</div><div class='ctx'> out:</div><div class='del'>-	/* Detatch and zero all the maps */</div><div class='add'>+	/* Detach and zero all the maps */</div><div class='ctx'> 	bpf_prog_detach2(bpf_program__fd(progs[3]), cg_fd, BPF_CGROUP_SOCK_OPS);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(links); i++) {</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_tag.c b/tools/testing/selftests/bpf/test_tag.c<br/>index 5546b05a0486..f1300047c1e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_tag.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_tag.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_tag.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_tag.c</a></div><div class='hunk'>@@ -116,7 +116,7 @@ static void tag_from_alg(int insns, uint8_t *tag, uint32_t len)</div><div class='ctx'> 	static const struct sockaddr_alg alg = {</div><div class='ctx'> 		.salg_family	= AF_ALG,</div><div class='ctx'> 		.salg_type	= "hash",</div><div class='del'>-		.salg_name	= "sha1",</div><div class='add'>+		.salg_name	= "sha256",</div><div class='ctx'> 	};</div><div class='ctx'> 	int fd_base, fd_alg, ret;</div><div class='ctx'> 	ssize_t size;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_tc_edt.sh b/tools/testing/selftests/bpf/test_tc_edt.sh<br/>deleted file mode 100755<br/>index 76f0bd17061f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_tc_edt.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_tc_edt.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#</div><div class='del'>-# This test installs a TC bpf program that throttles a TCP flow</div><div class='del'>-# with dst port = 9000 down to 5MBps. Then it measures actual</div><div class='del'>-# throughput of the flow.</div><div class='del'>-</div><div class='del'>-BPF_FILE="test_tc_edt.bpf.o"</div><div class='del'>-if [[ $EUID -ne 0 ]]; then</div><div class='del'>-	echo "This script must be run as root"</div><div class='del'>-	echo "FAIL"</div><div class='del'>-	exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# check that nc, dd, and timeout are present</div><div class='del'>-command -v nc &gt;/dev/null 2&gt;&amp;1 || \</div><div class='del'>-	{ echo &gt;&amp;2 "nc is not available"; exit 1; }</div><div class='del'>-command -v dd &gt;/dev/null 2&gt;&amp;1 || \</div><div class='del'>-	{ echo &gt;&amp;2 "nc is not available"; exit 1; }</div><div class='del'>-command -v timeout &gt;/dev/null 2&gt;&amp;1 || \</div><div class='del'>-	{ echo &gt;&amp;2 "timeout is not available"; exit 1; }</div><div class='del'>-</div><div class='del'>-readonly NS_SRC="ns-src-$(mktemp -u XXXXXX)"</div><div class='del'>-readonly NS_DST="ns-dst-$(mktemp -u XXXXXX)"</div><div class='del'>-</div><div class='del'>-readonly IP_SRC="172.16.1.100"</div><div class='del'>-readonly IP_DST="172.16.2.100"</div><div class='del'>-</div><div class='del'>-cleanup()</div><div class='del'>-{</div><div class='del'>-	ip netns del ${NS_SRC}</div><div class='del'>-	ip netns del ${NS_DST}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-trap cleanup EXIT</div><div class='del'>-</div><div class='del'>-set -e  # exit on error</div><div class='del'>-</div><div class='del'>-ip netns add "${NS_SRC}"</div><div class='del'>-ip netns add "${NS_DST}"</div><div class='del'>-ip link add veth_src type veth peer name veth_dst</div><div class='del'>-ip link set veth_src netns ${NS_SRC}</div><div class='del'>-ip link set veth_dst netns ${NS_DST}</div><div class='del'>-</div><div class='del'>-ip -netns ${NS_SRC} addr add ${IP_SRC}/24  dev veth_src</div><div class='del'>-ip -netns ${NS_DST} addr add ${IP_DST}/24  dev veth_dst</div><div class='del'>-</div><div class='del'>-ip -netns ${NS_SRC} link set dev veth_src up</div><div class='del'>-ip -netns ${NS_DST} link set dev veth_dst up</div><div class='del'>-</div><div class='del'>-ip -netns ${NS_SRC} route add ${IP_DST}/32  dev veth_src</div><div class='del'>-ip -netns ${NS_DST} route add ${IP_SRC}/32  dev veth_dst</div><div class='del'>-</div><div class='del'>-# set up TC on TX</div><div class='del'>-ip netns exec ${NS_SRC} tc qdisc add dev veth_src root fq</div><div class='del'>-ip netns exec ${NS_SRC} tc qdisc add dev veth_src clsact</div><div class='del'>-ip netns exec ${NS_SRC} tc filter add dev veth_src egress \</div><div class='del'>-	bpf da obj ${BPF_FILE} sec cls_test</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# start the listener</div><div class='del'>-ip netns exec ${NS_DST} bash -c \</div><div class='del'>-	"nc -4 -l -p 9000 &gt;/dev/null &amp;"</div><div class='del'>-declare -i NC_PID=$!</div><div class='del'>-sleep 1</div><div class='del'>-</div><div class='del'>-declare -ir TIMEOUT=20</div><div class='del'>-declare -ir EXPECTED_BPS=5000000</div><div class='del'>-</div><div class='del'>-# run the load, capture RX bytes on DST</div><div class='del'>-declare -ir RX_BYTES_START=$( ip netns exec ${NS_DST} \</div><div class='del'>-	cat /sys/class/net/veth_dst/statistics/rx_bytes )</div><div class='del'>-</div><div class='del'>-set +e</div><div class='del'>-ip netns exec ${NS_SRC} bash -c "timeout ${TIMEOUT} dd if=/dev/zero \</div><div class='del'>-	bs=1000 count=1000000 &gt; /dev/tcp/${IP_DST}/9000 2&gt;/dev/null"</div><div class='del'>-set -e</div><div class='del'>-</div><div class='del'>-declare -ir RX_BYTES_END=$( ip netns exec ${NS_DST} \</div><div class='del'>-	cat /sys/class/net/veth_dst/statistics/rx_bytes )</div><div class='del'>-</div><div class='del'>-declare -ir ACTUAL_BPS=$(( ($RX_BYTES_END - $RX_BYTES_START) / $TIMEOUT ))</div><div class='del'>-</div><div class='del'>-echo $TIMEOUT $ACTUAL_BPS $EXPECTED_BPS | \</div><div class='del'>-	awk '{printf "elapsed: %d sec; bps difference: %.2f%%\n",</div><div class='del'>-		$1, ($2-$3)*100.0/$3}'</div><div class='del'>-</div><div class='del'>-# Pass the test if the actual bps is within 1% of the expected bps.</div><div class='del'>-# The difference is usually about 0.1% on a 20-sec test, and ==&gt; zero</div><div class='del'>-# the longer the test runs.</div><div class='del'>-declare -ir RES=$( echo $ACTUAL_BPS $EXPECTED_BPS | \</div><div class='del'>-	 awk 'function abs(x){return ((x &lt; 0.0) ? -x : x)}</div><div class='del'>-	      {if (abs(($1-$2)*100.0/$2) &gt; 1.0) { print "1" }</div><div class='del'>-		else { print "0"} }' )</div><div class='del'>-if [ "${RES}" == "0" ] ; then</div><div class='del'>-	echo "PASS"</div><div class='del'>-else</div><div class='del'>-	echo "FAIL"</div><div class='del'>-	exit 1</div><div class='del'>-fi</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_tc_tunnel.sh b/tools/testing/selftests/bpf/test_tc_tunnel.sh<br/>deleted file mode 100755<br/>index cb55a908bb0d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_tc_tunnel.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_tc_tunnel.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,320 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#</div><div class='del'>-# In-place tunneling</div><div class='del'>-</div><div class='del'>-BPF_FILE="test_tc_tunnel.bpf.o"</div><div class='del'>-# must match the port that the bpf program filters on</div><div class='del'>-readonly port=8000</div><div class='del'>-</div><div class='del'>-readonly ns_prefix="ns-$$-"</div><div class='del'>-readonly ns1="${ns_prefix}1"</div><div class='del'>-readonly ns2="${ns_prefix}2"</div><div class='del'>-</div><div class='del'>-readonly ns1_v4=192.168.1.1</div><div class='del'>-readonly ns2_v4=192.168.1.2</div><div class='del'>-readonly ns1_v6=fd::1</div><div class='del'>-readonly ns2_v6=fd::2</div><div class='del'>-</div><div class='del'>-# Must match port used by bpf program</div><div class='del'>-readonly udpport=5555</div><div class='del'>-# MPLSoverUDP</div><div class='del'>-readonly mplsudpport=6635</div><div class='del'>-readonly mplsproto=137</div><div class='del'>-</div><div class='del'>-readonly infile="$(mktemp)"</div><div class='del'>-readonly outfile="$(mktemp)"</div><div class='del'>-</div><div class='del'>-setup() {</div><div class='del'>-	ip netns add "${ns1}"</div><div class='del'>-	ip netns add "${ns2}"</div><div class='del'>-</div><div class='del'>-	ip link add dev veth1 mtu 1500 netns "${ns1}" type veth \</div><div class='del'>-	      peer name veth2 mtu 1500 netns "${ns2}"</div><div class='del'>-</div><div class='del'>-	ip netns exec "${ns1}" ethtool -K veth1 tso off</div><div class='del'>-</div><div class='del'>-	ip -netns "${ns1}" link set veth1 up</div><div class='del'>-	ip -netns "${ns2}" link set veth2 up</div><div class='del'>-</div><div class='del'>-	ip -netns "${ns1}" -4 addr add "${ns1_v4}/24" dev veth1</div><div class='del'>-	ip -netns "${ns2}" -4 addr add "${ns2_v4}/24" dev veth2</div><div class='del'>-	ip -netns "${ns1}" -6 addr add "${ns1_v6}/64" dev veth1 nodad</div><div class='del'>-	ip -netns "${ns2}" -6 addr add "${ns2_v6}/64" dev veth2 nodad</div><div class='del'>-</div><div class='del'>-	# clamp route to reserve room for tunnel headers</div><div class='del'>-	ip -netns "${ns1}" -4 route flush table main</div><div class='del'>-	ip -netns "${ns1}" -6 route flush table main</div><div class='del'>-	ip -netns "${ns1}" -4 route add "${ns2_v4}" mtu 1450 dev veth1</div><div class='del'>-	ip -netns "${ns1}" -6 route add "${ns2_v6}" mtu 1430 dev veth1</div><div class='del'>-</div><div class='del'>-	sleep 1</div><div class='del'>-</div><div class='del'>-	dd if=/dev/urandom of="${infile}" bs="${datalen}" count=1 status=none</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-cleanup() {</div><div class='del'>-	ip netns del "${ns2}"</div><div class='del'>-	ip netns del "${ns1}"</div><div class='del'>-</div><div class='del'>-	if [[ -f "${outfile}" ]]; then</div><div class='del'>-		rm "${outfile}"</div><div class='del'>-	fi</div><div class='del'>-	if [[ -f "${infile}" ]]; then</div><div class='del'>-		rm "${infile}"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if [[ -n $server_pid ]]; then</div><div class='del'>-		kill $server_pid 2&gt; /dev/null</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-server_listen() {</div><div class='del'>-	ip netns exec "${ns2}" nc "${netcat_opt}" -l "${port}" &gt; "${outfile}" &amp;</div><div class='del'>-	server_pid=$!</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-client_connect() {</div><div class='del'>-	ip netns exec "${ns1}" timeout 2 nc "${netcat_opt}" -w 1 "${addr2}" "${port}" &lt; "${infile}"</div><div class='del'>-	echo $?</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-verify_data() {</div><div class='del'>-	wait "${server_pid}"</div><div class='del'>-	server_pid=</div><div class='del'>-	# sha1sum returns two fields [sha1] [filepath]</div><div class='del'>-	# convert to bash array and access first elem</div><div class='del'>-	insum=($(sha1sum ${infile}))</div><div class='del'>-	outsum=($(sha1sum ${outfile}))</div><div class='del'>-	if [[ "${insum[0]}" != "${outsum[0]}" ]]; then</div><div class='del'>-		echo "data mismatch"</div><div class='del'>-		exit 1</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-wait_for_port() {</div><div class='del'>-	for i in $(seq 20); do</div><div class='del'>-		if ip netns exec "${ns2}" ss ${2:--4}OHntl | grep -q "$1"; then</div><div class='del'>-			return 0</div><div class='del'>-		fi</div><div class='del'>-		sleep 0.1</div><div class='del'>-	done</div><div class='del'>-	return 1</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-set -e</div><div class='del'>-</div><div class='del'>-# no arguments: automated test, run all</div><div class='del'>-if [[ "$#" -eq "0" ]]; then</div><div class='del'>-	echo "ipip"</div><div class='del'>-	$0 ipv4 ipip none 100</div><div class='del'>-</div><div class='del'>-	echo "ipip6"</div><div class='del'>-	$0 ipv4 ipip6 none 100</div><div class='del'>-</div><div class='del'>-	echo "ip6ip6"</div><div class='del'>-	$0 ipv6 ip6tnl none 100</div><div class='del'>-</div><div class='del'>-	echo "sit"</div><div class='del'>-	$0 ipv6 sit none 100</div><div class='del'>-</div><div class='del'>-	echo "ip4 vxlan"</div><div class='del'>-	$0 ipv4 vxlan eth 2000</div><div class='del'>-</div><div class='del'>-	echo "ip6 vxlan"</div><div class='del'>-	$0 ipv6 ip6vxlan eth 2000</div><div class='del'>-</div><div class='del'>-	for mac in none mpls eth ; do</div><div class='del'>-		echo "ip gre $mac"</div><div class='del'>-		$0 ipv4 gre $mac 100</div><div class='del'>-</div><div class='del'>-		echo "ip6 gre $mac"</div><div class='del'>-		$0 ipv6 ip6gre $mac 100</div><div class='del'>-</div><div class='del'>-		echo "ip gre $mac gso"</div><div class='del'>-		$0 ipv4 gre $mac 2000</div><div class='del'>-</div><div class='del'>-		echo "ip6 gre $mac gso"</div><div class='del'>-		$0 ipv6 ip6gre $mac 2000</div><div class='del'>-</div><div class='del'>-		echo "ip udp $mac"</div><div class='del'>-		$0 ipv4 udp $mac 100</div><div class='del'>-</div><div class='del'>-		echo "ip6 udp $mac"</div><div class='del'>-		$0 ipv6 ip6udp $mac 100</div><div class='del'>-</div><div class='del'>-		echo "ip udp $mac gso"</div><div class='del'>-		$0 ipv4 udp $mac 2000</div><div class='del'>-</div><div class='del'>-		echo "ip6 udp $mac gso"</div><div class='del'>-		$0 ipv6 ip6udp $mac 2000</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-	echo "OK. All tests passed"</div><div class='del'>-	exit 0</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if [[ "$#" -ne "4" ]]; then</div><div class='del'>-	echo "Usage: $0"</div><div class='del'>-	echo "   or: $0 &lt;ipv4|ipv6&gt; &lt;tuntype&gt; &lt;none|mpls|eth&gt; &lt;data_len&gt;"</div><div class='del'>-	exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-case "$1" in</div><div class='del'>-"ipv4")</div><div class='del'>-	readonly addr1="${ns1_v4}"</div><div class='del'>-	readonly addr2="${ns2_v4}"</div><div class='del'>-	readonly ipproto=4</div><div class='del'>-	readonly netcat_opt=-${ipproto}</div><div class='del'>-	readonly foumod=fou</div><div class='del'>-	readonly foutype=ipip</div><div class='del'>-	readonly fouproto=4</div><div class='del'>-	readonly fouproto_mpls=${mplsproto}</div><div class='del'>-	readonly gretaptype=gretap</div><div class='del'>-	;;</div><div class='del'>-"ipv6")</div><div class='del'>-	readonly addr1="${ns1_v6}"</div><div class='del'>-	readonly addr2="${ns2_v6}"</div><div class='del'>-	readonly ipproto=6</div><div class='del'>-	readonly netcat_opt=-${ipproto}</div><div class='del'>-	readonly foumod=fou6</div><div class='del'>-	readonly foutype=ip6tnl</div><div class='del'>-	readonly fouproto="41 -6"</div><div class='del'>-	readonly fouproto_mpls="${mplsproto} -6"</div><div class='del'>-	readonly gretaptype=ip6gretap</div><div class='del'>-	;;</div><div class='del'>-*)</div><div class='del'>-	echo "unknown arg: $1"</div><div class='del'>-	exit 1</div><div class='del'>-	;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-readonly tuntype=$2</div><div class='del'>-readonly mac=$3</div><div class='del'>-readonly datalen=$4</div><div class='del'>-</div><div class='del'>-echo "encap ${addr1} to ${addr2}, type ${tuntype}, mac ${mac} len ${datalen}"</div><div class='del'>-</div><div class='del'>-trap cleanup EXIT</div><div class='del'>-</div><div class='del'>-setup</div><div class='del'>-</div><div class='del'>-# basic communication works</div><div class='del'>-echo "test basic connectivity"</div><div class='del'>-server_listen</div><div class='del'>-wait_for_port ${port} ${netcat_opt}</div><div class='del'>-client_connect</div><div class='del'>-verify_data</div><div class='del'>-</div><div class='del'>-# clientside, insert bpf program to encap all TCP to port ${port}</div><div class='del'>-# client can no longer connect</div><div class='del'>-ip netns exec "${ns1}" tc qdisc add dev veth1 clsact</div><div class='del'>-ip netns exec "${ns1}" tc filter add dev veth1 egress \</div><div class='del'>-	bpf direct-action object-file ${BPF_FILE} \</div><div class='del'>-	section "encap_${tuntype}_${mac}"</div><div class='del'>-echo "test bpf encap without decap (expect failure)"</div><div class='del'>-server_listen</div><div class='del'>-wait_for_port ${port} ${netcat_opt}</div><div class='del'>-! client_connect</div><div class='del'>-</div><div class='del'>-if [[ "$tuntype" =~ "udp" ]]; then</div><div class='del'>-	# Set up fou tunnel.</div><div class='del'>-	ttype="${foutype}"</div><div class='del'>-	targs="encap fou encap-sport auto encap-dport $udpport"</div><div class='del'>-	# fou may be a module; allow this to fail.</div><div class='del'>-	modprobe "${foumod}" ||true</div><div class='del'>-	if [[ "$mac" == "mpls" ]]; then</div><div class='del'>-		dport=${mplsudpport}</div><div class='del'>-		dproto=${fouproto_mpls}</div><div class='del'>-		tmode="mode any ttl 255"</div><div class='del'>-	else</div><div class='del'>-		dport=${udpport}</div><div class='del'>-		dproto=${fouproto}</div><div class='del'>-	fi</div><div class='del'>-	ip netns exec "${ns2}" ip fou add port $dport ipproto ${dproto}</div><div class='del'>-	targs="encap fou encap-sport auto encap-dport $dport"</div><div class='del'>-elif [[ "$tuntype" =~ "gre" &amp;&amp; "$mac" == "eth" ]]; then</div><div class='del'>-	ttype=$gretaptype</div><div class='del'>-elif [[ "$tuntype" =~ "vxlan" &amp;&amp; "$mac" == "eth" ]]; then</div><div class='del'>-	ttype="vxlan"</div><div class='del'>-	targs="id 1 dstport 8472 udp6zerocsumrx"</div><div class='del'>-elif [[ "$tuntype" == "ipip6" ]]; then</div><div class='del'>-	ttype="ip6tnl"</div><div class='del'>-	targs=""</div><div class='del'>-else</div><div class='del'>-	ttype=$tuntype</div><div class='del'>-	targs=""</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# tunnel address family differs from inner for SIT</div><div class='del'>-if [[ "${tuntype}" == "sit" ]]; then</div><div class='del'>-	link_addr1="${ns1_v4}"</div><div class='del'>-	link_addr2="${ns2_v4}"</div><div class='del'>-elif [[ "${tuntype}" == "ipip6" ]]; then</div><div class='del'>-	link_addr1="${ns1_v6}"</div><div class='del'>-	link_addr2="${ns2_v6}"</div><div class='del'>-else</div><div class='del'>-	link_addr1="${addr1}"</div><div class='del'>-	link_addr2="${addr2}"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# serverside, insert decap module</div><div class='del'>-# server is still running</div><div class='del'>-# client can connect again</div><div class='del'>-ip netns exec "${ns2}" ip link add name testtun0 type "${ttype}" \</div><div class='del'>-	${tmode} remote "${link_addr1}" local "${link_addr2}" $targs</div><div class='del'>-</div><div class='del'>-expect_tun_fail=0</div><div class='del'>-</div><div class='del'>-if [[ "$tuntype" == "ip6udp" &amp;&amp; "$mac" == "mpls" ]]; then</div><div class='del'>-	# No support for MPLS IPv6 fou tunnel; expect failure.</div><div class='del'>-	expect_tun_fail=1</div><div class='del'>-elif [[ "$tuntype" =~ "udp" &amp;&amp; "$mac" == "eth" ]]; then</div><div class='del'>-	# No support for TEB fou tunnel; expect failure.</div><div class='del'>-	expect_tun_fail=1</div><div class='del'>-elif [[ "$tuntype" =~ (gre|vxlan) &amp;&amp; "$mac" == "eth" ]]; then</div><div class='del'>-	# Share ethernet address between tunnel/veth2 so L2 decap works.</div><div class='del'>-	ethaddr=$(ip netns exec "${ns2}" ip link show veth2 | \</div><div class='del'>-		  awk '/ether/ { print $2 }')</div><div class='del'>-	ip netns exec "${ns2}" ip link set testtun0 address $ethaddr</div><div class='del'>-elif [[ "$mac" == "mpls" ]]; then</div><div class='del'>-	modprobe mpls_iptunnel ||true</div><div class='del'>-	modprobe mpls_gso ||true</div><div class='del'>-	ip netns exec "${ns2}" sysctl -qw net.mpls.platform_labels=65536</div><div class='del'>-	ip netns exec "${ns2}" ip -f mpls route add 1000 dev lo</div><div class='del'>-	ip netns exec "${ns2}" ip link set lo up</div><div class='del'>-	ip netns exec "${ns2}" sysctl -qw net.mpls.conf.testtun0.input=1</div><div class='del'>-	ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.lo.rp_filter=0</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Because packets are decapped by the tunnel they arrive on testtun0 from</div><div class='del'>-# the IP stack perspective.  Ensure reverse path filtering is disabled</div><div class='del'>-# otherwise we drop the TCP SYN as arriving on testtun0 instead of the</div><div class='del'>-# expected veth2 (veth2 is where 192.168.1.2 is configured).</div><div class='del'>-ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.all.rp_filter=0</div><div class='del'>-# rp needs to be disabled for both all and testtun0 as the rp value is</div><div class='del'>-# selected as the max of the "all" and device-specific values.</div><div class='del'>-ip netns exec "${ns2}" sysctl -qw net.ipv4.conf.testtun0.rp_filter=0</div><div class='del'>-ip netns exec "${ns2}" ip link set dev testtun0 up</div><div class='del'>-if [[ "$expect_tun_fail" == 1 ]]; then</div><div class='del'>-	# This tunnel mode is not supported, so we expect failure.</div><div class='del'>-	echo "test bpf encap with tunnel device decap (expect failure)"</div><div class='del'>-	! client_connect</div><div class='del'>-else</div><div class='del'>-	echo "test bpf encap with tunnel device decap"</div><div class='del'>-	client_connect</div><div class='del'>-	verify_data</div><div class='del'>-	server_listen</div><div class='del'>-	wait_for_port ${port} ${netcat_opt}</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# serverside, use BPF for decap</div><div class='del'>-ip netns exec "${ns2}" ip link del dev testtun0</div><div class='del'>-ip netns exec "${ns2}" tc qdisc add dev veth2 clsact</div><div class='del'>-ip netns exec "${ns2}" tc filter add dev veth2 ingress \</div><div class='del'>-	bpf direct-action object-file ${BPF_FILE} section decap</div><div class='del'>-echo "test bpf encap with bpf decap"</div><div class='del'>-client_connect</div><div class='del'>-verify_data</div><div class='del'>-</div><div class='del'>-echo OK</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_tcpnotify_user.c b/tools/testing/selftests/bpf/test_tcpnotify_user.c<br/>index 595194453ff8..35b4893ccdf8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_tcpnotify_user.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_tcpnotify_user.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_tcpnotify_user.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_tcpnotify_user.c</a></div><div class='hunk'>@@ -15,20 +15,18 @@</div><div class='ctx'> #include &lt;bpf/libbpf.h&gt;</div><div class='ctx'> #include &lt;sys/ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='ctx'> #include &lt;linux/perf_event.h&gt;</div><div class='del'>-#include &lt;linux/err.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "bpf_util.h"</div><div class='ctx'> #include "cgroup_helpers.h"</div><div class='ctx'> </div><div class='ctx'> #include "test_tcpnotify.h"</div><div class='del'>-#include "trace_helpers.h"</div><div class='ctx'> #include "testing_helpers.h"</div><div class='ctx'> </div><div class='ctx'> #define SOCKET_BUFFER_SIZE (getpagesize() &lt; 8192L ? getpagesize() : 8192L)</div><div class='ctx'> </div><div class='ctx'> pthread_t tid;</div><div class='add'>+static bool exit_thread;</div><div class='add'>+</div><div class='ctx'> int rx_callbacks;</div><div class='ctx'> </div><div class='ctx'> static void dummyfn(void *ctx, int cpu, void *data, __u32 size)</div><div class='hunk'>@@ -45,7 +43,7 @@ void tcp_notifier_poller(struct perf_buffer *pb)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='add'>+	while (!exit_thread) {</div><div class='ctx'> 		err = perf_buffer__poll(pb, 100);</div><div class='ctx'> 		if (err &lt; 0 &amp;&amp; err != -EINTR) {</div><div class='ctx'> 			printf("failed perf_buffer__poll: %d\n", err);</div><div class='hunk'>@@ -78,15 +76,10 @@ int main(int argc, char **argv)</div><div class='ctx'> 	int error = EXIT_FAILURE;</div><div class='ctx'> 	struct bpf_object *obj;</div><div class='ctx'> 	char test_script[80];</div><div class='del'>-	cpu_set_t cpuset;</div><div class='ctx'> 	__u32 key = 0;</div><div class='ctx'> </div><div class='ctx'> 	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);</div><div class='ctx'> </div><div class='del'>-	CPU_ZERO(&amp;cpuset);</div><div class='del'>-	CPU_SET(0, &amp;cpuset);</div><div class='del'>-	pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &amp;cpuset);</div><div class='del'>-</div><div class='ctx'> 	cg_fd = cgroup_setup_and_join(cg_path);</div><div class='ctx'> 	if (cg_fd &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -151,6 +144,13 @@ int main(int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> 	sleep(10);</div><div class='ctx'> </div><div class='add'>+	exit_thread = true;</div><div class='add'>+	int ret = pthread_join(tid, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printf("FAILED: pthread_join\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (verify_result(&amp;g)) {</div><div class='ctx'> 		printf("FAILED: Wrong stats Expected %d calls, got %d\n",</div><div class='ctx'> 			g.ncalls, rx_callbacks);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_tunnel.sh b/tools/testing/selftests/bpf/test_tunnel.sh<br/>deleted file mode 100755<br/>index d9661b9988ba..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_tunnel.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_tunnel.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,645 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-# End-to-end eBPF tunnel test suite</div><div class='del'>-#   The script tests BPF network tunnel implementation.</div><div class='del'>-#</div><div class='del'>-# Topology:</div><div class='del'>-# ---------</div><div class='del'>-#     root namespace   |     at_ns0 namespace</div><div class='del'>-#                      |</div><div class='del'>-#      -----------     |     -----------</div><div class='del'>-#      | tnl dev |     |     | tnl dev |  (overlay network)</div><div class='del'>-#      -----------     |     -----------</div><div class='del'>-#      metadata-mode   |     native-mode</div><div class='del'>-#       with bpf       |</div><div class='del'>-#                      |</div><div class='del'>-#      ----------      |     ----------</div><div class='del'>-#      |  veth1  | --------- |  veth0  |  (underlay network)</div><div class='del'>-#      ----------    peer    ----------</div><div class='del'>-#</div><div class='del'>-#</div><div class='del'>-# Device Configuration</div><div class='del'>-# --------------------</div><div class='del'>-# Root namespace with metadata-mode tunnel + BPF</div><div class='del'>-# Device names and addresses:</div><div class='del'>-# 	veth1 IP: 172.16.1.200, IPv6: 00::22 (underlay)</div><div class='del'>-# 	tunnel dev &lt;type&gt;11, ex: gre11, IPv4: 10.1.1.200, IPv6: 1::22 (overlay)</div><div class='del'>-#</div><div class='del'>-# Namespace at_ns0 with native tunnel</div><div class='del'>-# Device names and addresses:</div><div class='del'>-# 	veth0 IPv4: 172.16.1.100, IPv6: 00::11 (underlay)</div><div class='del'>-# 	tunnel dev &lt;type&gt;00, ex: gre00, IPv4: 10.1.1.100, IPv6: 1::11 (overlay)</div><div class='del'>-#</div><div class='del'>-#</div><div class='del'>-# End-to-end ping packet flow</div><div class='del'>-# ---------------------------</div><div class='del'>-# Most of the tests start by namespace creation, device configuration,</div><div class='del'>-# then ping the underlay and overlay network.  When doing 'ping 10.1.1.100'</div><div class='del'>-# from root namespace, the following operations happen:</div><div class='del'>-# 1) Route lookup shows 10.1.1.100/24 belongs to tnl dev, fwd to tnl dev.</div><div class='del'>-# 2) Tnl device's egress BPF program is triggered and set the tunnel metadata,</div><div class='del'>-#    with remote_ip=172.16.1.100 and others.</div><div class='del'>-# 3) Outer tunnel header is prepended and route the packet to veth1's egress</div><div class='del'>-# 4) veth0's ingress queue receive the tunneled packet at namespace at_ns0</div><div class='del'>-# 5) Tunnel protocol handler, ex: vxlan_rcv, decap the packet</div><div class='del'>-# 6) Forward the packet to the overlay tnl dev</div><div class='del'>-</div><div class='del'>-BPF_FILE="test_tunnel_kern.bpf.o"</div><div class='del'>-BPF_PIN_TUNNEL_DIR="/sys/fs/bpf/tc/tunnel"</div><div class='del'>-PING_ARG="-c 3 -w 10 -q"</div><div class='del'>-ret=0</div><div class='del'>-GREEN='\033[0;92m'</div><div class='del'>-RED='\033[0;31m'</div><div class='del'>-NC='\033[0m' # No Color</div><div class='del'>-</div><div class='del'>-config_device()</div><div class='del'>-{</div><div class='del'>-	ip netns add at_ns0</div><div class='del'>-	ip link add veth0 type veth peer name veth1</div><div class='del'>-	ip link set veth0 netns at_ns0</div><div class='del'>-	ip netns exec at_ns0 ip addr add 172.16.1.100/24 dev veth0</div><div class='del'>-	ip netns exec at_ns0 ip link set dev veth0 up</div><div class='del'>-	ip link set dev veth1 up mtu 1500</div><div class='del'>-	ip addr add dev veth1 172.16.1.200/24</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-add_gre_tunnel()</div><div class='del'>-{</div><div class='del'>-	tun_key=</div><div class='del'>-	if [ -n "$1" ]; then</div><div class='del'>-		tun_key="key $1"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# at_ns0 namespace</div><div class='del'>-	ip netns exec at_ns0 \</div><div class='del'>-        ip link add dev $DEV_NS type $TYPE seq $tun_key \</div><div class='del'>-		local 172.16.1.100 remote 172.16.1.200</div><div class='del'>-	ip netns exec at_ns0 ip link set dev $DEV_NS up</div><div class='del'>-	ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24</div><div class='del'>-</div><div class='del'>-	# root namespace</div><div class='del'>-	ip link add dev $DEV type $TYPE $tun_key external</div><div class='del'>-	ip link set dev $DEV up</div><div class='del'>-	ip addr add dev $DEV 10.1.1.200/24</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-add_ip6gretap_tunnel()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	# assign ipv6 address</div><div class='del'>-	ip netns exec at_ns0 ip addr add ::11/96 dev veth0</div><div class='del'>-	ip netns exec at_ns0 ip link set dev veth0 up</div><div class='del'>-	ip addr add dev veth1 ::22/96</div><div class='del'>-	ip link set dev veth1 up</div><div class='del'>-</div><div class='del'>-	# at_ns0 namespace</div><div class='del'>-	ip netns exec at_ns0 \</div><div class='del'>-		ip link add dev $DEV_NS type $TYPE seq flowlabel 0xbcdef key 2 \</div><div class='del'>-		local ::11 remote ::22</div><div class='del'>-</div><div class='del'>-	ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24</div><div class='del'>-	ip netns exec at_ns0 ip addr add dev $DEV_NS fc80::100/96</div><div class='del'>-	ip netns exec at_ns0 ip link set dev $DEV_NS up</div><div class='del'>-</div><div class='del'>-	# root namespace</div><div class='del'>-	ip link add dev $DEV type $TYPE external</div><div class='del'>-	ip addr add dev $DEV 10.1.1.200/24</div><div class='del'>-	ip addr add dev $DEV fc80::200/24</div><div class='del'>-	ip link set dev $DEV up</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-add_erspan_tunnel()</div><div class='del'>-{</div><div class='del'>-	# at_ns0 namespace</div><div class='del'>-	if [ "$1" == "v1" ]; then</div><div class='del'>-		ip netns exec at_ns0 \</div><div class='del'>-		ip link add dev $DEV_NS type $TYPE seq key 2 \</div><div class='del'>-		local 172.16.1.100 remote 172.16.1.200 \</div><div class='del'>-		erspan_ver 1 erspan 123</div><div class='del'>-	else</div><div class='del'>-		ip netns exec at_ns0 \</div><div class='del'>-		ip link add dev $DEV_NS type $TYPE seq key 2 \</div><div class='del'>-		local 172.16.1.100 remote 172.16.1.200 \</div><div class='del'>-		erspan_ver 2 erspan_dir egress erspan_hwid 3</div><div class='del'>-	fi</div><div class='del'>-	ip netns exec at_ns0 ip link set dev $DEV_NS up</div><div class='del'>-	ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24</div><div class='del'>-</div><div class='del'>-	# root namespace</div><div class='del'>-	ip link add dev $DEV type $TYPE external</div><div class='del'>-	ip link set dev $DEV up</div><div class='del'>-	ip addr add dev $DEV 10.1.1.200/24</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-add_ip6erspan_tunnel()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	# assign ipv6 address</div><div class='del'>-	ip netns exec at_ns0 ip addr add ::11/96 dev veth0</div><div class='del'>-	ip netns exec at_ns0 ip link set dev veth0 up</div><div class='del'>-	ip addr add dev veth1 ::22/96</div><div class='del'>-	ip link set dev veth1 up</div><div class='del'>-</div><div class='del'>-	# at_ns0 namespace</div><div class='del'>-	if [ "$1" == "v1" ]; then</div><div class='del'>-		ip netns exec at_ns0 \</div><div class='del'>-		ip link add dev $DEV_NS type $TYPE seq key 2 \</div><div class='del'>-		local ::11 remote ::22 \</div><div class='del'>-		erspan_ver 1 erspan 123</div><div class='del'>-	else</div><div class='del'>-		ip netns exec at_ns0 \</div><div class='del'>-		ip link add dev $DEV_NS type $TYPE seq key 2 \</div><div class='del'>-		local ::11 remote ::22 \</div><div class='del'>-		erspan_ver 2 erspan_dir egress erspan_hwid 7</div><div class='del'>-	fi</div><div class='del'>-	ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24</div><div class='del'>-	ip netns exec at_ns0 ip link set dev $DEV_NS up</div><div class='del'>-</div><div class='del'>-	# root namespace</div><div class='del'>-	ip link add dev $DEV type $TYPE external</div><div class='del'>-	ip addr add dev $DEV 10.1.1.200/24</div><div class='del'>-	ip link set dev $DEV up</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-add_geneve_tunnel()</div><div class='del'>-{</div><div class='del'>-	# at_ns0 namespace</div><div class='del'>-	ip netns exec at_ns0 \</div><div class='del'>-		ip link add dev $DEV_NS type $TYPE \</div><div class='del'>-		id 2 dstport 6081 remote 172.16.1.200</div><div class='del'>-	ip netns exec at_ns0 ip link set dev $DEV_NS up</div><div class='del'>-	ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24</div><div class='del'>-</div><div class='del'>-	# root namespace</div><div class='del'>-	ip link add dev $DEV type $TYPE dstport 6081 external</div><div class='del'>-	ip link set dev $DEV up</div><div class='del'>-	ip addr add dev $DEV 10.1.1.200/24</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-add_ip6geneve_tunnel()</div><div class='del'>-{</div><div class='del'>-	ip netns exec at_ns0 ip addr add ::11/96 dev veth0</div><div class='del'>-	ip netns exec at_ns0 ip link set dev veth0 up</div><div class='del'>-	ip addr add dev veth1 ::22/96</div><div class='del'>-	ip link set dev veth1 up</div><div class='del'>-</div><div class='del'>-	# at_ns0 namespace</div><div class='del'>-	ip netns exec at_ns0 \</div><div class='del'>-		ip link add dev $DEV_NS type $TYPE id 22 \</div><div class='del'>-		remote ::22     # geneve has no local option</div><div class='del'>-	ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24</div><div class='del'>-	ip netns exec at_ns0 ip link set dev $DEV_NS up</div><div class='del'>-</div><div class='del'>-	# root namespace</div><div class='del'>-	ip link add dev $DEV type $TYPE external</div><div class='del'>-	ip addr add dev $DEV 10.1.1.200/24</div><div class='del'>-	ip link set dev $DEV up</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-add_ipip_tunnel()</div><div class='del'>-{</div><div class='del'>-	# at_ns0 namespace</div><div class='del'>-	ip netns exec at_ns0 \</div><div class='del'>-		ip link add dev $DEV_NS type $TYPE \</div><div class='del'>-		local 172.16.1.100 remote 172.16.1.200</div><div class='del'>-	ip netns exec at_ns0 ip link set dev $DEV_NS up</div><div class='del'>-	ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24</div><div class='del'>-</div><div class='del'>-	# root namespace</div><div class='del'>-	ip link add dev $DEV type $TYPE external</div><div class='del'>-	ip link set dev $DEV up</div><div class='del'>-	ip addr add dev $DEV 10.1.1.200/24</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-add_ip6tnl_tunnel()</div><div class='del'>-{</div><div class='del'>-	ip netns exec at_ns0 ip addr add ::11/96 dev veth0</div><div class='del'>-	ip netns exec at_ns0 ip link set dev veth0 up</div><div class='del'>-	ip addr add dev veth1 ::22/96</div><div class='del'>-	ip link set dev veth1 up</div><div class='del'>-</div><div class='del'>-	# at_ns0 namespace</div><div class='del'>-	ip netns exec at_ns0 \</div><div class='del'>-		ip link add dev $DEV_NS type $TYPE \</div><div class='del'>-		local ::11 remote ::22</div><div class='del'>-	ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24</div><div class='del'>-	ip netns exec at_ns0 ip addr add dev $DEV_NS 1::11/96</div><div class='del'>-	ip netns exec at_ns0 ip link set dev $DEV_NS up</div><div class='del'>-</div><div class='del'>-	# root namespace</div><div class='del'>-	ip link add dev $DEV type $TYPE external</div><div class='del'>-	ip addr add dev $DEV 10.1.1.200/24</div><div class='del'>-	ip addr add dev $DEV 1::22/96</div><div class='del'>-	ip link set dev $DEV up</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_gre()</div><div class='del'>-{</div><div class='del'>-	TYPE=gretap</div><div class='del'>-	DEV_NS=gretap00</div><div class='del'>-	DEV=gretap11</div><div class='del'>-	ret=0</div><div class='del'>-</div><div class='del'>-	check $TYPE</div><div class='del'>-	config_device</div><div class='del'>-	add_gre_tunnel 2</div><div class='del'>-	attach_bpf $DEV gre_set_tunnel gre_get_tunnel</div><div class='del'>-	ping $PING_ARG 10.1.1.100</div><div class='del'>-	check_err $?</div><div class='del'>-	ip netns exec at_ns0 ping $PING_ARG 10.1.1.200</div><div class='del'>-	check_err $?</div><div class='del'>-	cleanup</div><div class='del'>-</div><div class='del'>-        if [ $ret -ne 0 ]; then</div><div class='del'>-                echo -e ${RED}"FAIL: $TYPE"${NC}</div><div class='del'>-                return 1</div><div class='del'>-        fi</div><div class='del'>-        echo -e ${GREEN}"PASS: $TYPE"${NC}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_gre_no_tunnel_key()</div><div class='del'>-{</div><div class='del'>-	TYPE=gre</div><div class='del'>-	DEV_NS=gre00</div><div class='del'>-	DEV=gre11</div><div class='del'>-	ret=0</div><div class='del'>-</div><div class='del'>-	check $TYPE</div><div class='del'>-	config_device</div><div class='del'>-	add_gre_tunnel</div><div class='del'>-	attach_bpf $DEV gre_set_tunnel_no_key gre_get_tunnel</div><div class='del'>-	ping $PING_ARG 10.1.1.100</div><div class='del'>-	check_err $?</div><div class='del'>-	ip netns exec at_ns0 ping $PING_ARG 10.1.1.200</div><div class='del'>-	check_err $?</div><div class='del'>-	cleanup</div><div class='del'>-</div><div class='del'>-        if [ $ret -ne 0 ]; then</div><div class='del'>-                echo -e ${RED}"FAIL: $TYPE"${NC}</div><div class='del'>-                return 1</div><div class='del'>-        fi</div><div class='del'>-        echo -e ${GREEN}"PASS: $TYPE"${NC}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_ip6gre()</div><div class='del'>-{</div><div class='del'>-	TYPE=ip6gre</div><div class='del'>-	DEV_NS=ip6gre00</div><div class='del'>-	DEV=ip6gre11</div><div class='del'>-	ret=0</div><div class='del'>-</div><div class='del'>-	check $TYPE</div><div class='del'>-	config_device</div><div class='del'>-	# reuse the ip6gretap function</div><div class='del'>-	add_ip6gretap_tunnel</div><div class='del'>-	attach_bpf $DEV ip6gretap_set_tunnel ip6gretap_get_tunnel</div><div class='del'>-	# underlay</div><div class='del'>-	ping6 $PING_ARG ::11</div><div class='del'>-	# overlay: ipv4 over ipv6</div><div class='del'>-	ip netns exec at_ns0 ping $PING_ARG 10.1.1.200</div><div class='del'>-	ping $PING_ARG 10.1.1.100</div><div class='del'>-	check_err $?</div><div class='del'>-	# overlay: ipv6 over ipv6</div><div class='del'>-	ip netns exec at_ns0 ping6 $PING_ARG fc80::200</div><div class='del'>-	check_err $?</div><div class='del'>-	cleanup</div><div class='del'>-</div><div class='del'>-        if [ $ret -ne 0 ]; then</div><div class='del'>-                echo -e ${RED}"FAIL: $TYPE"${NC}</div><div class='del'>-                return 1</div><div class='del'>-        fi</div><div class='del'>-        echo -e ${GREEN}"PASS: $TYPE"${NC}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_ip6gretap()</div><div class='del'>-{</div><div class='del'>-	TYPE=ip6gretap</div><div class='del'>-	DEV_NS=ip6gretap00</div><div class='del'>-	DEV=ip6gretap11</div><div class='del'>-	ret=0</div><div class='del'>-</div><div class='del'>-	check $TYPE</div><div class='del'>-	config_device</div><div class='del'>-	add_ip6gretap_tunnel</div><div class='del'>-	attach_bpf $DEV ip6gretap_set_tunnel ip6gretap_get_tunnel</div><div class='del'>-	# underlay</div><div class='del'>-	ping6 $PING_ARG ::11</div><div class='del'>-	# overlay: ipv4 over ipv6</div><div class='del'>-	ip netns exec at_ns0 ping $PING_ARG 10.1.1.200</div><div class='del'>-	ping $PING_ARG 10.1.1.100</div><div class='del'>-	check_err $?</div><div class='del'>-	# overlay: ipv6 over ipv6</div><div class='del'>-	ip netns exec at_ns0 ping6 $PING_ARG fc80::200</div><div class='del'>-	check_err $?</div><div class='del'>-	cleanup</div><div class='del'>-</div><div class='del'>-	if [ $ret -ne 0 ]; then</div><div class='del'>-                echo -e ${RED}"FAIL: $TYPE"${NC}</div><div class='del'>-                return 1</div><div class='del'>-        fi</div><div class='del'>-        echo -e ${GREEN}"PASS: $TYPE"${NC}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_erspan()</div><div class='del'>-{</div><div class='del'>-	TYPE=erspan</div><div class='del'>-	DEV_NS=erspan00</div><div class='del'>-	DEV=erspan11</div><div class='del'>-	ret=0</div><div class='del'>-</div><div class='del'>-	check $TYPE</div><div class='del'>-	config_device</div><div class='del'>-	add_erspan_tunnel $1</div><div class='del'>-	attach_bpf $DEV erspan_set_tunnel erspan_get_tunnel</div><div class='del'>-	ping $PING_ARG 10.1.1.100</div><div class='del'>-	check_err $?</div><div class='del'>-	ip netns exec at_ns0 ping $PING_ARG 10.1.1.200</div><div class='del'>-	check_err $?</div><div class='del'>-	cleanup</div><div class='del'>-</div><div class='del'>-	if [ $ret -ne 0 ]; then</div><div class='del'>-                echo -e ${RED}"FAIL: $TYPE"${NC}</div><div class='del'>-                return 1</div><div class='del'>-        fi</div><div class='del'>-        echo -e ${GREEN}"PASS: $TYPE"${NC}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_ip6erspan()</div><div class='del'>-{</div><div class='del'>-	TYPE=ip6erspan</div><div class='del'>-	DEV_NS=ip6erspan00</div><div class='del'>-	DEV=ip6erspan11</div><div class='del'>-	ret=0</div><div class='del'>-</div><div class='del'>-	check $TYPE</div><div class='del'>-	config_device</div><div class='del'>-	add_ip6erspan_tunnel $1</div><div class='del'>-	attach_bpf $DEV ip4ip6erspan_set_tunnel ip4ip6erspan_get_tunnel</div><div class='del'>-	ping6 $PING_ARG ::11</div><div class='del'>-	ip netns exec at_ns0 ping $PING_ARG 10.1.1.200</div><div class='del'>-	check_err $?</div><div class='del'>-	cleanup</div><div class='del'>-</div><div class='del'>-	if [ $ret -ne 0 ]; then</div><div class='del'>-                echo -e ${RED}"FAIL: $TYPE"${NC}</div><div class='del'>-                return 1</div><div class='del'>-        fi</div><div class='del'>-        echo -e ${GREEN}"PASS: $TYPE"${NC}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_geneve()</div><div class='del'>-{</div><div class='del'>-	TYPE=geneve</div><div class='del'>-	DEV_NS=geneve00</div><div class='del'>-	DEV=geneve11</div><div class='del'>-	ret=0</div><div class='del'>-</div><div class='del'>-	check $TYPE</div><div class='del'>-	config_device</div><div class='del'>-	add_geneve_tunnel</div><div class='del'>-	attach_bpf $DEV geneve_set_tunnel geneve_get_tunnel</div><div class='del'>-	ping $PING_ARG 10.1.1.100</div><div class='del'>-	check_err $?</div><div class='del'>-	ip netns exec at_ns0 ping $PING_ARG 10.1.1.200</div><div class='del'>-	check_err $?</div><div class='del'>-	cleanup</div><div class='del'>-</div><div class='del'>-	if [ $ret -ne 0 ]; then</div><div class='del'>-                echo -e ${RED}"FAIL: $TYPE"${NC}</div><div class='del'>-                return 1</div><div class='del'>-        fi</div><div class='del'>-        echo -e ${GREEN}"PASS: $TYPE"${NC}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_ip6geneve()</div><div class='del'>-{</div><div class='del'>-	TYPE=geneve</div><div class='del'>-	DEV_NS=ip6geneve00</div><div class='del'>-	DEV=ip6geneve11</div><div class='del'>-	ret=0</div><div class='del'>-</div><div class='del'>-	check $TYPE</div><div class='del'>-	config_device</div><div class='del'>-	add_ip6geneve_tunnel</div><div class='del'>-	attach_bpf $DEV ip6geneve_set_tunnel ip6geneve_get_tunnel</div><div class='del'>-	ping $PING_ARG 10.1.1.100</div><div class='del'>-	check_err $?</div><div class='del'>-	ip netns exec at_ns0 ping $PING_ARG 10.1.1.200</div><div class='del'>-	check_err $?</div><div class='del'>-	cleanup</div><div class='del'>-</div><div class='del'>-	if [ $ret -ne 0 ]; then</div><div class='del'>-                echo -e ${RED}"FAIL: ip6$TYPE"${NC}</div><div class='del'>-                return 1</div><div class='del'>-        fi</div><div class='del'>-        echo -e ${GREEN}"PASS: ip6$TYPE"${NC}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_ipip()</div><div class='del'>-{</div><div class='del'>-	TYPE=ipip</div><div class='del'>-	DEV_NS=ipip00</div><div class='del'>-	DEV=ipip11</div><div class='del'>-	ret=0</div><div class='del'>-</div><div class='del'>-	check $TYPE</div><div class='del'>-	config_device</div><div class='del'>-	add_ipip_tunnel</div><div class='del'>-	ip link set dev veth1 mtu 1500</div><div class='del'>-	attach_bpf $DEV ipip_set_tunnel ipip_get_tunnel</div><div class='del'>-	ping $PING_ARG 10.1.1.100</div><div class='del'>-	check_err $?</div><div class='del'>-	ip netns exec at_ns0 ping $PING_ARG 10.1.1.200</div><div class='del'>-	check_err $?</div><div class='del'>-	cleanup</div><div class='del'>-</div><div class='del'>-	if [ $ret -ne 0 ]; then</div><div class='del'>-                echo -e ${RED}"FAIL: $TYPE"${NC}</div><div class='del'>-                return 1</div><div class='del'>-        fi</div><div class='del'>-        echo -e ${GREEN}"PASS: $TYPE"${NC}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_ipip6()</div><div class='del'>-{</div><div class='del'>-	TYPE=ip6tnl</div><div class='del'>-	DEV_NS=ipip6tnl00</div><div class='del'>-	DEV=ipip6tnl11</div><div class='del'>-	ret=0</div><div class='del'>-</div><div class='del'>-	check $TYPE</div><div class='del'>-	config_device</div><div class='del'>-	add_ip6tnl_tunnel</div><div class='del'>-	ip link set dev veth1 mtu 1500</div><div class='del'>-	attach_bpf $DEV ipip6_set_tunnel ipip6_get_tunnel</div><div class='del'>-	# underlay</div><div class='del'>-	ping6 $PING_ARG ::11</div><div class='del'>-	# ip4 over ip6</div><div class='del'>-	ping $PING_ARG 10.1.1.100</div><div class='del'>-	check_err $?</div><div class='del'>-	ip netns exec at_ns0 ping $PING_ARG 10.1.1.200</div><div class='del'>-	check_err $?</div><div class='del'>-	cleanup</div><div class='del'>-</div><div class='del'>-	if [ $ret -ne 0 ]; then</div><div class='del'>-                echo -e ${RED}"FAIL: $TYPE"${NC}</div><div class='del'>-                return 1</div><div class='del'>-        fi</div><div class='del'>-        echo -e ${GREEN}"PASS: $TYPE"${NC}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_ip6ip6()</div><div class='del'>-{</div><div class='del'>-	TYPE=ip6tnl</div><div class='del'>-	DEV_NS=ip6ip6tnl00</div><div class='del'>-	DEV=ip6ip6tnl11</div><div class='del'>-	ret=0</div><div class='del'>-</div><div class='del'>-	check $TYPE</div><div class='del'>-	config_device</div><div class='del'>-	add_ip6tnl_tunnel</div><div class='del'>-	ip link set dev veth1 mtu 1500</div><div class='del'>-	attach_bpf $DEV ip6ip6_set_tunnel ip6ip6_get_tunnel</div><div class='del'>-	# underlay</div><div class='del'>-	ping6 $PING_ARG ::11</div><div class='del'>-	# ip6 over ip6</div><div class='del'>-	ping6 $PING_ARG 1::11</div><div class='del'>-	check_err $?</div><div class='del'>-	ip netns exec at_ns0 ping6 $PING_ARG 1::22</div><div class='del'>-	check_err $?</div><div class='del'>-	cleanup</div><div class='del'>-</div><div class='del'>-	if [ $ret -ne 0 ]; then</div><div class='del'>-                echo -e ${RED}"FAIL: ip6$TYPE"${NC}</div><div class='del'>-                return 1</div><div class='del'>-        fi</div><div class='del'>-        echo -e ${GREEN}"PASS: ip6$TYPE"${NC}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-attach_bpf()</div><div class='del'>-{</div><div class='del'>-	DEV=$1</div><div class='del'>-	SET=$2</div><div class='del'>-	GET=$3</div><div class='del'>-	mkdir -p ${BPF_PIN_TUNNEL_DIR}</div><div class='del'>-	bpftool prog loadall ${BPF_FILE} ${BPF_PIN_TUNNEL_DIR}/</div><div class='del'>-	tc qdisc add dev $DEV clsact</div><div class='del'>-	tc filter add dev $DEV egress bpf da object-pinned ${BPF_PIN_TUNNEL_DIR}/$SET</div><div class='del'>-	tc filter add dev $DEV ingress bpf da object-pinned ${BPF_PIN_TUNNEL_DIR}/$GET</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-cleanup()</div><div class='del'>-{</div><div class='del'>-        rm -rf ${BPF_PIN_TUNNEL_DIR}</div><div class='del'>-</div><div class='del'>-	ip netns delete at_ns0 2&gt; /dev/null</div><div class='del'>-	ip link del veth1 2&gt; /dev/null</div><div class='del'>-	ip link del ipip11 2&gt; /dev/null</div><div class='del'>-	ip link del ipip6tnl11 2&gt; /dev/null</div><div class='del'>-	ip link del ip6ip6tnl11 2&gt; /dev/null</div><div class='del'>-	ip link del gretap11 2&gt; /dev/null</div><div class='del'>-	ip link del gre11 2&gt; /dev/null</div><div class='del'>-	ip link del ip6gre11 2&gt; /dev/null</div><div class='del'>-	ip link del ip6gretap11 2&gt; /dev/null</div><div class='del'>-	ip link del geneve11 2&gt; /dev/null</div><div class='del'>-	ip link del ip6geneve11 2&gt; /dev/null</div><div class='del'>-	ip link del erspan11 2&gt; /dev/null</div><div class='del'>-	ip link del ip6erspan11 2&gt; /dev/null</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-cleanup_exit()</div><div class='del'>-{</div><div class='del'>-	echo "CATCH SIGKILL or SIGINT, cleanup and exit"</div><div class='del'>-	cleanup</div><div class='del'>-	exit 0</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-check()</div><div class='del'>-{</div><div class='del'>-	ip link help 2&gt;&amp;1 | grep -q "\s$1\s"</div><div class='del'>-	if [ $? -ne 0 ];then</div><div class='del'>-		echo "SKIP $1: iproute2 not support"</div><div class='del'>-	cleanup</div><div class='del'>-	return 1</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enable_debug()</div><div class='del'>-{</div><div class='del'>-	echo 'file ip_gre.c +p' &gt; /sys/kernel/debug/dynamic_debug/control</div><div class='del'>-	echo 'file ip6_gre.c +p' &gt; /sys/kernel/debug/dynamic_debug/control</div><div class='del'>-	echo 'file geneve.c +p' &gt; /sys/kernel/debug/dynamic_debug/control</div><div class='del'>-	echo 'file ipip.c +p' &gt; /sys/kernel/debug/dynamic_debug/control</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-check_err()</div><div class='del'>-{</div><div class='del'>-	if [ $ret -eq 0 ]; then</div><div class='del'>-		ret=$1</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bpf_tunnel_test()</div><div class='del'>-{</div><div class='del'>-	local errors=0</div><div class='del'>-</div><div class='del'>-	echo "Testing GRE tunnel..."</div><div class='del'>-	test_gre</div><div class='del'>-	errors=$(( $errors + $? ))</div><div class='del'>-</div><div class='del'>-	echo "Testing GRE tunnel (without tunnel keys)..."</div><div class='del'>-	test_gre_no_tunnel_key</div><div class='del'>-	errors=$(( $errors + $? ))</div><div class='del'>-</div><div class='del'>-	echo "Testing IP6GRE tunnel..."</div><div class='del'>-	test_ip6gre</div><div class='del'>-	errors=$(( $errors + $? ))</div><div class='del'>-</div><div class='del'>-	echo "Testing IP6GRETAP tunnel..."</div><div class='del'>-	test_ip6gretap</div><div class='del'>-	errors=$(( $errors + $? ))</div><div class='del'>-</div><div class='del'>-	echo "Testing ERSPAN tunnel..."</div><div class='del'>-	test_erspan v2</div><div class='del'>-	errors=$(( $errors + $? ))</div><div class='del'>-</div><div class='del'>-	echo "Testing IP6ERSPAN tunnel..."</div><div class='del'>-	test_ip6erspan v2</div><div class='del'>-	errors=$(( $errors + $? ))</div><div class='del'>-</div><div class='del'>-	echo "Testing GENEVE tunnel..."</div><div class='del'>-	test_geneve</div><div class='del'>-	errors=$(( $errors + $? ))</div><div class='del'>-</div><div class='del'>-	echo "Testing IP6GENEVE tunnel..."</div><div class='del'>-	test_ip6geneve</div><div class='del'>-	errors=$(( $errors + $? ))</div><div class='del'>-</div><div class='del'>-	echo "Testing IPIP tunnel..."</div><div class='del'>-	test_ipip</div><div class='del'>-	errors=$(( $errors + $? ))</div><div class='del'>-</div><div class='del'>-	echo "Testing IPIP6 tunnel..."</div><div class='del'>-	test_ipip6</div><div class='del'>-	errors=$(( $errors + $? ))</div><div class='del'>-</div><div class='del'>-	echo "Testing IP6IP6 tunnel..."</div><div class='del'>-	test_ip6ip6</div><div class='del'>-	errors=$(( $errors + $? ))</div><div class='del'>-</div><div class='del'>-	return $errors</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-trap cleanup 0 3 6</div><div class='del'>-trap cleanup_exit 2 9</div><div class='del'>-</div><div class='del'>-cleanup</div><div class='del'>-bpf_tunnel_test</div><div class='del'>-</div><div class='del'>-if [ $? -ne 0 ]; then</div><div class='del'>-	echo -e "$(basename $0): ${RED}FAIL${NC}"</div><div class='del'>-	exit 1</div><div class='del'>-fi</div><div class='del'>-echo -e "$(basename $0): ${GREEN}PASS${NC}"</div><div class='del'>-exit 0</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c<br/>index 447b68509d76..27db34ecf3f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_verifier.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_verifier.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_verifier.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_verifier.c</a></div><div class='hunk'>@@ -734,7 +734,7 @@ static __u32 btf_raw_types[] = {</div><div class='ctx'> 	BTF_MEMBER_ENC(71, 13, 128), /* struct prog_test_member __kptr *ptr; */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char bpf_vlog[UINT_MAX &gt;&gt; 8];</div><div class='add'>+static char bpf_vlog[UINT_MAX &gt;&gt; 5];</div><div class='ctx'> </div><div class='ctx'> static int load_btf_spec(__u32 *types, int types_len,</div><div class='ctx'> 			 const char *strings, int strings_len)</div><div class='hunk'>@@ -1559,10 +1559,10 @@ static void do_test_single(struct bpf_test *test, bool unpriv,</div><div class='ctx'> 		       test-&gt;errstr_unpriv : test-&gt;errstr;</div><div class='ctx'> </div><div class='ctx'> 	opts.expected_attach_type = test-&gt;expected_attach_type;</div><div class='del'>-	if (verbose)</div><div class='del'>-		opts.log_level = verif_log_level | 4; /* force stats */</div><div class='del'>-	else if (expected_ret == VERBOSE_ACCEPT)</div><div class='add'>+	if (expected_ret == VERBOSE_ACCEPT)</div><div class='ctx'> 		opts.log_level = 2;</div><div class='add'>+	else if (verbose)</div><div class='add'>+		opts.log_level = verif_log_level | 4; /* force stats */</div><div class='ctx'> 	else</div><div class='ctx'> 		opts.log_level = DEFAULT_LIBBPF_LOG_LEVEL;</div><div class='ctx'> 	opts.prog_flags = pflags;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh b/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh<br/>deleted file mode 100755<br/>index 4c3c3fdd2d73..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_xdp_redirect_multi.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,214 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#</div><div class='del'>-# Test topology:</div><div class='del'>-#    - - - - - - - - - - - - - - - - - - -</div><div class='del'>-#    | veth1         veth2         veth3 |  ns0</div><div class='del'>-#     - -| - - - - - - | - - - - - - | - -</div><div class='del'>-#    ---------     ---------     ---------</div><div class='del'>-#    | veth0 |     | veth0 |     | veth0 |</div><div class='del'>-#    ---------     ---------     ---------</div><div class='del'>-#       ns1           ns2           ns3</div><div class='del'>-#</div><div class='del'>-# Test modules:</div><div class='del'>-# XDP modes: generic, native, native + egress_prog</div><div class='del'>-#</div><div class='del'>-# Test cases:</div><div class='del'>-#   ARP: Testing BPF_F_BROADCAST, the ingress interface also should receive</div><div class='del'>-#   the redirects.</div><div class='del'>-#      ns1 -&gt; gw: ns1, ns2, ns3, should receive the arp request</div><div class='del'>-#   IPv4: Testing BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS, the ingress</div><div class='del'>-#   interface should not receive the redirects.</div><div class='del'>-#      ns1 -&gt; gw: ns1 should not receive, ns2, ns3 should receive redirects.</div><div class='del'>-#   IPv6: Testing none flag, all the pkts should be redirected back</div><div class='del'>-#      ping test: ns1 -&gt; ns2 (block), echo requests will be redirect back</div><div class='del'>-#   egress_prog:</div><div class='del'>-#      all src mac should be egress interface's mac</div><div class='del'>-</div><div class='del'>-# netns numbers</div><div class='del'>-NUM=3</div><div class='del'>-IFACES=""</div><div class='del'>-DRV_MODE="xdpgeneric xdpdrv xdpegress"</div><div class='del'>-PASS=0</div><div class='del'>-FAIL=0</div><div class='del'>-LOG_DIR=$(mktemp -d)</div><div class='del'>-declare -a NS</div><div class='del'>-NS[0]="ns0-$(mktemp -u XXXXXX)"</div><div class='del'>-NS[1]="ns1-$(mktemp -u XXXXXX)"</div><div class='del'>-NS[2]="ns2-$(mktemp -u XXXXXX)"</div><div class='del'>-NS[3]="ns3-$(mktemp -u XXXXXX)"</div><div class='del'>-</div><div class='del'>-test_pass()</div><div class='del'>-{</div><div class='del'>-	echo "Pass: $@"</div><div class='del'>-	PASS=$((PASS + 1))</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_fail()</div><div class='del'>-{</div><div class='del'>-	echo "fail: $@"</div><div class='del'>-	FAIL=$((FAIL + 1))</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-clean_up()</div><div class='del'>-{</div><div class='del'>-	for i in $(seq 0 $NUM); do</div><div class='del'>-		ip netns del ${NS[$i]} 2&gt; /dev/null</div><div class='del'>-	done</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# Kselftest framework requirement - SKIP code is 4.</div><div class='del'>-check_env()</div><div class='del'>-{</div><div class='del'>-	ip link set dev lo xdpgeneric off &amp;&gt;/dev/null</div><div class='del'>-	if [ $? -ne 0 ];then</div><div class='del'>-		echo "selftests: [SKIP] Could not run test without the ip xdpgeneric support"</div><div class='del'>-		exit 4</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	which tcpdump &amp;&gt;/dev/null</div><div class='del'>-	if [ $? -ne 0 ];then</div><div class='del'>-		echo "selftests: [SKIP] Could not run test without tcpdump"</div><div class='del'>-		exit 4</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-setup_ns()</div><div class='del'>-{</div><div class='del'>-	local mode=$1</div><div class='del'>-	IFACES=""</div><div class='del'>-</div><div class='del'>-	if [ "$mode" = "xdpegress" ]; then</div><div class='del'>-		mode="xdpdrv"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	ip netns add ${NS[0]}</div><div class='del'>-	for i in $(seq $NUM); do</div><div class='del'>-	        ip netns add ${NS[$i]}</div><div class='del'>-		ip -n ${NS[$i]} link add veth0 type veth peer name veth$i netns ${NS[0]}</div><div class='del'>-		ip -n ${NS[$i]} link set veth0 up</div><div class='del'>-		ip -n ${NS[0]} link set veth$i up</div><div class='del'>-</div><div class='del'>-		ip -n ${NS[$i]} addr add 192.0.2.$i/24 dev veth0</div><div class='del'>-		ip -n ${NS[$i]} addr add 2001:db8::$i/64 dev veth0</div><div class='del'>-		# Add a neigh entry for IPv4 ping test</div><div class='del'>-		ip -n ${NS[$i]} neigh add 192.0.2.253 lladdr 00:00:00:00:00:01 dev veth0</div><div class='del'>-		ip -n ${NS[$i]} link set veth0 $mode obj \</div><div class='del'>-			xdp_dummy.bpf.o sec xdp &amp;&gt; /dev/null || \</div><div class='del'>-			{ test_fail "Unable to load dummy xdp" &amp;&amp; exit 1; }</div><div class='del'>-		IFACES="$IFACES veth$i"</div><div class='del'>-		veth_mac[$i]=$(ip -n ${NS[0]} link show veth$i | awk '/link\/ether/ {print $2}')</div><div class='del'>-	done</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-do_egress_tests()</div><div class='del'>-{</div><div class='del'>-	local mode=$1</div><div class='del'>-</div><div class='del'>-	# mac test</div><div class='del'>-	ip netns exec ${NS[2]} tcpdump -e -i veth0 -nn -l -e &amp;&gt; ${LOG_DIR}/mac_ns1-2_${mode}.log &amp;</div><div class='del'>-	ip netns exec ${NS[3]} tcpdump -e -i veth0 -nn -l -e &amp;&gt; ${LOG_DIR}/mac_ns1-3_${mode}.log &amp;</div><div class='del'>-	sleep 0.5</div><div class='del'>-	ip netns exec ${NS[1]} ping 192.0.2.254 -i 0.1 -c 4 &amp;&gt; /dev/null</div><div class='del'>-	sleep 0.5</div><div class='del'>-	pkill tcpdump</div><div class='del'>-</div><div class='del'>-	# mac check</div><div class='del'>-	grep -q "${veth_mac[2]} &gt; ff:ff:ff:ff:ff:ff" ${LOG_DIR}/mac_ns1-2_${mode}.log &amp;&amp; \</div><div class='del'>-	       test_pass "$mode mac ns1-2" || test_fail "$mode mac ns1-2"</div><div class='del'>-	grep -q "${veth_mac[3]} &gt; ff:ff:ff:ff:ff:ff" ${LOG_DIR}/mac_ns1-3_${mode}.log &amp;&amp; \</div><div class='del'>-		test_pass "$mode mac ns1-3" || test_fail "$mode mac ns1-3"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-do_ping_tests()</div><div class='del'>-{</div><div class='del'>-	local mode=$1</div><div class='del'>-</div><div class='del'>-	# ping6 test: echo request should be redirect back to itself, not others</div><div class='del'>-	ip netns exec ${NS[1]} ip neigh add 2001:db8::2 dev veth0 lladdr 00:00:00:00:00:02</div><div class='del'>-</div><div class='del'>-	ip netns exec ${NS[1]} tcpdump -i veth0 -nn -l -e &amp;&gt; ${LOG_DIR}/ns1-1_${mode}.log &amp;</div><div class='del'>-	ip netns exec ${NS[2]} tcpdump -i veth0 -nn -l -e &amp;&gt; ${LOG_DIR}/ns1-2_${mode}.log &amp;</div><div class='del'>-	ip netns exec ${NS[3]} tcpdump -i veth0 -nn -l -e &amp;&gt; ${LOG_DIR}/ns1-3_${mode}.log &amp;</div><div class='del'>-	sleep 0.5</div><div class='del'>-	# ARP test</div><div class='del'>-	ip netns exec ${NS[1]} arping -q -c 2 -I veth0 192.0.2.254</div><div class='del'>-	# IPv4 test</div><div class='del'>-	ip netns exec ${NS[1]} ping 192.0.2.253 -i 0.1 -c 4 &amp;&gt; /dev/null</div><div class='del'>-	# IPv6 test</div><div class='del'>-	ip netns exec ${NS[1]} ping6 2001:db8::2 -i 0.1 -c 2 &amp;&gt; /dev/null</div><div class='del'>-	sleep 0.5</div><div class='del'>-	pkill tcpdump</div><div class='del'>-</div><div class='del'>-	# All netns should receive the redirect arp requests</div><div class='del'>-	[ $(grep -cF "who-has 192.0.2.254" ${LOG_DIR}/ns1-1_${mode}.log) -eq 4 ] &amp;&amp; \</div><div class='del'>-		test_pass "$mode arp(F_BROADCAST) ns1-1" || \</div><div class='del'>-		test_fail "$mode arp(F_BROADCAST) ns1-1"</div><div class='del'>-	[ $(grep -cF "who-has 192.0.2.254" ${LOG_DIR}/ns1-2_${mode}.log) -eq 2 ] &amp;&amp; \</div><div class='del'>-		test_pass "$mode arp(F_BROADCAST) ns1-2" || \</div><div class='del'>-		test_fail "$mode arp(F_BROADCAST) ns1-2"</div><div class='del'>-	[ $(grep -cF "who-has 192.0.2.254" ${LOG_DIR}/ns1-3_${mode}.log) -eq 2 ] &amp;&amp; \</div><div class='del'>-		test_pass "$mode arp(F_BROADCAST) ns1-3" || \</div><div class='del'>-		test_fail "$mode arp(F_BROADCAST) ns1-3"</div><div class='del'>-</div><div class='del'>-	# ns1 should not receive the redirect echo request, others should</div><div class='del'>-	[ $(grep -c "ICMP echo request" ${LOG_DIR}/ns1-1_${mode}.log) -eq 4 ] &amp;&amp; \</div><div class='del'>-		test_pass "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-1" || \</div><div class='del'>-		test_fail "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-1"</div><div class='del'>-	[ $(grep -c "ICMP echo request" ${LOG_DIR}/ns1-2_${mode}.log) -eq 4 ] &amp;&amp; \</div><div class='del'>-		test_pass "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-2" || \</div><div class='del'>-		test_fail "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-2"</div><div class='del'>-	[ $(grep -c "ICMP echo request" ${LOG_DIR}/ns1-3_${mode}.log) -eq 4 ] &amp;&amp; \</div><div class='del'>-		test_pass "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-3" || \</div><div class='del'>-		test_fail "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-3"</div><div class='del'>-</div><div class='del'>-	# ns1 should receive the echo request, ns2 should not</div><div class='del'>-	[ $(grep -c "ICMP6, echo request" ${LOG_DIR}/ns1-1_${mode}.log) -eq 4 ] &amp;&amp; \</div><div class='del'>-		test_pass "$mode IPv6 (no flags) ns1-1" || \</div><div class='del'>-		test_fail "$mode IPv6 (no flags) ns1-1"</div><div class='del'>-	[ $(grep -c "ICMP6, echo request" ${LOG_DIR}/ns1-2_${mode}.log) -eq 0 ] &amp;&amp; \</div><div class='del'>-		test_pass "$mode IPv6 (no flags) ns1-2" || \</div><div class='del'>-		test_fail "$mode IPv6 (no flags) ns1-2"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-do_tests()</div><div class='del'>-{</div><div class='del'>-	local mode=$1</div><div class='del'>-	local drv_p</div><div class='del'>-</div><div class='del'>-	case ${mode} in</div><div class='del'>-		xdpdrv)  drv_p="-N";;</div><div class='del'>-		xdpegress) drv_p="-X";;</div><div class='del'>-		xdpgeneric) drv_p="-S";;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	ip netns exec ${NS[0]} ./xdp_redirect_multi $drv_p $IFACES &amp;&gt; ${LOG_DIR}/xdp_redirect_${mode}.log &amp;</div><div class='del'>-	xdp_pid=$!</div><div class='del'>-	sleep 1</div><div class='del'>-	if ! ps -p $xdp_pid &gt; /dev/null; then</div><div class='del'>-		test_fail "$mode xdp_redirect_multi start failed"</div><div class='del'>-		return 1</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if [ "$mode" = "xdpegress" ]; then</div><div class='del'>-		do_egress_tests $mode</div><div class='del'>-	else</div><div class='del'>-		do_ping_tests $mode</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	kill $xdp_pid</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-check_env</div><div class='del'>-</div><div class='del'>-trap clean_up EXIT</div><div class='del'>-</div><div class='del'>-for mode in ${DRV_MODE}; do</div><div class='del'>-	setup_ns $mode</div><div class='del'>-	do_tests $mode</div><div class='del'>-	clean_up</div><div class='del'>-done</div><div class='del'>-rm -rf ${LOG_DIR}</div><div class='del'>-</div><div class='del'>-echo "Summary: PASS $PASS, FAIL $FAIL"</div><div class='del'>-[ $FAIL -eq 0 ] &amp;&amp; exit 0 || exit 1</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_xdp_vlan.sh b/tools/testing/selftests/bpf/test_xdp_vlan.sh<br/>deleted file mode 100755<br/>index fbcaa9f0120b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_xdp_vlan.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_xdp_vlan.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,233 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-# Author: Jesper Dangaard Brouer &lt;hawk@kernel.org&gt;</div><div class='del'>-</div><div class='del'>-# Kselftest framework requirement - SKIP code is 4.</div><div class='del'>-readonly KSFT_SKIP=4</div><div class='del'>-readonly NS1="ns1-$(mktemp -u XXXXXX)"</div><div class='del'>-readonly NS2="ns2-$(mktemp -u XXXXXX)"</div><div class='del'>-</div><div class='del'>-# Allow wrapper scripts to name test</div><div class='del'>-if [ -z "$TESTNAME" ]; then</div><div class='del'>-    TESTNAME=xdp_vlan</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Default XDP mode</div><div class='del'>-XDP_MODE=xdpgeneric</div><div class='del'>-</div><div class='del'>-usage() {</div><div class='del'>-  echo "Testing XDP + TC eBPF VLAN manipulations: $TESTNAME"</div><div class='del'>-  echo ""</div><div class='del'>-  echo "Usage: $0 [-vfh]"</div><div class='del'>-  echo "  -v | --verbose : Verbose"</div><div class='del'>-  echo "  --flush        : Flush before starting (e.g. after --interactive)"</div><div class='del'>-  echo "  --interactive  : Keep netns setup running after test-run"</div><div class='del'>-  echo "  --mode=XXX     : Choose XDP mode (xdp | xdpgeneric | xdpdrv)"</div><div class='del'>-  echo ""</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-valid_xdp_mode()</div><div class='del'>-{</div><div class='del'>-	local mode=$1</div><div class='del'>-</div><div class='del'>-	case "$mode" in</div><div class='del'>-		xdpgeneric | xdpdrv | xdp)</div><div class='del'>-			return 0</div><div class='del'>-			;;</div><div class='del'>-		*)</div><div class='del'>-			return 1</div><div class='del'>-	esac</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-cleanup()</div><div class='del'>-{</div><div class='del'>-	local status=$?</div><div class='del'>-</div><div class='del'>-	if [ "$status" = "0" ]; then</div><div class='del'>-		echo "selftests: $TESTNAME [PASS]";</div><div class='del'>-	else</div><div class='del'>-		echo "selftests: $TESTNAME [FAILED]";</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if [ -n "$INTERACTIVE" ]; then</div><div class='del'>-		echo "Namespace setup still active explore with:"</div><div class='del'>-		echo " ip netns exec ${NS1} bash"</div><div class='del'>-		echo " ip netns exec ${NS2} bash"</div><div class='del'>-		exit $status</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	set +e</div><div class='del'>-	ip link del veth1 2&gt; /dev/null</div><div class='del'>-	ip netns del ${NS1} 2&gt; /dev/null</div><div class='del'>-	ip netns del ${NS2} 2&gt; /dev/null</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# Using external program "getopt" to get --long-options</div><div class='del'>-OPTIONS=$(getopt -o hvfi: \</div><div class='del'>-    --long verbose,flush,help,interactive,debug,mode: -- "$@")</div><div class='del'>-if (( $? != 0 )); then</div><div class='del'>-    usage</div><div class='del'>-    echo "selftests: $TESTNAME [FAILED] Error calling getopt, unknown option?"</div><div class='del'>-    exit 2</div><div class='del'>-fi</div><div class='del'>-eval set -- "$OPTIONS"</div><div class='del'>-</div><div class='del'>-##  --- Parse command line arguments / parameters ---</div><div class='del'>-while true; do</div><div class='del'>-	case "$1" in</div><div class='del'>-	    -v | --verbose)</div><div class='del'>-		export VERBOSE=yes</div><div class='del'>-		shift</div><div class='del'>-		;;</div><div class='del'>-	    -i | --interactive | --debug )</div><div class='del'>-		INTERACTIVE=yes</div><div class='del'>-		shift</div><div class='del'>-		;;</div><div class='del'>-	    -f | --flush )</div><div class='del'>-		cleanup</div><div class='del'>-		shift</div><div class='del'>-		;;</div><div class='del'>-	    --mode )</div><div class='del'>-		shift</div><div class='del'>-		XDP_MODE=$1</div><div class='del'>-		shift</div><div class='del'>-		;;</div><div class='del'>-	    -- )</div><div class='del'>-		shift</div><div class='del'>-		break</div><div class='del'>-		;;</div><div class='del'>-	    -h | --help )</div><div class='del'>-		usage;</div><div class='del'>-		echo "selftests: $TESTNAME [SKIP] usage help info requested"</div><div class='del'>-		exit $KSFT_SKIP</div><div class='del'>-		;;</div><div class='del'>-	    * )</div><div class='del'>-		shift</div><div class='del'>-		break</div><div class='del'>-		;;</div><div class='del'>-	esac</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-if [ "$EUID" -ne 0 ]; then</div><div class='del'>-	echo "selftests: $TESTNAME [FAILED] need root privileges"</div><div class='del'>-	exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-valid_xdp_mode $XDP_MODE</div><div class='del'>-if [ $? -ne 0 ]; then</div><div class='del'>-	echo "selftests: $TESTNAME [FAILED] unknown XDP mode ($XDP_MODE)"</div><div class='del'>-	exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-ip link set dev lo xdpgeneric off 2&gt;/dev/null &gt; /dev/null</div><div class='del'>-if [ $? -ne 0 ]; then</div><div class='del'>-	echo "selftests: $TESTNAME [SKIP] need ip xdp support"</div><div class='del'>-	exit $KSFT_SKIP</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Interactive mode likely require us to cleanup netns</div><div class='del'>-if [ -n "$INTERACTIVE" ]; then</div><div class='del'>-	ip link del veth1 2&gt; /dev/null</div><div class='del'>-	ip netns del ${NS1} 2&gt; /dev/null</div><div class='del'>-	ip netns del ${NS2} 2&gt; /dev/null</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Exit on failure</div><div class='del'>-set -e</div><div class='del'>-</div><div class='del'>-# Some shell-tools dependencies</div><div class='del'>-which ip &gt; /dev/null</div><div class='del'>-which tc &gt; /dev/null</div><div class='del'>-which ethtool &gt; /dev/null</div><div class='del'>-</div><div class='del'>-# Make rest of shell verbose, showing comments as doc/info</div><div class='del'>-if [ -n "$VERBOSE" ]; then</div><div class='del'>-    set -v</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Create two namespaces</div><div class='del'>-ip netns add ${NS1}</div><div class='del'>-ip netns add ${NS2}</div><div class='del'>-</div><div class='del'>-# Run cleanup if failing or on kill</div><div class='del'>-trap cleanup 0 2 3 6 9</div><div class='del'>-</div><div class='del'>-# Create veth pair</div><div class='del'>-ip link add veth1 type veth peer name veth2</div><div class='del'>-</div><div class='del'>-# Move veth1 and veth2 into the respective namespaces</div><div class='del'>-ip link set veth1 netns ${NS1}</div><div class='del'>-ip link set veth2 netns ${NS2}</div><div class='del'>-</div><div class='del'>-# NOTICE: XDP require VLAN header inside packet payload</div><div class='del'>-#  - Thus, disable VLAN offloading driver features</div><div class='del'>-#  - For veth REMEMBER TX side VLAN-offload</div><div class='del'>-#</div><div class='del'>-# Disable rx-vlan-offload (mostly needed on ns1)</div><div class='del'>-ip netns exec ${NS1} ethtool -K veth1 rxvlan off</div><div class='del'>-ip netns exec ${NS2} ethtool -K veth2 rxvlan off</div><div class='del'>-#</div><div class='del'>-# Disable tx-vlan-offload (mostly needed on ns2)</div><div class='del'>-ip netns exec ${NS2} ethtool -K veth2 txvlan off</div><div class='del'>-ip netns exec ${NS1} ethtool -K veth1 txvlan off</div><div class='del'>-</div><div class='del'>-export IPADDR1=100.64.41.1</div><div class='del'>-export IPADDR2=100.64.41.2</div><div class='del'>-</div><div class='del'>-# In ns1/veth1 add IP-addr on plain net_device</div><div class='del'>-ip netns exec ${NS1} ip addr add ${IPADDR1}/24 dev veth1</div><div class='del'>-ip netns exec ${NS1} ip link set veth1 up</div><div class='del'>-</div><div class='del'>-# In ns2/veth2 create VLAN device</div><div class='del'>-export VLAN=4011</div><div class='del'>-export DEVNS2=veth2</div><div class='del'>-ip netns exec ${NS2} ip link add link $DEVNS2 name $DEVNS2.$VLAN type vlan id $VLAN</div><div class='del'>-ip netns exec ${NS2} ip addr add ${IPADDR2}/24 dev $DEVNS2.$VLAN</div><div class='del'>-ip netns exec ${NS2} ip link set $DEVNS2 up</div><div class='del'>-ip netns exec ${NS2} ip link set $DEVNS2.$VLAN up</div><div class='del'>-</div><div class='del'>-# Bringup lo in netns (to avoids confusing people using --interactive)</div><div class='del'>-ip netns exec ${NS1} ip link set lo up</div><div class='del'>-ip netns exec ${NS2} ip link set lo up</div><div class='del'>-</div><div class='del'>-# At this point, the hosts cannot reach each-other,</div><div class='del'>-# because ns2 are using VLAN tags on the packets.</div><div class='del'>-</div><div class='del'>-ip netns exec ${NS2} sh -c 'ping -W 1 -c 1 100.64.41.1 || echo "Success: First ping must fail"'</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Now we can use the test_xdp_vlan.c program to pop/push these VLAN tags</div><div class='del'>-# ----------------------------------------------------------------------</div><div class='del'>-# In ns1: ingress use XDP to remove VLAN tags</div><div class='del'>-export DEVNS1=veth1</div><div class='del'>-export BPF_FILE=test_xdp_vlan.bpf.o</div><div class='del'>-</div><div class='del'>-# First test: Remove VLAN by setting VLAN ID 0, using "xdp_vlan_change"</div><div class='del'>-export XDP_PROG=xdp_vlan_change</div><div class='del'>-ip netns exec ${NS1} ip link set $DEVNS1 $XDP_MODE object $BPF_FILE section $XDP_PROG</div><div class='del'>-</div><div class='del'>-# In ns1: egress use TC to add back VLAN tag 4011</div><div class='del'>-#  (del cmd)</div><div class='del'>-#  tc qdisc del dev $DEVNS1 clsact 2&gt; /dev/null</div><div class='del'>-#</div><div class='del'>-ip netns exec ${NS1} tc qdisc add dev $DEVNS1 clsact</div><div class='del'>-ip netns exec ${NS1} tc filter add dev $DEVNS1 egress \</div><div class='del'>-  prio 1 handle 1 bpf da obj $BPF_FILE sec tc_vlan_push</div><div class='del'>-</div><div class='del'>-# Now the namespaces can reach each-other, test with ping:</div><div class='del'>-ip netns exec ${NS2} ping -i 0.2 -W 2 -c 2 $IPADDR1</div><div class='del'>-ip netns exec ${NS1} ping -i 0.2 -W 2 -c 2 $IPADDR2</div><div class='del'>-</div><div class='del'>-# Second test: Replace xdp prog, that fully remove vlan header</div><div class='del'>-#</div><div class='del'>-# Catch kernel bug for generic-XDP, that does didn't allow us to</div><div class='del'>-# remove a VLAN header, because skb-&gt;protocol still contain VLAN</div><div class='del'>-# ETH_P_8021Q indication, and this cause overwriting of our changes.</div><div class='del'>-#</div><div class='del'>-export XDP_PROG=xdp_vlan_remove_outer2</div><div class='del'>-ip netns exec ${NS1} ip link set $DEVNS1 $XDP_MODE off</div><div class='del'>-ip netns exec ${NS1} ip link set $DEVNS1 $XDP_MODE object $BPF_FILE section $XDP_PROG</div><div class='del'>-</div><div class='del'>-# Now the namespaces should still be able reach each-other, test with ping:</div><div class='del'>-ip netns exec ${NS2} ping -i 0.2 -W 2 -c 2 $IPADDR1</div><div class='del'>-ip netns exec ${NS1} ping -i 0.2 -W 2 -c 2 $IPADDR2</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_xdp_vlan_mode_generic.sh b/tools/testing/selftests/bpf/test_xdp_vlan_mode_generic.sh<br/>deleted file mode 100755<br/>index c515326d6d59..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_xdp_vlan_mode_generic.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_xdp_vlan_mode_generic.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-# Exit on failure</div><div class='del'>-set -e</div><div class='del'>-</div><div class='del'>-# Wrapper script to test generic-XDP</div><div class='del'>-export TESTNAME=xdp_vlan_mode_generic</div><div class='del'>-./test_xdp_vlan.sh --mode=xdpgeneric</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_xdp_vlan_mode_native.sh b/tools/testing/selftests/bpf/test_xdp_vlan_mode_native.sh<br/>deleted file mode 100755<br/>index 5cf7ce1f16c1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_xdp_vlan_mode_native.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_xdp_vlan_mode_native.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-# Exit on failure</div><div class='del'>-set -e</div><div class='del'>-</div><div class='del'>-# Wrapper script to test native-XDP</div><div class='del'>-export TESTNAME=xdp_vlan_mode_native</div><div class='del'>-./test_xdp_vlan.sh --mode=xdpdrv</div><div class='head'>diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh<br/>index 65aafe0003db..62db060298a4 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_xsk.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/test_xsk.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/test_xsk.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/test_xsk.sh</a></div><div class='hunk'>@@ -241,4 +241,6 @@ done</div><div class='ctx'> </div><div class='ctx'> if [ $failures -eq 0 ]; then</div><div class='ctx'>         echo "All tests successful!"</div><div class='add'>+else</div><div class='add'>+	exit 1</div><div class='ctx'> fi</div><div class='head'>diff --git a/tools/testing/selftests/bpf/testing_helpers.c b/tools/testing/selftests/bpf/testing_helpers.c<br/>index 5e9f16683be5..16eb37e5bad6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/testing_helpers.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/testing_helpers.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/testing_helpers.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/testing_helpers.c</a></div><div class='hunk'>@@ -399,7 +399,7 @@ int unload_module(const char *name, bool verbose)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int load_module(const char *path, bool verbose)</div><div class='add'>+static int __load_module(const char *path, const char *param_values, bool verbose)</div><div class='ctx'> {</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='hunk'>@@ -411,7 +411,7 @@ int load_module(const char *path, bool verbose)</div><div class='ctx'> 		fprintf(stdout, "Can't find %s kernel module: %d\n", path, -errno);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='del'>-	if (finit_module(fd, "", 0)) {</div><div class='add'>+	if (finit_module(fd, param_values, 0)) {</div><div class='ctx'> 		fprintf(stdout, "Failed to load %s into the kernel: %d\n", path, -errno);</div><div class='ctx'> 		close(fd);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -423,6 +423,16 @@ int load_module(const char *path, bool verbose)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int load_module_params(const char *path, const char *param_values, bool verbose)</div><div class='add'>+{</div><div class='add'>+	return __load_module(path, param_values, verbose);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int load_module(const char *path, bool verbose)</div><div class='add'>+{</div><div class='add'>+	return __load_module(path, "", verbose);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int unload_bpf_testmod(bool verbose)</div><div class='ctx'> {</div><div class='ctx'> 	return unload_module("bpf_testmod", verbose);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/testing_helpers.h b/tools/testing/selftests/bpf/testing_helpers.h<br/>index 46d7f7089f63..eb20d3772218 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/testing_helpers.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/testing_helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/testing_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/testing_helpers.h</a></div><div class='hunk'>@@ -39,6 +39,7 @@ int kern_sync_rcu(void);</div><div class='ctx'> int finit_module(int fd, const char *param_values, int flags);</div><div class='ctx'> int delete_module(const char *name, int flags);</div><div class='ctx'> int load_module(const char *path, bool verbose);</div><div class='add'>+int load_module_params(const char *path, const char *param_values, bool verbose);</div><div class='ctx'> int unload_module(const char *name, bool verbose);</div><div class='ctx'> </div><div class='ctx'> static inline __u64 get_time_ns(void)</div><div class='head'>diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c<br/>index 81943c6254e6..eeaab7013ca2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/trace_helpers.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/trace_helpers.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/trace_helpers.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/trace_helpers.c</a></div><div class='hunk'>@@ -17,7 +17,9 @@</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='ctx'> #include &lt;libelf.h&gt;</div><div class='ctx'> #include &lt;gelf.h&gt;</div><div class='add'>+#include "bpf/hashmap.h"</div><div class='ctx'> #include "bpf/libbpf_internal.h"</div><div class='add'>+#include "bpf_util.h"</div><div class='ctx'> </div><div class='ctx'> #define TRACEFS_PIPE	"/sys/kernel/tracing/trace_pipe"</div><div class='ctx'> #define DEBUGFS_PIPE	"/sys/kernel/debug/tracing/trace_pipe"</div><div class='hunk'>@@ -519,3 +521,235 @@ void read_trace_pipe(void)</div><div class='ctx'> {</div><div class='ctx'> 	read_trace_pipe_iter(trace_pipe_cb, NULL, 0);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static size_t symbol_hash(long key, void *ctx __maybe_unused)</div><div class='add'>+{</div><div class='add'>+	return str_hash((const char *) key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool symbol_equal(long key1, long key2, void *ctx __maybe_unused)</div><div class='add'>+{</div><div class='add'>+	return strcmp((const char *) key1, (const char *) key2) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_invalid_entry(char *buf, bool kernel)</div><div class='add'>+{</div><div class='add'>+	if (kernel &amp;&amp; strchr(buf, '['))</div><div class='add'>+		return true;</div><div class='add'>+	if (!kernel &amp;&amp; !strchr(buf, '['))</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char * const trace_blacklist[] = {</div><div class='add'>+	"migrate_disable",</div><div class='add'>+	"migrate_enable",</div><div class='add'>+	"rcu_read_unlock_strict",</div><div class='add'>+	"preempt_count_add",</div><div class='add'>+	"preempt_count_sub",</div><div class='add'>+	"__rcu_read_lock",</div><div class='add'>+	"__rcu_read_unlock",</div><div class='add'>+	"bpf_get_numa_node_id",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool skip_entry(char *name)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We attach to almost all kernel functions and some of them</div><div class='add'>+	 * will cause 'suspicious RCU usage' when fprobe is attached</div><div class='add'>+	 * to them. Filter out the current culprits - arch_cpu_idle</div><div class='add'>+	 * default_idle and rcu_* functions.</div><div class='add'>+	 */</div><div class='add'>+	if (!strcmp(name, "arch_cpu_idle"))</div><div class='add'>+		return true;</div><div class='add'>+	if (!strcmp(name, "default_idle"))</div><div class='add'>+		return true;</div><div class='add'>+	if (!strncmp(name, "rcu_", 4))</div><div class='add'>+		return true;</div><div class='add'>+	if (!strcmp(name, "bpf_dispatcher_xdp_func"))</div><div class='add'>+		return true;</div><div class='add'>+	if (!strncmp(name, "__ftrace_invalid_address__",</div><div class='add'>+		     sizeof("__ftrace_invalid_address__") - 1))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(trace_blacklist); i++) {</div><div class='add'>+		if (!strcmp(name, trace_blacklist[i]))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Do comparison by ignoring '.llvm.&lt;hash&gt;' suffixes. */</div><div class='add'>+static int compare_name(const char *name1, const char *name2)</div><div class='add'>+{</div><div class='add'>+	const char *res1, *res2;</div><div class='add'>+	int len1, len2;</div><div class='add'>+</div><div class='add'>+	res1 = strstr(name1, ".llvm.");</div><div class='add'>+	res2 = strstr(name2, ".llvm.");</div><div class='add'>+	len1 = res1 ? res1 - name1 : strlen(name1);</div><div class='add'>+	len2 = res2 ? res2 - name2 : strlen(name2);</div><div class='add'>+</div><div class='add'>+	if (len1 == len2)</div><div class='add'>+		return strncmp(name1, name2, len1);</div><div class='add'>+	if (len1 &lt; len2)</div><div class='add'>+		return strncmp(name1, name2, len1) &lt;= 0 ? -1 : 1;</div><div class='add'>+	return strncmp(name1, name2, len2) &gt;= 0 ? 1 : -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int load_kallsyms_compare(const void *p1, const void *p2)</div><div class='add'>+{</div><div class='add'>+	return compare_name(((const struct ksym *)p1)-&gt;name, ((const struct ksym *)p2)-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int search_kallsyms_compare(const void *p1, const struct ksym *p2)</div><div class='add'>+{</div><div class='add'>+	return compare_name(p1, p2-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bpf_get_ksyms(char ***symsp, size_t *cntp, bool kernel)</div><div class='add'>+{</div><div class='add'>+	size_t cap = 0, cnt = 0;</div><div class='add'>+	char *name = NULL, *ksym_name, **syms = NULL;</div><div class='add'>+	struct hashmap *map;</div><div class='add'>+	struct ksyms *ksyms;</div><div class='add'>+	struct ksym *ks;</div><div class='add'>+	char buf[256];</div><div class='add'>+	FILE *f;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	ksyms = load_kallsyms_custom_local(load_kallsyms_compare);</div><div class='add'>+	if (!ksyms)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The available_filter_functions contains many duplicates,</div><div class='add'>+	 * but other than that all symbols are usable to trace.</div><div class='add'>+	 * Filtering out duplicates by using hashmap__add, which won't</div><div class='add'>+	 * add existing entry.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (access("/sys/kernel/tracing/trace", F_OK) == 0)</div><div class='add'>+		f = fopen("/sys/kernel/tracing/available_filter_functions", "r");</div><div class='add'>+	else</div><div class='add'>+		f = fopen("/sys/kernel/debug/tracing/available_filter_functions", "r");</div><div class='add'>+</div><div class='add'>+	if (!f)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	map = hashmap__new(symbol_hash, symbol_equal, NULL);</div><div class='add'>+	if (IS_ERR(map)) {</div><div class='add'>+		err = libbpf_get_error(map);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (fgets(buf, sizeof(buf), f)) {</div><div class='add'>+		if (is_invalid_entry(buf, kernel))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		free(name);</div><div class='add'>+		if (sscanf(buf, "%ms$*[^\n]\n", &amp;name) != 1)</div><div class='add'>+			continue;</div><div class='add'>+		if (skip_entry(name))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ks = search_kallsyms_custom_local(ksyms, name, search_kallsyms_compare);</div><div class='add'>+		if (!ks) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ksym_name = ks-&gt;name;</div><div class='add'>+		err = hashmap__add(map, ksym_name, 0);</div><div class='add'>+		if (err == -EEXIST) {</div><div class='add'>+			err = 0;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (err)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = libbpf_ensure_mem((void **) &amp;syms, &amp;cap,</div><div class='add'>+					sizeof(*syms), cnt + 1);</div><div class='add'>+		if (err)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		syms[cnt++] = ksym_name;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*symsp = syms;</div><div class='add'>+	*cntp = cnt;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	free(name);</div><div class='add'>+	fclose(f);</div><div class='add'>+	hashmap__free(map);</div><div class='add'>+	if (err)</div><div class='add'>+		free(syms);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bpf_get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel)</div><div class='add'>+{</div><div class='add'>+	unsigned long *addr, *addrs, *tmp_addrs;</div><div class='add'>+	int err = 0, max_cnt, inc_cnt;</div><div class='add'>+	char *name = NULL;</div><div class='add'>+	size_t cnt = 0;</div><div class='add'>+	char buf[256];</div><div class='add'>+	FILE *f;</div><div class='add'>+</div><div class='add'>+	if (access("/sys/kernel/tracing/trace", F_OK) == 0)</div><div class='add'>+		f = fopen("/sys/kernel/tracing/available_filter_functions_addrs", "r");</div><div class='add'>+	else</div><div class='add'>+		f = fopen("/sys/kernel/debug/tracing/available_filter_functions_addrs", "r");</div><div class='add'>+</div><div class='add'>+	if (!f)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/* In my local setup, the number of entries is 50k+ so Let us initially</div><div class='add'>+	 * allocate space to hold 64k entries. If 64k is not enough, incrementally</div><div class='add'>+	 * increase 1k each time.</div><div class='add'>+	 */</div><div class='add'>+	max_cnt = 65536;</div><div class='add'>+	inc_cnt = 1024;</div><div class='add'>+	addrs = malloc(max_cnt * sizeof(long));</div><div class='add'>+	if (addrs == NULL) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (fgets(buf, sizeof(buf), f)) {</div><div class='add'>+		if (is_invalid_entry(buf, kernel))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		free(name);</div><div class='add'>+		if (sscanf(buf, "%p %ms$*[^\n]\n", &amp;addr, &amp;name) != 2)</div><div class='add'>+			continue;</div><div class='add'>+		if (skip_entry(name))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (cnt == max_cnt) {</div><div class='add'>+			max_cnt += inc_cnt;</div><div class='add'>+			tmp_addrs = realloc(addrs, max_cnt * sizeof(long));</div><div class='add'>+			if (!tmp_addrs) {</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+			addrs = tmp_addrs;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		addrs[cnt++] = (unsigned long)addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*addrsp = addrs;</div><div class='add'>+	*cntp = cnt;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	free(name);</div><div class='add'>+	fclose(f);</div><div class='add'>+	if (err)</div><div class='add'>+		free(addrs);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/trace_helpers.h b/tools/testing/selftests/bpf/trace_helpers.h<br/>index 2ce873c9f9aa..9437bdd4afa5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/trace_helpers.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/trace_helpers.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/trace_helpers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/trace_helpers.h</a></div><div class='hunk'>@@ -41,4 +41,7 @@ ssize_t get_rel_offset(uintptr_t addr);</div><div class='ctx'> </div><div class='ctx'> int read_build_id(const char *path, char *build_id, size_t size);</div><div class='ctx'> </div><div class='add'>+int bpf_get_ksyms(char ***symsp, size_t *cntp, bool kernel);</div><div class='add'>+int bpf_get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/tools/testing/selftests/bpf/unpriv_helpers.c b/tools/testing/selftests/bpf/unpriv_helpers.c<br/>index 220f6a963813..f997d7ec8fd0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/unpriv_helpers.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/unpriv_helpers.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/unpriv_helpers.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/unpriv_helpers.c</a></div><div class='hunk'>@@ -1,15 +1,76 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> </div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;limits.h&gt;</div><div class='ctx'> #include &lt;stdbool.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/utsname.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;zlib.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "unpriv_helpers.h"</div><div class='ctx'> </div><div class='del'>-static bool get_mitigations_off(void)</div><div class='add'>+static gzFile open_config(void)</div><div class='add'>+{</div><div class='add'>+	struct utsname uts;</div><div class='add'>+	char buf[PATH_MAX];</div><div class='add'>+	gzFile config;</div><div class='add'>+</div><div class='add'>+	if (uname(&amp;uts)) {</div><div class='add'>+		perror("uname");</div><div class='add'>+		goto config_gz;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(buf, sizeof(buf), "/boot/config-%s", uts.release);</div><div class='add'>+	config = gzopen(buf, "rb");</div><div class='add'>+	if (config)</div><div class='add'>+		return config;</div><div class='add'>+	fprintf(stderr, "gzopen %s: %s\n", buf, strerror(errno));</div><div class='add'>+</div><div class='add'>+config_gz:</div><div class='add'>+	config = gzopen("/proc/config.gz", "rb");</div><div class='add'>+	if (!config)</div><div class='add'>+		perror("gzopen /proc/config.gz");</div><div class='add'>+	return config;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int config_contains(const char *pat)</div><div class='add'>+{</div><div class='add'>+	const char *msg;</div><div class='add'>+	char buf[1024];</div><div class='add'>+	gzFile config;</div><div class='add'>+	int n, err;</div><div class='add'>+</div><div class='add'>+	config = open_config();</div><div class='add'>+	if (!config)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		if (!gzgets(config, buf, sizeof(buf))) {</div><div class='add'>+			msg = gzerror(config, &amp;err);</div><div class='add'>+			if (err == Z_ERRNO)</div><div class='add'>+				perror("gzgets /proc/config.gz");</div><div class='add'>+			else if (err != Z_OK)</div><div class='add'>+				fprintf(stderr, "gzgets /proc/config.gz: %s", msg);</div><div class='add'>+			gzclose(config);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		n = strlen(buf);</div><div class='add'>+		if (buf[n - 1] == '\n')</div><div class='add'>+			buf[n - 1] = 0;</div><div class='add'>+		if (strcmp(buf, pat) == 0) {</div><div class='add'>+			gzclose(config);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	gzclose(config);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool cmdline_contains(const char *pat)</div><div class='ctx'> {</div><div class='ctx'> 	char cmdline[4096], *c;</div><div class='ctx'> 	int fd, ret = false;</div><div class='hunk'>@@ -27,7 +88,7 @@ static bool get_mitigations_off(void)</div><div class='ctx'> </div><div class='ctx'> 	cmdline[sizeof(cmdline) - 1] = '\0';</div><div class='ctx'> 	for (c = strtok(cmdline, " \n"); c; c = strtok(NULL, " \n")) {</div><div class='del'>-		if (strncmp(c, "mitigations=off", strlen(c)))</div><div class='add'>+		if (strncmp(c, pat, strlen(c)))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		ret = true;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -37,8 +98,21 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int get_mitigations_off(void)</div><div class='add'>+{</div><div class='add'>+	int enabled_in_config;</div><div class='add'>+</div><div class='add'>+	if (cmdline_contains("mitigations=off"))</div><div class='add'>+		return 1;</div><div class='add'>+	enabled_in_config = config_contains("CONFIG_CPU_MITIGATIONS=y");</div><div class='add'>+	if (enabled_in_config &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	return !enabled_in_config;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool get_unpriv_disabled(void)</div><div class='ctx'> {</div><div class='add'>+	int mitigations_off;</div><div class='ctx'> 	bool disabled;</div><div class='ctx'> 	char buf[2];</div><div class='ctx'> 	FILE *fd;</div><div class='hunk'>@@ -52,5 +126,19 @@ bool get_unpriv_disabled(void)</div><div class='ctx'> 		disabled = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return disabled ? true : get_mitigations_off();</div><div class='add'>+	if (disabled)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some unpriv tests rely on spectre mitigations being on.</div><div class='add'>+	 * If mitigations are off or status can't be determined</div><div class='add'>+	 * assume that unpriv tests are disabled.</div><div class='add'>+	 */</div><div class='add'>+	mitigations_off = get_mitigations_off();</div><div class='add'>+	if (mitigations_off &lt; 0) {</div><div class='add'>+		fprintf(stderr,</div><div class='add'>+			"Can't determine if mitigations are enabled, disabling unpriv tests.");</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return mitigations_off;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/usdt.h b/tools/testing/selftests/bpf/usdt.h<br/>new file mode 100644<br/>index 000000000000..549d1f774810<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/usdt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/usdt.h</a></div><div class='hunk'>@@ -0,0 +1,545 @@</div><div class='add'>+// SPDX-License-Identifier: BSD-2-Clause</div><div class='add'>+/*</div><div class='add'>+ *  This single-header library defines a collection of variadic macros for</div><div class='add'>+ *  defining and triggering USDTs (User Statically-Defined Tracepoints):</div><div class='add'>+ *</div><div class='add'>+ *      - For USDTs without associated semaphore:</div><div class='add'>+ *          USDT(group, name, args...)</div><div class='add'>+ *</div><div class='add'>+ *      - For USDTs with implicit (transparent to the user) semaphore:</div><div class='add'>+ *          USDT_WITH_SEMA(group, name, args...)</div><div class='add'>+ *          USDT_IS_ACTIVE(group, name)</div><div class='add'>+ *</div><div class='add'>+ *      - For USDTs with explicit (user-defined and provided) semaphore:</div><div class='add'>+ *          USDT_WITH_EXPLICIT_SEMA(sema, group, name, args...)</div><div class='add'>+ *          USDT_SEMA_IS_ACTIVE(sema)</div><div class='add'>+ *</div><div class='add'>+ *  all of which emit a NOP instruction into the instruction stream, and so</div><div class='add'>+ *  have *zero* overhead for the surrounding code. USDTs are identified by</div><div class='add'>+ *  a combination of `group` and `name` identifiers, which is used by external</div><div class='add'>+ *  tracing tooling (tracers) for identifying exact USDTs of interest.</div><div class='add'>+ *</div><div class='add'>+ *  USDTs can have an associated (2-byte) activity counter (USDT semaphore),</div><div class='add'>+ *  automatically maintained by Linux kernel whenever any correctly written</div><div class='add'>+ *  BPF-based tracer is attached to the USDT. This USDT semaphore can be used</div><div class='add'>+ *  to check whether there is a need to do any extra data collection and</div><div class='add'>+ *  processing for a given USDT (if necessary), and otherwise avoid extra work</div><div class='add'>+ *  for a common case of USDT not being traced ("active").</div><div class='add'>+ *</div><div class='add'>+ *  See documentation for USDT_WITH_SEMA()/USDT_IS_ACTIVE() or</div><div class='add'>+ *  USDT_WITH_EXPLICIT_SEMA()/USDT_SEMA_IS_ACTIVE() APIs below for details on</div><div class='add'>+ *  working with USDTs with implicitly or explicitly associated</div><div class='add'>+ *  USDT semaphores, respectively.</div><div class='add'>+ *</div><div class='add'>+ *  There is also some additional data recorded into an auxiliary note</div><div class='add'>+ *  section. The data in the note section describes the operands, in terms of</div><div class='add'>+ *  size and location, used by tracing tooling to know where to find USDT</div><div class='add'>+ *  arguments. Each location is encoded as an assembler operand string.</div><div class='add'>+ *  Tracing tools (bpftrace and BPF-based tracers, systemtap, etc) insert</div><div class='add'>+ *  breakpoints on top of the nop, and decode the location operand-strings,</div><div class='add'>+ *  like an assembler, to find the values being passed.</div><div class='add'>+ *</div><div class='add'>+ *  The operand strings are selected by the compiler for each operand.</div><div class='add'>+ *  They are constrained by inline-assembler codes.The default is:</div><div class='add'>+ *</div><div class='add'>+ *  #define USDT_ARG_CONSTRAINT nor</div><div class='add'>+ *</div><div class='add'>+ *  This is a good default if the operands tend to be integral and</div><div class='add'>+ *  moderate in number (smaller than number of registers). In other</div><div class='add'>+ *  cases, the compiler may report "'asm' requires impossible reload" or</div><div class='add'>+ *  similar. In this case, consider simplifying the macro call (fewer</div><div class='add'>+ *  and simpler operands), reduce optimization, or override the default</div><div class='add'>+ *  constraints string via:</div><div class='add'>+ *</div><div class='add'>+ *  #define USDT_ARG_CONSTRAINT g</div><div class='add'>+ *  #include &lt;usdt.h&gt;</div><div class='add'>+ *</div><div class='add'>+ * For some historical description of USDT v3 format (the one used by this</div><div class='add'>+ * library and generally recognized and assumed by BPF-based tracing tools)</div><div class='add'>+ * see [0]. The more formal specification can be found at [1]. Additional</div><div class='add'>+ * argument constraints information can be found at [2].</div><div class='add'>+ *</div><div class='add'>+ * Original SystemTap's sys/sdt.h implementation ([3]) was used as a base for</div><div class='add'>+ * this USDT library implementation. Current implementation differs *a lot* in</div><div class='add'>+ * terms of exposed user API and general usability, which was the main goal</div><div class='add'>+ * and focus of the reimplementation work. Nevertheless, underlying recorded</div><div class='add'>+ * USDT definitions are fully binary compatible and any USDT-based tooling</div><div class='add'>+ * should work equally well with USDTs defined by either SystemTap's or this</div><div class='add'>+ * library's USDT implementation.</div><div class='add'>+ *</div><div class='add'>+ *   [0] https://ecos.sourceware.org/ml/systemtap/2010-q3/msg00145.html</div><div class='add'>+ *   [1] https://sourceware.org/systemtap/wiki/UserSpaceProbeImplementation</div><div class='add'>+ *   [2] https://gcc.gnu.org/onlinedocs/gcc/Constraints.html</div><div class='add'>+ *   [3] https://sourceware.org/git/?p=systemtap.git;a=blob;f=includes/sys/sdt.h</div><div class='add'>+ */</div><div class='add'>+#ifndef __USDT_H</div><div class='add'>+#define __USDT_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Changelog:</div><div class='add'>+ *</div><div class='add'>+ * 0.1.0</div><div class='add'>+ * -----</div><div class='add'>+ * - Initial release</div><div class='add'>+ */</div><div class='add'>+#define USDT_MAJOR_VERSION 0</div><div class='add'>+#define USDT_MINOR_VERSION 1</div><div class='add'>+#define USDT_PATCH_VERSION 0</div><div class='add'>+</div><div class='add'>+/* C++20 and C23 added __VA_OPT__ as a standard replacement for non-standard `##__VA_ARGS__` extension */</div><div class='add'>+#if (defined(__STDC_VERSION__) &amp;&amp; __STDC_VERSION__ &gt; 201710L) || (defined(__cplusplus) &amp;&amp; __cplusplus &gt; 201703L)</div><div class='add'>+#define __usdt_va_opt 1</div><div class='add'>+#define __usdt_va_args(...) __VA_OPT__(,) __VA_ARGS__</div><div class='add'>+#else</div><div class='add'>+#define __usdt_va_args(...) , ##__VA_ARGS__</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Trigger USDT with `group`:`name` identifier and pass through `args` as its</div><div class='add'>+ * arguments. Zero arguments are acceptable as well. No USDT semaphore is</div><div class='add'>+ * associated with this USDT.</div><div class='add'>+ *</div><div class='add'>+ * Such "semaphoreless" USDTs are commonly used when there is no extra data</div><div class='add'>+ * collection or processing needed to collect and prepare USDT arguments and</div><div class='add'>+ * they are just available in the surrounding code. USDT() macro will just</div><div class='add'>+ * record their locations in CPU registers or in memory for tracing tooling to</div><div class='add'>+ * be able to access them, if necessary.</div><div class='add'>+ */</div><div class='add'>+#ifdef __usdt_va_opt</div><div class='add'>+#define USDT(group, name, ...)							\</div><div class='add'>+	__usdt_probe(group, name, __usdt_sema_none, 0 __VA_OPT__(,) __VA_ARGS__)</div><div class='add'>+#else</div><div class='add'>+#define USDT(group, name, ...)							\</div><div class='add'>+	__usdt_probe(group, name, __usdt_sema_none, 0, ##__VA_ARGS__)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Trigger USDT with `group`:`name` identifier and pass through `args` as its</div><div class='add'>+ * arguments. Zero arguments are acceptable as well. USDT also get an</div><div class='add'>+ * implicitly-defined associated USDT semaphore, which will be "activated" by</div><div class='add'>+ * tracing tooling and can be used to check whether USDT is being actively</div><div class='add'>+ * observed.</div><div class='add'>+ *</div><div class='add'>+ * USDTs with semaphore are commonly used when there is a need to perform</div><div class='add'>+ * additional data collection and processing to prepare USDT arguments, which</div><div class='add'>+ * otherwise might not be necessary for the rest of application logic. In such</div><div class='add'>+ * case, USDT semaphore can be used to avoid unnecessary extra work. If USDT</div><div class='add'>+ * is not traced (which is presumed to be a common situation), the associated</div><div class='add'>+ * USDT semaphore is "inactive", and so there is no need to waste resources to</div><div class='add'>+ * prepare USDT arguments. Use USDT_IS_ACTIVE(group, name) to check whether</div><div class='add'>+ * USDT is "active".</div><div class='add'>+ *</div><div class='add'>+ * N.B. There is an inherent (albeit short) gap between checking whether USDT</div><div class='add'>+ * is active and triggering corresponding USDT, in which external tracer can</div><div class='add'>+ * be attached to an USDT and activate USDT semaphore after the activity check.</div><div class='add'>+ * If such a race occurs, tracers might miss one USDT execution. Tracers are</div><div class='add'>+ * expected to accommodate such possibility and this is expected to not be</div><div class='add'>+ * a problem for applications and tracers.</div><div class='add'>+ *</div><div class='add'>+ * N.B. Implicit USDT semaphore defined by USDT_WITH_SEMA() is contained</div><div class='add'>+ * within a single executable or shared library and is not shared outside</div><div class='add'>+ * them. I.e., if you use USDT_WITH_SEMA() with the same USDT group and name</div><div class='add'>+ * identifier across executable and shared library, it will work and won't</div><div class='add'>+ * conflict, per se, but will define independent USDT semaphores, one for each</div><div class='add'>+ * shared library/executable in which USDT_WITH_SEMA(group, name) is used.</div><div class='add'>+ * That is, if you attach to this USDT in one shared library (or executable),</div><div class='add'>+ * then only USDT semaphore within that shared library (or executable) will be</div><div class='add'>+ * updated by the kernel, while other libraries (or executable) will not see</div><div class='add'>+ * activated USDT semaphore. In short, it's best to use unique USDT group:name</div><div class='add'>+ * identifiers across different shared libraries (and, equivalently, between</div><div class='add'>+ * executable and shared library). This is advanced consideration and is</div><div class='add'>+ * rarely (if ever) seen in practice, but just to avoid surprises this is</div><div class='add'>+ * called out here. (Static libraries become a part of final executable, once</div><div class='add'>+ * linked by linker, so the above considerations don't apply to them.)</div><div class='add'>+ */</div><div class='add'>+#ifdef __usdt_va_opt</div><div class='add'>+#define USDT_WITH_SEMA(group, name, ...)					\</div><div class='add'>+	__usdt_probe(group, name,						\</div><div class='add'>+		     __usdt_sema_implicit, __usdt_sema_name(group, name)	\</div><div class='add'>+		     __VA_OPT__(,) __VA_ARGS__)</div><div class='add'>+#else</div><div class='add'>+#define USDT_WITH_SEMA(group, name, ...)					\</div><div class='add'>+	__usdt_probe(group, name,						\</div><div class='add'>+		     __usdt_sema_implicit, __usdt_sema_name(group, name),	\</div><div class='add'>+		     ##__VA_ARGS__)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct usdt_sema { volatile unsigned short active; };</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if USDT with `group`:`name` identifier is "active" (i.e., whether it</div><div class='add'>+ * is attached to by external tracing tooling and is actively observed).</div><div class='add'>+ *</div><div class='add'>+ * This macro can be used to decide whether any additional and potentially</div><div class='add'>+ * expensive data collection or processing should be done to pass extra</div><div class='add'>+ * information into the given USDT. It is assumed that USDT is triggered with</div><div class='add'>+ * USDT_WITH_SEMA() macro which will implicitly define associated USDT</div><div class='add'>+ * semaphore. (If one needs more control over USDT semaphore, see</div><div class='add'>+ * USDT_DEFINE_SEMA() and USDT_WITH_EXPLICIT_SEMA() macros below.)</div><div class='add'>+ *</div><div class='add'>+ * N.B. Such checks are necessarily racy and speculative. Between checking</div><div class='add'>+ * whether USDT is active and triggering the USDT itself, tracer can be</div><div class='add'>+ * detached with no notification. This race should be extremely rare and worst</div><div class='add'>+ * case should result in one-time wasted extra data collection and processing.</div><div class='add'>+ */</div><div class='add'>+#define USDT_IS_ACTIVE(group, name) ({						\</div><div class='add'>+	extern struct usdt_sema __usdt_sema_name(group, name)			\</div><div class='add'>+		__usdt_asm_name(__usdt_sema_name(group, name));			\</div><div class='add'>+	__usdt_sema_implicit(__usdt_sema_name(group, name));			\</div><div class='add'>+	__usdt_sema_name(group, name).active &gt; 0;				\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * APIs for working with user-defined explicit USDT semaphores.</div><div class='add'>+ *</div><div class='add'>+ * This is a less commonly used advanced API for use cases in which user needs</div><div class='add'>+ * an explicit control over (potentially shared across multiple USDTs) USDT</div><div class='add'>+ * semaphore instance. This can be used when there is a group of logically</div><div class='add'>+ * related USDTs that all need extra data collection and processing whenever</div><div class='add'>+ * any of a family of related USDTs are "activated" (i.e., traced). In such</div><div class='add'>+ * a case, all such related USDTs will be associated with the same shared USDT</div><div class='add'>+ * semaphore defined with USDT_DEFINE_SEMA() and the USDTs themselves will be</div><div class='add'>+ * triggered with USDT_WITH_EXPLICIT_SEMA() macros, taking an explicit extra</div><div class='add'>+ * USDT semaphore identifier as an extra parameter.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Underlying C global variable name for user-defined USDT semaphore with</div><div class='add'>+ * `sema` identifier. Could be useful for debugging, but normally shouldn't be</div><div class='add'>+ * used explicitly.</div><div class='add'>+ */</div><div class='add'>+#define USDT_SEMA(sema) __usdt_sema_##sema</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define storage for user-defined USDT semaphore `sema`.</div><div class='add'>+ *</div><div class='add'>+ * Should be used only once in non-header source file to let compiler allocate</div><div class='add'>+ * space for the semaphore variable. Just like with any other global variable.</div><div class='add'>+ *</div><div class='add'>+ * This macro can be used anywhere where global variable declaration is</div><div class='add'>+ * allowed. Just like with global variable definitions, there should be only</div><div class='add'>+ * one definition of user-defined USDT semaphore with given `sema` identifier,</div><div class='add'>+ * otherwise compiler or linker will complain about duplicate variable</div><div class='add'>+ * definition.</div><div class='add'>+ *</div><div class='add'>+ * For C++, it is allowed to use USDT_DEFINE_SEMA() both in global namespace</div><div class='add'>+ * and inside namespaces (including nested namespaces). Just make sure that</div><div class='add'>+ * USDT_DECLARE_SEMA() is placed within the namespace where this semaphore is</div><div class='add'>+ * referenced, or any of its parent namespaces, so the C++ language-level</div><div class='add'>+ * identifier is visible to the code that needs to reference the semaphore.</div><div class='add'>+ * At the lowest layer, USDT semaphores have global naming and visibility</div><div class='add'>+ * (they have a corresponding `__usdt_sema_&lt;name&gt;` symbol, which can be linked</div><div class='add'>+ * against from C or C++ code, if necessary). To keep it simple, putting</div><div class='add'>+ * USDT_DECLARE_SEMA() declarations into global namespaces is the simplest</div><div class='add'>+ * no-brainer solution. All these aspects are irrelevant for plain C, because</div><div class='add'>+ * C doesn't have namespaces and everything is always in the global namespace.</div><div class='add'>+ *</div><div class='add'>+ * N.B. Due to USDT metadata being recorded in non-allocatable ELF note</div><div class='add'>+ * section, it has limitations when it comes to relocations, which, in</div><div class='add'>+ * practice, means that it's not possible to correctly share USDT semaphores</div><div class='add'>+ * between main executable and shared libraries, or even between multiple</div><div class='add'>+ * shared libraries. USDT semaphore has to be contained to individual shared</div><div class='add'>+ * library or executable to avoid unpleasant surprises with half-working USDT</div><div class='add'>+ * semaphores. We enforce this by marking semaphore ELF symbols as having</div><div class='add'>+ * a hidden visibility. This is quite an advanced use case and consideration</div><div class='add'>+ * and for most users this should have no consequences whatsoever.</div><div class='add'>+ */</div><div class='add'>+#define USDT_DEFINE_SEMA(sema)							\</div><div class='add'>+	struct usdt_sema __usdt_sema_sec USDT_SEMA(sema)			\</div><div class='add'>+		__usdt_asm_name(USDT_SEMA(sema))				\</div><div class='add'>+		__attribute__((visibility("hidden"))) = { 0 }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Declare extern reference to user-defined USDT semaphore `sema`.</div><div class='add'>+ *</div><div class='add'>+ * Refers to a variable defined in another compilation unit by</div><div class='add'>+ * USDT_DEFINE_SEMA() and allows to use the same USDT semaphore across</div><div class='add'>+ * multiple compilation units (i.e., .c and .cpp files).</div><div class='add'>+ *</div><div class='add'>+ * See USDT_DEFINE_SEMA() notes above for C++ language usage peculiarities.</div><div class='add'>+ */</div><div class='add'>+#define USDT_DECLARE_SEMA(sema)							\</div><div class='add'>+	extern struct usdt_sema USDT_SEMA(sema) __usdt_asm_name(USDT_SEMA(sema))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if user-defined USDT semaphore `sema` is "active" (i.e., whether it</div><div class='add'>+ * is attached to by external tracing tooling and is actively observed).</div><div class='add'>+ *</div><div class='add'>+ * This macro can be used to decide whether any additional and potentially</div><div class='add'>+ * expensive data collection or processing should be done to pass extra</div><div class='add'>+ * information into USDT(s) associated with USDT semaphore `sema`.</div><div class='add'>+ *</div><div class='add'>+ * N.B. Such checks are necessarily racy. Between checking the state of USDT</div><div class='add'>+ * semaphore and triggering associated USDT(s), the active tracer might attach</div><div class='add'>+ * or detach. This race should be extremely rare and worst case should result</div><div class='add'>+ * in one-time missed USDT event or wasted extra data collection and</div><div class='add'>+ * processing. USDT-using tracers should be written with this in mind and is</div><div class='add'>+ * not a concern of the application defining USDTs with associated semaphore.</div><div class='add'>+ */</div><div class='add'>+#define USDT_SEMA_IS_ACTIVE(sema) (USDT_SEMA(sema).active &gt; 0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Invoke USDT specified by `group` and `name` identifiers and associate</div><div class='add'>+ * explicitly user-defined semaphore `sema` with it. Pass through `args` as</div><div class='add'>+ * USDT arguments. `args` are optional and zero arguments are acceptable.</div><div class='add'>+ *</div><div class='add'>+ * Semaphore is defined with the help of USDT_DEFINE_SEMA() macro and can be</div><div class='add'>+ * checked whether active with USDT_SEMA_IS_ACTIVE().</div><div class='add'>+ */</div><div class='add'>+#ifdef __usdt_va_opt</div><div class='add'>+#define USDT_WITH_EXPLICIT_SEMA(sema, group, name, ...)				\</div><div class='add'>+	__usdt_probe(group, name, __usdt_sema_explicit, USDT_SEMA(sema), ##__VA_ARGS__)</div><div class='add'>+#else</div><div class='add'>+#define USDT_WITH_EXPLICIT_SEMA(sema, group, name, ...)				\</div><div class='add'>+	__usdt_probe(group, name, __usdt_sema_explicit, USDT_SEMA(sema) __VA_OPT__(,) __VA_ARGS__)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Adjustable implementation aspects</div><div class='add'>+ */</div><div class='add'>+#ifndef USDT_ARG_CONSTRAINT</div><div class='add'>+#if defined __powerpc__</div><div class='add'>+#define USDT_ARG_CONSTRAINT		nZr</div><div class='add'>+#elif defined __arm__</div><div class='add'>+#define USDT_ARG_CONSTRAINT		g</div><div class='add'>+#elif defined __loongarch__</div><div class='add'>+#define USDT_ARG_CONSTRAINT		nmr</div><div class='add'>+#else</div><div class='add'>+#define USDT_ARG_CONSTRAINT		nor</div><div class='add'>+#endif</div><div class='add'>+#endif /* USDT_ARG_CONSTRAINT */</div><div class='add'>+</div><div class='add'>+#ifndef USDT_NOP</div><div class='add'>+#if defined(__ia64__) || defined(__s390__) || defined(__s390x__)</div><div class='add'>+#define USDT_NOP			nop 0</div><div class='add'>+#else</div><div class='add'>+#define USDT_NOP			nop</div><div class='add'>+#endif</div><div class='add'>+#endif /* USDT_NOP */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Implementation details</div><div class='add'>+ */</div><div class='add'>+/* USDT name for implicitly-defined USDT semaphore, derived from group:name */</div><div class='add'>+#define __usdt_sema_name(group, name)	__usdt_sema_##group##__##name</div><div class='add'>+/* ELF section into which USDT semaphores are put */</div><div class='add'>+#define __usdt_sema_sec			__attribute__((section(".probes")))</div><div class='add'>+</div><div class='add'>+#define __usdt_concat(a, b)		a ## b</div><div class='add'>+#define __usdt_apply(fn, n)		__usdt_concat(fn, n)</div><div class='add'>+</div><div class='add'>+#ifndef __usdt_nth</div><div class='add'>+#define __usdt_nth(_, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, N, ...) N</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __usdt_narg</div><div class='add'>+#ifdef __usdt_va_opt</div><div class='add'>+#define __usdt_narg(...) __usdt_nth(_ __VA_OPT__(,) __VA_ARGS__, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)</div><div class='add'>+#else</div><div class='add'>+#define __usdt_narg(...) __usdt_nth(_, ##__VA_ARGS__, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)</div><div class='add'>+#endif</div><div class='add'>+#endif /* __usdt_narg */</div><div class='add'>+</div><div class='add'>+#define __usdt_hash			#</div><div class='add'>+#define __usdt_str_(x)			#x</div><div class='add'>+#define __usdt_str(x)			__usdt_str_(x)</div><div class='add'>+</div><div class='add'>+#ifndef __usdt_asm_name</div><div class='add'>+#define __usdt_asm_name(name)		__asm__(__usdt_str(name))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define __usdt_asm0()		"\n"</div><div class='add'>+#define __usdt_asm1(x)		__usdt_str(x) "\n"</div><div class='add'>+#define __usdt_asm2(x, ...)	__usdt_str(x) "," __usdt_asm1(__VA_ARGS__)</div><div class='add'>+#define __usdt_asm3(x, ...)	__usdt_str(x) "," __usdt_asm2(__VA_ARGS__)</div><div class='add'>+#define __usdt_asm4(x, ...)	__usdt_str(x) "," __usdt_asm3(__VA_ARGS__)</div><div class='add'>+#define __usdt_asm5(x, ...)	__usdt_str(x) "," __usdt_asm4(__VA_ARGS__)</div><div class='add'>+#define __usdt_asm6(x, ...)	__usdt_str(x) "," __usdt_asm5(__VA_ARGS__)</div><div class='add'>+#define __usdt_asm7(x, ...)	__usdt_str(x) "," __usdt_asm6(__VA_ARGS__)</div><div class='add'>+#define __usdt_asm8(x, ...)	__usdt_str(x) "," __usdt_asm7(__VA_ARGS__)</div><div class='add'>+#define __usdt_asm9(x, ...)	__usdt_str(x) "," __usdt_asm8(__VA_ARGS__)</div><div class='add'>+#define __usdt_asm10(x, ...)	__usdt_str(x) "," __usdt_asm9(__VA_ARGS__)</div><div class='add'>+#define __usdt_asm11(x, ...)	__usdt_str(x) "," __usdt_asm10(__VA_ARGS__)</div><div class='add'>+#define __usdt_asm12(x, ...)	__usdt_str(x) "," __usdt_asm11(__VA_ARGS__)</div><div class='add'>+#define __usdt_asm(...)		__usdt_apply(__usdt_asm, __usdt_narg(__VA_ARGS__))(__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#ifdef __LP64__</div><div class='add'>+#define __usdt_asm_addr		.8byte</div><div class='add'>+#else</div><div class='add'>+#define __usdt_asm_addr		.4byte</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define __usdt_asm_strz_(x)	__usdt_asm1(.asciz #x)</div><div class='add'>+#define __usdt_asm_strz(x)	__usdt_asm_strz_(x)</div><div class='add'>+#define __usdt_asm_str_(x)	__usdt_asm1(.ascii #x)</div><div class='add'>+#define __usdt_asm_str(x)	__usdt_asm_str_(x)</div><div class='add'>+</div><div class='add'>+/* "semaphoreless" USDT case */</div><div class='add'>+#ifndef __usdt_sema_none</div><div class='add'>+#define __usdt_sema_none(sema)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* implicitly defined __usdt_sema__group__name semaphore (using weak symbols) */</div><div class='add'>+#ifndef __usdt_sema_implicit</div><div class='add'>+#define __usdt_sema_implicit(sema)								\</div><div class='add'>+	__asm__ __volatile__ (									\</div><div class='add'>+	__usdt_asm1(.ifndef sema)								\</div><div class='add'>+	__usdt_asm3(		.pushsection .probes, "aw", "progbits")				\</div><div class='add'>+	__usdt_asm1(		.weak sema)							\</div><div class='add'>+	__usdt_asm1(		.hidden sema)							\</div><div class='add'>+	__usdt_asm1(		.align 2)							\</div><div class='add'>+	__usdt_asm1(sema:)									\</div><div class='add'>+	__usdt_asm1(		.zero 2)							\</div><div class='add'>+	__usdt_asm2(		.type sema, @object)						\</div><div class='add'>+	__usdt_asm2(		.size sema, 2)							\</div><div class='add'>+	__usdt_asm1(		.popsection)							\</div><div class='add'>+	__usdt_asm1(.endif)									\</div><div class='add'>+	);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* externally defined semaphore using USDT_DEFINE_SEMA() and passed explicitly by user */</div><div class='add'>+#ifndef __usdt_sema_explicit</div><div class='add'>+#define __usdt_sema_explicit(sema)								\</div><div class='add'>+	__asm__ __volatile__ ("" :: "m" (sema));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* main USDT definition (nop and .note.stapsdt metadata) */</div><div class='add'>+#define __usdt_probe(group, name, sema_def, sema, ...) do {					\</div><div class='add'>+	sema_def(sema)										\</div><div class='add'>+	__asm__ __volatile__ (									\</div><div class='add'>+	__usdt_asm( 990:	USDT_NOP)							\</div><div class='add'>+	__usdt_asm3(		.pushsection .note.stapsdt, "", "note")				\</div><div class='add'>+	__usdt_asm1(		.balign 4)							\</div><div class='add'>+	__usdt_asm3(		.4byte 992f-991f,994f-993f,3)					\</div><div class='add'>+	__usdt_asm1(991:	.asciz "stapsdt")						\</div><div class='add'>+	__usdt_asm1(992:	.balign 4)							\</div><div class='add'>+	__usdt_asm1(993:	__usdt_asm_addr 990b)						\</div><div class='add'>+	__usdt_asm1(		__usdt_asm_addr _.stapsdt.base)					\</div><div class='add'>+	__usdt_asm1(		__usdt_asm_addr sema)						\</div><div class='add'>+	__usdt_asm_strz(group)									\</div><div class='add'>+	__usdt_asm_strz(name)									\</div><div class='add'>+	__usdt_asm_args(__VA_ARGS__)								\</div><div class='add'>+	__usdt_asm1(		.ascii "\0")							\</div><div class='add'>+	__usdt_asm1(994:	.balign 4)							\</div><div class='add'>+	__usdt_asm1(		.popsection)							\</div><div class='add'>+	__usdt_asm1(.ifndef _.stapsdt.base)							\</div><div class='add'>+	__usdt_asm5(		.pushsection .stapsdt.base,"aG","progbits",.stapsdt.base,comdat)\</div><div class='add'>+	__usdt_asm1(		.weak _.stapsdt.base)						\</div><div class='add'>+	__usdt_asm1(		.hidden _.stapsdt.base)						\</div><div class='add'>+	__usdt_asm1(_.stapsdt.base:)								\</div><div class='add'>+	__usdt_asm1(		.space 1)							\</div><div class='add'>+	__usdt_asm2(		.size _.stapsdt.base, 1)					\</div><div class='add'>+	__usdt_asm1(		.popsection)							\</div><div class='add'>+	__usdt_asm1(.endif)									\</div><div class='add'>+	:: __usdt_asm_ops(__VA_ARGS__)								\</div><div class='add'>+	);											\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NB: gdb PR24541 highlighted an unspecified corner of the sdt.h</div><div class='add'>+ * operand note format.</div><div class='add'>+ *</div><div class='add'>+ * The named register may be a longer or shorter (!) alias for the</div><div class='add'>+ * storage where the value in question is found. For example, on</div><div class='add'>+ * i386, 64-bit value may be put in register pairs, and a register</div><div class='add'>+ * name stored would identify just one of them. Previously, gcc was</div><div class='add'>+ * asked to emit the %w[id] (16-bit alias of some registers holding</div><div class='add'>+ * operands), even when a wider 32-bit value was used.</div><div class='add'>+ *</div><div class='add'>+ * Bottom line: the byte-width given before the @ sign governs. If</div><div class='add'>+ * there is a mismatch between that width and that of the named</div><div class='add'>+ * register, then a sys/sdt.h note consumer may need to employ</div><div class='add'>+ * architecture-specific heuristics to figure out where the compiler</div><div class='add'>+ * has actually put the complete value.</div><div class='add'>+ */</div><div class='add'>+#if defined(__powerpc__) || defined(__powerpc64__)</div><div class='add'>+#define __usdt_argref(id)	%I[id]%[id]</div><div class='add'>+#elif defined(__i386__)</div><div class='add'>+#define __usdt_argref(id)	%k[id]		/* gcc.gnu.org/PR80115 sourceware.org/PR24541 */</div><div class='add'>+#else</div><div class='add'>+#define __usdt_argref(id)	%[id]</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define __usdt_asm_arg(n)	__usdt_asm_str(%c[__usdt_asz##n])				\</div><div class='add'>+				__usdt_asm1(.ascii "@")						\</div><div class='add'>+				__usdt_asm_str(__usdt_argref(__usdt_aval##n))</div><div class='add'>+</div><div class='add'>+#define __usdt_asm_args0	/* no arguments */</div><div class='add'>+#define __usdt_asm_args1	__usdt_asm_arg(1)</div><div class='add'>+#define __usdt_asm_args2	__usdt_asm_args1 __usdt_asm1(.ascii " ") __usdt_asm_arg(2)</div><div class='add'>+#define __usdt_asm_args3	__usdt_asm_args2 __usdt_asm1(.ascii " ") __usdt_asm_arg(3)</div><div class='add'>+#define __usdt_asm_args4	__usdt_asm_args3 __usdt_asm1(.ascii " ") __usdt_asm_arg(4)</div><div class='add'>+#define __usdt_asm_args5	__usdt_asm_args4 __usdt_asm1(.ascii " ") __usdt_asm_arg(5)</div><div class='add'>+#define __usdt_asm_args6	__usdt_asm_args5 __usdt_asm1(.ascii " ") __usdt_asm_arg(6)</div><div class='add'>+#define __usdt_asm_args7	__usdt_asm_args6 __usdt_asm1(.ascii " ") __usdt_asm_arg(7)</div><div class='add'>+#define __usdt_asm_args8	__usdt_asm_args7 __usdt_asm1(.ascii " ") __usdt_asm_arg(8)</div><div class='add'>+#define __usdt_asm_args9	__usdt_asm_args8 __usdt_asm1(.ascii " ") __usdt_asm_arg(9)</div><div class='add'>+#define __usdt_asm_args10	__usdt_asm_args9 __usdt_asm1(.ascii " ") __usdt_asm_arg(10)</div><div class='add'>+#define __usdt_asm_args11	__usdt_asm_args10 __usdt_asm1(.ascii " ") __usdt_asm_arg(11)</div><div class='add'>+#define __usdt_asm_args12	__usdt_asm_args11 __usdt_asm1(.ascii " ") __usdt_asm_arg(12)</div><div class='add'>+#define __usdt_asm_args(...)	__usdt_apply(__usdt_asm_args, __usdt_narg(__VA_ARGS__))</div><div class='add'>+</div><div class='add'>+#define __usdt_is_arr(x)	(__builtin_classify_type(x) == 14 || __builtin_classify_type(x) == 5)</div><div class='add'>+#define __usdt_arg_size(x)	(__usdt_is_arr(x) ? sizeof(void *) : sizeof(x))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We can't use __builtin_choose_expr() in C++, so fall back to table-based</div><div class='add'>+ * signedness determination for known types, utilizing templates magic.</div><div class='add'>+ */</div><div class='add'>+#ifdef __cplusplus</div><div class='add'>+</div><div class='add'>+#define __usdt_is_signed(x)	(!__usdt_is_arr(x) &amp;&amp; __usdt_t&lt;__typeof(x)&gt;::is_signed)</div><div class='add'>+</div><div class='add'>+#include &lt;cstddef&gt;</div><div class='add'>+</div><div class='add'>+template&lt;typename T&gt; struct __usdt_t { static const bool is_signed = false; };</div><div class='add'>+template&lt;typename A&gt; struct __usdt_t&lt;A[]&gt; : public __usdt_t&lt;A *&gt; {};</div><div class='add'>+template&lt;typename A, size_t N&gt; struct __usdt_t&lt;A[N]&gt; : public __usdt_t&lt;A *&gt; {};</div><div class='add'>+</div><div class='add'>+#define __usdt_def_signed(T)									\</div><div class='add'>+template&lt;&gt; struct __usdt_t&lt;T&gt;		     { static const bool is_signed = true; };		\</div><div class='add'>+template&lt;&gt; struct __usdt_t&lt;const T&gt;	     { static const bool is_signed = true; };		\</div><div class='add'>+template&lt;&gt; struct __usdt_t&lt;volatile T&gt;	     { static const bool is_signed = true; };		\</div><div class='add'>+template&lt;&gt; struct __usdt_t&lt;const volatile T&gt; { static const bool is_signed = true; }</div><div class='add'>+#define __usdt_maybe_signed(T)									\</div><div class='add'>+template&lt;&gt; struct __usdt_t&lt;T&gt;		     { static const bool is_signed = (T)-1 &lt; (T)1; };	\</div><div class='add'>+template&lt;&gt; struct __usdt_t&lt;const T&gt;	     { static const bool is_signed = (T)-1 &lt; (T)1; };	\</div><div class='add'>+template&lt;&gt; struct __usdt_t&lt;volatile T&gt;	     { static const bool is_signed = (T)-1 &lt; (T)1; };	\</div><div class='add'>+template&lt;&gt; struct __usdt_t&lt;const volatile T&gt; { static const bool is_signed = (T)-1 &lt; (T)1; }</div><div class='add'>+</div><div class='add'>+__usdt_def_signed(signed char);</div><div class='add'>+__usdt_def_signed(short);</div><div class='add'>+__usdt_def_signed(int);</div><div class='add'>+__usdt_def_signed(long);</div><div class='add'>+__usdt_def_signed(long long);</div><div class='add'>+__usdt_maybe_signed(char);</div><div class='add'>+__usdt_maybe_signed(wchar_t);</div><div class='add'>+</div><div class='add'>+#else /* !__cplusplus */</div><div class='add'>+</div><div class='add'>+#define __usdt_is_inttype(x)	(__builtin_classify_type(x) &gt;= 1 &amp;&amp; __builtin_classify_type(x) &lt;= 4)</div><div class='add'>+#define __usdt_inttype(x)	__typeof(__builtin_choose_expr(__usdt_is_inttype(x), (x), 0U))</div><div class='add'>+#define __usdt_is_signed(x)	((__usdt_inttype(x))-1 &lt; (__usdt_inttype(x))1)</div><div class='add'>+</div><div class='add'>+#endif /* __cplusplus */</div><div class='add'>+</div><div class='add'>+#define __usdt_asm_op(n, x)									\</div><div class='add'>+	[__usdt_asz##n] "n" ((__usdt_is_signed(x) ? (int)-1 : 1) * (int)__usdt_arg_size(x)),	\</div><div class='add'>+	[__usdt_aval##n] __usdt_str(USDT_ARG_CONSTRAINT)(x)</div><div class='add'>+</div><div class='add'>+#define __usdt_asm_ops0()				[__usdt_dummy] "g" (0)</div><div class='add'>+#define __usdt_asm_ops1(x)				__usdt_asm_op(1, x)</div><div class='add'>+#define __usdt_asm_ops2(a,x)				__usdt_asm_ops1(a), __usdt_asm_op(2, x)</div><div class='add'>+#define __usdt_asm_ops3(a,b,x)				__usdt_asm_ops2(a,b), __usdt_asm_op(3, x)</div><div class='add'>+#define __usdt_asm_ops4(a,b,c,x)			__usdt_asm_ops3(a,b,c), __usdt_asm_op(4, x)</div><div class='add'>+#define __usdt_asm_ops5(a,b,c,d,x)			__usdt_asm_ops4(a,b,c,d), __usdt_asm_op(5, x)</div><div class='add'>+#define __usdt_asm_ops6(a,b,c,d,e,x)			__usdt_asm_ops5(a,b,c,d,e), __usdt_asm_op(6, x)</div><div class='add'>+#define __usdt_asm_ops7(a,b,c,d,e,f,x)			__usdt_asm_ops6(a,b,c,d,e,f), __usdt_asm_op(7, x)</div><div class='add'>+#define __usdt_asm_ops8(a,b,c,d,e,f,g,x)		__usdt_asm_ops7(a,b,c,d,e,f,g), __usdt_asm_op(8, x)</div><div class='add'>+#define __usdt_asm_ops9(a,b,c,d,e,f,g,h,x)		__usdt_asm_ops8(a,b,c,d,e,f,g,h), __usdt_asm_op(9, x)</div><div class='add'>+#define __usdt_asm_ops10(a,b,c,d,e,f,g,h,i,x)		__usdt_asm_ops9(a,b,c,d,e,f,g,h,i), __usdt_asm_op(10, x)</div><div class='add'>+#define __usdt_asm_ops11(a,b,c,d,e,f,g,h,i,j,x)		__usdt_asm_ops10(a,b,c,d,e,f,g,h,i,j), __usdt_asm_op(11, x)</div><div class='add'>+#define __usdt_asm_ops12(a,b,c,d,e,f,g,h,i,j,k,x)	__usdt_asm_ops11(a,b,c,d,e,f,g,h,i,j,k), __usdt_asm_op(12, x)</div><div class='add'>+#define __usdt_asm_ops(...)				__usdt_apply(__usdt_asm_ops, __usdt_narg(__VA_ARGS__))(__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#endif /* __USDT_H */</div><div class='head'>diff --git a/tools/testing/selftests/bpf/verifier/bpf_st_mem.c b/tools/testing/selftests/bpf/verifier/bpf_st_mem.c<br/>index b616575c3b00..ce13002c7a19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verifier/bpf_st_mem.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verifier/bpf_st_mem.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verifier/bpf_st_mem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/verifier/bpf_st_mem.c</a></div><div class='hunk'>@@ -93,7 +93,7 @@</div><div class='ctx'> 	.expected_attach_type = BPF_SK_LOOKUP,</div><div class='ctx'> 	.result = VERBOSE_ACCEPT,</div><div class='ctx'> 	.runs = -1,</div><div class='del'>-	.errstr = "0: (7a) *(u64 *)(r10 -8) = -44        ; R10=fp0 fp-8_w=-44\</div><div class='add'>+	.errstr = "0: (7a) *(u64 *)(r10 -8) = -44        ; R10=fp0 fp-8=-44\</div><div class='ctx'> 	2: (c5) if r0 s&lt; 0x0 goto pc+2\</div><div class='del'>-	R0_w=-44",</div><div class='add'>+	R0=-44",</div><div class='ctx'> },</div><div class='head'>diff --git a/tools/testing/selftests/bpf/verifier/calls.c b/tools/testing/selftests/bpf/verifier/calls.c<br/>index 18596ae0b0c1..c8d640802cce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verifier/calls.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verifier/calls.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verifier/calls.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/verifier/calls.c</a></div><div class='hunk'>@@ -1375,7 +1375,7 @@</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 1),</div><div class='ctx'> 	/* write into map value */</div><div class='ctx'> 	BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 0),</div><div class='del'>-	/* fetch secound map_value_ptr from the stack */</div><div class='add'>+	/* fetch second map_value_ptr from the stack */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_10, -16),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 1),</div><div class='ctx'> 	/* write into map value */</div><div class='hunk'>@@ -1439,7 +1439,7 @@</div><div class='ctx'> 	/* second time with fp-16 */</div><div class='ctx'> 	BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 1, 0, 4),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 1, 2),</div><div class='del'>-	/* fetch secound map_value_ptr from the stack */</div><div class='add'>+	/* fetch second map_value_ptr from the stack */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_7, 0),</div><div class='ctx'> 	/* write into map value */</div><div class='ctx'> 	BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 0),</div><div class='hunk'>@@ -1493,7 +1493,7 @@</div><div class='ctx'> 	/* second time with fp-16 */</div><div class='ctx'> 	BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 1, 0, 4),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 2),</div><div class='del'>-	/* fetch secound map_value_ptr from the stack */</div><div class='add'>+	/* fetch second map_value_ptr from the stack */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_7, 0),</div><div class='ctx'> 	/* write into map value */</div><div class='ctx'> 	BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 0),</div><div class='hunk'>@@ -2380,7 +2380,7 @@</div><div class='ctx'> 	 */</div><div class='ctx'> 	BPF_JMP_REG(BPF_JGT, BPF_REG_6, BPF_REG_7, 1),</div><div class='ctx'> 	BPF_MOV64_REG(BPF_REG_9, BPF_REG_8),</div><div class='del'>-	/* r9 = *r9                ; verifier get's to this point via two paths:</div><div class='add'>+	/* r9 = *r9                ; verifier gets to this point via two paths:</div><div class='ctx'> 	 *                         ; (I) one including r9 = r8, verified first;</div><div class='ctx'> 	 *                         ; (II) one excluding r9 = r8, verified next.</div><div class='ctx'> 	 *                         ; After load of *r9 to r9 the frame[0].fp[-24].id == r9.id.</div><div class='hunk'>@@ -2409,3 +2409,27 @@</div><div class='ctx'> 	.errstr_unpriv = "",</div><div class='ctx'> 	.prog_type = BPF_PROG_TYPE_CGROUP_SKB,</div><div class='ctx'> },</div><div class='add'>+{</div><div class='add'>+	"calls: several args with ref_obj_id",</div><div class='add'>+	.insns = {</div><div class='add'>+	/* Reserve at least sizeof(struct iphdr) bytes in the ring buffer.</div><div class='add'>+	 * With a smaller size, the verifier would reject the call to</div><div class='add'>+	 * bpf_tcp_raw_gen_syncookie_ipv4 before we can reach the</div><div class='add'>+	 * ref_obj_id error.</div><div class='add'>+	 */</div><div class='add'>+	BPF_MOV64_IMM(BPF_REG_2, 20),</div><div class='add'>+	BPF_MOV64_IMM(BPF_REG_3, 0),</div><div class='add'>+	BPF_LD_MAP_FD(BPF_REG_1, 0),</div><div class='add'>+	BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_ringbuf_reserve),</div><div class='add'>+	/* if r0 == 0 goto &lt;exit&gt; */</div><div class='add'>+	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 3),</div><div class='add'>+	BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),</div><div class='add'>+	BPF_MOV64_REG(BPF_REG_2, BPF_REG_0),</div><div class='add'>+	BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_tcp_raw_gen_syncookie_ipv4),</div><div class='add'>+	BPF_EXIT_INSN(),</div><div class='add'>+	},</div><div class='add'>+	.fixup_map_ringbuf = { 2 },</div><div class='add'>+	.result = REJECT,</div><div class='add'>+	.errstr = "more than one arg with ref_obj_id",</div><div class='add'>+	.prog_type = BPF_PROG_TYPE_SCHED_CLS,</div><div class='add'>+},</div><div class='head'>diff --git a/tools/testing/selftests/bpf/verifier/dead_code.c b/tools/testing/selftests/bpf/verifier/dead_code.c<br/>index ee454327e5c6..77207b498c6f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verifier/dead_code.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verifier/dead_code.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verifier/dead_code.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/verifier/dead_code.c</a></div><div class='hunk'>@@ -2,14 +2,13 @@</div><div class='ctx'> 	"dead code: start",</div><div class='ctx'> 	.insns = {</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JA, 0, 0, 2),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R9 !read_ok") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JA, 0, 0, 2),</div><div class='ctx'> 	BPF_MOV64_IMM(BPF_REG_0, 7),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JGE, BPF_REG_0, 10, -4),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R9 !read_ok",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> 	.retval = 7,</div><div class='ctx'> },</div><div class='head'>diff --git a/tools/testing/selftests/bpf/verifier/jmp32.c b/tools/testing/selftests/bpf/verifier/jmp32.c<br/>index 43776f6f92f4..91d83e9cb148 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verifier/jmp32.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verifier/jmp32.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verifier/jmp32.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/verifier/jmp32.c</a></div><div class='hunk'>@@ -84,11 +84,10 @@</div><div class='ctx'> 	BPF_JMP32_IMM(BPF_JSET, BPF_REG_7, 0x10, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP32_IMM(BPF_JGE, BPF_REG_7, 0x10, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R9 !read_ok") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R9 !read_ok",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='hunk'>@@ -149,11 +148,10 @@</div><div class='ctx'> 	BPF_JMP32_IMM(BPF_JEQ, BPF_REG_7, 0x10, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP32_IMM(BPF_JSGE, BPF_REG_7, 0xf, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R9 !read_ok") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R9 !read_ok",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='hunk'>@@ -214,11 +212,10 @@</div><div class='ctx'> 	BPF_JMP32_IMM(BPF_JNE, BPF_REG_7, 0x10, 1),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x10, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R9 !read_ok") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R9 !read_ok",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='hunk'>@@ -283,11 +280,10 @@</div><div class='ctx'> 	BPF_JMP32_REG(BPF_JGE, BPF_REG_7, BPF_REG_8, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP32_IMM(BPF_JGE, BPF_REG_7, 0x7ffffff0, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R0 invalid mem access 'scalar'") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R0 invalid mem access 'scalar'",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> 	.retval = 2,</div><div class='ctx'> 	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,</div><div class='hunk'>@@ -354,11 +350,10 @@</div><div class='ctx'> 	BPF_JMP32_REG(BPF_JGT, BPF_REG_7, BPF_REG_8, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JGT, BPF_REG_7, 0x7ffffff0, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R0 invalid mem access 'scalar'") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R0 invalid mem access 'scalar'",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> 	.retval = 2,</div><div class='ctx'> 	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,</div><div class='hunk'>@@ -425,11 +420,10 @@</div><div class='ctx'> 	BPF_JMP32_REG(BPF_JLE, BPF_REG_7, BPF_REG_8, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP32_IMM(BPF_JLE, BPF_REG_7, 0x7ffffff0, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R0 invalid mem access 'scalar'") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R0 invalid mem access 'scalar'",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> 	.retval = 2,</div><div class='ctx'> 	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,</div><div class='hunk'>@@ -496,11 +490,10 @@</div><div class='ctx'> 	BPF_JMP32_REG(BPF_JLT, BPF_REG_7, BPF_REG_8, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JSLT, BPF_REG_7, 0x7ffffff0, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R0 invalid mem access 'scalar'") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R0 invalid mem access 'scalar'",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> 	.retval = 2,</div><div class='ctx'> 	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,</div><div class='hunk'>@@ -567,11 +560,10 @@</div><div class='ctx'> 	BPF_JMP32_REG(BPF_JSGE, BPF_REG_7, BPF_REG_8, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JSGE, BPF_REG_7, 0x7ffffff0, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R0 invalid mem access 'scalar'") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R0 invalid mem access 'scalar'",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> 	.retval = 2,</div><div class='ctx'> 	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,</div><div class='hunk'>@@ -638,11 +630,10 @@</div><div class='ctx'> 	BPF_JMP32_REG(BPF_JSGT, BPF_REG_7, BPF_REG_8, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JSGT, BPF_REG_7, -2, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R0 invalid mem access 'scalar'") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R0 invalid mem access 'scalar'",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> 	.retval = 2,</div><div class='ctx'> 	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,</div><div class='hunk'>@@ -709,11 +700,10 @@</div><div class='ctx'> 	BPF_JMP32_REG(BPF_JSLE, BPF_REG_7, BPF_REG_8, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JSLE, BPF_REG_7, 0x7ffffff0, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R0 invalid mem access 'scalar'") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R0 invalid mem access 'scalar'",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> 	.retval = 2,</div><div class='ctx'> 	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,</div><div class='hunk'>@@ -780,11 +770,10 @@</div><div class='ctx'> 	BPF_JMP32_REG(BPF_JSLT, BPF_REG_7, BPF_REG_8, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP32_IMM(BPF_JSLT, BPF_REG_7, -1, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R0 invalid mem access 'scalar'") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='del'>-	.errstr_unpriv = "R0 invalid mem access 'scalar'",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> 	.retval = 2,</div><div class='ctx'> 	.flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,</div><div class='head'>diff --git a/tools/testing/selftests/bpf/verifier/jset.c b/tools/testing/selftests/bpf/verifier/jset.c<br/>index 11fc68da735e..e901eefd774a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verifier/jset.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verifier/jset.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verifier/jset.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/verifier/jset.c</a></div><div class='hunk'>@@ -78,12 +78,11 @@</div><div class='ctx'> 	.insns = {</div><div class='ctx'> 	BPF_MOV64_IMM(BPF_REG_0, 1),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JSET, BPF_REG_0, 1, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R9 !read_ok") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='ctx'> 	.prog_type = BPF_PROG_TYPE_SOCKET_FILTER,</div><div class='del'>-	.errstr_unpriv = "R9 !read_ok",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.retval = 1,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> },</div><div class='hunk'>@@ -136,13 +135,12 @@</div><div class='ctx'> 	BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_prandom_u32),</div><div class='ctx'> 	BPF_ALU64_IMM(BPF_OR, BPF_REG_0, 2),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JSET, BPF_REG_0, 3, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R9 !read_ok") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0),</div><div class='ctx'> 	BPF_MOV64_IMM(BPF_REG_0, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='ctx'> 	.prog_type = BPF_PROG_TYPE_SOCKET_FILTER,</div><div class='del'>-	.errstr_unpriv = "R9 !read_ok",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='hunk'>@@ -154,16 +152,16 @@</div><div class='ctx'> 	BPF_ALU64_IMM(BPF_AND, BPF_REG_1, 0xff),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JSET, BPF_REG_1, 0xf0, 3),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JLT, BPF_REG_1, 0x10, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R9 !read_ok") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JSET, BPF_REG_1, 0x10, 1),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	BPF_JMP_IMM(BPF_JGE, BPF_REG_1, 0x10, 1),</div><div class='add'>+	/* unpriv: nospec (inserted to prevent "R9 !read_ok") */</div><div class='ctx'> 	BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0),</div><div class='ctx'> 	BPF_EXIT_INSN(),</div><div class='ctx'> 	},</div><div class='ctx'> 	.prog_type = BPF_PROG_TYPE_SOCKET_FILTER,</div><div class='del'>-	.errstr_unpriv = "R9 !read_ok",</div><div class='del'>-	.result_unpriv = REJECT,</div><div class='ctx'> 	.result = ACCEPT,</div><div class='ctx'> },</div><div class='head'>diff --git a/tools/testing/selftests/bpf/verify_sig_setup.sh b/tools/testing/selftests/bpf/verify_sig_setup.sh<br/>index f2cac42298ba..09179fb551f0 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verify_sig_setup.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/verify_sig_setup.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/verify_sig_setup.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/verify_sig_setup.sh</a></div><div class='hunk'>@@ -32,7 +32,7 @@ usage()</div><div class='ctx'> 	exit 1</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-setup()</div><div class='add'>+genkey()</div><div class='ctx'> {</div><div class='ctx'> 	local tmp_dir="$1"</div><div class='ctx'> </div><div class='hunk'>@@ -45,9 +45,14 @@ setup()</div><div class='ctx'> </div><div class='ctx'> 	openssl x509 -in ${tmp_dir}/signing_key.pem -out \</div><div class='ctx'> 		${tmp_dir}/signing_key.der -outform der</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	key_id=$(cat ${tmp_dir}/signing_key.der | keyctl padd asymmetric ebpf_testing_key @s)</div><div class='add'>+setup()</div><div class='add'>+{</div><div class='add'>+	local tmp_dir="$1"</div><div class='ctx'> </div><div class='add'>+	genkey "${tmp_dir}"</div><div class='add'>+	key_id=$(cat ${tmp_dir}/signing_key.der | keyctl padd asymmetric ebpf_testing_key @s)</div><div class='ctx'> 	keyring_id=$(keyctl newring ebpf_testing_keyring @s)</div><div class='ctx'> 	keyctl link $key_id $keyring_id</div><div class='ctx'> }</div><div class='hunk'>@@ -105,6 +110,8 @@ main()</div><div class='ctx'> </div><div class='ctx'> 	if [[ "${action}" == "setup" ]]; then</div><div class='ctx'> 		setup "${tmp_dir}"</div><div class='add'>+	elif [[ "${action}" == "genkey" ]]; then</div><div class='add'>+		genkey "${tmp_dir}"</div><div class='ctx'> 	elif [[ "${action}" == "cleanup" ]]; then</div><div class='ctx'> 		cleanup "${tmp_dir}"</div><div class='ctx'> 	elif [[ "${action}" == "fsverity-create-sign" ]]; then</div><div class='head'>diff --git a/tools/testing/selftests/bpf/veristat.c b/tools/testing/selftests/bpf/veristat.c<br/>index 06af5029885b..e962f133250c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/veristat.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/veristat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/veristat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/veristat.c</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> #define _GNU_SOURCE</div><div class='ctx'> #include &lt;argp.h&gt;</div><div class='ctx'> #include &lt;libgen.h&gt;</div><div class='add'>+#include &lt;ctype.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;sched.h&gt;</div><div class='hunk'>@@ -22,6 +23,7 @@</div><div class='ctx'> #include &lt;float.h&gt;</div><div class='ctx'> #include &lt;math.h&gt;</div><div class='ctx'> #include &lt;limits.h&gt;</div><div class='add'>+#include &lt;assert.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef ARRAY_SIZE</div><div class='ctx'> #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))</div><div class='hunk'>@@ -48,6 +50,7 @@ enum stat_id {</div><div class='ctx'> 	STACK,</div><div class='ctx'> 	PROG_TYPE,</div><div class='ctx'> 	ATTACH_TYPE,</div><div class='add'>+	MEMORY_PEAK,</div><div class='ctx'> </div><div class='ctx'> 	FILE_NAME,</div><div class='ctx'> 	PROG_NAME,</div><div class='hunk'>@@ -154,6 +157,36 @@ struct filter {</div><div class='ctx'> 	bool abs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct rvalue {</div><div class='add'>+	enum { INTEGRAL, ENUMERATOR } type;</div><div class='add'>+	union {</div><div class='add'>+		long long ivalue;</div><div class='add'>+		char *svalue;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct field_access {</div><div class='add'>+	enum { FIELD_NAME, ARRAY_INDEX } type;</div><div class='add'>+	union {</div><div class='add'>+		char *name;</div><div class='add'>+		struct rvalue index;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct var_preset {</div><div class='add'>+	struct field_access *atoms;</div><div class='add'>+	int atom_count;</div><div class='add'>+	char *full_name;</div><div class='add'>+	struct rvalue value;</div><div class='add'>+	bool applied;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum dump_mode {</div><div class='add'>+	DUMP_NONE = 0,</div><div class='add'>+	DUMP_XLATED = 1,</div><div class='add'>+	DUMP_JITED = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct env {</div><div class='ctx'> 	char **filenames;</div><div class='ctx'> 	int filename_cnt;</div><div class='hunk'>@@ -195,6 +228,12 @@ static struct env {</div><div class='ctx'> 	int progs_processed;</div><div class='ctx'> 	int progs_skipped;</div><div class='ctx'> 	int top_src_lines;</div><div class='add'>+	struct var_preset *presets;</div><div class='add'>+	int npresets;</div><div class='add'>+	char orig_cgroup[PATH_MAX];</div><div class='add'>+	char stat_cgroup[PATH_MAX];</div><div class='add'>+	int memory_peak_fd;</div><div class='add'>+	__u32 dump_mode;</div><div class='ctx'> } env;</div><div class='ctx'> </div><div class='ctx'> static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)</div><div class='hunk'>@@ -206,6 +245,22 @@ static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va</div><div class='ctx'> 	return vfprintf(stderr, format, args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define log_errno(fmt, ...) log_errno_aux(__FILE__, __LINE__, fmt, ##__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+__attribute__((format(printf, 3, 4)))</div><div class='add'>+static int log_errno_aux(const char *file, int line, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	int err = -errno;</div><div class='add'>+	va_list ap;</div><div class='add'>+</div><div class='add'>+	va_start(ap, fmt);</div><div class='add'>+	fprintf(stderr, "%s:%d: ", file, line);</div><div class='add'>+	vfprintf(stderr, fmt, ap);</div><div class='add'>+	fprintf(stderr, " failed with error '%s'.\n", strerror(errno));</div><div class='add'>+	va_end(ap);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifndef VERISTAT_VERSION</div><div class='ctx'> #define VERISTAT_VERSION "&lt;kernel&gt;"</div><div class='ctx'> #endif</div><div class='hunk'>@@ -223,6 +278,7 @@ const char argp_program_doc[] =</div><div class='ctx'> enum {</div><div class='ctx'> 	OPT_LOG_FIXED = 1000,</div><div class='ctx'> 	OPT_LOG_SIZE = 1001,</div><div class='add'>+	OPT_DUMP = 1002,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct argp_option opts[] = {</div><div class='hunk'>@@ -246,16 +302,21 @@ static const struct argp_option opts[] = {</div><div class='ctx'> 	{ "test-reg-invariants", 'r', NULL, 0,</div><div class='ctx'> 	  "Force BPF verifier failure on register invariant violation (BPF_F_TEST_REG_INVARIANTS program flag)" },</div><div class='ctx'> 	{ "top-src-lines", 'S', "N", 0, "Emit N most frequent source code lines" },</div><div class='add'>+	{ "set-global-vars", 'G', "GLOBAL", 0, "Set global variables provided in the expression, for example \"var1 = 1\"" },</div><div class='add'>+	{ "dump", OPT_DUMP, "DUMP_MODE", OPTION_ARG_OPTIONAL, "Print BPF program dump (xlated, jited)" },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int parse_stats(const char *stats_str, struct stat_specs *specs);</div><div class='ctx'> static int append_filter(struct filter **filters, int *cnt, const char *str);</div><div class='ctx'> static int append_filter_file(const char *path);</div><div class='add'>+static int append_var_preset(struct var_preset **presets, int *cnt, const char *expr);</div><div class='add'>+static int append_var_preset_file(const char *filename);</div><div class='add'>+static int append_file(const char *path);</div><div class='add'>+static int append_file_from_file(const char *path);</div><div class='ctx'> </div><div class='ctx'> static error_t parse_arg(int key, char *arg, struct argp_state *state)</div><div class='ctx'> {</div><div class='del'>-	void *tmp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	switch (key) {</div><div class='hunk'>@@ -327,6 +388,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)</div><div class='ctx'> 			fprintf(stderr, "invalid top N specifier: %s\n", arg);</div><div class='ctx'> 			argp_usage(state);</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='ctx'> 	case 'C':</div><div class='ctx'> 		env.comparison_mode = true;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -353,15 +415,36 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)</div><div class='ctx'> 			argp_usage(state);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case 'G': {</div><div class='add'>+		if (arg[0] == '@')</div><div class='add'>+			err = append_var_preset_file(arg + 1);</div><div class='add'>+		else</div><div class='add'>+			err = append_var_preset(&amp;env.presets, &amp;env.npresets, arg);</div><div class='add'>+		if (err) {</div><div class='add'>+			fprintf(stderr, "Failed to parse global variable presets: %s\n", arg);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	case ARGP_KEY_ARG:</div><div class='del'>-		tmp = realloc(env.filenames, (env.filename_cnt + 1) * sizeof(*env.filenames));</div><div class='del'>-		if (!tmp)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		env.filenames = tmp;</div><div class='del'>-		env.filenames[env.filename_cnt] = strdup(arg);</div><div class='del'>-		if (!env.filenames[env.filename_cnt])</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		env.filename_cnt++;</div><div class='add'>+		if (arg[0] == '@')</div><div class='add'>+			err = append_file_from_file(arg + 1);</div><div class='add'>+		else</div><div class='add'>+			err = append_file(arg);</div><div class='add'>+		if (err) {</div><div class='add'>+			fprintf(stderr, "Failed to collect BPF object files: %d\n", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case OPT_DUMP:</div><div class='add'>+		if (!arg || strcasecmp(arg, "xlated") == 0) {</div><div class='add'>+			env.dump_mode |= DUMP_XLATED;</div><div class='add'>+		} else if (strcasecmp(arg, "jited") == 0) {</div><div class='add'>+			env.dump_mode |= DUMP_JITED;</div><div class='add'>+		} else {</div><div class='add'>+			fprintf(stderr, "Unrecognized dump mode '%s'\n", arg);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return ARGP_ERR_UNKNOWN;</div><div class='hunk'>@@ -632,7 +715,7 @@ static int append_filter_file(const char *path)</div><div class='ctx'> 	f = fopen(path, "r");</div><div class='ctx'> 	if (!f) {</div><div class='ctx'> 		err = -errno;</div><div class='del'>-		fprintf(stderr, "Failed to open filters in '%s': %d\n", path, err);</div><div class='add'>+		fprintf(stderr, "Failed to open filters in '%s': %s\n", path, strerror(-err));</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -662,14 +745,57 @@ static const struct stat_specs default_output_spec = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int append_file(const char *path)</div><div class='add'>+{</div><div class='add'>+	void *tmp;</div><div class='add'>+</div><div class='add'>+	tmp = realloc(env.filenames, (env.filename_cnt + 1) * sizeof(*env.filenames));</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	env.filenames = tmp;</div><div class='add'>+	env.filenames[env.filename_cnt] = strdup(path);</div><div class='add'>+	if (!env.filenames[env.filename_cnt])</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	env.filename_cnt++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int append_file_from_file(const char *path)</div><div class='add'>+{</div><div class='add'>+	char buf[1024];</div><div class='add'>+	int err = 0;</div><div class='add'>+	FILE *f;</div><div class='add'>+</div><div class='add'>+	f = fopen(path, "r");</div><div class='add'>+	if (!f) {</div><div class='add'>+		err = -errno;</div><div class='add'>+		fprintf(stderr, "Failed to open object files list in '%s': %s\n",</div><div class='add'>+			path, strerror(errno));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (fscanf(f, " %1023[^\n]\n", buf) == 1) {</div><div class='add'>+		/* lines starting with # are comments, skip them */</div><div class='add'>+		if (buf[0] == '\0' || buf[0] == '#')</div><div class='add'>+			continue;</div><div class='add'>+		err = append_file(buf);</div><div class='add'>+		if (err)</div><div class='add'>+			goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	fclose(f);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct stat_specs default_csv_output_spec = {</div><div class='del'>-	.spec_cnt = 14,</div><div class='add'>+	.spec_cnt = 15,</div><div class='ctx'> 	.ids = {</div><div class='ctx'> 		FILE_NAME, PROG_NAME, VERDICT, DURATION,</div><div class='ctx'> 		TOTAL_INSNS, TOTAL_STATES, PEAK_STATES,</div><div class='ctx'> 		MAX_STATES_PER_INSN, MARK_READ_MAX_LEN,</div><div class='ctx'> 		SIZE, JITED_SIZE, PROG_TYPE, ATTACH_TYPE,</div><div class='del'>-		STACK,</div><div class='add'>+		STACK, MEMORY_PEAK,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -710,6 +836,7 @@ static struct stat_def {</div><div class='ctx'> 	[STACK] = {"Stack depth", {"stack_depth", "stack"}, },</div><div class='ctx'> 	[PROG_TYPE] = { "Program type", {"prog_type"}, },</div><div class='ctx'> 	[ATTACH_TYPE] = { "Attach type", {"attach_type", }, },</div><div class='add'>+	[MEMORY_PEAK] = { "Peak memory (MiB)", {"mem_peak", }, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static bool parse_stat_id_var(const char *name, size_t len, int *id,</div><div class='hunk'>@@ -783,6 +910,18 @@ static bool is_desc_sym(char c)</div><div class='ctx'> 	return c == 'v' || c == 'V' || c == '.' || c == '!' || c == '_';</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static char *rtrim(char *str)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = strlen(str) - 1; i &gt; 0; --i) {</div><div class='add'>+		if (!isspace(str[i]))</div><div class='add'>+			break;</div><div class='add'>+		str[i] = '\0';</div><div class='add'>+	}</div><div class='add'>+	return str;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int parse_stat(const char *stat_name, struct stat_specs *specs)</div><div class='ctx'> {</div><div class='ctx'> 	int id;</div><div class='hunk'>@@ -1111,6 +1250,7 @@ static void fixup_obj(struct bpf_object *obj, struct bpf_program *prog, const ch</div><div class='ctx'> 		case BPF_MAP_TYPE_TASK_STORAGE:</div><div class='ctx'> 		case BPF_MAP_TYPE_INODE_STORAGE:</div><div class='ctx'> 		case BPF_MAP_TYPE_CGROUP_STORAGE:</div><div class='add'>+		case BPF_MAP_TYPE_CGRP_STORAGE:</div><div class='ctx'> 			break;</div><div class='ctx'> 		case BPF_MAP_TYPE_STRUCT_OPS:</div><div class='ctx'> 			mask_unrelated_struct_ops_progs(obj, map, prog);</div><div class='hunk'>@@ -1163,13 +1303,13 @@ static void fixup_obj(struct bpf_object *obj, struct bpf_program *prog, const ch</div><div class='ctx'> 			bpf_program__set_expected_attach_type(prog, attach_type);</div><div class='ctx'> </div><div class='ctx'> 			if (!env.quiet) {</div><div class='del'>-				printf("Using guessed program type '%s' for %s/%s...\n",</div><div class='add'>+				fprintf(stderr, "Using guessed program type '%s' for %s/%s...\n",</div><div class='ctx'> 					libbpf_bpf_prog_type_str(prog_type),</div><div class='ctx'> 					filename, prog_name);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (!env.quiet) {</div><div class='del'>-				printf("Failed to guess program type for freplace program with context type name '%s' for %s/%s. Consider using canonical type names to help veristat...\n",</div><div class='add'>+				fprintf(stderr, "Failed to guess program type for freplace program with context type name '%s' for %s/%s. Consider using canonical type names to help veristat...\n",</div><div class='ctx'> 					ctx_name, filename, prog_name);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1207,16 +1347,273 @@ static int max_verifier_log_size(void)</div><div class='ctx'> 	return log_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool output_stat_enabled(int id)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; env.output_spec.spec_cnt; i++)</div><div class='add'>+		if (env.output_spec.ids[i] == id)</div><div class='add'>+			return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__attribute__((format(printf, 2, 3)))</div><div class='add'>+static int write_one_line(const char *file, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	int err, saved_errno;</div><div class='add'>+	va_list ap;</div><div class='add'>+	FILE *f;</div><div class='add'>+</div><div class='add'>+	f = fopen(file, "w");</div><div class='add'>+	if (!f)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	va_start(ap, fmt);</div><div class='add'>+	errno = 0;</div><div class='add'>+	err = vfprintf(f, fmt, ap);</div><div class='add'>+	saved_errno = errno;</div><div class='add'>+	va_end(ap);</div><div class='add'>+	fclose(f);</div><div class='add'>+	errno = saved_errno;</div><div class='add'>+	return err &lt; 0 ? -1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__attribute__((format(scanf, 3, 4)))</div><div class='add'>+static int scanf_one_line(const char *file, int fields_expected, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	int res = 0, saved_errno = 0;</div><div class='add'>+	char *line = NULL;</div><div class='add'>+	size_t line_len;</div><div class='add'>+	va_list ap;</div><div class='add'>+	FILE *f;</div><div class='add'>+</div><div class='add'>+	f = fopen(file, "r");</div><div class='add'>+	if (!f)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	va_start(ap, fmt);</div><div class='add'>+	while (getline(&amp;line, &amp;line_len, f) &gt; 0) {</div><div class='add'>+		res = vsscanf(line, fmt, ap);</div><div class='add'>+		if (res == fields_expected)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+	if (ferror(f)) {</div><div class='add'>+		saved_errno = errno;</div><div class='add'>+		res = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	va_end(ap);</div><div class='add'>+	free(line);</div><div class='add'>+	fclose(f);</div><div class='add'>+	errno = saved_errno;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_stat_cgroup(void)</div><div class='add'>+{</div><div class='add'>+	char buf[PATH_MAX];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	close(env.memory_peak_fd);</div><div class='add'>+</div><div class='add'>+	if (env.orig_cgroup[0]) {</div><div class='add'>+		snprintf(buf, sizeof(buf), "%s/cgroup.procs", env.orig_cgroup);</div><div class='add'>+		err = write_one_line(buf, "%d\n", getpid());</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			log_errno("moving self to original cgroup %s\n", env.orig_cgroup);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (env.stat_cgroup[0]) {</div><div class='add'>+		err = rmdir(env.stat_cgroup);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			log_errno("deletion of cgroup %s", env.stat_cgroup);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	env.memory_peak_fd = -1;</div><div class='add'>+	env.orig_cgroup[0] = 0;</div><div class='add'>+	env.stat_cgroup[0] = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Creates a cgroup at /sys/fs/cgroup/veristat-accounting-&lt;pid&gt;,</div><div class='add'>+ * moves current process to this cgroup.</div><div class='add'>+ */</div><div class='add'>+static void create_stat_cgroup(void)</div><div class='add'>+{</div><div class='add'>+	char cgroup_fs_mount[4096];</div><div class='add'>+	char buf[4096];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	env.memory_peak_fd = -1;</div><div class='add'>+</div><div class='add'>+	if (!output_stat_enabled(MEMORY_PEAK))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = scanf_one_line("/proc/self/mounts", 2, "%*s %4095s cgroup2 %s",</div><div class='add'>+			     cgroup_fs_mount, buf);</div><div class='add'>+	if (err != 2) {</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			log_errno("reading /proc/self/mounts");</div><div class='add'>+		else if (!env.quiet)</div><div class='add'>+			fprintf(stderr, "Can't find cgroupfs v2 mount point.\n");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* cgroup-v2.rst promises the line "0::&lt;group&gt;" for cgroups v2 */</div><div class='add'>+	err = scanf_one_line("/proc/self/cgroup", 1, "0::%4095s", buf);</div><div class='add'>+	if (err != 1) {</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			log_errno("reading /proc/self/cgroup");</div><div class='add'>+		else if (!env.quiet)</div><div class='add'>+			fprintf(stderr, "Can't infer veristat process cgroup.");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(env.orig_cgroup, sizeof(env.orig_cgroup), "%s/%s", cgroup_fs_mount, buf);</div><div class='add'>+</div><div class='add'>+	snprintf(buf, sizeof(buf), "%s/veristat-accounting-%d", cgroup_fs_mount, getpid());</div><div class='add'>+	err = mkdir(buf, 0777);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		log_errno("creation of cgroup %s", buf);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	strcpy(env.stat_cgroup, buf);</div><div class='add'>+</div><div class='add'>+	snprintf(buf, sizeof(buf), "%s/cgroup.procs", env.stat_cgroup);</div><div class='add'>+	err = write_one_line(buf, "%d\n", getpid());</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		log_errno("entering cgroup %s", buf);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(buf, sizeof(buf), "%s/memory.peak", env.stat_cgroup);</div><div class='add'>+	env.memory_peak_fd = open(buf, O_RDWR | O_APPEND);</div><div class='add'>+	if (env.memory_peak_fd &lt; 0) {</div><div class='add'>+		log_errno("opening %s", buf);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	if (!env.quiet)</div><div class='add'>+		fprintf(stderr, "Memory usage metric unavailable.\n");</div><div class='add'>+	destroy_stat_cgroup();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Current value of /sys/fs/cgroup/veristat-accounting-&lt;pid&gt;/memory.peak */</div><div class='add'>+static long cgroup_memory_peak(void)</div><div class='add'>+{</div><div class='add'>+	long err, memory_peak;</div><div class='add'>+	char buf[32];</div><div class='add'>+</div><div class='add'>+	if (env.memory_peak_fd &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	err = pread(env.memory_peak_fd, buf, sizeof(buf) - 1, 0);</div><div class='add'>+	if (err &lt;= 0) {</div><div class='add'>+		log_errno("pread(%s/memory.peak)", env.stat_cgroup);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf[err] = 0;</div><div class='add'>+	errno = 0;</div><div class='add'>+	memory_peak = strtoll(buf, NULL, 10);</div><div class='add'>+	if (errno) {</div><div class='add'>+		log_errno("%s/memory.peak:strtoll(%s)", env.stat_cgroup, buf);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return memory_peak;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reset_stat_cgroup(void)</div><div class='add'>+{</div><div class='add'>+	char buf[] = "r\n";</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (env.memory_peak_fd &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	err = pwrite(env.memory_peak_fd, buf, sizeof(buf), 0);</div><div class='add'>+	if (err &lt;= 0) {</div><div class='add'>+		log_errno("pwrite(%s/memory.peak)", env.stat_cgroup);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_rvalue(const char *val, struct rvalue *rvalue)</div><div class='add'>+{</div><div class='add'>+	long long value;</div><div class='add'>+	char *val_end;</div><div class='add'>+</div><div class='add'>+	if (val[0] == '-' || isdigit(val[0])) {</div><div class='add'>+		/* must be a number */</div><div class='add'>+		errno = 0;</div><div class='add'>+		value = strtoll(val, &amp;val_end, 0);</div><div class='add'>+		if (errno == ERANGE) {</div><div class='add'>+			errno = 0;</div><div class='add'>+			value = strtoull(val, &amp;val_end, 0);</div><div class='add'>+		}</div><div class='add'>+		if (errno || *val_end != '\0') {</div><div class='add'>+			fprintf(stderr, "Failed to parse value '%s'\n", val);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		rvalue-&gt;ivalue = value;</div><div class='add'>+		rvalue-&gt;type = INTEGRAL;</div><div class='add'>+	} else {</div><div class='add'>+		/* if not a number, consider it enum value */</div><div class='add'>+		rvalue-&gt;svalue = strdup(val);</div><div class='add'>+		if (!rvalue-&gt;svalue)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		rvalue-&gt;type = ENUMERATOR;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dump(__u32 prog_id, enum dump_mode mode, const char *file_name, const char *prog_name)</div><div class='add'>+{</div><div class='add'>+	char command[64], buf[4096];</div><div class='add'>+	FILE *fp;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = system("command -v bpftool &gt; /dev/null 2&gt;&amp;1");</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		fprintf(stderr, "bpftool is not available, can't print program dump\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	snprintf(command, sizeof(command), "bpftool prog dump %s id %u",</div><div class='add'>+		 mode == DUMP_JITED ? "jited" : "xlated", prog_id);</div><div class='add'>+	fp = popen(command, "r");</div><div class='add'>+	if (!fp) {</div><div class='add'>+		fprintf(stderr, "bpftool failed with error: %d\n", errno);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printf("DUMP (%s) %s/%s:\n", mode == DUMP_JITED ? "JITED" : "XLATED", file_name, prog_name);</div><div class='add'>+	while (fgets(buf, sizeof(buf), fp))</div><div class='add'>+		fputs(buf, stdout);</div><div class='add'>+	fprintf(stdout, "\n");</div><div class='add'>+</div><div class='add'>+	if (ferror(fp))</div><div class='add'>+		fprintf(stderr, "Failed to dump BPF prog with error: %d\n", errno);</div><div class='add'>+</div><div class='add'>+	pclose(fp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int process_prog(const char *filename, struct bpf_object *obj, struct bpf_program *prog)</div><div class='ctx'> {</div><div class='ctx'> 	const char *base_filename = basename(strdupa(filename));</div><div class='ctx'> 	const char *prog_name = bpf_program__name(prog);</div><div class='add'>+	long mem_peak_a, mem_peak_b, mem_peak = -1;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	int buf_sz, log_level;</div><div class='ctx'> 	struct verif_stats *stats;</div><div class='ctx'> 	struct bpf_prog_info info;</div><div class='ctx'> 	__u32 info_len = sizeof(info);</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err = 0, cgroup_err;</div><div class='ctx'> 	void *tmp;</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='hunk'>@@ -1261,7 +1658,15 @@ static int process_prog(const char *filename, struct bpf_object *obj, struct bpf</div><div class='ctx'> 	if (env.force_reg_invariants)</div><div class='ctx'> 		bpf_program__set_flags(prog, bpf_program__flags(prog) | BPF_F_TEST_REG_INVARIANTS);</div><div class='ctx'> </div><div class='del'>-	err = bpf_object__load(obj);</div><div class='add'>+	err = bpf_object__prepare(obj);</div><div class='add'>+	if (!err) {</div><div class='add'>+		cgroup_err = reset_stat_cgroup();</div><div class='add'>+		mem_peak_a = cgroup_memory_peak();</div><div class='add'>+		err = bpf_object__load(obj);</div><div class='add'>+		mem_peak_b = cgroup_memory_peak();</div><div class='add'>+		if (!cgroup_err &amp;&amp; mem_peak_a &gt;= 0 &amp;&amp; mem_peak_b &gt;= 0)</div><div class='add'>+			mem_peak = mem_peak_b - mem_peak_a;</div><div class='add'>+	}</div><div class='ctx'> 	env.progs_processed++;</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;file_name = strdup(base_filename);</div><div class='hunk'>@@ -1270,11 +1675,17 @@ static int process_prog(const char *filename, struct bpf_object *obj, struct bpf</div><div class='ctx'> 	stats-&gt;stats[SIZE] = bpf_program__insn_cnt(prog);</div><div class='ctx'> 	stats-&gt;stats[PROG_TYPE] = bpf_program__type(prog);</div><div class='ctx'> 	stats-&gt;stats[ATTACH_TYPE] = bpf_program__expected_attach_type(prog);</div><div class='add'>+	stats-&gt;stats[MEMORY_PEAK] = mem_peak &lt; 0 ? -1 : mem_peak / (1024 * 1024);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;info, 0, info_len);</div><div class='ctx'> 	fd = bpf_program__fd(prog);</div><div class='del'>-	if (fd &gt; 0 &amp;&amp; bpf_prog_get_info_by_fd(fd, &amp;info, &amp;info_len) == 0)</div><div class='add'>+	if (fd &gt; 0 &amp;&amp; bpf_prog_get_info_by_fd(fd, &amp;info, &amp;info_len) == 0) {</div><div class='ctx'> 		stats-&gt;stats[JITED_SIZE] = info.jited_prog_len;</div><div class='add'>+		if (env.dump_mode &amp; DUMP_JITED)</div><div class='add'>+			dump(info.id, DUMP_JITED, base_filename, prog_name);</div><div class='add'>+		if (env.dump_mode &amp; DUMP_XLATED)</div><div class='add'>+			dump(info.id, DUMP_XLATED, base_filename, prog_name);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	parse_verif_log(buf, buf_sz, stats);</div><div class='ctx'> </div><div class='hunk'>@@ -1290,7 +1701,483 @@ static int process_prog(const char *filename, struct bpf_object *obj, struct bpf</div><div class='ctx'> 		free(buf);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-};</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int append_preset_atom(struct var_preset *preset, char *value, bool is_index)</div><div class='add'>+{</div><div class='add'>+	struct field_access *tmp;</div><div class='add'>+	int i = preset-&gt;atom_count;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	tmp = reallocarray(preset-&gt;atoms, i + 1, sizeof(*preset-&gt;atoms));</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	preset-&gt;atoms = tmp;</div><div class='add'>+	preset-&gt;atom_count++;</div><div class='add'>+</div><div class='add'>+	if (is_index) {</div><div class='add'>+		preset-&gt;atoms[i].type = ARRAY_INDEX;</div><div class='add'>+		err = parse_rvalue(value, &amp;preset-&gt;atoms[i].index);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else {</div><div class='add'>+		preset-&gt;atoms[i].type = FIELD_NAME;</div><div class='add'>+		preset-&gt;atoms[i].name = strdup(value);</div><div class='add'>+		if (!preset-&gt;atoms[i].name)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_var_atoms(const char *full_var, struct var_preset *preset)</div><div class='add'>+{</div><div class='add'>+	char expr[256], var[256], *name, *saveptr;</div><div class='add'>+	int n, len, off, err;</div><div class='add'>+</div><div class='add'>+	snprintf(expr, sizeof(expr), "%s", full_var);</div><div class='add'>+	preset-&gt;atom_count = 0;</div><div class='add'>+	while ((name = strtok_r(preset-&gt;atom_count ? NULL : expr, ".", &amp;saveptr))) {</div><div class='add'>+		len = strlen(name);</div><div class='add'>+		/* parse variable name */</div><div class='add'>+		if (sscanf(name, "%[a-zA-Z0-9_] %n", var, &amp;off) != 1) {</div><div class='add'>+			fprintf(stderr, "Can't parse %s\n", name);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		err = append_preset_atom(preset, var, false);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* parse optional array indexes */</div><div class='add'>+		while (off &lt; len) {</div><div class='add'>+			if (sscanf(name + off, " [ %[a-zA-Z0-9_] ] %n", var, &amp;n) != 1) {</div><div class='add'>+				fprintf(stderr, "Can't parse %s as index\n", name + off);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			err = append_preset_atom(preset, var, true);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			off += n;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int append_var_preset(struct var_preset **presets, int *cnt, const char *expr)</div><div class='add'>+{</div><div class='add'>+	void *tmp;</div><div class='add'>+	struct var_preset *cur;</div><div class='add'>+	char var[256], val[256];</div><div class='add'>+	int n, err;</div><div class='add'>+</div><div class='add'>+	tmp = realloc(*presets, (*cnt + 1) * sizeof(**presets));</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	*presets = tmp;</div><div class='add'>+	cur = &amp;(*presets)[*cnt];</div><div class='add'>+	memset(cur, 0, sizeof(*cur));</div><div class='add'>+	(*cnt)++;</div><div class='add'>+</div><div class='add'>+	if (sscanf(expr, " %[][a-zA-Z0-9_. ] = %s %n", var, val, &amp;n) != 2 || n != strlen(expr)) {</div><div class='add'>+		fprintf(stderr, "Failed to parse expression '%s'\n", expr);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* Remove trailing spaces from var, as scanf may add those */</div><div class='add'>+	rtrim(var);</div><div class='add'>+</div><div class='add'>+	err = parse_rvalue(val, &amp;cur-&gt;value);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	cur-&gt;full_name = strdup(var);</div><div class='add'>+	if (!cur-&gt;full_name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = parse_var_atoms(var, cur);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int append_var_preset_file(const char *filename)</div><div class='add'>+{</div><div class='add'>+	char buf[1024];</div><div class='add'>+	FILE *f;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	f = fopen(filename, "rt");</div><div class='add'>+	if (!f) {</div><div class='add'>+		err = -errno;</div><div class='add'>+		fprintf(stderr, "Failed to open presets in '%s': %s\n", filename, strerror(-err));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (fscanf(f, " %1023[^\n]\n", buf) == 1) {</div><div class='add'>+		if (buf[0] == '\0' || buf[0] == '#')</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = append_var_preset(&amp;env.presets, &amp;env.npresets, buf);</div><div class='add'>+		if (err)</div><div class='add'>+			goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	fclose(f);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_signed_type(const struct btf_type *t)</div><div class='add'>+{</div><div class='add'>+	if (btf_is_int(t))</div><div class='add'>+		return btf_int_encoding(t) &amp; BTF_INT_SIGNED;</div><div class='add'>+	if (btf_is_any_enum(t))</div><div class='add'>+		return btf_kflag(t);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enum_value_from_name(const struct btf *btf, const struct btf_type *t,</div><div class='add'>+				const char *evalue, long long *retval)</div><div class='add'>+{</div><div class='add'>+	if (btf_is_enum(t)) {</div><div class='add'>+		struct btf_enum *e = btf_enum(t);</div><div class='add'>+		int i, n = btf_vlen(t);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; n; ++i, ++e) {</div><div class='add'>+			const char *cur_name = btf__name_by_offset(btf, e-&gt;name_off);</div><div class='add'>+</div><div class='add'>+			if (strcmp(cur_name, evalue) == 0) {</div><div class='add'>+				*retval = e-&gt;val;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else if (btf_is_enum64(t)) {</div><div class='add'>+		struct btf_enum64 *e = btf_enum64(t);</div><div class='add'>+		int i, n = btf_vlen(t);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; n; ++i, ++e) {</div><div class='add'>+			const char *cur_name = btf__name_by_offset(btf, e-&gt;name_off);</div><div class='add'>+			__u64 value =  btf_enum64_value(e);</div><div class='add'>+</div><div class='add'>+			if (strcmp(cur_name, evalue) == 0) {</div><div class='add'>+				*retval = value;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_preset_supported(const struct btf_type *t)</div><div class='add'>+{</div><div class='add'>+	return btf_is_int(t) || btf_is_enum(t) || btf_is_enum64(t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int find_enum_value(const struct btf *btf, const char *name, long long *value)</div><div class='add'>+{</div><div class='add'>+	const struct btf_type *t;</div><div class='add'>+	int cnt, i;</div><div class='add'>+	long long lvalue;</div><div class='add'>+</div><div class='add'>+	cnt = btf__type_cnt(btf);</div><div class='add'>+	for (i = 1; i != cnt; ++i) {</div><div class='add'>+		t = btf__type_by_id(btf, i);</div><div class='add'>+</div><div class='add'>+		if (!btf_is_any_enum(t))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (enum_value_from_name(btf, t, name, &amp;lvalue) == 0) {</div><div class='add'>+			*value = lvalue;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -ESRCH;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int resolve_rvalue(struct btf *btf, const struct rvalue *rvalue, long long *result)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (rvalue-&gt;type) {</div><div class='add'>+	case INTEGRAL:</div><div class='add'>+		*result = rvalue-&gt;ivalue;</div><div class='add'>+		return 0;</div><div class='add'>+	case ENUMERATOR:</div><div class='add'>+		err = find_enum_value(btf, rvalue-&gt;svalue, result);</div><div class='add'>+		if (err) {</div><div class='add'>+			fprintf(stderr, "Can't resolve enum value %s\n", rvalue-&gt;svalue);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		fprintf(stderr, "Unknown rvalue type\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adjust_var_secinfo_array(struct btf *btf, int tid, struct field_access *atom,</div><div class='add'>+				    const char *array_name, struct btf_var_secinfo *sinfo)</div><div class='add'>+{</div><div class='add'>+	const struct btf_type *t;</div><div class='add'>+	struct btf_array *barr;</div><div class='add'>+	long long idx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	tid = btf__resolve_type(btf, tid);</div><div class='add'>+	t = btf__type_by_id(btf, tid);</div><div class='add'>+	if (!btf_is_array(t)) {</div><div class='add'>+		fprintf(stderr, "Array index is not expected for %s\n",</div><div class='add'>+			array_name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	barr = btf_array(t);</div><div class='add'>+	err = resolve_rvalue(btf, &amp;atom-&gt;index, &amp;idx);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (idx &lt; 0 || idx &gt;= barr-&gt;nelems) {</div><div class='add'>+		fprintf(stderr, "Array index %lld is out of bounds [0, %u): %s\n",</div><div class='add'>+			idx, barr-&gt;nelems, array_name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	sinfo-&gt;size = btf__resolve_size(btf, barr-&gt;type);</div><div class='add'>+	sinfo-&gt;offset += sinfo-&gt;size * idx;</div><div class='add'>+	sinfo-&gt;type = btf__resolve_type(btf, barr-&gt;type);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adjust_var_secinfo_member(const struct btf *btf,</div><div class='add'>+				     const struct btf_type *parent_type,</div><div class='add'>+				     __u32 parent_offset,</div><div class='add'>+				     const char *member_name,</div><div class='add'>+				     struct btf_var_secinfo *sinfo)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!btf_is_composite(parent_type)) {</div><div class='add'>+		fprintf(stderr, "Can't resolve field %s for non-composite type\n", member_name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; btf_vlen(parent_type); ++i) {</div><div class='add'>+		const struct btf_member *member;</div><div class='add'>+		const struct btf_type *member_type;</div><div class='add'>+		int tid, off;</div><div class='add'>+</div><div class='add'>+		member = btf_members(parent_type) + i;</div><div class='add'>+		tid =  btf__resolve_type(btf, member-&gt;type);</div><div class='add'>+		if (tid &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		member_type = btf__type_by_id(btf, tid);</div><div class='add'>+		off = parent_offset + member-&gt;offset;</div><div class='add'>+		if (member-&gt;name_off) {</div><div class='add'>+			const char *name = btf__name_by_offset(btf, member-&gt;name_off);</div><div class='add'>+</div><div class='add'>+			if (strcmp(member_name, name) == 0) {</div><div class='add'>+				if (btf_member_bitfield_size(parent_type, i) != 0) {</div><div class='add'>+					fprintf(stderr, "Bitfield presets are not supported %s\n",</div><div class='add'>+						name);</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+				sinfo-&gt;offset += off / 8;</div><div class='add'>+				sinfo-&gt;type = tid;</div><div class='add'>+				sinfo-&gt;size = member_type-&gt;size;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		} else if (btf_is_composite(member_type)) {</div><div class='add'>+			int err;</div><div class='add'>+</div><div class='add'>+			err = adjust_var_secinfo_member(btf, member_type, off,</div><div class='add'>+							member_name, sinfo);</div><div class='add'>+			if (!err)</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ESRCH;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adjust_var_secinfo(struct btf *btf, const struct btf_type *t,</div><div class='add'>+			      struct btf_var_secinfo *sinfo, struct var_preset *preset)</div><div class='add'>+{</div><div class='add'>+	const struct btf_type *base_type;</div><div class='add'>+	const char *prev_name;</div><div class='add'>+	int err, i;</div><div class='add'>+	int tid;</div><div class='add'>+</div><div class='add'>+	assert(preset-&gt;atom_count &gt; 0);</div><div class='add'>+	assert(preset-&gt;atoms[0].type == FIELD_NAME);</div><div class='add'>+</div><div class='add'>+	tid = btf__resolve_type(btf, t-&gt;type);</div><div class='add'>+	base_type = btf__type_by_id(btf, tid);</div><div class='add'>+	prev_name = preset-&gt;atoms[0].name;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; preset-&gt;atom_count; ++i) {</div><div class='add'>+		struct field_access *atom = preset-&gt;atoms + i;</div><div class='add'>+</div><div class='add'>+		switch (atom-&gt;type) {</div><div class='add'>+		case ARRAY_INDEX:</div><div class='add'>+			err = adjust_var_secinfo_array(btf, tid, atom, prev_name, sinfo);</div><div class='add'>+			break;</div><div class='add'>+		case FIELD_NAME:</div><div class='add'>+			err = adjust_var_secinfo_member(btf, base_type, 0, atom-&gt;name, sinfo);</div><div class='add'>+			if (err == -ESRCH)</div><div class='add'>+				fprintf(stderr, "Can't find '%s'\n", atom-&gt;name);</div><div class='add'>+			prev_name = atom-&gt;name;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			fprintf(stderr, "Unknown field_access type\n");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		base_type = btf__type_by_id(btf, sinfo-&gt;type);</div><div class='add'>+		tid = sinfo-&gt;type;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_global_var(struct bpf_object *obj, struct btf *btf,</div><div class='add'>+			  struct bpf_map *map, struct btf_var_secinfo *sinfo,</div><div class='add'>+			  struct var_preset *preset)</div><div class='add'>+{</div><div class='add'>+	const struct btf_type *base_type;</div><div class='add'>+	void *ptr;</div><div class='add'>+	long long value = preset-&gt;value.ivalue;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	base_type = btf__type_by_id(btf, btf__resolve_type(btf, sinfo-&gt;type));</div><div class='add'>+	if (!base_type) {</div><div class='add'>+		fprintf(stderr, "Failed to resolve type %d\n", sinfo-&gt;type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!is_preset_supported(base_type)) {</div><div class='add'>+		fprintf(stderr, "Can't set %s. Only ints and enums are supported\n",</div><div class='add'>+			preset-&gt;full_name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (preset-&gt;value.type == ENUMERATOR) {</div><div class='add'>+		if (btf_is_any_enum(base_type)) {</div><div class='add'>+			if (enum_value_from_name(btf, base_type, preset-&gt;value.svalue, &amp;value)) {</div><div class='add'>+				fprintf(stderr,</div><div class='add'>+					"Failed to find integer value for enum element %s\n",</div><div class='add'>+					preset-&gt;value.svalue);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			fprintf(stderr, "Value %s is not supported for type %s\n",</div><div class='add'>+				preset-&gt;value.svalue,</div><div class='add'>+				btf__name_by_offset(btf, base_type-&gt;name_off));</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if value fits into the target variable size */</div><div class='add'>+	if  (sinfo-&gt;size &lt; sizeof(value)) {</div><div class='add'>+		bool is_signed = is_signed_type(base_type);</div><div class='add'>+		__u32 unsigned_bits = sinfo-&gt;size * 8 - (is_signed ? 1 : 0);</div><div class='add'>+		long long max_val = 1ll &lt;&lt; unsigned_bits;</div><div class='add'>+</div><div class='add'>+		if (value &gt;= max_val || value &lt; -max_val) {</div><div class='add'>+			fprintf(stderr,</div><div class='add'>+				"Variable %s value %lld is out of range [%lld; %lld]\n",</div><div class='add'>+				btf__name_by_offset(btf, base_type-&gt;name_off), value,</div><div class='add'>+				is_signed ? -max_val : 0, max_val - 1);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr = bpf_map__initial_value(map, &amp;size);</div><div class='add'>+	if (!ptr || sinfo-&gt;offset + sinfo-&gt;size &gt; size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (__BYTE_ORDER == __LITTLE_ENDIAN) {</div><div class='add'>+		memcpy(ptr + sinfo-&gt;offset, &amp;value, sinfo-&gt;size);</div><div class='add'>+	} else { /* __BYTE_ORDER == __BIG_ENDIAN */</div><div class='add'>+		__u8 src_offset = sizeof(value) - sinfo-&gt;size;</div><div class='add'>+</div><div class='add'>+		memcpy(ptr + sinfo-&gt;offset, (void *)&amp;value + src_offset, sinfo-&gt;size);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_global_vars(struct bpf_object *obj, struct var_preset *presets, int npresets)</div><div class='add'>+{</div><div class='add'>+	struct btf_var_secinfo *sinfo;</div><div class='add'>+	const char *sec_name;</div><div class='add'>+	const struct btf_type *t;</div><div class='add'>+	struct bpf_map *map;</div><div class='add'>+	struct btf *btf;</div><div class='add'>+	int i, j, k, n, cnt, err = 0;</div><div class='add'>+</div><div class='add'>+	if (npresets == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	btf = bpf_object__btf(obj);</div><div class='add'>+	if (!btf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cnt = btf__type_cnt(btf);</div><div class='add'>+	for (i = 1; i != cnt; ++i) {</div><div class='add'>+		t = btf__type_by_id(btf, i);</div><div class='add'>+</div><div class='add'>+		if (!btf_is_datasec(t))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sinfo = btf_var_secinfos(t);</div><div class='add'>+		sec_name = btf__name_by_offset(btf, t-&gt;name_off);</div><div class='add'>+		map = bpf_object__find_map_by_name(obj, sec_name);</div><div class='add'>+		if (!map)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		n = btf_vlen(t);</div><div class='add'>+		for (j = 0; j &lt; n; ++j, ++sinfo) {</div><div class='add'>+			const struct btf_type *var_type = btf__type_by_id(btf, sinfo-&gt;type);</div><div class='add'>+			const char *var_name;</div><div class='add'>+</div><div class='add'>+			if (!btf_is_var(var_type))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			var_name = btf__name_by_offset(btf, var_type-&gt;name_off);</div><div class='add'>+</div><div class='add'>+			for (k = 0; k &lt; npresets; ++k) {</div><div class='add'>+				struct btf_var_secinfo tmp_sinfo;</div><div class='add'>+</div><div class='add'>+				if (strcmp(var_name, presets[k].atoms[0].name) != 0)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				if (presets[k].applied) {</div><div class='add'>+					fprintf(stderr, "Variable %s is set more than once",</div><div class='add'>+						var_name);</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+				tmp_sinfo = *sinfo;</div><div class='add'>+				err = adjust_var_secinfo(btf, var_type,</div><div class='add'>+							 &amp;tmp_sinfo, presets + k);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+</div><div class='add'>+				err = set_global_var(obj, btf, map, &amp;tmp_sinfo, presets + k);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+</div><div class='add'>+				presets[k].applied = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; npresets; ++i) {</div><div class='add'>+		if (!presets[i].applied) {</div><div class='add'>+			fprintf(stderr, "Global variable preset %s has not been applied\n",</div><div class='add'>+				presets[i].full_name);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		presets[i].applied = false;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int process_obj(const char *filename)</div><div class='ctx'> {</div><div class='hunk'>@@ -1341,6 +2228,11 @@ static int process_obj(const char *filename)</div><div class='ctx'> 	if (prog_cnt == 1) {</div><div class='ctx'> 		prog = bpf_object__next_program(obj, NULL);</div><div class='ctx'> 		bpf_program__set_autoload(prog, true);</div><div class='add'>+		err = set_global_vars(obj, env.presets, env.npresets);</div><div class='add'>+		if (err) {</div><div class='add'>+			fprintf(stderr, "Failed to set global variables %d\n", err);</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='ctx'> 		process_prog(filename, obj, prog);</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1355,6 +2247,12 @@ static int process_obj(const char *filename)</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		err = set_global_vars(tobj, env.presets, env.npresets);</div><div class='add'>+		if (err) {</div><div class='add'>+			fprintf(stderr, "Failed to set global variables %d\n", err);</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		lprog = NULL;</div><div class='ctx'> 		bpf_object__for_each_program(tprog, tobj) {</div><div class='ctx'> 			const char *tprog_name = bpf_program__name(tprog);</div><div class='hunk'>@@ -1400,6 +2298,7 @@ static int cmp_stat(const struct verif_stats *s1, const struct verif_stats *s2,</div><div class='ctx'> 	case TOTAL_STATES:</div><div class='ctx'> 	case PEAK_STATES:</div><div class='ctx'> 	case MAX_STATES_PER_INSN:</div><div class='add'>+	case MEMORY_PEAK:</div><div class='ctx'> 	case MARK_READ_MAX_LEN: {</div><div class='ctx'> 		long v1 = s1-&gt;stats[id];</div><div class='ctx'> 		long v2 = s2-&gt;stats[id];</div><div class='hunk'>@@ -1629,6 +2528,7 @@ static void prepare_value(const struct verif_stats *s, enum stat_id id,</div><div class='ctx'> 	case STACK:</div><div class='ctx'> 	case SIZE:</div><div class='ctx'> 	case JITED_SIZE:</div><div class='add'>+	case MEMORY_PEAK:</div><div class='ctx'> 		*val = s ? s-&gt;stats[id] : 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1715,6 +2615,7 @@ static int parse_stat_value(const char *str, enum stat_id id, struct verif_stats</div><div class='ctx'> 	case MARK_READ_MAX_LEN:</div><div class='ctx'> 	case SIZE:</div><div class='ctx'> 	case JITED_SIZE:</div><div class='add'>+	case MEMORY_PEAK:</div><div class='ctx'> 	case STACK: {</div><div class='ctx'> 		long val;</div><div class='ctx'> 		int err, n;</div><div class='hunk'>@@ -2352,7 +3253,7 @@ static void output_prog_stats(void)</div><div class='ctx'> </div><div class='ctx'> static int handle_verif_mode(void)</div><div class='ctx'> {</div><div class='del'>-	int i, err;</div><div class='add'>+	int i, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (env.filename_cnt == 0) {</div><div class='ctx'> 		fprintf(stderr, "Please provide path to BPF object file!\n\n");</div><div class='hunk'>@@ -2360,11 +3261,12 @@ static int handle_verif_mode(void)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	create_stat_cgroup();</div><div class='ctx'> 	for (i = 0; i &lt; env.filename_cnt; i++) {</div><div class='ctx'> 		err = process_obj(env.filenames[i]);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			fprintf(stderr, "Failed to process '%s': %d\n", env.filenames[i], err);</div><div class='del'>-			return err;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2372,7 +3274,9 @@ static int handle_verif_mode(void)</div><div class='ctx'> </div><div class='ctx'> 	output_prog_stats();</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+out:</div><div class='add'>+	destroy_stat_cgroup();</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int handle_replay_mode(void)</div><div class='hunk'>@@ -2402,7 +3306,7 @@ static int handle_replay_mode(void)</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='del'>-	int err = 0, i;</div><div class='add'>+	int err = 0, i, j;</div><div class='ctx'> </div><div class='ctx'> 	if (argp_parse(&amp;argp, argc, argv, 0, NULL, NULL))</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -2460,5 +3364,21 @@ int main(int argc, char **argv)</div><div class='ctx'> 		free(env.deny_filters[i].prog_glob);</div><div class='ctx'> 	}</div><div class='ctx'> 	free(env.deny_filters);</div><div class='add'>+	for (i = 0; i &lt; env.npresets; ++i) {</div><div class='add'>+		free(env.presets[i].full_name);</div><div class='add'>+		for (j = 0; j &lt; env.presets[i].atom_count; ++j) {</div><div class='add'>+			switch (env.presets[i].atoms[j].type) {</div><div class='add'>+			case FIELD_NAME:</div><div class='add'>+				free(env.presets[i].atoms[j].name);</div><div class='add'>+				break;</div><div class='add'>+			case ARRAY_INDEX:</div><div class='add'>+				if (env.presets[i].atoms[j].index.type == ENUMERATOR)</div><div class='add'>+					free(env.presets[i].atoms[j].index.svalue);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		free(env.presets[i].atoms);</div><div class='add'>+	}</div><div class='add'>+	free(env.presets);</div><div class='ctx'> 	return -err;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/vmtest.sh b/tools/testing/selftests/bpf/vmtest.sh<br/>index 79505d294c44..2f869daf8a06 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/vmtest.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/vmtest.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/vmtest.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/vmtest.sh</a></div><div class='hunk'>@@ -43,6 +43,15 @@ riscv64)</div><div class='ctx'> 	BZIMAGE="arch/riscv/boot/Image"</div><div class='ctx'> 	ARCH="riscv"</div><div class='ctx'> 	;;</div><div class='add'>+ppc64el)</div><div class='add'>+	QEMU_BINARY=qemu-system-ppc64</div><div class='add'>+	QEMU_CONSOLE="hvc0"</div><div class='add'>+	# KVM could not be tested for powerpc, therefore not enabled for now.</div><div class='add'>+	HOST_FLAGS=(-machine pseries -cpu POWER9)</div><div class='add'>+	CROSS_FLAGS=(-machine pseries -cpu POWER9)</div><div class='add'>+	BZIMAGE="vmlinux"</div><div class='add'>+	ARCH="powerpc"</div><div class='add'>+	;;</div><div class='ctx'> *)</div><div class='ctx'> 	echo "Unsupported architecture"</div><div class='ctx'> 	exit 1</div><div class='head'>diff --git a/tools/testing/selftests/bpf/with_addr.sh b/tools/testing/selftests/bpf/with_addr.sh<br/>deleted file mode 100755<br/>index ffcd3953f94c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/with_addr.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/with_addr.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#</div><div class='del'>-# add private ipv4 and ipv6 addresses to loopback</div><div class='del'>-</div><div class='del'>-readonly V6_INNER='100::a/128'</div><div class='del'>-readonly V4_INNER='192.168.0.1/32'</div><div class='del'>-</div><div class='del'>-if getopts ":s" opt; then</div><div class='del'>-  readonly SIT_DEV_NAME='sixtofourtest0'</div><div class='del'>-  readonly V6_SIT='2::/64'</div><div class='del'>-  readonly V4_SIT='172.17.0.1/32'</div><div class='del'>-  shift</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fail() {</div><div class='del'>-  echo "error: $*" 1&gt;&amp;2</div><div class='del'>-  exit 1</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-setup() {</div><div class='del'>-  ip -6 addr add "${V6_INNER}" dev lo || fail 'failed to setup v6 address'</div><div class='del'>-  ip -4 addr add "${V4_INNER}" dev lo || fail 'failed to setup v4 address'</div><div class='del'>-</div><div class='del'>-  if [[ -n "${V6_SIT}" ]]; then</div><div class='del'>-    ip link add "${SIT_DEV_NAME}" type sit remote any local any \</div><div class='del'>-	    || fail 'failed to add sit'</div><div class='del'>-    ip link set dev "${SIT_DEV_NAME}" up \</div><div class='del'>-	    || fail 'failed to bring sit device up'</div><div class='del'>-    ip -6 addr add "${V6_SIT}" dev "${SIT_DEV_NAME}" \</div><div class='del'>-	    || fail 'failed to setup v6 SIT address'</div><div class='del'>-    ip -4 addr add "${V4_SIT}" dev "${SIT_DEV_NAME}" \</div><div class='del'>-	    || fail 'failed to setup v4 SIT address'</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  sleep 2	# avoid race causing bind to fail</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-cleanup() {</div><div class='del'>-  if [[ -n "${V6_SIT}" ]]; then</div><div class='del'>-    ip -4 addr del "${V4_SIT}" dev "${SIT_DEV_NAME}"</div><div class='del'>-    ip -6 addr del "${V6_SIT}" dev "${SIT_DEV_NAME}"</div><div class='del'>-    ip link del "${SIT_DEV_NAME}"</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  ip -4 addr del "${V4_INNER}" dev lo</div><div class='del'>-  ip -6 addr del "${V6_INNER}" dev lo</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-trap cleanup EXIT</div><div class='del'>-</div><div class='del'>-setup</div><div class='del'>-"$@"</div><div class='del'>-exit "$?"</div><div class='head'>diff --git a/tools/testing/selftests/bpf/with_tunnels.sh b/tools/testing/selftests/bpf/with_tunnels.sh<br/>deleted file mode 100755<br/>index e24949ed3a20..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/with_tunnels.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/with_tunnels.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#</div><div class='del'>-# setup tunnels for flow dissection test</div><div class='del'>-</div><div class='del'>-readonly SUFFIX="test_$(mktemp -u XXXX)"</div><div class='del'>-CONFIG="remote 127.0.0.2 local 127.0.0.1 dev lo"</div><div class='del'>-</div><div class='del'>-setup() {</div><div class='del'>-  ip link add "ipip_${SUFFIX}" type ipip ${CONFIG}</div><div class='del'>-  ip link add "gre_${SUFFIX}" type gre ${CONFIG}</div><div class='del'>-  ip link add "sit_${SUFFIX}" type sit ${CONFIG}</div><div class='del'>-</div><div class='del'>-  echo "tunnels before test:"</div><div class='del'>-  ip tunnel show</div><div class='del'>-</div><div class='del'>-  ip link set "ipip_${SUFFIX}" up</div><div class='del'>-  ip link set "gre_${SUFFIX}" up</div><div class='del'>-  ip link set "sit_${SUFFIX}" up</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-cleanup() {</div><div class='del'>-  ip tunnel del "ipip_${SUFFIX}"</div><div class='del'>-  ip tunnel del "gre_${SUFFIX}"</div><div class='del'>-  ip tunnel del "sit_${SUFFIX}"</div><div class='del'>-</div><div class='del'>-  echo "tunnels after test:"</div><div class='del'>-  ip tunnel show</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-trap cleanup EXIT</div><div class='del'>-</div><div class='del'>-setup</div><div class='del'>-"$@"</div><div class='del'>-exit "$?"</div><div class='head'>diff --git a/tools/testing/selftests/bpf/xdp_hw_metadata.c b/tools/testing/selftests/bpf/xdp_hw_metadata.c<br/>index 6f7b15d6c6ed..3d8de0d4c96a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xdp_hw_metadata.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xdp_hw_metadata.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xdp_hw_metadata.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/xdp_hw_metadata.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'>  * - UDP 9091 packets trigger TX reply</div><div class='ctx'>  * - TX HW timestamp is requested and reported back upon completion</div><div class='ctx'>  * - TX checksum is requested</div><div class='add'>+ * - TX launch time HW offload is requested for transmission</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;test_progs.h&gt;</div><div class='hunk'>@@ -37,6 +38,15 @@</div><div class='ctx'> #include &lt;time.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;libgen.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;linux/pkt_sched.h&gt;</div><div class='add'>+#include &lt;linux/pkt_cls.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;arpa/inet.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "xdp_metadata.h"</div><div class='ctx'> </div><div class='hunk'>@@ -64,6 +74,18 @@ int rxq;</div><div class='ctx'> bool skip_tx;</div><div class='ctx'> __u64 last_hw_rx_timestamp;</div><div class='ctx'> __u64 last_xdp_rx_timestamp;</div><div class='add'>+__u64 last_launch_time;</div><div class='add'>+__u64 launch_time_delta_to_hw_rx_timestamp;</div><div class='add'>+int launch_time_queue;</div><div class='add'>+</div><div class='add'>+#define run_command(cmd, ...)					\</div><div class='add'>+({								\</div><div class='add'>+	char command[1024];					\</div><div class='add'>+	memset(command, 0, sizeof(command));			\</div><div class='add'>+	snprintf(command, sizeof(command), cmd, ##__VA_ARGS__);	\</div><div class='add'>+	fprintf(stderr, "Running: %s\n", command);		\</div><div class='add'>+	system(command);					\</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> void test__fail(void) { /* for network_helpers.c */ }</div><div class='ctx'> </div><div class='hunk'>@@ -298,6 +320,12 @@ static bool complete_tx(struct xsk *xsk, clockid_t clock_id)</div><div class='ctx'> 	if (meta-&gt;completion.tx_timestamp) {</div><div class='ctx'> 		__u64 ref_tstamp = gettime(clock_id);</div><div class='ctx'> </div><div class='add'>+		if (launch_time_delta_to_hw_rx_timestamp) {</div><div class='add'>+			print_tstamp_delta("HW Launch-time",</div><div class='add'>+					   "HW TX-complete-time",</div><div class='add'>+					   last_launch_time,</div><div class='add'>+					   meta-&gt;completion.tx_timestamp);</div><div class='add'>+		}</div><div class='ctx'> 		print_tstamp_delta("HW TX-complete-time", "User TX-complete-time",</div><div class='ctx'> 				   meta-&gt;completion.tx_timestamp, ref_tstamp);</div><div class='ctx'> 		print_tstamp_delta("XDP RX-time", "User TX-complete-time",</div><div class='hunk'>@@ -395,6 +423,17 @@ static void ping_pong(struct xsk *xsk, void *rx_packet, clockid_t clock_id)</div><div class='ctx'> 	       xsk, ntohs(udph-&gt;check), ntohs(want_csum),</div><div class='ctx'> 	       meta-&gt;request.csum_start, meta-&gt;request.csum_offset);</div><div class='ctx'> </div><div class='add'>+	/* Set the value of launch time */</div><div class='add'>+	if (launch_time_delta_to_hw_rx_timestamp) {</div><div class='add'>+		meta-&gt;flags |= XDP_TXMD_FLAGS_LAUNCH_TIME;</div><div class='add'>+		meta-&gt;request.launch_time = last_hw_rx_timestamp +</div><div class='add'>+					    launch_time_delta_to_hw_rx_timestamp;</div><div class='add'>+		last_launch_time = meta-&gt;request.launch_time;</div><div class='add'>+		print_tstamp_delta("HW RX-time", "HW Launch-time",</div><div class='add'>+				   last_hw_rx_timestamp,</div><div class='add'>+				   meta-&gt;request.launch_time);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	memcpy(data, rx_packet, len); /* don't share umem chunk for simplicity */</div><div class='ctx'> 	tx_desc-&gt;options |= XDP_TX_METADATA;</div><div class='ctx'> 	tx_desc-&gt;len = len;</div><div class='hunk'>@@ -407,6 +446,7 @@ static int verify_metadata(struct xsk *rx_xsk, int rxq, int server_fd, clockid_t</div><div class='ctx'> 	const struct xdp_desc *rx_desc;</div><div class='ctx'> 	struct pollfd fds[rxq + 1];</div><div class='ctx'> 	__u64 comp_addr;</div><div class='add'>+	__u64 deadline;</div><div class='ctx'> 	__u64 addr;</div><div class='ctx'> 	__u32 idx = 0;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -477,9 +517,15 @@ peek:</div><div class='ctx'> 					if (ret)</div><div class='ctx'> 						printf("kick_tx ret=%d\n", ret);</div><div class='ctx'> </div><div class='del'>-					for (int j = 0; j &lt; 500; j++) {</div><div class='add'>+					/* wait 1 second + cover launch time */</div><div class='add'>+					deadline = gettime(clock_id) +</div><div class='add'>+						   NANOSEC_PER_SEC +</div><div class='add'>+						   launch_time_delta_to_hw_rx_timestamp;</div><div class='add'>+					while (true) {</div><div class='ctx'> 						if (complete_tx(xsk, clock_id))</div><div class='ctx'> 							break;</div><div class='add'>+						if (gettime(clock_id) &gt;= deadline)</div><div class='add'>+							break;</div><div class='ctx'> 						usleep(10);</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='hunk'>@@ -608,6 +654,10 @@ static void print_usage(void)</div><div class='ctx'> 		"  -h    Display this help and exit\n\n"</div><div class='ctx'> 		"  -m    Enable multi-buffer XDP for larger MTU\n"</div><div class='ctx'> 		"  -r    Don't generate AF_XDP reply (rx metadata only)\n"</div><div class='add'>+		"  -l    Delta of launch time relative to HW RX-time in ns\n"</div><div class='add'>+		"        default: 0 ns (launch time request is disabled)\n"</div><div class='add'>+		"  -L    Tx Queue to be enabled with launch time offload\n"</div><div class='add'>+		"        default: 0 (Tx Queue 0)\n"</div><div class='ctx'> 		"Generate test packets on the other machine with:\n"</div><div class='ctx'> 		"  echo -n xdp | nc -u -q1 &lt;dst_ip&gt; 9091\n";</div><div class='ctx'> </div><div class='hunk'>@@ -618,7 +668,7 @@ static void read_args(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	int opt;</div><div class='ctx'> </div><div class='del'>-	while ((opt = getopt(argc, argv, "chmr")) != -1) {</div><div class='add'>+	while ((opt = getopt(argc, argv, "chmrl:L:")) != -1) {</div><div class='ctx'> 		switch (opt) {</div><div class='ctx'> 		case 'c':</div><div class='ctx'> 			bind_flags &amp;= ~XDP_USE_NEED_WAKEUP;</div><div class='hunk'>@@ -634,6 +684,12 @@ static void read_args(int argc, char *argv[])</div><div class='ctx'> 		case 'r':</div><div class='ctx'> 			skip_tx = true;</div><div class='ctx'> 			break;</div><div class='add'>+		case 'l':</div><div class='add'>+			launch_time_delta_to_hw_rx_timestamp = atoll(optarg);</div><div class='add'>+			break;</div><div class='add'>+		case 'L':</div><div class='add'>+			launch_time_queue = atoll(optarg);</div><div class='add'>+			break;</div><div class='ctx'> 		case '?':</div><div class='ctx'> 			if (isprint(optopt))</div><div class='ctx'> 				fprintf(stderr, "Unknown option: -%c\n", optopt);</div><div class='hunk'>@@ -657,23 +713,118 @@ static void read_args(int argc, char *argv[])</div><div class='ctx'> 		error(-1, errno, "Invalid interface name");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void clean_existing_configurations(void)</div><div class='add'>+{</div><div class='add'>+	/* Check and delete root qdisc if exists */</div><div class='add'>+	if (run_command("sudo tc qdisc show dev %s | grep -q 'qdisc mqprio 8001:'", ifname) == 0)</div><div class='add'>+		run_command("sudo tc qdisc del dev %s root", ifname);</div><div class='add'>+</div><div class='add'>+	/* Check and delete ingress qdisc if exists */</div><div class='add'>+	if (run_command("sudo tc qdisc show dev %s | grep -q 'qdisc ingress ffff:'", ifname) == 0)</div><div class='add'>+		run_command("sudo tc qdisc del dev %s ingress", ifname);</div><div class='add'>+</div><div class='add'>+	/* Check and delete ethtool filters if any exist */</div><div class='add'>+	if (run_command("sudo ethtool -n %s | grep -q 'Filter:'", ifname) == 0) {</div><div class='add'>+		run_command("sudo ethtool -n %s | grep 'Filter:' | awk '{print $2}' | xargs -n1 sudo ethtool -N %s delete &gt;&amp;2",</div><div class='add'>+			    ifname, ifname);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_TC 16</div><div class='add'>+</div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	clockid_t clock_id = CLOCK_TAI;</div><div class='add'>+	struct bpf_program *prog;</div><div class='ctx'> 	int server_fd = -1;</div><div class='add'>+	size_t map_len = 0;</div><div class='add'>+	size_t que_len = 0;</div><div class='add'>+	char *buf = NULL;</div><div class='add'>+	char *map = NULL;</div><div class='add'>+	char *que = NULL;</div><div class='add'>+	char *tmp = NULL;</div><div class='add'>+	int tc = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	struct bpf_program *prog;</div><div class='del'>-</div><div class='ctx'> 	read_args(argc, argv);</div><div class='ctx'> </div><div class='ctx'> 	rxq = rxq_num(ifname);</div><div class='del'>-</div><div class='ctx'> 	printf("rxq: %d\n", rxq);</div><div class='ctx'> </div><div class='add'>+	if (launch_time_queue &gt;= rxq || launch_time_queue &lt; 0)</div><div class='add'>+		error(1, 0, "Invalid launch_time_queue.");</div><div class='add'>+</div><div class='add'>+	clean_existing_configurations();</div><div class='add'>+	sleep(1);</div><div class='add'>+</div><div class='add'>+	/* Enable tx and rx hardware timestamping */</div><div class='ctx'> 	hwtstamp_enable(ifname);</div><div class='ctx'> </div><div class='add'>+	/* Prepare priority to traffic class map for tc-mqprio */</div><div class='add'>+	for (i = 0; i &lt; MAX_TC; i++) {</div><div class='add'>+		if (i &lt; rxq)</div><div class='add'>+			tc = i;</div><div class='add'>+</div><div class='add'>+		if (asprintf(&amp;buf, "%d ", tc) == -1) {</div><div class='add'>+			printf("Failed to malloc buf for tc map.\n");</div><div class='add'>+			goto free_mem;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		map_len += strlen(buf);</div><div class='add'>+		tmp = realloc(map, map_len + 1);</div><div class='add'>+		if (!tmp) {</div><div class='add'>+			printf("Failed to realloc tc map.\n");</div><div class='add'>+			goto free_mem;</div><div class='add'>+		}</div><div class='add'>+		map = tmp;</div><div class='add'>+		strcat(map, buf);</div><div class='add'>+		free(buf);</div><div class='add'>+		buf = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Prepare traffic class to hardware queue map for tc-mqprio */</div><div class='add'>+	for (i = 0; i &lt;= tc; i++) {</div><div class='add'>+		if (asprintf(&amp;buf, "1@%d ", i) == -1) {</div><div class='add'>+			printf("Failed to malloc buf for tc queues.\n");</div><div class='add'>+			goto free_mem;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		que_len += strlen(buf);</div><div class='add'>+		tmp = realloc(que, que_len + 1);</div><div class='add'>+		if (!tmp) {</div><div class='add'>+			printf("Failed to realloc tc queues.\n");</div><div class='add'>+			goto free_mem;</div><div class='add'>+		}</div><div class='add'>+		que = tmp;</div><div class='add'>+		strcat(que, buf);</div><div class='add'>+		free(buf);</div><div class='add'>+		buf = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add mqprio qdisc */</div><div class='add'>+	run_command("sudo tc qdisc add dev %s handle 8001: parent root mqprio num_tc %d map %squeues %shw 0",</div><div class='add'>+		    ifname, tc + 1, map, que);</div><div class='add'>+</div><div class='add'>+	/* To test launch time, send UDP packet with VLAN priority 1 to port 9091 */</div><div class='add'>+	if (launch_time_delta_to_hw_rx_timestamp) {</div><div class='add'>+		/* Enable launch time hardware offload on launch_time_queue */</div><div class='add'>+		run_command("sudo tc qdisc replace dev %s parent 8001:%d etf offload clockid CLOCK_TAI delta 500000",</div><div class='add'>+			    ifname, launch_time_queue + 1);</div><div class='add'>+		sleep(1);</div><div class='add'>+</div><div class='add'>+		/* Route incoming packet with VLAN priority 1 into launch_time_queue */</div><div class='add'>+		if (run_command("sudo ethtool -N %s flow-type ether vlan 0x2000 vlan-mask 0x1FFF action %d",</div><div class='add'>+				ifname, launch_time_queue)) {</div><div class='add'>+			run_command("sudo tc qdisc add dev %s ingress", ifname);</div><div class='add'>+			run_command("sudo tc filter add dev %s parent ffff: protocol 802.1Q flower vlan_prio 1 hw_tc %d",</div><div class='add'>+				    ifname, launch_time_queue);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable VLAN tag stripping offload */</div><div class='add'>+		run_command("sudo ethtool -K %s rxvlan on", ifname);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rx_xsk = malloc(sizeof(struct xsk) * rxq);</div><div class='ctx'> 	if (!rx_xsk)</div><div class='ctx'> 		error(1, ENOMEM, "malloc");</div><div class='hunk'>@@ -733,4 +884,11 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	cleanup();</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		error(1, -ret, "verify_metadata");</div><div class='add'>+</div><div class='add'>+	clean_existing_configurations();</div><div class='add'>+</div><div class='add'>+free_mem:</div><div class='add'>+	free(buf);</div><div class='add'>+	free(map);</div><div class='add'>+	free(que);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/bpf/xdp_redirect_multi.c b/tools/testing/selftests/bpf/xdp_redirect_multi.c<br/>deleted file mode 100644<br/>index c1fc44c87c30..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xdp_redirect_multi.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xdp_redirect_multi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,226 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-#include &lt;linux/bpf.h&gt;</div><div class='del'>-#include &lt;linux/if_link.h&gt;</div><div class='del'>-#include &lt;assert.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;net/if.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;libgen.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-</div><div class='del'>-#include "bpf_util.h"</div><div class='del'>-#include &lt;bpf/bpf.h&gt;</div><div class='del'>-#include &lt;bpf/libbpf.h&gt;</div><div class='del'>-</div><div class='del'>-#define MAX_IFACE_NUM 32</div><div class='del'>-#define MAX_INDEX_NUM 1024</div><div class='del'>-</div><div class='del'>-static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;</div><div class='del'>-static int ifaces[MAX_IFACE_NUM] = {};</div><div class='del'>-</div><div class='del'>-static void int_exit(int sig)</div><div class='del'>-{</div><div class='del'>-	__u32 prog_id = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; ifaces[i] &gt; 0; i++) {</div><div class='del'>-		if (bpf_xdp_query_id(ifaces[i], xdp_flags, &amp;prog_id)) {</div><div class='del'>-			printf("bpf_xdp_query_id failed\n");</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-		if (prog_id)</div><div class='del'>-			bpf_xdp_detach(ifaces[i], xdp_flags, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	exit(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_mac_addr(unsigned int ifindex, void *mac_addr)</div><div class='del'>-{</div><div class='del'>-	char ifname[IF_NAMESIZE];</div><div class='del'>-	struct ifreq ifr;</div><div class='del'>-	int fd, ret = -1;</div><div class='del'>-</div><div class='del'>-	fd = socket(AF_INET, SOCK_DGRAM, 0);</div><div class='del'>-	if (fd &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (!if_indextoname(ifindex, ifname))</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	strcpy(ifr.ifr_name, ifname);</div><div class='del'>-</div><div class='del'>-	if (ioctl(fd, SIOCGIFHWADDR, &amp;ifr) != 0)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	memcpy(mac_addr, ifr.ifr_hwaddr.sa_data, 6 * sizeof(char));</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	close(fd);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void usage(const char *prog)</div><div class='del'>-{</div><div class='del'>-	fprintf(stderr,</div><div class='del'>-		"usage: %s [OPTS] &lt;IFNAME|IFINDEX&gt; &lt;IFNAME|IFINDEX&gt; ...\n"</div><div class='del'>-		"OPTS:\n"</div><div class='del'>-		"    -S    use skb-mode\n"</div><div class='del'>-		"    -N    enforce native mode\n"</div><div class='del'>-		"    -F    force loading prog\n"</div><div class='del'>-		"    -X    load xdp program on egress\n",</div><div class='del'>-		prog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	int prog_fd, group_all, mac_map;</div><div class='del'>-	struct bpf_program *ingress_prog, *egress_prog;</div><div class='del'>-	int i, err, ret, opt, egress_prog_fd = 0;</div><div class='del'>-	struct bpf_devmap_val devmap_val;</div><div class='del'>-	bool attach_egress_prog = false;</div><div class='del'>-	unsigned char mac_addr[6];</div><div class='del'>-	char ifname[IF_NAMESIZE];</div><div class='del'>-	struct bpf_object *obj;</div><div class='del'>-	unsigned int ifindex;</div><div class='del'>-	char filename[256];</div><div class='del'>-</div><div class='del'>-	while ((opt = getopt(argc, argv, "SNFX")) != -1) {</div><div class='del'>-		switch (opt) {</div><div class='del'>-		case 'S':</div><div class='del'>-			xdp_flags |= XDP_FLAGS_SKB_MODE;</div><div class='del'>-			break;</div><div class='del'>-		case 'N':</div><div class='del'>-			/* default, set below */</div><div class='del'>-			break;</div><div class='del'>-		case 'F':</div><div class='del'>-			xdp_flags &amp;= ~XDP_FLAGS_UPDATE_IF_NOEXIST;</div><div class='del'>-			break;</div><div class='del'>-		case 'X':</div><div class='del'>-			attach_egress_prog = true;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(xdp_flags &amp; XDP_FLAGS_SKB_MODE)) {</div><div class='del'>-		xdp_flags |= XDP_FLAGS_DRV_MODE;</div><div class='del'>-	} else if (attach_egress_prog) {</div><div class='del'>-		printf("Load xdp program on egress with SKB mode not supported yet\n");</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (optind == argc) {</div><div class='del'>-		printf("usage: %s &lt;IFNAME|IFINDEX&gt; &lt;IFNAME|IFINDEX&gt; ...\n", argv[0]);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("Get interfaces:");</div><div class='del'>-	for (i = 0; i &lt; MAX_IFACE_NUM &amp;&amp; argv[optind + i]; i++) {</div><div class='del'>-		ifaces[i] = if_nametoindex(argv[optind + i]);</div><div class='del'>-		if (!ifaces[i])</div><div class='del'>-			ifaces[i] = strtoul(argv[optind + i], NULL, 0);</div><div class='del'>-		if (!if_indextoname(ifaces[i], ifname)) {</div><div class='del'>-			perror("Invalid interface name or i");</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		if (ifaces[i] &gt; MAX_INDEX_NUM) {</div><div class='del'>-			printf(" interface index too large\n");</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		printf(" %d", ifaces[i]);</div><div class='del'>-	}</div><div class='del'>-	printf("\n");</div><div class='del'>-</div><div class='del'>-	snprintf(filename, sizeof(filename), "%s_kern.bpf.o", argv[0]);</div><div class='del'>-	obj = bpf_object__open_file(filename, NULL);</div><div class='del'>-	err = libbpf_get_error(obj);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_out;</div><div class='del'>-	err = bpf_object__load(obj);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_out;</div><div class='del'>-	prog_fd = bpf_program__fd(bpf_object__next_program(obj, NULL));</div><div class='del'>-</div><div class='del'>-	if (attach_egress_prog)</div><div class='del'>-		group_all = bpf_object__find_map_fd_by_name(obj, "map_egress");</div><div class='del'>-	else</div><div class='del'>-		group_all = bpf_object__find_map_fd_by_name(obj, "map_all");</div><div class='del'>-	mac_map = bpf_object__find_map_fd_by_name(obj, "mac_map");</div><div class='del'>-</div><div class='del'>-	if (group_all &lt; 0 || mac_map &lt; 0) {</div><div class='del'>-		printf("bpf_object__find_map_fd_by_name failed\n");</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attach_egress_prog) {</div><div class='del'>-		/* Find ingress/egress prog for 2nd xdp prog */</div><div class='del'>-		ingress_prog = bpf_object__find_program_by_name(obj, "xdp_redirect_map_all_prog");</div><div class='del'>-		egress_prog = bpf_object__find_program_by_name(obj, "xdp_devmap_prog");</div><div class='del'>-		if (!ingress_prog || !egress_prog) {</div><div class='del'>-			printf("finding ingress/egress_prog in obj file failed\n");</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-		prog_fd = bpf_program__fd(ingress_prog);</div><div class='del'>-		egress_prog_fd = bpf_program__fd(egress_prog);</div><div class='del'>-		if (prog_fd &lt; 0 || egress_prog_fd &lt; 0) {</div><div class='del'>-			printf("find egress_prog fd failed\n");</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	signal(SIGINT, int_exit);</div><div class='del'>-	signal(SIGTERM, int_exit);</div><div class='del'>-</div><div class='del'>-	/* Init forward multicast groups and exclude group */</div><div class='del'>-	for (i = 0; ifaces[i] &gt; 0; i++) {</div><div class='del'>-		ifindex = ifaces[i];</div><div class='del'>-</div><div class='del'>-		if (attach_egress_prog) {</div><div class='del'>-			ret = get_mac_addr(ifindex, mac_addr);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				printf("get interface %d mac failed\n", ifindex);</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-			ret = bpf_map_update_elem(mac_map, &amp;ifindex, mac_addr, 0);</div><div class='del'>-			if (ret) {</div><div class='del'>-				perror("bpf_update_elem mac_map failed\n");</div><div class='del'>-				goto err_out;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Add all the interfaces to group all */</div><div class='del'>-		devmap_val.ifindex = ifindex;</div><div class='del'>-		devmap_val.bpf_prog.fd = egress_prog_fd;</div><div class='del'>-		ret = bpf_map_update_elem(group_all, &amp;ifindex, &amp;devmap_val, 0);</div><div class='del'>-		if (ret) {</div><div class='del'>-			perror("bpf_map_update_elem");</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* bind prog_fd to each interface */</div><div class='del'>-		ret = bpf_xdp_attach(ifindex, prog_fd, xdp_flags, NULL);</div><div class='del'>-		if (ret) {</div><div class='del'>-			printf("Set xdp fd failed on %d\n", ifindex);</div><div class='del'>-			goto err_out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* sleep some time for testing */</div><div class='del'>-	sleep(999);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='head'>diff --git a/tools/testing/selftests/bpf/xdping.c b/tools/testing/selftests/bpf/xdping.c<br/>index 1503a1d2faa0..9ed8c796645d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xdping.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xdping.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xdping.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/xdping.c</a></div><div class='hunk'>@@ -155,7 +155,7 @@ int main(int argc, char **argv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!server) {</div><div class='del'>-		/* Only supports IPv4; see hints initiailization above. */</div><div class='add'>+		/* Only supports IPv4; see hints initialization above. */</div><div class='ctx'> 		if (getaddrinfo(argv[optind], NULL, &amp;hints, &amp;a) || !a) {</div><div class='ctx'> 			fprintf(stderr, "Could not resolve %s\n", argv[optind]);</div><div class='ctx'> 			return 1;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/xsk.h b/tools/testing/selftests/bpf/xsk.h<br/>index 93c2cc413cfc..48729da142c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xsk.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xsk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xsk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/xsk.h</a></div><div class='hunk'>@@ -93,8 +93,8 @@ static inline __u32 xsk_prod_nb_free(struct xsk_ring_prod *r, __u32 nb)</div><div class='ctx'> 	/* Refresh the local tail pointer.</div><div class='ctx'> 	 * cached_cons is r-&gt;size bigger than the real consumer pointer so</div><div class='ctx'> 	 * that this addition can be avoided in the more frequently</div><div class='del'>-	 * executed code that computs free_entries in the beginning of</div><div class='del'>-	 * this function. Without this optimization it whould have been</div><div class='add'>+	 * executed code that computes free_entries in the beginning of</div><div class='add'>+	 * this function. Without this optimization it would have been</div><div class='ctx'> 	 * free_entries = r-&gt;cached_prod - r-&gt;cached_cons + r-&gt;size.</div><div class='ctx'> 	 */</div><div class='ctx'> 	r-&gt;cached_cons = __atomic_load_n(r-&gt;consumer, __ATOMIC_ACQUIRE);</div><div class='head'>diff --git a/tools/testing/selftests/bpf/xsk_xdp_common.h b/tools/testing/selftests/bpf/xsk_xdp_common.h<br/>index 5a6f36f07383..45810ff552da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xsk_xdp_common.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xsk_xdp_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xsk_xdp_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/xsk_xdp_common.h</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #define XSK_XDP_COMMON_H_</div><div class='ctx'> </div><div class='ctx'> #define MAX_SOCKETS 2</div><div class='add'>+#define PKT_HDR_ALIGN (sizeof(struct ethhdr) + 2) /* Just to align the data in the packet */</div><div class='ctx'> </div><div class='ctx'> struct xdp_info {</div><div class='ctx'> 	__u64 count;</div><div class='head'>diff --git a/tools/testing/selftests/bpf/xskxceiver.c b/tools/testing/selftests/bpf/xskxceiver.c<br/>index 11f047b8af75..05b3cebc5ca9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xskxceiver.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xskxceiver.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xskxceiver.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/xskxceiver.c</a></div><div class='hunk'>@@ -74,42 +74,33 @@</div><div class='ctx'> #define _GNU_SOURCE</div><div class='ctx'> #include &lt;assert.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;getopt.h&gt;</div><div class='ctx'> #include &lt;linux/if_link.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/netdev.h&gt;</div><div class='del'>-#include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;arpa/inet.h&gt;</div><div class='ctx'> #include &lt;net/if.h&gt;</div><div class='ctx'> #include &lt;locale.h&gt;</div><div class='del'>-#include &lt;poll.h&gt;</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;libgen.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='ctx'> #include &lt;stddef.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "prog_tests/test_xsk.h"</div><div class='ctx'> #include "xsk_xdp_progs.skel.h"</div><div class='ctx'> #include "xsk.h"</div><div class='ctx'> #include "xskxceiver.h"</div><div class='ctx'> #include &lt;bpf/bpf.h&gt;</div><div class='ctx'> #include &lt;linux/filter.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "xsk_xdp_common.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;network_helpers.h&gt;</div><div class='ctx'> </div><div class='del'>-static bool opt_verbose;</div><div class='ctx'> static bool opt_print_tests;</div><div class='ctx'> static enum test_mode opt_mode = TEST_MODE_ALL;</div><div class='ctx'> static u32 opt_run_test = RUN_ALL_TESTS;</div><div class='hunk'>@@ -118,169 +109,12 @@ void test__fail(void) { /* for network_helpers.c */ }</div><div class='ctx'> </div><div class='ctx'> static void __exit_with_error(int error, const char *file, const char *func, int line)</div><div class='ctx'> {</div><div class='del'>-	ksft_test_result_fail("[%s:%s:%i]: ERROR: %d/\"%s\"\n", file, func, line, error,</div><div class='del'>-			      strerror(error));</div><div class='add'>+	ksft_test_result_fail("[%s:%s:%i]: ERROR: %d/\"%s\"\n", file, func, line,</div><div class='add'>+			      error, strerror(error));</div><div class='ctx'> 	ksft_exit_xfail();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define exit_with_error(error) __exit_with_error(error, __FILE__, __func__, __LINE__)</div><div class='del'>-#define busy_poll_string(test) (test)-&gt;ifobj_tx-&gt;busy_poll ? "BUSY-POLL " : ""</div><div class='del'>-static char *mode_string(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	switch (test-&gt;mode) {</div><div class='del'>-	case TEST_MODE_SKB:</div><div class='del'>-		return "SKB";</div><div class='del'>-	case TEST_MODE_DRV:</div><div class='del'>-		return "DRV";</div><div class='del'>-	case TEST_MODE_ZC:</div><div class='del'>-		return "ZC";</div><div class='del'>-	default:</div><div class='del'>-		return "BOGUS";</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void report_failure(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	if (test-&gt;fail)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ksft_test_result_fail("FAIL: %s %s%s\n", mode_string(test), busy_poll_string(test),</div><div class='del'>-			      test-&gt;name);</div><div class='del'>-	test-&gt;fail = true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The payload is a word consisting of a packet sequence number in the upper</div><div class='del'>- * 16-bits and a intra packet data sequence number in the lower 16 bits. So the 3rd packet's</div><div class='del'>- * 5th word of data will contain the number (2&lt;&lt;16) | 4 as they are numbered from 0.</div><div class='del'>- */</div><div class='del'>-static void write_payload(void *dest, u32 pkt_nb, u32 start, u32 size)</div><div class='del'>-{</div><div class='del'>-	u32 *ptr = (u32 *)dest, i;</div><div class='del'>-</div><div class='del'>-	start /= sizeof(*ptr);</div><div class='del'>-	size /= sizeof(*ptr);</div><div class='del'>-	for (i = 0; i &lt; size; i++)</div><div class='del'>-		ptr[i] = htonl(pkt_nb &lt;&lt; 16 | (i + start));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gen_eth_hdr(struct xsk_socket_info *xsk, struct ethhdr *eth_hdr)</div><div class='del'>-{</div><div class='del'>-	memcpy(eth_hdr-&gt;h_dest, xsk-&gt;dst_mac, ETH_ALEN);</div><div class='del'>-	memcpy(eth_hdr-&gt;h_source, xsk-&gt;src_mac, ETH_ALEN);</div><div class='del'>-	eth_hdr-&gt;h_proto = htons(ETH_P_LOOPBACK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool is_umem_valid(struct ifobject *ifobj)</div><div class='del'>-{</div><div class='del'>-	return !!ifobj-&gt;umem-&gt;umem;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 mode_to_xdp_flags(enum test_mode mode)</div><div class='del'>-{</div><div class='del'>-	return (mode == TEST_MODE_SKB) ? XDP_FLAGS_SKB_MODE : XDP_FLAGS_DRV_MODE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 umem_size(struct xsk_umem_info *umem)</div><div class='del'>-{</div><div class='del'>-	return umem-&gt;num_frames * umem-&gt;frame_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xsk_configure_umem(struct ifobject *ifobj, struct xsk_umem_info *umem, void *buffer,</div><div class='del'>-			      u64 size)</div><div class='del'>-{</div><div class='del'>-	struct xsk_umem_config cfg = {</div><div class='del'>-		.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,</div><div class='del'>-		.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,</div><div class='del'>-		.frame_size = umem-&gt;frame_size,</div><div class='del'>-		.frame_headroom = umem-&gt;frame_headroom,</div><div class='del'>-		.flags = XSK_UMEM__DEFAULT_FLAGS</div><div class='del'>-	};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (umem-&gt;fill_size)</div><div class='del'>-		cfg.fill_size = umem-&gt;fill_size;</div><div class='del'>-</div><div class='del'>-	if (umem-&gt;comp_size)</div><div class='del'>-		cfg.comp_size = umem-&gt;comp_size;</div><div class='del'>-</div><div class='del'>-	if (umem-&gt;unaligned_mode)</div><div class='del'>-		cfg.flags |= XDP_UMEM_UNALIGNED_CHUNK_FLAG;</div><div class='del'>-</div><div class='del'>-	ret = xsk_umem__create(&amp;umem-&gt;umem, buffer, size,</div><div class='del'>-			       &amp;umem-&gt;fq, &amp;umem-&gt;cq, &amp;cfg);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	umem-&gt;buffer = buffer;</div><div class='del'>-	if (ifobj-&gt;shared_umem &amp;&amp; ifobj-&gt;rx_on) {</div><div class='del'>-		umem-&gt;base_addr = umem_size(umem);</div><div class='del'>-		umem-&gt;next_buffer = umem_size(umem);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 umem_alloc_buffer(struct xsk_umem_info *umem)</div><div class='del'>-{</div><div class='del'>-	u64 addr;</div><div class='del'>-</div><div class='del'>-	addr = umem-&gt;next_buffer;</div><div class='del'>-	umem-&gt;next_buffer += umem-&gt;frame_size;</div><div class='del'>-	if (umem-&gt;next_buffer &gt;= umem-&gt;base_addr + umem_size(umem))</div><div class='del'>-		umem-&gt;next_buffer = umem-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void umem_reset_alloc(struct xsk_umem_info *umem)</div><div class='del'>-{</div><div class='del'>-	umem-&gt;next_buffer = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void enable_busy_poll(struct xsk_socket_info *xsk)</div><div class='del'>-{</div><div class='del'>-	int sock_opt;</div><div class='del'>-</div><div class='del'>-	sock_opt = 1;</div><div class='del'>-	if (setsockopt(xsk_socket__fd(xsk-&gt;xsk), SOL_SOCKET, SO_PREFER_BUSY_POLL,</div><div class='del'>-		       (void *)&amp;sock_opt, sizeof(sock_opt)) &lt; 0)</div><div class='del'>-		exit_with_error(errno);</div><div class='del'>-</div><div class='del'>-	sock_opt = 20;</div><div class='del'>-	if (setsockopt(xsk_socket__fd(xsk-&gt;xsk), SOL_SOCKET, SO_BUSY_POLL,</div><div class='del'>-		       (void *)&amp;sock_opt, sizeof(sock_opt)) &lt; 0)</div><div class='del'>-		exit_with_error(errno);</div><div class='del'>-</div><div class='del'>-	sock_opt = xsk-&gt;batch_size;</div><div class='del'>-	if (setsockopt(xsk_socket__fd(xsk-&gt;xsk), SOL_SOCKET, SO_BUSY_POLL_BUDGET,</div><div class='del'>-		       (void *)&amp;sock_opt, sizeof(sock_opt)) &lt; 0)</div><div class='del'>-		exit_with_error(errno);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __xsk_configure_socket(struct xsk_socket_info *xsk, struct xsk_umem_info *umem,</div><div class='del'>-				  struct ifobject *ifobject, bool shared)</div><div class='del'>-{</div><div class='del'>-	struct xsk_socket_config cfg = {};</div><div class='del'>-	struct xsk_ring_cons *rxr;</div><div class='del'>-	struct xsk_ring_prod *txr;</div><div class='del'>-</div><div class='del'>-	xsk-&gt;umem = umem;</div><div class='del'>-	cfg.rx_size = xsk-&gt;rxqsize;</div><div class='del'>-	cfg.tx_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;</div><div class='del'>-	cfg.bind_flags = ifobject-&gt;bind_flags;</div><div class='del'>-	if (shared)</div><div class='del'>-		cfg.bind_flags |= XDP_SHARED_UMEM;</div><div class='del'>-	if (ifobject-&gt;mtu &gt; MAX_ETH_PKT_SIZE)</div><div class='del'>-		cfg.bind_flags |= XDP_USE_SG;</div><div class='del'>-	if (umem-&gt;comp_size)</div><div class='del'>-		cfg.tx_size = umem-&gt;comp_size;</div><div class='del'>-	if (umem-&gt;fill_size)</div><div class='del'>-		cfg.rx_size = umem-&gt;fill_size;</div><div class='del'>-</div><div class='del'>-	txr = ifobject-&gt;tx_on ? &amp;xsk-&gt;tx : NULL;</div><div class='del'>-	rxr = ifobject-&gt;rx_on ? &amp;xsk-&gt;rx : NULL;</div><div class='del'>-	return xsk_socket__create(&amp;xsk-&gt;xsk, ifobject-&gt;ifindex, 0, umem-&gt;umem, rxr, txr, &amp;cfg);</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static bool ifobj_zc_avail(struct ifobject *ifobject)</div><div class='ctx'> {</div><div class='hunk'>@@ -312,7 +146,7 @@ static bool ifobj_zc_avail(struct ifobject *ifobject)</div><div class='ctx'> 	ifobject-&gt;bind_flags = XDP_USE_NEED_WAKEUP | XDP_ZEROCOPY;</div><div class='ctx'> 	ifobject-&gt;rx_on = true;</div><div class='ctx'> 	xsk-&gt;rxqsize = XSK_RING_CONS__DEFAULT_NUM_DESCS;</div><div class='del'>-	ret = __xsk_configure_socket(xsk, umem, ifobject, false);</div><div class='add'>+	ret = xsk_configure_socket(xsk, umem, ifobject, false);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		zc_avail = true;</div><div class='ctx'> </div><div class='hunk'>@@ -325,25 +159,6 @@ out:</div><div class='ctx'> 	return zc_avail;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MAX_SKB_FRAGS_PATH "/proc/sys/net/core/max_skb_frags"</div><div class='del'>-static unsigned int get_max_skb_frags(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int max_skb_frags = 0;</div><div class='del'>-	FILE *file;</div><div class='del'>-</div><div class='del'>-	file = fopen(MAX_SKB_FRAGS_PATH, "r");</div><div class='del'>-	if (!file) {</div><div class='del'>-		ksft_print_msg("Error opening %s\n", MAX_SKB_FRAGS_PATH);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fscanf(file, "%u", &amp;max_skb_frags) != 1)</div><div class='del'>-		ksft_print_msg("Error reading %s\n", MAX_SKB_FRAGS_PATH);</div><div class='del'>-</div><div class='del'>-	fclose(file);</div><div class='del'>-	return max_skb_frags;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct option long_options[] = {</div><div class='ctx'> 	{"interface", required_argument, 0, 'i'},</div><div class='ctx'> 	{"busy-poll", no_argument, 0, 'b'},</div><div class='hunk'>@@ -444,2119 +259,36 @@ static void parse_command_line(struct ifobject *ifobj_tx, struct ifobject *ifobj</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_ring_size(struct ifobject *ifobj)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u32 ctr = 0;</div><div class='del'>-</div><div class='del'>-	while (ctr++ &lt; SOCK_RECONF_CTR) {</div><div class='del'>-		ret = set_hw_ring_size(ifobj-&gt;ifname, &amp;ifobj-&gt;ring);</div><div class='del'>-		if (!ret)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Retry if it fails */</div><div class='del'>-		if (ctr &gt;= SOCK_RECONF_CTR || errno != EBUSY)</div><div class='del'>-			return -errno;</div><div class='del'>-</div><div class='del'>-		usleep(USLEEP_MAX);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hw_ring_size_reset(struct ifobject *ifobj)</div><div class='del'>-{</div><div class='del'>-	ifobj-&gt;ring.tx_pending = ifobj-&gt;set_ring.default_tx;</div><div class='del'>-	ifobj-&gt;ring.rx_pending = ifobj-&gt;set_ring.default_rx;</div><div class='del'>-	return set_ring_size(ifobj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __test_spec_init(struct test_spec *test, struct ifobject *ifobj_tx,</div><div class='del'>-			     struct ifobject *ifobj_rx)</div><div class='del'>-{</div><div class='del'>-	u32 i, j;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_INTERFACES; i++) {</div><div class='del'>-		struct ifobject *ifobj = i ? ifobj_rx : ifobj_tx;</div><div class='del'>-</div><div class='del'>-		ifobj-&gt;xsk = &amp;ifobj-&gt;xsk_arr[0];</div><div class='del'>-		ifobj-&gt;use_poll = false;</div><div class='del'>-		ifobj-&gt;use_fill_ring = true;</div><div class='del'>-		ifobj-&gt;release_rx = true;</div><div class='del'>-		ifobj-&gt;validation_func = NULL;</div><div class='del'>-		ifobj-&gt;use_metadata = false;</div><div class='del'>-</div><div class='del'>-		if (i == 0) {</div><div class='del'>-			ifobj-&gt;rx_on = false;</div><div class='del'>-			ifobj-&gt;tx_on = true;</div><div class='del'>-		} else {</div><div class='del'>-			ifobj-&gt;rx_on = true;</div><div class='del'>-			ifobj-&gt;tx_on = false;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memset(ifobj-&gt;umem, 0, sizeof(*ifobj-&gt;umem));</div><div class='del'>-		ifobj-&gt;umem-&gt;num_frames = DEFAULT_UMEM_BUFFERS;</div><div class='del'>-		ifobj-&gt;umem-&gt;frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE;</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; MAX_SOCKETS; j++) {</div><div class='del'>-			memset(&amp;ifobj-&gt;xsk_arr[j], 0, sizeof(ifobj-&gt;xsk_arr[j]));</div><div class='del'>-			ifobj-&gt;xsk_arr[j].rxqsize = XSK_RING_CONS__DEFAULT_NUM_DESCS;</div><div class='del'>-			ifobj-&gt;xsk_arr[j].batch_size = DEFAULT_BATCH_SIZE;</div><div class='del'>-			if (i == 0)</div><div class='del'>-				ifobj-&gt;xsk_arr[j].pkt_stream = test-&gt;tx_pkt_stream_default;</div><div class='del'>-			else</div><div class='del'>-				ifobj-&gt;xsk_arr[j].pkt_stream = test-&gt;rx_pkt_stream_default;</div><div class='del'>-</div><div class='del'>-			memcpy(ifobj-&gt;xsk_arr[j].src_mac, g_mac, ETH_ALEN);</div><div class='del'>-			memcpy(ifobj-&gt;xsk_arr[j].dst_mac, g_mac, ETH_ALEN);</div><div class='del'>-			ifobj-&gt;xsk_arr[j].src_mac[5] += ((j * 2) + 0);</div><div class='del'>-			ifobj-&gt;xsk_arr[j].dst_mac[5] += ((j * 2) + 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ifobj_tx-&gt;hw_ring_size_supp)</div><div class='del'>-		hw_ring_size_reset(ifobj_tx);</div><div class='del'>-</div><div class='del'>-	test-&gt;ifobj_tx = ifobj_tx;</div><div class='del'>-	test-&gt;ifobj_rx = ifobj_rx;</div><div class='del'>-	test-&gt;current_step = 0;</div><div class='del'>-	test-&gt;total_steps = 1;</div><div class='del'>-	test-&gt;nb_sockets = 1;</div><div class='del'>-	test-&gt;fail = false;</div><div class='del'>-	test-&gt;set_ring = false;</div><div class='del'>-	test-&gt;mtu = MAX_ETH_PKT_SIZE;</div><div class='del'>-	test-&gt;xdp_prog_rx = ifobj_rx-&gt;xdp_progs-&gt;progs.xsk_def_prog;</div><div class='del'>-	test-&gt;xskmap_rx = ifobj_rx-&gt;xdp_progs-&gt;maps.xsk;</div><div class='del'>-	test-&gt;xdp_prog_tx = ifobj_tx-&gt;xdp_progs-&gt;progs.xsk_def_prog;</div><div class='del'>-	test-&gt;xskmap_tx = ifobj_tx-&gt;xdp_progs-&gt;maps.xsk;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_spec_init(struct test_spec *test, struct ifobject *ifobj_tx,</div><div class='del'>-			   struct ifobject *ifobj_rx, enum test_mode mode,</div><div class='del'>-			   const struct test_spec *test_to_run)</div><div class='del'>-{</div><div class='del'>-	struct pkt_stream *tx_pkt_stream;</div><div class='del'>-	struct pkt_stream *rx_pkt_stream;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	tx_pkt_stream = test-&gt;tx_pkt_stream_default;</div><div class='del'>-	rx_pkt_stream = test-&gt;rx_pkt_stream_default;</div><div class='del'>-	memset(test, 0, sizeof(*test));</div><div class='del'>-	test-&gt;tx_pkt_stream_default = tx_pkt_stream;</div><div class='del'>-	test-&gt;rx_pkt_stream_default = rx_pkt_stream;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_INTERFACES; i++) {</div><div class='del'>-		struct ifobject *ifobj = i ? ifobj_rx : ifobj_tx;</div><div class='del'>-</div><div class='del'>-		ifobj-&gt;bind_flags = XDP_USE_NEED_WAKEUP;</div><div class='del'>-		if (mode == TEST_MODE_ZC)</div><div class='del'>-			ifobj-&gt;bind_flags |= XDP_ZEROCOPY;</div><div class='del'>-		else</div><div class='del'>-			ifobj-&gt;bind_flags |= XDP_COPY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	strncpy(test-&gt;name, test_to_run-&gt;name, MAX_TEST_NAME_SIZE);</div><div class='del'>-	test-&gt;test_func = test_to_run-&gt;test_func;</div><div class='del'>-	test-&gt;mode = mode;</div><div class='del'>-	__test_spec_init(test, ifobj_tx, ifobj_rx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_spec_reset(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	__test_spec_init(test, test-&gt;ifobj_tx, test-&gt;ifobj_rx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void test_spec_set_xdp_prog(struct test_spec *test, struct bpf_program *xdp_prog_rx,</div><div class='del'>-				   struct bpf_program *xdp_prog_tx, struct bpf_map *xskmap_rx,</div><div class='del'>-				   struct bpf_map *xskmap_tx)</div><div class='del'>-{</div><div class='del'>-	test-&gt;xdp_prog_rx = xdp_prog_rx;</div><div class='del'>-	test-&gt;xdp_prog_tx = xdp_prog_tx;</div><div class='del'>-	test-&gt;xskmap_rx = xskmap_rx;</div><div class='del'>-	test-&gt;xskmap_tx = xskmap_tx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int test_spec_set_mtu(struct test_spec *test, int mtu)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (test-&gt;ifobj_rx-&gt;mtu != mtu) {</div><div class='del'>-		err = xsk_set_mtu(test-&gt;ifobj_rx-&gt;ifindex, mtu);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		test-&gt;ifobj_rx-&gt;mtu = mtu;</div><div class='del'>-	}</div><div class='del'>-	if (test-&gt;ifobj_tx-&gt;mtu != mtu) {</div><div class='del'>-		err = xsk_set_mtu(test-&gt;ifobj_tx-&gt;ifindex, mtu);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		test-&gt;ifobj_tx-&gt;mtu = mtu;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_stream_reset(struct pkt_stream *pkt_stream)</div><div class='del'>-{</div><div class='del'>-	if (pkt_stream) {</div><div class='del'>-		pkt_stream-&gt;current_pkt_nb = 0;</div><div class='del'>-		pkt_stream-&gt;nb_rx_pkts = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pkt *pkt_stream_get_next_tx_pkt(struct pkt_stream *pkt_stream)</div><div class='del'>-{</div><div class='del'>-	if (pkt_stream-&gt;current_pkt_nb &gt;= pkt_stream-&gt;nb_pkts)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return &amp;pkt_stream-&gt;pkts[pkt_stream-&gt;current_pkt_nb++];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pkt *pkt_stream_get_next_rx_pkt(struct pkt_stream *pkt_stream, u32 *pkts_sent)</div><div class='del'>-{</div><div class='del'>-	while (pkt_stream-&gt;current_pkt_nb &lt; pkt_stream-&gt;nb_pkts) {</div><div class='del'>-		(*pkts_sent)++;</div><div class='del'>-		if (pkt_stream-&gt;pkts[pkt_stream-&gt;current_pkt_nb].valid)</div><div class='del'>-			return &amp;pkt_stream-&gt;pkts[pkt_stream-&gt;current_pkt_nb++];</div><div class='del'>-		pkt_stream-&gt;current_pkt_nb++;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_stream_delete(struct pkt_stream *pkt_stream)</div><div class='del'>-{</div><div class='del'>-	free(pkt_stream-&gt;pkts);</div><div class='del'>-	free(pkt_stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_stream_restore_default(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct pkt_stream *tx_pkt_stream = test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream;</div><div class='del'>-	struct pkt_stream *rx_pkt_stream = test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream;</div><div class='del'>-</div><div class='del'>-	if (tx_pkt_stream != test-&gt;tx_pkt_stream_default) {</div><div class='del'>-		pkt_stream_delete(test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream);</div><div class='del'>-		test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream = test-&gt;tx_pkt_stream_default;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rx_pkt_stream != test-&gt;rx_pkt_stream_default) {</div><div class='del'>-		pkt_stream_delete(test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream);</div><div class='del'>-		test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream = test-&gt;rx_pkt_stream_default;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pkt_stream *__pkt_stream_alloc(u32 nb_pkts)</div><div class='del'>-{</div><div class='del'>-	struct pkt_stream *pkt_stream;</div><div class='del'>-</div><div class='del'>-	pkt_stream = calloc(1, sizeof(*pkt_stream));</div><div class='del'>-	if (!pkt_stream)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	pkt_stream-&gt;pkts = calloc(nb_pkts, sizeof(*pkt_stream-&gt;pkts));</div><div class='del'>-	if (!pkt_stream-&gt;pkts) {</div><div class='del'>-		free(pkt_stream);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pkt_stream-&gt;nb_pkts = nb_pkts;</div><div class='del'>-	return pkt_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool pkt_continues(u32 options)</div><div class='del'>-{</div><div class='del'>-	return options &amp; XDP_PKT_CONTD;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 ceil_u32(u32 a, u32 b)</div><div class='del'>-{</div><div class='del'>-	return (a + b - 1) / b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 pkt_nb_frags(u32 frame_size, struct pkt_stream *pkt_stream, struct pkt *pkt)</div><div class='del'>-{</div><div class='del'>-	u32 nb_frags = 1, next_frag;</div><div class='del'>-</div><div class='del'>-	if (!pkt)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (!pkt_stream-&gt;verbatim) {</div><div class='del'>-		if (!pkt-&gt;valid || !pkt-&gt;len)</div><div class='del'>-			return 1;</div><div class='del'>-		return ceil_u32(pkt-&gt;len, frame_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Search for the end of the packet in verbatim mode */</div><div class='del'>-	if (!pkt_continues(pkt-&gt;options))</div><div class='del'>-		return nb_frags;</div><div class='del'>-</div><div class='del'>-	next_frag = pkt_stream-&gt;current_pkt_nb;</div><div class='del'>-	pkt++;</div><div class='del'>-	while (next_frag++ &lt; pkt_stream-&gt;nb_pkts) {</div><div class='del'>-		nb_frags++;</div><div class='del'>-		if (!pkt_continues(pkt-&gt;options) || !pkt-&gt;valid)</div><div class='del'>-			break;</div><div class='del'>-		pkt++;</div><div class='del'>-	}</div><div class='del'>-	return nb_frags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool set_pkt_valid(int offset, u32 len)</div><div class='del'>-{</div><div class='del'>-	return len &lt;= MAX_ETH_JUMBO_SIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_set(struct pkt_stream *pkt_stream, struct pkt *pkt, int offset, u32 len)</div><div class='del'>-{</div><div class='del'>-	pkt-&gt;offset = offset;</div><div class='del'>-	pkt-&gt;len = len;</div><div class='del'>-	pkt-&gt;valid = set_pkt_valid(offset, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_stream_pkt_set(struct pkt_stream *pkt_stream, struct pkt *pkt, int offset, u32 len)</div><div class='del'>-{</div><div class='del'>-	bool prev_pkt_valid = pkt-&gt;valid;</div><div class='del'>-</div><div class='del'>-	pkt_set(pkt_stream, pkt, offset, len);</div><div class='del'>-	pkt_stream-&gt;nb_valid_entries += pkt-&gt;valid - prev_pkt_valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 pkt_get_buffer_len(struct xsk_umem_info *umem, u32 len)</div><div class='del'>-{</div><div class='del'>-	return ceil_u32(len, umem-&gt;frame_size) * umem-&gt;frame_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pkt_stream *__pkt_stream_generate(u32 nb_pkts, u32 pkt_len, u32 nb_start, u32 nb_off)</div><div class='del'>-{</div><div class='del'>-	struct pkt_stream *pkt_stream;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	pkt_stream = __pkt_stream_alloc(nb_pkts);</div><div class='del'>-	if (!pkt_stream)</div><div class='del'>-		exit_with_error(ENOMEM);</div><div class='del'>-</div><div class='del'>-	pkt_stream-&gt;nb_pkts = nb_pkts;</div><div class='del'>-	pkt_stream-&gt;max_pkt_len = pkt_len;</div><div class='del'>-	for (i = 0; i &lt; nb_pkts; i++) {</div><div class='del'>-		struct pkt *pkt = &amp;pkt_stream-&gt;pkts[i];</div><div class='del'>-</div><div class='del'>-		pkt_stream_pkt_set(pkt_stream, pkt, 0, pkt_len);</div><div class='del'>-		pkt-&gt;pkt_nb = nb_start + i * nb_off;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return pkt_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pkt_stream *pkt_stream_generate(u32 nb_pkts, u32 pkt_len)</div><div class='del'>-{</div><div class='del'>-	return __pkt_stream_generate(nb_pkts, pkt_len, 0, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pkt_stream *pkt_stream_clone(struct pkt_stream *pkt_stream)</div><div class='del'>-{</div><div class='del'>-	return pkt_stream_generate(pkt_stream-&gt;nb_pkts, pkt_stream-&gt;pkts[0].len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_stream_replace(struct test_spec *test, u32 nb_pkts, u32 pkt_len)</div><div class='del'>-{</div><div class='del'>-	struct pkt_stream *pkt_stream;</div><div class='del'>-</div><div class='del'>-	pkt_stream = pkt_stream_generate(nb_pkts, pkt_len);</div><div class='del'>-	test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream = pkt_stream;</div><div class='del'>-	pkt_stream = pkt_stream_generate(nb_pkts, pkt_len);</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream = pkt_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __pkt_stream_replace_half(struct ifobject *ifobj, u32 pkt_len,</div><div class='del'>-				      int offset)</div><div class='del'>-{</div><div class='del'>-	struct pkt_stream *pkt_stream;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	pkt_stream = pkt_stream_clone(ifobj-&gt;xsk-&gt;pkt_stream);</div><div class='del'>-	for (i = 1; i &lt; ifobj-&gt;xsk-&gt;pkt_stream-&gt;nb_pkts; i += 2)</div><div class='del'>-		pkt_stream_pkt_set(pkt_stream, &amp;pkt_stream-&gt;pkts[i], offset, pkt_len);</div><div class='del'>-</div><div class='del'>-	ifobj-&gt;xsk-&gt;pkt_stream = pkt_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_stream_replace_half(struct test_spec *test, u32 pkt_len, int offset)</div><div class='del'>-{</div><div class='del'>-	__pkt_stream_replace_half(test-&gt;ifobj_tx, pkt_len, offset);</div><div class='del'>-	__pkt_stream_replace_half(test-&gt;ifobj_rx, pkt_len, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_stream_receive_half(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct pkt_stream *pkt_stream = test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream = pkt_stream_generate(pkt_stream-&gt;nb_pkts,</div><div class='del'>-							      pkt_stream-&gt;pkts[0].len);</div><div class='del'>-	pkt_stream = test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream;</div><div class='del'>-	for (i = 1; i &lt; pkt_stream-&gt;nb_pkts; i += 2)</div><div class='del'>-		pkt_stream-&gt;pkts[i].valid = false;</div><div class='del'>-</div><div class='del'>-	pkt_stream-&gt;nb_valid_entries /= 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_stream_even_odd_sequence(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct pkt_stream *pkt_stream;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; test-&gt;nb_sockets; i++) {</div><div class='del'>-		pkt_stream = test-&gt;ifobj_tx-&gt;xsk_arr[i].pkt_stream;</div><div class='del'>-		pkt_stream = __pkt_stream_generate(pkt_stream-&gt;nb_pkts / 2,</div><div class='del'>-						   pkt_stream-&gt;pkts[0].len, i, 2);</div><div class='del'>-		test-&gt;ifobj_tx-&gt;xsk_arr[i].pkt_stream = pkt_stream;</div><div class='del'>-</div><div class='del'>-		pkt_stream = test-&gt;ifobj_rx-&gt;xsk_arr[i].pkt_stream;</div><div class='del'>-		pkt_stream = __pkt_stream_generate(pkt_stream-&gt;nb_pkts / 2,</div><div class='del'>-						   pkt_stream-&gt;pkts[0].len, i, 2);</div><div class='del'>-		test-&gt;ifobj_rx-&gt;xsk_arr[i].pkt_stream = pkt_stream;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 pkt_get_addr(struct pkt *pkt, struct xsk_umem_info *umem)</div><div class='del'>-{</div><div class='del'>-	if (!pkt-&gt;valid)</div><div class='del'>-		return pkt-&gt;offset;</div><div class='del'>-	return pkt-&gt;offset + umem_alloc_buffer(umem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_stream_cancel(struct pkt_stream *pkt_stream)</div><div class='del'>-{</div><div class='del'>-	pkt_stream-&gt;current_pkt_nb--;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_generate(struct xsk_socket_info *xsk, struct xsk_umem_info *umem, u64 addr, u32 len,</div><div class='del'>-			 u32 pkt_nb, u32 bytes_written)</div><div class='del'>-{</div><div class='del'>-	void *data = xsk_umem__get_data(umem-&gt;buffer, addr);</div><div class='del'>-</div><div class='del'>-	if (len &lt; MIN_PKT_SIZE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!bytes_written) {</div><div class='del'>-		gen_eth_hdr(xsk, data);</div><div class='del'>-</div><div class='del'>-		len -= PKT_HDR_SIZE;</div><div class='del'>-		data += PKT_HDR_SIZE;</div><div class='del'>-	} else {</div><div class='del'>-		bytes_written -= PKT_HDR_SIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	write_payload(data, pkt_nb, bytes_written, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pkt_stream *__pkt_stream_generate_custom(struct ifobject *ifobj, struct pkt *frames,</div><div class='del'>-						       u32 nb_frames, bool verbatim)</div><div class='del'>-{</div><div class='del'>-	u32 i, len = 0, pkt_nb = 0, payload = 0;</div><div class='del'>-	struct pkt_stream *pkt_stream;</div><div class='del'>-</div><div class='del'>-	pkt_stream = __pkt_stream_alloc(nb_frames);</div><div class='del'>-	if (!pkt_stream)</div><div class='del'>-		exit_with_error(ENOMEM);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nb_frames; i++) {</div><div class='del'>-		struct pkt *pkt = &amp;pkt_stream-&gt;pkts[pkt_nb];</div><div class='del'>-		struct pkt *frame = &amp;frames[i];</div><div class='del'>-</div><div class='del'>-		pkt-&gt;offset = frame-&gt;offset;</div><div class='del'>-		if (verbatim) {</div><div class='del'>-			*pkt = *frame;</div><div class='del'>-			pkt-&gt;pkt_nb = payload;</div><div class='del'>-			if (!frame-&gt;valid || !pkt_continues(frame-&gt;options))</div><div class='del'>-				payload++;</div><div class='del'>-		} else {</div><div class='del'>-			if (frame-&gt;valid)</div><div class='del'>-				len += frame-&gt;len;</div><div class='del'>-			if (frame-&gt;valid &amp;&amp; pkt_continues(frame-&gt;options))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			pkt-&gt;pkt_nb = pkt_nb;</div><div class='del'>-			pkt-&gt;len = len;</div><div class='del'>-			pkt-&gt;valid = frame-&gt;valid;</div><div class='del'>-			pkt-&gt;options = 0;</div><div class='del'>-</div><div class='del'>-			len = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		print_verbose("offset: %d len: %u valid: %u options: %u pkt_nb: %u\n",</div><div class='del'>-			      pkt-&gt;offset, pkt-&gt;len, pkt-&gt;valid, pkt-&gt;options, pkt-&gt;pkt_nb);</div><div class='del'>-</div><div class='del'>-		if (pkt-&gt;valid &amp;&amp; pkt-&gt;len &gt; pkt_stream-&gt;max_pkt_len)</div><div class='del'>-			pkt_stream-&gt;max_pkt_len = pkt-&gt;len;</div><div class='del'>-</div><div class='del'>-		if (pkt-&gt;valid)</div><div class='del'>-			pkt_stream-&gt;nb_valid_entries++;</div><div class='del'>-</div><div class='del'>-		pkt_nb++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pkt_stream-&gt;nb_pkts = pkt_nb;</div><div class='del'>-	pkt_stream-&gt;verbatim = verbatim;</div><div class='del'>-	return pkt_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_stream_generate_custom(struct test_spec *test, struct pkt *pkts, u32 nb_pkts)</div><div class='del'>-{</div><div class='del'>-	struct pkt_stream *pkt_stream;</div><div class='del'>-</div><div class='del'>-	pkt_stream = __pkt_stream_generate_custom(test-&gt;ifobj_tx, pkts, nb_pkts, true);</div><div class='del'>-	test-&gt;ifobj_tx-&gt;xsk-&gt;pkt_stream = pkt_stream;</div><div class='del'>-</div><div class='del'>-	pkt_stream = __pkt_stream_generate_custom(test-&gt;ifobj_rx, pkts, nb_pkts, false);</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream = pkt_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_print_data(u32 *data, u32 cnt)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cnt; i++) {</div><div class='del'>-		u32 seqnum, pkt_nb;</div><div class='del'>-</div><div class='del'>-		seqnum = ntohl(*data) &amp; 0xffff;</div><div class='del'>-		pkt_nb = ntohl(*data) &gt;&gt; 16;</div><div class='del'>-		ksft_print_msg("%u:%u ", pkt_nb, seqnum);</div><div class='del'>-		data++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pkt_dump(void *pkt, u32 len, bool eth_header)</div><div class='del'>-{</div><div class='del'>-	struct ethhdr *ethhdr = pkt;</div><div class='del'>-	u32 i, *data;</div><div class='del'>-</div><div class='del'>-	if (eth_header) {</div><div class='del'>-		/*extract L2 frame */</div><div class='del'>-		ksft_print_msg("DEBUG&gt;&gt; L2: dst mac: ");</div><div class='del'>-		for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-			ksft_print_msg("%02X", ethhdr-&gt;h_dest[i]);</div><div class='del'>-</div><div class='del'>-		ksft_print_msg("\nDEBUG&gt;&gt; L2: src mac: ");</div><div class='del'>-		for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-			ksft_print_msg("%02X", ethhdr-&gt;h_source[i]);</div><div class='del'>-</div><div class='del'>-		data = pkt + PKT_HDR_SIZE;</div><div class='del'>-	} else {</div><div class='del'>-		data = pkt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*extract L5 frame */</div><div class='del'>-	ksft_print_msg("\nDEBUG&gt;&gt; L5: seqnum: ");</div><div class='del'>-	pkt_print_data(data, PKT_DUMP_NB_TO_PRINT);</div><div class='del'>-	ksft_print_msg("....");</div><div class='del'>-	if (len &gt; PKT_DUMP_NB_TO_PRINT * sizeof(u32)) {</div><div class='del'>-		ksft_print_msg("\n.... ");</div><div class='del'>-		pkt_print_data(data + len / sizeof(u32) - PKT_DUMP_NB_TO_PRINT,</div><div class='del'>-			       PKT_DUMP_NB_TO_PRINT);</div><div class='del'>-	}</div><div class='del'>-	ksft_print_msg("\n---------------------------------------\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool is_offset_correct(struct xsk_umem_info *umem, struct pkt *pkt, u64 addr)</div><div class='del'>-{</div><div class='del'>-	u32 headroom = umem-&gt;unaligned_mode ? 0 : umem-&gt;frame_headroom;</div><div class='del'>-	u32 offset = addr % umem-&gt;frame_size, expected_offset;</div><div class='del'>-	int pkt_offset = pkt-&gt;valid ? pkt-&gt;offset : 0;</div><div class='del'>-</div><div class='del'>-	if (!umem-&gt;unaligned_mode)</div><div class='del'>-		pkt_offset = 0;</div><div class='del'>-</div><div class='del'>-	expected_offset = (pkt_offset + headroom + XDP_PACKET_HEADROOM) % umem-&gt;frame_size;</div><div class='del'>-</div><div class='del'>-	if (offset == expected_offset)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	ksft_print_msg("[%s] expected [%u], got [%u]\n", __func__, expected_offset, offset);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool is_metadata_correct(struct pkt *pkt, void *buffer, u64 addr)</div><div class='del'>-{</div><div class='del'>-	void *data = xsk_umem__get_data(buffer, addr);</div><div class='del'>-	struct xdp_info *meta = data - sizeof(struct xdp_info);</div><div class='del'>-</div><div class='del'>-	if (meta-&gt;count != pkt-&gt;pkt_nb) {</div><div class='del'>-		ksft_print_msg("[%s] expected meta_count [%d], got meta_count [%llu]\n",</div><div class='del'>-			       __func__, pkt-&gt;pkt_nb,</div><div class='del'>-			       (unsigned long long)meta-&gt;count);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool is_frag_valid(struct xsk_umem_info *umem, u64 addr, u32 len, u32 expected_pkt_nb,</div><div class='del'>-			  u32 bytes_processed)</div><div class='del'>-{</div><div class='del'>-	u32 seqnum, pkt_nb, *pkt_data, words_to_end, expected_seqnum;</div><div class='del'>-	void *data = xsk_umem__get_data(umem-&gt;buffer, addr);</div><div class='del'>-</div><div class='del'>-	addr -= umem-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-	if (addr &gt;= umem-&gt;num_frames * umem-&gt;frame_size ||</div><div class='del'>-	    addr + len &gt; umem-&gt;num_frames * umem-&gt;frame_size) {</div><div class='del'>-		ksft_print_msg("Frag invalid addr: %llx len: %u\n",</div><div class='del'>-			       (unsigned long long)addr, len);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-	if (!umem-&gt;unaligned_mode &amp;&amp; addr % umem-&gt;frame_size + len &gt; umem-&gt;frame_size) {</div><div class='del'>-		ksft_print_msg("Frag crosses frame boundary addr: %llx len: %u\n",</div><div class='del'>-			       (unsigned long long)addr, len);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pkt_data = data;</div><div class='del'>-	if (!bytes_processed) {</div><div class='del'>-		pkt_data += PKT_HDR_SIZE / sizeof(*pkt_data);</div><div class='del'>-		len -= PKT_HDR_SIZE;</div><div class='del'>-	} else {</div><div class='del'>-		bytes_processed -= PKT_HDR_SIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	expected_seqnum = bytes_processed / sizeof(*pkt_data);</div><div class='del'>-	seqnum = ntohl(*pkt_data) &amp; 0xffff;</div><div class='del'>-	pkt_nb = ntohl(*pkt_data) &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	if (expected_pkt_nb != pkt_nb) {</div><div class='del'>-		ksft_print_msg("[%s] expected pkt_nb [%u], got pkt_nb [%u]\n",</div><div class='del'>-			       __func__, expected_pkt_nb, pkt_nb);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	if (expected_seqnum != seqnum) {</div><div class='del'>-		ksft_print_msg("[%s] expected seqnum at start [%u], got seqnum [%u]\n",</div><div class='del'>-			       __func__, expected_seqnum, seqnum);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	words_to_end = len / sizeof(*pkt_data) - 1;</div><div class='del'>-	pkt_data += words_to_end;</div><div class='del'>-	seqnum = ntohl(*pkt_data) &amp; 0xffff;</div><div class='del'>-	expected_seqnum += words_to_end;</div><div class='del'>-	if (expected_seqnum != seqnum) {</div><div class='del'>-		ksft_print_msg("[%s] expected seqnum at end [%u], got seqnum [%u]\n",</div><div class='del'>-			       __func__, expected_seqnum, seqnum);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	pkt_dump(data, len, !bytes_processed);</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool is_pkt_valid(struct pkt *pkt, void *buffer, u64 addr, u32 len)</div><div class='del'>-{</div><div class='del'>-	if (pkt-&gt;len != len) {</div><div class='del'>-		ksft_print_msg("[%s] expected packet length [%d], got length [%d]\n",</div><div class='del'>-			       __func__, pkt-&gt;len, len);</div><div class='del'>-		pkt_dump(xsk_umem__get_data(buffer, addr), len, true);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int kick_tx(struct xsk_socket_info *xsk)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = sendto(xsk_socket__fd(xsk-&gt;xsk), NULL, 0, MSG_DONTWAIT, NULL, 0);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		return TEST_PASS;</div><div class='del'>-	if (errno == ENOBUFS || errno == EAGAIN || errno == EBUSY || errno == ENETDOWN) {</div><div class='del'>-		usleep(100);</div><div class='del'>-		return TEST_PASS;</div><div class='del'>-	}</div><div class='del'>-	return TEST_FAILURE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int kick_rx(struct xsk_socket_info *xsk)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = recvfrom(xsk_socket__fd(xsk-&gt;xsk), NULL, 0, MSG_DONTWAIT, NULL, NULL);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	return TEST_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int complete_pkts(struct xsk_socket_info *xsk, int batch_size)</div><div class='del'>-{</div><div class='del'>-	unsigned int rcvd;</div><div class='del'>-	u32 idx;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (xsk_ring_prod__needs_wakeup(&amp;xsk-&gt;tx)) {</div><div class='del'>-		ret = kick_tx(xsk);</div><div class='del'>-		if (ret)</div><div class='del'>-			return TEST_FAILURE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcvd = xsk_ring_cons__peek(&amp;xsk-&gt;umem-&gt;cq, batch_size, &amp;idx);</div><div class='del'>-	if (rcvd) {</div><div class='del'>-		if (rcvd &gt; xsk-&gt;outstanding_tx) {</div><div class='del'>-			u64 addr = *xsk_ring_cons__comp_addr(&amp;xsk-&gt;umem-&gt;cq, idx + rcvd - 1);</div><div class='del'>-</div><div class='del'>-			ksft_print_msg("[%s] Too many packets completed\n", __func__);</div><div class='del'>-			ksft_print_msg("Last completion address: %llx\n",</div><div class='del'>-				       (unsigned long long)addr);</div><div class='del'>-			return TEST_FAILURE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		xsk_ring_cons__release(&amp;xsk-&gt;umem-&gt;cq, rcvd);</div><div class='del'>-		xsk-&gt;outstanding_tx -= rcvd;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TEST_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __receive_pkts(struct test_spec *test, struct xsk_socket_info *xsk)</div><div class='del'>-{</div><div class='del'>-	u32 frags_processed = 0, nb_frags = 0, pkt_len = 0;</div><div class='del'>-	u32 idx_rx = 0, idx_fq = 0, rcvd, pkts_sent = 0;</div><div class='del'>-	struct pkt_stream *pkt_stream = xsk-&gt;pkt_stream;</div><div class='del'>-	struct ifobject *ifobj = test-&gt;ifobj_rx;</div><div class='del'>-	struct xsk_umem_info *umem = xsk-&gt;umem;</div><div class='del'>-	struct pollfd fds = { };</div><div class='del'>-	struct pkt *pkt;</div><div class='del'>-	u64 first_addr = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	fds.fd = xsk_socket__fd(xsk-&gt;xsk);</div><div class='del'>-	fds.events = POLLIN;</div><div class='del'>-</div><div class='del'>-	ret = kick_rx(xsk);</div><div class='del'>-	if (ret)</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	if (ifobj-&gt;use_poll) {</div><div class='del'>-		ret = poll(&amp;fds, 1, POLL_TMOUT);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-		if (!ret) {</div><div class='del'>-			if (!is_umem_valid(test-&gt;ifobj_tx))</div><div class='del'>-				return TEST_PASS;</div><div class='del'>-</div><div class='del'>-			ksft_print_msg("ERROR: [%s] Poll timed out\n", __func__);</div><div class='del'>-			return TEST_CONTINUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!(fds.revents &amp; POLLIN))</div><div class='del'>-			return TEST_CONTINUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rcvd = xsk_ring_cons__peek(&amp;xsk-&gt;rx, xsk-&gt;batch_size, &amp;idx_rx);</div><div class='del'>-	if (!rcvd)</div><div class='del'>-		return TEST_CONTINUE;</div><div class='del'>-</div><div class='del'>-	if (ifobj-&gt;use_fill_ring) {</div><div class='del'>-		ret = xsk_ring_prod__reserve(&amp;umem-&gt;fq, rcvd, &amp;idx_fq);</div><div class='del'>-		while (ret != rcvd) {</div><div class='del'>-			if (xsk_ring_prod__needs_wakeup(&amp;umem-&gt;fq)) {</div><div class='del'>-				ret = poll(&amp;fds, 1, POLL_TMOUT);</div><div class='del'>-				if (ret &lt; 0)</div><div class='del'>-					return TEST_FAILURE;</div><div class='del'>-			}</div><div class='del'>-			ret = xsk_ring_prod__reserve(&amp;umem-&gt;fq, rcvd, &amp;idx_fq);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (frags_processed &lt; rcvd) {</div><div class='del'>-		const struct xdp_desc *desc = xsk_ring_cons__rx_desc(&amp;xsk-&gt;rx, idx_rx++);</div><div class='del'>-		u64 addr = desc-&gt;addr, orig;</div><div class='del'>-</div><div class='del'>-		orig = xsk_umem__extract_addr(addr);</div><div class='del'>-		addr = xsk_umem__add_offset_to_addr(addr);</div><div class='del'>-</div><div class='del'>-		if (!nb_frags) {</div><div class='del'>-			pkt = pkt_stream_get_next_rx_pkt(pkt_stream, &amp;pkts_sent);</div><div class='del'>-			if (!pkt) {</div><div class='del'>-				ksft_print_msg("[%s] received too many packets addr: %lx len %u\n",</div><div class='del'>-					       __func__, addr, desc-&gt;len);</div><div class='del'>-				return TEST_FAILURE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		print_verbose("Rx: addr: %lx len: %u options: %u pkt_nb: %u valid: %u\n",</div><div class='del'>-			      addr, desc-&gt;len, desc-&gt;options, pkt-&gt;pkt_nb, pkt-&gt;valid);</div><div class='del'>-</div><div class='del'>-		if (!is_frag_valid(umem, addr, desc-&gt;len, pkt-&gt;pkt_nb, pkt_len) ||</div><div class='del'>-		    !is_offset_correct(umem, pkt, addr) || (ifobj-&gt;use_metadata &amp;&amp;</div><div class='del'>-		    !is_metadata_correct(pkt, umem-&gt;buffer, addr)))</div><div class='del'>-			return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-		if (!nb_frags++)</div><div class='del'>-			first_addr = addr;</div><div class='del'>-		frags_processed++;</div><div class='del'>-		pkt_len += desc-&gt;len;</div><div class='del'>-		if (ifobj-&gt;use_fill_ring)</div><div class='del'>-			*xsk_ring_prod__fill_addr(&amp;umem-&gt;fq, idx_fq++) = orig;</div><div class='del'>-</div><div class='del'>-		if (pkt_continues(desc-&gt;options))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* The complete packet has been received */</div><div class='del'>-		if (!is_pkt_valid(pkt, umem-&gt;buffer, first_addr, pkt_len) ||</div><div class='del'>-		    !is_offset_correct(umem, pkt, addr))</div><div class='del'>-			return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-		pkt_stream-&gt;nb_rx_pkts++;</div><div class='del'>-		nb_frags = 0;</div><div class='del'>-		pkt_len = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nb_frags) {</div><div class='del'>-		/* In the middle of a packet. Start over from beginning of packet. */</div><div class='del'>-		idx_rx -= nb_frags;</div><div class='del'>-		xsk_ring_cons__cancel(&amp;xsk-&gt;rx, nb_frags);</div><div class='del'>-		if (ifobj-&gt;use_fill_ring) {</div><div class='del'>-			idx_fq -= nb_frags;</div><div class='del'>-			xsk_ring_prod__cancel(&amp;umem-&gt;fq, nb_frags);</div><div class='del'>-		}</div><div class='del'>-		frags_processed -= nb_frags;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ifobj-&gt;use_fill_ring)</div><div class='del'>-		xsk_ring_prod__submit(&amp;umem-&gt;fq, frags_processed);</div><div class='del'>-	if (ifobj-&gt;release_rx)</div><div class='del'>-		xsk_ring_cons__release(&amp;xsk-&gt;rx, frags_processed);</div><div class='del'>-</div><div class='del'>-	pthread_mutex_lock(&amp;pacing_mutex);</div><div class='del'>-	pkts_in_flight -= pkts_sent;</div><div class='del'>-	pthread_mutex_unlock(&amp;pacing_mutex);</div><div class='del'>-	pkts_sent = 0;</div><div class='del'>-</div><div class='del'>-return TEST_CONTINUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool all_packets_received(struct test_spec *test, struct xsk_socket_info *xsk, u32 sock_num,</div><div class='del'>-			  unsigned long *bitmap)</div><div class='del'>-{</div><div class='del'>-	struct pkt_stream *pkt_stream = xsk-&gt;pkt_stream;</div><div class='del'>-</div><div class='del'>-	if (!pkt_stream) {</div><div class='del'>-		__set_bit(sock_num, bitmap);</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pkt_stream-&gt;nb_rx_pkts == pkt_stream-&gt;nb_valid_entries) {</div><div class='del'>-		__set_bit(sock_num, bitmap);</div><div class='del'>-		if (bitmap_full(bitmap, test-&gt;nb_sockets))</div><div class='del'>-			return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int receive_pkts(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct timeval tv_end, tv_now, tv_timeout = {THREAD_TMOUT, 0};</div><div class='del'>-	DECLARE_BITMAP(bitmap, test-&gt;nb_sockets);</div><div class='del'>-	struct xsk_socket_info *xsk;</div><div class='del'>-	u32 sock_num = 0;</div><div class='del'>-	int res, ret;</div><div class='del'>-</div><div class='del'>-	ret = gettimeofday(&amp;tv_now, NULL);</div><div class='del'>-	if (ret)</div><div class='del'>-		exit_with_error(errno);</div><div class='del'>-</div><div class='del'>-	timeradd(&amp;tv_now, &amp;tv_timeout, &amp;tv_end);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		xsk = &amp;test-&gt;ifobj_rx-&gt;xsk_arr[sock_num];</div><div class='del'>-</div><div class='del'>-		if ((all_packets_received(test, xsk, sock_num, bitmap)))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		res = __receive_pkts(test, xsk);</div><div class='del'>-		if (!(res == TEST_PASS || res == TEST_CONTINUE))</div><div class='del'>-			return res;</div><div class='del'>-</div><div class='del'>-		ret = gettimeofday(&amp;tv_now, NULL);</div><div class='del'>-		if (ret)</div><div class='del'>-			exit_with_error(errno);</div><div class='del'>-</div><div class='del'>-		if (timercmp(&amp;tv_now, &amp;tv_end, &gt;)) {</div><div class='del'>-			ksft_print_msg("ERROR: [%s] Receive loop timed out\n", __func__);</div><div class='del'>-			return TEST_FAILURE;</div><div class='del'>-		}</div><div class='del'>-		sock_num = (sock_num + 1) % test-&gt;nb_sockets;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TEST_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __send_pkts(struct ifobject *ifobject, struct xsk_socket_info *xsk, bool timeout)</div><div class='del'>-{</div><div class='del'>-	u32 i, idx = 0, valid_pkts = 0, valid_frags = 0, buffer_len;</div><div class='del'>-	struct pkt_stream *pkt_stream = xsk-&gt;pkt_stream;</div><div class='del'>-	struct xsk_umem_info *umem = ifobject-&gt;umem;</div><div class='del'>-	bool use_poll = ifobject-&gt;use_poll;</div><div class='del'>-	struct pollfd fds = { };</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	buffer_len = pkt_get_buffer_len(umem, pkt_stream-&gt;max_pkt_len);</div><div class='del'>-	/* pkts_in_flight might be negative if many invalid packets are sent */</div><div class='del'>-	if (pkts_in_flight &gt;= (int)((umem_size(umem) - xsk-&gt;batch_size * buffer_len) /</div><div class='del'>-	    buffer_len)) {</div><div class='del'>-		ret = kick_tx(xsk);</div><div class='del'>-		if (ret)</div><div class='del'>-			return TEST_FAILURE;</div><div class='del'>-		return TEST_CONTINUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fds.fd = xsk_socket__fd(xsk-&gt;xsk);</div><div class='del'>-	fds.events = POLLOUT;</div><div class='del'>-</div><div class='del'>-	while (xsk_ring_prod__reserve(&amp;xsk-&gt;tx, xsk-&gt;batch_size, &amp;idx) &lt; xsk-&gt;batch_size) {</div><div class='del'>-		if (use_poll) {</div><div class='del'>-			ret = poll(&amp;fds, 1, POLL_TMOUT);</div><div class='del'>-			if (timeout) {</div><div class='del'>-				if (ret &lt; 0) {</div><div class='del'>-					ksft_print_msg("ERROR: [%s] Poll error %d\n",</div><div class='del'>-						       __func__, errno);</div><div class='del'>-					return TEST_FAILURE;</div><div class='del'>-				}</div><div class='del'>-				if (ret == 0)</div><div class='del'>-					return TEST_PASS;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (ret &lt;= 0) {</div><div class='del'>-				ksft_print_msg("ERROR: [%s] Poll error %d\n",</div><div class='del'>-					       __func__, errno);</div><div class='del'>-				return TEST_FAILURE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		complete_pkts(xsk, xsk-&gt;batch_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; xsk-&gt;batch_size; i++) {</div><div class='del'>-		struct pkt *pkt = pkt_stream_get_next_tx_pkt(pkt_stream);</div><div class='del'>-		u32 nb_frags_left, nb_frags, bytes_written = 0;</div><div class='del'>-</div><div class='del'>-		if (!pkt)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		nb_frags = pkt_nb_frags(umem-&gt;frame_size, pkt_stream, pkt);</div><div class='del'>-		if (nb_frags &gt; xsk-&gt;batch_size - i) {</div><div class='del'>-			pkt_stream_cancel(pkt_stream);</div><div class='del'>-			xsk_ring_prod__cancel(&amp;xsk-&gt;tx, xsk-&gt;batch_size - i);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		nb_frags_left = nb_frags;</div><div class='del'>-</div><div class='del'>-		while (nb_frags_left--) {</div><div class='del'>-			struct xdp_desc *tx_desc = xsk_ring_prod__tx_desc(&amp;xsk-&gt;tx, idx + i);</div><div class='del'>-</div><div class='del'>-			tx_desc-&gt;addr = pkt_get_addr(pkt, ifobject-&gt;umem);</div><div class='del'>-			if (pkt_stream-&gt;verbatim) {</div><div class='del'>-				tx_desc-&gt;len = pkt-&gt;len;</div><div class='del'>-				tx_desc-&gt;options = pkt-&gt;options;</div><div class='del'>-			} else if (nb_frags_left) {</div><div class='del'>-				tx_desc-&gt;len = umem-&gt;frame_size;</div><div class='del'>-				tx_desc-&gt;options = XDP_PKT_CONTD;</div><div class='del'>-			} else {</div><div class='del'>-				tx_desc-&gt;len = pkt-&gt;len - bytes_written;</div><div class='del'>-				tx_desc-&gt;options = 0;</div><div class='del'>-			}</div><div class='del'>-			if (pkt-&gt;valid)</div><div class='del'>-				pkt_generate(xsk, umem, tx_desc-&gt;addr, tx_desc-&gt;len, pkt-&gt;pkt_nb,</div><div class='del'>-					     bytes_written);</div><div class='del'>-			bytes_written += tx_desc-&gt;len;</div><div class='del'>-</div><div class='del'>-			print_verbose("Tx addr: %llx len: %u options: %u pkt_nb: %u\n",</div><div class='del'>-				      tx_desc-&gt;addr, tx_desc-&gt;len, tx_desc-&gt;options, pkt-&gt;pkt_nb);</div><div class='del'>-</div><div class='del'>-			if (nb_frags_left) {</div><div class='del'>-				i++;</div><div class='del'>-				if (pkt_stream-&gt;verbatim)</div><div class='del'>-					pkt = pkt_stream_get_next_tx_pkt(pkt_stream);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (pkt &amp;&amp; pkt-&gt;valid) {</div><div class='del'>-			valid_pkts++;</div><div class='del'>-			valid_frags += nb_frags;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pthread_mutex_lock(&amp;pacing_mutex);</div><div class='del'>-	pkts_in_flight += valid_pkts;</div><div class='del'>-	pthread_mutex_unlock(&amp;pacing_mutex);</div><div class='del'>-</div><div class='del'>-	xsk_ring_prod__submit(&amp;xsk-&gt;tx, i);</div><div class='del'>-	xsk-&gt;outstanding_tx += valid_frags;</div><div class='del'>-</div><div class='del'>-	if (use_poll) {</div><div class='del'>-		ret = poll(&amp;fds, 1, POLL_TMOUT);</div><div class='del'>-		if (ret &lt;= 0) {</div><div class='del'>-			if (ret == 0 &amp;&amp; timeout)</div><div class='del'>-				return TEST_PASS;</div><div class='del'>-</div><div class='del'>-			ksft_print_msg("ERROR: [%s] Poll error %d\n", __func__, ret);</div><div class='del'>-			return TEST_FAILURE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!timeout) {</div><div class='del'>-		if (complete_pkts(xsk, i))</div><div class='del'>-			return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-		usleep(10);</div><div class='del'>-		return TEST_PASS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TEST_CONTINUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wait_for_tx_completion(struct xsk_socket_info *xsk)</div><div class='del'>-{</div><div class='del'>-	struct timeval tv_end, tv_now, tv_timeout = {THREAD_TMOUT, 0};</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = gettimeofday(&amp;tv_now, NULL);</div><div class='del'>-	if (ret)</div><div class='del'>-		exit_with_error(errno);</div><div class='del'>-	timeradd(&amp;tv_now, &amp;tv_timeout, &amp;tv_end);</div><div class='del'>-</div><div class='del'>-	while (xsk-&gt;outstanding_tx) {</div><div class='del'>-		ret = gettimeofday(&amp;tv_now, NULL);</div><div class='del'>-		if (ret)</div><div class='del'>-			exit_with_error(errno);</div><div class='del'>-		if (timercmp(&amp;tv_now, &amp;tv_end, &gt;)) {</div><div class='del'>-			ksft_print_msg("ERROR: [%s] Transmission loop timed out\n", __func__);</div><div class='del'>-			return TEST_FAILURE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		complete_pkts(xsk, xsk-&gt;batch_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TEST_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool all_packets_sent(struct test_spec *test, unsigned long *bitmap)</div><div class='del'>-{</div><div class='del'>-	return bitmap_full(bitmap, test-&gt;nb_sockets);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int send_pkts(struct test_spec *test, struct ifobject *ifobject)</div><div class='del'>-{</div><div class='del'>-	bool timeout = !is_umem_valid(test-&gt;ifobj_rx);</div><div class='del'>-	DECLARE_BITMAP(bitmap, test-&gt;nb_sockets);</div><div class='del'>-	u32 i, ret;</div><div class='del'>-</div><div class='del'>-	while (!(all_packets_sent(test, bitmap))) {</div><div class='del'>-		for (i = 0; i &lt; test-&gt;nb_sockets; i++) {</div><div class='del'>-			struct pkt_stream *pkt_stream;</div><div class='del'>-</div><div class='del'>-			pkt_stream = ifobject-&gt;xsk_arr[i].pkt_stream;</div><div class='del'>-			if (!pkt_stream || pkt_stream-&gt;current_pkt_nb &gt;= pkt_stream-&gt;nb_pkts) {</div><div class='del'>-				__set_bit(i, bitmap);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			ret = __send_pkts(ifobject, &amp;ifobject-&gt;xsk_arr[i], timeout);</div><div class='del'>-			if (ret == TEST_CONTINUE &amp;&amp; !test-&gt;fail)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if ((ret || test-&gt;fail) &amp;&amp; !timeout)</div><div class='del'>-				return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-			if (ret == TEST_PASS &amp;&amp; timeout)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			ret = wait_for_tx_completion(&amp;ifobject-&gt;xsk_arr[i]);</div><div class='del'>-			if (ret)</div><div class='del'>-				return TEST_FAILURE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TEST_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_xsk_stats(struct xsk_socket *xsk, struct xdp_statistics *stats)</div><div class='del'>-{</div><div class='del'>-	int fd = xsk_socket__fd(xsk), err;</div><div class='del'>-	socklen_t optlen, expected_len;</div><div class='del'>-</div><div class='del'>-	optlen = sizeof(*stats);</div><div class='del'>-	err = getsockopt(fd, SOL_XDP, XDP_STATISTICS, stats, &amp;optlen);</div><div class='del'>-	if (err) {</div><div class='del'>-		ksft_print_msg("[%s] getsockopt(XDP_STATISTICS) error %u %s\n",</div><div class='del'>-			       __func__, -err, strerror(-err));</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	expected_len = sizeof(struct xdp_statistics);</div><div class='del'>-	if (optlen != expected_len) {</div><div class='del'>-		ksft_print_msg("[%s] getsockopt optlen error. Expected: %u got: %u\n",</div><div class='del'>-			       __func__, expected_len, optlen);</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TEST_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int validate_rx_dropped(struct ifobject *ifobject)</div><div class='del'>-{</div><div class='del'>-	struct xsk_socket *xsk = ifobject-&gt;xsk-&gt;xsk;</div><div class='del'>-	struct xdp_statistics stats;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = kick_rx(ifobject-&gt;xsk);</div><div class='del'>-	if (err)</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	err = get_xsk_stats(xsk, &amp;stats);</div><div class='del'>-	if (err)</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	/* The receiver calls getsockopt after receiving the last (valid)</div><div class='del'>-	 * packet which is not the final packet sent in this test (valid and</div><div class='del'>-	 * invalid packets are sent in alternating fashion with the final</div><div class='del'>-	 * packet being invalid). Since the last packet may or may not have</div><div class='del'>-	 * been dropped already, both outcomes must be allowed.</div><div class='del'>-	 */</div><div class='del'>-	if (stats.rx_dropped == ifobject-&gt;xsk-&gt;pkt_stream-&gt;nb_pkts / 2 ||</div><div class='del'>-	    stats.rx_dropped == ifobject-&gt;xsk-&gt;pkt_stream-&gt;nb_pkts / 2 - 1)</div><div class='del'>-		return TEST_PASS;</div><div class='del'>-</div><div class='del'>-	return TEST_FAILURE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int validate_rx_full(struct ifobject *ifobject)</div><div class='del'>-{</div><div class='del'>-	struct xsk_socket *xsk = ifobject-&gt;xsk-&gt;xsk;</div><div class='del'>-	struct xdp_statistics stats;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	usleep(1000);</div><div class='del'>-	err = kick_rx(ifobject-&gt;xsk);</div><div class='del'>-	if (err)</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	err = get_xsk_stats(xsk, &amp;stats);</div><div class='del'>-	if (err)</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	if (stats.rx_ring_full)</div><div class='del'>-		return TEST_PASS;</div><div class='del'>-</div><div class='del'>-	return TEST_FAILURE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int validate_fill_empty(struct ifobject *ifobject)</div><div class='del'>-{</div><div class='del'>-	struct xsk_socket *xsk = ifobject-&gt;xsk-&gt;xsk;</div><div class='del'>-	struct xdp_statistics stats;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	usleep(1000);</div><div class='del'>-	err = kick_rx(ifobject-&gt;xsk);</div><div class='del'>-	if (err)</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	err = get_xsk_stats(xsk, &amp;stats);</div><div class='del'>-	if (err)</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	if (stats.rx_fill_ring_empty_descs)</div><div class='del'>-		return TEST_PASS;</div><div class='del'>-</div><div class='del'>-	return TEST_FAILURE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int validate_tx_invalid_descs(struct ifobject *ifobject)</div><div class='del'>-{</div><div class='del'>-	struct xsk_socket *xsk = ifobject-&gt;xsk-&gt;xsk;</div><div class='del'>-	int fd = xsk_socket__fd(xsk);</div><div class='del'>-	struct xdp_statistics stats;</div><div class='del'>-	socklen_t optlen;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	optlen = sizeof(stats);</div><div class='del'>-	err = getsockopt(fd, SOL_XDP, XDP_STATISTICS, &amp;stats, &amp;optlen);</div><div class='del'>-	if (err) {</div><div class='del'>-		ksft_print_msg("[%s] getsockopt(XDP_STATISTICS) error %u %s\n",</div><div class='del'>-			       __func__, -err, strerror(-err));</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (stats.tx_invalid_descs != ifobject-&gt;xsk-&gt;pkt_stream-&gt;nb_pkts / 2) {</div><div class='del'>-		ksft_print_msg("[%s] tx_invalid_descs incorrect. Got [%llu] expected [%u]\n",</div><div class='del'>-			       __func__,</div><div class='del'>-			       (unsigned long long)stats.tx_invalid_descs,</div><div class='del'>-			       ifobject-&gt;xsk-&gt;pkt_stream-&gt;nb_pkts);</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TEST_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xsk_configure_socket(struct test_spec *test, struct ifobject *ifobject,</div><div class='del'>-				 struct xsk_umem_info *umem, bool tx)</div><div class='del'>-{</div><div class='del'>-	int i, ret;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; test-&gt;nb_sockets; i++) {</div><div class='del'>-		bool shared = (ifobject-&gt;shared_umem &amp;&amp; tx) ? true : !!i;</div><div class='del'>-		u32 ctr = 0;</div><div class='del'>-</div><div class='del'>-		while (ctr++ &lt; SOCK_RECONF_CTR) {</div><div class='del'>-			ret = __xsk_configure_socket(&amp;ifobject-&gt;xsk_arr[i], umem,</div><div class='del'>-						     ifobject, shared);</div><div class='del'>-			if (!ret)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			/* Retry if it fails as xsk_socket__create() is asynchronous */</div><div class='del'>-			if (ctr &gt;= SOCK_RECONF_CTR)</div><div class='del'>-				exit_with_error(-ret);</div><div class='del'>-			usleep(USLEEP_MAX);</div><div class='del'>-		}</div><div class='del'>-		if (ifobject-&gt;busy_poll)</div><div class='del'>-			enable_busy_poll(&amp;ifobject-&gt;xsk_arr[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void thread_common_ops_tx(struct test_spec *test, struct ifobject *ifobject)</div><div class='del'>-{</div><div class='del'>-	xsk_configure_socket(test, ifobject, test-&gt;ifobj_rx-&gt;umem, true);</div><div class='del'>-	ifobject-&gt;xsk = &amp;ifobject-&gt;xsk_arr[0];</div><div class='del'>-	ifobject-&gt;xskmap = test-&gt;ifobj_rx-&gt;xskmap;</div><div class='del'>-	memcpy(ifobject-&gt;umem, test-&gt;ifobj_rx-&gt;umem, sizeof(struct xsk_umem_info));</div><div class='del'>-	ifobject-&gt;umem-&gt;base_addr = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xsk_populate_fill_ring(struct xsk_umem_info *umem, struct pkt_stream *pkt_stream,</div><div class='del'>-				   bool fill_up)</div><div class='del'>-{</div><div class='del'>-	u32 rx_frame_size = umem-&gt;frame_size - XDP_PACKET_HEADROOM;</div><div class='del'>-	u32 idx = 0, filled = 0, buffers_to_fill, nb_pkts;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (umem-&gt;num_frames &lt; XSK_RING_PROD__DEFAULT_NUM_DESCS)</div><div class='del'>-		buffers_to_fill = umem-&gt;num_frames;</div><div class='del'>-	else</div><div class='del'>-		buffers_to_fill = umem-&gt;fill_size;</div><div class='del'>-</div><div class='del'>-	ret = xsk_ring_prod__reserve(&amp;umem-&gt;fq, buffers_to_fill, &amp;idx);</div><div class='del'>-	if (ret != buffers_to_fill)</div><div class='del'>-		exit_with_error(ENOSPC);</div><div class='del'>-</div><div class='del'>-	while (filled &lt; buffers_to_fill) {</div><div class='del'>-		struct pkt *pkt = pkt_stream_get_next_rx_pkt(pkt_stream, &amp;nb_pkts);</div><div class='del'>-		u64 addr;</div><div class='del'>-		u32 i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; pkt_nb_frags(rx_frame_size, pkt_stream, pkt); i++) {</div><div class='del'>-			if (!pkt) {</div><div class='del'>-				if (!fill_up)</div><div class='del'>-					break;</div><div class='del'>-				addr = filled * umem-&gt;frame_size + umem-&gt;base_addr;</div><div class='del'>-			} else if (pkt-&gt;offset &gt;= 0) {</div><div class='del'>-				addr = pkt-&gt;offset % umem-&gt;frame_size + umem_alloc_buffer(umem);</div><div class='del'>-			} else {</div><div class='del'>-				addr = pkt-&gt;offset + umem_alloc_buffer(umem);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			*xsk_ring_prod__fill_addr(&amp;umem-&gt;fq, idx++) = addr;</div><div class='del'>-			if (++filled &gt;= buffers_to_fill)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	xsk_ring_prod__submit(&amp;umem-&gt;fq, filled);</div><div class='del'>-	xsk_ring_prod__cancel(&amp;umem-&gt;fq, buffers_to_fill - filled);</div><div class='del'>-</div><div class='del'>-	pkt_stream_reset(pkt_stream);</div><div class='del'>-	umem_reset_alloc(umem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void thread_common_ops(struct test_spec *test, struct ifobject *ifobject)</div><div class='del'>-{</div><div class='del'>-	u64 umem_sz = ifobject-&gt;umem-&gt;num_frames * ifobject-&gt;umem-&gt;frame_size;</div><div class='del'>-	int mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE;</div><div class='del'>-	LIBBPF_OPTS(bpf_xdp_query_opts, opts);</div><div class='del'>-	void *bufs;</div><div class='del'>-	int ret;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	if (ifobject-&gt;umem-&gt;unaligned_mode)</div><div class='del'>-		mmap_flags |= MAP_HUGETLB | MAP_HUGE_2MB;</div><div class='del'>-</div><div class='del'>-	if (ifobject-&gt;shared_umem)</div><div class='del'>-		umem_sz *= 2;</div><div class='del'>-</div><div class='del'>-	bufs = mmap(NULL, umem_sz, PROT_READ | PROT_WRITE, mmap_flags, -1, 0);</div><div class='del'>-	if (bufs == MAP_FAILED)</div><div class='del'>-		exit_with_error(errno);</div><div class='del'>-</div><div class='del'>-	ret = xsk_configure_umem(ifobject, ifobject-&gt;umem, bufs, umem_sz);</div><div class='del'>-	if (ret)</div><div class='del'>-		exit_with_error(-ret);</div><div class='del'>-</div><div class='del'>-	xsk_configure_socket(test, ifobject, ifobject-&gt;umem, false);</div><div class='del'>-</div><div class='del'>-	ifobject-&gt;xsk = &amp;ifobject-&gt;xsk_arr[0];</div><div class='del'>-</div><div class='del'>-	if (!ifobject-&gt;rx_on)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	xsk_populate_fill_ring(ifobject-&gt;umem, ifobject-&gt;xsk-&gt;pkt_stream, ifobject-&gt;use_fill_ring);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; test-&gt;nb_sockets; i++) {</div><div class='del'>-		ifobject-&gt;xsk = &amp;ifobject-&gt;xsk_arr[i];</div><div class='del'>-		ret = xsk_update_xskmap(ifobject-&gt;xskmap, ifobject-&gt;xsk-&gt;xsk, i);</div><div class='del'>-		if (ret)</div><div class='del'>-			exit_with_error(errno);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *worker_testapp_validate_tx(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct test_spec *test = (struct test_spec *)arg;</div><div class='del'>-	struct ifobject *ifobject = test-&gt;ifobj_tx;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (test-&gt;current_step == 1) {</div><div class='del'>-		if (!ifobject-&gt;shared_umem)</div><div class='del'>-			thread_common_ops(test, ifobject);</div><div class='del'>-		else</div><div class='del'>-			thread_common_ops_tx(test, ifobject);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = send_pkts(test, ifobject);</div><div class='del'>-</div><div class='del'>-	if (!err &amp;&amp; ifobject-&gt;validation_func)</div><div class='del'>-		err = ifobject-&gt;validation_func(ifobject);</div><div class='del'>-	if (err)</div><div class='del'>-		report_failure(test);</div><div class='del'>-</div><div class='del'>-	pthread_exit(NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *worker_testapp_validate_rx(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct test_spec *test = (struct test_spec *)arg;</div><div class='del'>-	struct ifobject *ifobject = test-&gt;ifobj_rx;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (test-&gt;current_step == 1) {</div><div class='del'>-		thread_common_ops(test, ifobject);</div><div class='del'>-	} else {</div><div class='del'>-		xsk_clear_xskmap(ifobject-&gt;xskmap);</div><div class='del'>-		err = xsk_update_xskmap(ifobject-&gt;xskmap, ifobject-&gt;xsk-&gt;xsk, 0);</div><div class='del'>-		if (err) {</div><div class='del'>-			ksft_print_msg("Error: Failed to update xskmap, error %s\n",</div><div class='del'>-				       strerror(-err));</div><div class='del'>-			exit_with_error(-err);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pthread_barrier_wait(&amp;barr);</div><div class='del'>-</div><div class='del'>-	err = receive_pkts(test);</div><div class='del'>-</div><div class='del'>-	if (!err &amp;&amp; ifobject-&gt;validation_func)</div><div class='del'>-		err = ifobject-&gt;validation_func(ifobject);</div><div class='del'>-	if (err)</div><div class='del'>-		report_failure(test);</div><div class='del'>-</div><div class='del'>-	pthread_exit(NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 ceil_u64(u64 a, u64 b)</div><div class='del'>-{</div><div class='del'>-	return (a + b - 1) / b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void testapp_clean_xsk_umem(struct ifobject *ifobj)</div><div class='del'>-{</div><div class='del'>-	u64 umem_sz = ifobj-&gt;umem-&gt;num_frames * ifobj-&gt;umem-&gt;frame_size;</div><div class='del'>-</div><div class='del'>-	if (ifobj-&gt;shared_umem)</div><div class='del'>-		umem_sz *= 2;</div><div class='del'>-</div><div class='del'>-	umem_sz = ceil_u64(umem_sz, HUGEPAGE_SIZE) * HUGEPAGE_SIZE;</div><div class='del'>-	xsk_umem__delete(ifobj-&gt;umem-&gt;umem);</div><div class='del'>-	munmap(ifobj-&gt;umem-&gt;buffer, umem_sz);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void handler(int signum)</div><div class='del'>-{</div><div class='del'>-	pthread_exit(NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool xdp_prog_changed_rx(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct ifobject *ifobj = test-&gt;ifobj_rx;</div><div class='del'>-</div><div class='del'>-	return ifobj-&gt;xdp_prog != test-&gt;xdp_prog_rx || ifobj-&gt;mode != test-&gt;mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool xdp_prog_changed_tx(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct ifobject *ifobj = test-&gt;ifobj_tx;</div><div class='del'>-</div><div class='del'>-	return ifobj-&gt;xdp_prog != test-&gt;xdp_prog_tx || ifobj-&gt;mode != test-&gt;mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xsk_reattach_xdp(struct ifobject *ifobj, struct bpf_program *xdp_prog,</div><div class='del'>-			     struct bpf_map *xskmap, enum test_mode mode)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	xsk_detach_xdp_program(ifobj-&gt;ifindex, mode_to_xdp_flags(ifobj-&gt;mode));</div><div class='del'>-	err = xsk_attach_xdp_program(xdp_prog, ifobj-&gt;ifindex, mode_to_xdp_flags(mode));</div><div class='del'>-	if (err) {</div><div class='del'>-		ksft_print_msg("Error attaching XDP program\n");</div><div class='del'>-		exit_with_error(-err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ifobj-&gt;mode != mode &amp;&amp; (mode == TEST_MODE_DRV || mode == TEST_MODE_ZC))</div><div class='del'>-		if (!xsk_is_in_mode(ifobj-&gt;ifindex, XDP_FLAGS_DRV_MODE)) {</div><div class='del'>-			ksft_print_msg("ERROR: XDP prog not in DRV mode\n");</div><div class='del'>-			exit_with_error(EINVAL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	ifobj-&gt;xdp_prog = xdp_prog;</div><div class='del'>-	ifobj-&gt;xskmap = xskmap;</div><div class='del'>-	ifobj-&gt;mode = mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xsk_attach_xdp_progs(struct test_spec *test, struct ifobject *ifobj_rx,</div><div class='del'>-				 struct ifobject *ifobj_tx)</div><div class='del'>-{</div><div class='del'>-	if (xdp_prog_changed_rx(test))</div><div class='del'>-		xsk_reattach_xdp(ifobj_rx, test-&gt;xdp_prog_rx, test-&gt;xskmap_rx, test-&gt;mode);</div><div class='del'>-</div><div class='del'>-	if (!ifobj_tx || ifobj_tx-&gt;shared_umem)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (xdp_prog_changed_tx(test))</div><div class='del'>-		xsk_reattach_xdp(ifobj_tx, test-&gt;xdp_prog_tx, test-&gt;xskmap_tx, test-&gt;mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __testapp_validate_traffic(struct test_spec *test, struct ifobject *ifobj1,</div><div class='del'>-				      struct ifobject *ifobj2)</div><div class='del'>-{</div><div class='del'>-	pthread_t t0, t1;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (test-&gt;mtu &gt; MAX_ETH_PKT_SIZE) {</div><div class='del'>-		if (test-&gt;mode == TEST_MODE_ZC &amp;&amp; (!ifobj1-&gt;multi_buff_zc_supp ||</div><div class='del'>-						   (ifobj2 &amp;&amp; !ifobj2-&gt;multi_buff_zc_supp))) {</div><div class='del'>-			ksft_test_result_skip("Multi buffer for zero-copy not supported.\n");</div><div class='del'>-			return TEST_SKIP;</div><div class='del'>-		}</div><div class='del'>-		if (test-&gt;mode != TEST_MODE_ZC &amp;&amp; (!ifobj1-&gt;multi_buff_supp ||</div><div class='del'>-						   (ifobj2 &amp;&amp; !ifobj2-&gt;multi_buff_supp))) {</div><div class='del'>-			ksft_test_result_skip("Multi buffer not supported.\n");</div><div class='del'>-			return TEST_SKIP;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	err = test_spec_set_mtu(test, test-&gt;mtu);</div><div class='del'>-	if (err) {</div><div class='del'>-		ksft_print_msg("Error, could not set mtu.\n");</div><div class='del'>-		exit_with_error(err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ifobj2) {</div><div class='del'>-		if (pthread_barrier_init(&amp;barr, NULL, 2))</div><div class='del'>-			exit_with_error(errno);</div><div class='del'>-		pkt_stream_reset(ifobj2-&gt;xsk-&gt;pkt_stream);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	test-&gt;current_step++;</div><div class='del'>-	pkt_stream_reset(ifobj1-&gt;xsk-&gt;pkt_stream);</div><div class='del'>-	pkts_in_flight = 0;</div><div class='del'>-</div><div class='del'>-	signal(SIGUSR1, handler);</div><div class='del'>-	/*Spawn RX thread */</div><div class='del'>-	pthread_create(&amp;t0, NULL, ifobj1-&gt;func_ptr, test);</div><div class='del'>-</div><div class='del'>-	if (ifobj2) {</div><div class='del'>-		pthread_barrier_wait(&amp;barr);</div><div class='del'>-		if (pthread_barrier_destroy(&amp;barr))</div><div class='del'>-			exit_with_error(errno);</div><div class='del'>-</div><div class='del'>-		/*Spawn TX thread */</div><div class='del'>-		pthread_create(&amp;t1, NULL, ifobj2-&gt;func_ptr, test);</div><div class='del'>-</div><div class='del'>-		pthread_join(t1, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ifobj2)</div><div class='del'>-		pthread_kill(t0, SIGUSR1);</div><div class='del'>-	else</div><div class='del'>-		pthread_join(t0, NULL);</div><div class='del'>-</div><div class='del'>-	if (test-&gt;total_steps == test-&gt;current_step || test-&gt;fail) {</div><div class='del'>-		u32 i;</div><div class='del'>-</div><div class='del'>-		if (ifobj2)</div><div class='del'>-			for (i = 0; i &lt; test-&gt;nb_sockets; i++)</div><div class='del'>-				xsk_socket__delete(ifobj2-&gt;xsk_arr[i].xsk);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; test-&gt;nb_sockets; i++)</div><div class='del'>-			xsk_socket__delete(ifobj1-&gt;xsk_arr[i].xsk);</div><div class='del'>-</div><div class='del'>-		testapp_clean_xsk_umem(ifobj1);</div><div class='del'>-		if (ifobj2 &amp;&amp; !ifobj2-&gt;shared_umem)</div><div class='del'>-			testapp_clean_xsk_umem(ifobj2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return !!test-&gt;fail;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_validate_traffic(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct ifobject *ifobj_rx = test-&gt;ifobj_rx;</div><div class='del'>-	struct ifobject *ifobj_tx = test-&gt;ifobj_tx;</div><div class='del'>-</div><div class='del'>-	if ((ifobj_rx-&gt;umem-&gt;unaligned_mode &amp;&amp; !ifobj_rx-&gt;unaligned_supp) ||</div><div class='del'>-	    (ifobj_tx-&gt;umem-&gt;unaligned_mode &amp;&amp; !ifobj_tx-&gt;unaligned_supp)) {</div><div class='del'>-		ksft_test_result_skip("No huge pages present.\n");</div><div class='del'>-		return TEST_SKIP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test-&gt;set_ring) {</div><div class='del'>-		if (ifobj_tx-&gt;hw_ring_size_supp) {</div><div class='del'>-			if (set_ring_size(ifobj_tx)) {</div><div class='del'>-				ksft_test_result_skip("Failed to change HW ring size.\n");</div><div class='del'>-				return TEST_FAILURE;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			ksft_test_result_skip("Changing HW ring size not supported.\n");</div><div class='del'>-			return TEST_SKIP;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	xsk_attach_xdp_progs(test, ifobj_rx, ifobj_tx);</div><div class='del'>-	return __testapp_validate_traffic(test, ifobj_rx, ifobj_tx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_validate_traffic_single_thread(struct test_spec *test, struct ifobject *ifobj)</div><div class='del'>-{</div><div class='del'>-	return __testapp_validate_traffic(test, ifobj, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_teardown(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_TEARDOWN_ITER; i++) {</div><div class='del'>-		if (testapp_validate_traffic(test))</div><div class='del'>-			return TEST_FAILURE;</div><div class='del'>-		test_spec_reset(test);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TEST_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void swap_directions(struct ifobject **ifobj1, struct ifobject **ifobj2)</div><div class='del'>-{</div><div class='del'>-	thread_func_t tmp_func_ptr = (*ifobj1)-&gt;func_ptr;</div><div class='del'>-	struct ifobject *tmp_ifobj = (*ifobj1);</div><div class='del'>-</div><div class='del'>-	(*ifobj1)-&gt;func_ptr = (*ifobj2)-&gt;func_ptr;</div><div class='del'>-	(*ifobj2)-&gt;func_ptr = tmp_func_ptr;</div><div class='del'>-</div><div class='del'>-	*ifobj1 = *ifobj2;</div><div class='del'>-	*ifobj2 = tmp_ifobj;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_bidirectional(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	test-&gt;ifobj_tx-&gt;rx_on = true;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;tx_on = true;</div><div class='del'>-	test-&gt;total_steps = 2;</div><div class='del'>-	if (testapp_validate_traffic(test))</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	print_verbose("Switching Tx/Rx direction\n");</div><div class='del'>-	swap_directions(&amp;test-&gt;ifobj_rx, &amp;test-&gt;ifobj_tx);</div><div class='del'>-	res = __testapp_validate_traffic(test, test-&gt;ifobj_rx, test-&gt;ifobj_tx);</div><div class='del'>-</div><div class='del'>-	swap_directions(&amp;test-&gt;ifobj_rx, &amp;test-&gt;ifobj_tx);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int swap_xsk_resources(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	test-&gt;ifobj_tx-&gt;xsk_arr[0].pkt_stream = NULL;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk_arr[0].pkt_stream = NULL;</div><div class='del'>-	test-&gt;ifobj_tx-&gt;xsk_arr[1].pkt_stream = test-&gt;tx_pkt_stream_default;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk_arr[1].pkt_stream = test-&gt;rx_pkt_stream_default;</div><div class='del'>-	test-&gt;ifobj_tx-&gt;xsk = &amp;test-&gt;ifobj_tx-&gt;xsk_arr[1];</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk = &amp;test-&gt;ifobj_rx-&gt;xsk_arr[1];</div><div class='del'>-</div><div class='del'>-	ret = xsk_update_xskmap(test-&gt;ifobj_rx-&gt;xskmap, test-&gt;ifobj_rx-&gt;xsk-&gt;xsk, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	return TEST_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_xdp_prog_cleanup(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;total_steps = 2;</div><div class='del'>-	test-&gt;nb_sockets = 2;</div><div class='del'>-	if (testapp_validate_traffic(test))</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	if (swap_xsk_resources(test))</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_headroom(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;frame_headroom = UMEM_HEADROOM_TEST_SIZE;</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_stats_rx_dropped(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	if (test-&gt;mode == TEST_MODE_ZC) {</div><div class='del'>-		ksft_test_result_skip("Can not run RX_DROPPED test for ZC mode\n");</div><div class='del'>-		return TEST_SKIP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pkt_stream_replace_half(test, MIN_PKT_SIZE * 4, 0);</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;frame_headroom = test-&gt;ifobj_rx-&gt;umem-&gt;frame_size -</div><div class='del'>-		XDP_PACKET_HEADROOM - MIN_PKT_SIZE * 3;</div><div class='del'>-	pkt_stream_receive_half(test);</div><div class='del'>-	test-&gt;ifobj_rx-&gt;validation_func = validate_rx_dropped;</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_stats_tx_invalid_descs(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	pkt_stream_replace_half(test, XSK_UMEM__INVALID_FRAME_SIZE, 0);</div><div class='del'>-	test-&gt;ifobj_tx-&gt;validation_func = validate_tx_invalid_descs;</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_stats_rx_full(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	pkt_stream_replace(test, DEFAULT_UMEM_BUFFERS + DEFAULT_UMEM_BUFFERS / 2, MIN_PKT_SIZE);</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream = pkt_stream_generate(DEFAULT_UMEM_BUFFERS, MIN_PKT_SIZE);</div><div class='del'>-</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk-&gt;rxqsize = DEFAULT_UMEM_BUFFERS;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;release_rx = false;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;validation_func = validate_rx_full;</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_stats_fill_empty(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	pkt_stream_replace(test, DEFAULT_UMEM_BUFFERS + DEFAULT_UMEM_BUFFERS / 2, MIN_PKT_SIZE);</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk-&gt;pkt_stream = pkt_stream_generate(DEFAULT_UMEM_BUFFERS, MIN_PKT_SIZE);</div><div class='del'>-</div><div class='del'>-	test-&gt;ifobj_rx-&gt;use_fill_ring = false;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;validation_func = validate_fill_empty;</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_send_receive_unaligned(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;ifobj_tx-&gt;umem-&gt;unaligned_mode = true;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;unaligned_mode = true;</div><div class='del'>-	/* Let half of the packets straddle a 4K buffer boundary */</div><div class='del'>-	pkt_stream_replace_half(test, MIN_PKT_SIZE, -MIN_PKT_SIZE / 2);</div><div class='del'>-</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_send_receive_unaligned_mb(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='del'>-	test-&gt;ifobj_tx-&gt;umem-&gt;unaligned_mode = true;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;unaligned_mode = true;</div><div class='del'>-	pkt_stream_replace(test, DEFAULT_PKT_CNT, MAX_ETH_JUMBO_SIZE);</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_single_pkt(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct pkt pkts[] = {{0, MIN_PKT_SIZE, 0, true}};</div><div class='del'>-</div><div class='del'>-	pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts));</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_send_receive_mb(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='del'>-	pkt_stream_replace(test, DEFAULT_PKT_CNT, MAX_ETH_JUMBO_SIZE);</div><div class='del'>-</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_invalid_desc_mb(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct xsk_umem_info *umem = test-&gt;ifobj_tx-&gt;umem;</div><div class='del'>-	u64 umem_size = umem-&gt;num_frames * umem-&gt;frame_size;</div><div class='del'>-	struct pkt pkts[] = {</div><div class='del'>-		/* Valid packet for synch to start with */</div><div class='del'>-		{0, MIN_PKT_SIZE, 0, true, 0},</div><div class='del'>-		/* Zero frame len is not legal */</div><div class='del'>-		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='del'>-		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='del'>-		{0, 0, 0, false, 0},</div><div class='del'>-		/* Invalid address in the second frame */</div><div class='del'>-		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='del'>-		{umem_size, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='del'>-		/* Invalid len in the middle */</div><div class='del'>-		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='del'>-		{0, XSK_UMEM__INVALID_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='del'>-		/* Invalid options in the middle */</div><div class='del'>-		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='del'>-		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XSK_DESC__INVALID_OPTION},</div><div class='del'>-		/* Transmit 2 frags, receive 3 */</div><div class='del'>-		{0, XSK_UMEM__MAX_FRAME_SIZE, 0, true, XDP_PKT_CONTD},</div><div class='del'>-		{0, XSK_UMEM__MAX_FRAME_SIZE, 0, true, 0},</div><div class='del'>-		/* Middle frame crosses chunk boundary with small length */</div><div class='del'>-		{0, XSK_UMEM__LARGE_FRAME_SIZE, 0, false, XDP_PKT_CONTD},</div><div class='del'>-		{-MIN_PKT_SIZE / 2, MIN_PKT_SIZE, 0, false, 0},</div><div class='del'>-		/* Valid packet for synch so that something is received */</div><div class='del'>-		{0, MIN_PKT_SIZE, 0, true, 0}};</div><div class='del'>-</div><div class='del'>-	if (umem-&gt;unaligned_mode) {</div><div class='del'>-		/* Crossing a chunk boundary allowed */</div><div class='del'>-		pkts[12].valid = true;</div><div class='del'>-		pkts[13].valid = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='del'>-	pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts));</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_invalid_desc(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct xsk_umem_info *umem = test-&gt;ifobj_tx-&gt;umem;</div><div class='del'>-	u64 umem_size = umem-&gt;num_frames * umem-&gt;frame_size;</div><div class='del'>-	struct pkt pkts[] = {</div><div class='del'>-		/* Zero packet address allowed */</div><div class='del'>-		{0, MIN_PKT_SIZE, 0, true},</div><div class='del'>-		/* Allowed packet */</div><div class='del'>-		{0, MIN_PKT_SIZE, 0, true},</div><div class='del'>-		/* Straddling the start of umem */</div><div class='del'>-		{-2, MIN_PKT_SIZE, 0, false},</div><div class='del'>-		/* Packet too large */</div><div class='del'>-		{0, XSK_UMEM__INVALID_FRAME_SIZE, 0, false},</div><div class='del'>-		/* Up to end of umem allowed */</div><div class='del'>-		{umem_size - MIN_PKT_SIZE - 2 * umem-&gt;frame_size, MIN_PKT_SIZE, 0, true},</div><div class='del'>-		/* After umem ends */</div><div class='del'>-		{umem_size, MIN_PKT_SIZE, 0, false},</div><div class='del'>-		/* Straddle the end of umem */</div><div class='del'>-		{umem_size - MIN_PKT_SIZE / 2, MIN_PKT_SIZE, 0, false},</div><div class='del'>-		/* Straddle a 4K boundary */</div><div class='del'>-		{0x1000 - MIN_PKT_SIZE / 2, MIN_PKT_SIZE, 0, false},</div><div class='del'>-		/* Straddle a 2K boundary */</div><div class='del'>-		{0x800 - MIN_PKT_SIZE / 2, MIN_PKT_SIZE, 0, true},</div><div class='del'>-		/* Valid packet for synch so that something is received */</div><div class='del'>-		{0, MIN_PKT_SIZE, 0, true}};</div><div class='del'>-</div><div class='del'>-	if (umem-&gt;unaligned_mode) {</div><div class='del'>-		/* Crossing a page boundary allowed */</div><div class='del'>-		pkts[7].valid = true;</div><div class='del'>-	}</div><div class='del'>-	if (umem-&gt;frame_size == XSK_UMEM__DEFAULT_FRAME_SIZE / 2) {</div><div class='del'>-		/* Crossing a 2K frame size boundary not allowed */</div><div class='del'>-		pkts[8].valid = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (test-&gt;ifobj_tx-&gt;shared_umem) {</div><div class='del'>-		pkts[4].offset += umem_size;</div><div class='del'>-		pkts[5].offset += umem_size;</div><div class='del'>-		pkts[6].offset += umem_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts));</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_xdp_drop(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct xsk_xdp_progs *skel_rx = test-&gt;ifobj_rx-&gt;xdp_progs;</div><div class='del'>-	struct xsk_xdp_progs *skel_tx = test-&gt;ifobj_tx-&gt;xdp_progs;</div><div class='del'>-</div><div class='del'>-	test_spec_set_xdp_prog(test, skel_rx-&gt;progs.xsk_xdp_drop, skel_tx-&gt;progs.xsk_xdp_drop,</div><div class='del'>-			       skel_rx-&gt;maps.xsk, skel_tx-&gt;maps.xsk);</div><div class='del'>-</div><div class='del'>-	pkt_stream_receive_half(test);</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_xdp_metadata_copy(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct xsk_xdp_progs *skel_rx = test-&gt;ifobj_rx-&gt;xdp_progs;</div><div class='del'>-	struct xsk_xdp_progs *skel_tx = test-&gt;ifobj_tx-&gt;xdp_progs;</div><div class='del'>-	struct bpf_map *data_map;</div><div class='del'>-	int count = 0;</div><div class='del'>-	int key = 0;</div><div class='del'>-</div><div class='del'>-	test_spec_set_xdp_prog(test, skel_rx-&gt;progs.xsk_xdp_populate_metadata,</div><div class='del'>-			       skel_tx-&gt;progs.xsk_xdp_populate_metadata,</div><div class='del'>-			       skel_rx-&gt;maps.xsk, skel_tx-&gt;maps.xsk);</div><div class='del'>-	test-&gt;ifobj_rx-&gt;use_metadata = true;</div><div class='del'>-</div><div class='del'>-	data_map = bpf_object__find_map_by_name(skel_rx-&gt;obj, "xsk_xdp_.bss");</div><div class='del'>-	if (!data_map || !bpf_map__is_internal(data_map)) {</div><div class='del'>-		ksft_print_msg("Error: could not find bss section of XDP program\n");</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bpf_map_update_elem(bpf_map__fd(data_map), &amp;key, &amp;count, BPF_ANY)) {</div><div class='del'>-		ksft_print_msg("Error: could not update count element\n");</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_xdp_shared_umem(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct xsk_xdp_progs *skel_rx = test-&gt;ifobj_rx-&gt;xdp_progs;</div><div class='del'>-	struct xsk_xdp_progs *skel_tx = test-&gt;ifobj_tx-&gt;xdp_progs;</div><div class='del'>-</div><div class='del'>-	test-&gt;total_steps = 1;</div><div class='del'>-	test-&gt;nb_sockets = 2;</div><div class='del'>-</div><div class='del'>-	test_spec_set_xdp_prog(test, skel_rx-&gt;progs.xsk_xdp_shared_umem,</div><div class='del'>-			       skel_tx-&gt;progs.xsk_xdp_shared_umem,</div><div class='del'>-			       skel_rx-&gt;maps.xsk, skel_tx-&gt;maps.xsk);</div><div class='del'>-</div><div class='del'>-	pkt_stream_even_odd_sequence(test);</div><div class='del'>-</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_poll_txq_tmout(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;ifobj_tx-&gt;use_poll = true;</div><div class='del'>-	/* create invalid frame by set umem frame_size and pkt length equal to 2048 */</div><div class='del'>-	test-&gt;ifobj_tx-&gt;umem-&gt;frame_size = 2048;</div><div class='del'>-	pkt_stream_replace(test, 2 * DEFAULT_PKT_CNT, 2048);</div><div class='del'>-	return testapp_validate_traffic_single_thread(test, test-&gt;ifobj_tx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_poll_rxq_tmout(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;ifobj_rx-&gt;use_poll = true;</div><div class='del'>-	return testapp_validate_traffic_single_thread(test, test-&gt;ifobj_rx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_too_many_frags(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	struct pkt *pkts;</div><div class='del'>-	u32 max_frags, i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (test-&gt;mode == TEST_MODE_ZC) {</div><div class='del'>-		max_frags = test-&gt;ifobj_tx-&gt;xdp_zc_max_segs;</div><div class='del'>-	} else {</div><div class='del'>-		max_frags = get_max_skb_frags();</div><div class='del'>-		if (!max_frags) {</div><div class='del'>-			ksft_print_msg("Couldn't retrieve MAX_SKB_FRAGS from system, using default (17) value\n");</div><div class='del'>-			max_frags = 17;</div><div class='del'>-		}</div><div class='del'>-		max_frags += 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pkts = calloc(2 * max_frags + 2, sizeof(struct pkt));</div><div class='del'>-	if (!pkts)</div><div class='del'>-		return TEST_FAILURE;</div><div class='del'>-</div><div class='del'>-	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='del'>-</div><div class='del'>-	/* Valid packet for synch */</div><div class='del'>-	pkts[0].len = MIN_PKT_SIZE;</div><div class='del'>-	pkts[0].valid = true;</div><div class='del'>-</div><div class='del'>-	/* One valid packet with the max amount of frags */</div><div class='del'>-	for (i = 1; i &lt; max_frags + 1; i++) {</div><div class='del'>-		pkts[i].len = MIN_PKT_SIZE;</div><div class='del'>-		pkts[i].options = XDP_PKT_CONTD;</div><div class='del'>-		pkts[i].valid = true;</div><div class='del'>-	}</div><div class='del'>-	pkts[max_frags].options = 0;</div><div class='del'>-</div><div class='del'>-	/* An invalid packet with the max amount of frags but signals packet</div><div class='del'>-	 * continues on the last frag</div><div class='del'>-	 */</div><div class='del'>-	for (i = max_frags + 1; i &lt; 2 * max_frags + 1; i++) {</div><div class='del'>-		pkts[i].len = MIN_PKT_SIZE;</div><div class='del'>-		pkts[i].options = XDP_PKT_CONTD;</div><div class='del'>-		pkts[i].valid = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Valid packet for synch */</div><div class='del'>-	pkts[2 * max_frags + 1].len = MIN_PKT_SIZE;</div><div class='del'>-	pkts[2 * max_frags + 1].valid = true;</div><div class='del'>-</div><div class='del'>-	pkt_stream_generate_custom(test, pkts, 2 * max_frags + 2);</div><div class='del'>-	ret = testapp_validate_traffic(test);</div><div class='del'>-</div><div class='del'>-	free(pkts);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xsk_load_xdp_programs(struct ifobject *ifobj)</div><div class='del'>-{</div><div class='del'>-	ifobj-&gt;xdp_progs = xsk_xdp_progs__open_and_load();</div><div class='del'>-	if (libbpf_get_error(ifobj-&gt;xdp_progs))</div><div class='del'>-		return libbpf_get_error(ifobj-&gt;xdp_progs);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void xsk_unload_xdp_programs(struct ifobject *ifobj)</div><div class='ctx'> {</div><div class='ctx'> 	xsk_xdp_progs__destroy(ifobj-&gt;xdp_progs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Simple test */</div><div class='del'>-static bool hugepages_present(void)</div><div class='del'>-{</div><div class='del'>-	size_t mmap_sz = 2 * DEFAULT_UMEM_BUFFERS * XSK_UMEM__DEFAULT_FRAME_SIZE;</div><div class='del'>-	void *bufs;</div><div class='del'>-</div><div class='del'>-	bufs = mmap(NULL, mmap_sz, PROT_READ | PROT_WRITE,</div><div class='del'>-		    MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, MAP_HUGE_2MB);</div><div class='del'>-	if (bufs == MAP_FAILED)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	mmap_sz = ceil_u64(mmap_sz, HUGEPAGE_SIZE) * HUGEPAGE_SIZE;</div><div class='del'>-	munmap(bufs, mmap_sz);</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void init_iface(struct ifobject *ifobj, thread_func_t func_ptr)</div><div class='del'>-{</div><div class='del'>-	LIBBPF_OPTS(bpf_xdp_query_opts, query_opts);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ifobj-&gt;func_ptr = func_ptr;</div><div class='del'>-</div><div class='del'>-	err = xsk_load_xdp_programs(ifobj);</div><div class='del'>-	if (err) {</div><div class='del'>-		ksft_print_msg("Error loading XDP program\n");</div><div class='del'>-		exit_with_error(err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hugepages_present())</div><div class='del'>-		ifobj-&gt;unaligned_supp = true;</div><div class='del'>-</div><div class='del'>-	err = bpf_xdp_query(ifobj-&gt;ifindex, XDP_FLAGS_DRV_MODE, &amp;query_opts);</div><div class='del'>-	if (err) {</div><div class='del'>-		ksft_print_msg("Error querying XDP capabilities\n");</div><div class='del'>-		exit_with_error(-err);</div><div class='del'>-	}</div><div class='del'>-	if (query_opts.feature_flags &amp; NETDEV_XDP_ACT_RX_SG)</div><div class='del'>-		ifobj-&gt;multi_buff_supp = true;</div><div class='del'>-	if (query_opts.feature_flags &amp; NETDEV_XDP_ACT_XSK_ZEROCOPY) {</div><div class='del'>-		if (query_opts.xdp_zc_max_segs &gt; 1) {</div><div class='del'>-			ifobj-&gt;multi_buff_zc_supp = true;</div><div class='del'>-			ifobj-&gt;xdp_zc_max_segs = query_opts.xdp_zc_max_segs;</div><div class='del'>-		} else {</div><div class='del'>-			ifobj-&gt;xdp_zc_max_segs = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_send_receive(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_send_receive_2k_frame(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;ifobj_tx-&gt;umem-&gt;frame_size = 2048;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;frame_size = 2048;</div><div class='del'>-	pkt_stream_replace(test, DEFAULT_PKT_CNT, MIN_PKT_SIZE);</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_poll_rx(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;ifobj_rx-&gt;use_poll = true;</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_poll_tx(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;ifobj_tx-&gt;use_poll = true;</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_aligned_inv_desc(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	return testapp_invalid_desc(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_aligned_inv_desc_2k_frame(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;ifobj_tx-&gt;umem-&gt;frame_size = 2048;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;frame_size = 2048;</div><div class='del'>-	return testapp_invalid_desc(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_unaligned_inv_desc(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;ifobj_tx-&gt;umem-&gt;unaligned_mode = true;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;unaligned_mode = true;</div><div class='del'>-	return testapp_invalid_desc(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_unaligned_inv_desc_4001_frame(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	u64 page_size, umem_size;</div><div class='del'>-</div><div class='del'>-	/* Odd frame size so the UMEM doesn't end near a page boundary. */</div><div class='del'>-	test-&gt;ifobj_tx-&gt;umem-&gt;frame_size = 4001;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;frame_size = 4001;</div><div class='del'>-	test-&gt;ifobj_tx-&gt;umem-&gt;unaligned_mode = true;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;unaligned_mode = true;</div><div class='del'>-	/* This test exists to test descriptors that staddle the end of</div><div class='del'>-	 * the UMEM but not a page.</div><div class='del'>-	 */</div><div class='del'>-	page_size = sysconf(_SC_PAGESIZE);</div><div class='del'>-	umem_size = test-&gt;ifobj_tx-&gt;umem-&gt;num_frames * test-&gt;ifobj_tx-&gt;umem-&gt;frame_size;</div><div class='del'>-	assert(umem_size % page_size &gt; MIN_PKT_SIZE);</div><div class='del'>-	assert(umem_size % page_size &lt; page_size - MIN_PKT_SIZE);</div><div class='del'>-</div><div class='del'>-	return testapp_invalid_desc(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_aligned_inv_desc_mb(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	return testapp_invalid_desc_mb(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_unaligned_inv_desc_mb(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;ifobj_tx-&gt;umem-&gt;unaligned_mode = true;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;unaligned_mode = true;</div><div class='del'>-	return testapp_invalid_desc_mb(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_xdp_metadata(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	return testapp_xdp_metadata_copy(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_xdp_metadata_mb(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	test-&gt;mtu = MAX_ETH_JUMBO_SIZE;</div><div class='del'>-	return testapp_xdp_metadata_copy(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_hw_sw_min_ring_size(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	test-&gt;set_ring = true;</div><div class='del'>-	test-&gt;total_steps = 2;</div><div class='del'>-	test-&gt;ifobj_tx-&gt;ring.tx_pending = DEFAULT_BATCH_SIZE;</div><div class='del'>-	test-&gt;ifobj_tx-&gt;ring.rx_pending = DEFAULT_BATCH_SIZE * 2;</div><div class='del'>-	test-&gt;ifobj_tx-&gt;xsk-&gt;batch_size = 1;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk-&gt;batch_size = 1;</div><div class='del'>-	ret = testapp_validate_traffic(test);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Set batch size to hw_ring_size - 1 */</div><div class='del'>-	test-&gt;ifobj_tx-&gt;xsk-&gt;batch_size = DEFAULT_BATCH_SIZE - 1;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk-&gt;batch_size = DEFAULT_BATCH_SIZE - 1;</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int testapp_hw_sw_max_ring_size(struct test_spec *test)</div><div class='del'>-{</div><div class='del'>-	u32 max_descs = XSK_RING_PROD__DEFAULT_NUM_DESCS * 4;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	test-&gt;set_ring = true;</div><div class='del'>-	test-&gt;total_steps = 2;</div><div class='del'>-	test-&gt;ifobj_tx-&gt;ring.tx_pending = test-&gt;ifobj_tx-&gt;ring.tx_max_pending;</div><div class='del'>-	test-&gt;ifobj_tx-&gt;ring.rx_pending  = test-&gt;ifobj_tx-&gt;ring.rx_max_pending;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;num_frames = max_descs;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;fill_size = max_descs;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;umem-&gt;comp_size = max_descs;</div><div class='del'>-	test-&gt;ifobj_tx-&gt;xsk-&gt;batch_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk-&gt;batch_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;</div><div class='del'>-</div><div class='del'>-	ret = testapp_validate_traffic(test);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Set batch_size to 8152 for testing, as the ice HW ignores the 3 lowest bits when</div><div class='del'>-	 * updating the Rx HW tail register.</div><div class='del'>-	 */</div><div class='del'>-	test-&gt;ifobj_tx-&gt;xsk-&gt;batch_size = test-&gt;ifobj_tx-&gt;ring.tx_max_pending - 8;</div><div class='del'>-	test-&gt;ifobj_rx-&gt;xsk-&gt;batch_size = test-&gt;ifobj_tx-&gt;ring.tx_max_pending - 8;</div><div class='del'>-	pkt_stream_replace(test, max_descs, MIN_PKT_SIZE);</div><div class='del'>-	return testapp_validate_traffic(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void run_pkt_test(struct test_spec *test)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = test-&gt;test_func(test);</div><div class='ctx'> </div><div class='del'>-	if (ret == TEST_PASS)</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case TEST_PASS:</div><div class='ctx'> 		ksft_test_result_pass("PASS: %s %s%s\n", mode_string(test), busy_poll_string(test),</div><div class='ctx'> 				      test-&gt;name);</div><div class='del'>-	pkt_stream_restore_default(test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct ifobject *ifobject_create(void)</div><div class='del'>-{</div><div class='del'>-	struct ifobject *ifobj;</div><div class='del'>-</div><div class='del'>-	ifobj = calloc(1, sizeof(struct ifobject));</div><div class='del'>-	if (!ifobj)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	ifobj-&gt;xsk_arr = calloc(MAX_SOCKETS, sizeof(*ifobj-&gt;xsk_arr));</div><div class='del'>-	if (!ifobj-&gt;xsk_arr)</div><div class='del'>-		goto out_xsk_arr;</div><div class='del'>-</div><div class='del'>-	ifobj-&gt;umem = calloc(1, sizeof(*ifobj-&gt;umem));</div><div class='del'>-	if (!ifobj-&gt;umem)</div><div class='del'>-		goto out_umem;</div><div class='del'>-</div><div class='del'>-	return ifobj;</div><div class='del'>-</div><div class='del'>-out_umem:</div><div class='del'>-	free(ifobj-&gt;xsk_arr);</div><div class='del'>-out_xsk_arr:</div><div class='del'>-	free(ifobj);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='add'>+		break;</div><div class='add'>+	case TEST_SKIP:</div><div class='add'>+		ksft_test_result_skip("SKIP: %s %s%s\n", mode_string(test), busy_poll_string(test),</div><div class='add'>+				      test-&gt;name);</div><div class='add'>+		break;</div><div class='add'>+	case TEST_FAILURE:</div><div class='add'>+		ksft_test_result_fail("FAIL: %s %s%s\n", mode_string(test), busy_poll_string(test),</div><div class='add'>+				      test-&gt;name);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ksft_test_result_fail("FAIL: %s %s%s -- Unexpected returned value (%d)\n",</div><div class='add'>+				      mode_string(test), busy_poll_string(test), test-&gt;name, ret);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static void ifobject_delete(struct ifobject *ifobj)</div><div class='del'>-{</div><div class='del'>-	free(ifobj-&gt;umem);</div><div class='del'>-	free(ifobj-&gt;xsk_arr);</div><div class='del'>-	free(ifobj);</div><div class='add'>+	pkt_stream_restore_default(test);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool is_xdp_supported(int ifindex)</div><div class='hunk'>@@ -2587,42 +319,6 @@ static bool is_xdp_supported(int ifindex)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct test_spec tests[] = {</div><div class='del'>-	{.name = "SEND_RECEIVE", .test_func = testapp_send_receive},</div><div class='del'>-	{.name = "SEND_RECEIVE_2K_FRAME", .test_func = testapp_send_receive_2k_frame},</div><div class='del'>-	{.name = "SEND_RECEIVE_SINGLE_PKT", .test_func = testapp_single_pkt},</div><div class='del'>-	{.name = "POLL_RX", .test_func = testapp_poll_rx},</div><div class='del'>-	{.name = "POLL_TX", .test_func = testapp_poll_tx},</div><div class='del'>-	{.name = "POLL_RXQ_FULL", .test_func = testapp_poll_rxq_tmout},</div><div class='del'>-	{.name = "POLL_TXQ_FULL", .test_func = testapp_poll_txq_tmout},</div><div class='del'>-	{.name = "SEND_RECEIVE_UNALIGNED", .test_func = testapp_send_receive_unaligned},</div><div class='del'>-	{.name = "ALIGNED_INV_DESC", .test_func = testapp_aligned_inv_desc},</div><div class='del'>-	{.name = "ALIGNED_INV_DESC_2K_FRAME_SIZE", .test_func = testapp_aligned_inv_desc_2k_frame},</div><div class='del'>-	{.name = "UNALIGNED_INV_DESC", .test_func = testapp_unaligned_inv_desc},</div><div class='del'>-	{.name = "UNALIGNED_INV_DESC_4001_FRAME_SIZE",</div><div class='del'>-	 .test_func = testapp_unaligned_inv_desc_4001_frame},</div><div class='del'>-	{.name = "UMEM_HEADROOM", .test_func = testapp_headroom},</div><div class='del'>-	{.name = "TEARDOWN", .test_func = testapp_teardown},</div><div class='del'>-	{.name = "BIDIRECTIONAL", .test_func = testapp_bidirectional},</div><div class='del'>-	{.name = "STAT_RX_DROPPED", .test_func = testapp_stats_rx_dropped},</div><div class='del'>-	{.name = "STAT_TX_INVALID", .test_func = testapp_stats_tx_invalid_descs},</div><div class='del'>-	{.name = "STAT_RX_FULL", .test_func = testapp_stats_rx_full},</div><div class='del'>-	{.name = "STAT_FILL_EMPTY", .test_func = testapp_stats_fill_empty},</div><div class='del'>-	{.name = "XDP_PROG_CLEANUP", .test_func = testapp_xdp_prog_cleanup},</div><div class='del'>-	{.name = "XDP_DROP_HALF", .test_func = testapp_xdp_drop},</div><div class='del'>-	{.name = "XDP_SHARED_UMEM", .test_func = testapp_xdp_shared_umem},</div><div class='del'>-	{.name = "XDP_METADATA_COPY", .test_func = testapp_xdp_metadata},</div><div class='del'>-	{.name = "XDP_METADATA_COPY_MULTI_BUFF", .test_func = testapp_xdp_metadata_mb},</div><div class='del'>-	{.name = "SEND_RECEIVE_9K_PACKETS", .test_func = testapp_send_receive_mb},</div><div class='del'>-	{.name = "SEND_RECEIVE_UNALIGNED_9K_PACKETS",</div><div class='del'>-	 .test_func = testapp_send_receive_unaligned_mb},</div><div class='del'>-	{.name = "ALIGNED_INV_DESC_MULTI_BUFF", .test_func = testapp_aligned_inv_desc_mb},</div><div class='del'>-	{.name = "UNALIGNED_INV_DESC_MULTI_BUFF", .test_func = testapp_unaligned_inv_desc_mb},</div><div class='del'>-	{.name = "TOO_MANY_FRAGS", .test_func = testapp_too_many_frags},</div><div class='del'>-	{.name = "HW_SW_MIN_RING_SIZE", .test_func = testapp_hw_sw_min_ring_size},</div><div class='del'>-	{.name = "HW_SW_MAX_RING_SIZE", .test_func = testapp_hw_sw_max_ring_size},</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> static void print_tests(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='hunk'>@@ -2630,10 +326,13 @@ static void print_tests(void)</div><div class='ctx'> 	printf("Tests:\n");</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(tests); i++)</div><div class='ctx'> 		printf("%u: %s\n", i, tests[i].name);</div><div class='add'>+	for (i = ARRAY_SIZE(tests); i &lt; ARRAY_SIZE(tests) + ARRAY_SIZE(ci_skip_tests); i++)</div><div class='add'>+		printf("%u: %s\n", i, ci_skip_tests[i - ARRAY_SIZE(tests)].name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='add'>+	const size_t total_tests = ARRAY_SIZE(tests) + ARRAY_SIZE(ci_skip_tests);</div><div class='ctx'> 	struct pkt_stream *rx_pkt_stream_default;</div><div class='ctx'> 	struct pkt_stream *tx_pkt_stream_default;</div><div class='ctx'> 	struct ifobject *ifobj_tx, *ifobj_rx;</div><div class='hunk'>@@ -2661,7 +360,7 @@ int main(int argc, char **argv)</div><div class='ctx'> 		print_tests();</div><div class='ctx'> 		ksft_exit_xpass();</div><div class='ctx'> 	}</div><div class='del'>-	if (opt_run_test != RUN_ALL_TESTS &amp;&amp; opt_run_test &gt;= ARRAY_SIZE(tests)) {</div><div class='add'>+	if (opt_run_test != RUN_ALL_TESTS &amp;&amp; opt_run_test &gt;= total_tests) {</div><div class='ctx'> 		ksft_print_msg("Error: test %u does not exist.\n", opt_run_test);</div><div class='ctx'> 		ksft_exit_xfail();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2686,10 +385,13 @@ int main(int argc, char **argv)</div><div class='ctx'> 		ifobj_tx-&gt;set_ring.default_rx = ifobj_tx-&gt;ring.rx_pending;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	init_iface(ifobj_rx, worker_testapp_validate_rx);</div><div class='del'>-	init_iface(ifobj_tx, worker_testapp_validate_tx);</div><div class='add'>+	if (init_iface(ifobj_rx, worker_testapp_validate_rx) ||</div><div class='add'>+	    init_iface(ifobj_tx, worker_testapp_validate_tx)) {</div><div class='add'>+		ksft_print_msg("Error : can't initialize interfaces\n");</div><div class='add'>+		ksft_exit_xfail();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	test_spec_init(&amp;test, ifobj_tx, ifobj_rx, 0, &amp;tests[0]);</div><div class='add'>+	test_init(&amp;test, ifobj_tx, ifobj_rx, 0, &amp;tests[0]);</div><div class='ctx'> 	tx_pkt_stream_default = pkt_stream_generate(DEFAULT_PKT_CNT, MIN_PKT_SIZE);</div><div class='ctx'> 	rx_pkt_stream_default = pkt_stream_generate(DEFAULT_PKT_CNT, MIN_PKT_SIZE);</div><div class='ctx'> 	if (!tx_pkt_stream_default || !rx_pkt_stream_default)</div><div class='hunk'>@@ -2698,7 +400,7 @@ int main(int argc, char **argv)</div><div class='ctx'> 	test.rx_pkt_stream_default = rx_pkt_stream_default;</div><div class='ctx'> </div><div class='ctx'> 	if (opt_run_test == RUN_ALL_TESTS)</div><div class='del'>-		nb_tests = ARRAY_SIZE(tests);</div><div class='add'>+		nb_tests = total_tests;</div><div class='ctx'> 	else</div><div class='ctx'> 		nb_tests = 1;</div><div class='ctx'> 	if (opt_mode == TEST_MODE_ALL) {</div><div class='hunk'>@@ -2720,11 +422,15 @@ int main(int argc, char **argv)</div><div class='ctx'> 		if (opt_mode != TEST_MODE_ALL &amp;&amp; i != opt_mode)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; ARRAY_SIZE(tests); j++) {</div><div class='add'>+		for (j = 0; j &lt; total_tests; j++) {</div><div class='ctx'> 			if (opt_run_test != RUN_ALL_TESTS &amp;&amp; j != opt_run_test)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			test_spec_init(&amp;test, ifobj_tx, ifobj_rx, i, &amp;tests[j]);</div><div class='add'>+			if (j &lt; ARRAY_SIZE(tests))</div><div class='add'>+				test_init(&amp;test, ifobj_tx, ifobj_rx, i, &amp;tests[j]);</div><div class='add'>+			else</div><div class='add'>+				test_init(&amp;test, ifobj_tx, ifobj_rx, i,</div><div class='add'>+					  &amp;ci_skip_tests[j - ARRAY_SIZE(tests)]);</div><div class='ctx'> 			run_pkt_test(&amp;test);</div><div class='ctx'> 			usleep(USLEEP_MAX);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/bpf/xskxceiver.h b/tools/testing/selftests/bpf/xskxceiver.h<br/>index e46e823f6a1a..3ca518df23ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xskxceiver.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/bpf/xskxceiver.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/bpf/xskxceiver.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/bpf/xskxceiver.h</a></div><div class='hunk'>@@ -22,166 +22,13 @@</div><div class='ctx'> #define PF_XDP AF_XDP</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef SO_BUSY_POLL_BUDGET</div><div class='del'>-#define SO_BUSY_POLL_BUDGET 70</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef SO_PREFER_BUSY_POLL</div><div class='del'>-#define SO_PREFER_BUSY_POLL 69</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define TEST_PASS 0</div><div class='del'>-#define TEST_FAILURE -1</div><div class='del'>-#define TEST_CONTINUE 1</div><div class='del'>-#define TEST_SKIP 2</div><div class='del'>-#define MAX_INTERFACES 2</div><div class='del'>-#define MAX_INTERFACE_NAME_CHARS 16</div><div class='del'>-#define MAX_TEST_NAME_SIZE 48</div><div class='ctx'> #define MAX_TEARDOWN_ITER 10</div><div class='del'>-#define PKT_HDR_SIZE (sizeof(struct ethhdr) + 2) /* Just to align the data in the packet */</div><div class='del'>-#define MIN_PKT_SIZE 64</div><div class='del'>-#define MAX_ETH_PKT_SIZE 1518</div><div class='ctx'> #define MAX_ETH_JUMBO_SIZE 9000</div><div class='del'>-#define USLEEP_MAX 10000</div><div class='ctx'> #define SOCK_RECONF_CTR 10</div><div class='del'>-#define DEFAULT_BATCH_SIZE 64</div><div class='del'>-#define POLL_TMOUT 1000</div><div class='del'>-#define THREAD_TMOUT 3</div><div class='del'>-#define DEFAULT_PKT_CNT (4 * 1024)</div><div class='del'>-#define DEFAULT_UMEM_BUFFERS (DEFAULT_PKT_CNT / 4)</div><div class='ctx'> #define RX_FULL_RXQSIZE 32</div><div class='ctx'> #define UMEM_HEADROOM_TEST_SIZE 128</div><div class='ctx'> #define XSK_UMEM__INVALID_FRAME_SIZE (MAX_ETH_JUMBO_SIZE + 1)</div><div class='del'>-#define XSK_UMEM__LARGE_FRAME_SIZE (3 * 1024)</div><div class='del'>-#define XSK_UMEM__MAX_FRAME_SIZE (4 * 1024)</div><div class='del'>-#define XSK_DESC__INVALID_OPTION (0xffff)</div><div class='del'>-#define HUGEPAGE_SIZE (2 * 1024 * 1024)</div><div class='del'>-#define PKT_DUMP_NB_TO_PRINT 16</div><div class='ctx'> #define RUN_ALL_TESTS UINT_MAX</div><div class='ctx'> #define NUM_MAC_ADDRESSES 4</div><div class='ctx'> </div><div class='del'>-#define print_verbose(x...) do { if (opt_verbose) ksft_print_msg(x); } while (0)</div><div class='del'>-</div><div class='del'>-enum test_mode {</div><div class='del'>-	TEST_MODE_SKB,</div><div class='del'>-	TEST_MODE_DRV,</div><div class='del'>-	TEST_MODE_ZC,</div><div class='del'>-	TEST_MODE_ALL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct xsk_umem_info {</div><div class='del'>-	struct xsk_ring_prod fq;</div><div class='del'>-	struct xsk_ring_cons cq;</div><div class='del'>-	struct xsk_umem *umem;</div><div class='del'>-	u64 next_buffer;</div><div class='del'>-	u32 num_frames;</div><div class='del'>-	u32 frame_headroom;</div><div class='del'>-	void *buffer;</div><div class='del'>-	u32 frame_size;</div><div class='del'>-	u32 base_addr;</div><div class='del'>-	u32 fill_size;</div><div class='del'>-	u32 comp_size;</div><div class='del'>-	bool unaligned_mode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct xsk_socket_info {</div><div class='del'>-	struct xsk_ring_cons rx;</div><div class='del'>-	struct xsk_ring_prod tx;</div><div class='del'>-	struct xsk_umem_info *umem;</div><div class='del'>-	struct xsk_socket *xsk;</div><div class='del'>-	struct pkt_stream *pkt_stream;</div><div class='del'>-	u32 outstanding_tx;</div><div class='del'>-	u32 rxqsize;</div><div class='del'>-	u32 batch_size;</div><div class='del'>-	u8 dst_mac[ETH_ALEN];</div><div class='del'>-	u8 src_mac[ETH_ALEN];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pkt {</div><div class='del'>-	int offset;</div><div class='del'>-	u32 len;</div><div class='del'>-	u32 pkt_nb;</div><div class='del'>-	bool valid;</div><div class='del'>-	u16 options;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pkt_stream {</div><div class='del'>-	u32 nb_pkts;</div><div class='del'>-	u32 current_pkt_nb;</div><div class='del'>-	struct pkt *pkts;</div><div class='del'>-	u32 max_pkt_len;</div><div class='del'>-	u32 nb_rx_pkts;</div><div class='del'>-	u32 nb_valid_entries;</div><div class='del'>-	bool verbatim;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct set_hw_ring {</div><div class='del'>-	u32 default_tx;</div><div class='del'>-	u32 default_rx;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ifobject;</div><div class='del'>-struct test_spec;</div><div class='del'>-typedef int (*validation_func_t)(struct ifobject *ifobj);</div><div class='del'>-typedef void *(*thread_func_t)(void *arg);</div><div class='del'>-typedef int (*test_func_t)(struct test_spec *test);</div><div class='del'>-</div><div class='del'>-struct ifobject {</div><div class='del'>-	char ifname[MAX_INTERFACE_NAME_CHARS];</div><div class='del'>-	struct xsk_socket_info *xsk;</div><div class='del'>-	struct xsk_socket_info *xsk_arr;</div><div class='del'>-	struct xsk_umem_info *umem;</div><div class='del'>-	thread_func_t func_ptr;</div><div class='del'>-	validation_func_t validation_func;</div><div class='del'>-	struct xsk_xdp_progs *xdp_progs;</div><div class='del'>-	struct bpf_map *xskmap;</div><div class='del'>-	struct bpf_program *xdp_prog;</div><div class='del'>-	struct ethtool_ringparam ring;</div><div class='del'>-	struct set_hw_ring set_ring;</div><div class='del'>-	enum test_mode mode;</div><div class='del'>-	int ifindex;</div><div class='del'>-	int mtu;</div><div class='del'>-	u32 bind_flags;</div><div class='del'>-	u32 xdp_zc_max_segs;</div><div class='del'>-	bool tx_on;</div><div class='del'>-	bool rx_on;</div><div class='del'>-	bool use_poll;</div><div class='del'>-	bool busy_poll;</div><div class='del'>-	bool use_fill_ring;</div><div class='del'>-	bool release_rx;</div><div class='del'>-	bool shared_umem;</div><div class='del'>-	bool use_metadata;</div><div class='del'>-	bool unaligned_supp;</div><div class='del'>-	bool multi_buff_supp;</div><div class='del'>-	bool multi_buff_zc_supp;</div><div class='del'>-	bool hw_ring_size_supp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct test_spec {</div><div class='del'>-	struct ifobject *ifobj_tx;</div><div class='del'>-	struct ifobject *ifobj_rx;</div><div class='del'>-	struct pkt_stream *tx_pkt_stream_default;</div><div class='del'>-	struct pkt_stream *rx_pkt_stream_default;</div><div class='del'>-	struct bpf_program *xdp_prog_rx;</div><div class='del'>-	struct bpf_program *xdp_prog_tx;</div><div class='del'>-	struct bpf_map *xskmap_rx;</div><div class='del'>-	struct bpf_map *xskmap_tx;</div><div class='del'>-	test_func_t test_func;</div><div class='del'>-	int mtu;</div><div class='del'>-	u16 total_steps;</div><div class='del'>-	u16 current_step;</div><div class='del'>-	u16 nb_sockets;</div><div class='del'>-	bool fail;</div><div class='del'>-	bool set_ring;</div><div class='del'>-	enum test_mode mode;</div><div class='del'>-	char name[MAX_TEST_NAME_SIZE];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-pthread_barrier_t barr;</div><div class='del'>-pthread_mutex_t pacing_mutex = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-</div><div class='del'>-int pkts_in_flight;</div><div class='del'>-</div><div class='del'>-static const u8 g_mac[ETH_ALEN] = {0x55, 0x44, 0x33, 0x22, 0x11, 0x00};</div><div class='del'>-</div><div class='ctx'> #endif				/* XSKXCEIVER_H_ */</div><div class='head'>diff --git a/tools/testing/selftests/breakpoints/breakpoint_test.c b/tools/testing/selftests/breakpoints/breakpoint_test.c<br/>index d46962a24724..1159d81890c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/breakpoints/breakpoint_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/breakpoints/breakpoint_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/breakpoints/breakpoint_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/breakpoints/breakpoint_test.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define COUNT_ISN_BPS	4</div><div class='ctx'> #define COUNT_WPS	4</div><div class='head'>diff --git a/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c b/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c<br/>index e7041816085a..5fc0f37f3fd4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/breakpoints/breakpoint_test_arm64.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/breakpoints/breakpoint_test_arm64.c</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;signal.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> static volatile uint8_t var[96] __attribute__((__aligned__(32)));</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/breakpoints/step_after_suspend_test.c b/tools/testing/selftests/breakpoints/step_after_suspend_test.c<br/>index 8d275f03e977..ca2aaab9e4ca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/breakpoints/step_after_suspend_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/breakpoints/step_after_suspend_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/breakpoints/step_after_suspend_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/breakpoints/step_after_suspend_test.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> void child(int cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -127,22 +127,42 @@ int run_test(int cpu)</div><div class='ctx'> 	return KSFT_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Reads the suspend success count from sysfs.</div><div class='add'>+ * Returns the count on success or exits on failure.</div><div class='add'>+ */</div><div class='add'>+static int get_suspend_success_count_or_fail(void)</div><div class='add'>+{</div><div class='add'>+	FILE *fp;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	fp = fopen("/sys/power/suspend_stats/success", "r");</div><div class='add'>+	if (!fp)</div><div class='add'>+		ksft_exit_fail_msg(</div><div class='add'>+			"Failed to open suspend_stats/success: %s\n",</div><div class='add'>+			strerror(errno));</div><div class='add'>+</div><div class='add'>+	if (fscanf(fp, "%d", &amp;val) != 1) {</div><div class='add'>+		fclose(fp);</div><div class='add'>+		ksft_exit_fail_msg(</div><div class='add'>+			"Failed to read suspend success count\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fclose(fp);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void suspend(void)</div><div class='ctx'> {</div><div class='del'>-	int power_state_fd;</div><div class='ctx'> 	int timerfd;</div><div class='ctx'> 	int err;</div><div class='add'>+	int count_before;</div><div class='add'>+	int count_after;</div><div class='ctx'> 	struct itimerspec spec = {};</div><div class='ctx'> </div><div class='ctx'> 	if (getuid() != 0)</div><div class='ctx'> 		ksft_exit_skip("Please run the test as root - Exiting.\n");</div><div class='ctx'> </div><div class='del'>-	power_state_fd = open("/sys/power/state", O_RDWR);</div><div class='del'>-	if (power_state_fd &lt; 0)</div><div class='del'>-		ksft_exit_fail_msg(</div><div class='del'>-			"open(\"/sys/power/state\") failed %s)\n",</div><div class='del'>-			strerror(errno));</div><div class='del'>-</div><div class='ctx'> 	timerfd = timerfd_create(CLOCK_BOOTTIME_ALARM, 0);</div><div class='ctx'> 	if (timerfd &lt; 0)</div><div class='ctx'> 		ksft_exit_fail_msg("timerfd_create() failed\n");</div><div class='hunk'>@@ -152,14 +172,15 @@ void suspend(void)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		ksft_exit_fail_msg("timerfd_settime() failed\n");</div><div class='ctx'> </div><div class='add'>+	count_before = get_suspend_success_count_or_fail();</div><div class='add'>+</div><div class='ctx'> 	system("(echo mem &gt; /sys/power/state) 2&gt; /dev/null");</div><div class='ctx'> </div><div class='del'>-	timerfd_gettime(timerfd, &amp;spec);</div><div class='del'>-	if (spec.it_value.tv_sec != 0 || spec.it_value.tv_nsec != 0)</div><div class='add'>+	count_after = get_suspend_success_count_or_fail();</div><div class='add'>+	if (count_after &lt;= count_before)</div><div class='ctx'> 		ksft_exit_fail_msg("Failed to enter Suspend state\n");</div><div class='ctx'> </div><div class='ctx'> 	close(timerfd);</div><div class='del'>-	close(power_state_fd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char **argv)</div><div class='head'>diff --git a/tools/testing/selftests/cachestat/.gitignore b/tools/testing/selftests/cachestat/.gitignore<br/>index d6c30b43a4bb..abbb13b6e96b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cachestat/.gitignore?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cachestat/.gitignore</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cachestat/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cachestat/.gitignore</a></div><div class='hunk'>@@ -1,2 +1,3 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> test_cachestat</div><div class='add'>+tmpshmcstat</div><div class='head'>diff --git a/tools/testing/selftests/cachestat/test_cachestat.c b/tools/testing/selftests/cachestat/test_cachestat.c<br/>index 632ab44737ec..542cd09cb443 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cachestat/test_cachestat.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cachestat/test_cachestat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cachestat/test_cachestat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cachestat/test_cachestat.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define NR_TESTS	9</div><div class='ctx'> </div><div class='hunk'>@@ -33,6 +33,11 @@ void print_cachestat(struct cachestat *cs)</div><div class='ctx'> 	cs-&gt;nr_evicted, cs-&gt;nr_recently_evicted);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum file_type {</div><div class='add'>+	FILE_MMAP,</div><div class='add'>+	FILE_SHMEM</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> bool write_exactly(int fd, size_t filesize)</div><div class='ctx'> {</div><div class='ctx'> 	int random_fd = open("/dev/urandom", O_RDONLY);</div><div class='hunk'>@@ -201,38 +206,73 @@ out1:</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+const char *file_type_str(enum file_type type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case FILE_SHMEM:</div><div class='add'>+		return "shmem";</div><div class='add'>+	case FILE_MMAP:</div><div class='add'>+		return "mmap";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-bool test_cachestat_shmem(void)</div><div class='add'>+</div><div class='add'>+bool run_cachestat_test(enum file_type type)</div><div class='ctx'> {</div><div class='ctx'> 	size_t PS = sysconf(_SC_PAGESIZE);</div><div class='ctx'> 	size_t filesize = PS * 512 * 2; /* 2 2MB huge pages */</div><div class='ctx'> 	int syscall_ret;</div><div class='ctx'> 	size_t compute_len = PS * 512;</div><div class='ctx'> 	struct cachestat_range cs_range = { PS, compute_len };</div><div class='del'>-	char *filename = "tmpshmcstat";</div><div class='add'>+	char *filename = "tmpshmcstat", *map;</div><div class='ctx'> 	struct cachestat cs;</div><div class='ctx'> 	bool ret = true;</div><div class='add'>+	int fd;</div><div class='ctx'> 	unsigned long num_pages = compute_len / PS;</div><div class='del'>-	int fd = shm_open(filename, O_CREAT | O_RDWR, 0600);</div><div class='add'>+	if (type == FILE_SHMEM)</div><div class='add'>+		fd = shm_open(filename, O_CREAT | O_RDWR, 0600);</div><div class='add'>+	else</div><div class='add'>+		fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, 0666);</div><div class='ctx'> </div><div class='ctx'> 	if (fd &lt; 0) {</div><div class='del'>-		ksft_print_msg("Unable to create shmem file.\n");</div><div class='add'>+		ksft_print_msg("Unable to create %s file.\n",</div><div class='add'>+				file_type_str(type));</div><div class='ctx'> 		ret = false;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ftruncate(fd, filesize)) {</div><div class='del'>-		ksft_print_msg("Unable to truncate shmem file.\n");</div><div class='add'>+		ksft_print_msg("Unable to truncate %s file.\n",file_type_str(type));</div><div class='ctx'> 		ret = false;</div><div class='ctx'> 		goto close_fd;</div><div class='ctx'> 	}</div><div class='add'>+	switch (type) {</div><div class='add'>+	case FILE_SHMEM:</div><div class='add'>+		if (!write_exactly(fd, filesize)) {</div><div class='add'>+			ksft_print_msg("Unable to write to file.\n");</div><div class='add'>+			ret = false;</div><div class='add'>+			goto close_fd;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case FILE_MMAP:</div><div class='add'>+		map = mmap(NULL, filesize, PROT_READ | PROT_WRITE,</div><div class='add'>+				 MAP_SHARED, fd, 0);</div><div class='ctx'> </div><div class='del'>-	if (!write_exactly(fd, filesize)) {</div><div class='del'>-		ksft_print_msg("Unable to write to shmem file.\n");</div><div class='add'>+		if (map == MAP_FAILED) {</div><div class='add'>+			ksft_print_msg("mmap failed.\n");</div><div class='add'>+			ret = false;</div><div class='add'>+			goto close_fd;</div><div class='add'>+		}</div><div class='add'>+		for (int i = 0; i &lt; filesize; i++)</div><div class='add'>+			map[i] = 'A';</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ksft_print_msg("Unsupported file type.\n");</div><div class='ctx'> 		ret = false;</div><div class='ctx'> 		goto close_fd;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	syscall_ret = syscall(__NR_cachestat, fd, &amp;cs_range, &amp;cs, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (syscall_ret) {</div><div class='hunk'>@@ -308,12 +348,18 @@ int main(void)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_cachestat_shmem())</div><div class='add'>+	if (run_cachestat_test(FILE_SHMEM))</div><div class='ctx'> 		ksft_test_result_pass("cachestat works with a shmem file\n");</div><div class='ctx'> 	else {</div><div class='ctx'> 		ksft_test_result_fail("cachestat fails with a shmem file\n");</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (run_cachestat_test(FILE_MMAP))</div><div class='add'>+		ksft_test_result_pass("cachestat works with a mmap file\n");</div><div class='add'>+	else {</div><div class='add'>+		ksft_test_result_fail("cachestat fails with a mmap file\n");</div><div class='add'>+		ret = 1;</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/capabilities/test_execve.c b/tools/testing/selftests/capabilities/test_execve.c<br/>index 47bad7ddc5bc..46fc8d46b6e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/capabilities/test_execve.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/capabilities/test_execve.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/capabilities/test_execve.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/capabilities/test_execve.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;sys/prctl.h&gt;</div><div class='ctx'> #include &lt;sys/stat.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> static int nerrs;</div><div class='ctx'> static pid_t mpid;	/*  main() pid is used to avoid duplicate test counts */</div><div class='head'>diff --git a/tools/testing/selftests/capabilities/validate_cap.c b/tools/testing/selftests/capabilities/validate_cap.c<br/>index 65f2a1c89239..cef1d9937b9f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/capabilities/validate_cap.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/capabilities/validate_cap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/capabilities/validate_cap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/capabilities/validate_cap.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;sys/prctl.h&gt;</div><div class='ctx'> #include &lt;sys/auxv.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #if __GLIBC__ &gt; 2 || (__GLIBC__ == 2 &amp;&amp; __GLIBC_MINOR__ &gt;= 19)</div><div class='ctx'> # define HAVE_GETAUXVAL</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/Makefile b/tools/testing/selftests/cgroup/Makefile<br/>index 1b897152bab6..e01584c2189a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/Makefile</a></div><div class='hunk'>@@ -21,14 +21,15 @@ TEST_GEN_PROGS += test_zswap</div><div class='ctx'> LOCAL_HDRS += $(selfdir)/clone3/clone3_selftests.h $(selfdir)/pidfd/pidfd.h</div><div class='ctx'> </div><div class='ctx'> include ../lib.mk</div><div class='add'>+include lib/libcgroup.mk</div><div class='ctx'> </div><div class='del'>-$(OUTPUT)/test_core: cgroup_util.c</div><div class='del'>-$(OUTPUT)/test_cpu: cgroup_util.c</div><div class='del'>-$(OUTPUT)/test_cpuset: cgroup_util.c</div><div class='del'>-$(OUTPUT)/test_freezer: cgroup_util.c</div><div class='del'>-$(OUTPUT)/test_hugetlb_memcg: cgroup_util.c</div><div class='del'>-$(OUTPUT)/test_kill: cgroup_util.c</div><div class='del'>-$(OUTPUT)/test_kmem: cgroup_util.c</div><div class='del'>-$(OUTPUT)/test_memcontrol: cgroup_util.c</div><div class='del'>-$(OUTPUT)/test_pids: cgroup_util.c</div><div class='del'>-$(OUTPUT)/test_zswap: cgroup_util.c</div><div class='add'>+$(OUTPUT)/test_core: $(LIBCGROUP_O)</div><div class='add'>+$(OUTPUT)/test_cpu: $(LIBCGROUP_O)</div><div class='add'>+$(OUTPUT)/test_cpuset: $(LIBCGROUP_O)</div><div class='add'>+$(OUTPUT)/test_freezer: $(LIBCGROUP_O)</div><div class='add'>+$(OUTPUT)/test_hugetlb_memcg: $(LIBCGROUP_O)</div><div class='add'>+$(OUTPUT)/test_kill: $(LIBCGROUP_O)</div><div class='add'>+$(OUTPUT)/test_kmem: $(LIBCGROUP_O)</div><div class='add'>+$(OUTPUT)/test_memcontrol: $(LIBCGROUP_O)</div><div class='add'>+$(OUTPUT)/test_pids: $(LIBCGROUP_O)</div><div class='add'>+$(OUTPUT)/test_zswap: $(LIBCGROUP_O)</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/cgroup_util.c b/tools/testing/selftests/cgroup/lib/cgroup_util.c<br/>index 1e2d46636a0c..44c52f620fda 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/cgroup_util.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/cgroup_util.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/lib/cgroup_util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/lib/cgroup_util.c</a></div><div class='hunk'>@@ -17,10 +17,12 @@</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cgroup_util.h"</div><div class='del'>-#include "../clone3/clone3_selftests.h"</div><div class='add'>+#include "../../clone3/clone3_selftests.h"</div><div class='add'>+</div><div class='add'>+bool cg_test_v1_named;</div><div class='ctx'> </div><div class='ctx'> /* Returns read len on success, or -errno on failure. */</div><div class='del'>-static ssize_t read_text(const char *path, char *buf, size_t max_len)</div><div class='add'>+ssize_t read_text(const char *path, char *buf, size_t max_len)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t len;</div><div class='ctx'> 	int fd;</div><div class='hunk'>@@ -39,7 +41,7 @@ static ssize_t read_text(const char *path, char *buf, size_t max_len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns written len on success, or -errno on failure. */</div><div class='del'>-static ssize_t write_text(const char *path, char *buf, ssize_t len)</div><div class='add'>+ssize_t write_text(const char *path, char *buf, ssize_t len)</div><div class='ctx'> {</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='hunk'>@@ -217,7 +219,8 @@ int cg_write_numeric(const char *cgroup, const char *control, long value)</div><div class='ctx'> 	return cg_write(cgroup, control, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cg_find_unified_root(char *root, size_t len, bool *nsdelegate)</div><div class='add'>+static int cg_find_root(char *root, size_t len, const char *controller,</div><div class='add'>+			bool *nsdelegate)</div><div class='ctx'> {</div><div class='ctx'> 	char buf[10 * PAGE_SIZE];</div><div class='ctx'> 	char *fs, *mount, *type, *options;</div><div class='hunk'>@@ -236,18 +239,37 @@ int cg_find_unified_root(char *root, size_t len, bool *nsdelegate)</div><div class='ctx'> 		options = strtok(NULL, delim);</div><div class='ctx'> 		strtok(NULL, delim);</div><div class='ctx'> 		strtok(NULL, delim);</div><div class='del'>-</div><div class='del'>-		if (strcmp(type, "cgroup2") == 0) {</div><div class='del'>-			strncpy(root, mount, len);</div><div class='del'>-			if (nsdelegate)</div><div class='del'>-				*nsdelegate = !!strstr(options, "nsdelegate");</div><div class='del'>-			return 0;</div><div class='add'>+		if (strcmp(type, "cgroup") == 0) {</div><div class='add'>+			if (!controller || !strstr(options, controller))</div><div class='add'>+				continue;</div><div class='add'>+		} else if (strcmp(type, "cgroup2") == 0) {</div><div class='add'>+			if (controller &amp;&amp;</div><div class='add'>+					cg_read_strstr(mount, "cgroup.controllers", controller))</div><div class='add'>+				continue;</div><div class='add'>+		} else {</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='add'>+		strncpy(root, mount, len);</div><div class='add'>+</div><div class='add'>+		if (nsdelegate)</div><div class='add'>+			*nsdelegate = !!strstr(options, "nsdelegate");</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int cg_find_controller_root(char *root, size_t len, const char *controller)</div><div class='add'>+{</div><div class='add'>+	return cg_find_root(root, len, controller, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cg_find_unified_root(char *root, size_t len, bool *nsdelegate)</div><div class='add'>+{</div><div class='add'>+	return cg_find_root(root, len, NULL, nsdelegate);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int cg_create(const char *cgroup)</div><div class='ctx'> {</div><div class='ctx'> 	return mkdir(cgroup, 0755);</div><div class='hunk'>@@ -341,7 +363,7 @@ int cg_enter_current(const char *cgroup)</div><div class='ctx'> </div><div class='ctx'> int cg_enter_current_thread(const char *cgroup)</div><div class='ctx'> {</div><div class='del'>-	return cg_write(cgroup, "cgroup.threads", "0");</div><div class='add'>+	return cg_write(cgroup, CG_THREADS_FILE, "0");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cg_run(const char *cgroup,</div><div class='hunk'>@@ -488,94 +510,28 @@ int cg_run_nowait(const char *cgroup,</div><div class='ctx'> 	return pid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int get_temp_fd(void)</div><div class='del'>-{</div><div class='del'>-	return open(".", O_TMPFILE | O_RDWR | O_EXCL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int alloc_pagecache(int fd, size_t size)</div><div class='del'>-{</div><div class='del'>-	char buf[PAGE_SIZE];</div><div class='del'>-	struct stat st;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (fstat(fd, &amp;st))</div><div class='del'>-		goto cleanup;</div><div class='del'>-</div><div class='del'>-	size += st.st_size;</div><div class='del'>-</div><div class='del'>-	if (ftruncate(fd, size))</div><div class='del'>-		goto cleanup;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; size; i += sizeof(buf))</div><div class='del'>-		read(fd, buf, sizeof(buf));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-cleanup:</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int alloc_anon(const char *cgroup, void *arg)</div><div class='add'>+int proc_mount_contains(const char *option)</div><div class='ctx'> {</div><div class='del'>-	size_t size = (unsigned long)arg;</div><div class='del'>-	char *buf, *ptr;</div><div class='add'>+	char buf[4 * PAGE_SIZE];</div><div class='add'>+	ssize_t read;</div><div class='ctx'> </div><div class='del'>-	buf = malloc(size);</div><div class='del'>-	for (ptr = buf; ptr &lt; buf + size; ptr += PAGE_SIZE)</div><div class='del'>-		*ptr = 0;</div><div class='add'>+	read = read_text("/proc/mounts", buf, sizeof(buf));</div><div class='add'>+	if (read &lt; 0)</div><div class='add'>+		return read;</div><div class='ctx'> </div><div class='del'>-	free(buf);</div><div class='del'>-	return 0;</div><div class='add'>+	return strstr(buf, option) != NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int is_swap_enabled(void)</div><div class='add'>+int cgroup_feature(const char *feature)</div><div class='ctx'> {</div><div class='ctx'> 	char buf[PAGE_SIZE];</div><div class='del'>-	const char delim[] = "\n";</div><div class='del'>-	int cnt = 0;</div><div class='del'>-	char *line;</div><div class='del'>-</div><div class='del'>-	if (read_text("/proc/swaps", buf, sizeof(buf)) &lt;= 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	for (line = strtok(buf, delim); line; line = strtok(NULL, delim))</div><div class='del'>-		cnt++;</div><div class='del'>-</div><div class='del'>-	return cnt &gt; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int set_oom_adj_score(int pid, int score)</div><div class='del'>-{</div><div class='del'>-	char path[PATH_MAX];</div><div class='del'>-	int fd, len;</div><div class='del'>-</div><div class='del'>-	sprintf(path, "/proc/%d/oom_score_adj", pid);</div><div class='del'>-</div><div class='del'>-	fd = open(path, O_WRONLY | O_APPEND);</div><div class='del'>-	if (fd &lt; 0)</div><div class='del'>-		return fd;</div><div class='del'>-</div><div class='del'>-	len = dprintf(fd, "%d", score);</div><div class='del'>-	if (len &lt; 0) {</div><div class='del'>-		close(fd);</div><div class='del'>-		return len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	close(fd);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int proc_mount_contains(const char *option)</div><div class='del'>-{</div><div class='del'>-	char buf[4 * PAGE_SIZE];</div><div class='ctx'> 	ssize_t read;</div><div class='ctx'> </div><div class='del'>-	read = read_text("/proc/mounts", buf, sizeof(buf));</div><div class='add'>+	read = read_text("/sys/kernel/cgroup/features", buf, sizeof(buf));</div><div class='ctx'> 	if (read &lt; 0)</div><div class='ctx'> 		return read;</div><div class='ctx'> </div><div class='del'>-	return strstr(buf, option) != NULL;</div><div class='add'>+	return strstr(buf, feature) != NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t proc_read_text(int pid, bool thread, const char *item, char *buf, size_t size)</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/cgroup_util.h b/tools/testing/selftests/cgroup/lib/include/cgroup_util.h<br/>index 19b131ee7707..7ab2824ed7b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/cgroup_util.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/cgroup_util.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/lib/include/cgroup_util.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/lib/include/cgroup_util.h</a></div><div class='hunk'>@@ -2,9 +2,9 @@</div><div class='ctx'> #include &lt;stdbool.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='del'>-</div><div class='add'>+#ifndef PAGE_SIZE</div><div class='ctx'> #define PAGE_SIZE 4096</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define MB(x) (x &lt;&lt; 20)</div><div class='ctx'> </div><div class='hunk'>@@ -13,6 +13,10 @@</div><div class='ctx'> </div><div class='ctx'> #define TEST_UID	65534 /* usually nobody, any !root is fine */</div><div class='ctx'> </div><div class='add'>+#define CG_THREADS_FILE (!cg_test_v1_named ? "cgroup.threads" : "tasks")</div><div class='add'>+#define CG_NAMED_NAME "selftest"</div><div class='add'>+#define CG_PATH_FORMAT (!cg_test_v1_named ? "0::%s" : (":name=" CG_NAMED_NAME ":%s"))</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Checks if two given values differ by less than err% of their sum.</div><div class='ctx'>  */</div><div class='hunk'>@@ -21,6 +25,30 @@ static inline int values_close(long a, long b, int err)</div><div class='ctx'> 	return labs(a - b) &lt;= (a + b) / 100 * err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Checks if two given values differ by less than err% of their sum and assert</div><div class='add'>+ * with detailed debug info if not.</div><div class='add'>+ */</div><div class='add'>+static inline int values_close_report(long a, long b, int err)</div><div class='add'>+{</div><div class='add'>+	long diff  = labs(a - b);</div><div class='add'>+	long limit = (a + b) / 100 * err;</div><div class='add'>+	double actual_err = (a + b) ? (100.0 * diff / (a + b)) : 0.0;</div><div class='add'>+	int close = diff &lt;= limit;</div><div class='add'>+</div><div class='add'>+	if (!close)</div><div class='add'>+		fprintf(stderr,</div><div class='add'>+			"[FAIL] actual=%ld expected=%ld | diff=%ld | limit=%ld | "</div><div class='add'>+			"tolerance=%d%% | actual_error=%.2f%%\n",</div><div class='add'>+			a, b, diff, limit, err, actual_err);</div><div class='add'>+</div><div class='add'>+	return close;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern ssize_t read_text(const char *path, char *buf, size_t max_len);</div><div class='add'>+extern ssize_t write_text(const char *path, char *buf, ssize_t len);</div><div class='add'>+</div><div class='add'>+extern int cg_find_controller_root(char *root, size_t len, const char *controller);</div><div class='ctx'> extern int cg_find_unified_root(char *root, size_t len, bool *nsdelegate);</div><div class='ctx'> extern char *cg_name(const char *root, const char *name);</div><div class='ctx'> extern char *cg_name_indexed(const char *root, const char *name, int index);</div><div class='hunk'>@@ -49,14 +77,10 @@ extern int cg_enter_current_thread(const char *cgroup);</div><div class='ctx'> extern int cg_run_nowait(const char *cgroup,</div><div class='ctx'> 			 int (*fn)(const char *cgroup, void *arg),</div><div class='ctx'> 			 void *arg);</div><div class='del'>-extern int get_temp_fd(void);</div><div class='del'>-extern int alloc_pagecache(int fd, size_t size);</div><div class='del'>-extern int alloc_anon(const char *cgroup, void *arg);</div><div class='del'>-extern int is_swap_enabled(void);</div><div class='del'>-extern int set_oom_adj_score(int pid, int score);</div><div class='ctx'> extern int cg_wait_for_proc_count(const char *cgroup, int count);</div><div class='ctx'> extern int cg_killall(const char *cgroup);</div><div class='ctx'> int proc_mount_contains(const char *option);</div><div class='add'>+int cgroup_feature(const char *feature);</div><div class='ctx'> extern ssize_t proc_read_text(int pid, bool thread, const char *item, char *buf, size_t size);</div><div class='ctx'> extern int proc_read_strstr(int pid, bool thread, const char *item, const char *needle);</div><div class='ctx'> extern pid_t clone_into_cgroup(int cgroup_fd);</div><div class='hunk'>@@ -66,3 +90,4 @@ extern int dirfd_open_opath(const char *dir);</div><div class='ctx'> extern int cg_prepare_for_wait(const char *cgroup);</div><div class='ctx'> extern int memcg_prepare_for_wait(const char *cgroup);</div><div class='ctx'> extern int cg_wait_for(int fd);</div><div class='add'>+extern bool cg_test_v1_named;</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/lib/libcgroup.mk b/tools/testing/selftests/cgroup/lib/libcgroup.mk<br/>new file mode 100644<br/>index 000000000000..7a73007204c3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/lib/libcgroup.mk?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/lib/libcgroup.mk</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+CGROUP_DIR := $(selfdir)/cgroup</div><div class='add'>+</div><div class='add'>+LIBCGROUP_C := lib/cgroup_util.c</div><div class='add'>+</div><div class='add'>+LIBCGROUP_O := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBCGROUP_C))</div><div class='add'>+</div><div class='add'>+LIBCGROUP_O_DIRS := $(shell dirname $(LIBCGROUP_O) | uniq)</div><div class='add'>+</div><div class='add'>+CFLAGS += -I$(CGROUP_DIR)/lib/include</div><div class='add'>+</div><div class='add'>+EXTRA_HDRS := $(selfdir)/clone3/clone3_selftests.h</div><div class='add'>+</div><div class='add'>+$(LIBCGROUP_O_DIRS):</div><div class='add'>+	mkdir -p $@</div><div class='add'>+</div><div class='add'>+$(LIBCGROUP_O): $(OUTPUT)/%.o : $(CGROUP_DIR)/%.c $(EXTRA_HDRS) $(LIBCGROUP_O_DIRS)</div><div class='add'>+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $&lt; -o $@</div><div class='add'>+</div><div class='add'>+EXTRA_CLEAN += $(LIBCGROUP_O)</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c<br/>index a5672a91d273..102262555a59 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_core.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/test_core.c</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='add'>+#include &lt;sys/mount.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='hunk'>@@ -15,10 +17,13 @@</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;pthread.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "cgroup_util.h"</div><div class='ctx'> </div><div class='ctx'> static bool nsdelegate;</div><div class='add'>+#ifndef CLONE_NEWCGROUP</div><div class='add'>+#define CLONE_NEWCGROUP 0</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int touch_anon(char *buf, size_t size)</div><div class='ctx'> {</div><div class='hunk'>@@ -148,6 +153,9 @@ static int test_cgcore_populated(const char *root)</div><div class='ctx'> 	int cgroup_fd = -EBADF;</div><div class='ctx'> 	pid_t pid;</div><div class='ctx'> </div><div class='add'>+	if (cg_test_v1_named)</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+</div><div class='ctx'> 	cg_test_a = cg_name(root, "cg_test_a");</div><div class='ctx'> 	cg_test_b = cg_name(root, "cg_test_a/cg_test_b");</div><div class='ctx'> 	cg_test_c = cg_name(root, "cg_test_a/cg_test_b/cg_test_c");</div><div class='hunk'>@@ -277,6 +285,9 @@ static int test_cgcore_invalid_domain(const char *root)</div><div class='ctx'> 	int ret = KSFT_FAIL;</div><div class='ctx'> 	char *grandparent = NULL, *parent = NULL, *child = NULL;</div><div class='ctx'> </div><div class='add'>+	if (cg_test_v1_named)</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+</div><div class='ctx'> 	grandparent = cg_name(root, "cg_test_grandparent");</div><div class='ctx'> 	parent = cg_name(root, "cg_test_grandparent/cg_test_parent");</div><div class='ctx'> 	child = cg_name(root, "cg_test_grandparent/cg_test_parent/cg_test_child");</div><div class='hunk'>@@ -339,6 +350,9 @@ static int test_cgcore_parent_becomes_threaded(const char *root)</div><div class='ctx'> 	int ret = KSFT_FAIL;</div><div class='ctx'> 	char *parent = NULL, *child = NULL;</div><div class='ctx'> </div><div class='add'>+	if (cg_test_v1_named)</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+</div><div class='ctx'> 	parent = cg_name(root, "cg_test_parent");</div><div class='ctx'> 	child = cg_name(root, "cg_test_parent/cg_test_child");</div><div class='ctx'> 	if (!parent || !child)</div><div class='hunk'>@@ -378,7 +392,8 @@ static int test_cgcore_no_internal_process_constraint_on_threads(const char *roo</div><div class='ctx'> 	int ret = KSFT_FAIL;</div><div class='ctx'> 	char *parent = NULL, *child = NULL;</div><div class='ctx'> </div><div class='del'>-	if (cg_read_strstr(root, "cgroup.controllers", "cpu") ||</div><div class='add'>+	if (cg_test_v1_named ||</div><div class='add'>+	    cg_read_strstr(root, "cgroup.controllers", "cpu") ||</div><div class='ctx'> 	    cg_write(root, "cgroup.subtree_control", "+cpu")) {</div><div class='ctx'> 		ret = KSFT_SKIP;</div><div class='ctx'> 		goto cleanup;</div><div class='hunk'>@@ -430,6 +445,9 @@ static int test_cgcore_top_down_constraint_enable(const char *root)</div><div class='ctx'> 	int ret = KSFT_FAIL;</div><div class='ctx'> 	char *parent = NULL, *child = NULL;</div><div class='ctx'> </div><div class='add'>+	if (cg_test_v1_named)</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+</div><div class='ctx'> 	parent = cg_name(root, "cg_test_parent");</div><div class='ctx'> 	child = cg_name(root, "cg_test_parent/cg_test_child");</div><div class='ctx'> 	if (!parent || !child)</div><div class='hunk'>@@ -465,6 +483,9 @@ static int test_cgcore_top_down_constraint_disable(const char *root)</div><div class='ctx'> 	int ret = KSFT_FAIL;</div><div class='ctx'> 	char *parent = NULL, *child = NULL;</div><div class='ctx'> </div><div class='add'>+	if (cg_test_v1_named)</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+</div><div class='ctx'> 	parent = cg_name(root, "cg_test_parent");</div><div class='ctx'> 	child = cg_name(root, "cg_test_parent/cg_test_child");</div><div class='ctx'> 	if (!parent || !child)</div><div class='hunk'>@@ -506,6 +527,9 @@ static int test_cgcore_internal_process_constraint(const char *root)</div><div class='ctx'> 	int ret = KSFT_FAIL;</div><div class='ctx'> 	char *parent = NULL, *child = NULL;</div><div class='ctx'> </div><div class='add'>+	if (cg_test_v1_named)</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+</div><div class='ctx'> 	parent = cg_name(root, "cg_test_parent");</div><div class='ctx'> 	child = cg_name(root, "cg_test_parent/cg_test_child");</div><div class='ctx'> 	if (!parent || !child)</div><div class='hunk'>@@ -573,7 +597,7 @@ static int test_cgcore_proc_migration(const char *root)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cg_enter_current(dst);</div><div class='del'>-	if (cg_read_lc(dst, "cgroup.threads") != n_threads + 1)</div><div class='add'>+	if (cg_read_lc(dst, CG_THREADS_FILE) != n_threads + 1)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	ret = KSFT_PASS;</div><div class='hunk'>@@ -605,7 +629,7 @@ static void *migrating_thread_fn(void *arg)</div><div class='ctx'> 	char lines[3][PATH_MAX];</div><div class='ctx'> </div><div class='ctx'> 	for (g = 1; g &lt; 3; ++g)</div><div class='del'>-		snprintf(lines[g], sizeof(lines[g]), "0::%s", grps[g] + strlen(grps[0]));</div><div class='add'>+		snprintf(lines[g], sizeof(lines[g]), CG_PATH_FORMAT, grps[g] + strlen(grps[0]));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; n_iterations; ++i) {</div><div class='ctx'> 		cg_enter_current_thread(grps[(i % 2) + 1]);</div><div class='hunk'>@@ -642,10 +666,12 @@ static int test_cgcore_thread_migration(const char *root)</div><div class='ctx'> 	if (cg_create(grps[2]))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	if (cg_write(grps[1], "cgroup.type", "threaded"))</div><div class='del'>-		goto cleanup;</div><div class='del'>-	if (cg_write(grps[2], "cgroup.type", "threaded"))</div><div class='del'>-		goto cleanup;</div><div class='add'>+	if (!cg_test_v1_named) {</div><div class='add'>+		if (cg_write(grps[1], "cgroup.type", "threaded"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+		if (cg_write(grps[2], "cgroup.type", "threaded"))</div><div class='add'>+			goto cleanup;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cg_enter_current(grps[1]))</div><div class='ctx'> 		goto cleanup;</div><div class='hunk'>@@ -659,7 +685,7 @@ static int test_cgcore_thread_migration(const char *root)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	snprintf(line, sizeof(line), "0::%s", grps[1] + strlen(grps[0]));</div><div class='add'>+	snprintf(line, sizeof(line), CG_PATH_FORMAT, grps[1] + strlen(grps[0]));</div><div class='ctx'> 	if (proc_read_strstr(0, 1, "cgroup", line))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='hunk'>@@ -842,6 +868,38 @@ cleanup:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int setup_named_v1_root(char *root, size_t len, const char *name)</div><div class='add'>+{</div><div class='add'>+	char options[PATH_MAX];</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = snprintf(root, len, "/mnt/cg_selftest");</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = snprintf(options, sizeof(options), "none,name=%s", name);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = mkdir(root, 0755);</div><div class='add'>+	if (r &lt; 0 &amp;&amp; errno != EEXIST)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = mount("none", root, "cgroup", 0, options);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup_named_v1_root(char *root)</div><div class='add'>+{</div><div class='add'>+	if (!cg_test_v1_named)</div><div class='add'>+		return;</div><div class='add'>+	umount(root);</div><div class='add'>+	rmdir(root);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define T(x) { x, #x }</div><div class='ctx'> struct corecg_test {</div><div class='ctx'> 	int (*fn)(const char *root);</div><div class='hunk'>@@ -865,15 +923,22 @@ struct corecg_test {</div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	char root[PATH_MAX];</div><div class='del'>-	int i, ret = EXIT_SUCCESS;</div><div class='del'>-</div><div class='del'>-	if (cg_find_unified_root(root, sizeof(root), &amp;nsdelegate))</div><div class='del'>-		ksft_exit_skip("cgroup v2 isn't mounted\n");</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ksft_print_header();</div><div class='add'>+	ksft_set_plan(ARRAY_SIZE(tests));</div><div class='add'>+	if (cg_find_unified_root(root, sizeof(root), &amp;nsdelegate)) {</div><div class='add'>+		if (setup_named_v1_root(root, sizeof(root), CG_NAMED_NAME))</div><div class='add'>+			ksft_exit_skip("cgroup v2 isn't mounted and could not setup named v1 hierarchy\n");</div><div class='add'>+		cg_test_v1_named = true;</div><div class='add'>+		goto post_v2_setup;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cg_read_strstr(root, "cgroup.subtree_control", "memory"))</div><div class='ctx'> 		if (cg_write(root, "cgroup.subtree_control", "+memory"))</div><div class='ctx'> 			ksft_exit_skip("Failed to set memory controller\n");</div><div class='ctx'> </div><div class='add'>+post_v2_setup:</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(tests); i++) {</div><div class='ctx'> 		switch (tests[i].fn(root)) {</div><div class='ctx'> 		case KSFT_PASS:</div><div class='hunk'>@@ -883,11 +948,11 @@ int main(int argc, char *argv[])</div><div class='ctx'> 			ksft_test_result_skip("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			ret = EXIT_FAILURE;</div><div class='ctx'> 			ksft_test_result_fail("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	cleanup_named_v1_root(root);</div><div class='add'>+	ksft_finished();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/test_cpu.c b/tools/testing/selftests/cgroup/test_cpu.c<br/>index a2b50af8e9ee..c83f05438d7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_cpu.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_cpu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_cpu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/test_cpu.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> </div><div class='ctx'> #define _GNU_SOURCE</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='add'>+#include &lt;sys/param.h&gt;</div><div class='ctx'> #include &lt;sys/sysinfo.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='hunk'>@@ -10,7 +11,7 @@</div><div class='ctx'> #include &lt;time.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "cgroup_util.h"</div><div class='ctx'> </div><div class='ctx'> enum hog_clock_type {</div><div class='hunk'>@@ -218,7 +219,7 @@ static int test_cpucg_stats(const char *root)</div><div class='ctx'> 	if (user_usec &lt;= 0)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	if (!values_close(usage_usec, expected_usage_usec, 1))</div><div class='add'>+	if (!values_close_report(usage_usec, expected_usage_usec, 1))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	ret = KSFT_PASS;</div><div class='hunk'>@@ -290,7 +291,7 @@ static int test_cpucg_nice(const char *root)</div><div class='ctx'> </div><div class='ctx'> 		user_usec = cg_read_key_long(cpucg, "cpu.stat", "user_usec");</div><div class='ctx'> 		nice_usec = cg_read_key_long(cpucg, "cpu.stat", "nice_usec");</div><div class='del'>-		if (!values_close(nice_usec, expected_nice_usec, 1))</div><div class='add'>+		if (!values_close_report(nice_usec, expected_nice_usec, 1))</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 		ret = KSFT_PASS;</div><div class='hunk'>@@ -403,7 +404,7 @@ overprovision_validate(const struct cpu_hogger *children, int num_children)</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 		delta = children[i + 1].usage - children[i].usage;</div><div class='del'>-		if (!values_close(delta, children[0].usage, 35))</div><div class='add'>+		if (!values_close_report(delta, children[0].usage, 35))</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -443,7 +444,7 @@ underprovision_validate(const struct cpu_hogger *children, int num_children)</div><div class='ctx'> 	int ret = KSFT_FAIL, i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_children - 1; i++) {</div><div class='del'>-		if (!values_close(children[i + 1].usage, children[0].usage, 15))</div><div class='add'>+		if (!values_close_report(children[i + 1].usage, children[0].usage, 15))</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -572,16 +573,16 @@ run_cpucg_nested_weight_test(const char *root, bool overprovisioned)</div><div class='ctx'> </div><div class='ctx'> 	nested_leaf_usage = leaf[1].usage + leaf[2].usage;</div><div class='ctx'> 	if (overprovisioned) {</div><div class='del'>-		if (!values_close(leaf[0].usage, nested_leaf_usage, 15))</div><div class='add'>+		if (!values_close_report(leaf[0].usage, nested_leaf_usage, 15))</div><div class='ctx'> 			goto cleanup;</div><div class='del'>-	} else if (!values_close(leaf[0].usage * 2, nested_leaf_usage, 15))</div><div class='add'>+	} else if (!values_close_report(leaf[0].usage * 2, nested_leaf_usage, 15))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	child_usage = cg_read_key_long(child, "cpu.stat", "usage_usec");</div><div class='ctx'> 	if (child_usage &lt;= 0)</div><div class='ctx'> 		goto cleanup;</div><div class='del'>-	if (!values_close(child_usage, nested_leaf_usage, 1))</div><div class='add'>+	if (!values_close_report(child_usage, nested_leaf_usage, 1))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	ret = KSFT_PASS;</div><div class='hunk'>@@ -645,10 +646,16 @@ test_cpucg_nested_weight_underprovisioned(const char *root)</div><div class='ctx'> static int test_cpucg_max(const char *root)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = KSFT_FAIL;</div><div class='del'>-	long usage_usec, user_usec;</div><div class='del'>-	long usage_seconds = 1;</div><div class='del'>-	long expected_usage_usec = usage_seconds * USEC_PER_SEC;</div><div class='add'>+	long quota_usec = 1000;</div><div class='add'>+	long default_period_usec = 100000; /* cpu.max's default period */</div><div class='add'>+	long duration_seconds = 1;</div><div class='add'>+</div><div class='add'>+	long duration_usec = duration_seconds * USEC_PER_SEC;</div><div class='add'>+	long usage_usec, n_periods, remainder_usec, expected_usage_usec;</div><div class='ctx'> 	char *cpucg;</div><div class='add'>+	char quota_buf[32];</div><div class='add'>+</div><div class='add'>+	snprintf(quota_buf, sizeof(quota_buf), "%ld", quota_usec);</div><div class='ctx'> </div><div class='ctx'> 	cpucg = cg_name(root, "cpucg_test");</div><div class='ctx'> 	if (!cpucg)</div><div class='hunk'>@@ -657,13 +664,13 @@ static int test_cpucg_max(const char *root)</div><div class='ctx'> 	if (cg_create(cpucg))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	if (cg_write(cpucg, "cpu.max", "1000"))</div><div class='add'>+	if (cg_write(cpucg, "cpu.max", quota_buf))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	struct cpu_hog_func_param param = {</div><div class='ctx'> 		.nprocs = 1,</div><div class='ctx'> 		.ts = {</div><div class='del'>-			.tv_sec = usage_seconds,</div><div class='add'>+			.tv_sec = duration_seconds,</div><div class='ctx'> 			.tv_nsec = 0,</div><div class='ctx'> 		},</div><div class='ctx'> 		.clock_type = CPU_HOG_CLOCK_WALL,</div><div class='hunk'>@@ -672,14 +679,19 @@ static int test_cpucg_max(const char *root)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	usage_usec = cg_read_key_long(cpucg, "cpu.stat", "usage_usec");</div><div class='del'>-	user_usec = cg_read_key_long(cpucg, "cpu.stat", "user_usec");</div><div class='del'>-	if (user_usec &lt;= 0)</div><div class='add'>+	if (usage_usec &lt;= 0)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	if (user_usec &gt;= expected_usage_usec)</div><div class='del'>-		goto cleanup;</div><div class='add'>+	/*</div><div class='add'>+	 * The following calculation applies only since</div><div class='add'>+	 * the cpu hog is set to run as per wall-clock time</div><div class='add'>+	 */</div><div class='add'>+	n_periods = duration_usec / default_period_usec;</div><div class='add'>+	remainder_usec = duration_usec - n_periods * default_period_usec;</div><div class='add'>+	expected_usage_usec</div><div class='add'>+		= n_periods * quota_usec + MIN(remainder_usec, quota_usec);</div><div class='ctx'> </div><div class='del'>-	if (values_close(usage_usec, expected_usage_usec, 95))</div><div class='add'>+	if (!values_close_report(usage_usec, expected_usage_usec, 10))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	ret = KSFT_PASS;</div><div class='hunk'>@@ -698,10 +710,16 @@ cleanup:</div><div class='ctx'> static int test_cpucg_max_nested(const char *root)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = KSFT_FAIL;</div><div class='del'>-	long usage_usec, user_usec;</div><div class='del'>-	long usage_seconds = 1;</div><div class='del'>-	long expected_usage_usec = usage_seconds * USEC_PER_SEC;</div><div class='add'>+	long quota_usec = 1000;</div><div class='add'>+	long default_period_usec = 100000; /* cpu.max's default period */</div><div class='add'>+	long duration_seconds = 1;</div><div class='add'>+</div><div class='add'>+	long duration_usec = duration_seconds * USEC_PER_SEC;</div><div class='add'>+	long usage_usec, n_periods, remainder_usec, expected_usage_usec;</div><div class='ctx'> 	char *parent, *child;</div><div class='add'>+	char quota_buf[32];</div><div class='add'>+</div><div class='add'>+	snprintf(quota_buf, sizeof(quota_buf), "%ld", quota_usec);</div><div class='ctx'> </div><div class='ctx'> 	parent = cg_name(root, "cpucg_parent");</div><div class='ctx'> 	child = cg_name(parent, "cpucg_child");</div><div class='hunk'>@@ -717,13 +735,13 @@ static int test_cpucg_max_nested(const char *root)</div><div class='ctx'> 	if (cg_create(child))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	if (cg_write(parent, "cpu.max", "1000"))</div><div class='add'>+	if (cg_write(parent, "cpu.max", quota_buf))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	struct cpu_hog_func_param param = {</div><div class='ctx'> 		.nprocs = 1,</div><div class='ctx'> 		.ts = {</div><div class='del'>-			.tv_sec = usage_seconds,</div><div class='add'>+			.tv_sec = duration_seconds,</div><div class='ctx'> 			.tv_nsec = 0,</div><div class='ctx'> 		},</div><div class='ctx'> 		.clock_type = CPU_HOG_CLOCK_WALL,</div><div class='hunk'>@@ -732,14 +750,19 @@ static int test_cpucg_max_nested(const char *root)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	usage_usec = cg_read_key_long(child, "cpu.stat", "usage_usec");</div><div class='del'>-	user_usec = cg_read_key_long(child, "cpu.stat", "user_usec");</div><div class='del'>-	if (user_usec &lt;= 0)</div><div class='add'>+	if (usage_usec &lt;= 0)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	if (user_usec &gt;= expected_usage_usec)</div><div class='del'>-		goto cleanup;</div><div class='add'>+	/*</div><div class='add'>+	 * The following calculation applies only since</div><div class='add'>+	 * the cpu hog is set to run as per wall-clock time</div><div class='add'>+	 */</div><div class='add'>+	n_periods = duration_usec / default_period_usec;</div><div class='add'>+	remainder_usec = duration_usec - n_periods * default_period_usec;</div><div class='add'>+	expected_usage_usec</div><div class='add'>+		= n_periods * quota_usec + MIN(remainder_usec, quota_usec);</div><div class='ctx'> </div><div class='del'>-	if (values_close(usage_usec, expected_usage_usec, 95))</div><div class='add'>+	if (!values_close_report(usage_usec, expected_usage_usec, 10))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	ret = KSFT_PASS;</div><div class='hunk'>@@ -773,8 +796,10 @@ struct cpucg_test {</div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	char root[PATH_MAX];</div><div class='del'>-	int i, ret = EXIT_SUCCESS;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='add'>+	ksft_print_header();</div><div class='add'>+	ksft_set_plan(ARRAY_SIZE(tests));</div><div class='ctx'> 	if (cg_find_unified_root(root, sizeof(root), NULL))</div><div class='ctx'> 		ksft_exit_skip("cgroup v2 isn't mounted\n");</div><div class='ctx'> </div><div class='hunk'>@@ -791,11 +816,10 @@ int main(int argc, char *argv[])</div><div class='ctx'> 			ksft_test_result_skip("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			ret = EXIT_FAILURE;</div><div class='ctx'> 			ksft_test_result_fail("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ksft_finished();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/test_cpuset.c b/tools/testing/selftests/cgroup/test_cpuset.c<br/>index 4034d14ba69a..c5cf8b56ceb8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_cpuset.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_cpuset.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_cpuset.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/test_cpuset.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='ctx'> #include &lt;signal.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "cgroup_util.h"</div><div class='ctx'> </div><div class='ctx'> static int idle_process_fn(const char *cgroup, void *arg)</div><div class='hunk'>@@ -247,8 +247,10 @@ struct cpuset_test {</div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	char root[PATH_MAX];</div><div class='del'>-	int i, ret = EXIT_SUCCESS;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='add'>+	ksft_print_header();</div><div class='add'>+	ksft_set_plan(ARRAY_SIZE(tests));</div><div class='ctx'> 	if (cg_find_unified_root(root, sizeof(root), NULL))</div><div class='ctx'> 		ksft_exit_skip("cgroup v2 isn't mounted\n");</div><div class='ctx'> </div><div class='hunk'>@@ -265,11 +267,10 @@ int main(int argc, char *argv[])</div><div class='ctx'> 			ksft_test_result_skip("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			ret = EXIT_FAILURE;</div><div class='ctx'> 			ksft_test_result_fail("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ksft_finished();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/test_cpuset_prs.sh b/tools/testing/selftests/cgroup/test_cpuset_prs.sh<br/>index 400a696a0d21..a17256d9f88a 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_cpuset_prs.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_cpuset_prs.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_cpuset_prs.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/test_cpuset_prs.sh</a></div><div class='hunk'>@@ -88,22 +88,32 @@ echo "" &gt; test/cpuset.cpus</div><div class='ctx'> # If isolated CPUs have been reserved at boot time (as shown in</div><div class='ctx'> # cpuset.cpus.isolated), these isolated CPUs should be outside of CPUs 0-8</div><div class='ctx'> # that will be used by this script for testing purpose. If not, some of</div><div class='del'>-# the tests may fail incorrectly. These pre-isolated CPUs should stay in</div><div class='del'>-# an isolated state throughout the testing process for now.</div><div class='add'>+# the tests may fail incorrectly. Wait a bit and retry again just in case</div><div class='add'>+# these isolated CPUs are leftover from previous run and have just been</div><div class='add'>+# cleaned up earlier in this script.</div><div class='add'>+#</div><div class='add'>+# These pre-isolated CPUs should stay in an isolated state throughout the</div><div class='add'>+# testing process for now.</div><div class='ctx'> #</div><div class='ctx'> BOOT_ISOLCPUS=$(cat $CGROUP2/cpuset.cpus.isolated)</div><div class='add'>+[[ -n "$BOOT_ISOLCPUS" ]] &amp;&amp; {</div><div class='add'>+	sleep 0.5</div><div class='add'>+	BOOT_ISOLCPUS=$(cat $CGROUP2/cpuset.cpus.isolated)</div><div class='add'>+}</div><div class='ctx'> if [[ -n "$BOOT_ISOLCPUS" ]]</div><div class='ctx'> then</div><div class='ctx'> 	[[ $(echo $BOOT_ISOLCPUS | sed -e "s/[,-].*//") -le 8 ]] &amp;&amp;</div><div class='ctx'> 		skip_test "Pre-isolated CPUs ($BOOT_ISOLCPUS) overlap CPUs to be tested"</div><div class='ctx'> 	echo "Pre-isolated CPUs: $BOOT_ISOLCPUS"</div><div class='ctx'> fi</div><div class='add'>+</div><div class='ctx'> cleanup()</div><div class='ctx'> {</div><div class='ctx'> 	online_cpus</div><div class='ctx'> 	cd $CGROUP2</div><div class='del'>-	rmdir A1/A2/A3 A1/A2 A1 B1 &gt; /dev/null 2&gt;&amp;1</div><div class='del'>-	rmdir test &gt; /dev/null 2&gt;&amp;1</div><div class='add'>+	rmdir A1/A2/A3 A1/A2 A1 B1 test/A1 test/B1 test &gt; /dev/null 2&gt;&amp;1</div><div class='add'>+	rmdir rtest/p1/c11 rtest/p1/c12 rtest/p2/c21 \</div><div class='add'>+	      rtest/p2/c22 rtest/p1 rtest/p2 rtest &gt; /dev/null 2&gt;&amp;1</div><div class='ctx'> 	[[ -n "$SCHED_DEBUG" ]] &amp;&amp;</div><div class='ctx'> 		echo "$SCHED_DEBUG" &gt; /sys/kernel/debug/sched/verbose</div><div class='ctx'> }</div><div class='hunk'>@@ -173,14 +183,22 @@ test_add_proc()</div><div class='ctx'> #</div><div class='ctx'> # Cgroup test hierarchy</div><div class='ctx'> #</div><div class='del'>-# root -- A1 -- A2 -- A3</div><div class='del'>-#      +- B1</div><div class='add'>+#	      root</div><div class='add'>+#	        |</div><div class='add'>+#	 +------+------+</div><div class='add'>+#	 |             |</div><div class='add'>+#	 A1            B1</div><div class='add'>+#	 |</div><div class='add'>+#	 A2</div><div class='add'>+#	 |</div><div class='add'>+#	 A3</div><div class='ctx'> #</div><div class='ctx'> #  P&lt;v&gt; = set cpus.partition (0:member, 1:root, 2:isolated)</div><div class='ctx'> #  C&lt;l&gt; = add cpu-list to cpuset.cpus</div><div class='ctx'> #  X&lt;l&gt; = add cpu-list to cpuset.cpus.exclusive</div><div class='ctx'> #  S&lt;p&gt; = use prefix in subtree_control</div><div class='ctx'> #  T    = put a task into cgroup</div><div class='add'>+#  CX&lt;l&gt; = add cpu-list to both cpuset.cpus and cpuset.cpus.exclusive</div><div class='ctx'> #  O&lt;c&gt;=&lt;v&gt; = Write &lt;v&gt; to CPU online file of &lt;c&gt;</div><div class='ctx'> #</div><div class='ctx'> # ECPUs    - effective CPUs of cpusets</div><div class='hunk'>@@ -207,130 +225,129 @@ TEST_MATRIX=(</div><div class='ctx'> 	"  C0-1:P1   .      .    C2-3  S+:C4-5   .      .      .     0 A1:4-5"</div><div class='ctx'> 	"   C0-1     .      .   C2-3:P1   .      .      .     C2     0 "</div><div class='ctx'> 	"   C0-1     .      .   C2-3:P1   .      .      .    C4-5    0 B1:4-5"</div><div class='del'>-	"C0-3:P1:S+ C2-3:P1 .      .      .      .      .      .     0 A1:0-1,A2:2-3"</div><div class='del'>-	"C0-3:P1:S+ C2-3:P1 .      .     C1-3    .      .      .     0 A1:1,A2:2-3"</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .     C3      .      .      .     0 A1:,A2:3 A1:P1,A2:P1"</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .     C3      P0     .      .     0 A1:3,A2:3 A1:P1,A2:P0"</div><div class='del'>-	"C2-3:P1:S+  C2:P1  .      .     C2-4    .      .      .     0 A1:3-4,A2:2"</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .     C3      .      .     C0-2   0 A1:,B1:0-2 A1:P1,A2:P1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .     C2-3    .      .      .     0 A1:,A2:2,A3:3 A1:P1,A2:P1,A3:P1"</div><div class='add'>+	"C0-3:P1:S+ C2-3:P1 .      .      .      .      .      .     0 A1:0-1|A2:2-3|XA2:2-3"</div><div class='add'>+	"C0-3:P1:S+ C2-3:P1 .      .     C1-3    .      .      .     0 A1:1|A2:2-3|XA2:2-3"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .     C3      .      .      .     0 A1:|A2:3|XA2:3 A1:P1|A2:P1"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .     C3      P0     .      .     0 A1:3|A2:3 A1:P1|A2:P0"</div><div class='add'>+	"C2-3:P1:S+  C2:P1  .      .     C2-4    .      .      .     0 A1:3-4|A2:2"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .     C3      .      .     C0-2   0 A1:|B1:0-2 A1:P1|A2:P1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .     C2-3    .      .      .     0 A1:|A2:2|A3:3 A1:P1|A2:P1|A3:P1"</div><div class='ctx'> </div><div class='ctx'> 	# CPU offlining cases:</div><div class='del'>-	"   C0-1     .      .    C2-3    S+    C4-5     .     O2=0   0 A1:0-1,B1:3"</div><div class='del'>-	"C0-3:P1:S+ C2-3:P1 .      .     O2=0    .      .      .     0 A1:0-1,A2:3"</div><div class='del'>-	"C0-3:P1:S+ C2-3:P1 .      .     O2=0   O2=1    .      .     0 A1:0-1,A2:2-3"</div><div class='del'>-	"C0-3:P1:S+ C2-3:P1 .      .     O1=0    .      .      .     0 A1:0,A2:2-3"</div><div class='del'>-	"C0-3:P1:S+ C2-3:P1 .      .     O1=0   O1=1    .      .     0 A1:0-1,A2:2-3"</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .     O3=0   O3=1    .      .     0 A1:2,A2:3 A1:P1,A2:P1"</div><div class='del'>-	"C2-3:P1:S+  C3:P2  .      .     O3=0   O3=1    .      .     0 A1:2,A2:3 A1:P1,A2:P2"</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .     O2=0   O2=1    .      .     0 A1:2,A2:3 A1:P1,A2:P1"</div><div class='del'>-	"C2-3:P1:S+  C3:P2  .      .     O2=0   O2=1    .      .     0 A1:2,A2:3 A1:P1,A2:P2"</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .     O2=0    .      .      .     0 A1:,A2:3 A1:P1,A2:P1"</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .     O3=0    .      .      .     0 A1:2,A2: A1:P1,A2:P1"</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .    T:O2=0   .      .      .     0 A1:3,A2:3 A1:P1,A2:P-1"</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .      .    T:O3=0   .      .     0 A1:2,A2:2 A1:P1,A2:P-1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .     O1=0    .      .      .     0 A1:,A2:2,A3:3 A1:P1,A2:P1,A3:P1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .     O2=0    .      .      .     0 A1:1,A2:,A3:3 A1:P1,A2:P1,A3:P1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .     O3=0    .      .      .     0 A1:1,A2:2,A3: A1:P1,A2:P1,A3:P1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .    T:O1=0   .      .      .     0 A1:2-3,A2:2-3,A3:3 A1:P1,A2:P-1,A3:P-1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .      .    T:O2=0   .      .     0 A1:1,A2:3,A3:3 A1:P1,A2:P1,A3:P-1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .      .      .    T:O3=0   .     0 A1:1,A2:2,A3:2 A1:P1,A2:P1,A3:P-1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .    T:O1=0  O1=1    .      .     0 A1:1,A2:2,A3:3 A1:P1,A2:P1,A3:P1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .      .    T:O2=0  O2=1    .     0 A1:1,A2:2,A3:3 A1:P1,A2:P1,A3:P1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .      .      .    T:O3=0  O3=1   0 A1:1,A2:2,A3:3 A1:P1,A2:P1,A3:P1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .    T:O1=0  O2=0   O1=1    .     0 A1:1,A2:,A3:3 A1:P1,A2:P1,A3:P1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .    T:O1=0  O2=0   O2=1    .     0 A1:2-3,A2:2-3,A3:3 A1:P1,A2:P-1,A3:P-1"</div><div class='add'>+	"   C0-1     .      .    C2-3    S+    C4-5     .     O2=0   0 A1:0-1|B1:3"</div><div class='add'>+	"C0-3:P1:S+ C2-3:P1 .      .     O2=0    .      .      .     0 A1:0-1|A2:3"</div><div class='add'>+	"C0-3:P1:S+ C2-3:P1 .      .     O2=0   O2=1    .      .     0 A1:0-1|A2:2-3"</div><div class='add'>+	"C0-3:P1:S+ C2-3:P1 .      .     O1=0    .      .      .     0 A1:0|A2:2-3"</div><div class='add'>+	"C0-3:P1:S+ C2-3:P1 .      .     O1=0   O1=1    .      .     0 A1:0-1|A2:2-3"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .     O3=0   O3=1    .      .     0 A1:2|A2:3 A1:P1|A2:P1"</div><div class='add'>+	"C2-3:P1:S+  C3:P2  .      .     O3=0   O3=1    .      .     0 A1:2|A2:3 A1:P1|A2:P2"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .     O2=0   O2=1    .      .     0 A1:2|A2:3 A1:P1|A2:P1"</div><div class='add'>+	"C2-3:P1:S+  C3:P2  .      .     O2=0   O2=1    .      .     0 A1:2|A2:3 A1:P1|A2:P2"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .     O2=0    .      .      .     0 A1:|A2:3 A1:P1|A2:P1"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .     O3=0    .      .      .     0 A1:2|A2: A1:P1|A2:P1"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .    T:O2=0   .      .      .     0 A1:3|A2:3 A1:P1|A2:P-1"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .      .    T:O3=0   .      .     0 A1:2|A2:2 A1:P1|A2:P-1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .     O1=0    .      .      .     0 A1:|A2:2|A3:3 A1:P1|A2:P1|A3:P1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .     O2=0    .      .      .     0 A1:1|A2:|A3:3 A1:P1|A2:P1|A3:P1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .     O3=0    .      .      .     0 A1:1|A2:2|A3: A1:P1|A2:P1|A3:P1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .    T:O1=0   .      .      .     0 A1:2-3|A2:2-3|A3:3 A1:P1|A2:P-1|A3:P-1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .      .    T:O2=0   .      .     0 A1:1|A2:3|A3:3 A1:P1|A2:P1|A3:P-1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .      .      .    T:O3=0   .     0 A1:1|A2:2|A3:2 A1:P1|A2:P1|A3:P-1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .    T:O1=0  O1=1    .      .     0 A1:1|A2:2|A3:3 A1:P1|A2:P1|A3:P1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .      .    T:O2=0  O2=1    .     0 A1:1|A2:2|A3:3 A1:P1|A2:P1|A3:P1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .      .      .    T:O3=0  O3=1   0 A1:1|A2:2|A3:3 A1:P1|A2:P1|A3:P1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .    T:O1=0  O2=0   O1=1    .     0 A1:1|A2:|A3:3 A1:P1|A2:P1|A3:P1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .    T:O1=0  O2=0   O2=1    .     0 A1:2-3|A2:2-3|A3:3 A1:P1|A2:P-1|A3:P-1"</div><div class='ctx'> </div><div class='ctx'> 	#  old-A1 old-A2 old-A3 old-B1 new-A1 new-A2 new-A3 new-B1 fail ECPUs Pstate ISOLCPUS</div><div class='ctx'> 	#  ------ ------ ------ ------ ------ ------ ------ ------ ---- ----- ------ --------</div><div class='ctx'> 	#</div><div class='ctx'> 	# Remote partition and cpuset.cpus.exclusive tests</div><div class='ctx'> 	#</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3     .    X2-3     .      .      .     0 A1:0-3,A2:1-3,A3:2-3,XA1:2-3"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3     .    X2-3  X2-3:P2   .      .     0 A1:0-1,A2:2-3,A3:2-3 A1:P0,A2:P2 2-3"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3     .    X2-3   X3:P2    .      .     0 A1:0-2,A2:3,A3:3 A1:P0,A2:P2 3"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3     .    X2-3   X2-3  X2-3:P2   .     0 A1:0-1,A2:1,A3:2-3 A1:P0,A3:P2 2-3"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3     .    X2-3   X2-3 X2-3:P2:C3 .     0 A1:0-1,A2:1,A3:2-3 A1:P0,A3:P2 2-3"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3   C2-3     .      .      .      P2    0 A1:0-3,A2:1-3,A3:2-3,B1:2-3 A1:P0,A3:P0,B1:P-2"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3     .    X2-3     .      .      .     0 A1:0-3|A2:1-3|A3:2-3|XA1:2-3"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3     .    X2-3  X2-3:P2   .      .     0 A1:0-1|A2:2-3|A3:2-3 A1:P0|A2:P2 2-3"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3     .    X2-3   X3:P2    .      .     0 A1:0-2|A2:3|A3:3 A1:P0|A2:P2 3"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3     .    X2-3   X2-3  X2-3:P2   .     0 A1:0-1|A2:1|A3:2-3 A1:P0|A3:P2 2-3"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3     .    X2-3   X2-3 X2-3:P2:C3 .     0 A1:0-1|A2:1|A3:2-3 A1:P0|A3:P2 2-3"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3   C2-3     .      .      .      P2    0 A1:0-3|A2:1-3|A3:2-3|B1:2-3 A1:P0|A3:P0|B1:P-2"</div><div class='ctx'> 	" C0-3:S+ C1-3:S+ C2-3   C4-5     .      .      .      P2    0 B1:4-5 B1:P2 4-5"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3    C4    X2-3   X2-3  X2-3:P2   P2    0 A3:2-3,B1:4 A3:P2,B1:P2 2-4"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3    C4    X2-3   X2-3 X2-3:P2:C1-3 P2  0 A3:2-3,B1:4 A3:P2,B1:P2 2-4"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3    C4    X1-3  X1-3:P2   P2     .     0 A2:1,A3:2-3 A2:P2,A3:P2 1-3"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3    C4    X2-3   X2-3  X2-3:P2 P2:C4-5 0 A3:2-3,B1:4-5 A3:P2,B1:P2 2-5"</div><div class='del'>-	" C4:X0-3:S+ X1-3:S+ X2-3  .      .      P2     .      .     0 A1:4,A2:1-3,A3:1-3 A2:P2 1-3"</div><div class='del'>-	" C4:X0-3:S+ X1-3:S+ X2-3  .      .      .      P2     .     0 A1:4,A2:4,A3:2-3 A3:P2 2-3"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3    C4    X2-3   X2-3  X2-3:P2   P2    0 A3:2-3|B1:4 A3:P2|B1:P2 2-4"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3    C4    X2-3   X2-3 X2-3:P2:C1-3 P2  0 A3:2-3|B1:4 A3:P2|B1:P2 2-4"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3    C4    X1-3  X1-3:P2   P2     .     0 A2:1|A3:2-3 A2:P2|A3:P2 1-3"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3    C4    X2-3   X2-3  X2-3:P2 P2:C4-5 0 A3:2-3|B1:4-5 A3:P2|B1:P2 2-5"</div><div class='add'>+	" C4:X0-3:S+ X1-3:S+ X2-3  .      .      P2     .      .     0 A1:4|A2:1-3|A3:1-3 A2:P2 1-3"</div><div class='add'>+	" C4:X0-3:S+ X1-3:S+ X2-3  .      .      .      P2     .     0 A1:4|A2:4|A3:2-3 A3:P2 2-3"</div><div class='ctx'> </div><div class='ctx'> 	# Nested remote/local partition tests</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3   C4-5   X2-3  X2-3:P1   P2     P1    0 A1:0-1,A2:,A3:2-3,B1:4-5 \</div><div class='del'>-								       A1:P0,A2:P1,A3:P2,B1:P1 2-3"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3    C4    X2-3  X2-3:P1   P2     P1    0 A1:0-1,A2:,A3:2-3,B1:4 \</div><div class='del'>-								       A1:P0,A2:P1,A3:P2,B1:P1 2-4,2-3"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3    C4    X2-3  X2-3:P1    .     P1    0 A1:0-1,A2:2-3,A3:2-3,B1:4 \</div><div class='del'>-								       A1:P0,A2:P1,A3:P0,B1:P1"</div><div class='del'>-	" C0-3:S+ C1-3:S+  C3     C4    X2-3  X2-3:P1   P2     P1    0 A1:0-1,A2:2,A3:3,B1:4 \</div><div class='del'>-								       A1:P0,A2:P1,A3:P2,B1:P1 2-4,3"</div><div class='del'>-	" C0-4:S+ C1-4:S+ C2-4     .    X2-4  X2-4:P2  X4:P1    .    0 A1:0-1,A2:2-3,A3:4 \</div><div class='del'>-								       A1:P0,A2:P2,A3:P1 2-4,2-3"</div><div class='del'>-	" C0-4:S+ C1-4:S+ C2-4     .    X2-4  X2-4:P2 X3-4:P1   .    0 A1:0-1,A2:2,A3:3-4 \</div><div class='del'>-								       A1:P0,A2:P2,A3:P1 2"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3   C4-5   X2-3  X2-3:P1   P2     P1    0 A1:0-1|A2:|A3:2-3|B1:4-5 \</div><div class='add'>+								       A1:P0|A2:P1|A3:P2|B1:P1 2-3"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3    C4    X2-3  X2-3:P1   P2     P1    0 A1:0-1|A2:|A3:2-3|B1:4 \</div><div class='add'>+								       A1:P0|A2:P1|A3:P2|B1:P1 2-4|2-3"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3    C4    X2-3  X2-3:P1    .     P1    0 A1:0-1|A2:2-3|A3:2-3|B1:4 \</div><div class='add'>+								       A1:P0|A2:P1|A3:P0|B1:P1"</div><div class='add'>+	" C0-3:S+ C1-3:S+  C3     C4    X2-3  X2-3:P1   P2     P1    0 A1:0-1|A2:2|A3:3|B1:4 \</div><div class='add'>+								       A1:P0|A2:P1|A3:P2|B1:P1 2-4|3"</div><div class='add'>+	" C0-4:S+ C1-4:S+ C2-4     .    X2-4  X2-4:P2  X4:P1    .    0 A1:0-1|A2:2-3|A3:4 \</div><div class='add'>+								       A1:P0|A2:P2|A3:P1 2-4|2-3"</div><div class='add'>+	" C0-4:S+ C1-4:S+ C2-4     .    X2-4  X2-4:P2 X3-4:P1   .    0 A1:0-1|A2:2|A3:3-4 \</div><div class='add'>+								       A1:P0|A2:P2|A3:P1 2"</div><div class='ctx'> 	" C0-4:X2-4:S+ C1-4:X2-4:S+:P2 C2-4:X4:P1 \</div><div class='del'>-				   .      .      X5      .      .    0 A1:0-4,A2:1-4,A3:2-4 \</div><div class='del'>-								       A1:P0,A2:P-2,A3:P-1"</div><div class='add'>+				   .      .      X5      .      .    0 A1:0-4|A2:1-4|A3:2-4 \</div><div class='add'>+								       A1:P0|A2:P-2|A3:P-1 ."</div><div class='ctx'> 	" C0-4:X2-4:S+ C1-4:X2-4:S+:P2 C2-4:X4:P1 \</div><div class='del'>-				   .      .      .      X1      .    0 A1:0-1,A2:2-4,A3:2-4 \</div><div class='del'>-								       A1:P0,A2:P2,A3:P-1 2-4"</div><div class='add'>+				   .      .      .      X1      .    0 A1:0-1|A2:2-4|A3:2-4 \</div><div class='add'>+								       A1:P0|A2:P2|A3:P-1 2-4"</div><div class='ctx'> </div><div class='ctx'> 	# Remote partition offline tests</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3     .    X2-3   X2-3 X2-3:P2:O2=0 .   0 A1:0-1,A2:1,A3:3 A1:P0,A3:P2 2-3"</div><div class='del'>-	" C0-3:S+ C1-3:S+ C2-3     .    X2-3   X2-3 X2-3:P2:O2=0 O2=1 0 A1:0-1,A2:1,A3:2-3 A1:P0,A3:P2 2-3"</div><div class='del'>-	" C0-3:S+ C1-3:S+  C3      .    X2-3   X2-3    P2:O3=0   .   0 A1:0-2,A2:1-2,A3: A1:P0,A3:P2 3"</div><div class='del'>-	" C0-3:S+ C1-3:S+  C3      .    X2-3   X2-3   T:P2:O3=0  .   0 A1:0-2,A2:1-2,A3:1-2 A1:P0,A3:P-2 3,"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3     .    X2-3   X2-3 X2-3:P2:O2=0 .   0 A1:0-1|A2:1|A3:3 A1:P0|A3:P2 2-3"</div><div class='add'>+	" C0-3:S+ C1-3:S+ C2-3     .    X2-3   X2-3 X2-3:P2:O2=0 O2=1 0 A1:0-1|A2:1|A3:2-3 A1:P0|A3:P2 2-3"</div><div class='add'>+	" C0-3:S+ C1-3:S+  C3      .    X2-3   X2-3    P2:O3=0   .   0 A1:0-2|A2:1-2|A3: A1:P0|A3:P2 3"</div><div class='add'>+	" C0-3:S+ C1-3:S+  C3      .    X2-3   X2-3   T:P2:O3=0  .   0 A1:0-2|A2:1-2|A3:1-2 A1:P0|A3:P-2 3|"</div><div class='ctx'> </div><div class='ctx'> 	# An invalidated remote partition cannot self-recover from hotplug</div><div class='del'>-	" C0-3:S+ C1-3:S+  C2      .    X2-3   X2-3   T:P2:O2=0 O2=1 0 A1:0-3,A2:1-3,A3:2 A1:P0,A3:P-2"</div><div class='add'>+	" C0-3:S+ C1-3:S+  C2      .    X2-3   X2-3   T:P2:O2=0 O2=1 0 A1:0-3|A2:1-3|A3:2 A1:P0|A3:P-2 ."</div><div class='ctx'> </div><div class='ctx'> 	# cpus.exclusive.effective clearing test</div><div class='del'>-	" C0-3:S+ C1-3:S+  C2      .   X2-3:X    .      .      .     0 A1:0-3,A2:1-3,A3:2,XA1:"</div><div class='add'>+	" C0-3:S+ C1-3:S+  C2      .   X2-3:X    .      .      .     0 A1:0-3|A2:1-3|A3:2|XA1:"</div><div class='ctx'> </div><div class='ctx'> 	# Invalid to valid remote partition transition test</div><div class='del'>-	" C0-3:S+   C1-3    .      .      .    X3:P2    .      .     0 A1:0-3,A2:1-3,XA2: A2:P-2"</div><div class='add'>+	" C0-3:S+   C1-3    .      .      .    X3:P2    .      .     0 A1:0-3|A2:1-3|XA2: A2:P-2 ."</div><div class='ctx'> 	" C0-3:S+ C1-3:X3:P2</div><div class='del'>-			    .      .    X2-3    P2      .      .     0 A1:0-2,A2:3,XA2:3 A2:P2 3"</div><div class='add'>+			    .      .    X2-3    P2      .      .     0 A1:0-2|A2:3|XA2:3 A2:P2 3"</div><div class='ctx'> </div><div class='ctx'> 	# Invalid to valid local partition direct transition tests</div><div class='del'>-	" C1-3:S+:P2 X4:P2  .      .      .      .      .      .     0 A1:1-3,XA1:1-3,A2:1-3:XA2: A1:P2,A2:P-2 1-3"</div><div class='del'>-	" C1-3:S+:P2 X4:P2  .      .      .    X3:P2    .      .     0 A1:1-2,XA1:1-3,A2:3:XA2:3 A1:P2,A2:P2 1-3"</div><div class='del'>-	"  C0-3:P2   .      .    C4-6   C0-4     .      .      .     0 A1:0-4,B1:4-6 A1:P-2,B1:P0"</div><div class='del'>-	"  C0-3:P2   .      .    C4-6 C0-4:C0-3  .      .      .     0 A1:0-3,B1:4-6 A1:P2,B1:P0 0-3"</div><div class='del'>-	"  C0-3:P2   .      .  C3-5:C4-5  .      .      .      .     0 A1:0-3,B1:4-5 A1:P2,B1:P0 0-3"</div><div class='add'>+	" C1-3:S+:P2 X4:P2  .      .      .      .      .      .     0 A1:1-3|XA1:1-3|A2:1-3:XA2: A1:P2|A2:P-2 1-3"</div><div class='add'>+	" C1-3:S+:P2 X4:P2  .      .      .    X3:P2    .      .     0 A1:1-2|XA1:1-3|A2:3:XA2:3 A1:P2|A2:P2 1-3"</div><div class='add'>+	"  C0-3:P2   .      .    C4-6   C0-4     .      .      .     0 A1:0-4|B1:4-6 A1:P-2|B1:P0"</div><div class='add'>+	"  C0-3:P2   .      .    C4-6 C0-4:C0-3  .      .      .     0 A1:0-3|B1:4-6 A1:P2|B1:P0 0-3"</div><div class='ctx'> </div><div class='ctx'> 	# Local partition invalidation tests</div><div class='ctx'> 	" C0-3:X1-3:S+:P2 C1-3:X2-3:S+:P2 C2-3:X3:P2 \</div><div class='del'>-				   .      .      .      .      .     0 A1:1,A2:2,A3:3 A1:P2,A2:P2,A3:P2 1-3"</div><div class='add'>+				   .      .      .      .      .     0 A1:1|A2:2|A3:3 A1:P2|A2:P2|A3:P2 1-3"</div><div class='ctx'> 	" C0-3:X1-3:S+:P2 C1-3:X2-3:S+:P2 C2-3:X3:P2 \</div><div class='del'>-				   .      .     X4      .      .     0 A1:1-3,A2:1-3,A3:2-3,XA2:,XA3: A1:P2,A2:P-2,A3:P-2 1-3"</div><div class='add'>+				   .      .     X4      .      .     0 A1:1-3|A2:1-3|A3:2-3|XA2:|XA3: A1:P2|A2:P-2|A3:P-2 1-3"</div><div class='ctx'> 	" C0-3:X1-3:S+:P2 C1-3:X2-3:S+:P2 C2-3:X3:P2 \</div><div class='del'>-				   .      .    C4:X     .      .     0 A1:1-3,A2:1-3,A3:2-3,XA2:,XA3: A1:P2,A2:P-2,A3:P-2 1-3"</div><div class='add'>+				   .      .    C4:X     .      .     0 A1:1-3|A2:1-3|A3:2-3|XA2:|XA3: A1:P2|A2:P-2|A3:P-2 1-3"</div><div class='ctx'> 	# Local partition CPU change tests</div><div class='del'>-	" C0-5:S+:P2 C4-5:S+:P1 .  .      .    C3-5     .      .     0 A1:0-2,A2:3-5 A1:P2,A2:P1 0-2"</div><div class='del'>-	" C0-5:S+:P2 C4-5:S+:P1 .  .    C1-5     .      .      .     0 A1:1-3,A2:4-5 A1:P2,A2:P1 1-3"</div><div class='add'>+	" C0-5:S+:P2 C4-5:S+:P1 .  .      .    C3-5     .      .     0 A1:0-2|A2:3-5 A1:P2|A2:P1 0-2"</div><div class='add'>+	" C0-5:S+:P2 C4-5:S+:P1 .  .    C1-5     .      .      .     0 A1:1-3|A2:4-5 A1:P2|A2:P1 1-3"</div><div class='ctx'> </div><div class='ctx'> 	# cpus_allowed/exclusive_cpus update tests</div><div class='ctx'> 	" C0-3:X2-3:S+ C1-3:X2-3:S+ C2-3:X2-3 \</div><div class='del'>-				   .    X:C4     .      P2     .     0 A1:4,A2:4,XA2:,XA3:,A3:4 \</div><div class='del'>-								       A1:P0,A3:P-2"</div><div class='add'>+				   .    X:C4     .      P2     .     0 A1:4|A2:4|XA2:|XA3:|A3:4 \</div><div class='add'>+								       A1:P0|A3:P-2 ."</div><div class='ctx'> 	" C0-3:X2-3:S+ C1-3:X2-3:S+ C2-3:X2-3 \</div><div class='del'>-				   .     X1      .      P2     .     0 A1:0-3,A2:1-3,XA1:1,XA2:,XA3:,A3:2-3 \</div><div class='del'>-								       A1:P0,A3:P-2"</div><div class='add'>+				   .     X1      .      P2     .     0 A1:0-3|A2:1-3|XA1:1|XA2:|XA3:|A3:2-3 \</div><div class='add'>+								       A1:P0|A3:P-2 ."</div><div class='ctx'> 	" C0-3:X2-3:S+ C1-3:X2-3:S+ C2-3:X2-3 \</div><div class='del'>-				   .      .     X3      P2     .     0 A1:0-2,A2:1-2,XA2:3,XA3:3,A3:3 \</div><div class='del'>-								       A1:P0,A3:P2 3"</div><div class='add'>+				   .      .     X3      P2     .     0 A1:0-2|A2:1-2|XA2:3|XA3:3|A3:3 \</div><div class='add'>+								       A1:P0|A3:P2 3"</div><div class='ctx'> 	" C0-3:X2-3:S+ C1-3:X2-3:S+ C2-3:X2-3:P2 \</div><div class='del'>-				   .      .     X3      .      .     0 A1:0-3,A2:1-3,XA2:3,XA3:3,A3:2-3 \</div><div class='del'>-								       A1:P0,A3:P-2"</div><div class='add'>+				   .      .     X3      .      .     0 A1:0-2|A2:1-2|XA2:3|XA3:3|A3:3|XA3:3 \</div><div class='add'>+								       A1:P0|A3:P2 3"</div><div class='ctx'> 	" C0-3:X2-3:S+ C1-3:X2-3:S+ C2-3:X2-3:P2 \</div><div class='del'>-				   .     X4      .      .      .     0 A1:0-3,A2:1-3,A3:2-3,XA1:4,XA2:,XA3 \</div><div class='del'>-								       A1:P0,A3:P-2"</div><div class='add'>+				   .     X4      .      .      .     0 A1:0-3|A2:1-3|A3:2-3|XA1:4|XA2:|XA3 \</div><div class='add'>+								       A1:P0|A3:P-2"</div><div class='ctx'> </div><div class='ctx'> 	#  old-A1 old-A2 old-A3 old-B1 new-A1 new-A2 new-A3 new-B1 fail ECPUs Pstate ISOLCPUS</div><div class='ctx'> 	#  ------ ------ ------ ------ ------ ------ ------ ------ ---- ----- ------ --------</div><div class='hunk'>@@ -339,68 +356,127 @@ TEST_MATRIX=(</div><div class='ctx'> 	#</div><div class='ctx'> 	# Adding CPUs to partition root that are not in parent's</div><div class='ctx'> 	# cpuset.cpus is allowed, but those extra CPUs are ignored.</div><div class='del'>-	"C2-3:P1:S+ C3:P1   .      .      .     C2-4    .      .     0 A1:,A2:2-3 A1:P1,A2:P1"</div><div class='add'>+	"C2-3:P1:S+ C3:P1   .      .      .     C2-4    .      .     0 A1:|A2:2-3 A1:P1|A2:P1"</div><div class='ctx'> </div><div class='ctx'> 	# Taking away all CPUs from parent or itself if there are tasks</div><div class='ctx'> 	# will make the partition invalid.</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .      T     C2-3    .      .     0 A1:2-3,A2:2-3 A1:P1,A2:P-1"</div><div class='del'>-	" C3:P1:S+    C3    .      .      T      P1     .      .     0 A1:3,A2:3 A1:P1,A2:P-1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .    T:C2-3   .      .      .     0 A1:2-3,A2:2-3,A3:3 A1:P1,A2:P-1,A3:P-1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    . T:C2-3:C1-3 .      .      .     0 A1:1,A2:2,A3:3 A1:P1,A2:P1,A3:P1"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .      T     C2-3    .      .     0 A1:2-3|A2:2-3 A1:P1|A2:P-1"</div><div class='add'>+	" C3:P1:S+    C3    .      .      T      P1     .      .     0 A1:3|A2:3 A1:P1|A2:P-1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .    T:C2-3   .      .      .     0 A1:2-3|A2:2-3|A3:3 A1:P1|A2:P-1|A3:P-1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    . T:C2-3:C1-3 .      .      .     0 A1:1|A2:2|A3:3 A1:P1|A2:P1|A3:P1"</div><div class='ctx'> </div><div class='ctx'> 	# Changing a partition root to member makes child partitions invalid</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .      P0     .      .      .     0 A1:2-3,A2:3 A1:P0,A2:P-1"</div><div class='del'>-	"$SETUP_A123_PARTITIONS    .     C2-3    P0     .      .     0 A1:2-3,A2:2-3,A3:3 A1:P1,A2:P0,A3:P-1"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .      P0     .      .      .     0 A1:2-3|A2:3 A1:P0|A2:P-1"</div><div class='add'>+	"$SETUP_A123_PARTITIONS    .     C2-3    P0     .      .     0 A1:2-3|A2:2-3|A3:3 A1:P1|A2:P0|A3:P-1"</div><div class='ctx'> </div><div class='ctx'> 	# cpuset.cpus can contains cpus not in parent's cpuset.cpus as long</div><div class='ctx'> 	# as they overlap.</div><div class='del'>-	"C2-3:P1:S+  .      .      .      .   C3-4:P1   .      .     0 A1:2,A2:3 A1:P1,A2:P1"</div><div class='add'>+	"C2-3:P1:S+  .      .      .      .   C3-4:P1   .      .     0 A1:2|A2:3 A1:P1|A2:P1"</div><div class='ctx'> </div><div class='ctx'> 	# Deletion of CPUs distributed to child cgroup is allowed.</div><div class='del'>-	"C0-1:P1:S+ C1      .    C2-3   C4-5     .      .      .     0 A1:4-5,A2:4-5"</div><div class='add'>+	"C0-1:P1:S+ C1      .    C2-3   C4-5     .      .      .     0 A1:4-5|A2:4-5"</div><div class='ctx'> </div><div class='ctx'> 	# To become a valid partition root, cpuset.cpus must overlap parent's</div><div class='ctx'> 	# cpuset.cpus.</div><div class='del'>-	"  C0-1:P1   .      .    C2-3    S+   C4-5:P1   .      .     0 A1:0-1,A2:0-1 A1:P1,A2:P-1"</div><div class='add'>+	"  C0-1:P1   .      .    C2-3    S+   C4-5:P1   .      .     0 A1:0-1|A2:0-1 A1:P1|A2:P-1"</div><div class='ctx'> </div><div class='ctx'> 	# Enabling partition with child cpusets is allowed</div><div class='del'>-	"  C0-1:S+  C1      .    C2-3    P1      .      .      .     0 A1:0-1,A2:1 A1:P1"</div><div class='add'>+	"  C0-1:S+  C1      .    C2-3    P1      .      .      .     0 A1:0-1|A2:1 A1:P1"</div><div class='ctx'> </div><div class='del'>-	# A partition root with non-partition root parent is invalid, but it</div><div class='add'>+	# A partition root with non-partition root parent is invalid| but it</div><div class='ctx'> 	# can be made valid if its parent becomes a partition root too.</div><div class='del'>-	"  C0-1:S+  C1      .    C2-3     .      P2     .      .     0 A1:0-1,A2:1 A1:P0,A2:P-2"</div><div class='del'>-	"  C0-1:S+ C1:P2    .    C2-3     P1     .      .      .     0 A1:0,A2:1 A1:P1,A2:P2"</div><div class='add'>+	"  C0-1:S+  C1      .    C2-3     .      P2     .      .     0 A1:0-1|A2:1 A1:P0|A2:P-2"</div><div class='add'>+	"  C0-1:S+ C1:P2    .    C2-3     P1     .      .      .     0 A1:0|A2:1 A1:P1|A2:P2 0-1|1"</div><div class='ctx'> </div><div class='ctx'> 	# A non-exclusive cpuset.cpus change will invalidate partition and its siblings</div><div class='del'>-	"  C0-1:P1   .      .    C2-3   C0-2     .      .      .     0 A1:0-2,B1:2-3 A1:P-1,B1:P0"</div><div class='del'>-	"  C0-1:P1   .      .  P1:C2-3  C0-2     .      .      .     0 A1:0-2,B1:2-3 A1:P-1,B1:P-1"</div><div class='del'>-	"   C0-1     .      .  P1:C2-3  C0-2     .      .      .     0 A1:0-2,B1:2-3 A1:P0,B1:P-1"</div><div class='add'>+	"  C0-1:P1   .      .    C2-3   C0-2     .      .      .     0 A1:0-2|B1:2-3 A1:P-1|B1:P0"</div><div class='add'>+	"  C0-1:P1   .      .  P1:C2-3  C0-2     .      .      .     0 A1:0-2|B1:2-3 A1:P-1|B1:P-1"</div><div class='add'>+	"   C0-1     .      .  P1:C2-3  C0-2     .      .      .     0 A1:0-2|B1:2-3 A1:P0|B1:P-1"</div><div class='ctx'> </div><div class='ctx'> 	# cpuset.cpus can overlap with sibling cpuset.cpus.exclusive but not subsumed by it</div><div class='del'>-	"   C0-3     .      .    C4-5     X5     .      .      .     0 A1:0-3,B1:4-5"</div><div class='add'>+	"   C0-3     .      .    C4-5     X5     .      .      .     0 A1:0-3|B1:4-5"</div><div class='ctx'> </div><div class='ctx'> 	# Child partition root that try to take all CPUs from parent partition</div><div class='ctx'> 	# with tasks will remain invalid.</div><div class='del'>-	" C1-4:P1:S+ P1     .      .       .     .      .      .     0 A1:1-4,A2:1-4 A1:P1,A2:P-1"</div><div class='del'>-	" C1-4:P1:S+ P1     .      .       .   C1-4     .      .     0 A1,A2:1-4 A1:P1,A2:P1"</div><div class='del'>-	" C1-4:P1:S+ P1     .      .       T   C1-4     .      .     0 A1:1-4,A2:1-4 A1:P1,A2:P-1"</div><div class='add'>+	" C1-4:P1:S+ P1     .      .       .     .      .      .     0 A1:1-4|A2:1-4 A1:P1|A2:P-1"</div><div class='add'>+	" C1-4:P1:S+ P1     .      .       .   C1-4     .      .     0 A1|A2:1-4 A1:P1|A2:P1"</div><div class='add'>+	" C1-4:P1:S+ P1     .      .       T   C1-4     .      .     0 A1:1-4|A2:1-4 A1:P1|A2:P-1"</div><div class='ctx'> </div><div class='ctx'> 	# Clearing of cpuset.cpus with a preset cpuset.cpus.exclusive shouldn't</div><div class='ctx'> 	# affect cpuset.cpus.exclusive.effective.</div><div class='del'>-	" C1-4:X3:S+ C1:X3  .      .       .     C      .      .     0 A2:1-4,XA2:3"</div><div class='add'>+	" C1-4:X3:S+ C1:X3  .      .       .     C      .      .     0 A2:1-4|XA2:3"</div><div class='add'>+</div><div class='add'>+	# cpuset.cpus can contain CPUs that overlap a sibling cpuset with cpus.exclusive</div><div class='add'>+	# but creating a local partition out of it is not allowed. Similarly and change</div><div class='add'>+	# in cpuset.cpus of a local partition that overlaps sibling exclusive CPUs will</div><div class='add'>+	# invalidate it.</div><div class='add'>+	" CX1-4:S+ CX2-4:P2 .    C5-6      .     .      .      P1    0 A1:1|A2:2-4|B1:5-6|XB1:5-6 \</div><div class='add'>+								       A1:P0|A2:P2:B1:P1 2-4"</div><div class='add'>+	" CX1-4:S+ CX2-4:P2 .    C3-6      .     .      .      P1    0 A1:1|A2:2-4|B1:5-6 \</div><div class='add'>+								       A1:P0|A2:P2:B1:P-1 2-4"</div><div class='add'>+	" CX1-4:S+ CX2-4:P2 .    C5-6      .     .      .   P1:C3-6  0 A1:1|A2:2-4|B1:5-6 \</div><div class='add'>+								       A1:P0|A2:P2:B1:P-1 2-4"</div><div class='ctx'> </div><div class='ctx'> 	#  old-A1 old-A2 old-A3 old-B1 new-A1 new-A2 new-A3 new-B1 fail ECPUs Pstate ISOLCPUS</div><div class='ctx'> 	#  ------ ------ ------ ------ ------ ------ ------ ------ ---- ----- ------ --------</div><div class='ctx'> 	# Failure cases:</div><div class='ctx'> </div><div class='ctx'> 	# A task cannot be added to a partition with no cpu</div><div class='del'>-	"C2-3:P1:S+  C3:P1  .      .    O2=0:T   .      .      .     1 A1:,A2:3 A1:P1,A2:P1"</div><div class='add'>+	"C2-3:P1:S+  C3:P1  .      .    O2=0:T   .      .      .     1 A1:|A2:3 A1:P1|A2:P1"</div><div class='ctx'> </div><div class='ctx'> 	# Changes to cpuset.cpus.exclusive that violate exclusivity rule is rejected</div><div class='del'>-	"   C0-3     .      .    C4-5   X0-3     .      .     X3-5   1 A1:0-3,B1:4-5"</div><div class='add'>+	"   C0-3     .      .    C4-5   X0-3     .      .     X3-5   1 A1:0-3|B1:4-5"</div><div class='ctx'> </div><div class='ctx'> 	# cpuset.cpus cannot be a subset of sibling cpuset.cpus.exclusive</div><div class='del'>-	"   C0-3     .      .    C4-5   X3-5     .      .      .     1 A1:0-3,B1:4-5"</div><div class='add'>+	"   C0-3     .      .    C4-5   X3-5     .      .      .     1 A1:0-3|B1:4-5"</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cpuset controller remote partition test matrix.</div><div class='add'>+#</div><div class='add'>+# Cgroup test hierarchy</div><div class='add'>+#</div><div class='add'>+#	      root</div><div class='add'>+#	        |</div><div class='add'>+#	      rtest (cpuset.cpus.exclusive=1-7)</div><div class='add'>+#	        |</div><div class='add'>+#	 +------+------+</div><div class='add'>+#	 |             |</div><div class='add'>+#	 p1            p2</div><div class='add'>+#     +--+--+       +--+--+</div><div class='add'>+#     |     |       |     |</div><div class='add'>+#    c11   c12     c21   c22</div><div class='add'>+#</div><div class='add'>+# REMOTE_TEST_MATRIX uses the same notational convention as TEST_MATRIX.</div><div class='add'>+# Only CPUs 1-7 should be used.</div><div class='add'>+#</div><div class='add'>+REMOTE_TEST_MATRIX=(</div><div class='add'>+	#  old-p1 old-p2 old-c11 old-c12 old-c21 old-c22</div><div class='add'>+	#  new-p1 new-p2 new-c11 new-c12 new-c21 new-c22 ECPUs Pstate ISOLCPUS</div><div class='add'>+	#  ------ ------ ------- ------- ------- ------- ----- ------ --------</div><div class='add'>+	" X1-3:S+ X4-6:S+ X1-2     X3     X4-5     X6 \</div><div class='add'>+	      .      .     P2      P2      P2      P2    c11:1-2|c12:3|c21:4-5|c22:6 \</div><div class='add'>+							 c11:P2|c12:P2|c21:P2|c22:P2 1-6"</div><div class='add'>+	" CX1-4:S+   .   X1-2:P2   C3      .       .  \</div><div class='add'>+	      .      .     .      C3-4     .       .     p1:3-4|c11:1-2|c12:3-4 \</div><div class='add'>+							 p1:P0|c11:P2|c12:P0 1-2"</div><div class='add'>+	" CX1-4:S+   .   X1-2:P2   .       .       .  \</div><div class='add'>+	    X2-4     .     .       .       .       .     p1:1,3-4|c11:2 \</div><div class='add'>+							 p1:P0|c11:P2 2"</div><div class='add'>+	" CX1-5:S+   .   X1-2:P2 X3-5:P1   .       .  \</div><div class='add'>+	    X2-4     .     .       .       .       .     p1:1,5|c11:2|c12:3-4 \</div><div class='add'>+							 p1:P0|c11:P2|c12:P1 2"</div><div class='add'>+	" CX1-4:S+   .   X1-2:P2 X3-4:P1   .       .  \</div><div class='add'>+	      .      .     X2      .       .       .     p1:1|c11:2|c12:3-4 \</div><div class='add'>+							 p1:P0|c11:P2|c12:P1 2"</div><div class='add'>+	# p1 as member, will get its effective CPUs from its parent rtest</div><div class='add'>+	" CX1-4:S+   .   X1-2:P2 X3-4:P1   .       .  \</div><div class='add'>+	      .      .     X1     CX2-4    .       .     p1:5-7|c11:1|c12:2-4 \</div><div class='add'>+							 p1:P0|c11:P2|c12:P1 1"</div><div class='add'>+	" CX1-4:S+ X5-6:P1:S+ .    .       .       .  \</div><div class='add'>+	      .      .   X1-2:P2  X4-5:P1  .     X1-7:P2 p1:3|c11:1-2|c12:4:c22:5-6 \</div><div class='add'>+							 p1:P0|p2:P1|c11:P2|c12:P1|c22:P2 \</div><div class='add'>+							 1-2,4-6|1-2,5-6"</div><div class='ctx'> )</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -453,25 +529,26 @@ set_ctrl_state()</div><div class='ctx'> 		PFILE=$CGRP/cpuset.cpus.partition</div><div class='ctx'> 		CFILE=$CGRP/cpuset.cpus</div><div class='ctx'> 		XFILE=$CGRP/cpuset.cpus.exclusive</div><div class='del'>-		S=$(expr substr $CMD 1 1)</div><div class='del'>-		if [[ $S = S ]]</div><div class='del'>-		then</div><div class='del'>-			PREFIX=${CMD#?}</div><div class='add'>+		case $CMD in</div><div class='add'>+		    S*) PREFIX=${CMD#?}</div><div class='ctx'> 			COMM="echo ${PREFIX}${CTRL} &gt; $SFILE"</div><div class='ctx'> 			eval $COMM $REDIRECT</div><div class='del'>-		elif [[ $S = X ]]</div><div class='del'>-		then</div><div class='add'>+			;;</div><div class='add'>+		    X*)</div><div class='ctx'> 			CPUS=${CMD#?}</div><div class='ctx'> 			COMM="echo $CPUS &gt; $XFILE"</div><div class='ctx'> 			eval $COMM $REDIRECT</div><div class='del'>-		elif [[ $S = C ]]</div><div class='del'>-		then</div><div class='del'>-			CPUS=${CMD#?}</div><div class='add'>+			;;</div><div class='add'>+		    CX*)</div><div class='add'>+			CPUS=${CMD#??}</div><div class='add'>+			COMM="echo $CPUS &gt; $CFILE; echo $CPUS &gt; $XFILE"</div><div class='add'>+			eval $COMM $REDIRECT</div><div class='add'>+			;;</div><div class='add'>+		    C*) CPUS=${CMD#?}</div><div class='ctx'> 			COMM="echo $CPUS &gt; $CFILE"</div><div class='ctx'> 			eval $COMM $REDIRECT</div><div class='del'>-		elif [[ $S = P ]]</div><div class='del'>-		then</div><div class='del'>-			VAL=${CMD#?}</div><div class='add'>+			;;</div><div class='add'>+		    P*) VAL=${CMD#?}</div><div class='ctx'> 			case $VAL in</div><div class='ctx'> 			0)  VAL=member</div><div class='ctx'> 			    ;;</div><div class='hunk'>@@ -486,15 +563,17 @@ set_ctrl_state()</div><div class='ctx'> 			esac</div><div class='ctx'> 			COMM="echo $VAL &gt; $PFILE"</div><div class='ctx'> 			eval $COMM $REDIRECT</div><div class='del'>-		elif [[ $S = O ]]</div><div class='del'>-		then</div><div class='del'>-			VAL=${CMD#?}</div><div class='add'>+			;;</div><div class='add'>+		    O*) VAL=${CMD#?}</div><div class='ctx'> 			write_cpu_online $VAL</div><div class='del'>-		elif [[ $S = T ]]</div><div class='del'>-		then</div><div class='del'>-			COMM="echo 0 &gt; $TFILE"</div><div class='add'>+			;;</div><div class='add'>+		    T*) COMM="echo 0 &gt; $TFILE"</div><div class='ctx'> 			eval $COMM $REDIRECT</div><div class='del'>-		fi</div><div class='add'>+			;;</div><div class='add'>+		    *)  echo "Unknown command: $CMD"</div><div class='add'>+		        exit 1</div><div class='add'>+			;;</div><div class='add'>+		esac</div><div class='ctx'> 		RET=$?</div><div class='ctx'> 		[[ $RET -ne 0 ]] &amp;&amp; {</div><div class='ctx'> 			[[ -n "$SHOWERR" ]] &amp;&amp; {</div><div class='hunk'>@@ -532,21 +611,18 @@ online_cpus()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Return 1 if the list of effective cpus isn't the same as the initial list.</div><div class='add'>+# Remove all the test cgroup directories</div><div class='ctx'> #</div><div class='ctx'> reset_cgroup_states()</div><div class='ctx'> {</div><div class='ctx'> 	echo 0 &gt; $CGROUP2/cgroup.procs</div><div class='ctx'> 	online_cpus</div><div class='del'>-	rmdir A1/A2/A3 A1/A2 A1 B1 &gt; /dev/null 2&gt;&amp;1</div><div class='del'>-	pause 0.02</div><div class='del'>-	set_ctrl_state . R-</div><div class='del'>-	pause 0.01</div><div class='add'>+	rmdir $RESET_LIST &gt; /dev/null 2&gt;&amp;1</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> dump_states()</div><div class='ctx'> {</div><div class='del'>-	for DIR in . A1 A1/A2 A1/A2/A3 B1</div><div class='add'>+	for DIR in $CGROUP_LIST</div><div class='ctx'> 	do</div><div class='ctx'> 		CPUS=$DIR/cpuset.cpus</div><div class='ctx'> 		ECPUS=$DIR/cpuset.cpus.effective</div><div class='hunk'>@@ -566,17 +642,33 @@ dump_states()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Set the actual cgroup directory into $CGRP_DIR</div><div class='add'>+# $1 - cgroup name</div><div class='add'>+#</div><div class='add'>+set_cgroup_dir()</div><div class='add'>+{</div><div class='add'>+	CGRP_DIR=$1</div><div class='add'>+	[[ $CGRP_DIR = A2  ]] &amp;&amp; CGRP_DIR=A1/A2</div><div class='add'>+	[[ $CGRP_DIR = A3  ]] &amp;&amp; CGRP_DIR=A1/A2/A3</div><div class='add'>+	[[ $CGRP_DIR = c11 ]] &amp;&amp; CGRP_DIR=p1/c11</div><div class='add'>+	[[ $CGRP_DIR = c12 ]] &amp;&amp; CGRP_DIR=p1/c12</div><div class='add'>+	[[ $CGRP_DIR = c21 ]] &amp;&amp; CGRP_DIR=p2/c21</div><div class='add'>+	[[ $CGRP_DIR = c22 ]] &amp;&amp; CGRP_DIR=p2/c22</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Check effective cpus</div><div class='del'>-# $1 - check string, format: &lt;cgroup&gt;:&lt;cpu-list&gt;[,&lt;cgroup&gt;:&lt;cpu-list&gt;]*</div><div class='add'>+# $1 - check string, format: &lt;cgroup&gt;:&lt;cpu-list&gt;[|&lt;cgroup&gt;:&lt;cpu-list&gt;]*</div><div class='ctx'> #</div><div class='ctx'> check_effective_cpus()</div><div class='ctx'> {</div><div class='ctx'> 	CHK_STR=$1</div><div class='del'>-	for CHK in $(echo $CHK_STR | sed -e "s/,/ /g")</div><div class='add'>+	for CHK in $(echo $CHK_STR | sed -e "s/|/ /g")</div><div class='ctx'> 	do</div><div class='ctx'> 		set -- $(echo $CHK | sed -e "s/:/ /g")</div><div class='ctx'> 		CGRP=$1</div><div class='del'>-		CPUS=$2</div><div class='add'>+		EXPECTED_CPUS=$2</div><div class='add'>+		ACTUAL_CPUS=</div><div class='ctx'> 		if [[ $CGRP = X* ]]</div><div class='ctx'> 		then</div><div class='ctx'> 			CGRP=${CGRP#X}</div><div class='hunk'>@@ -584,41 +676,39 @@ check_effective_cpus()</div><div class='ctx'> 		else</div><div class='ctx'> 			FILE=cpuset.cpus.effective</div><div class='ctx'> 		fi</div><div class='del'>-		[[ $CGRP = A2 ]] &amp;&amp; CGRP=A1/A2</div><div class='del'>-		[[ $CGRP = A3 ]] &amp;&amp; CGRP=A1/A2/A3</div><div class='del'>-		[[ -e $CGRP/$FILE ]] || return 1</div><div class='del'>-		[[ $CPUS = $(cat $CGRP/$FILE) ]] || return 1</div><div class='add'>+		set_cgroup_dir $CGRP</div><div class='add'>+		[[ -e $CGRP_DIR/$FILE ]] || return 1</div><div class='add'>+		ACTUAL_CPUS=$(cat $CGRP_DIR/$FILE)</div><div class='add'>+		[[ $EXPECTED_CPUS = $ACTUAL_CPUS ]] || return 1</div><div class='ctx'> 	done</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Check cgroup states</div><div class='del'>-#  $1 - check string, format: &lt;cgroup&gt;:&lt;state&gt;[,&lt;cgroup&gt;:&lt;state&gt;]*</div><div class='add'>+#  $1 - check string, format: &lt;cgroup&gt;:&lt;state&gt;[|&lt;cgroup&gt;:&lt;state&gt;]*</div><div class='ctx'> #</div><div class='ctx'> check_cgroup_states()</div><div class='ctx'> {</div><div class='ctx'> 	CHK_STR=$1</div><div class='del'>-	for CHK in $(echo $CHK_STR | sed -e "s/,/ /g")</div><div class='add'>+	for CHK in $(echo $CHK_STR | sed -e "s/|/ /g")</div><div class='ctx'> 	do</div><div class='ctx'> 		set -- $(echo $CHK | sed -e "s/:/ /g")</div><div class='ctx'> 		CGRP=$1</div><div class='del'>-		CGRP_DIR=$CGRP</div><div class='del'>-		STATE=$2</div><div class='add'>+		EXPECTED_STATE=$2</div><div class='ctx'> 		FILE=</div><div class='del'>-		EVAL=$(expr substr $STATE 2 2)</div><div class='del'>-		[[ $CGRP = A2 ]] &amp;&amp; CGRP_DIR=A1/A2</div><div class='del'>-		[[ $CGRP = A3 ]] &amp;&amp; CGRP_DIR=A1/A2/A3</div><div class='add'>+		EVAL=$(expr substr $EXPECTED_STATE 2 2)</div><div class='ctx'> </div><div class='del'>-		case $STATE in</div><div class='add'>+		set_cgroup_dir $CGRP</div><div class='add'>+		case $EXPECTED_STATE in</div><div class='ctx'> 			P*) FILE=$CGRP_DIR/cpuset.cpus.partition</div><div class='ctx'> 			    ;;</div><div class='del'>-			*)  echo "Unknown state: $STATE!"</div><div class='add'>+			*)  echo "Unknown state: $EXPECTED_STATE!"</div><div class='ctx'> 			    exit 1</div><div class='ctx'> 			    ;;</div><div class='ctx'> 		esac</div><div class='del'>-		VAL=$(cat $FILE)</div><div class='add'>+		ACTUAL_STATE=$(cat $FILE)</div><div class='ctx'> </div><div class='del'>-		case "$VAL" in</div><div class='add'>+		case "$ACTUAL_STATE" in</div><div class='ctx'> 			member) VAL=0</div><div class='ctx'> 				;;</div><div class='ctx'> 			root)	VAL=1</div><div class='hunk'>@@ -642,7 +732,7 @@ check_cgroup_states()</div><div class='ctx'> 		[[ $VAL -eq 1 &amp;&amp; $VERBOSE -gt 0 ]] &amp;&amp; {</div><div class='ctx'> 			DOMS=$(cat $CGRP_DIR/cpuset.cpus.effective)</div><div class='ctx'> 			[[ -n "$DOMS" ]] &amp;&amp;</div><div class='del'>-				echo " [$CGRP] sched-domain: $DOMS" &gt; $CONSOLE</div><div class='add'>+				echo " [$CGRP_DIR] sched-domain: $DOMS" &gt; $CONSOLE</div><div class='ctx'> 		}</div><div class='ctx'> 	done</div><div class='ctx'> 	return 0</div><div class='hunk'>@@ -665,22 +755,22 @@ check_cgroup_states()</div><div class='ctx'> #</div><div class='ctx'> check_isolcpus()</div><div class='ctx'> {</div><div class='del'>-	EXPECT_VAL=$1</div><div class='del'>-	ISOLCPUS=</div><div class='add'>+	EXPECTED_ISOLCPUS=$1</div><div class='add'>+	ISCPUS=${CGROUP2}/cpuset.cpus.isolated</div><div class='add'>+	ISOLCPUS=$(cat $ISCPUS)</div><div class='ctx'> 	LASTISOLCPU=</div><div class='ctx'> 	SCHED_DOMAINS=/sys/kernel/debug/sched/domains</div><div class='del'>-	ISCPUS=${CGROUP2}/cpuset.cpus.isolated</div><div class='del'>-	if [[ $EXPECT_VAL = . ]]</div><div class='add'>+	if [[ $EXPECTED_ISOLCPUS = . ]]</div><div class='ctx'> 	then</div><div class='del'>-		EXPECT_VAL=</div><div class='del'>-		EXPECT_VAL2=</div><div class='del'>-	elif [[ $(expr $EXPECT_VAL : ".*,.*") &gt; 0 ]]</div><div class='add'>+		EXPECTED_ISOLCPUS=</div><div class='add'>+		EXPECTED_SDOMAIN=</div><div class='add'>+	elif [[ $(expr $EXPECTED_ISOLCPUS : ".*|.*") &gt; 0 ]]</div><div class='ctx'> 	then</div><div class='del'>-		set -- $(echo $EXPECT_VAL | sed -e "s/,/ /g")</div><div class='del'>-		EXPECT_VAL=$1</div><div class='del'>-		EXPECT_VAL2=$2</div><div class='add'>+		set -- $(echo $EXPECTED_ISOLCPUS | sed -e "s/|/ /g")</div><div class='add'>+		EXPECTED_ISOLCPUS=$2</div><div class='add'>+		EXPECTED_SDOMAIN=$1</div><div class='ctx'> 	else</div><div class='del'>-		EXPECT_VAL2=$EXPECT_VAL</div><div class='add'>+		EXPECTED_SDOMAIN=$EXPECTED_ISOLCPUS</div><div class='ctx'> 	fi</div><div class='ctx'> </div><div class='ctx'> 	#</div><div class='hunk'>@@ -689,20 +779,21 @@ check_isolcpus()</div><div class='ctx'> 	# to make appending those CPUs easier.</div><div class='ctx'> 	#</div><div class='ctx'> 	[[ -n "$BOOT_ISOLCPUS" ]] &amp;&amp; {</div><div class='del'>-		EXPECT_VAL=${EXPECT_VAL:+${EXPECT_VAL},}${BOOT_ISOLCPUS}</div><div class='del'>-		EXPECT_VAL2=${EXPECT_VAL2:+${EXPECT_VAL2},}${BOOT_ISOLCPUS}</div><div class='add'>+		EXPECTED_ISOLCPUS=${EXPECTED_ISOLCPUS:+${EXPECTED_ISOLCPUS},}${BOOT_ISOLCPUS}</div><div class='add'>+		EXPECTED_SDOMAIN=${EXPECTED_SDOMAIN:+${EXPECTED_SDOMAIN},}${BOOT_ISOLCPUS}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	#</div><div class='ctx'> 	# Check cpuset.cpus.isolated cpumask</div><div class='ctx'> 	#</div><div class='del'>-	[[ "$EXPECT_VAL2" != "$ISOLCPUS" ]] &amp;&amp; {</div><div class='add'>+	[[ "$EXPECTED_ISOLCPUS" != "$ISOLCPUS" ]] &amp;&amp; {</div><div class='ctx'> 		# Take a 50ms pause and try again</div><div class='ctx'> 		pause 0.05</div><div class='ctx'> 		ISOLCPUS=$(cat $ISCPUS)</div><div class='ctx'> 	}</div><div class='del'>-	[[ "$EXPECT_VAL2" != "$ISOLCPUS" ]] &amp;&amp; return 1</div><div class='add'>+	[[ "$EXPECTED_ISOLCPUS" != "$ISOLCPUS" ]] &amp;&amp; return 1</div><div class='ctx'> 	ISOLCPUS=</div><div class='add'>+	EXPECTED_ISOLCPUS=$EXPECTED_SDOMAIN</div><div class='ctx'> </div><div class='ctx'> 	#</div><div class='ctx'> 	# Use the sched domain in debugfs to check isolated CPUs, if available</div><div class='hunk'>@@ -736,7 +827,7 @@ check_isolcpus()</div><div class='ctx'> 	done</div><div class='ctx'> 	[[ "$ISOLCPUS" = *- ]] &amp;&amp; ISOLCPUS=${ISOLCPUS}$LASTISOLCPU</div><div class='ctx'> </div><div class='del'>-	[[ "$EXPECT_VAL" = "$ISOLCPUS" ]]</div><div class='add'>+	[[ "$EXPECTED_SDOMAIN" = "$ISOLCPUS" ]]</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> test_fail()</div><div class='hunk'>@@ -774,6 +865,63 @@ null_isolcpus_check()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Check state transition test result</div><div class='add'>+#  $1 - Test number</div><div class='add'>+#  $2 - Expected effective CPU values</div><div class='add'>+#  $3 - Expected partition states</div><div class='add'>+#  $4 - Expected isolated CPUs</div><div class='add'>+#</div><div class='add'>+check_test_results()</div><div class='add'>+{</div><div class='add'>+	_NR=$1</div><div class='add'>+	_ECPUS="$2"</div><div class='add'>+	_PSTATES="$3"</div><div class='add'>+	_ISOLCPUS="$4"</div><div class='add'>+</div><div class='add'>+	[[ -n "$_ECPUS" &amp;&amp; "$_ECPUS" != . ]] &amp;&amp; {</div><div class='add'>+		check_effective_cpus $_ECPUS</div><div class='add'>+		[[ $? -ne 0 ]] &amp;&amp; test_fail $_NR "effective CPU" \</div><div class='add'>+			 "Cgroup $CGRP: expected $EXPECTED_CPUS, got $ACTUAL_CPUS"</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	[[ -n "$_PSTATES" &amp;&amp; "$_PSTATES" != . ]] &amp;&amp; {</div><div class='add'>+		check_cgroup_states $_PSTATES</div><div class='add'>+		[[ $? -ne 0 ]] &amp;&amp; test_fail $_NR states \</div><div class='add'>+			"Cgroup $CGRP: expected $EXPECTED_STATE, got $ACTUAL_STATE"</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	# Compare the expected isolated CPUs with the actual ones,</div><div class='add'>+	# if available</div><div class='add'>+	[[ -n "$_ISOLCPUS" ]] &amp;&amp; {</div><div class='add'>+		check_isolcpus $_ISOLCPUS</div><div class='add'>+		[[ $? -ne 0 ]] &amp;&amp; {</div><div class='add'>+			[[ -n "$BOOT_ISOLCPUS" ]] &amp;&amp; _ISOLCPUS=${_ISOLCPUS},${BOOT_ISOLCPUS}</div><div class='add'>+			test_fail $_NR "isolated CPU" \</div><div class='add'>+				"Expect $_ISOLCPUS, get $ISOLCPUS instead"</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	reset_cgroup_states</div><div class='add'>+	#</div><div class='add'>+	# Check to see if effective cpu list changes</div><div class='add'>+	#</div><div class='add'>+	_NEWLIST=$(cat $CGROUP2/cpuset.cpus.effective)</div><div class='add'>+	RETRY=0</div><div class='add'>+	while [[ $_NEWLIST != $CPULIST &amp;&amp; $RETRY -lt 8 ]]</div><div class='add'>+	do</div><div class='add'>+		# Wait a bit longer &amp; recheck a few times</div><div class='add'>+		pause 0.02</div><div class='add'>+		((RETRY++))</div><div class='add'>+		_NEWLIST=$(cat $CGROUP2/cpuset.cpus.effective)</div><div class='add'>+	done</div><div class='add'>+	[[ $_NEWLIST != $CPULIST ]] &amp;&amp; {</div><div class='add'>+		echo "Effective cpus changed to $_NEWLIST after test $_NR!"</div><div class='add'>+		exit 1</div><div class='add'>+	}</div><div class='add'>+	null_isolcpus_check</div><div class='add'>+	[[ $VERBOSE -gt 0 ]] &amp;&amp; echo "Test $I done."</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Run cpuset state transition test</div><div class='ctx'> #  $1 - test matrix name</div><div class='ctx'> #</div><div class='hunk'>@@ -785,6 +933,8 @@ run_state_test()</div><div class='ctx'> {</div><div class='ctx'> 	TEST=$1</div><div class='ctx'> 	CONTROLLER=cpuset</div><div class='add'>+	CGROUP_LIST=". A1 A1/A2 A1/A2/A3 B1"</div><div class='add'>+	RESET_LIST="A1/A2/A3 A1/A2 A1 B1"</div><div class='ctx'> 	I=0</div><div class='ctx'> 	eval CNT="\${#$TEST[@]}"</div><div class='ctx'> </div><div class='hunk'>@@ -812,10 +962,11 @@ run_state_test()</div><div class='ctx'> 		STATES=${11}</div><div class='ctx'> 		ICPUS=${12}</div><div class='ctx'> </div><div class='del'>-		set_ctrl_state_noerr B1       $OLD_B1</div><div class='ctx'> 		set_ctrl_state_noerr A1       $OLD_A1</div><div class='ctx'> 		set_ctrl_state_noerr A1/A2    $OLD_A2</div><div class='ctx'> 		set_ctrl_state_noerr A1/A2/A3 $OLD_A3</div><div class='add'>+		set_ctrl_state_noerr B1       $OLD_B1</div><div class='add'>+</div><div class='ctx'> 		RETVAL=0</div><div class='ctx'> 		set_ctrl_state A1       $NEW_A1; ((RETVAL += $?))</div><div class='ctx'> 		set_ctrl_state A1/A2    $NEW_A2; ((RETVAL += $?))</div><div class='hunk'>@@ -824,47 +975,79 @@ run_state_test()</div><div class='ctx'> </div><div class='ctx'> 		[[ $RETVAL -ne $RESULT ]] &amp;&amp; test_fail $I result</div><div class='ctx'> </div><div class='del'>-		[[ -n "$ECPUS" &amp;&amp; "$ECPUS" != . ]] &amp;&amp; {</div><div class='del'>-			check_effective_cpus $ECPUS</div><div class='del'>-			[[ $? -ne 0 ]] &amp;&amp; test_fail $I "effective CPU"</div><div class='del'>-		}</div><div class='add'>+		check_test_results $I "$ECPUS" "$STATES" "$ICPUS"</div><div class='add'>+		((I++))</div><div class='add'>+	done</div><div class='add'>+	echo "All $I tests of $TEST PASSED."</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		[[ -n "$STATES" &amp;&amp; "$STATES" != . ]] &amp;&amp; {</div><div class='del'>-			check_cgroup_states $STATES</div><div class='del'>-			[[ $? -ne 0 ]] &amp;&amp; test_fail $I states</div><div class='del'>-		}</div><div class='add'>+#</div><div class='add'>+# Run cpuset remote partition state transition test</div><div class='add'>+#  $1 - test matrix name</div><div class='add'>+#</div><div class='add'>+run_remote_state_test()</div><div class='add'>+{</div><div class='add'>+	TEST=$1</div><div class='add'>+	CONTROLLER=cpuset</div><div class='add'>+	[[ -d rtest ]] || mkdir rtest</div><div class='add'>+	cd rtest</div><div class='add'>+	echo +cpuset &gt; cgroup.subtree_control</div><div class='add'>+	echo "1-7" &gt; cpuset.cpus</div><div class='add'>+	echo "1-7" &gt; cpuset.cpus.exclusive</div><div class='add'>+	CGROUP_LIST=".. . p1 p2 p1/c11 p1/c12 p2/c21 p2/c22"</div><div class='add'>+	RESET_LIST="p1/c11 p1/c12 p2/c21 p2/c22 p1 p2"</div><div class='add'>+	I=0</div><div class='add'>+	eval CNT="\${#$TEST[@]}"</div><div class='ctx'> </div><div class='del'>-		# Compare the expected isolated CPUs with the actual ones,</div><div class='del'>-		# if available</div><div class='del'>-		[[ -n "$ICPUS" ]] &amp;&amp; {</div><div class='del'>-			check_isolcpus $ICPUS</div><div class='del'>-			[[ $? -ne 0 ]] &amp;&amp; {</div><div class='del'>-				[[ -n "$BOOT_ISOLCPUS" ]] &amp;&amp; ICPUS=${ICPUS},${BOOT_ISOLCPUS}</div><div class='del'>-				test_fail $I "isolated CPU" \</div><div class='del'>-					"Expect $ICPUS, get $ISOLCPUS instead"</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		reset_cgroup_states</div><div class='del'>-		#</div><div class='del'>-		# Check to see if effective cpu list changes</div><div class='del'>-		#</div><div class='del'>-		NEWLIST=$(cat cpuset.cpus.effective)</div><div class='del'>-		RETRY=0</div><div class='del'>-		while [[ $NEWLIST != $CPULIST &amp;&amp; $RETRY -lt 8 ]]</div><div class='del'>-		do</div><div class='del'>-			# Wait a bit longer &amp; recheck a few times</div><div class='del'>-			pause 0.02</div><div class='del'>-			((RETRY++))</div><div class='del'>-			NEWLIST=$(cat cpuset.cpus.effective)</div><div class='del'>-		done</div><div class='del'>-		[[ $NEWLIST != $CPULIST ]] &amp;&amp; {</div><div class='del'>-			echo "Effective cpus changed to $NEWLIST after test $I!"</div><div class='del'>-			exit 1</div><div class='add'>+	reset_cgroup_states</div><div class='add'>+	console_msg "Running remote partition state transition test ..."</div><div class='add'>+</div><div class='add'>+	while [[ $I -lt $CNT ]]</div><div class='add'>+	do</div><div class='add'>+		echo "Running test $I ..." &gt; $CONSOLE</div><div class='add'>+		[[ $VERBOSE -gt 1 ]] &amp;&amp; {</div><div class='add'>+			echo ""</div><div class='add'>+			eval echo \${$TEST[$I]}</div><div class='ctx'> 		}</div><div class='del'>-		null_isolcpus_check</div><div class='del'>-		[[ $VERBOSE -gt 0 ]] &amp;&amp; echo "Test $I done."</div><div class='add'>+		eval set -- "\${$TEST[$I]}"</div><div class='add'>+		OLD_p1=$1</div><div class='add'>+		OLD_p2=$2</div><div class='add'>+		OLD_c11=$3</div><div class='add'>+		OLD_c12=$4</div><div class='add'>+		OLD_c21=$5</div><div class='add'>+		OLD_c22=$6</div><div class='add'>+		NEW_p1=$7</div><div class='add'>+		NEW_p2=$8</div><div class='add'>+		NEW_c11=$9</div><div class='add'>+		NEW_c12=${10}</div><div class='add'>+		NEW_c21=${11}</div><div class='add'>+		NEW_c22=${12}</div><div class='add'>+		ECPUS=${13}</div><div class='add'>+		STATES=${14}</div><div class='add'>+		ICPUS=${15}</div><div class='add'>+</div><div class='add'>+		set_ctrl_state_noerr p1     $OLD_p1</div><div class='add'>+		set_ctrl_state_noerr p2     $OLD_p2</div><div class='add'>+		set_ctrl_state_noerr p1/c11 $OLD_c11</div><div class='add'>+		set_ctrl_state_noerr p1/c12 $OLD_c12</div><div class='add'>+		set_ctrl_state_noerr p2/c21 $OLD_c21</div><div class='add'>+		set_ctrl_state_noerr p2/c22 $OLD_c22</div><div class='add'>+</div><div class='add'>+		RETVAL=0</div><div class='add'>+		set_ctrl_state p1     $NEW_p1 ; ((RETVAL += $?))</div><div class='add'>+		set_ctrl_state p2     $NEW_p2 ; ((RETVAL += $?))</div><div class='add'>+		set_ctrl_state p1/c11 $NEW_c11; ((RETVAL += $?))</div><div class='add'>+		set_ctrl_state p1/c12 $NEW_c12; ((RETVAL += $?))</div><div class='add'>+		set_ctrl_state p2/c21 $NEW_c21; ((RETVAL += $?))</div><div class='add'>+		set_ctrl_state p2/c22 $NEW_c22; ((RETVAL += $?))</div><div class='add'>+</div><div class='add'>+		[[ $RETVAL -ne 0 ]] &amp;&amp; test_fail $I result</div><div class='add'>+</div><div class='add'>+		check_test_results $I "$ECPUS" "$STATES" "$ICPUS"</div><div class='ctx'> 		((I++))</div><div class='ctx'> 	done</div><div class='add'>+	cd ..</div><div class='add'>+	rmdir rtest</div><div class='ctx'> 	echo "All $I tests of $TEST PASSED."</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -932,6 +1115,7 @@ test_isolated()</div><div class='ctx'> 	echo $$ &gt; $CGROUP2/cgroup.procs</div><div class='ctx'> 	[[ -d A1 ]] &amp;&amp; rmdir A1</div><div class='ctx'> 	null_isolcpus_check</div><div class='add'>+	pause 0.05</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -997,10 +1181,13 @@ test_inotify()</div><div class='ctx'> 	else</div><div class='ctx'> 		echo "Inotify test PASSED"</div><div class='ctx'> 	fi</div><div class='add'>+	echo member &gt; cpuset.cpus.partition</div><div class='add'>+	echo "" &gt; cpuset.cpus</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> trap cleanup 0 2 3 6</div><div class='ctx'> run_state_test TEST_MATRIX</div><div class='add'>+run_remote_state_test REMOTE_TEST_MATRIX</div><div class='ctx'> test_isolated</div><div class='ctx'> test_inotify</div><div class='ctx'> echo "All tests PASSED."</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/test_freezer.c b/tools/testing/selftests/cgroup/test_freezer.c<br/>index 8730645d363a..97fae92c8387 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_freezer.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_freezer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_freezer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/test_freezer.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "cgroup_util.h"</div><div class='ctx'> </div><div class='ctx'> #define DEBUG</div><div class='hunk'>@@ -804,6 +804,662 @@ cleanup:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Get the current frozen_usec for the cgroup.</div><div class='add'>+ */</div><div class='add'>+static long cg_check_freezetime(const char *cgroup)</div><div class='add'>+{</div><div class='add'>+	return cg_read_key_long(cgroup, "cgroup.stat.local",</div><div class='add'>+				"frozen_usec ");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test that the freeze time will behave as expected for an empty cgroup.</div><div class='add'>+ */</div><div class='add'>+static int test_cgfreezer_time_empty(const char *root)</div><div class='add'>+{</div><div class='add'>+	int ret = KSFT_FAIL;</div><div class='add'>+	char *cgroup = NULL;</div><div class='add'>+	long prev, curr;</div><div class='add'>+</div><div class='add'>+	cgroup = cg_name(root, "cg_time_test_empty");</div><div class='add'>+	if (!cgroup)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 1) Create an empty cgroup and check that its freeze time</div><div class='add'>+	 *    is 0.</div><div class='add'>+	 */</div><div class='add'>+	if (cg_create(cgroup))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt; 0) {</div><div class='add'>+		ret = KSFT_SKIP;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+	if (curr &gt; 0) {</div><div class='add'>+		debug("Expect time (%ld) to be 0\n", curr);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_nowait(cgroup, true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 2) Sleep for 1000 us. Check that the freeze time is at</div><div class='add'>+	 *    least 1000 us.</div><div class='add'>+	 */</div><div class='add'>+	usleep(1000);</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt; 1000) {</div><div class='add'>+		debug("Expect time (%ld) to be at least 1000 us\n",</div><div class='add'>+		      curr);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 3) Unfreeze the cgroup. Check that the freeze time is</div><div class='add'>+	 *    larger than at 2).</div><div class='add'>+	 */</div><div class='add'>+	if (cg_freeze_nowait(cgroup, false))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt;= prev) {</div><div class='add'>+		debug("Expect time (%ld) to be more than previous check (%ld)\n",</div><div class='add'>+		      curr, prev);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 4) Check the freeze time again to ensure that it has not</div><div class='add'>+	 *    changed.</div><div class='add'>+	 */</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr != prev) {</div><div class='add'>+		debug("Expect time (%ld) to be unchanged from previous check (%ld)\n",</div><div class='add'>+		      curr, prev);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = KSFT_PASS;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	if (cgroup)</div><div class='add'>+		cg_destroy(cgroup);</div><div class='add'>+	free(cgroup);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A simple test for cgroup freezer time accounting. This test follows</div><div class='add'>+ * the same flow as test_cgfreezer_time_empty, but with a single process</div><div class='add'>+ * in the cgroup.</div><div class='add'>+ */</div><div class='add'>+static int test_cgfreezer_time_simple(const char *root)</div><div class='add'>+{</div><div class='add'>+	int ret = KSFT_FAIL;</div><div class='add'>+	char *cgroup = NULL;</div><div class='add'>+	long prev, curr;</div><div class='add'>+</div><div class='add'>+	cgroup = cg_name(root, "cg_time_test_simple");</div><div class='add'>+	if (!cgroup)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 1) Create a cgroup and check that its freeze time is 0.</div><div class='add'>+	 */</div><div class='add'>+	if (cg_create(cgroup))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt; 0) {</div><div class='add'>+		ret = KSFT_SKIP;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+	if (curr &gt; 0) {</div><div class='add'>+		debug("Expect time (%ld) to be 0\n", curr);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 2) Populate the cgroup with one child and check that the</div><div class='add'>+	 *    freeze time is still 0.</div><div class='add'>+	 */</div><div class='add'>+	cg_run_nowait(cgroup, child_fn, NULL);</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &gt; prev) {</div><div class='add'>+		debug("Expect time (%ld) to be 0\n", curr);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_nowait(cgroup, true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 3) Sleep for 1000 us. Check that the freeze time is at</div><div class='add'>+	 *    least 1000 us.</div><div class='add'>+	 */</div><div class='add'>+	usleep(1000);</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt; 1000) {</div><div class='add'>+		debug("Expect time (%ld) to be at least 1000 us\n",</div><div class='add'>+		      curr);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 4) Unfreeze the cgroup. Check that the freeze time is</div><div class='add'>+	 *    larger than at 3).</div><div class='add'>+	 */</div><div class='add'>+	if (cg_freeze_nowait(cgroup, false))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt;= prev) {</div><div class='add'>+		debug("Expect time (%ld) to be more than previous check (%ld)\n",</div><div class='add'>+		      curr, prev);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 5) Sleep for 1000 us. Check that the freeze time is the</div><div class='add'>+	 *    same as at 4).</div><div class='add'>+	 */</div><div class='add'>+	usleep(1000);</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr != prev) {</div><div class='add'>+		debug("Expect time (%ld) to be unchanged from previous check (%ld)\n",</div><div class='add'>+		      curr, prev);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = KSFT_PASS;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	if (cgroup)</div><div class='add'>+		cg_destroy(cgroup);</div><div class='add'>+	free(cgroup);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test that freezer time accounting works as expected, even while we're</div><div class='add'>+ * populating a cgroup with processes.</div><div class='add'>+ */</div><div class='add'>+static int test_cgfreezer_time_populate(const char *root)</div><div class='add'>+{</div><div class='add'>+	int ret = KSFT_FAIL;</div><div class='add'>+	char *cgroup = NULL;</div><div class='add'>+	long prev, curr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cgroup = cg_name(root, "cg_time_test_populate");</div><div class='add'>+	if (!cgroup)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_create(cgroup))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt; 0) {</div><div class='add'>+		ret = KSFT_SKIP;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+	if (curr &gt; 0) {</div><div class='add'>+		debug("Expect time (%ld) to be 0\n", curr);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 1) Populate the cgroup with 100 processes. Check that</div><div class='add'>+	 *    the freeze time is 0.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 100; i++)</div><div class='add'>+		cg_run_nowait(cgroup, child_fn, NULL);</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr != prev) {</div><div class='add'>+		debug("Expect time (%ld) to be 0\n", curr);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 2) Wait for the group to become fully populated. Check</div><div class='add'>+	 *    that the freeze time is 0.</div><div class='add'>+	 */</div><div class='add'>+	if (cg_wait_for_proc_count(cgroup, 100))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr != prev) {</div><div class='add'>+		debug("Expect time (%ld) to be 0\n", curr);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 3) Freeze the cgroup and then populate it with 100 more</div><div class='add'>+	 *    processes. Check that the freeze time continues to grow.</div><div class='add'>+	 */</div><div class='add'>+	if (cg_freeze_nowait(cgroup, true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt;= prev) {</div><div class='add'>+		debug("Expect time (%ld) to be more than previous check (%ld)\n",</div><div class='add'>+		      curr, prev);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 100; i++)</div><div class='add'>+		cg_run_nowait(cgroup, child_fn, NULL);</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt;= prev) {</div><div class='add'>+		debug("Expect time (%ld) to be more than previous check (%ld)\n",</div><div class='add'>+		      curr, prev);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 4) Wait for the group to become fully populated. Check</div><div class='add'>+	 *    that the freeze time is larger than at 3).</div><div class='add'>+	 */</div><div class='add'>+	if (cg_wait_for_proc_count(cgroup, 200))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt;= prev) {</div><div class='add'>+		debug("Expect time (%ld) to be more than previous check (%ld)\n",</div><div class='add'>+		      curr, prev);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 5) Unfreeze the cgroup. Check that the freeze time is</div><div class='add'>+	 *    larger than at 4).</div><div class='add'>+	 */</div><div class='add'>+	if (cg_freeze_nowait(cgroup, false))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt;= prev) {</div><div class='add'>+		debug("Expect time (%ld) to be more than previous check (%ld)\n",</div><div class='add'>+		      curr, prev);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 6) Kill the processes. Check that the freeze time is the</div><div class='add'>+	 *    same as it was at 5).</div><div class='add'>+	 */</div><div class='add'>+	if (cg_killall(cgroup))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr != prev) {</div><div class='add'>+		debug("Expect time (%ld) to be unchanged from previous check (%ld)\n",</div><div class='add'>+		      curr, prev);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 7) Freeze and unfreeze the cgroup. Check that the freeze</div><div class='add'>+	 *    time is larger than it was at 6).</div><div class='add'>+	 */</div><div class='add'>+	if (cg_freeze_nowait(cgroup, true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	if (cg_freeze_nowait(cgroup, false))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	prev = curr;</div><div class='add'>+	curr = cg_check_freezetime(cgroup);</div><div class='add'>+	if (curr &lt;= prev) {</div><div class='add'>+		debug("Expect time (%ld) to be more than previous check (%ld)\n",</div><div class='add'>+		      curr, prev);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = KSFT_PASS;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	if (cgroup)</div><div class='add'>+		cg_destroy(cgroup);</div><div class='add'>+	free(cgroup);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test that frozen time for a cgroup continues to work as expected,</div><div class='add'>+ * even as processes are migrated. Frozen cgroup A's freeze time should</div><div class='add'>+ * continue to increase and running cgroup B's should stay 0.</div><div class='add'>+ */</div><div class='add'>+static int test_cgfreezer_time_migrate(const char *root)</div><div class='add'>+{</div><div class='add'>+	long prev_A, curr_A, curr_B;</div><div class='add'>+	char *cgroup[2] = {0};</div><div class='add'>+	int ret = KSFT_FAIL;</div><div class='add'>+	int pid;</div><div class='add'>+</div><div class='add'>+	cgroup[0] = cg_name(root, "cg_time_test_migrate_A");</div><div class='add'>+	if (!cgroup[0])</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	cgroup[1] = cg_name(root, "cg_time_test_migrate_B");</div><div class='add'>+	if (!cgroup[1])</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_create(cgroup[0]))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_check_freezetime(cgroup[0]) &lt; 0) {</div><div class='add'>+		ret = KSFT_SKIP;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cg_create(cgroup[1]))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	pid = cg_run_nowait(cgroup[0], child_fn, NULL);</div><div class='add'>+	if (pid &lt; 0)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_wait_for_proc_count(cgroup[0], 1))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	curr_A = cg_check_freezetime(cgroup[0]);</div><div class='add'>+	if (curr_A) {</div><div class='add'>+		debug("Expect time (%ld) to be 0\n", curr_A);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+	curr_B = cg_check_freezetime(cgroup[1]);</div><div class='add'>+	if (curr_B) {</div><div class='add'>+		debug("Expect time (%ld) to be 0\n", curr_B);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Freeze cgroup A.</div><div class='add'>+	 */</div><div class='add'>+	if (cg_freeze_wait(cgroup[0], true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+	prev_A = curr_A;</div><div class='add'>+	curr_A = cg_check_freezetime(cgroup[0]);</div><div class='add'>+	if (curr_A &lt;= prev_A) {</div><div class='add'>+		debug("Expect time (%ld) to be &gt; 0\n", curr_A);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Migrate from A (frozen) to B (running).</div><div class='add'>+	 */</div><div class='add'>+	if (cg_enter(cgroup[1], pid))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	usleep(1000);</div><div class='add'>+	curr_B = cg_check_freezetime(cgroup[1]);</div><div class='add'>+	if (curr_B) {</div><div class='add'>+		debug("Expect time (%ld) to be 0\n", curr_B);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prev_A = curr_A;</div><div class='add'>+	curr_A = cg_check_freezetime(cgroup[0]);</div><div class='add'>+	if (curr_A &lt;= prev_A) {</div><div class='add'>+		debug("Expect time (%ld) to be more than previous check (%ld)\n",</div><div class='add'>+		      curr_A, prev_A);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = KSFT_PASS;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	if (cgroup[0])</div><div class='add'>+		cg_destroy(cgroup[0]);</div><div class='add'>+	free(cgroup[0]);</div><div class='add'>+	if (cgroup[1])</div><div class='add'>+		cg_destroy(cgroup[1]);</div><div class='add'>+	free(cgroup[1]);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The test creates a cgroup and freezes it. Then it creates a child cgroup.</div><div class='add'>+ * After that it checks that the child cgroup has a non-zero freeze time</div><div class='add'>+ * that is less than the parent's. Next, it freezes the child, unfreezes</div><div class='add'>+ * the parent, and sleeps. Finally, it checks that the child's freeze</div><div class='add'>+ * time has grown larger than the parent's.</div><div class='add'>+ */</div><div class='add'>+static int test_cgfreezer_time_parent(const char *root)</div><div class='add'>+{</div><div class='add'>+	char *parent, *child = NULL;</div><div class='add'>+	int ret = KSFT_FAIL;</div><div class='add'>+	long ptime, ctime;</div><div class='add'>+</div><div class='add'>+	parent = cg_name(root, "cg_test_parent_A");</div><div class='add'>+	if (!parent)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	child = cg_name(parent, "cg_test_parent_B");</div><div class='add'>+	if (!child)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_create(parent))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_check_freezetime(parent) &lt; 0) {</div><div class='add'>+		ret = KSFT_SKIP;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_wait(parent, true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	usleep(1000);</div><div class='add'>+	if (cg_create(child))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_check_frozen(child, true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since the parent was frozen the entire time the child cgroup</div><div class='add'>+	 * was being created, we expect the parent's freeze time to be</div><div class='add'>+	 * larger than the child's.</div><div class='add'>+	 *</div><div class='add'>+	 * Ideally, we would be able to check both times simultaneously,</div><div class='add'>+	 * but here we get the child's after we get the parent's.</div><div class='add'>+	 */</div><div class='add'>+	ptime = cg_check_freezetime(parent);</div><div class='add'>+	ctime = cg_check_freezetime(child);</div><div class='add'>+	if (ptime &lt;= ctime) {</div><div class='add'>+		debug("Expect ptime (%ld) &gt; ctime (%ld)\n", ptime, ctime);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_nowait(child, true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_wait(parent, false))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_check_frozen(child, true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	usleep(100000);</div><div class='add'>+</div><div class='add'>+	ctime = cg_check_freezetime(child);</div><div class='add'>+	ptime = cg_check_freezetime(parent);</div><div class='add'>+</div><div class='add'>+	if (ctime &lt;= ptime) {</div><div class='add'>+		debug("Expect ctime (%ld) &gt; ptime (%ld)\n", ctime, ptime);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = KSFT_PASS;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	if (child)</div><div class='add'>+		cg_destroy(child);</div><div class='add'>+	free(child);</div><div class='add'>+	if (parent)</div><div class='add'>+		cg_destroy(parent);</div><div class='add'>+	free(parent);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The test creates a parent cgroup and a child cgroup. Then, it freezes</div><div class='add'>+ * the child and checks that the child's freeze time is greater than the</div><div class='add'>+ * parent's, which should be zero.</div><div class='add'>+ */</div><div class='add'>+static int test_cgfreezer_time_child(const char *root)</div><div class='add'>+{</div><div class='add'>+	char *parent, *child = NULL;</div><div class='add'>+	int ret = KSFT_FAIL;</div><div class='add'>+	long ptime, ctime;</div><div class='add'>+</div><div class='add'>+	parent = cg_name(root, "cg_test_child_A");</div><div class='add'>+	if (!parent)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	child = cg_name(parent, "cg_test_child_B");</div><div class='add'>+	if (!child)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_create(parent))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_check_freezetime(parent) &lt; 0) {</div><div class='add'>+		ret = KSFT_SKIP;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cg_create(child))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_wait(child, true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	ctime = cg_check_freezetime(child);</div><div class='add'>+	ptime = cg_check_freezetime(parent);</div><div class='add'>+	if (ptime != 0) {</div><div class='add'>+		debug("Expect ptime (%ld) to be 0\n", ptime);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctime &lt;= ptime) {</div><div class='add'>+		debug("Expect ctime (%ld) &lt;= ptime (%ld)\n", ctime, ptime);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = KSFT_PASS;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	if (child)</div><div class='add'>+		cg_destroy(child);</div><div class='add'>+	free(child);</div><div class='add'>+	if (parent)</div><div class='add'>+		cg_destroy(parent);</div><div class='add'>+	free(parent);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The test creates the following hierarchy:</div><div class='add'>+ *    A</div><div class='add'>+ *    |</div><div class='add'>+ *    B</div><div class='add'>+ *    |</div><div class='add'>+ *    C</div><div class='add'>+ *</div><div class='add'>+ * Then it freezes the cgroups in the order C, B, A.</div><div class='add'>+ * Then it unfreezes the cgroups in the order A, B, C.</div><div class='add'>+ * Then it checks that C's freeze time is larger than B's and</div><div class='add'>+ * that B's is larger than A's.</div><div class='add'>+ */</div><div class='add'>+static int test_cgfreezer_time_nested(const char *root)</div><div class='add'>+{</div><div class='add'>+	char *cgroup[3] = {0};</div><div class='add'>+	int ret = KSFT_FAIL;</div><div class='add'>+	long time[3] = {0};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cgroup[0] = cg_name(root, "cg_test_time_A");</div><div class='add'>+	if (!cgroup[0])</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	cgroup[1] = cg_name(cgroup[0], "B");</div><div class='add'>+	if (!cgroup[1])</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	cgroup[2] = cg_name(cgroup[1], "C");</div><div class='add'>+	if (!cgroup[2])</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_create(cgroup[0]))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_check_freezetime(cgroup[0]) &lt; 0) {</div><div class='add'>+		ret = KSFT_SKIP;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cg_create(cgroup[1]))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_create(cgroup[2]))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_nowait(cgroup[2], true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_nowait(cgroup[1], true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_nowait(cgroup[0], true))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	usleep(1000);</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_nowait(cgroup[0], false))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_nowait(cgroup[1], false))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (cg_freeze_nowait(cgroup[2], false))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	time[2] = cg_check_freezetime(cgroup[2]);</div><div class='add'>+	time[1] = cg_check_freezetime(cgroup[1]);</div><div class='add'>+	time[0] = cg_check_freezetime(cgroup[0]);</div><div class='add'>+</div><div class='add'>+	if (time[2] &lt;= time[1]) {</div><div class='add'>+		debug("Expect C's time (%ld) &gt; B's time (%ld)", time[2], time[1]);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (time[1] &lt;= time[0]) {</div><div class='add'>+		debug("Expect B's time (%ld) &gt; A's time (%ld)", time[1], time[0]);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = KSFT_PASS;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	for (i = 2; i &gt;= 0 &amp;&amp; cgroup[i]; i--) {</div><div class='add'>+		cg_destroy(cgroup[i]);</div><div class='add'>+		free(cgroup[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define T(x) { x, #x }</div><div class='ctx'> struct cgfreezer_test {</div><div class='ctx'> 	int (*fn)(const char *root);</div><div class='hunk'>@@ -819,14 +1475,23 @@ struct cgfreezer_test {</div><div class='ctx'> 	T(test_cgfreezer_stopped),</div><div class='ctx'> 	T(test_cgfreezer_ptraced),</div><div class='ctx'> 	T(test_cgfreezer_vfork),</div><div class='add'>+	T(test_cgfreezer_time_empty),</div><div class='add'>+	T(test_cgfreezer_time_simple),</div><div class='add'>+	T(test_cgfreezer_time_populate),</div><div class='add'>+	T(test_cgfreezer_time_migrate),</div><div class='add'>+	T(test_cgfreezer_time_parent),</div><div class='add'>+	T(test_cgfreezer_time_child),</div><div class='add'>+	T(test_cgfreezer_time_nested),</div><div class='ctx'> };</div><div class='ctx'> #undef T</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	char root[PATH_MAX];</div><div class='del'>-	int i, ret = EXIT_SUCCESS;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='add'>+	ksft_print_header();</div><div class='add'>+	ksft_set_plan(ARRAY_SIZE(tests));</div><div class='ctx'> 	if (cg_find_unified_root(root, sizeof(root), NULL))</div><div class='ctx'> 		ksft_exit_skip("cgroup v2 isn't mounted\n");</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(tests); i++) {</div><div class='hunk'>@@ -838,11 +1503,10 @@ int main(int argc, char *argv[])</div><div class='ctx'> 			ksft_test_result_skip("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			ret = EXIT_FAILURE;</div><div class='ctx'> 			ksft_test_result_fail("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ksft_finished();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c b/tools/testing/selftests/cgroup/test_hugetlb_memcg.c<br/>index 856f9508ea56..f451aa449be6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_hugetlb_memcg.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_hugetlb_memcg.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_hugetlb_memcg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/test_hugetlb_memcg.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "cgroup_util.h"</div><div class='ctx'> </div><div class='ctx'> #define ADDR ((void *)(0x0UL))</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/test_kill.c b/tools/testing/selftests/cgroup/test_kill.c<br/>index 0e5bb6c7307a..c8c9d306925b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_kill.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_kill.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_kill.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/test_kill.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "../pidfd/pidfd.h"</div><div class='ctx'> #include "cgroup_util.h"</div><div class='ctx'> </div><div class='hunk'>@@ -274,8 +274,10 @@ struct cgkill_test {</div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	char root[PATH_MAX];</div><div class='del'>-	int i, ret = EXIT_SUCCESS;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='add'>+	ksft_print_header();</div><div class='add'>+	ksft_set_plan(ARRAY_SIZE(tests));</div><div class='ctx'> 	if (cg_find_unified_root(root, sizeof(root), NULL))</div><div class='ctx'> 		ksft_exit_skip("cgroup v2 isn't mounted\n");</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(tests); i++) {</div><div class='hunk'>@@ -287,11 +289,10 @@ int main(int argc, char *argv[])</div><div class='ctx'> 			ksft_test_result_skip("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			ret = EXIT_FAILURE;</div><div class='ctx'> 			ksft_test_result_fail("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ksft_finished();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/test_kmem.c b/tools/testing/selftests/cgroup/test_kmem.c<br/>index 96693d8772be..ca38525484e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_kmem.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_kmem.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_kmem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/test_kmem.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;sys/sysinfo.h&gt;</div><div class='ctx'> #include &lt;pthread.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "cgroup_util.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -308,6 +308,7 @@ static int test_kmem_dead_cgroups(const char *root)</div><div class='ctx'> 	char *parent;</div><div class='ctx'> 	long dead;</div><div class='ctx'> 	int i;</div><div class='add'>+	int max_time = 20;</div><div class='ctx'> </div><div class='ctx'> 	parent = cg_name(root, "kmem_dead_cgroups_test");</div><div class='ctx'> 	if (!parent)</div><div class='hunk'>@@ -322,7 +323,7 @@ static int test_kmem_dead_cgroups(const char *root)</div><div class='ctx'> 	if (cg_run_in_subcgroups(parent, alloc_dcache, (void *)100, 30))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+	for (i = 0; i &lt; max_time; i++) {</div><div class='ctx'> 		dead = cg_read_key_long(parent, "cgroup.stat",</div><div class='ctx'> 					"nr_dying_descendants ");</div><div class='ctx'> 		if (dead == 0) {</div><div class='hunk'>@@ -334,6 +335,8 @@ static int test_kmem_dead_cgroups(const char *root)</div><div class='ctx'> 		 * let's wait a bit and repeat.</div><div class='ctx'> 		 */</div><div class='ctx'> 		sleep(1);</div><div class='add'>+		if (i &gt; 5)</div><div class='add'>+			printf("Waiting time longer than 5s; wait: %ds (dead: %ld)\n", i, dead);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='hunk'>@@ -418,8 +421,10 @@ struct kmem_test {</div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	char root[PATH_MAX];</div><div class='del'>-	int i, ret = EXIT_SUCCESS;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='add'>+	ksft_print_header();</div><div class='add'>+	ksft_set_plan(ARRAY_SIZE(tests));</div><div class='ctx'> 	if (cg_find_unified_root(root, sizeof(root), NULL))</div><div class='ctx'> 		ksft_exit_skip("cgroup v2 isn't mounted\n");</div><div class='ctx'> </div><div class='hunk'>@@ -443,11 +448,10 @@ int main(int argc, char **argv)</div><div class='ctx'> 			ksft_test_result_skip("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			ret = EXIT_FAILURE;</div><div class='ctx'> 			ksft_test_result_fail("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ksft_finished();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c<br/>index 16f5d74ae762..4e1647568c5b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_memcontrol.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_memcontrol.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_memcontrol.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/test_memcontrol.c</a></div><div class='hunk'>@@ -18,12 +18,90 @@</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "cgroup_util.h"</div><div class='ctx'> </div><div class='ctx'> static bool has_localevents;</div><div class='ctx'> static bool has_recursiveprot;</div><div class='ctx'> </div><div class='add'>+int get_temp_fd(void)</div><div class='add'>+{</div><div class='add'>+	return open(".", O_TMPFILE | O_RDWR | O_EXCL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int alloc_pagecache(int fd, size_t size)</div><div class='add'>+{</div><div class='add'>+	char buf[PAGE_SIZE];</div><div class='add'>+	struct stat st;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (fstat(fd, &amp;st))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	size += st.st_size;</div><div class='add'>+</div><div class='add'>+	if (ftruncate(fd, size))</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size; i += sizeof(buf))</div><div class='add'>+		read(fd, buf, sizeof(buf));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int alloc_anon(const char *cgroup, void *arg)</div><div class='add'>+{</div><div class='add'>+	size_t size = (unsigned long)arg;</div><div class='add'>+	char *buf, *ptr;</div><div class='add'>+</div><div class='add'>+	buf = malloc(size);</div><div class='add'>+	for (ptr = buf; ptr &lt; buf + size; ptr += PAGE_SIZE)</div><div class='add'>+		*ptr = 0;</div><div class='add'>+</div><div class='add'>+	free(buf);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int is_swap_enabled(void)</div><div class='add'>+{</div><div class='add'>+	char buf[PAGE_SIZE];</div><div class='add'>+	const char delim[] = "\n";</div><div class='add'>+	int cnt = 0;</div><div class='add'>+	char *line;</div><div class='add'>+</div><div class='add'>+	if (read_text("/proc/swaps", buf, sizeof(buf)) &lt;= 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (line = strtok(buf, delim); line; line = strtok(NULL, delim))</div><div class='add'>+		cnt++;</div><div class='add'>+</div><div class='add'>+	return cnt &gt; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int set_oom_adj_score(int pid, int score)</div><div class='add'>+{</div><div class='add'>+	char path[PATH_MAX];</div><div class='add'>+	int fd, len;</div><div class='add'>+</div><div class='add'>+	sprintf(path, "/proc/%d/oom_score_adj", pid);</div><div class='add'>+</div><div class='add'>+	fd = open(path, O_WRONLY | O_APPEND);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		return fd;</div><div class='add'>+</div><div class='add'>+	len = dprintf(fd, "%d", score);</div><div class='add'>+	if (len &lt; 0) {</div><div class='add'>+		close(fd);</div><div class='add'>+		return len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	close(fd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This test creates two nested cgroups with and without enabling</div><div class='ctx'>  * the memory controller.</div><div class='hunk'>@@ -380,10 +458,11 @@ static bool reclaim_until(const char *memcg, long goal);</div><div class='ctx'>  *</div><div class='ctx'>  * Then it checks actual memory usages and expects that:</div><div class='ctx'>  * A/B    memory.current ~= 50M</div><div class='del'>- * A/B/C  memory.current ~= 29M</div><div class='del'>- * A/B/D  memory.current ~= 21M</div><div class='del'>- * A/B/E  memory.current ~= 0</div><div class='del'>- * A/B/F  memory.current  = 0</div><div class='add'>+ * A/B/C  memory.current ~= 29M [memory.events:low &gt; 0]</div><div class='add'>+ * A/B/D  memory.current ~= 21M [memory.events:low &gt; 0]</div><div class='add'>+ * A/B/E  memory.current ~= 0   [memory.events:low == 0 if !memory_recursiveprot,</div><div class='add'>+ *				 undefined otherwise]</div><div class='add'>+ * A/B/F  memory.current  = 0   [memory.events:low == 0]</div><div class='ctx'>  * (for origin of the numbers, see model in memcg_protection.m.)</div><div class='ctx'>  *</div><div class='ctx'>  * After that it tries to allocate more than there is</div><div class='hunk'>@@ -495,10 +574,10 @@ static int test_memcg_protection(const char *root, bool min)</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(children); i++)</div><div class='ctx'> 		c[i] = cg_read_long(children[i], "memory.current");</div><div class='ctx'> </div><div class='del'>-	if (!values_close(c[0], MB(29), 10))</div><div class='add'>+	if (!values_close(c[0], MB(29), 15))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	if (!values_close(c[1], MB(21), 10))</div><div class='add'>+	if (!values_close(c[1], MB(21), 20))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	if (c[3] != 0)</div><div class='hunk'>@@ -525,7 +604,14 @@ static int test_memcg_protection(const char *root, bool min)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Child 2 has memory.low=0, but some low protection may still be</div><div class='add'>+	 * distributed down from its parent with memory.low=50M if cgroup2</div><div class='add'>+	 * memory_recursiveprot mount option is enabled. Ignore the low</div><div class='add'>+	 * event count in this case.</div><div class='add'>+	 */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(children); i++) {</div><div class='add'>+		int ignore_low_events_index = has_recursiveprot ? 2 : -1;</div><div class='ctx'> 		int no_low_events_index = 1;</div><div class='ctx'> 		long low, oom;</div><div class='ctx'> </div><div class='hunk'>@@ -534,6 +620,8 @@ static int test_memcg_protection(const char *root, bool min)</div><div class='ctx'> </div><div class='ctx'> 		if (oom)</div><div class='ctx'> 			goto cleanup;</div><div class='add'>+		if (i == ignore_low_events_index)</div><div class='add'>+			continue;</div><div class='ctx'> 		if (i &lt;= no_low_events_index &amp;&amp; low &lt;= 0)</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 		if (i &gt; no_low_events_index &amp;&amp; low)</div><div class='hunk'>@@ -1562,8 +1650,10 @@ struct memcg_test {</div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	char root[PATH_MAX];</div><div class='del'>-	int i, proc_status, ret = EXIT_SUCCESS;</div><div class='add'>+	int i, proc_status;</div><div class='ctx'> </div><div class='add'>+	ksft_print_header();</div><div class='add'>+	ksft_set_plan(ARRAY_SIZE(tests));</div><div class='ctx'> 	if (cg_find_unified_root(root, sizeof(root), NULL))</div><div class='ctx'> 		ksft_exit_skip("cgroup v2 isn't mounted\n");</div><div class='ctx'> </div><div class='hunk'>@@ -1597,11 +1687,10 @@ int main(int argc, char **argv)</div><div class='ctx'> 			ksft_test_result_skip("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			ret = EXIT_FAILURE;</div><div class='ctx'> 			ksft_test_result_fail("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ksft_finished();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/test_pids.c b/tools/testing/selftests/cgroup/test_pids.c<br/>index 9ecb83c6cc5c..9a387c815d2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_pids.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_pids.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_pids.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/test_pids.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "cgroup_util.h"</div><div class='ctx'> </div><div class='ctx'> static int run_success(const char *cgroup, void *arg)</div><div class='hunk'>@@ -77,6 +77,9 @@ static int test_pids_events(const char *root)</div><div class='ctx'> 	char *cg_parent = NULL, *cg_child = NULL;</div><div class='ctx'> 	int pid;</div><div class='ctx'> </div><div class='add'>+	if (cgroup_feature("pids_localevents") &lt;= 0)</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+</div><div class='ctx'> 	cg_parent = cg_name(root, "pids_parent");</div><div class='ctx'> 	cg_child = cg_name(cg_parent, "pids_child");</div><div class='ctx'> 	if (!cg_parent || !cg_child)</div><div class='head'>diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/selftests/cgroup/test_zswap.c<br/>index 40de679248b8..64ebc3f3f203 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_zswap.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cgroup/test_zswap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cgroup/test_zswap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cgroup/test_zswap.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "cgroup_util.h"</div><div class='ctx'> </div><div class='ctx'> static int read_int(const char *path, size_t *value)</div><div class='hunk'>@@ -338,7 +338,7 @@ static int test_zswap_writeback_one(const char *cgroup, bool wb)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (wb != !!zswpwb_after) {</div><div class='del'>-		ksft_print_msg("zswpwb_after is %ld while wb is %s",</div><div class='add'>+		ksft_print_msg("zswpwb_after is %ld while wb is %s\n",</div><div class='ctx'> 				zswpwb_after, wb ? "enabled" : "disabled");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -597,8 +597,10 @@ static bool zswap_configured(void)</div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	char root[PATH_MAX];</div><div class='del'>-	int i, ret = EXIT_SUCCESS;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='add'>+	ksft_print_header();</div><div class='add'>+	ksft_set_plan(ARRAY_SIZE(tests));</div><div class='ctx'> 	if (cg_find_unified_root(root, sizeof(root), NULL))</div><div class='ctx'> 		ksft_exit_skip("cgroup v2 isn't mounted\n");</div><div class='ctx'> </div><div class='hunk'>@@ -625,11 +627,10 @@ int main(int argc, char **argv)</div><div class='ctx'> 			ksft_test_result_skip("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			ret = EXIT_FAILURE;</div><div class='ctx'> 			ksft_test_result_fail("%s\n", tests[i].name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ksft_finished();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/clone3/clone3.c b/tools/testing/selftests/clone3/clone3.c<br/>index e61f07973ce5..289e0c7c1f09 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/clone3/clone3.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/clone3/clone3.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/clone3/clone3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/clone3/clone3.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;sched.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "clone3_selftests.h"</div><div class='ctx'> </div><div class='ctx'> enum test_mode {</div><div class='head'>diff --git a/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c b/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c<br/>index 3c196fa86c99..e82281efa273 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;sched.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> #include "clone3_selftests.h"</div><div class='ctx'> </div><div class='ctx'> static void child_exit(int ret)</div><div class='head'>diff --git a/tools/testing/selftests/clone3/clone3_clear_sighand.c b/tools/testing/selftests/clone3/clone3_clear_sighand.c<br/>index ce0426786828..de0c9d62015d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/clone3/clone3_clear_sighand.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/clone3/clone3_clear_sighand.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/clone3/clone3_clear_sighand.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/clone3/clone3_clear_sighand.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;sys/syscall.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "clone3_selftests.h"</div><div class='ctx'> </div><div class='ctx'> static void nop_handler(int signo)</div><div class='head'>diff --git a/tools/testing/selftests/clone3/clone3_selftests.h b/tools/testing/selftests/clone3/clone3_selftests.h<br/>index 3d2663fe50ba..a0593e8950f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/clone3/clone3_selftests.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/clone3/clone3_selftests.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/clone3/clone3_selftests.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/clone3/clone3_selftests.h</a></div><div class='hunk'>@@ -11,12 +11,12 @@</div><div class='ctx'> #include &lt;syscall.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define ptr_to_u64(ptr) ((__u64)((uintptr_t)(ptr)))</div><div class='ctx'> </div><div class='ctx'> #ifndef __NR_clone3</div><div class='del'>-#define __NR_clone3 -1</div><div class='add'>+#define __NR_clone3 435</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct __clone_args {</div><div class='head'>diff --git a/tools/testing/selftests/clone3/clone3_set_tid.c b/tools/testing/selftests/clone3/clone3_set_tid.c<br/>index bfb0da2b4fdd..5c944aee6b41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/clone3/clone3_set_tid.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/clone3/clone3_set_tid.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/clone3/clone3_set_tid.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/clone3/clone3_set_tid.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;sched.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "clone3_selftests.h"</div><div class='ctx'> </div><div class='ctx'> #define MAX_PID_NS_LEVEL 32</div><div class='head'>diff --git a/tools/testing/selftests/connector/proc_filter.c b/tools/testing/selftests/connector/proc_filter.c<br/>index 4a825b997666..36c11467a8f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/connector/proc_filter.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/connector/proc_filter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/connector/proc_filter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/connector/proc_filter.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;signal.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define NL_MESSAGE_SIZE (sizeof(struct nlmsghdr) + sizeof(struct cn_msg) + \</div><div class='ctx'> 			 sizeof(struct proc_input))</div><div class='head'>diff --git a/tools/testing/selftests/core/close_range_test.c b/tools/testing/selftests/core/close_range_test.c<br/>index e0d9851fe1c9..f14eca63f20c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/core/close_range_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/core/close_range_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/core/close_range_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/core/close_range_test.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;sys/resource.h&gt;</div><div class='ctx'> #include &lt;linux/close_range.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> #include "../clone3/clone3_selftests.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/core/unshare_test.c b/tools/testing/selftests/core/unshare_test.c<br/>index 7fec9dfb1b0e..ffce75a6c228 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/core/unshare_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/core/unshare_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/core/unshare_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/core/unshare_test.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;sys/resource.h&gt;</div><div class='ctx'> #include &lt;linux/close_range.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> #include "../clone3/clone3_selftests.h"</div><div class='ctx'> </div><div class='ctx'> TEST(unshare_EMFILE)</div><div class='head'>diff --git a/tools/testing/selftests/coredump/.gitignore b/tools/testing/selftests/coredump/.gitignore<br/>new file mode 100644<br/>index 000000000000..097f52db0be9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/coredump/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/coredump/.gitignore</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+stackdump_test</div><div class='add'>+coredump_socket_test</div><div class='add'>+coredump_socket_protocol_test</div><div class='head'>diff --git a/tools/testing/selftests/coredump/Makefile b/tools/testing/selftests/coredump/Makefile<br/>index ed210037b29d..dece1a31d561 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/coredump/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/coredump/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/coredump/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/coredump/Makefile</a></div><div class='hunk'>@@ -1,7 +1,13 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-CFLAGS = $(KHDR_INCLUDES)</div><div class='add'>+CFLAGS += -Wall -O0 -g $(KHDR_INCLUDES) $(TOOLS_INCLUDES)</div><div class='ctx'> </div><div class='del'>-TEST_GEN_PROGS := stackdump_test</div><div class='add'>+TEST_GEN_PROGS := stackdump_test \</div><div class='add'>+		  coredump_socket_test \</div><div class='add'>+		  coredump_socket_protocol_test</div><div class='ctx'> TEST_FILES := stackdump</div><div class='ctx'> </div><div class='ctx'> include ../lib.mk</div><div class='add'>+</div><div class='add'>+$(OUTPUT)/stackdump_test: coredump_test_helpers.c</div><div class='add'>+$(OUTPUT)/coredump_socket_test: coredump_test_helpers.c</div><div class='add'>+$(OUTPUT)/coredump_socket_protocol_test: coredump_test_helpers.c</div><div class='head'>diff --git a/tools/testing/selftests/coredump/config b/tools/testing/selftests/coredump/config<br/>new file mode 100644<br/>index 000000000000..a05ef112b4f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/coredump/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/coredump/config</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+CONFIG_COREDUMP=y</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='head'>diff --git a/tools/testing/selftests/coredump/coredump_socket_protocol_test.c b/tools/testing/selftests/coredump/coredump_socket_protocol_test.c<br/>new file mode 100644<br/>index 000000000000..d19b6717c53e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/coredump/coredump_socket_protocol_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/coredump/coredump_socket_protocol_test.c</a></div><div class='hunk'>@@ -0,0 +1,1568 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/epoll.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/un.h&gt;</div><div class='add'>+</div><div class='add'>+#include "coredump_test.h"</div><div class='add'>+</div><div class='add'>+#define NUM_CRASHING_COREDUMPS 5</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(coredump)</div><div class='add'>+{</div><div class='add'>+	FILE *file;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	self-&gt;pid_coredump_server = -ESRCH;</div><div class='add'>+	self-&gt;fd_tmpfs_detached = -1;</div><div class='add'>+	file = fopen("/proc/sys/kernel/core_pattern", "r");</div><div class='add'>+	ASSERT_NE(NULL, file);</div><div class='add'>+</div><div class='add'>+	ret = fread(self-&gt;original_core_pattern, 1, sizeof(self-&gt;original_core_pattern), file);</div><div class='add'>+	ASSERT_TRUE(ret || feof(file));</div><div class='add'>+	ASSERT_LT(ret, sizeof(self-&gt;original_core_pattern));</div><div class='add'>+</div><div class='add'>+	self-&gt;original_core_pattern[ret] = '\0';</div><div class='add'>+	self-&gt;fd_tmpfs_detached = create_detached_tmpfs();</div><div class='add'>+	ASSERT_GE(self-&gt;fd_tmpfs_detached, 0);</div><div class='add'>+</div><div class='add'>+	ret = fclose(file);</div><div class='add'>+	ASSERT_EQ(0, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(coredump)</div><div class='add'>+{</div><div class='add'>+	const char *reason;</div><div class='add'>+	FILE *file;</div><div class='add'>+	int ret, status;</div><div class='add'>+</div><div class='add'>+	if (self-&gt;pid_coredump_server &gt; 0) {</div><div class='add'>+		kill(self-&gt;pid_coredump_server, SIGTERM);</div><div class='add'>+		waitpid(self-&gt;pid_coredump_server, &amp;status, 0);</div><div class='add'>+	}</div><div class='add'>+	unlink("/tmp/coredump.file");</div><div class='add'>+	unlink("/tmp/coredump.socket");</div><div class='add'>+</div><div class='add'>+	file = fopen("/proc/sys/kernel/core_pattern", "w");</div><div class='add'>+	if (!file) {</div><div class='add'>+		reason = "Unable to open core_pattern";</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = fprintf(file, "%s", self-&gt;original_core_pattern);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		reason = "Unable to write to core_pattern";</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = fclose(file);</div><div class='add'>+	if (ret) {</div><div class='add'>+		reason = "Unable to close core_pattern";</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (self-&gt;fd_tmpfs_detached &gt;= 0) {</div><div class='add'>+		ret = close(self-&gt;fd_tmpfs_detached);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			reason = "Unable to close detached tmpfs";</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+		self-&gt;fd_tmpfs_detached = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+fail:</div><div class='add'>+	/* This should never happen */</div><div class='add'>+	fprintf(stderr, "Failed to cleanup coredump test: %s\n", reason);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket_request_kernel)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct stat st;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		struct coredump_req req = {};</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_core_file = -1, fd_peer_pidfd = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_core_file = creat("/tmp/coredump.file", 0644);</div><div class='add'>+		if (fd_core_file &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: creat coredump file failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_coredump_req(fd_coredump, &amp;req)) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: read_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!check_coredump_req(&amp;req, COREDUMP_ACK_SIZE_VER0,</div><div class='add'>+					COREDUMP_KERNEL | COREDUMP_USERSPACE |</div><div class='add'>+					COREDUMP_REJECT | COREDUMP_WAIT)) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: check_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!send_coredump_ack(fd_coredump, &amp;req,</div><div class='add'>+				       COREDUMP_KERNEL | COREDUMP_WAIT, 0)) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: send_coredump_ack failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_marker(fd_coredump, COREDUMP_MARK_REQACK)) {</div><div class='add'>+			fprintf(stderr, "socket_request_kernel: read_marker COREDUMP_MARK_REQACK failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (;;) {</div><div class='add'>+			char buffer[4096];</div><div class='add'>+			ssize_t bytes_read, bytes_write;</div><div class='add'>+</div><div class='add'>+			bytes_read = read(fd_coredump, buffer, sizeof(buffer));</div><div class='add'>+			if (bytes_read &lt; 0) {</div><div class='add'>+				fprintf(stderr, "socket_request_kernel: read from coredump socket failed: %m\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (bytes_read == 0)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			bytes_write = write(fd_core_file, buffer, bytes_read);</div><div class='add'>+			if (bytes_read != bytes_write) {</div><div class='add'>+				if (bytes_write &lt; 0 &amp;&amp; errno == ENOSPC)</div><div class='add'>+					continue;</div><div class='add'>+				fprintf(stderr, "socket_request_kernel: write to core file failed (read=%zd, write=%zd): %m\n",</div><div class='add'>+					bytes_read, bytes_write);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_request_kernel: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_core_file &gt;= 0)</div><div class='add'>+			close(fd_core_file);</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_TRUE(WCOREDUMP(status));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_GT((info.mask &amp; PIDFD_INFO_COREDUMP), 0);</div><div class='add'>+	ASSERT_GT((info.coredump_mask &amp; PIDFD_COREDUMPED), 0);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(stat("/tmp/coredump.file", &amp;st), 0);</div><div class='add'>+	ASSERT_GT(st.st_size, 0);</div><div class='add'>+	system("file /tmp/coredump.file");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket_request_userspace)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		struct coredump_req req = {};</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_userspace: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_userspace: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_userspace: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_userspace: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_request_userspace: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_request_userspace: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket_request_userspace: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_coredump_req(fd_coredump, &amp;req)) {</div><div class='add'>+			fprintf(stderr, "socket_request_userspace: read_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!check_coredump_req(&amp;req, COREDUMP_ACK_SIZE_VER0,</div><div class='add'>+					COREDUMP_KERNEL | COREDUMP_USERSPACE |</div><div class='add'>+					COREDUMP_REJECT | COREDUMP_WAIT)) {</div><div class='add'>+			fprintf(stderr, "socket_request_userspace: check_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!send_coredump_ack(fd_coredump, &amp;req,</div><div class='add'>+				       COREDUMP_USERSPACE | COREDUMP_WAIT, 0)) {</div><div class='add'>+			fprintf(stderr, "socket_request_userspace: send_coredump_ack failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_marker(fd_coredump, COREDUMP_MARK_REQACK)) {</div><div class='add'>+			fprintf(stderr, "socket_request_userspace: read_marker COREDUMP_MARK_REQACK failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (;;) {</div><div class='add'>+			char buffer[4096];</div><div class='add'>+			ssize_t bytes_read;</div><div class='add'>+</div><div class='add'>+			bytes_read = read(fd_coredump, buffer, sizeof(buffer));</div><div class='add'>+			if (bytes_read &gt; 0) {</div><div class='add'>+				fprintf(stderr, "socket_request_userspace: unexpected data received (expected no coredump data)\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (bytes_read &lt; 0) {</div><div class='add'>+				fprintf(stderr, "socket_request_userspace: read from coredump socket failed: %m\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (bytes_read == 0)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_request_userspace: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_TRUE(WCOREDUMP(status));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_GT((info.mask &amp; PIDFD_INFO_COREDUMP), 0);</div><div class='add'>+	ASSERT_GT((info.coredump_mask &amp; PIDFD_COREDUMPED), 0);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket_request_reject)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		struct coredump_req req = {};</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_reject: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_reject: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_reject: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_reject: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_request_reject: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_request_reject: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket_request_reject: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_coredump_req(fd_coredump, &amp;req)) {</div><div class='add'>+			fprintf(stderr, "socket_request_reject: read_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!check_coredump_req(&amp;req, COREDUMP_ACK_SIZE_VER0,</div><div class='add'>+					COREDUMP_KERNEL | COREDUMP_USERSPACE |</div><div class='add'>+					COREDUMP_REJECT | COREDUMP_WAIT)) {</div><div class='add'>+			fprintf(stderr, "socket_request_reject: check_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!send_coredump_ack(fd_coredump, &amp;req,</div><div class='add'>+				       COREDUMP_REJECT | COREDUMP_WAIT, 0)) {</div><div class='add'>+			fprintf(stderr, "socket_request_reject: send_coredump_ack failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_marker(fd_coredump, COREDUMP_MARK_REQACK)) {</div><div class='add'>+			fprintf(stderr, "socket_request_reject: read_marker COREDUMP_MARK_REQACK failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (;;) {</div><div class='add'>+			char buffer[4096];</div><div class='add'>+			ssize_t bytes_read;</div><div class='add'>+</div><div class='add'>+			bytes_read = read(fd_coredump, buffer, sizeof(buffer));</div><div class='add'>+			if (bytes_read &gt; 0) {</div><div class='add'>+				fprintf(stderr, "socket_request_reject: unexpected data received (expected no coredump data for REJECT)\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (bytes_read &lt; 0) {</div><div class='add'>+				fprintf(stderr, "socket_request_reject: read from coredump socket failed: %m\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (bytes_read == 0)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_request_reject: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_FALSE(WCOREDUMP(status));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_GT((info.mask &amp; PIDFD_INFO_COREDUMP), 0);</div><div class='add'>+	ASSERT_GT((info.coredump_mask &amp; PIDFD_COREDUMPED), 0);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket_request_invalid_flag_combination)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		struct coredump_req req = {};</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_flag_combination: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_flag_combination: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_flag_combination: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_flag_combination: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_flag_combination: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_flag_combination: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_flag_combination: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_coredump_req(fd_coredump, &amp;req)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_flag_combination: read_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!check_coredump_req(&amp;req, COREDUMP_ACK_SIZE_VER0,</div><div class='add'>+					COREDUMP_KERNEL | COREDUMP_USERSPACE |</div><div class='add'>+					COREDUMP_REJECT | COREDUMP_WAIT)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_flag_combination: check_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!send_coredump_ack(fd_coredump, &amp;req,</div><div class='add'>+				       COREDUMP_KERNEL | COREDUMP_REJECT | COREDUMP_WAIT, 0)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_flag_combination: send_coredump_ack failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_marker(fd_coredump, COREDUMP_MARK_CONFLICTING)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_flag_combination: read_marker COREDUMP_MARK_CONFLICTING failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_request_invalid_flag_combination: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_FALSE(WCOREDUMP(status));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_GT((info.mask &amp; PIDFD_INFO_COREDUMP), 0);</div><div class='add'>+	ASSERT_GT((info.coredump_mask &amp; PIDFD_COREDUMPED), 0);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket_request_unknown_flag)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		struct coredump_req req = {};</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_unknown_flag: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_unknown_flag: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_unknown_flag: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_unknown_flag: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_request_unknown_flag: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_request_unknown_flag: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket_request_unknown_flag: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_coredump_req(fd_coredump, &amp;req)) {</div><div class='add'>+			fprintf(stderr, "socket_request_unknown_flag: read_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!check_coredump_req(&amp;req, COREDUMP_ACK_SIZE_VER0,</div><div class='add'>+					COREDUMP_KERNEL | COREDUMP_USERSPACE |</div><div class='add'>+					COREDUMP_REJECT | COREDUMP_WAIT)) {</div><div class='add'>+			fprintf(stderr, "socket_request_unknown_flag: check_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!send_coredump_ack(fd_coredump, &amp;req, (1ULL &lt;&lt; 63), 0)) {</div><div class='add'>+			fprintf(stderr, "socket_request_unknown_flag: send_coredump_ack failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_marker(fd_coredump, COREDUMP_MARK_UNSUPPORTED)) {</div><div class='add'>+			fprintf(stderr, "socket_request_unknown_flag: read_marker COREDUMP_MARK_UNSUPPORTED failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_request_unknown_flag: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_FALSE(WCOREDUMP(status));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_GT((info.mask &amp; PIDFD_INFO_COREDUMP), 0);</div><div class='add'>+	ASSERT_GT((info.coredump_mask &amp; PIDFD_COREDUMPED), 0);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket_request_invalid_size_small)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		struct coredump_req req = {};</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_small: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_small: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_small: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_small: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_small: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_small: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_small: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_coredump_req(fd_coredump, &amp;req)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_small: read_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!check_coredump_req(&amp;req, COREDUMP_ACK_SIZE_VER0,</div><div class='add'>+					COREDUMP_KERNEL | COREDUMP_USERSPACE |</div><div class='add'>+					COREDUMP_REJECT | COREDUMP_WAIT)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_small: check_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!send_coredump_ack(fd_coredump, &amp;req,</div><div class='add'>+				       COREDUMP_REJECT | COREDUMP_WAIT,</div><div class='add'>+				       COREDUMP_ACK_SIZE_VER0 / 2)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_small: send_coredump_ack failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_marker(fd_coredump, COREDUMP_MARK_MINSIZE)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_small: read_marker COREDUMP_MARK_MINSIZE failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_request_invalid_size_small: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_FALSE(WCOREDUMP(status));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_GT((info.mask &amp; PIDFD_INFO_COREDUMP), 0);</div><div class='add'>+	ASSERT_GT((info.coredump_mask &amp; PIDFD_COREDUMPED), 0);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket_request_invalid_size_large)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		struct coredump_req req = {};</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_large: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_large: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_large: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_large: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_large: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_large: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_large: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_coredump_req(fd_coredump, &amp;req)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_large: read_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!check_coredump_req(&amp;req, COREDUMP_ACK_SIZE_VER0,</div><div class='add'>+					COREDUMP_KERNEL | COREDUMP_USERSPACE |</div><div class='add'>+					COREDUMP_REJECT | COREDUMP_WAIT)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_large: check_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!send_coredump_ack(fd_coredump, &amp;req,</div><div class='add'>+				       COREDUMP_REJECT | COREDUMP_WAIT,</div><div class='add'>+				       COREDUMP_ACK_SIZE_VER0 + PAGE_SIZE)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_large: send_coredump_ack failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_marker(fd_coredump, COREDUMP_MARK_MAXSIZE)) {</div><div class='add'>+			fprintf(stderr, "socket_request_invalid_size_large: read_marker COREDUMP_MARK_MAXSIZE failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_request_invalid_size_large: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_FALSE(WCOREDUMP(status));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_GT((info.mask &amp; PIDFD_INFO_COREDUMP), 0);</div><div class='add'>+	ASSERT_GT((info.coredump_mask &amp; PIDFD_COREDUMPED), 0);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test: PIDFD_INFO_COREDUMP_SIGNAL via socket coredump with SIGSEGV</div><div class='add'>+ *</div><div class='add'>+ * Verify that when using socket-based coredump protocol,</div><div class='add'>+ * the coredump_signal field is correctly exposed as SIGSEGV.</div><div class='add'>+ */</div><div class='add'>+TEST_F(coredump, socket_coredump_signal_sigsegv)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		struct coredump_req req = {};</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Verify coredump_signal is available and correct */</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP_SIGNAL)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: PIDFD_INFO_COREDUMP_SIGNAL not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (info.coredump_signal != SIGSEGV) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: coredump_signal=%d, expected SIGSEGV=%d\n",</div><div class='add'>+				info.coredump_signal, SIGSEGV);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_coredump_req(fd_coredump, &amp;req)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: read_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!send_coredump_ack(fd_coredump, &amp;req,</div><div class='add'>+				       COREDUMP_REJECT | COREDUMP_WAIT, 0)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: send_coredump_ack failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_marker(fd_coredump, COREDUMP_MARK_REQACK)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: read_marker COREDUMP_MARK_REQACK failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_coredump_signal_sigsegv: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_EQ(WTERMSIG(status), SIGSEGV);</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_TRUE(!!(info.mask &amp; PIDFD_INFO_COREDUMP));</div><div class='add'>+	ASSERT_TRUE(!!(info.mask &amp; PIDFD_INFO_COREDUMP_SIGNAL));</div><div class='add'>+	ASSERT_EQ(info.coredump_signal, SIGSEGV);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test: PIDFD_INFO_COREDUMP_SIGNAL via socket coredump with SIGABRT</div><div class='add'>+ *</div><div class='add'>+ * Verify that when using socket-based coredump protocol,</div><div class='add'>+ * the coredump_signal field is correctly exposed as SIGABRT.</div><div class='add'>+ */</div><div class='add'>+TEST_F(coredump, socket_coredump_signal_sigabrt)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		struct coredump_req req = {};</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Verify coredump_signal is available and correct */</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP_SIGNAL)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: PIDFD_INFO_COREDUMP_SIGNAL not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (info.coredump_signal != SIGABRT) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: coredump_signal=%d, expected SIGABRT=%d\n",</div><div class='add'>+				info.coredump_signal, SIGABRT);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_coredump_req(fd_coredump, &amp;req)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: read_coredump_req failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!send_coredump_ack(fd_coredump, &amp;req,</div><div class='add'>+				       COREDUMP_REJECT | COREDUMP_WAIT, 0)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: send_coredump_ack failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!read_marker(fd_coredump, COREDUMP_MARK_REQACK)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: read_marker COREDUMP_MARK_REQACK failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_coredump_signal_sigabrt: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		abort();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_EQ(WTERMSIG(status), SIGABRT);</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_TRUE(!!(info.mask &amp; PIDFD_INFO_COREDUMP));</div><div class='add'>+	ASSERT_TRUE(!!(info.mask &amp; PIDFD_INFO_COREDUMP_SIGNAL));</div><div class='add'>+	ASSERT_EQ(info.coredump_signal, SIGABRT);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F_TIMEOUT(coredump, socket_multiple_crashing_coredumps, 500)</div><div class='add'>+{</div><div class='add'>+	int pidfd[NUM_CRASHING_COREDUMPS], status[NUM_CRASHING_COREDUMPS];</div><div class='add'>+	pid_t pid[NUM_CRASHING_COREDUMPS], pid_coredump_server;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets), 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1, fd_core_file = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+		struct coredump_req req = {};</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "Failed to create and listen on unix socket\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "Failed to notify parent via ipc socket\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		for (int i = 0; i &lt; NUM_CRASHING_COREDUMPS; i++) {</div><div class='add'>+			fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+			if (fd_coredump &lt; 0) {</div><div class='add'>+				fprintf(stderr, "accept4 failed: %m\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+			if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+				fprintf(stderr, "get_peer_pidfd failed for fd %d: %m\n", fd_coredump);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+				fprintf(stderr, "get_pidfd_info failed for fd %d\n", fd_peer_pidfd);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+				fprintf(stderr, "pidfd info missing PIDFD_INFO_COREDUMP for fd %d\n", fd_peer_pidfd);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+				fprintf(stderr, "pidfd info missing PIDFD_COREDUMPED for fd %d\n", fd_peer_pidfd);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!read_coredump_req(fd_coredump, &amp;req)) {</div><div class='add'>+				fprintf(stderr, "read_coredump_req failed for fd %d\n", fd_coredump);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!check_coredump_req(&amp;req, COREDUMP_ACK_SIZE_VER0,</div><div class='add'>+						COREDUMP_KERNEL | COREDUMP_USERSPACE |</div><div class='add'>+						COREDUMP_REJECT | COREDUMP_WAIT)) {</div><div class='add'>+				fprintf(stderr, "check_coredump_req failed for fd %d\n", fd_coredump);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!send_coredump_ack(fd_coredump, &amp;req,</div><div class='add'>+					       COREDUMP_KERNEL | COREDUMP_WAIT, 0)) {</div><div class='add'>+				fprintf(stderr, "send_coredump_ack failed for fd %d\n", fd_coredump);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!read_marker(fd_coredump, COREDUMP_MARK_REQACK)) {</div><div class='add'>+				fprintf(stderr, "read_marker failed for fd %d\n", fd_coredump);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			fd_core_file = open_coredump_tmpfile(self-&gt;fd_tmpfs_detached);</div><div class='add'>+			if (fd_core_file &lt; 0) {</div><div class='add'>+				fprintf(stderr, "%m - open_coredump_tmpfile failed for fd %d\n", fd_coredump);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			for (;;) {</div><div class='add'>+				char buffer[4096];</div><div class='add'>+				ssize_t bytes_read, bytes_write;</div><div class='add'>+</div><div class='add'>+				bytes_read = read(fd_coredump, buffer, sizeof(buffer));</div><div class='add'>+				if (bytes_read &lt; 0) {</div><div class='add'>+					fprintf(stderr, "read failed for fd %d: %m\n", fd_coredump);</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (bytes_read == 0)</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				bytes_write = write(fd_core_file, buffer, bytes_read);</div><div class='add'>+				if (bytes_read != bytes_write) {</div><div class='add'>+					if (bytes_write &lt; 0 &amp;&amp; errno == ENOSPC)</div><div class='add'>+						continue;</div><div class='add'>+					fprintf(stderr, "write failed for fd %d: %m\n", fd_core_file);</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			close(fd_core_file);</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+			fd_peer_pidfd = -1;</div><div class='add'>+			fd_coredump = -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+out:</div><div class='add'>+		if (fd_core_file &gt;= 0)</div><div class='add'>+			close(fd_core_file);</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; NUM_CRASHING_COREDUMPS; i++) {</div><div class='add'>+		pid[i] = fork();</div><div class='add'>+		ASSERT_GE(pid[i], 0);</div><div class='add'>+		if (pid[i] == 0)</div><div class='add'>+			crashing_child();</div><div class='add'>+		pidfd[i] = sys_pidfd_open(pid[i], 0);</div><div class='add'>+		ASSERT_GE(pidfd[i], 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; NUM_CRASHING_COREDUMPS; i++) {</div><div class='add'>+		waitpid(pid[i], &amp;status[i], 0);</div><div class='add'>+		ASSERT_TRUE(WIFSIGNALED(status[i]));</div><div class='add'>+		ASSERT_TRUE(WCOREDUMP(status[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; NUM_CRASHING_COREDUMPS; i++) {</div><div class='add'>+		info.mask = PIDFD_INFO_EXIT | PIDFD_INFO_COREDUMP;</div><div class='add'>+		ASSERT_EQ(ioctl(pidfd[i], PIDFD_GET_INFO, &amp;info), 0);</div><div class='add'>+		ASSERT_GT((info.mask &amp; PIDFD_INFO_COREDUMP), 0);</div><div class='add'>+		ASSERT_GT((info.coredump_mask &amp; PIDFD_COREDUMPED), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F_TIMEOUT(coredump, socket_multiple_crashing_coredumps_epoll_workers, 500)</div><div class='add'>+{</div><div class='add'>+	int pidfd[NUM_CRASHING_COREDUMPS], status[NUM_CRASHING_COREDUMPS];</div><div class='add'>+	pid_t pid[NUM_CRASHING_COREDUMPS], pid_coredump_server, worker_pids[NUM_CRASHING_COREDUMPS];</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@@/tmp/coredump.socket"));</div><div class='add'>+	ASSERT_EQ(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets), 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		int fd_server = -1, exit_code = EXIT_FAILURE, n_conns = 0;</div><div class='add'>+		fd_server = -1;</div><div class='add'>+		exit_code = EXIT_FAILURE;</div><div class='add'>+		n_conns = 0;</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_multiple_crashing_coredumps_epoll_workers: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_multiple_crashing_coredumps_epoll_workers: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		while (n_conns &lt; NUM_CRASHING_COREDUMPS) {</div><div class='add'>+			int fd_coredump = -1, fd_peer_pidfd = -1, fd_core_file = -1;</div><div class='add'>+			struct coredump_req req = {};</div><div class='add'>+			fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+			if (fd_coredump &lt; 0) {</div><div class='add'>+				if (errno == EAGAIN || errno == EWOULDBLOCK)</div><div class='add'>+					continue;</div><div class='add'>+				fprintf(stderr, "socket_multiple_crashing_coredumps_epoll_workers: accept4 failed: %m\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+			if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+				fprintf(stderr, "socket_multiple_crashing_coredumps_epoll_workers: get_peer_pidfd failed\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+				fprintf(stderr, "socket_multiple_crashing_coredumps_epoll_workers: get_pidfd_info failed\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			if (!(info.mask &amp; PIDFD_INFO_COREDUMP) || !(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+				fprintf(stderr, "socket_multiple_crashing_coredumps_epoll_workers: missing PIDFD_INFO_COREDUMP or PIDFD_COREDUMPED\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			if (!read_coredump_req(fd_coredump, &amp;req)) {</div><div class='add'>+				fprintf(stderr, "socket_multiple_crashing_coredumps_epoll_workers: read_coredump_req failed\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			if (!check_coredump_req(&amp;req, COREDUMP_ACK_SIZE_VER0,</div><div class='add'>+						COREDUMP_KERNEL | COREDUMP_USERSPACE |</div><div class='add'>+						COREDUMP_REJECT | COREDUMP_WAIT)) {</div><div class='add'>+				fprintf(stderr, "socket_multiple_crashing_coredumps_epoll_workers: check_coredump_req failed\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			if (!send_coredump_ack(fd_coredump, &amp;req, COREDUMP_KERNEL | COREDUMP_WAIT, 0)) {</div><div class='add'>+				fprintf(stderr, "socket_multiple_crashing_coredumps_epoll_workers: send_coredump_ack failed\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			if (!read_marker(fd_coredump, COREDUMP_MARK_REQACK)) {</div><div class='add'>+				fprintf(stderr, "socket_multiple_crashing_coredumps_epoll_workers: read_marker failed\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			fd_core_file = open_coredump_tmpfile(self-&gt;fd_tmpfs_detached);</div><div class='add'>+			if (fd_core_file &lt; 0) {</div><div class='add'>+				fprintf(stderr, "socket_multiple_crashing_coredumps_epoll_workers: open_coredump_tmpfile failed: %m\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			pid_t worker = fork();</div><div class='add'>+			if (worker == 0) {</div><div class='add'>+				close(fd_server);</div><div class='add'>+				process_coredump_worker(fd_coredump, fd_peer_pidfd, fd_core_file);</div><div class='add'>+			}</div><div class='add'>+			worker_pids[n_conns] = worker;</div><div class='add'>+			if (fd_coredump &gt;= 0)</div><div class='add'>+				close(fd_coredump);</div><div class='add'>+			if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+				close(fd_peer_pidfd);</div><div class='add'>+			if (fd_core_file &gt;= 0)</div><div class='add'>+				close(fd_core_file);</div><div class='add'>+			n_conns++;</div><div class='add'>+		}</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+out:</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+</div><div class='add'>+		// Reap all worker processes</div><div class='add'>+		for (int i = 0; i &lt; n_conns; i++) {</div><div class='add'>+			int wstatus;</div><div class='add'>+			if (waitpid(worker_pids[i], &amp;wstatus, 0) &lt; 0) {</div><div class='add'>+				fprintf(stderr, "Failed to wait for worker %d: %m\n", worker_pids[i]);</div><div class='add'>+			} else if (WIFEXITED(wstatus) &amp;&amp; WEXITSTATUS(wstatus) != EXIT_SUCCESS) {</div><div class='add'>+				fprintf(stderr, "Worker %d exited with error code %d\n", worker_pids[i], WEXITSTATUS(wstatus));</div><div class='add'>+				exit_code = EXIT_FAILURE;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; NUM_CRASHING_COREDUMPS; i++) {</div><div class='add'>+		pid[i] = fork();</div><div class='add'>+		ASSERT_GE(pid[i], 0);</div><div class='add'>+		if (pid[i] == 0)</div><div class='add'>+			crashing_child();</div><div class='add'>+		pidfd[i] = sys_pidfd_open(pid[i], 0);</div><div class='add'>+		ASSERT_GE(pidfd[i], 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; NUM_CRASHING_COREDUMPS; i++) {</div><div class='add'>+		ASSERT_GE(waitpid(pid[i], &amp;status[i], 0), 0);</div><div class='add'>+		ASSERT_TRUE(WIFSIGNALED(status[i]));</div><div class='add'>+		ASSERT_TRUE(WCOREDUMP(status[i]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; NUM_CRASHING_COREDUMPS; i++) {</div><div class='add'>+		info.mask = PIDFD_INFO_EXIT | PIDFD_INFO_COREDUMP;</div><div class='add'>+		ASSERT_EQ(ioctl(pidfd[i], PIDFD_GET_INFO, &amp;info), 0);</div><div class='add'>+		ASSERT_GT((info.mask &amp; PIDFD_INFO_COREDUMP), 0);</div><div class='add'>+		ASSERT_GT((info.coredump_mask &amp; PIDFD_COREDUMPED), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/coredump/coredump_socket_test.c b/tools/testing/selftests/coredump/coredump_socket_test.c<br/>new file mode 100644<br/>index 000000000000..7e26d4a6a15d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/coredump/coredump_socket_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/coredump/coredump_socket_test.c</a></div><div class='hunk'>@@ -0,0 +1,742 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/epoll.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/un.h&gt;</div><div class='add'>+</div><div class='add'>+#include "coredump_test.h"</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(coredump)</div><div class='add'>+{</div><div class='add'>+	FILE *file;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	self-&gt;pid_coredump_server = -ESRCH;</div><div class='add'>+	self-&gt;fd_tmpfs_detached = -1;</div><div class='add'>+	file = fopen("/proc/sys/kernel/core_pattern", "r");</div><div class='add'>+	ASSERT_NE(NULL, file);</div><div class='add'>+</div><div class='add'>+	ret = fread(self-&gt;original_core_pattern, 1, sizeof(self-&gt;original_core_pattern), file);</div><div class='add'>+	ASSERT_TRUE(ret || feof(file));</div><div class='add'>+	ASSERT_LT(ret, sizeof(self-&gt;original_core_pattern));</div><div class='add'>+</div><div class='add'>+	self-&gt;original_core_pattern[ret] = '\0';</div><div class='add'>+	self-&gt;fd_tmpfs_detached = create_detached_tmpfs();</div><div class='add'>+	ASSERT_GE(self-&gt;fd_tmpfs_detached, 0);</div><div class='add'>+</div><div class='add'>+	ret = fclose(file);</div><div class='add'>+	ASSERT_EQ(0, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(coredump)</div><div class='add'>+{</div><div class='add'>+	const char *reason;</div><div class='add'>+	FILE *file;</div><div class='add'>+	int ret, status;</div><div class='add'>+</div><div class='add'>+	if (self-&gt;pid_coredump_server &gt; 0) {</div><div class='add'>+		kill(self-&gt;pid_coredump_server, SIGTERM);</div><div class='add'>+		waitpid(self-&gt;pid_coredump_server, &amp;status, 0);</div><div class='add'>+	}</div><div class='add'>+	unlink("/tmp/coredump.file");</div><div class='add'>+	unlink("/tmp/coredump.socket");</div><div class='add'>+</div><div class='add'>+	file = fopen("/proc/sys/kernel/core_pattern", "w");</div><div class='add'>+	if (!file) {</div><div class='add'>+		reason = "Unable to open core_pattern";</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = fprintf(file, "%s", self-&gt;original_core_pattern);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		reason = "Unable to write to core_pattern";</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = fclose(file);</div><div class='add'>+	if (ret) {</div><div class='add'>+		reason = "Unable to close core_pattern";</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (self-&gt;fd_tmpfs_detached &gt;= 0) {</div><div class='add'>+		ret = close(self-&gt;fd_tmpfs_detached);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			reason = "Unable to close detached tmpfs";</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+		self-&gt;fd_tmpfs_detached = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+fail:</div><div class='add'>+	/* This should never happen */</div><div class='add'>+	fprintf(stderr, "Failed to cleanup coredump test: %s\n", reason);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct stat st;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1, fd_core_file = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket test: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket test: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket test: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket test: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket test: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket test: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket test: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_core_file = creat("/tmp/coredump.file", 0644);</div><div class='add'>+		if (fd_core_file &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket test: creat coredump file failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (;;) {</div><div class='add'>+			char buffer[4096];</div><div class='add'>+			ssize_t bytes_read, bytes_write;</div><div class='add'>+</div><div class='add'>+			bytes_read = read(fd_coredump, buffer, sizeof(buffer));</div><div class='add'>+			if (bytes_read &lt; 0) {</div><div class='add'>+				fprintf(stderr, "socket test: read from coredump socket failed: %m\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (bytes_read == 0)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			bytes_write = write(fd_core_file, buffer, bytes_read);</div><div class='add'>+			if (bytes_read != bytes_write) {</div><div class='add'>+				if (bytes_write &lt; 0 &amp;&amp; errno == ENOSPC)</div><div class='add'>+					continue;</div><div class='add'>+				fprintf(stderr, "socket test: write to core file failed (read=%zd, write=%zd): %m\n", bytes_read, bytes_write);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket test: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_core_file &gt;= 0)</div><div class='add'>+			close(fd_core_file);</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_TRUE(WCOREDUMP(status));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_GT((info.mask &amp; PIDFD_INFO_COREDUMP), 0);</div><div class='add'>+	ASSERT_GT((info.coredump_mask &amp; PIDFD_COREDUMPED), 0);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(stat("/tmp/coredump.file", &amp;st), 0);</div><div class='add'>+	ASSERT_GT(st.st_size, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket_detect_userspace_client)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct stat st;</div><div class='add'>+	struct pidfd_info info = {</div><div class='add'>+		.mask = PIDFD_INFO_COREDUMP,</div><div class='add'>+	};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_detect_userspace_client: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_detect_userspace_client: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_detect_userspace_client: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_detect_userspace_client: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_detect_userspace_client: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_detect_userspace_client: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (info.coredump_mask &amp; PIDFD_COREDUMPED) {</div><div class='add'>+			fprintf(stderr, "socket_detect_userspace_client: PIDFD_COREDUMPED incorrectly set (should be userspace client)\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_detect_userspace_client: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0) {</div><div class='add'>+		int fd_socket;</div><div class='add'>+		ssize_t ret;</div><div class='add'>+		const struct sockaddr_un coredump_sk = {</div><div class='add'>+			.sun_family = AF_UNIX,</div><div class='add'>+			.sun_path = "/tmp/coredump.socket",</div><div class='add'>+		};</div><div class='add'>+		size_t coredump_sk_len =</div><div class='add'>+			offsetof(struct sockaddr_un, sun_path) +</div><div class='add'>+			sizeof("/tmp/coredump.socket");</div><div class='add'>+</div><div class='add'>+		fd_socket = socket(AF_UNIX, SOCK_STREAM, 0);</div><div class='add'>+		if (fd_socket &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_detect_userspace_client (client): socket failed: %m\n");</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = connect(fd_socket, (const struct sockaddr *)&amp;coredump_sk, coredump_sk_len);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_detect_userspace_client (client): connect failed: %m\n");</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(fd_socket);</div><div class='add'>+		pause();</div><div class='add'>+		fprintf(stderr, "socket_detect_userspace_client (client): completed successfully\n");</div><div class='add'>+		_exit(EXIT_SUCCESS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_GT((info.mask &amp; PIDFD_INFO_COREDUMP), 0);</div><div class='add'>+	ASSERT_EQ((info.coredump_mask &amp; PIDFD_COREDUMPED), 0);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_pidfd_send_signal(pidfd, SIGKILL, NULL, 0), 0);</div><div class='add'>+	ASSERT_EQ(close(pidfd), 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_EQ(WTERMSIG(status), SIGKILL);</div><div class='add'>+</div><div class='add'>+	ASSERT_NE(stat("/tmp/coredump.file", &amp;st), 0);</div><div class='add'>+	ASSERT_EQ(errno, ENOENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket_enoent)</div><div class='add'>+{</div><div class='add'>+	int pidfd, status;</div><div class='add'>+	pid_t pid;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_FALSE(WCOREDUMP(status));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket_no_listener)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+	const struct sockaddr_un coredump_sk = {</div><div class='add'>+		.sun_family = AF_UNIX,</div><div class='add'>+		.sun_path = "/tmp/coredump.socket",</div><div class='add'>+	};</div><div class='add'>+	size_t coredump_sk_len = offsetof(struct sockaddr_un, sun_path) +</div><div class='add'>+				 sizeof("/tmp/coredump.socket");</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		int fd_server = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_no_listener: socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = bind(fd_server, (const struct sockaddr *)&amp;coredump_sk, coredump_sk_len);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_no_listener: bind failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_no_listener: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_no_listener: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_FALSE(WCOREDUMP(status));</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test: PIDFD_INFO_COREDUMP_SIGNAL via simple socket coredump</div><div class='add'>+ *</div><div class='add'>+ * Verify that when using simple socket-based coredump (@ pattern),</div><div class='add'>+ * the coredump_signal field is correctly exposed as SIGSEGV.</div><div class='add'>+ */</div><div class='add'>+TEST_F(coredump, socket_coredump_signal_sigsegv)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1, fd_core_file = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Verify coredump_signal is available and correct */</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP_SIGNAL)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: PIDFD_INFO_COREDUMP_SIGNAL not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (info.coredump_signal != SIGSEGV) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: coredump_signal=%d, expected SIGSEGV=%d\n",</div><div class='add'>+				info.coredump_signal, SIGSEGV);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_core_file = open_coredump_tmpfile(self-&gt;fd_tmpfs_detached);</div><div class='add'>+		if (fd_core_file &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigsegv: open_coredump_tmpfile failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (;;) {</div><div class='add'>+			char buffer[4096];</div><div class='add'>+			ssize_t bytes_read, bytes_write;</div><div class='add'>+</div><div class='add'>+			bytes_read = read(fd_coredump, buffer, sizeof(buffer));</div><div class='add'>+			if (bytes_read &lt; 0) {</div><div class='add'>+				fprintf(stderr, "socket_coredump_signal_sigsegv: read from coredump socket failed: %m\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (bytes_read == 0)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			bytes_write = write(fd_core_file, buffer, bytes_read);</div><div class='add'>+			if (bytes_read != bytes_write) {</div><div class='add'>+				fprintf(stderr, "socket_coredump_signal_sigsegv: write to core file failed (read=%zd, write=%zd): %m\n",</div><div class='add'>+					bytes_read, bytes_write);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_coredump_signal_sigsegv: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_core_file &gt;= 0)</div><div class='add'>+			close(fd_core_file);</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		crashing_child();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_EQ(WTERMSIG(status), SIGSEGV);</div><div class='add'>+	ASSERT_TRUE(WCOREDUMP(status));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_TRUE(!!(info.mask &amp; PIDFD_INFO_COREDUMP));</div><div class='add'>+	ASSERT_TRUE(!!(info.mask &amp; PIDFD_INFO_COREDUMP_SIGNAL));</div><div class='add'>+	ASSERT_EQ(info.coredump_signal, SIGSEGV);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test: PIDFD_INFO_COREDUMP_SIGNAL via simple socket coredump with SIGABRT</div><div class='add'>+ *</div><div class='add'>+ * Verify that when using simple socket-based coredump (@ pattern),</div><div class='add'>+ * the coredump_signal field is correctly exposed as SIGABRT.</div><div class='add'>+ */</div><div class='add'>+TEST_F(coredump, socket_coredump_signal_sigabrt)</div><div class='add'>+{</div><div class='add'>+	int pidfd, ret, status;</div><div class='add'>+	pid_t pid, pid_coredump_server;</div><div class='add'>+	struct pidfd_info info = {};</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(set_core_pattern("@/tmp/coredump.socket"));</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid_coredump_server = fork();</div><div class='add'>+	ASSERT_GE(pid_coredump_server, 0);</div><div class='add'>+	if (pid_coredump_server == 0) {</div><div class='add'>+		int fd_server = -1, fd_coredump = -1, fd_peer_pidfd = -1, fd_core_file = -1;</div><div class='add'>+		int exit_code = EXIT_FAILURE;</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[0]);</div><div class='add'>+</div><div class='add'>+		fd_server = create_and_listen_unix_socket("/tmp/coredump.socket");</div><div class='add'>+		if (fd_server &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: create_and_listen_unix_socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (write_nointr(ipc_sockets[1], "1", 1) &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: write_nointr to ipc socket failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		close(ipc_sockets[1]);</div><div class='add'>+</div><div class='add'>+		fd_coredump = accept4(fd_server, NULL, NULL, SOCK_CLOEXEC);</div><div class='add'>+		if (fd_coredump &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: accept4 failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_peer_pidfd = get_peer_pidfd(fd_coredump);</div><div class='add'>+		if (fd_peer_pidfd &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: get_peer_pidfd failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!get_pidfd_info(fd_peer_pidfd, &amp;info)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: get_pidfd_info failed\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: PIDFD_INFO_COREDUMP not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(info.coredump_mask &amp; PIDFD_COREDUMPED)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: PIDFD_COREDUMPED not set in coredump_mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Verify coredump_signal is available and correct */</div><div class='add'>+		if (!(info.mask &amp; PIDFD_INFO_COREDUMP_SIGNAL)) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: PIDFD_INFO_COREDUMP_SIGNAL not set in mask\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (info.coredump_signal != SIGABRT) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: coredump_signal=%d, expected SIGABRT=%d\n",</div><div class='add'>+				info.coredump_signal, SIGABRT);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fd_core_file = open_coredump_tmpfile(self-&gt;fd_tmpfs_detached);</div><div class='add'>+		if (fd_core_file &lt; 0) {</div><div class='add'>+			fprintf(stderr, "socket_coredump_signal_sigabrt: open_coredump_tmpfile failed: %m\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (;;) {</div><div class='add'>+			char buffer[4096];</div><div class='add'>+			ssize_t bytes_read, bytes_write;</div><div class='add'>+</div><div class='add'>+			bytes_read = read(fd_coredump, buffer, sizeof(buffer));</div><div class='add'>+			if (bytes_read &lt; 0) {</div><div class='add'>+				fprintf(stderr, "socket_coredump_signal_sigabrt: read from coredump socket failed: %m\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (bytes_read == 0)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			bytes_write = write(fd_core_file, buffer, bytes_read);</div><div class='add'>+			if (bytes_read != bytes_write) {</div><div class='add'>+				fprintf(stderr, "socket_coredump_signal_sigabrt: write to core file failed (read=%zd, write=%zd): %m\n",</div><div class='add'>+					bytes_read, bytes_write);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit_code = EXIT_SUCCESS;</div><div class='add'>+		fprintf(stderr, "socket_coredump_signal_sigabrt: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+		if (fd_core_file &gt;= 0)</div><div class='add'>+			close(fd_core_file);</div><div class='add'>+		if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+			close(fd_peer_pidfd);</div><div class='add'>+		if (fd_coredump &gt;= 0)</div><div class='add'>+			close(fd_coredump);</div><div class='add'>+		if (fd_server &gt;= 0)</div><div class='add'>+			close(fd_server);</div><div class='add'>+		_exit(exit_code);</div><div class='add'>+	}</div><div class='add'>+	self-&gt;pid_coredump_server = pid_coredump_server;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(read_nointr(ipc_sockets[0], &amp;c, 1), 1);</div><div class='add'>+	EXPECT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0)</div><div class='add'>+		abort();</div><div class='add'>+</div><div class='add'>+	pidfd = sys_pidfd_open(pid, 0);</div><div class='add'>+	ASSERT_GE(pidfd, 0);</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_EQ(WTERMSIG(status), SIGABRT);</div><div class='add'>+	ASSERT_TRUE(WCOREDUMP(status));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(get_pidfd_info(pidfd, &amp;info));</div><div class='add'>+	ASSERT_TRUE(!!(info.mask &amp; PIDFD_INFO_COREDUMP));</div><div class='add'>+	ASSERT_TRUE(!!(info.mask &amp; PIDFD_INFO_COREDUMP_SIGNAL));</div><div class='add'>+	ASSERT_EQ(info.coredump_signal, SIGABRT);</div><div class='add'>+</div><div class='add'>+	wait_and_check_coredump_server(pid_coredump_server, _metadata, self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(coredump, socket_invalid_paths)</div><div class='add'>+{</div><div class='add'>+	ASSERT_FALSE(set_core_pattern("@ /tmp/coredump.socket"));</div><div class='add'>+	ASSERT_FALSE(set_core_pattern("@/tmp/../coredump.socket"));</div><div class='add'>+	ASSERT_FALSE(set_core_pattern("@../coredump.socket"));</div><div class='add'>+	ASSERT_FALSE(set_core_pattern("@/tmp/coredump.socket/.."));</div><div class='add'>+	ASSERT_FALSE(set_core_pattern("@.."));</div><div class='add'>+</div><div class='add'>+	ASSERT_FALSE(set_core_pattern("@@ /tmp/coredump.socket"));</div><div class='add'>+	ASSERT_FALSE(set_core_pattern("@@/tmp/../coredump.socket"));</div><div class='add'>+	ASSERT_FALSE(set_core_pattern("@@../coredump.socket"));</div><div class='add'>+	ASSERT_FALSE(set_core_pattern("@@/tmp/coredump.socket/.."));</div><div class='add'>+	ASSERT_FALSE(set_core_pattern("@@.."));</div><div class='add'>+</div><div class='add'>+	ASSERT_FALSE(set_core_pattern("@@@/tmp/coredump.socket"));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/coredump/coredump_test.h b/tools/testing/selftests/coredump/coredump_test.h<br/>new file mode 100644<br/>index 000000000000..ed47f01fa53c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/coredump/coredump_test.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/coredump/coredump_test.h</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef __COREDUMP_TEST_H</div><div class='add'>+#define __COREDUMP_TEST_H</div><div class='add'>+</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;linux/coredump.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../kselftest_harness.h"</div><div class='add'>+#include "../pidfd/pidfd.h"</div><div class='add'>+</div><div class='add'>+#ifndef PAGE_SIZE</div><div class='add'>+#define PAGE_SIZE 4096</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define NUM_THREAD_SPAWN 128</div><div class='add'>+</div><div class='add'>+/* Coredump fixture */</div><div class='add'>+FIXTURE(coredump)</div><div class='add'>+{</div><div class='add'>+	char original_core_pattern[256];</div><div class='add'>+	pid_t pid_coredump_server;</div><div class='add'>+	int fd_tmpfs_detached;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Shared helper function declarations */</div><div class='add'>+void *do_nothing(void *arg);</div><div class='add'>+void crashing_child(void);</div><div class='add'>+int create_detached_tmpfs(void);</div><div class='add'>+int create_and_listen_unix_socket(const char *path);</div><div class='add'>+bool set_core_pattern(const char *pattern);</div><div class='add'>+int get_peer_pidfd(int fd);</div><div class='add'>+bool get_pidfd_info(int fd_peer_pidfd, struct pidfd_info *info);</div><div class='add'>+</div><div class='add'>+/* Inline helper that uses harness types */</div><div class='add'>+static inline void wait_and_check_coredump_server(pid_t pid_coredump_server,</div><div class='add'>+						   struct __test_metadata *const _metadata,</div><div class='add'>+						   FIXTURE_DATA(coredump) *self)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	waitpid(pid_coredump_server, &amp;status, 0);</div><div class='add'>+	self-&gt;pid_coredump_server = -ESRCH;</div><div class='add'>+	ASSERT_TRUE(WIFEXITED(status));</div><div class='add'>+	ASSERT_EQ(WEXITSTATUS(status), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Protocol helper function declarations */</div><div class='add'>+ssize_t recv_marker(int fd);</div><div class='add'>+bool read_marker(int fd, enum coredump_mark mark);</div><div class='add'>+bool read_coredump_req(int fd, struct coredump_req *req);</div><div class='add'>+bool send_coredump_ack(int fd, const struct coredump_req *req,</div><div class='add'>+		       __u64 mask, size_t size_ack);</div><div class='add'>+bool check_coredump_req(const struct coredump_req *req, size_t min_size,</div><div class='add'>+			__u64 required_mask);</div><div class='add'>+int open_coredump_tmpfile(int fd_tmpfs_detached);</div><div class='add'>+void process_coredump_worker(int fd_coredump, int fd_peer_pidfd, int fd_core_file);</div><div class='add'>+</div><div class='add'>+#endif /* __COREDUMP_TEST_H */</div><div class='head'>diff --git a/tools/testing/selftests/coredump/coredump_test_helpers.c b/tools/testing/selftests/coredump/coredump_test_helpers.c<br/>new file mode 100644<br/>index 000000000000..a6f6d5f2ae07<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/coredump/coredump_test_helpers.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/coredump/coredump_test_helpers.c</a></div><div class='hunk'>@@ -0,0 +1,383 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;assert.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;limits.h&gt;</div><div class='add'>+#include &lt;linux/coredump.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/epoll.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/un.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../filesystems/wrappers.h"</div><div class='add'>+#include "../pidfd/pidfd.h"</div><div class='add'>+</div><div class='add'>+/* Forward declarations to avoid including harness header */</div><div class='add'>+struct __test_metadata;</div><div class='add'>+</div><div class='add'>+/* Match the fixture definition from coredump_test.h */</div><div class='add'>+struct _fixture_coredump_data {</div><div class='add'>+	char original_core_pattern[256];</div><div class='add'>+	pid_t pid_coredump_server;</div><div class='add'>+	int fd_tmpfs_detached;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifndef PAGE_SIZE</div><div class='add'>+#define PAGE_SIZE 4096</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define NUM_THREAD_SPAWN 128</div><div class='add'>+</div><div class='add'>+void *do_nothing(void *arg)</div><div class='add'>+{</div><div class='add'>+	(void)arg;</div><div class='add'>+	while (1)</div><div class='add'>+		pause();</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void crashing_child(void)</div><div class='add'>+{</div><div class='add'>+	pthread_t thread;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_THREAD_SPAWN; ++i)</div><div class='add'>+		pthread_create(&amp;thread, NULL, do_nothing, NULL);</div><div class='add'>+</div><div class='add'>+	/* crash on purpose */</div><div class='add'>+	i = *(int *)NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int create_detached_tmpfs(void)</div><div class='add'>+{</div><div class='add'>+	int fd_context, fd_tmpfs;</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("tmpfs", 0);</div><div class='add'>+	if (fd_context &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	fd_tmpfs = sys_fsmount(fd_context, 0, 0);</div><div class='add'>+	close(fd_context);</div><div class='add'>+	return fd_tmpfs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int create_and_listen_unix_socket(const char *path)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_un addr = {</div><div class='add'>+		.sun_family = AF_UNIX,</div><div class='add'>+	};</div><div class='add'>+	assert(strlen(path) &lt; sizeof(addr.sun_path) - 1);</div><div class='add'>+	strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);</div><div class='add'>+	size_t addr_len =</div><div class='add'>+		offsetof(struct sockaddr_un, sun_path) + strlen(path) + 1;</div><div class='add'>+	int fd, ret;</div><div class='add'>+</div><div class='add'>+	fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = bind(fd, (const struct sockaddr *)&amp;addr, addr_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = listen(fd, 128);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	return fd;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (fd &gt;= 0)</div><div class='add'>+		close(fd);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool set_core_pattern(const char *pattern)</div><div class='add'>+{</div><div class='add'>+	int fd;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	fd = open("/proc/sys/kernel/core_pattern", O_WRONLY | O_CLOEXEC);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ret = write(fd, pattern, strlen(pattern));</div><div class='add'>+	close(fd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "Set core_pattern to '%s' | %zu == %zu\n", pattern, ret, strlen(pattern));</div><div class='add'>+	return ret == strlen(pattern);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_peer_pidfd(int fd)</div><div class='add'>+{</div><div class='add'>+	int fd_peer_pidfd;</div><div class='add'>+	socklen_t fd_peer_pidfd_len = sizeof(fd_peer_pidfd);</div><div class='add'>+	int ret = getsockopt(fd, SOL_SOCKET, SO_PEERPIDFD, &amp;fd_peer_pidfd,</div><div class='add'>+			     &amp;fd_peer_pidfd_len);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		fprintf(stderr, "get_peer_pidfd: getsockopt(SO_PEERPIDFD) failed: %m\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	fprintf(stderr, "get_peer_pidfd: successfully retrieved pidfd %d\n", fd_peer_pidfd);</div><div class='add'>+	return fd_peer_pidfd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool get_pidfd_info(int fd_peer_pidfd, struct pidfd_info *info)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	memset(info, 0, sizeof(*info));</div><div class='add'>+	info-&gt;mask = PIDFD_INFO_EXIT | PIDFD_INFO_COREDUMP | PIDFD_INFO_COREDUMP_SIGNAL;</div><div class='add'>+	ret = ioctl(fd_peer_pidfd, PIDFD_GET_INFO, info);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		fprintf(stderr, "get_pidfd_info: ioctl(PIDFD_GET_INFO) failed: %m\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	fprintf(stderr, "get_pidfd_info: mask=0x%llx, coredump_mask=0x%x, coredump_signal=%d\n",</div><div class='add'>+		(unsigned long long)info-&gt;mask, info-&gt;coredump_mask, info-&gt;coredump_signal);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Protocol helper functions */</div><div class='add'>+</div><div class='add'>+ssize_t recv_marker(int fd)</div><div class='add'>+{</div><div class='add'>+	enum coredump_mark mark = COREDUMP_MARK_REQACK;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = recv(fd, &amp;mark, sizeof(mark), MSG_WAITALL);</div><div class='add'>+	if (ret != sizeof(mark))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	switch (mark) {</div><div class='add'>+	case COREDUMP_MARK_REQACK:</div><div class='add'>+		fprintf(stderr, "Received marker: ReqAck\n");</div><div class='add'>+		return COREDUMP_MARK_REQACK;</div><div class='add'>+	case COREDUMP_MARK_MINSIZE:</div><div class='add'>+		fprintf(stderr, "Received marker: MinSize\n");</div><div class='add'>+		return COREDUMP_MARK_MINSIZE;</div><div class='add'>+	case COREDUMP_MARK_MAXSIZE:</div><div class='add'>+		fprintf(stderr, "Received marker: MaxSize\n");</div><div class='add'>+		return COREDUMP_MARK_MAXSIZE;</div><div class='add'>+	case COREDUMP_MARK_UNSUPPORTED:</div><div class='add'>+		fprintf(stderr, "Received marker: Unsupported\n");</div><div class='add'>+		return COREDUMP_MARK_UNSUPPORTED;</div><div class='add'>+	case COREDUMP_MARK_CONFLICTING:</div><div class='add'>+		fprintf(stderr, "Received marker: Conflicting\n");</div><div class='add'>+		return COREDUMP_MARK_CONFLICTING;</div><div class='add'>+	default:</div><div class='add'>+		fprintf(stderr, "Received unknown marker: %u\n", mark);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool read_marker(int fd, enum coredump_mark mark)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = recv_marker(fd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	return ret == mark;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool read_coredump_req(int fd, struct coredump_req *req)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	size_t field_size, user_size, ack_size, kernel_size, remaining_size;</div><div class='add'>+</div><div class='add'>+	memset(req, 0, sizeof(*req));</div><div class='add'>+	field_size = sizeof(req-&gt;size);</div><div class='add'>+</div><div class='add'>+	/* Peek the size of the coredump request. */</div><div class='add'>+	ret = recv(fd, req, field_size, MSG_PEEK | MSG_WAITALL);</div><div class='add'>+	if (ret != field_size) {</div><div class='add'>+		fprintf(stderr, "read_coredump_req: peek failed (got %zd, expected %zu): %m\n",</div><div class='add'>+			ret, field_size);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	kernel_size = req-&gt;size;</div><div class='add'>+</div><div class='add'>+	if (kernel_size &lt; COREDUMP_ACK_SIZE_VER0) {</div><div class='add'>+		fprintf(stderr, "read_coredump_req: kernel_size %zu &lt; min %d\n",</div><div class='add'>+			kernel_size, COREDUMP_ACK_SIZE_VER0);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (kernel_size &gt;= PAGE_SIZE) {</div><div class='add'>+		fprintf(stderr, "read_coredump_req: kernel_size %zu &gt;= PAGE_SIZE %d\n",</div><div class='add'>+			kernel_size, PAGE_SIZE);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use the minimum of user and kernel size to read the full request. */</div><div class='add'>+	user_size = sizeof(struct coredump_req);</div><div class='add'>+	ack_size = user_size &lt; kernel_size ? user_size : kernel_size;</div><div class='add'>+	ret = recv(fd, req, ack_size, MSG_WAITALL);</div><div class='add'>+	if (ret != ack_size)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "Read coredump request with size %u and mask 0x%llx\n",</div><div class='add'>+		req-&gt;size, (unsigned long long)req-&gt;mask);</div><div class='add'>+</div><div class='add'>+	if (user_size &gt; kernel_size)</div><div class='add'>+		remaining_size = user_size - kernel_size;</div><div class='add'>+	else</div><div class='add'>+		remaining_size = kernel_size - user_size;</div><div class='add'>+</div><div class='add'>+	if (PAGE_SIZE &lt;= remaining_size)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Discard any additional data if the kernel's request was larger than</div><div class='add'>+	 * what we knew about or cared about.</div><div class='add'>+	 */</div><div class='add'>+	if (remaining_size) {</div><div class='add'>+		char buffer[PAGE_SIZE];</div><div class='add'>+</div><div class='add'>+		ret = recv(fd, buffer, sizeof(buffer), MSG_WAITALL);</div><div class='add'>+		if (ret != remaining_size)</div><div class='add'>+			return false;</div><div class='add'>+		fprintf(stderr, "Discarded %zu bytes of data after coredump request\n", remaining_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool send_coredump_ack(int fd, const struct coredump_req *req,</div><div class='add'>+		       __u64 mask, size_t size_ack)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	/*</div><div class='add'>+	 * Wrap struct coredump_ack in a larger struct so we can</div><div class='add'>+	 * simulate sending to much data to the kernel.</div><div class='add'>+	 */</div><div class='add'>+	struct large_ack_for_size_testing {</div><div class='add'>+		struct coredump_ack ack;</div><div class='add'>+		char buffer[PAGE_SIZE];</div><div class='add'>+	} large_ack = {};</div><div class='add'>+</div><div class='add'>+	if (!size_ack)</div><div class='add'>+		size_ack = sizeof(struct coredump_ack) &lt; req-&gt;size_ack ?</div><div class='add'>+				   sizeof(struct coredump_ack) :</div><div class='add'>+				   req-&gt;size_ack;</div><div class='add'>+	large_ack.ack.mask = mask;</div><div class='add'>+	large_ack.ack.size = size_ack;</div><div class='add'>+	ret = send(fd, &amp;large_ack, size_ack, MSG_NOSIGNAL);</div><div class='add'>+	if (ret != size_ack)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "Sent coredump ack with size %zu and mask 0x%llx\n",</div><div class='add'>+		size_ack, (unsigned long long)mask);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool check_coredump_req(const struct coredump_req *req, size_t min_size,</div><div class='add'>+			__u64 required_mask)</div><div class='add'>+{</div><div class='add'>+	if (req-&gt;size &lt; min_size)</div><div class='add'>+		return false;</div><div class='add'>+	if ((req-&gt;mask &amp; required_mask) != required_mask)</div><div class='add'>+		return false;</div><div class='add'>+	if (req-&gt;mask &amp; ~required_mask)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int open_coredump_tmpfile(int fd_tmpfs_detached)</div><div class='add'>+{</div><div class='add'>+	return openat(fd_tmpfs_detached, ".", O_TMPFILE | O_RDWR | O_EXCL, 0600);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void process_coredump_worker(int fd_coredump, int fd_peer_pidfd, int fd_core_file)</div><div class='add'>+{</div><div class='add'>+	int epfd = -1;</div><div class='add'>+	int exit_code = EXIT_FAILURE;</div><div class='add'>+	struct epoll_event ev;</div><div class='add'>+	int flags;</div><div class='add'>+</div><div class='add'>+	/* Set socket to non-blocking mode for edge-triggered epoll */</div><div class='add'>+	flags = fcntl(fd_coredump, F_GETFL, 0);</div><div class='add'>+	if (flags &lt; 0) {</div><div class='add'>+		fprintf(stderr, "Worker: fcntl(F_GETFL) failed: %m\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (fcntl(fd_coredump, F_SETFL, flags | O_NONBLOCK) &lt; 0) {</div><div class='add'>+		fprintf(stderr, "Worker: fcntl(F_SETFL, O_NONBLOCK) failed: %m\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	epfd = epoll_create1(0);</div><div class='add'>+	if (epfd &lt; 0) {</div><div class='add'>+		fprintf(stderr, "Worker: epoll_create1() failed: %m\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ev.events = EPOLLIN | EPOLLRDHUP | EPOLLET;</div><div class='add'>+	ev.data.fd = fd_coredump;</div><div class='add'>+	if (epoll_ctl(epfd, EPOLL_CTL_ADD, fd_coredump, &amp;ev) &lt; 0) {</div><div class='add'>+		fprintf(stderr, "Worker: epoll_ctl(EPOLL_CTL_ADD) failed: %m\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		struct epoll_event events[1];</div><div class='add'>+		int n = epoll_wait(epfd, events, 1, -1);</div><div class='add'>+		if (n &lt; 0) {</div><div class='add'>+			fprintf(stderr, "Worker: epoll_wait() failed: %m\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (events[0].events &amp; (EPOLLIN | EPOLLRDHUP)) {</div><div class='add'>+			for (;;) {</div><div class='add'>+				char buffer[4096];</div><div class='add'>+				ssize_t bytes_read = read(fd_coredump, buffer, sizeof(buffer));</div><div class='add'>+				if (bytes_read &lt; 0) {</div><div class='add'>+					if (errno == EAGAIN || errno == EWOULDBLOCK)</div><div class='add'>+						break;</div><div class='add'>+					fprintf(stderr, "Worker: read() failed: %m\n");</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+				if (bytes_read == 0)</div><div class='add'>+					goto done;</div><div class='add'>+				ssize_t bytes_write = write(fd_core_file, buffer, bytes_read);</div><div class='add'>+				if (bytes_write != bytes_read) {</div><div class='add'>+					if (bytes_write &lt; 0 &amp;&amp; errno == ENOSPC)</div><div class='add'>+						continue;</div><div class='add'>+					fprintf(stderr, "Worker: write() failed (read=%zd, write=%zd): %m\n",</div><div class='add'>+						bytes_read, bytes_write);</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	exit_code = EXIT_SUCCESS;</div><div class='add'>+	fprintf(stderr, "Worker: completed successfully\n");</div><div class='add'>+out:</div><div class='add'>+	if (epfd &gt;= 0)</div><div class='add'>+		close(epfd);</div><div class='add'>+	if (fd_core_file &gt;= 0)</div><div class='add'>+		close(fd_core_file);</div><div class='add'>+	if (fd_peer_pidfd &gt;= 0)</div><div class='add'>+		close(fd_peer_pidfd);</div><div class='add'>+	if (fd_coredump &gt;= 0)</div><div class='add'>+		close(fd_coredump);</div><div class='add'>+	_exit(exit_code);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/coredump/stackdump_test.c b/tools/testing/selftests/coredump/stackdump_test.c<br/>index 137b2364a082..1ec88937a1c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/coredump/stackdump_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/coredump/stackdump_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/coredump/stackdump_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/coredump/stackdump_test.c</a></div><div class='hunk'>@@ -1,49 +1,44 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+#include &lt;assert.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;inttypes.h&gt;</div><div class='ctx'> #include &lt;libgen.h&gt;</div><div class='add'>+#include &lt;limits.h&gt;</div><div class='add'>+#include &lt;linux/coredump.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/limits.h&gt;</div><div class='ctx'> #include &lt;pthread.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/mount.h&gt;</div><div class='add'>+#include &lt;poll.h&gt;</div><div class='add'>+#include &lt;sys/epoll.h&gt;</div><div class='ctx'> #include &lt;sys/resource.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/un.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+#include "../filesystems/wrappers.h"</div><div class='add'>+#include "../pidfd/pidfd.h"</div><div class='add'>+</div><div class='add'>+#include "coredump_test.h"</div><div class='ctx'> </div><div class='ctx'> #define STACKDUMP_FILE "stack_values"</div><div class='ctx'> #define STACKDUMP_SCRIPT "stackdump"</div><div class='del'>-#define NUM_THREAD_SPAWN 128</div><div class='del'>-</div><div class='del'>-static void *do_nothing(void *)</div><div class='del'>-{</div><div class='del'>-	while (1)</div><div class='del'>-		pause();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void crashing_child(void)</div><div class='del'>-{</div><div class='del'>-	pthread_t thread;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_THREAD_SPAWN; ++i)</div><div class='del'>-		pthread_create(&amp;thread, NULL, do_nothing, NULL);</div><div class='del'>-</div><div class='del'>-	/* crash on purpose */</div><div class='del'>-	i = *(int *)NULL;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-FIXTURE(coredump)</div><div class='del'>-{</div><div class='del'>-	char original_core_pattern[256];</div><div class='del'>-};</div><div class='add'>+#ifndef PAGE_SIZE</div><div class='add'>+#define PAGE_SIZE 4096</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> FIXTURE_SETUP(coredump)</div><div class='ctx'> {</div><div class='del'>-	char buf[PATH_MAX];</div><div class='ctx'> 	FILE *file;</div><div class='del'>-	char *dir;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	self-&gt;pid_coredump_server = -ESRCH;</div><div class='add'>+	self-&gt;fd_tmpfs_detached = -1;</div><div class='ctx'> 	file = fopen("/proc/sys/kernel/core_pattern", "r");</div><div class='ctx'> 	ASSERT_NE(NULL, file);</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +47,8 @@ FIXTURE_SETUP(coredump)</div><div class='ctx'> 	ASSERT_LT(ret, sizeof(self-&gt;original_core_pattern));</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;original_core_pattern[ret] = '\0';</div><div class='add'>+	self-&gt;fd_tmpfs_detached = create_detached_tmpfs();</div><div class='add'>+	ASSERT_GE(self-&gt;fd_tmpfs_detached, 0);</div><div class='ctx'> </div><div class='ctx'> 	ret = fclose(file);</div><div class='ctx'> 	ASSERT_EQ(0, ret);</div><div class='hunk'>@@ -61,10 +58,17 @@ FIXTURE_TEARDOWN(coredump)</div><div class='ctx'> {</div><div class='ctx'> 	const char *reason;</div><div class='ctx'> 	FILE *file;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, status;</div><div class='ctx'> </div><div class='ctx'> 	unlink(STACKDUMP_FILE);</div><div class='ctx'> </div><div class='add'>+	if (self-&gt;pid_coredump_server &gt; 0) {</div><div class='add'>+		kill(self-&gt;pid_coredump_server, SIGTERM);</div><div class='add'>+		waitpid(self-&gt;pid_coredump_server, &amp;status, 0);</div><div class='add'>+	}</div><div class='add'>+	unlink("/tmp/coredump.file");</div><div class='add'>+	unlink("/tmp/coredump.socket");</div><div class='add'>+</div><div class='ctx'> 	file = fopen("/proc/sys/kernel/core_pattern", "w");</div><div class='ctx'> 	if (!file) {</div><div class='ctx'> 		reason = "Unable to open core_pattern";</div><div class='hunk'>@@ -83,20 +87,28 @@ FIXTURE_TEARDOWN(coredump)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (self-&gt;fd_tmpfs_detached &gt;= 0) {</div><div class='add'>+		ret = close(self-&gt;fd_tmpfs_detached);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			reason = "Unable to close detached tmpfs";</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+		self-&gt;fd_tmpfs_detached = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return;</div><div class='ctx'> fail:</div><div class='ctx'> 	/* This should never happen */</div><div class='ctx'> 	fprintf(stderr, "Failed to cleanup stackdump test: %s\n", reason);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-TEST_F(coredump, stackdump)</div><div class='add'>+TEST_F_TIMEOUT(coredump, stackdump, 120)</div><div class='ctx'> {</div><div class='del'>-	struct sigaction action = {};</div><div class='ctx'> 	unsigned long long stack;</div><div class='ctx'> 	char *test_dir, *line;</div><div class='ctx'> 	size_t line_length;</div><div class='del'>-	char buf[PATH_MAX];</div><div class='del'>-	int ret, i;</div><div class='add'>+	char buf[PAGE_SIZE];</div><div class='add'>+	int ret, i, status;</div><div class='ctx'> 	FILE *file;</div><div class='ctx'> 	pid_t pid;</div><div class='ctx'> </div><div class='hunk'>@@ -129,6 +141,10 @@ TEST_F(coredump, stackdump)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Step 3: Wait for the stackdump script to write the stack pointers to the stackdump file</div><div class='ctx'> 	 */</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	ASSERT_TRUE(WIFSIGNALED(status));</div><div class='add'>+	ASSERT_TRUE(WCOREDUMP(status));</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 10; ++i) {</div><div class='ctx'> 		file = fopen(STACKDUMP_FILE, "r");</div><div class='ctx'> 		if (file)</div><div class='hunk'>@@ -138,10 +154,12 @@ TEST_F(coredump, stackdump)</div><div class='ctx'> 	ASSERT_NE(file, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Step 4: Make sure all stack pointer values are non-zero */</div><div class='add'>+	line = NULL;</div><div class='ctx'> 	for (i = 0; -1 != getline(&amp;line, &amp;line_length, file); ++i) {</div><div class='ctx'> 		stack = strtoull(line, NULL, 10);</div><div class='ctx'> 		ASSERT_NE(stack, 0);</div><div class='ctx'> 	}</div><div class='add'>+	free(line);</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_EQ(i, 1 + NUM_THREAD_SPAWN);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh b/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh<br/>index d5dc7e0dc726..6232a46ca6e1 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh</a></div><div class='hunk'>@@ -67,7 +67,7 @@ hotpluggable_cpus()</div><div class='ctx'> 	done</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-hotplaggable_offline_cpus()</div><div class='add'>+hotpluggable_offline_cpus()</div><div class='ctx'> {</div><div class='ctx'> 	hotpluggable_cpus 0</div><div class='ctx'> }</div><div class='hunk'>@@ -151,7 +151,7 @@ offline_cpu_expect_fail()</div><div class='ctx'> </div><div class='ctx'> online_all_hot_pluggable_cpus()</div><div class='ctx'> {</div><div class='del'>-	for cpu in `hotplaggable_offline_cpus`; do</div><div class='add'>+	for cpu in `hotpluggable_offline_cpus`; do</div><div class='ctx'> 		online_cpu_expect_success $cpu</div><div class='ctx'> 	done</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/cpufreq/cpufreq.sh b/tools/testing/selftests/cpufreq/cpufreq.sh<br/>index e350c521b467..9927b654fb8f 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cpufreq/cpufreq.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/cpufreq/cpufreq.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/cpufreq/cpufreq.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/cpufreq/cpufreq.sh</a></div><div class='hunk'>@@ -52,7 +52,14 @@ read_cpufreq_files_in_dir()</div><div class='ctx'> 	for file in $files; do</div><div class='ctx'> 		if [ -f $1/$file ]; then</div><div class='ctx'> 			printf "$file:"</div><div class='del'>-			cat $1/$file</div><div class='add'>+			#file is readable ?</div><div class='add'>+			local rfile=$(ls -l $1/$file | awk '$1 ~ /^.*r.*/ { print $NF; }')</div><div class='add'>+</div><div class='add'>+			if [ ! -z $rfile ]; then</div><div class='add'>+				cat $1/$file</div><div class='add'>+			else</div><div class='add'>+				printf "$file is not readable\n"</div><div class='add'>+			fi</div><div class='ctx'> 		else</div><div class='ctx'> 			printf "\n"</div><div class='ctx'> 			read_cpufreq_files_in_dir "$1/$file"</div><div class='hunk'>@@ -83,10 +90,10 @@ update_cpufreq_files_in_dir()</div><div class='ctx'> </div><div class='ctx'> 	for file in $files; do</div><div class='ctx'> 		if [ -f $1/$file ]; then</div><div class='del'>-			# file is writable ?</div><div class='del'>-			local wfile=$(ls -l $1/$file | awk '$1 ~ /^.*w.*/ { print $NF; }')</div><div class='add'>+			# file is readable and writable ?</div><div class='add'>+			local rwfile=$(ls -l $1/$file | awk '$1 ~ /^.*rw.*/ { print $NF; }')</div><div class='ctx'> </div><div class='del'>-			if [ ! -z $wfile ]; then</div><div class='add'>+			if [ ! -z $rwfile ]; then</div><div class='ctx'> 				# scaling_setspeed is a special file and we</div><div class='ctx'> 				# should skip updating it</div><div class='ctx'> 				if [ $file != "scaling_setspeed" ]; then</div><div class='hunk'>@@ -244,9 +251,10 @@ do_suspend()</div><div class='ctx'> 					printf "Failed to suspend using RTC wake alarm\n"</div><div class='ctx'> 					return 1</div><div class='ctx'> 				fi</div><div class='add'>+			else</div><div class='add'>+				echo $filename &gt; $SYSFS/power/state</div><div class='ctx'> 			fi</div><div class='ctx'> </div><div class='del'>-			echo $filename &gt; $SYSFS/power/state</div><div class='ctx'> 			printf "Came out of $1\n"</div><div class='ctx'> </div><div class='ctx'> 			printf "Do basic tests after finishing $1 to verify cpufreq state\n\n"</div><div class='head'>diff --git a/tools/testing/selftests/damon/Makefile b/tools/testing/selftests/damon/Makefile<br/>index ecbf07afc6dd..2180c328a825 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/Makefile</a></div><div class='hunk'>@@ -3,10 +3,13 @@</div><div class='ctx'> </div><div class='ctx'> TEST_GEN_FILES += access_memory access_memory_even</div><div class='ctx'> </div><div class='del'>-TEST_FILES = _chk_dependency.sh _damon_sysfs.py</div><div class='add'>+TEST_FILES = _damon_sysfs.py</div><div class='add'>+TEST_FILES += drgn_dump_damon_status.py</div><div class='add'>+TEST_FILES += _common.sh</div><div class='ctx'> </div><div class='ctx'> # functionality tests</div><div class='ctx'> TEST_PROGS += sysfs.sh</div><div class='add'>+TEST_PROGS += sysfs.py</div><div class='ctx'> TEST_PROGS += sysfs_update_schemes_tried_regions_wss_estimation.py</div><div class='ctx'> TEST_PROGS += damos_quota.py damos_quota_goal.py damos_apply_interval.py</div><div class='ctx'> TEST_PROGS += damos_tried_regions.py damon_nr_regions.py</div><div class='hunk'>@@ -15,6 +18,8 @@ TEST_PROGS += reclaim.sh lru_sort.sh</div><div class='ctx'> # regression tests (reproducers of previously found bugs)</div><div class='ctx'> TEST_PROGS += sysfs_update_removed_scheme_dir.sh</div><div class='ctx'> TEST_PROGS += sysfs_update_schemes_tried_regions_hang.py</div><div class='add'>+TEST_PROGS += sysfs_memcg_path_leak.sh</div><div class='add'>+TEST_PROGS += sysfs_no_op_commit_break.py</div><div class='ctx'> </div><div class='ctx'> EXTRA_CLEAN = __pycache__</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/damon/_chk_dependency.sh b/tools/testing/selftests/damon/_chk_dependency.sh<br/>deleted file mode 100644<br/>index dda3a87dc00a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/_chk_dependency.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/_chk_dependency.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-# Kselftest framework requirement - SKIP code is 4.</div><div class='del'>-ksft_skip=4</div><div class='del'>-</div><div class='del'>-DBGFS=$(grep debugfs /proc/mounts --max-count 1 | awk '{print $2}')</div><div class='del'>-if [ "$DBGFS" = "" ]</div><div class='del'>-then</div><div class='del'>-	echo "debugfs not mounted"</div><div class='del'>-	exit $ksft_skip</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-DBGFS+="/damon"</div><div class='del'>-</div><div class='del'>-if [ $EUID -ne 0 ];</div><div class='del'>-then</div><div class='del'>-	echo "Run as root"</div><div class='del'>-	exit $ksft_skip</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if [ ! -d "$DBGFS" ]</div><div class='del'>-then</div><div class='del'>-	echo "$DBGFS not found"</div><div class='del'>-	exit $ksft_skip</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if [ -f "$DBGFS/monitor_on_DEPRECATED" ]</div><div class='del'>-then</div><div class='del'>-	monitor_on_file="monitor_on_DEPRECATED"</div><div class='del'>-else</div><div class='del'>-	monitor_on_file="monitor_on"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-for f in attrs target_ids "$monitor_on_file"</div><div class='del'>-do</div><div class='del'>-	if [ ! -f "$DBGFS/$f" ]</div><div class='del'>-	then</div><div class='del'>-		echo "$f not found"</div><div class='del'>-		exit 1</div><div class='del'>-	fi</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-permission_error="Operation not permitted"</div><div class='del'>-for f in attrs target_ids "$monitor_on_file"</div><div class='del'>-do</div><div class='del'>-	status=$( cat "$DBGFS/$f" 2&gt;&amp;1 )</div><div class='del'>-	if [ "${status#*$permission_error}" != "$status" ]; then</div><div class='del'>-		echo "Permission for reading $DBGFS/$f denied; maybe secureboot enabled?"</div><div class='del'>-		exit $ksft_skip</div><div class='del'>-	fi</div><div class='del'>-done</div><div class='head'>diff --git a/tools/testing/selftests/damon/_common.sh b/tools/testing/selftests/damon/_common.sh<br/>new file mode 100644<br/>index 000000000000..0279698f733e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/_common.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/_common.sh</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+#!/bin/bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+check_dependencies()</div><div class='add'>+{</div><div class='add'>+	if [ $EUID -ne 0 ]</div><div class='add'>+	then</div><div class='add'>+		echo "Run as root"</div><div class='add'>+		exit $ksft_skip</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/damon/_damon_sysfs.py b/tools/testing/selftests/damon/_damon_sysfs.py<br/>index 6e136dc3df19..748778b563cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/_damon_sysfs.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/_damon_sysfs.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/_damon_sysfs.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/_damon_sysfs.py</a></div><div class='hunk'>@@ -15,6 +15,10 @@ if sysfs_root is None:</div><div class='ctx'>     print('Seems sysfs not mounted?')</div><div class='ctx'>     exit(ksft_skip)</div><div class='ctx'> </div><div class='add'>+if not os.path.exists(sysfs_root):</div><div class='add'>+    print('Seems DAMON disabled?')</div><div class='add'>+    exit(ksft_skip)</div><div class='add'>+</div><div class='ctx'> def write_file(path, string):</div><div class='ctx'>     "Returns error string if failed, or None otherwise"</div><div class='ctx'>     string = '%s' % string</div><div class='hunk'>@@ -48,9 +52,9 @@ class DamosAccessPattern:</div><div class='ctx'>         if self.size is None:</div><div class='ctx'>             self.size = [0, 2**64 - 1]</div><div class='ctx'>         if self.nr_accesses is None:</div><div class='del'>-            self.nr_accesses = [0, 2**64 - 1]</div><div class='add'>+            self.nr_accesses = [0, 2**32 - 1]</div><div class='ctx'>         if self.age is None:</div><div class='del'>-            self.age = [0, 2**64 - 1]</div><div class='add'>+            self.age = [0, 2**32 - 1]</div><div class='ctx'> </div><div class='ctx'>     def sysfs_dir(self):</div><div class='ctx'>         return os.path.join(self.scheme.sysfs_dir(), 'access_pattern')</div><div class='hunk'>@@ -89,14 +93,16 @@ class DamosQuotaGoal:</div><div class='ctx'>     metric = None</div><div class='ctx'>     target_value = None</div><div class='ctx'>     current_value = None</div><div class='add'>+    nid = None</div><div class='ctx'>     effective_bytes = None</div><div class='ctx'>     quota = None            # owner quota</div><div class='ctx'>     idx = None</div><div class='ctx'> </div><div class='del'>-    def __init__(self, metric, target_value=10000, current_value=0):</div><div class='add'>+    def __init__(self, metric, target_value=10000, current_value=0, nid=0):</div><div class='ctx'>         self.metric = metric</div><div class='ctx'>         self.target_value = target_value</div><div class='ctx'>         self.current_value = current_value</div><div class='add'>+        self.nid = nid</div><div class='ctx'> </div><div class='ctx'>     def sysfs_dir(self):</div><div class='ctx'>         return os.path.join(self.quota.sysfs_dir(), 'goals', '%d' % self.idx)</div><div class='hunk'>@@ -114,6 +120,10 @@ class DamosQuotaGoal:</div><div class='ctx'>                          self.current_value)</div><div class='ctx'>         if err is not None:</div><div class='ctx'>             return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'nid'), self.nid)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+</div><div class='ctx'>         return None</div><div class='ctx'> </div><div class='ctx'> class DamosQuota:</div><div class='hunk'>@@ -121,12 +131,20 @@ class DamosQuota:</div><div class='ctx'>     ms = None                   # time quota</div><div class='ctx'>     goals = None                # quota goals</div><div class='ctx'>     reset_interval_ms = None    # quota reset interval</div><div class='add'>+    weight_sz_permil = None</div><div class='add'>+    weight_nr_accesses_permil = None</div><div class='add'>+    weight_age_permil = None</div><div class='ctx'>     scheme = None               # owner scheme</div><div class='ctx'> </div><div class='del'>-    def __init__(self, sz=0, ms=0, goals=None, reset_interval_ms=0):</div><div class='add'>+    def __init__(self, sz=0, ms=0, goals=None, reset_interval_ms=0,</div><div class='add'>+                 weight_sz_permil=0, weight_nr_accesses_permil=0,</div><div class='add'>+                 weight_age_permil=0):</div><div class='ctx'>         self.sz = sz</div><div class='ctx'>         self.ms = ms</div><div class='ctx'>         self.reset_interval_ms = reset_interval_ms</div><div class='add'>+        self.weight_sz_permil = weight_sz_permil</div><div class='add'>+        self.weight_nr_accesses_permil = weight_nr_accesses_permil</div><div class='add'>+        self.weight_age_permil = weight_age_permil</div><div class='ctx'>         self.goals = goals if goals is not None else []</div><div class='ctx'>         for idx, goal in enumerate(self.goals):</div><div class='ctx'>             goal.idx = idx</div><div class='hunk'>@@ -147,6 +165,20 @@ class DamosQuota:</div><div class='ctx'>         if err is not None:</div><div class='ctx'>             return err</div><div class='ctx'> </div><div class='add'>+        err = write_file(os.path.join(</div><div class='add'>+            self.sysfs_dir(), 'weights', 'sz_permil'), self.weight_sz_permil)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(</div><div class='add'>+            self.sysfs_dir(), 'weights', 'nr_accesses_permil'),</div><div class='add'>+                         self.weight_nr_accesses_permil)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(</div><div class='add'>+            self.sysfs_dir(), 'weights', 'age_permil'), self.weight_age_permil)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+</div><div class='ctx'>         nr_goals_file = os.path.join(self.sysfs_dir(), 'goals', 'nr_goals')</div><div class='ctx'>         content, err = read_file(nr_goals_file)</div><div class='ctx'>         if err is not None:</div><div class='hunk'>@@ -161,6 +193,178 @@ class DamosQuota:</div><div class='ctx'>                 return err</div><div class='ctx'>         return None</div><div class='ctx'> </div><div class='add'>+class DamosWatermarks:</div><div class='add'>+    metric = None</div><div class='add'>+    interval = None</div><div class='add'>+    high = None</div><div class='add'>+    mid = None</div><div class='add'>+    low = None</div><div class='add'>+    scheme = None   # owner scheme</div><div class='add'>+</div><div class='add'>+    def __init__(self, metric='none', interval=0, high=0, mid=0, low=0):</div><div class='add'>+        self.metric = metric</div><div class='add'>+        self.interval = interval</div><div class='add'>+        self.high = high</div><div class='add'>+        self.mid = mid</div><div class='add'>+        self.low = low</div><div class='add'>+</div><div class='add'>+    def sysfs_dir(self):</div><div class='add'>+        return os.path.join(self.scheme.sysfs_dir(), 'watermarks')</div><div class='add'>+</div><div class='add'>+    def stage(self):</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'metric'), self.metric)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'interval_us'),</div><div class='add'>+                         self.interval)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'high'), self.high)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'mid'), self.mid)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'low'), self.low)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+</div><div class='add'>+class DamosFilter:</div><div class='add'>+    type_ = None</div><div class='add'>+    matching = None</div><div class='add'>+    allow = None</div><div class='add'>+    memcg_path = None</div><div class='add'>+    addr_start = None</div><div class='add'>+    addr_end = None</div><div class='add'>+    target_idx = None</div><div class='add'>+    min_ = None</div><div class='add'>+    max_ = None</div><div class='add'>+    idx = None</div><div class='add'>+    filters = None  # owner filters</div><div class='add'>+</div><div class='add'>+    def __init__(self, type_='anon', matching=False, allow=False,</div><div class='add'>+                 memcg_path='', addr_start=0, addr_end=0, target_idx=0, min_=0,</div><div class='add'>+                 max_=0):</div><div class='add'>+        self.type_ = type_</div><div class='add'>+        self.matching = matching</div><div class='add'>+        self.allow = allow</div><div class='add'>+        self.memcg_path = memcg_path,</div><div class='add'>+        self.addr_start = addr_start</div><div class='add'>+        self.addr_end = addr_end</div><div class='add'>+        self.target_idx = target_idx</div><div class='add'>+        self.min_ = min_</div><div class='add'>+        self.max_ = max_</div><div class='add'>+</div><div class='add'>+    def sysfs_dir(self):</div><div class='add'>+        return os.path.join(self.filters.sysfs_dir(), '%d' % self.idx)</div><div class='add'>+</div><div class='add'>+    def stage(self):</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'type'), self.type_)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'matching'),</div><div class='add'>+                         self.matching)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'allow'), self.allow)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'memcg_path'),</div><div class='add'>+                         self.memcg_path)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'addr_start'),</div><div class='add'>+                         self.addr_start)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'addr_end'),</div><div class='add'>+                         self.addr_end)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'damon_target_idx'),</div><div class='add'>+                         self.target_idx)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'min'), self.min_)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'max'), self.max_)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        return None</div><div class='add'>+</div><div class='add'>+class DamosFilters:</div><div class='add'>+    name = None</div><div class='add'>+    filters = None</div><div class='add'>+    scheme = None   # owner scheme</div><div class='add'>+</div><div class='add'>+    def __init__(self, name, filters=[]):</div><div class='add'>+        self.name = name</div><div class='add'>+        self.filters = filters</div><div class='add'>+        for idx, filter_ in enumerate(self.filters):</div><div class='add'>+            filter_.idx = idx</div><div class='add'>+            filter_.filters = self</div><div class='add'>+</div><div class='add'>+    def sysfs_dir(self):</div><div class='add'>+        return os.path.join(self.scheme.sysfs_dir(), self.name)</div><div class='add'>+</div><div class='add'>+    def stage(self):</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'nr_filters'),</div><div class='add'>+                         len(self.filters))</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        for filter_ in self.filters:</div><div class='add'>+            err = filter_.stage()</div><div class='add'>+            if err is not None:</div><div class='add'>+                return err</div><div class='add'>+        return None</div><div class='add'>+</div><div class='add'>+class DamosDest:</div><div class='add'>+    id = None</div><div class='add'>+    weight = None</div><div class='add'>+    idx = None</div><div class='add'>+    dests = None    # owner dests</div><div class='add'>+</div><div class='add'>+    def __init__(self, id=0, weight=0):</div><div class='add'>+        self.id = id</div><div class='add'>+        self.weight = weight</div><div class='add'>+</div><div class='add'>+    def sysfs_dir(self):</div><div class='add'>+        return os.path.join(self.dests.sysfs_dir(), '%d' % self.idx)</div><div class='add'>+</div><div class='add'>+    def stage(self):</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'id'), self.id)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'weight'), self.weight)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        return None</div><div class='add'>+</div><div class='add'>+class DamosDests:</div><div class='add'>+    dests = None</div><div class='add'>+    scheme = None   # owner scheme</div><div class='add'>+</div><div class='add'>+    def __init__(self, dests=[]):</div><div class='add'>+        self.dests = dests</div><div class='add'>+        for idx, dest in enumerate(self.dests):</div><div class='add'>+            dest.idx = idx</div><div class='add'>+            dest.dests = self</div><div class='add'>+</div><div class='add'>+    def sysfs_dir(self):</div><div class='add'>+        return os.path.join(self.scheme.sysfs_dir(), 'dests')</div><div class='add'>+</div><div class='add'>+    def stage(self):</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'nr_dests'),</div><div class='add'>+                         len(self.dests))</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        for dest in self.dests:</div><div class='add'>+            err = dest.stage()</div><div class='add'>+            if err is not None:</div><div class='add'>+                return err</div><div class='add'>+        return None</div><div class='add'>+</div><div class='ctx'> class DamosStats:</div><div class='ctx'>     nr_tried = None</div><div class='ctx'>     sz_tried = None</div><div class='hunk'>@@ -186,8 +390,13 @@ class Damos:</div><div class='ctx'>     action = None</div><div class='ctx'>     access_pattern = None</div><div class='ctx'>     quota = None</div><div class='add'>+    watermarks = None</div><div class='add'>+    core_filters = None</div><div class='add'>+    ops_filters = None</div><div class='add'>+    filters = None</div><div class='ctx'>     apply_interval_us = None</div><div class='del'>-    # todo: Support watermarks, stats</div><div class='add'>+    target_nid = None</div><div class='add'>+    dests = None</div><div class='ctx'>     idx = None</div><div class='ctx'>     context = None</div><div class='ctx'>     tried_bytes = None</div><div class='hunk'>@@ -195,12 +404,30 @@ class Damos:</div><div class='ctx'>     tried_regions = None</div><div class='ctx'> </div><div class='ctx'>     def __init__(self, action='stat', access_pattern=DamosAccessPattern(),</div><div class='del'>-                 quota=DamosQuota(), apply_interval_us=0):</div><div class='add'>+                 quota=DamosQuota(), watermarks=DamosWatermarks(),</div><div class='add'>+                 core_filters=[], ops_filters=[], filters=[], target_nid=0,</div><div class='add'>+                 dests=DamosDests(), apply_interval_us=0):</div><div class='ctx'>         self.action = action</div><div class='ctx'>         self.access_pattern = access_pattern</div><div class='ctx'>         self.access_pattern.scheme = self</div><div class='ctx'>         self.quota = quota</div><div class='ctx'>         self.quota.scheme = self</div><div class='add'>+        self.watermarks = watermarks</div><div class='add'>+        self.watermarks.scheme = self</div><div class='add'>+</div><div class='add'>+        self.core_filters = DamosFilters(name='core_filters',</div><div class='add'>+                                         filters=core_filters)</div><div class='add'>+        self.core_filters.scheme = self</div><div class='add'>+        self.ops_filters = DamosFilters(name='ops_filters',</div><div class='add'>+                                         filters=ops_filters)</div><div class='add'>+        self.ops_filters.scheme = self</div><div class='add'>+        self.filters = DamosFilters(name='filters', filters=filters)</div><div class='add'>+        self.filters.scheme = self</div><div class='add'>+</div><div class='add'>+        self.target_nid = target_nid</div><div class='add'>+        self.dests = dests</div><div class='add'>+        self.dests.scheme = self</div><div class='add'>+</div><div class='ctx'>         self.apply_interval_us = apply_interval_us</div><div class='ctx'> </div><div class='ctx'>     def sysfs_dir(self):</div><div class='hunk'>@@ -223,26 +450,39 @@ class Damos:</div><div class='ctx'>         if err is not None:</div><div class='ctx'>             return err</div><div class='ctx'> </div><div class='del'>-        # disable watermarks</div><div class='del'>-        err = write_file(</div><div class='del'>-                os.path.join(self.sysfs_dir(), 'watermarks', 'metric'), 'none')</div><div class='add'>+        err = self.watermarks.stage()</div><div class='ctx'>         if err is not None:</div><div class='ctx'>             return err</div><div class='ctx'> </div><div class='del'>-        # disable filters</div><div class='del'>-        err = write_file(</div><div class='del'>-                os.path.join(self.sysfs_dir(), 'filters', 'nr_filters'), '0')</div><div class='add'>+        err = self.core_filters.stage()</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = self.ops_filters.stage()</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = self.filters.stage()</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'target_nid'), '%d' %</div><div class='add'>+                         self.target_nid)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+</div><div class='add'>+        err = self.dests.stage()</div><div class='ctx'>         if err is not None:</div><div class='ctx'>             return err</div><div class='ctx'> </div><div class='ctx'> class DamonTarget:</div><div class='ctx'>     pid = None</div><div class='add'>+    obsolete = None</div><div class='ctx'>     # todo: Support target regions if test is made</div><div class='ctx'>     idx = None</div><div class='ctx'>     context = None</div><div class='ctx'> </div><div class='del'>-    def __init__(self, pid):</div><div class='add'>+    def __init__(self, pid, obsolete=False):</div><div class='ctx'>         self.pid = pid</div><div class='add'>+        self.obsolete = obsolete</div><div class='ctx'> </div><div class='ctx'>     def sysfs_dir(self):</div><div class='ctx'>         return os.path.join(</div><div class='hunk'>@@ -253,21 +493,64 @@ class DamonTarget:</div><div class='ctx'>                 os.path.join(self.sysfs_dir(), 'regions', 'nr_regions'), '0')</div><div class='ctx'>         if err is not None:</div><div class='ctx'>             return err</div><div class='del'>-        return write_file(</div><div class='add'>+        err = write_file(</div><div class='ctx'>                 os.path.join(self.sysfs_dir(), 'pid_target'), self.pid)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        return write_file(</div><div class='add'>+                os.path.join(self.sysfs_dir(), 'obsolete_target'),</div><div class='add'>+                'Y' if self.obsolete else 'N')</div><div class='add'>+</div><div class='add'>+class IntervalsGoal:</div><div class='add'>+    access_bp = None</div><div class='add'>+    aggrs = None</div><div class='add'>+    min_sample_us = None</div><div class='add'>+    max_sample_us = None</div><div class='add'>+    attrs = None    # owner DamonAttrs</div><div class='add'>+</div><div class='add'>+    def __init__(self, access_bp=0, aggrs=0, min_sample_us=0, max_sample_us=0):</div><div class='add'>+        self.access_bp = access_bp</div><div class='add'>+        self.aggrs = aggrs</div><div class='add'>+        self.min_sample_us = min_sample_us</div><div class='add'>+        self.max_sample_us = max_sample_us</div><div class='add'>+</div><div class='add'>+    def sysfs_dir(self):</div><div class='add'>+        return os.path.join(self.attrs.interval_sysfs_dir(), 'intervals_goal')</div><div class='add'>+</div><div class='add'>+    def stage(self):</div><div class='add'>+        err = write_file(</div><div class='add'>+                os.path.join(self.sysfs_dir(), 'access_bp'), self.access_bp)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'aggrs'), self.aggrs)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'min_sample_us'),</div><div class='add'>+                         self.min_sample_us)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        err = write_file(os.path.join(self.sysfs_dir(), 'max_sample_us'),</div><div class='add'>+                         self.max_sample_us)</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        return None</div><div class='ctx'> </div><div class='ctx'> class DamonAttrs:</div><div class='ctx'>     sample_us = None</div><div class='ctx'>     aggr_us = None</div><div class='add'>+    intervals_goal = None</div><div class='ctx'>     update_us = None</div><div class='ctx'>     min_nr_regions = None</div><div class='ctx'>     max_nr_regions = None</div><div class='ctx'>     context = None</div><div class='ctx'> </div><div class='del'>-    def __init__(self, sample_us=5000, aggr_us=100000, update_us=1000000,</div><div class='add'>+    def __init__(self, sample_us=5000, aggr_us=100000,</div><div class='add'>+                 intervals_goal=IntervalsGoal(), update_us=1000000,</div><div class='ctx'>             min_nr_regions=10, max_nr_regions=1000):</div><div class='ctx'>         self.sample_us = sample_us</div><div class='ctx'>         self.aggr_us = aggr_us</div><div class='add'>+        self.intervals_goal = intervals_goal</div><div class='add'>+        self.intervals_goal.attrs = self</div><div class='ctx'>         self.update_us = update_us</div><div class='ctx'>         self.min_nr_regions = min_nr_regions</div><div class='ctx'>         self.max_nr_regions = max_nr_regions</div><div class='hunk'>@@ -289,6 +572,9 @@ class DamonAttrs:</div><div class='ctx'>                 self.aggr_us)</div><div class='ctx'>         if err is not None:</div><div class='ctx'>             return err</div><div class='add'>+        err = self.intervals_goal.stage()</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='ctx'>         err = write_file(os.path.join(self.interval_sysfs_dir(), 'update_us'),</div><div class='ctx'>                 self.update_us)</div><div class='ctx'>         if err is not None:</div><div class='hunk'>@@ -404,6 +690,9 @@ class Kdamond:</div><div class='ctx'>             if err is not None:</div><div class='ctx'>                 return err</div><div class='ctx'>         err = write_file(os.path.join(self.sysfs_dir(), 'state'), 'on')</div><div class='add'>+        if err is not None:</div><div class='add'>+            return err</div><div class='add'>+        self.pid, err = read_file(os.path.join(self.sysfs_dir(), 'pid'))</div><div class='ctx'>         return err</div><div class='ctx'> </div><div class='ctx'>     def stop(self):</div><div class='hunk'>@@ -420,11 +709,16 @@ class Kdamond:</div><div class='ctx'>                 tried_regions = []</div><div class='ctx'>                 tried_regions_dir = os.path.join(</div><div class='ctx'>                         scheme.sysfs_dir(), 'tried_regions')</div><div class='add'>+                region_indices = []</div><div class='ctx'>                 for filename in os.listdir(</div><div class='ctx'>                         os.path.join(scheme.sysfs_dir(), 'tried_regions')):</div><div class='ctx'>                     tried_region_dir = os.path.join(tried_regions_dir, filename)</div><div class='ctx'>                     if not os.path.isdir(tried_region_dir):</div><div class='ctx'>                         continue</div><div class='add'>+                    region_indices.append(int(filename))</div><div class='add'>+                for region_idx in sorted(region_indices):</div><div class='add'>+                    tried_region_dir = os.path.join(tried_regions_dir,</div><div class='add'>+                                                    '%d' % region_idx)</div><div class='ctx'>                     region_values = []</div><div class='ctx'>                     for f in ['start', 'end', 'nr_accesses', 'age']:</div><div class='ctx'>                         content, err = read_file(</div><div class='head'>diff --git a/tools/testing/selftests/damon/_debugfs_common.sh b/tools/testing/selftests/damon/_debugfs_common.sh<br/>deleted file mode 100644<br/>index 54d45791b0d9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/_debugfs_common.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/_debugfs_common.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-test_write_result() {</div><div class='del'>-	file=$1</div><div class='del'>-	content=$2</div><div class='del'>-	orig_content=$3</div><div class='del'>-	expect_reason=$4</div><div class='del'>-	expected=$5</div><div class='del'>-</div><div class='del'>-	if [ "$expected" = "0" ]</div><div class='del'>-	then</div><div class='del'>-		echo "$content" &gt; "$file"</div><div class='del'>-	else</div><div class='del'>-		echo "$content" &gt; "$file" 2&gt; /dev/null</div><div class='del'>-	fi</div><div class='del'>-	if [ $? -ne "$expected" ]</div><div class='del'>-	then</div><div class='del'>-		echo "writing $content to $file doesn't return $expected"</div><div class='del'>-		echo "expected because: $expect_reason"</div><div class='del'>-		echo "$orig_content" &gt; "$file"</div><div class='del'>-		exit 1</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_write_succ() {</div><div class='del'>-	test_write_result "$1" "$2" "$3" "$4" 0</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_write_fail() {</div><div class='del'>-	test_write_result "$1" "$2" "$3" "$4" 1</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test_content() {</div><div class='del'>-	file=$1</div><div class='del'>-	orig_content=$2</div><div class='del'>-	expected=$3</div><div class='del'>-	expect_reason=$4</div><div class='del'>-</div><div class='del'>-	content=$(cat "$file")</div><div class='del'>-	if [ "$content" != "$expected" ]</div><div class='del'>-	then</div><div class='del'>-		echo "reading $file expected $expected but $content"</div><div class='del'>-		echo "expected because: $expect_reason"</div><div class='del'>-		echo "$orig_content" &gt; "$file"</div><div class='del'>-		exit 1</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-source ./_chk_dependency.sh</div><div class='del'>-</div><div class='del'>-damon_onoff="$DBGFS/monitor_on"</div><div class='del'>-if [ -f "$DBGFS/monitor_on_DEPRECATED" ]</div><div class='del'>-then</div><div class='del'>-	damon_onoff="$DBGFS/monitor_on_DEPRECATED"</div><div class='del'>-else</div><div class='del'>-	damon_onoff="$DBGFS/monitor_on"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if [ $(cat "$damon_onoff") = "on" ]</div><div class='del'>-then</div><div class='del'>-	echo "monitoring is on"</div><div class='del'>-	exit $ksft_skip</div><div class='del'>-fi</div><div class='head'>diff --git a/tools/testing/selftests/damon/access_memory_even.c b/tools/testing/selftests/damon/access_memory_even.c<br/>index a9f4e9aaf3a9..93f3a71bcfd4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/access_memory_even.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/access_memory_even.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/access_memory_even.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/access_memory_even.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/damon/damon_nr_regions.py b/tools/testing/selftests/damon/damon_nr_regions.py<br/>index 2e8a74aff543..58f3291fed12 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/damon_nr_regions.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/damon_nr_regions.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/damon_nr_regions.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/damon_nr_regions.py</a></div><div class='hunk'>@@ -65,6 +65,7 @@ def test_nr_regions(real_nr_regions, min_nr_regions, max_nr_regions):</div><div class='ctx'> </div><div class='ctx'>     test_name = 'nr_regions test with %d/%d/%d real/min/max nr_regions' % (</div><div class='ctx'>             real_nr_regions, min_nr_regions, max_nr_regions)</div><div class='add'>+    collected_nr_regions.sort()</div><div class='ctx'>     if (collected_nr_regions[0] &lt; min_nr_regions or</div><div class='ctx'>         collected_nr_regions[-1] &gt; max_nr_regions):</div><div class='ctx'>         print('fail %s' % test_name)</div><div class='hunk'>@@ -109,6 +110,7 @@ def main():</div><div class='ctx'>     attrs = kdamonds.kdamonds[0].contexts[0].monitoring_attrs</div><div class='ctx'>     attrs.min_nr_regions = 3</div><div class='ctx'>     attrs.max_nr_regions = 7</div><div class='add'>+    attrs.update_us = 100000</div><div class='ctx'>     err = kdamonds.kdamonds[0].commit()</div><div class='ctx'>     if err is not None:</div><div class='ctx'>         proc.terminate()</div><div class='head'>diff --git a/tools/testing/selftests/damon/damos_quota.py b/tools/testing/selftests/damon/damos_quota.py<br/>index 7d4c6bb2e3cd..57c4937aaed2 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/damos_quota.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/damos_quota.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/damos_quota.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/damos_quota.py</a></div><div class='hunk'>@@ -51,16 +51,19 @@ def main():</div><div class='ctx'>         nr_quota_exceeds = scheme.stats.qt_exceeds</div><div class='ctx'> </div><div class='ctx'>     wss_collected.sort()</div><div class='add'>+    nr_expected_quota_exceeds = 0</div><div class='ctx'>     for wss in wss_collected:</div><div class='ctx'>         if wss &gt; sz_quota:</div><div class='ctx'>             print('quota is not kept: %s &gt; %s' % (wss, sz_quota))</div><div class='ctx'>             print('collected samples are as below')</div><div class='ctx'>             print('\n'.join(['%d' % wss for wss in wss_collected]))</div><div class='ctx'>             exit(1)</div><div class='add'>+        if wss == sz_quota:</div><div class='add'>+            nr_expected_quota_exceeds += 1</div><div class='ctx'> </div><div class='del'>-    if nr_quota_exceeds &lt; len(wss_collected):</div><div class='del'>-        print('quota is not always exceeded: %d &gt; %d' %</div><div class='del'>-              (len(wss_collected), nr_quota_exceeds))</div><div class='add'>+    if nr_quota_exceeds &lt; nr_expected_quota_exceeds:</div><div class='add'>+        print('quota is exceeded less than expected: %d &lt; %d' %</div><div class='add'>+              (nr_quota_exceeds, nr_expected_quota_exceeds))</div><div class='ctx'>         exit(1)</div><div class='ctx'> </div><div class='ctx'> if __name__ == '__main__':</div><div class='head'>diff --git a/tools/testing/selftests/damon/damos_quota_goal.py b/tools/testing/selftests/damon/damos_quota_goal.py<br/>index 18246f3b62f7..f76e0412b564 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/damos_quota_goal.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/damos_quota_goal.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/damos_quota_goal.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/damos_quota_goal.py</a></div><div class='hunk'>@@ -63,6 +63,9 @@ def main():</div><div class='ctx'>             if last_effective_bytes != 0 else -1.0))</div><div class='ctx'> </div><div class='ctx'>         if last_effective_bytes == goal.effective_bytes:</div><div class='add'>+            # effective quota was already minimum that cannot be more reduced</div><div class='add'>+            if expect_increase is False and last_effective_bytes == 1:</div><div class='add'>+                continue</div><div class='ctx'>             print('efective bytes not changed: %d' % goal.effective_bytes)</div><div class='ctx'>             exit(1)</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/damon/drgn_dump_damon_status.py b/tools/testing/selftests/damon/drgn_dump_damon_status.py<br/>new file mode 100755<br/>index 000000000000..5374d18d1fa8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/drgn_dump_damon_status.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/drgn_dump_damon_status.py</a></div><div class='hunk'>@@ -0,0 +1,223 @@</div><div class='add'>+#!/usr/bin/env drgn</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+'''</div><div class='add'>+Read DAMON context data and dump as a json string.</div><div class='add'>+'''</div><div class='add'>+import drgn</div><div class='add'>+from drgn import FaultError, NULL, Object, cast, container_of, execscript, offsetof, reinterpret, sizeof</div><div class='add'>+from drgn.helpers.common import *</div><div class='add'>+from drgn.helpers.linux import *</div><div class='add'>+</div><div class='add'>+import json</div><div class='add'>+import sys</div><div class='add'>+</div><div class='add'>+if "prog" not in globals():</div><div class='add'>+    try:</div><div class='add'>+        prog = drgn.get_default_prog()</div><div class='add'>+    except drgn.NoDefaultProgramError:</div><div class='add'>+        prog = drgn.program_from_kernel()</div><div class='add'>+        drgn.set_default_prog(prog)</div><div class='add'>+</div><div class='add'>+def to_dict(object, attr_name_converter):</div><div class='add'>+    d = {}</div><div class='add'>+    for attr_name, converter in attr_name_converter:</div><div class='add'>+        d[attr_name] = converter(getattr(object, attr_name))</div><div class='add'>+    return d</div><div class='add'>+</div><div class='add'>+def ops_to_dict(ops):</div><div class='add'>+    return to_dict(ops, [</div><div class='add'>+        ['id', int],</div><div class='add'>+        ])</div><div class='add'>+</div><div class='add'>+def intervals_goal_to_dict(goal):</div><div class='add'>+    return to_dict(goal, [</div><div class='add'>+        ['access_bp', int],</div><div class='add'>+        ['aggrs', int],</div><div class='add'>+        ['min_sample_us', int],</div><div class='add'>+        ['max_sample_us', int],</div><div class='add'>+        ])</div><div class='add'>+</div><div class='add'>+def attrs_to_dict(attrs):</div><div class='add'>+    return to_dict(attrs, [</div><div class='add'>+        ['sample_interval', int],</div><div class='add'>+        ['aggr_interval', int],</div><div class='add'>+        ['ops_update_interval', int],</div><div class='add'>+        ['intervals_goal', intervals_goal_to_dict],</div><div class='add'>+        ['min_nr_regions', int],</div><div class='add'>+        ['max_nr_regions', int],</div><div class='add'>+        ])</div><div class='add'>+</div><div class='add'>+def addr_range_to_dict(addr_range):</div><div class='add'>+    return to_dict(addr_range, [</div><div class='add'>+        ['start', int],</div><div class='add'>+        ['end', int],</div><div class='add'>+        ])</div><div class='add'>+</div><div class='add'>+def region_to_dict(region):</div><div class='add'>+    return to_dict(region, [</div><div class='add'>+        ['ar', addr_range_to_dict],</div><div class='add'>+        ['sampling_addr', int],</div><div class='add'>+        ['nr_accesses', int],</div><div class='add'>+        ['nr_accesses_bp', int],</div><div class='add'>+        ['age', int],</div><div class='add'>+        ])</div><div class='add'>+</div><div class='add'>+def regions_to_list(regions):</div><div class='add'>+    return [region_to_dict(r)</div><div class='add'>+            for r in list_for_each_entry(</div><div class='add'>+                'struct damon_region', regions.address_of_(), 'list')]</div><div class='add'>+</div><div class='add'>+def target_to_dict(target):</div><div class='add'>+    return to_dict(target, [</div><div class='add'>+        ['pid', int],</div><div class='add'>+        ['nr_regions', int],</div><div class='add'>+        ['regions_list', regions_to_list],</div><div class='add'>+        ['obsolete', bool],</div><div class='add'>+        ])</div><div class='add'>+</div><div class='add'>+def targets_to_list(targets):</div><div class='add'>+    return [target_to_dict(t)</div><div class='add'>+            for t in list_for_each_entry(</div><div class='add'>+                'struct damon_target', targets.address_of_(), 'list')]</div><div class='add'>+</div><div class='add'>+def damos_access_pattern_to_dict(pattern):</div><div class='add'>+    return to_dict(pattern, [</div><div class='add'>+        ['min_sz_region', int],</div><div class='add'>+        ['max_sz_region', int],</div><div class='add'>+        ['min_nr_accesses', int],</div><div class='add'>+        ['max_nr_accesses', int],</div><div class='add'>+        ['min_age_region', int],</div><div class='add'>+        ['max_age_region', int],</div><div class='add'>+        ])</div><div class='add'>+</div><div class='add'>+def damos_quota_goal_to_dict(goal):</div><div class='add'>+    return to_dict(goal, [</div><div class='add'>+        ['metric', int],</div><div class='add'>+        ['target_value', int],</div><div class='add'>+        ['current_value', int],</div><div class='add'>+        ['last_psi_total', int],</div><div class='add'>+        ['nid', int],</div><div class='add'>+        ])</div><div class='add'>+</div><div class='add'>+def damos_quota_goals_to_list(goals):</div><div class='add'>+    return [damos_quota_goal_to_dict(g)</div><div class='add'>+            for g in list_for_each_entry(</div><div class='add'>+                'struct damos_quota_goal', goals.address_of_(), 'list')]</div><div class='add'>+</div><div class='add'>+def damos_quota_to_dict(quota):</div><div class='add'>+    return to_dict(quota, [</div><div class='add'>+        ['reset_interval', int],</div><div class='add'>+        ['ms', int], ['sz', int],</div><div class='add'>+        ['goals', damos_quota_goals_to_list],</div><div class='add'>+        ['esz', int],</div><div class='add'>+        ['weight_sz', int],</div><div class='add'>+        ['weight_nr_accesses', int],</div><div class='add'>+        ['weight_age', int],</div><div class='add'>+        ])</div><div class='add'>+</div><div class='add'>+def damos_watermarks_to_dict(watermarks):</div><div class='add'>+    return to_dict(watermarks, [</div><div class='add'>+        ['metric', int],</div><div class='add'>+        ['interval', int],</div><div class='add'>+        ['high', int], ['mid', int], ['low', int],</div><div class='add'>+        ])</div><div class='add'>+</div><div class='add'>+def damos_migrate_dests_to_dict(dests):</div><div class='add'>+    nr_dests = int(dests.nr_dests)</div><div class='add'>+    node_id_arr = []</div><div class='add'>+    weight_arr = []</div><div class='add'>+    for i in range(nr_dests):</div><div class='add'>+        node_id_arr.append(int(dests.node_id_arr[i]))</div><div class='add'>+        weight_arr.append(int(dests.weight_arr[i]))</div><div class='add'>+    return {</div><div class='add'>+            'node_id_arr': node_id_arr,</div><div class='add'>+            'weight_arr': weight_arr,</div><div class='add'>+            'nr_dests': nr_dests,</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+def damos_filter_to_dict(damos_filter):</div><div class='add'>+    filter_type_keyword = {</div><div class='add'>+            0: 'anon',</div><div class='add'>+            1: 'active',</div><div class='add'>+            2: 'memcg',</div><div class='add'>+            3: 'young',</div><div class='add'>+            4: 'hugepage_size',</div><div class='add'>+            5: 'unmapped',</div><div class='add'>+            6: 'addr',</div><div class='add'>+            7: 'target'</div><div class='add'>+            }</div><div class='add'>+    dict_ = {</div><div class='add'>+            'type': filter_type_keyword[int(damos_filter.type)],</div><div class='add'>+            'matching': bool(damos_filter.matching),</div><div class='add'>+            'allow': bool(damos_filter.allow),</div><div class='add'>+            }</div><div class='add'>+    type_ = dict_['type']</div><div class='add'>+    if type_ == 'memcg':</div><div class='add'>+        dict_['memcg_id'] = int(damos_filter.memcg_id)</div><div class='add'>+    elif type_ == 'addr':</div><div class='add'>+        dict_['addr_range'] = [int(damos_filter.addr_range.start),</div><div class='add'>+                               int(damos_filter.addr_range.end)]</div><div class='add'>+    elif type_ == 'target':</div><div class='add'>+        dict_['target_idx'] = int(damos_filter.target_idx)</div><div class='add'>+    elif type_ == 'hugeapge_size':</div><div class='add'>+        dict_['sz_range'] = [int(damos_filter.sz_range.min),</div><div class='add'>+                             int(damos_filter.sz_range.max)]</div><div class='add'>+    return dict_</div><div class='add'>+</div><div class='add'>+def scheme_to_dict(scheme):</div><div class='add'>+    dict_ = to_dict(scheme, [</div><div class='add'>+        ['pattern', damos_access_pattern_to_dict],</div><div class='add'>+        ['action', int],</div><div class='add'>+        ['apply_interval_us', int],</div><div class='add'>+        ['quota', damos_quota_to_dict],</div><div class='add'>+        ['wmarks', damos_watermarks_to_dict],</div><div class='add'>+        ['target_nid', int],</div><div class='add'>+        ['migrate_dests', damos_migrate_dests_to_dict],</div><div class='add'>+        ])</div><div class='add'>+    core_filters = []</div><div class='add'>+    for f in list_for_each_entry(</div><div class='add'>+            'struct damos_filter', scheme.core_filters.address_of_(), 'list'):</div><div class='add'>+        core_filters.append(damos_filter_to_dict(f))</div><div class='add'>+    dict_['core_filters'] = core_filters</div><div class='add'>+    ops_filters = []</div><div class='add'>+    for f in list_for_each_entry(</div><div class='add'>+            'struct damos_filter', scheme.ops_filters.address_of_(), 'list'):</div><div class='add'>+        ops_filters.append(damos_filter_to_dict(f))</div><div class='add'>+    dict_['ops_filters'] = ops_filters</div><div class='add'>+</div><div class='add'>+    return dict_</div><div class='add'>+</div><div class='add'>+def schemes_to_list(schemes):</div><div class='add'>+    return [scheme_to_dict(s)</div><div class='add'>+            for s in list_for_each_entry(</div><div class='add'>+                'struct damos', schemes.address_of_(), 'list')]</div><div class='add'>+</div><div class='add'>+def damon_ctx_to_dict(ctx):</div><div class='add'>+    return to_dict(ctx, [</div><div class='add'>+        ['ops', ops_to_dict],</div><div class='add'>+        ['attrs', attrs_to_dict],</div><div class='add'>+        ['adaptive_targets', targets_to_list],</div><div class='add'>+        ['schemes', schemes_to_list],</div><div class='add'>+        ])</div><div class='add'>+</div><div class='add'>+def main():</div><div class='add'>+    if len(sys.argv) &lt; 3:</div><div class='add'>+        print('Usage: %s &lt;kdamond pid&gt; &lt;file&gt;' % sys.argv[0])</div><div class='add'>+        exit(1)</div><div class='add'>+</div><div class='add'>+    pid = int(sys.argv[1])</div><div class='add'>+    file_to_store = sys.argv[2]</div><div class='add'>+</div><div class='add'>+    kthread_data = cast('struct kthread *',</div><div class='add'>+                        find_task(prog, pid).worker_private).data</div><div class='add'>+    ctx = cast('struct damon_ctx *', kthread_data)</div><div class='add'>+    status = {'contexts': [damon_ctx_to_dict(ctx)]}</div><div class='add'>+    if file_to_store == 'stdout':</div><div class='add'>+        print(json.dumps(status, indent=4))</div><div class='add'>+    else:</div><div class='add'>+        with open(file_to_store, 'w') as f:</div><div class='add'>+            json.dump(status, f, indent=4)</div><div class='add'>+</div><div class='add'>+if __name__ == '__main__':</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/damon/lru_sort.sh b/tools/testing/selftests/damon/lru_sort.sh<br/>index 61b80197c896..1e4849db78a9 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/lru_sort.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/lru_sort.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/lru_sort.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/lru_sort.sh</a></div><div class='hunk'>@@ -1,14 +1,12 @@</div><div class='ctx'> #!/bin/bash</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+source _common.sh</div><div class='add'>+</div><div class='ctx'> # Kselftest framework requirement - SKIP code is 4.</div><div class='ctx'> ksft_skip=4</div><div class='ctx'> </div><div class='del'>-if [ $EUID -ne 0 ]</div><div class='del'>-then</div><div class='del'>-	echo "Run as root"</div><div class='del'>-	exit $ksft_skip</div><div class='del'>-fi</div><div class='add'>+check_dependencies</div><div class='ctx'> </div><div class='ctx'> damon_lru_sort_enabled="/sys/module/damon_lru_sort/parameters/enabled"</div><div class='ctx'> if [ ! -f "$damon_lru_sort_enabled" ]</div><div class='head'>diff --git a/tools/testing/selftests/damon/reclaim.sh b/tools/testing/selftests/damon/reclaim.sh<br/>index 78dbc2334cbe..e56ceb035129 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/reclaim.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/reclaim.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/reclaim.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/reclaim.sh</a></div><div class='hunk'>@@ -1,14 +1,12 @@</div><div class='ctx'> #!/bin/bash</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+source _common.sh</div><div class='add'>+</div><div class='ctx'> # Kselftest framework requirement - SKIP code is 4.</div><div class='ctx'> ksft_skip=4</div><div class='ctx'> </div><div class='del'>-if [ $EUID -ne 0 ]</div><div class='del'>-then</div><div class='del'>-	echo "Run as root"</div><div class='del'>-	exit $ksft_skip</div><div class='del'>-fi</div><div class='add'>+check_dependencies</div><div class='ctx'> </div><div class='ctx'> damon_reclaim_enabled="/sys/module/damon_reclaim/parameters/enabled"</div><div class='ctx'> if [ ! -f "$damon_reclaim_enabled" ]</div><div class='head'>diff --git a/tools/testing/selftests/damon/sysfs.py b/tools/testing/selftests/damon/sysfs.py<br/>new file mode 100755<br/>index 000000000000..9cca71eb0325<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/sysfs.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/sysfs.py</a></div><div class='hunk'>@@ -0,0 +1,303 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+import json</div><div class='add'>+import os</div><div class='add'>+import subprocess</div><div class='add'>+</div><div class='add'>+import _damon_sysfs</div><div class='add'>+</div><div class='add'>+def dump_damon_status_dict(pid):</div><div class='add'>+    try:</div><div class='add'>+        subprocess.check_output(['which', 'drgn'], stderr=subprocess.DEVNULL)</div><div class='add'>+    except:</div><div class='add'>+        return None, 'drgn not found'</div><div class='add'>+    file_dir = os.path.dirname(os.path.abspath(__file__))</div><div class='add'>+    dump_script = os.path.join(file_dir, 'drgn_dump_damon_status.py')</div><div class='add'>+    rc = subprocess.call(['drgn', dump_script, pid, 'damon_dump_output'],</div><div class='add'>+                         stderr=subprocess.DEVNULL)</div><div class='add'>+    if rc != 0:</div><div class='add'>+        return None, 'drgn fail'</div><div class='add'>+    try:</div><div class='add'>+        with open('damon_dump_output', 'r') as f:</div><div class='add'>+            return json.load(f), None</div><div class='add'>+    except Exception as e:</div><div class='add'>+        return None, 'json.load fail (%s)' % e</div><div class='add'>+</div><div class='add'>+def fail(expectation, status):</div><div class='add'>+    print('unexpected %s' % expectation)</div><div class='add'>+    print(json.dumps(status, indent=4))</div><div class='add'>+    exit(1)</div><div class='add'>+</div><div class='add'>+def assert_true(condition, expectation, status):</div><div class='add'>+    if condition is not True:</div><div class='add'>+        fail(expectation, status)</div><div class='add'>+</div><div class='add'>+def assert_watermarks_committed(watermarks, dump):</div><div class='add'>+    wmark_metric_val = {</div><div class='add'>+            'none': 0,</div><div class='add'>+            'free_mem_rate': 1,</div><div class='add'>+            }</div><div class='add'>+    assert_true(dump['metric'] == wmark_metric_val[watermarks.metric],</div><div class='add'>+                'metric', dump)</div><div class='add'>+    assert_true(dump['interval'] == watermarks.interval, 'interval', dump)</div><div class='add'>+    assert_true(dump['high'] == watermarks.high, 'high', dump)</div><div class='add'>+    assert_true(dump['mid'] == watermarks.mid, 'mid', dump)</div><div class='add'>+    assert_true(dump['low'] == watermarks.low, 'low', dump)</div><div class='add'>+</div><div class='add'>+def assert_quota_goal_committed(qgoal, dump):</div><div class='add'>+    metric_val = {</div><div class='add'>+            'user_input': 0,</div><div class='add'>+            'some_mem_psi_us': 1,</div><div class='add'>+            'node_mem_used_bp': 2,</div><div class='add'>+            'node_mem_free_bp': 3,</div><div class='add'>+            }</div><div class='add'>+    assert_true(dump['metric'] == metric_val[qgoal.metric], 'metric', dump)</div><div class='add'>+    assert_true(dump['target_value'] == qgoal.target_value, 'target_value',</div><div class='add'>+                dump)</div><div class='add'>+    if qgoal.metric == 'user_input':</div><div class='add'>+        assert_true(dump['current_value'] == qgoal.current_value,</div><div class='add'>+                    'current_value', dump)</div><div class='add'>+    assert_true(dump['nid'] == qgoal.nid, 'nid', dump)</div><div class='add'>+</div><div class='add'>+def assert_quota_committed(quota, dump):</div><div class='add'>+    assert_true(dump['reset_interval'] == quota.reset_interval_ms,</div><div class='add'>+                'reset_interval', dump)</div><div class='add'>+    assert_true(dump['ms'] == quota.ms, 'ms', dump)</div><div class='add'>+    assert_true(dump['sz'] == quota.sz, 'sz', dump)</div><div class='add'>+    for idx, qgoal in enumerate(quota.goals):</div><div class='add'>+        assert_quota_goal_committed(qgoal, dump['goals'][idx])</div><div class='add'>+    assert_true(dump['weight_sz'] == quota.weight_sz_permil, 'weight_sz', dump)</div><div class='add'>+    assert_true(dump['weight_nr_accesses'] == quota.weight_nr_accesses_permil,</div><div class='add'>+                'weight_nr_accesses', dump)</div><div class='add'>+    assert_true(</div><div class='add'>+            dump['weight_age'] == quota.weight_age_permil, 'weight_age', dump)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def assert_migrate_dests_committed(dests, dump):</div><div class='add'>+    assert_true(dump['nr_dests'] == len(dests.dests), 'nr_dests', dump)</div><div class='add'>+    for idx, dest in enumerate(dests.dests):</div><div class='add'>+        assert_true(dump['node_id_arr'][idx] == dest.id, 'node_id', dump)</div><div class='add'>+        assert_true(dump['weight_arr'][idx] == dest.weight, 'weight', dump)</div><div class='add'>+</div><div class='add'>+def assert_filter_committed(filter_, dump):</div><div class='add'>+    assert_true(filter_.type_ == dump['type'], 'type', dump)</div><div class='add'>+    assert_true(filter_.matching == dump['matching'], 'matching', dump)</div><div class='add'>+    assert_true(filter_.allow == dump['allow'], 'allow', dump)</div><div class='add'>+    # TODO: check memcg_path and memcg_id if type is memcg</div><div class='add'>+    if filter_.type_ == 'addr':</div><div class='add'>+        assert_true([filter_.addr_start, filter_.addr_end] ==</div><div class='add'>+                    dump['addr_range'], 'addr_range', dump)</div><div class='add'>+    elif filter_.type_ == 'target':</div><div class='add'>+        assert_true(filter_.target_idx == dump['target_idx'], 'target_idx',</div><div class='add'>+                    dump)</div><div class='add'>+    elif filter_.type_ == 'hugepage_size':</div><div class='add'>+        assert_true([filter_.min_, filter_.max_] == dump['sz_range'],</div><div class='add'>+                    'sz_range', dump)</div><div class='add'>+</div><div class='add'>+def assert_access_pattern_committed(pattern, dump):</div><div class='add'>+    assert_true(dump['min_sz_region'] == pattern.size[0], 'min_sz_region',</div><div class='add'>+                dump)</div><div class='add'>+    assert_true(dump['max_sz_region'] == pattern.size[1], 'max_sz_region',</div><div class='add'>+                dump)</div><div class='add'>+    assert_true(dump['min_nr_accesses'] == pattern.nr_accesses[0],</div><div class='add'>+                'min_nr_accesses', dump)</div><div class='add'>+    assert_true(dump['max_nr_accesses'] == pattern.nr_accesses[1],</div><div class='add'>+                'max_nr_accesses', dump)</div><div class='add'>+    assert_true(dump['min_age_region'] == pattern.age[0], 'min_age_region',</div><div class='add'>+                dump)</div><div class='add'>+    assert_true(dump['max_age_region'] == pattern.age[1], 'miaxage_region',</div><div class='add'>+                dump)</div><div class='add'>+</div><div class='add'>+def assert_scheme_committed(scheme, dump):</div><div class='add'>+    assert_access_pattern_committed(scheme.access_pattern, dump['pattern'])</div><div class='add'>+    action_val = {</div><div class='add'>+            'willneed': 0,</div><div class='add'>+            'cold': 1,</div><div class='add'>+            'pageout': 2,</div><div class='add'>+            'hugepage': 3,</div><div class='add'>+            'nohugeapge': 4,</div><div class='add'>+            'lru_prio': 5,</div><div class='add'>+            'lru_deprio': 6,</div><div class='add'>+            'migrate_hot': 7,</div><div class='add'>+            'migrate_cold': 8,</div><div class='add'>+            'stat': 9,</div><div class='add'>+            }</div><div class='add'>+    assert_true(dump['action'] == action_val[scheme.action], 'action', dump)</div><div class='add'>+    assert_true(dump['apply_interval_us'] == scheme. apply_interval_us,</div><div class='add'>+                'apply_interval_us', dump)</div><div class='add'>+    assert_true(dump['target_nid'] == scheme.target_nid, 'target_nid', dump)</div><div class='add'>+    assert_migrate_dests_committed(scheme.dests, dump['migrate_dests'])</div><div class='add'>+    assert_quota_committed(scheme.quota, dump['quota'])</div><div class='add'>+    assert_watermarks_committed(scheme.watermarks, dump['wmarks'])</div><div class='add'>+    # TODO: test filters directory</div><div class='add'>+    for idx, f in enumerate(scheme.core_filters.filters):</div><div class='add'>+        assert_filter_committed(f, dump['core_filters'][idx])</div><div class='add'>+    for idx, f in enumerate(scheme.ops_filters.filters):</div><div class='add'>+        assert_filter_committed(f, dump['ops_filters'][idx])</div><div class='add'>+</div><div class='add'>+def assert_schemes_committed(schemes, dump):</div><div class='add'>+    assert_true(len(schemes) == len(dump), 'len_schemes', dump)</div><div class='add'>+    for idx, scheme in enumerate(schemes):</div><div class='add'>+        assert_scheme_committed(scheme, dump[idx])</div><div class='add'>+</div><div class='add'>+def assert_monitoring_attrs_committed(attrs, dump):</div><div class='add'>+    assert_true(dump['sample_interval'] == attrs.sample_us, 'sample_interval',</div><div class='add'>+                dump)</div><div class='add'>+    assert_true(dump['aggr_interval'] == attrs.aggr_us, 'aggr_interval', dump)</div><div class='add'>+    assert_true(dump['intervals_goal']['access_bp'] ==</div><div class='add'>+                attrs.intervals_goal.access_bp, 'access_bp',</div><div class='add'>+                dump['intervals_goal'])</div><div class='add'>+    assert_true(dump['intervals_goal']['aggrs'] == attrs.intervals_goal.aggrs,</div><div class='add'>+                'aggrs', dump['intervals_goal'])</div><div class='add'>+    assert_true(dump['intervals_goal']['min_sample_us'] ==</div><div class='add'>+                attrs.intervals_goal.min_sample_us, 'min_sample_us',</div><div class='add'>+                dump['intervals_goal'])</div><div class='add'>+    assert_true(dump['intervals_goal']['max_sample_us'] ==</div><div class='add'>+                attrs.intervals_goal.max_sample_us, 'max_sample_us',</div><div class='add'>+                dump['intervals_goal'])</div><div class='add'>+</div><div class='add'>+    assert_true(dump['ops_update_interval'] == attrs.update_us,</div><div class='add'>+                'ops_update_interval', dump)</div><div class='add'>+    assert_true(dump['min_nr_regions'] == attrs.min_nr_regions,</div><div class='add'>+                'min_nr_regions', dump)</div><div class='add'>+    assert_true(dump['max_nr_regions'] == attrs.max_nr_regions,</div><div class='add'>+                'max_nr_regions', dump)</div><div class='add'>+</div><div class='add'>+def assert_monitoring_target_committed(target, dump):</div><div class='add'>+    # target.pid is the pid "number", while dump['pid'] is 'struct pid'</div><div class='add'>+    # pointer, and hence cannot be compared.</div><div class='add'>+    assert_true(dump['obsolete'] == target.obsolete, 'target obsolete', dump)</div><div class='add'>+</div><div class='add'>+def assert_monitoring_targets_committed(targets, dump):</div><div class='add'>+    assert_true(len(targets) == len(dump), 'len_targets', dump)</div><div class='add'>+    for idx, target in enumerate(targets):</div><div class='add'>+        assert_monitoring_target_committed(target, dump[idx])</div><div class='add'>+</div><div class='add'>+def assert_ctx_committed(ctx, dump):</div><div class='add'>+    ops_val = {</div><div class='add'>+            'vaddr': 0,</div><div class='add'>+            'fvaddr': 1,</div><div class='add'>+            'paddr': 2,</div><div class='add'>+            }</div><div class='add'>+    assert_true(dump['ops']['id'] == ops_val[ctx.ops], 'ops_id', dump)</div><div class='add'>+    assert_monitoring_attrs_committed(ctx.monitoring_attrs, dump['attrs'])</div><div class='add'>+    assert_monitoring_targets_committed(ctx.targets, dump['adaptive_targets'])</div><div class='add'>+    assert_schemes_committed(ctx.schemes, dump['schemes'])</div><div class='add'>+</div><div class='add'>+def assert_ctxs_committed(kdamonds):</div><div class='add'>+    status, err = dump_damon_status_dict(kdamonds.kdamonds[0].pid)</div><div class='add'>+    if err is not None:</div><div class='add'>+        print(err)</div><div class='add'>+        kdamonds.stop()</div><div class='add'>+        exit(1)</div><div class='add'>+</div><div class='add'>+    ctxs = kdamonds.kdamonds[0].contexts</div><div class='add'>+    dump = status['contexts']</div><div class='add'>+    assert_true(len(ctxs) == len(dump), 'ctxs length', dump)</div><div class='add'>+    for idx, ctx in enumerate(ctxs):</div><div class='add'>+        assert_ctx_committed(ctx, dump[idx])</div><div class='add'>+</div><div class='add'>+def main():</div><div class='add'>+    kdamonds = _damon_sysfs.Kdamonds(</div><div class='add'>+            [_damon_sysfs.Kdamond(</div><div class='add'>+                contexts=[_damon_sysfs.DamonCtx(</div><div class='add'>+                    targets=[_damon_sysfs.DamonTarget(pid=-1)],</div><div class='add'>+                    schemes=[_damon_sysfs.Damos()],</div><div class='add'>+                    )])])</div><div class='add'>+    err = kdamonds.start()</div><div class='add'>+    if err is not None:</div><div class='add'>+        print('kdamond start failed: %s' % err)</div><div class='add'>+        exit(1)</div><div class='add'>+</div><div class='add'>+    assert_ctxs_committed(kdamonds)</div><div class='add'>+</div><div class='add'>+    context = _damon_sysfs.DamonCtx(</div><div class='add'>+            monitoring_attrs=_damon_sysfs.DamonAttrs(</div><div class='add'>+                sample_us=100000, aggr_us=2000000,</div><div class='add'>+                intervals_goal=_damon_sysfs.IntervalsGoal(</div><div class='add'>+                    access_bp=400, aggrs=3, min_sample_us=5000,</div><div class='add'>+                    max_sample_us=10000000),</div><div class='add'>+                update_us=2000000),</div><div class='add'>+            schemes=[_damon_sysfs.Damos(</div><div class='add'>+                action='pageout',</div><div class='add'>+                access_pattern=_damon_sysfs.DamosAccessPattern(</div><div class='add'>+                    size=[4096, 2**10],</div><div class='add'>+                    nr_accesses=[3, 317],</div><div class='add'>+                    age=[5,71]),</div><div class='add'>+                quota=_damon_sysfs.DamosQuota(</div><div class='add'>+                    sz=100*1024*1024, ms=100,</div><div class='add'>+                    goals=[_damon_sysfs.DamosQuotaGoal(</div><div class='add'>+                        metric='node_mem_used_bp',</div><div class='add'>+                        target_value=9950,</div><div class='add'>+                        nid=1)],</div><div class='add'>+                    reset_interval_ms=1500,</div><div class='add'>+                    weight_sz_permil=20,</div><div class='add'>+                    weight_nr_accesses_permil=200,</div><div class='add'>+                    weight_age_permil=1000),</div><div class='add'>+                watermarks=_damon_sysfs.DamosWatermarks(</div><div class='add'>+                    metric = 'free_mem_rate', interval = 500000, # 500 ms</div><div class='add'>+                    high = 500, mid = 400, low = 50),</div><div class='add'>+                target_nid=1,</div><div class='add'>+                apply_interval_us=1000000,</div><div class='add'>+                dests=_damon_sysfs.DamosDests(</div><div class='add'>+                    dests=[_damon_sysfs.DamosDest(id=1, weight=30),</div><div class='add'>+                           _damon_sysfs.DamosDest(id=0, weight=70)]),</div><div class='add'>+                core_filters=[</div><div class='add'>+                    _damon_sysfs.DamosFilter(type_='addr', matching=True,</div><div class='add'>+                                             allow=False, addr_start=42,</div><div class='add'>+                                             addr_end=4242),</div><div class='add'>+                    ],</div><div class='add'>+                ops_filters=[</div><div class='add'>+                    _damon_sysfs.DamosFilter(type_='anon', matching=True,</div><div class='add'>+                                             allow=True),</div><div class='add'>+                    ],</div><div class='add'>+                )])</div><div class='add'>+    context.idx = 0</div><div class='add'>+    context.kdamond = kdamonds.kdamonds[0]</div><div class='add'>+    kdamonds.kdamonds[0].contexts = [context]</div><div class='add'>+    kdamonds.kdamonds[0].commit()</div><div class='add'>+</div><div class='add'>+    assert_ctxs_committed(kdamonds)</div><div class='add'>+</div><div class='add'>+    # test online commitment of minimum context.</div><div class='add'>+    context = _damon_sysfs.DamonCtx()</div><div class='add'>+    context.idx = 0</div><div class='add'>+    context.kdamond = kdamonds.kdamonds[0]</div><div class='add'>+    kdamonds.kdamonds[0].contexts = [context]</div><div class='add'>+    kdamonds.kdamonds[0].commit()</div><div class='add'>+</div><div class='add'>+    assert_ctxs_committed(kdamonds)</div><div class='add'>+</div><div class='add'>+    kdamonds.stop()</div><div class='add'>+</div><div class='add'>+    # test obsolete_target.</div><div class='add'>+    proc1 = subprocess.Popen(['sh'], stdout=subprocess.PIPE,</div><div class='add'>+                             stderr=subprocess.PIPE)</div><div class='add'>+    proc2 = subprocess.Popen(['sh'], stdout=subprocess.PIPE,</div><div class='add'>+                             stderr=subprocess.PIPE)</div><div class='add'>+    proc3 = subprocess.Popen(['sh'], stdout=subprocess.PIPE,</div><div class='add'>+                             stderr=subprocess.PIPE)</div><div class='add'>+    kdamonds = _damon_sysfs.Kdamonds(</div><div class='add'>+            [_damon_sysfs.Kdamond(</div><div class='add'>+                contexts=[_damon_sysfs.DamonCtx(</div><div class='add'>+                    ops='vaddr',</div><div class='add'>+                    targets=[</div><div class='add'>+                        _damon_sysfs.DamonTarget(pid=proc1.pid),</div><div class='add'>+                        _damon_sysfs.DamonTarget(pid=proc2.pid),</div><div class='add'>+                        _damon_sysfs.DamonTarget(pid=proc3.pid),</div><div class='add'>+                        ],</div><div class='add'>+                    schemes=[_damon_sysfs.Damos()],</div><div class='add'>+                    )])])</div><div class='add'>+    err = kdamonds.start()</div><div class='add'>+    if err is not None:</div><div class='add'>+        print('kdamond start failed: %s' % err)</div><div class='add'>+        exit(1)</div><div class='add'>+    kdamonds.kdamonds[0].contexts[0].targets[1].obsolete = True</div><div class='add'>+    kdamonds.kdamonds[0].commit()</div><div class='add'>+    del kdamonds.kdamonds[0].contexts[0].targets[1]</div><div class='add'>+    assert_ctxs_committed(kdamonds)</div><div class='add'>+    kdamonds.stop()</div><div class='add'>+</div><div class='add'>+if __name__ == '__main__':</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/damon/sysfs.sh b/tools/testing/selftests/damon/sysfs.sh<br/>index e9a976d296e2..83e3b7f63d81 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/sysfs.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/sysfs.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/sysfs.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/sysfs.sh</a></div><div class='hunk'>@@ -1,6 +1,8 @@</div><div class='ctx'> #!/bin/bash</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+source _common.sh</div><div class='add'>+</div><div class='ctx'> # Kselftest frmework requirement - SKIP code is 4.</div><div class='ctx'> ksft_skip=4</div><div class='ctx'> </div><div class='hunk'>@@ -364,14 +366,5 @@ test_damon_sysfs()</div><div class='ctx'> 	test_kdamonds "$damon_sysfs/kdamonds"</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-check_dependencies()</div><div class='del'>-{</div><div class='del'>-	if [ $EUID -ne 0 ]</div><div class='del'>-	then</div><div class='del'>-		echo "Run as root"</div><div class='del'>-		exit $ksft_skip</div><div class='del'>-	fi</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> check_dependencies</div><div class='ctx'> test_damon_sysfs "/sys/kernel/mm/damon/admin"</div><div class='head'>diff --git a/tools/testing/selftests/damon/sysfs_memcg_path_leak.sh b/tools/testing/selftests/damon/sysfs_memcg_path_leak.sh<br/>new file mode 100755<br/>index 000000000000..64c5d8c518a4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/sysfs_memcg_path_leak.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/sysfs_memcg_path_leak.sh</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+#!/bin/bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+if [ $EUID -ne 0 ]</div><div class='add'>+then</div><div class='add'>+	echo "Run as root"</div><div class='add'>+	exit $ksft_skip</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+damon_sysfs="/sys/kernel/mm/damon/admin"</div><div class='add'>+if [ ! -d "$damon_sysfs" ]</div><div class='add'>+then</div><div class='add'>+	echo "damon sysfs not found"</div><div class='add'>+	exit $ksft_skip</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# ensure filter directory</div><div class='add'>+echo 1 &gt; "$damon_sysfs/kdamonds/nr_kdamonds"</div><div class='add'>+echo 1 &gt; "$damon_sysfs/kdamonds/0/contexts/nr_contexts"</div><div class='add'>+echo 1 &gt; "$damon_sysfs/kdamonds/0/contexts/0/schemes/nr_schemes"</div><div class='add'>+echo 1 &gt; "$damon_sysfs/kdamonds/0/contexts/0/schemes/0/filters/nr_filters"</div><div class='add'>+</div><div class='add'>+filter_dir="$damon_sysfs/kdamonds/0/contexts/0/schemes/0/filters/0"</div><div class='add'>+</div><div class='add'>+before_kb=$(grep Slab /proc/meminfo | awk '{print $2}')</div><div class='add'>+</div><div class='add'>+# try to leak 3000 KiB</div><div class='add'>+for i in {1..102400};</div><div class='add'>+do</div><div class='add'>+	echo "012345678901234567890123456789" &gt; "$filter_dir/memcg_path"</div><div class='add'>+done</div><div class='add'>+</div><div class='add'>+after_kb=$(grep Slab /proc/meminfo | awk '{print $2}')</div><div class='add'>+# expect up to 1500 KiB free from other tasks memory</div><div class='add'>+expected_after_kb_max=$((before_kb + 1500))</div><div class='add'>+</div><div class='add'>+if [ "$after_kb" -gt "$expected_after_kb_max" ]</div><div class='add'>+then</div><div class='add'>+	echo "maybe memcg_path are leaking: $before_kb -&gt; $after_kb"</div><div class='add'>+	exit 1</div><div class='add'>+else</div><div class='add'>+	exit 0</div><div class='add'>+fi</div><div class='head'>diff --git a/tools/testing/selftests/damon/sysfs_no_op_commit_break.py b/tools/testing/selftests/damon/sysfs_no_op_commit_break.py<br/>new file mode 100755<br/>index 000000000000..2c65cffe6b54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/sysfs_no_op_commit_break.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/sysfs_no_op_commit_break.py</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+import json</div><div class='add'>+import os</div><div class='add'>+import subprocess</div><div class='add'>+import sys</div><div class='add'>+</div><div class='add'>+import _damon_sysfs</div><div class='add'>+</div><div class='add'>+def dump_damon_status_dict(pid):</div><div class='add'>+    try:</div><div class='add'>+        subprocess.check_output(['which', 'drgn'], stderr=subprocess.DEVNULL)</div><div class='add'>+    except:</div><div class='add'>+        return None, 'drgn not found'</div><div class='add'>+    file_dir = os.path.dirname(os.path.abspath(__file__))</div><div class='add'>+    dump_script = os.path.join(file_dir, 'drgn_dump_damon_status.py')</div><div class='add'>+    rc = subprocess.call(['drgn', dump_script, pid, 'damon_dump_output'],</div><div class='add'>+        stderr=subprocess.DEVNULL)</div><div class='add'>+</div><div class='add'>+    if rc != 0:</div><div class='add'>+        return None, f'drgn fail: return code({rc})'</div><div class='add'>+    try:</div><div class='add'>+        with open('damon_dump_output', 'r') as f:</div><div class='add'>+            return json.load(f), None</div><div class='add'>+    except Exception as e:</div><div class='add'>+        return None, 'json.load fail (%s)' % e</div><div class='add'>+</div><div class='add'>+def main():</div><div class='add'>+    kdamonds = _damon_sysfs.Kdamonds(</div><div class='add'>+        [_damon_sysfs.Kdamond(</div><div class='add'>+            contexts=[_damon_sysfs.DamonCtx(</div><div class='add'>+                schemes=[_damon_sysfs.Damos(</div><div class='add'>+                    ops_filters=[</div><div class='add'>+                        _damon_sysfs.DamosFilter(</div><div class='add'>+                            type_='anon',</div><div class='add'>+                            matching=True,</div><div class='add'>+                            allow=True,</div><div class='add'>+                        )</div><div class='add'>+                    ]</div><div class='add'>+                )],</div><div class='add'>+            )])]</div><div class='add'>+    )</div><div class='add'>+</div><div class='add'>+    err = kdamonds.start()</div><div class='add'>+    if err is not None:</div><div class='add'>+        print('kdamond start failed: %s' % err)</div><div class='add'>+        exit(1)</div><div class='add'>+</div><div class='add'>+    before_commit_status, err = \</div><div class='add'>+        dump_damon_status_dict(kdamonds.kdamonds[0].pid)</div><div class='add'>+    if err is not None:</div><div class='add'>+        print('before-commit status dump failed: %s' % err)</div><div class='add'>+        exit(1)</div><div class='add'>+</div><div class='add'>+    kdamonds.kdamonds[0].commit()</div><div class='add'>+</div><div class='add'>+    after_commit_status, err = \</div><div class='add'>+        dump_damon_status_dict(kdamonds.kdamonds[0].pid)</div><div class='add'>+    if err is not None:</div><div class='add'>+        print('after-commit status dump failed: %s' % err)</div><div class='add'>+        exit(1)</div><div class='add'>+</div><div class='add'>+    if before_commit_status != after_commit_status:</div><div class='add'>+        print(f'before: {json.dumps(before_commit_status, indent=2)}')</div><div class='add'>+        print(f'after: {json.dumps(after_commit_status, indent=2)}')</div><div class='add'>+        exit(1)</div><div class='add'>+</div><div class='add'>+    kdamonds.stop()</div><div class='add'>+</div><div class='add'>+if __name__ == '__main__':</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh b/tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh<br/>index ade35576e748..35fc32beeaf7 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh</a></div><div class='hunk'>@@ -1,14 +1,12 @@</div><div class='ctx'> #!/bin/bash</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+source _common.sh</div><div class='add'>+</div><div class='ctx'> # Kselftest framework requirement - SKIP code is 4.</div><div class='ctx'> ksft_skip=4</div><div class='ctx'> </div><div class='del'>-if [ $EUID -ne 0 ]</div><div class='del'>-then</div><div class='del'>-	echo "Run as root"</div><div class='del'>-	exit $ksft_skip</div><div class='del'>-fi</div><div class='add'>+check_dependencies</div><div class='ctx'> </div><div class='ctx'> damon_sysfs="/sys/kernel/mm/damon/admin"</div><div class='ctx'> if [ ! -d "$damon_sysfs" ]</div><div class='head'>diff --git a/tools/testing/selftests/dma/Makefile b/tools/testing/selftests/dma/Makefile<br/>deleted file mode 100644<br/>index cd8c5ece1cba..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/dma/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/dma/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-CFLAGS += -I../../../../usr/include/</div><div class='del'>-CFLAGS += -I../../../../include/</div><div class='del'>-</div><div class='del'>-TEST_GEN_PROGS := dma_map_benchmark</div><div class='del'>-</div><div class='del'>-include ../lib.mk</div><div class='head'>diff --git a/tools/testing/selftests/dma/config b/tools/testing/selftests/dma/config<br/>deleted file mode 100644<br/>index 6102ee3c43cd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/dma/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/dma/config</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-CONFIG_DMA_MAP_BENCHMARK=y</div><div class='head'>diff --git a/tools/testing/selftests/dma/dma_map_benchmark.c b/tools/testing/selftests/dma/dma_map_benchmark.c<br/>deleted file mode 100644<br/>index b12f1f9babf8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/dma/dma_map_benchmark.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/dma/dma_map_benchmark.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,128 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2020 HiSilicon Limited.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;sys/mman.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/map_benchmark.h&gt;</div><div class='del'>-</div><div class='del'>-#define NSEC_PER_MSEC	1000000L</div><div class='del'>-</div><div class='del'>-static char *directions[] = {</div><div class='del'>-	"BIDIRECTIONAL",</div><div class='del'>-	"TO_DEVICE",</div><div class='del'>-	"FROM_DEVICE",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	struct map_benchmark map;</div><div class='del'>-	int fd, opt;</div><div class='del'>-	/* default single thread, run 20 seconds on NUMA_NO_NODE */</div><div class='del'>-	int threads = 1, seconds = 20, node = -1;</div><div class='del'>-	/* default dma mask 32bit, bidirectional DMA */</div><div class='del'>-	int bits = 32, xdelay = 0, dir = DMA_MAP_BIDIRECTIONAL;</div><div class='del'>-	/* default granule 1 PAGESIZE */</div><div class='del'>-	int granule = 1;</div><div class='del'>-</div><div class='del'>-	int cmd = DMA_MAP_BENCHMARK;</div><div class='del'>-</div><div class='del'>-	while ((opt = getopt(argc, argv, "t:s:n:b:d:x:g:")) != -1) {</div><div class='del'>-		switch (opt) {</div><div class='del'>-		case 't':</div><div class='del'>-			threads = atoi(optarg);</div><div class='del'>-			break;</div><div class='del'>-		case 's':</div><div class='del'>-			seconds = atoi(optarg);</div><div class='del'>-			break;</div><div class='del'>-		case 'n':</div><div class='del'>-			node = atoi(optarg);</div><div class='del'>-			break;</div><div class='del'>-		case 'b':</div><div class='del'>-			bits = atoi(optarg);</div><div class='del'>-			break;</div><div class='del'>-		case 'd':</div><div class='del'>-			dir = atoi(optarg);</div><div class='del'>-			break;</div><div class='del'>-		case 'x':</div><div class='del'>-			xdelay = atoi(optarg);</div><div class='del'>-			break;</div><div class='del'>-		case 'g':</div><div class='del'>-			granule = atoi(optarg);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (threads &lt;= 0 || threads &gt; DMA_MAP_MAX_THREADS) {</div><div class='del'>-		fprintf(stderr, "invalid number of threads, must be in 1-%d\n",</div><div class='del'>-			DMA_MAP_MAX_THREADS);</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (seconds &lt;= 0 || seconds &gt; DMA_MAP_MAX_SECONDS) {</div><div class='del'>-		fprintf(stderr, "invalid number of seconds, must be in 1-%d\n",</div><div class='del'>-			DMA_MAP_MAX_SECONDS);</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (xdelay &lt; 0 || xdelay &gt; DMA_MAP_MAX_TRANS_DELAY) {</div><div class='del'>-		fprintf(stderr, "invalid transmit delay, must be in 0-%ld\n",</div><div class='del'>-			DMA_MAP_MAX_TRANS_DELAY);</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* suppose the mininum DMA zone is 1MB in the world */</div><div class='del'>-	if (bits &lt; 20 || bits &gt; 64) {</div><div class='del'>-		fprintf(stderr, "invalid dma mask bit, must be in 20-64\n");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dir != DMA_MAP_BIDIRECTIONAL &amp;&amp; dir != DMA_MAP_TO_DEVICE &amp;&amp;</div><div class='del'>-			dir != DMA_MAP_FROM_DEVICE) {</div><div class='del'>-		fprintf(stderr, "invalid dma direction\n");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (granule &lt; 1 || granule &gt; 1024) {</div><div class='del'>-		fprintf(stderr, "invalid granule size\n");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fd = open("/sys/kernel/debug/dma_map_benchmark", O_RDWR);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		perror("open");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(&amp;map, 0, sizeof(map));</div><div class='del'>-	map.seconds = seconds;</div><div class='del'>-	map.threads = threads;</div><div class='del'>-	map.node = node;</div><div class='del'>-	map.dma_bits = bits;</div><div class='del'>-	map.dma_dir = dir;</div><div class='del'>-	map.dma_trans_ns = xdelay;</div><div class='del'>-	map.granule = granule;</div><div class='del'>-</div><div class='del'>-	if (ioctl(fd, cmd, &amp;map)) {</div><div class='del'>-		perror("ioctl");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("dma mapping benchmark: threads:%d seconds:%d node:%d dir:%s granule: %d\n",</div><div class='del'>-			threads, seconds, node, dir[directions], granule);</div><div class='del'>-	printf("average map latency(us):%.1f standard deviation:%.1f\n",</div><div class='del'>-			map.avg_map_100ns/10.0, map.map_stddev/10.0);</div><div class='del'>-	printf("average unmap latency(us):%.1f standard deviation:%.1f\n",</div><div class='del'>-			map.avg_unmap_100ns/10.0, map.unmap_stddev/10.0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c<br/>index 5d0a809dc2df..fc9694fc4e89 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/dma-buf.h&gt;</div><div class='ctx'> #include &lt;linux/dma-heap.h&gt;</div><div class='ctx'> #include &lt;drm/drm.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define DEVPATH "/dev/dma_heap"</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/drivers/dma-buf/udmabuf.c b/tools/testing/selftests/drivers/dma-buf/udmabuf.c<br/>index 6062723a172e..d78aec662586 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/dma-buf/udmabuf.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/dma-buf/udmabuf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/dma-buf/udmabuf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/dma-buf/udmabuf.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include &lt;linux/memfd.h&gt;</div><div class='ctx'> #include &lt;linux/udmabuf.h&gt;</div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define TEST_PREFIX	"drivers/dma-buf/udmabuf"</div><div class='ctx'> #define NUM_PAGES       4</div><div class='hunk'>@@ -138,7 +138,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	void *addr1, *addr2;</div><div class='ctx'> </div><div class='ctx'> 	ksft_print_header();</div><div class='del'>-	ksft_set_plan(6);</div><div class='add'>+	ksft_set_plan(7);</div><div class='ctx'> </div><div class='ctx'> 	devfd = open("/dev/udmabuf", O_RDWR);</div><div class='ctx'> 	if (devfd &lt; 0) {</div><div class='hunk'>@@ -250,6 +250,24 @@ int main(int argc, char *argv[])</div><div class='ctx'> </div><div class='ctx'> 	close(buf);</div><div class='ctx'> 	close(memfd);</div><div class='add'>+</div><div class='add'>+	/* same test as above but we pin first before writing to memfd */</div><div class='add'>+	page_size = getpagesize() * 512; /* 2 MB */</div><div class='add'>+	size = MEMFD_SIZE * page_size;</div><div class='add'>+	memfd = create_memfd_with_seals(size, true);</div><div class='add'>+	buf = create_udmabuf_list(devfd, memfd, size);</div><div class='add'>+	addr2 = mmap_fd(buf, NUM_PAGES * NUM_ENTRIES * getpagesize());</div><div class='add'>+	addr1 = mmap_fd(memfd, size);</div><div class='add'>+	write_to_memfd(addr1, size, 'a');</div><div class='add'>+	write_to_memfd(addr1, size, 'b');</div><div class='add'>+	ret = compare_chunks(addr1, addr2, size);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		ksft_test_result_fail("%s: [FAIL,test-7]\n", TEST_PREFIX);</div><div class='add'>+	else</div><div class='add'>+		ksft_test_result_pass("%s: [PASS,test-7]\n", TEST_PREFIX);</div><div class='add'>+</div><div class='add'>+	close(buf);</div><div class='add'>+	close(memfd);</div><div class='ctx'> 	close(devfd);</div><div class='ctx'> </div><div class='ctx'> 	ksft_print_msg("%s: ok\n", TEST_PREFIX);</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/.gitignore b/tools/testing/selftests/drivers/net/.gitignore<br/>new file mode 100644<br/>index 000000000000..3633c7a3ed65<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/.gitignore</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+gro</div><div class='add'>+napi_id_helper</div><div class='add'>+psp_responder</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/selftests/drivers/net/Makefile<br/>index 137470bdee0c..f5c71d993750 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/Makefile</a></div><div class='hunk'>@@ -1,18 +1,43 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='add'>+CFLAGS += $(KHDR_INCLUDES)</div><div class='ctx'> </div><div class='ctx'> TEST_INCLUDES := $(wildcard lib/py/*.py) \</div><div class='ctx'> 		 $(wildcard lib/sh/*.sh) \</div><div class='del'>-		 ../../net/net_helper.sh \</div><div class='ctx'> 		 ../../net/lib.sh \</div><div class='ctx'> </div><div class='add'>+TEST_GEN_FILES := \</div><div class='add'>+	gro \</div><div class='add'>+	napi_id_helper \</div><div class='add'>+# end of TEST_GEN_FILES</div><div class='add'>+</div><div class='ctx'> TEST_PROGS := \</div><div class='add'>+	gro.py \</div><div class='add'>+	hds.py \</div><div class='add'>+	napi_id.py \</div><div class='add'>+	napi_threaded.py \</div><div class='ctx'> 	netcons_basic.sh \</div><div class='add'>+	netcons_cmdline.sh \</div><div class='add'>+	netcons_fragmented_msg.sh \</div><div class='ctx'> 	netcons_overflow.sh \</div><div class='add'>+	netcons_sysdata.sh \</div><div class='add'>+	netcons_torture.sh \</div><div class='add'>+	netpoll_basic.py \</div><div class='ctx'> 	ping.py \</div><div class='add'>+	psp.py \</div><div class='ctx'> 	queues.py \</div><div class='del'>-	stats.py \</div><div class='add'>+	ring_reconfig.py \</div><div class='ctx'> 	shaper.py \</div><div class='del'>-	hds.py \</div><div class='add'>+	stats.py \</div><div class='add'>+	xdp.py \</div><div class='ctx'> # end of TEST_PROGS</div><div class='ctx'> </div><div class='add'>+# YNL files, must be before "include ..lib.mk"</div><div class='add'>+YNL_GEN_FILES := psp_responder</div><div class='add'>+TEST_GEN_FILES += $(YNL_GEN_FILES)</div><div class='add'>+</div><div class='ctx'> include ../../lib.mk</div><div class='add'>+</div><div class='add'>+# YNL build</div><div class='add'>+YNL_GENS := psp</div><div class='add'>+</div><div class='add'>+include ../../net/ynl.mk</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/README.rst b/tools/testing/selftests/drivers/net/README.rst<br/>index 3b6a29e6564b..eb838ae94844 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/README.rst?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/README.rst</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/README.rst?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/README.rst</a></div><div class='hunk'>@@ -107,7 +107,7 @@ On the target machine, running the tests will use netdevsim by default::</div><div class='ctx'>   1..1</div><div class='ctx'>   # timeout set to 45</div><div class='ctx'>   # selftests: drivers/net: ping.py</div><div class='del'>-  # KTAP version 1</div><div class='add'>+  # TAP version 13</div><div class='ctx'>   # 1..3</div><div class='ctx'>   # ok 1 ping.test_v4</div><div class='ctx'>   # ok 2 ping.test_v6</div><div class='hunk'>@@ -128,7 +128,7 @@ Create a config with remote info::</div><div class='ctx'> Run the test::</div><div class='ctx'> </div><div class='ctx'>   [/root] # ./ksft-net-drv/drivers/net/ping.py</div><div class='del'>-  KTAP version 1</div><div class='add'>+  TAP version 13</div><div class='ctx'>   1..3</div><div class='ctx'>   ok 1 ping.test_v4</div><div class='ctx'>   ok 2 ping.test_v6 # SKIP Test requires IPv6 connectivity</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/bonding/Makefile b/tools/testing/selftests/drivers/net/bonding/Makefile<br/>index 2b10854e4b1e..6c5c60adb5e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/bonding/Makefile</a></div><div class='hunk'>@@ -4,21 +4,29 @@</div><div class='ctx'> TEST_PROGS := \</div><div class='ctx'> 	bond-arp-interval-causes-panic.sh \</div><div class='ctx'> 	bond-break-lacpdu-tx.sh \</div><div class='add'>+	bond-eth-type-change.sh \</div><div class='ctx'> 	bond-lladdr-target.sh \</div><div class='add'>+	bond_ipsec_offload.sh \</div><div class='add'>+	bond_lacp_prio.sh \</div><div class='add'>+	bond_macvlan_ipvlan.sh \</div><div class='add'>+	bond_options.sh \</div><div class='add'>+	bond_passive_lacp.sh \</div><div class='ctx'> 	dev_addr_lists.sh \</div><div class='ctx'> 	mode-1-recovery-updelay.sh \</div><div class='ctx'> 	mode-2-recovery-updelay.sh \</div><div class='del'>-	bond_options.sh \</div><div class='del'>-	bond-eth-type-change.sh \</div><div class='del'>-	bond_macvlan_ipvlan.sh</div><div class='add'>+	netcons_over_bonding.sh \</div><div class='add'>+# end of TEST_PROGS</div><div class='ctx'> </div><div class='ctx'> TEST_FILES := \</div><div class='del'>-	lag_lib.sh \</div><div class='ctx'> 	bond_topo_2d1c.sh \</div><div class='del'>-	bond_topo_3d1c.sh</div><div class='add'>+	bond_topo_3d1c.sh \</div><div class='add'>+	lag_lib.sh \</div><div class='add'>+# end of TEST_FILES</div><div class='ctx'> </div><div class='ctx'> TEST_INCLUDES := \</div><div class='add'>+	../../../net/lib.sh \</div><div class='add'>+	../lib/sh/lib_netcons.sh \</div><div class='ctx'> 	../../../net/forwarding/lib.sh \</div><div class='del'>-	../../../net/lib.sh</div><div class='add'>+# end of TEST_INCLUDES</div><div class='ctx'> </div><div class='ctx'> include ../../../lib.mk</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/bonding/bond_ipsec_offload.sh b/tools/testing/selftests/drivers/net/bonding/bond_ipsec_offload.sh<br/>new file mode 100755<br/>index 000000000000..f09e100232c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/bond_ipsec_offload.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/bonding/bond_ipsec_offload.sh</a></div><div class='hunk'>@@ -0,0 +1,156 @@</div><div class='add'>+#!/bin/bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+# IPsec over bonding offload test:</div><div class='add'>+#</div><div class='add'>+#  +----------------+</div><div class='add'>+#  |     bond0      |</div><div class='add'>+#  |       |        |</div><div class='add'>+#  |  eth0    eth1  |</div><div class='add'>+#  +---+-------+----+</div><div class='add'>+#</div><div class='add'>+# We use netdevsim instead of physical interfaces</div><div class='add'>+#-------------------------------------------------------------------</div><div class='add'>+# Example commands</div><div class='add'>+#   ip x s add proto esp src 192.0.2.1 dst 192.0.2.2 \</div><div class='add'>+#            spi 0x07 mode transport reqid 0x07 replay-window 32 \</div><div class='add'>+#            aead 'rfc4106(gcm(aes))' 1234567890123456dcba 128 \</div><div class='add'>+#            sel src 192.0.2.1/24 dst 192.0.2.2/24</div><div class='add'>+#            offload dev bond0 dir out</div><div class='add'>+#   ip x p add dir out src 192.0.2.1/24 dst 192.0.2.2/24 \</div><div class='add'>+#            tmpl proto esp src 192.0.2.1 dst 192.0.2.2 \</div><div class='add'>+#            spi 0x07 mode transport reqid 0x07</div><div class='add'>+#</div><div class='add'>+#-------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+lib_dir=$(dirname "$0")</div><div class='add'>+# shellcheck disable=SC1091</div><div class='add'>+source "$lib_dir"/../../../net/lib.sh</div><div class='add'>+srcip=192.0.2.1</div><div class='add'>+dstip=192.0.2.2</div><div class='add'>+ipsec0=/sys/kernel/debug/netdevsim/netdevsim0/ports/0/ipsec</div><div class='add'>+ipsec1=/sys/kernel/debug/netdevsim/netdevsim0/ports/1/ipsec</div><div class='add'>+active_slave=""</div><div class='add'>+</div><div class='add'>+# shellcheck disable=SC2317</div><div class='add'>+active_slave_changed()</div><div class='add'>+{</div><div class='add'>+	local old_active_slave=$1</div><div class='add'>+	local new_active_slave</div><div class='add'>+</div><div class='add'>+	# shellcheck disable=SC2154</div><div class='add'>+	new_active_slave=$(ip -n "${ns}" -d -j link show bond0 | \</div><div class='add'>+		jq -r ".[].linkinfo.info_data.active_slave")</div><div class='add'>+	[ "$new_active_slave" != "$old_active_slave" ] &amp;&amp; [ "$new_active_slave" != "null" ]</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+test_offload()</div><div class='add'>+{</div><div class='add'>+	# use ping to exercise the Tx path</div><div class='add'>+	ip netns exec "$ns" ping -I bond0 -c 3 -W 1 -i 0 "$dstip" &gt;/dev/null</div><div class='add'>+</div><div class='add'>+	active_slave=$(ip -n "${ns}" -d -j link show bond0 | \</div><div class='add'>+		       jq -r ".[].linkinfo.info_data.active_slave")</div><div class='add'>+</div><div class='add'>+	if [ "$active_slave" = "$nic0" ]; then</div><div class='add'>+		sysfs=$ipsec0</div><div class='add'>+	elif [ "$active_slave" = "$nic1" ]; then</div><div class='add'>+		sysfs=$ipsec1</div><div class='add'>+	else</div><div class='add'>+		check_err 1 "bond_ipsec_offload invalid active_slave $active_slave"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# The tx/rx order in sysfs may changed after failover</div><div class='add'>+	grep -q "SA count=2 tx=3" "$sysfs" &amp;&amp; grep -q "tx ipaddr=$dstip" "$sysfs"</div><div class='add'>+	check_err $? "incorrect tx count with link ${active_slave}"</div><div class='add'>+</div><div class='add'>+	log_test bond_ipsec_offload "active_slave ${active_slave}"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+setup_env()</div><div class='add'>+{</div><div class='add'>+	if ! mount | grep -q debugfs; then</div><div class='add'>+		mount -t debugfs none /sys/kernel/debug/ &amp;&gt; /dev/null</div><div class='add'>+		defer umount /sys/kernel/debug/</div><div class='add'>+</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# setup netdevsim since dummy/veth dev doesn't have offload support</div><div class='add'>+	if [ ! -w /sys/bus/netdevsim/new_device ] ; then</div><div class='add'>+		if ! modprobe -q netdevsim; then</div><div class='add'>+			echo "SKIP: can't load netdevsim for ipsec offload"</div><div class='add'>+			# shellcheck disable=SC2154</div><div class='add'>+			exit "$ksft_skip"</div><div class='add'>+		fi</div><div class='add'>+		defer modprobe -r netdevsim</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	setup_ns ns</div><div class='add'>+	defer cleanup_ns "$ns"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+setup_bond()</div><div class='add'>+{</div><div class='add'>+	ip -n "$ns" link add bond0 type bond mode active-backup miimon 100</div><div class='add'>+	ip -n "$ns" addr add "$srcip/24" dev bond0</div><div class='add'>+	ip -n "$ns" link set bond0 up</div><div class='add'>+</div><div class='add'>+	echo "0 2" | ip netns exec "$ns" tee /sys/bus/netdevsim/new_device &gt;/dev/null</div><div class='add'>+	nic0=$(ip netns exec "$ns" ls /sys/bus/netdevsim/devices/netdevsim0/net | head -n 1)</div><div class='add'>+	nic1=$(ip netns exec "$ns" ls /sys/bus/netdevsim/devices/netdevsim0/net | tail -n 1)</div><div class='add'>+	ip -n "$ns" link set "$nic0" master bond0</div><div class='add'>+	ip -n "$ns" link set "$nic1" master bond0</div><div class='add'>+</div><div class='add'>+	# we didn't create a peer, make sure we can Tx by adding a permanent</div><div class='add'>+	# neighbour this need to be added after enslave</div><div class='add'>+	ip -n "$ns" neigh add "$dstip" dev bond0 lladdr 00:11:22:33:44:55</div><div class='add'>+</div><div class='add'>+	# create offloaded SAs, both in and out</div><div class='add'>+	ip -n "$ns" x p add dir out src "$srcip/24" dst "$dstip/24" \</div><div class='add'>+	    tmpl proto esp src "$srcip" dst "$dstip" spi 9 \</div><div class='add'>+	    mode transport reqid 42</div><div class='add'>+</div><div class='add'>+	ip -n "$ns" x p add dir in src "$dstip/24" dst "$srcip/24" \</div><div class='add'>+	    tmpl proto esp src "$dstip" dst "$srcip" spi 9 \</div><div class='add'>+	    mode transport reqid 42</div><div class='add'>+</div><div class='add'>+	ip -n "$ns" x s add proto esp src "$srcip" dst "$dstip" spi 9 \</div><div class='add'>+	    mode transport reqid 42 aead "rfc4106(gcm(aes))" \</div><div class='add'>+	    0x3132333435363738393031323334353664636261 128 \</div><div class='add'>+	    sel src "$srcip/24" dst "$dstip/24" \</div><div class='add'>+	    offload dev bond0 dir out</div><div class='add'>+</div><div class='add'>+	ip -n "$ns" x s add proto esp src "$dstip" dst "$srcip" spi 9 \</div><div class='add'>+	    mode transport reqid 42 aead "rfc4106(gcm(aes))" \</div><div class='add'>+	    0x3132333435363738393031323334353664636261 128 \</div><div class='add'>+	    sel src "$dstip/24" dst "$srcip/24" \</div><div class='add'>+	    offload dev bond0 dir in</div><div class='add'>+</div><div class='add'>+	# does offload show up in ip output</div><div class='add'>+	lines=$(ip -n "$ns" x s list | grep -c "crypto offload parameters: dev bond0 dir")</div><div class='add'>+	if [ "$lines" -ne 2 ] ; then</div><div class='add'>+		check_err 1 "bond_ipsec_offload SA offload missing from list output"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+trap defer_scopes_cleanup EXIT</div><div class='add'>+setup_env</div><div class='add'>+setup_bond</div><div class='add'>+</div><div class='add'>+# start Offload testing</div><div class='add'>+test_offload</div><div class='add'>+</div><div class='add'>+# do failover and re-test</div><div class='add'>+ip -n "$ns" link set "$active_slave" down</div><div class='add'>+slowwait 5 active_slave_changed "$active_slave"</div><div class='add'>+test_offload</div><div class='add'>+</div><div class='add'>+# make sure offload get removed from driver</div><div class='add'>+ip -n "$ns" x s flush</div><div class='add'>+ip -n "$ns" x p flush</div><div class='add'>+line0=$(grep -c "SA count=0" "$ipsec0")</div><div class='add'>+line1=$(grep -c "SA count=0" "$ipsec1")</div><div class='add'>+[ "$line0" -ne 1 ] || [ "$line1" -ne 1 ]</div><div class='add'>+check_fail $? "bond_ipsec_offload SA not removed from driver"</div><div class='add'>+</div><div class='add'>+exit "$EXIT_STATUS"</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/bonding/bond_lacp_prio.sh b/tools/testing/selftests/drivers/net/bonding/bond_lacp_prio.sh<br/>new file mode 100755<br/>index 000000000000..a483d505c6a8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/bond_lacp_prio.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/bonding/bond_lacp_prio.sh</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+#!/bin/bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#</div><div class='add'>+# Testing if bond lacp per port priority works</div><div class='add'>+#</div><div class='add'>+#          Switch (s_ns)          Backup Switch (b_ns)</div><div class='add'>+#  +-------------------------+ +-------------------------+</div><div class='add'>+#  |          bond0          | |          bond0          |</div><div class='add'>+#  |            +            | |            +            |</div><div class='add'>+#  |      eth0  |  eth1      | |      eth0  |  eth1      |</div><div class='add'>+#  |        +---+---+        | |        +---+---+        |</div><div class='add'>+#  |        |       |        | |        |       |        |</div><div class='add'>+#  +-------------------------+ +-------------------------+</div><div class='add'>+#           |       |                   |       |</div><div class='add'>+#  +-----------------------------------------------------+</div><div class='add'>+#  |        |       |                   |       |        |</div><div class='add'>+#  |        +-------+---------+---------+-------+        |</div><div class='add'>+#  |      eth0     eth1       |       eth2     eth3      |</div><div class='add'>+#  |                          +                          |</div><div class='add'>+#  |                        bond0                        |</div><div class='add'>+#  +-----------------------------------------------------+</div><div class='add'>+#                        Client (c_ns)</div><div class='add'>+</div><div class='add'>+lib_dir=$(dirname "$0")</div><div class='add'>+# shellcheck disable=SC1091</div><div class='add'>+source "$lib_dir"/../../../net/lib.sh</div><div class='add'>+</div><div class='add'>+setup_links()</div><div class='add'>+{</div><div class='add'>+	# shellcheck disable=SC2154</div><div class='add'>+	ip -n "${c_ns}" link add eth0 type veth peer name eth0 netns "${s_ns}"</div><div class='add'>+	ip -n "${c_ns}" link add eth1 type veth peer name eth1 netns "${s_ns}"</div><div class='add'>+	# shellcheck disable=SC2154</div><div class='add'>+	ip -n "${c_ns}" link add eth2 type veth peer name eth0 netns "${b_ns}"</div><div class='add'>+	ip -n "${c_ns}" link add eth3 type veth peer name eth1 netns "${b_ns}"</div><div class='add'>+</div><div class='add'>+	ip -n "${c_ns}" link add bond0 type bond mode 802.3ad miimon 100 \</div><div class='add'>+		lacp_rate fast ad_select actor_port_prio</div><div class='add'>+	ip -n "${s_ns}" link add bond0 type bond mode 802.3ad miimon 100 \</div><div class='add'>+		lacp_rate fast</div><div class='add'>+	ip -n "${b_ns}" link add bond0 type bond mode 802.3ad miimon 100 \</div><div class='add'>+		lacp_rate fast</div><div class='add'>+</div><div class='add'>+	ip -n "${c_ns}" link set eth0 master bond0</div><div class='add'>+	ip -n "${c_ns}" link set eth1 master bond0</div><div class='add'>+	ip -n "${c_ns}" link set eth2 master bond0</div><div class='add'>+	ip -n "${c_ns}" link set eth3 master bond0</div><div class='add'>+	ip -n "${s_ns}" link set eth0 master bond0</div><div class='add'>+	ip -n "${s_ns}" link set eth1 master bond0</div><div class='add'>+	ip -n "${b_ns}" link set eth0 master bond0</div><div class='add'>+	ip -n "${b_ns}" link set eth1 master bond0</div><div class='add'>+</div><div class='add'>+	ip -n "${c_ns}" link set bond0 up</div><div class='add'>+	ip -n "${s_ns}" link set bond0 up</div><div class='add'>+	ip -n "${b_ns}" link set bond0 up</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+test_port_prio_setting()</div><div class='add'>+{</div><div class='add'>+	RET=0</div><div class='add'>+	ip -n "${c_ns}" link set eth0 type bond_slave actor_port_prio 1000</div><div class='add'>+	prio=$(cmd_jq "ip -n ${c_ns} -d -j link show eth0" \</div><div class='add'>+		".[].linkinfo.info_slave_data.actor_port_prio")</div><div class='add'>+	[ "$prio" -ne 1000 ] &amp;&amp; RET=1</div><div class='add'>+	ip -n "${c_ns}" link set eth2 type bond_slave actor_port_prio 10</div><div class='add'>+	prio=$(cmd_jq "ip -n ${c_ns} -d -j link show eth2" \</div><div class='add'>+		".[].linkinfo.info_slave_data.actor_port_prio")</div><div class='add'>+	[ "$prio" -ne 10 ] &amp;&amp; RET=1</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+test_agg_reselect()</div><div class='add'>+{</div><div class='add'>+	local bond_agg_id slave_agg_id</div><div class='add'>+	local expect_slave="$1"</div><div class='add'>+	RET=0</div><div class='add'>+</div><div class='add'>+	# Trigger link state change to reselect the aggregator</div><div class='add'>+	ip -n "${c_ns}" link set eth1 down</div><div class='add'>+	sleep 0.5</div><div class='add'>+	ip -n "${c_ns}" link set eth1 up</div><div class='add'>+	sleep 0.5</div><div class='add'>+</div><div class='add'>+	bond_agg_id=$(cmd_jq "ip -n ${c_ns} -d -j link show bond0" \</div><div class='add'>+		".[].linkinfo.info_data.ad_info.aggregator")</div><div class='add'>+	slave_agg_id=$(cmd_jq "ip -n ${c_ns} -d -j link show $expect_slave" \</div><div class='add'>+		".[].linkinfo.info_slave_data.ad_aggregator_id")</div><div class='add'>+	# shellcheck disable=SC2034</div><div class='add'>+	[ "${bond_agg_id}" -ne "${slave_agg_id}" ] &amp;&amp; \</div><div class='add'>+		RET=1</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+trap cleanup_all_ns EXIT</div><div class='add'>+setup_ns c_ns s_ns b_ns</div><div class='add'>+setup_links</div><div class='add'>+</div><div class='add'>+test_port_prio_setting</div><div class='add'>+log_test "bond 802.3ad" "actor_port_prio setting"</div><div class='add'>+</div><div class='add'>+test_agg_reselect eth0</div><div class='add'>+log_test "bond 802.3ad" "actor_port_prio select"</div><div class='add'>+</div><div class='add'>+# Change the actor port prio and re-test</div><div class='add'>+ip -n "${c_ns}" link set eth0 type bond_slave actor_port_prio 10</div><div class='add'>+ip -n "${c_ns}" link set eth2 type bond_slave actor_port_prio 1000</div><div class='add'>+test_agg_reselect eth2</div><div class='add'>+log_test "bond 802.3ad" "actor_port_prio switch"</div><div class='add'>+</div><div class='add'>+exit "${EXIT_STATUS}"</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/bonding/bond_macvlan_ipvlan.sh b/tools/testing/selftests/drivers/net/bonding/bond_macvlan_ipvlan.sh<br/>index c4711272fe45..559f300f965a 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/bond_macvlan_ipvlan.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/bond_macvlan_ipvlan.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/bond_macvlan_ipvlan.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/bonding/bond_macvlan_ipvlan.sh</a></div><div class='hunk'>@@ -30,6 +30,7 @@ check_connection()</div><div class='ctx'> 	local message=${3}</div><div class='ctx'> 	RET=0</div><div class='ctx'> </div><div class='add'>+	sleep 0.25</div><div class='ctx'> 	ip netns exec ${ns} ping ${target} -c 4 -i 0.1 &amp;&gt;/dev/null</div><div class='ctx'> 	check_err $? "ping failed"</div><div class='ctx'> 	log_test "${bond_mode}/${xvlan_type}_${xvlan_mode}: ${message}"</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/bonding/bond_options.sh b/tools/testing/selftests/drivers/net/bonding/bond_options.sh<br/>index edc56e2cc606..187b478d0ddf 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/bond_options.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/bond_options.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/bond_options.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/bonding/bond_options.sh</a></div><div class='hunk'>@@ -7,12 +7,14 @@ ALL_TESTS="</div><div class='ctx'> 	prio</div><div class='ctx'> 	arp_validate</div><div class='ctx'> 	num_grat_arp</div><div class='add'>+	fail_over_mac</div><div class='add'>+	vlan_over_bond</div><div class='ctx'> "</div><div class='ctx'> </div><div class='ctx'> lib_dir=$(dirname "$0")</div><div class='ctx'> source ${lib_dir}/bond_topo_3d1c.sh</div><div class='del'>-c_maddr="33:33:00:00:00:10"</div><div class='del'>-g_maddr="33:33:00:00:02:54"</div><div class='add'>+c_maddr="33:33:ff:00:00:10"</div><div class='add'>+g_maddr="33:33:ff:00:02:54"</div><div class='ctx'> </div><div class='ctx'> skip_prio()</div><div class='ctx'> {</div><div class='hunk'>@@ -352,8 +354,8 @@ garp_test()</div><div class='ctx'> </div><div class='ctx'> 	exp_num=$(echo "${param}" | cut -f6 -d ' ')</div><div class='ctx'> 	active_slave=$(cmd_jq "ip -n ${s_ns} -d -j link show bond0" ".[].linkinfo.info_data.active_slave")</div><div class='del'>-	slowwait_for_counter $((exp_num + 5)) $exp_num \</div><div class='del'>-		tc_rule_handle_stats_get "dev s${active_slave#eth} ingress" 101 ".packets" "-n ${g_ns}"</div><div class='add'>+	slowwait_for_counter $((exp_num + 5)) $exp_num tc_rule_handle_stats_get \</div><div class='add'>+		"dev s${active_slave#eth} ingress" 101 ".packets" "-n ${g_ns}" &amp;&gt; /dev/null</div><div class='ctx'> </div><div class='ctx'> 	# check result</div><div class='ctx'> 	real_num=$(tc_rule_handle_stats_get "dev s${active_slave#eth} ingress" 101 ".packets" "-n ${g_ns}")</div><div class='hunk'>@@ -376,6 +378,197 @@ num_grat_arp()</div><div class='ctx'> 	done</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+check_all_mac_same()</div><div class='add'>+{</div><div class='add'>+	RET=0</div><div class='add'>+	# all slaves should have same mac address (with the first port's mac)</div><div class='add'>+	local bond_mac=$(ip -n "$s_ns" -j link show bond0 | jq -r '.[]["address"]')</div><div class='add'>+	local eth0_mac=$(ip -n "$s_ns" -j link show eth0 | jq -r '.[]["address"]')</div><div class='add'>+	local eth1_mac=$(ip -n "$s_ns" -j link show eth1 | jq -r '.[]["address"]')</div><div class='add'>+	local eth2_mac=$(ip -n "$s_ns" -j link show eth2 | jq -r '.[]["address"]')</div><div class='add'>+	if [ "$bond_mac" != "${mac[0]}" ] || [ "$eth0_mac" != "$bond_mac" ] || \</div><div class='add'>+		[ "$eth1_mac" != "$bond_mac" ] || [ "$eth2_mac" != "$bond_mac" ]; then</div><div class='add'>+		RET=1</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+check_bond_mac_same_with_first()</div><div class='add'>+{</div><div class='add'>+	RET=0</div><div class='add'>+	# bond mac address should be same with the first added slave</div><div class='add'>+	local bond_mac=$(ip -n "$s_ns" -j link show bond0 | jq -r '.[]["address"]')</div><div class='add'>+	if [ "$bond_mac" != "${mac[0]}" ]; then</div><div class='add'>+		RET=1</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+check_bond_mac_same_with_active()</div><div class='add'>+{</div><div class='add'>+	RET=0</div><div class='add'>+	# bond mac address should be same with active slave</div><div class='add'>+	local bond_mac=$(ip -n "$s_ns" -j link show bond0 | jq -r '.[]["address"]')</div><div class='add'>+	local active_slave=$(cmd_jq "ip -n ${s_ns} -d -j link show bond0" ".[].linkinfo.info_data.active_slave")</div><div class='add'>+	local active_slave_mac=$(ip -n "$s_ns" -j link show "$active_slave" | jq -r '.[]["address"]')</div><div class='add'>+	if [ "$bond_mac" != "$active_slave_mac" ]; then</div><div class='add'>+		RET=1</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+check_backup_slave_mac_not_change()</div><div class='add'>+{</div><div class='add'>+	RET=0</div><div class='add'>+	# backup slave's mac address is not changed</div><div class='add'>+	if ip -n "$s_ns" -d -j link show type bond_slave | jq -e '.[]</div><div class='add'>+		| select(.linkinfo.info_slave_data.state=="BACKUP")</div><div class='add'>+		| select(.address != .linkinfo.info_slave_data.perm_hwaddr)' &amp;&gt; /dev/null; then</div><div class='add'>+		RET=1</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+check_backup_slave_mac_inherit()</div><div class='add'>+{</div><div class='add'>+	local backup_mac</div><div class='add'>+	RET=0</div><div class='add'>+</div><div class='add'>+	# backup slaves should use mac[1] or mac[2]</div><div class='add'>+	local backup_macs=$(ip -n "$s_ns" -d -j link show type bond_slave | \</div><div class='add'>+		jq -r '.[] | select(.linkinfo.info_slave_data.state=="BACKUP") | .address')</div><div class='add'>+	for backup_mac in $backup_macs; do</div><div class='add'>+		if [ "$backup_mac" != "${mac[1]}" ] &amp;&amp; [ "$backup_mac" != "${mac[2]}" ]; then</div><div class='add'>+			RET=1</div><div class='add'>+		fi</div><div class='add'>+	done</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+check_first_slave_random_mac()</div><div class='add'>+{</div><div class='add'>+	RET=0</div><div class='add'>+	# remove the first added slave and added it back</div><div class='add'>+	ip -n "$s_ns" link set eth0 nomaster</div><div class='add'>+	ip -n "$s_ns" link set eth0 master bond0</div><div class='add'>+</div><div class='add'>+	# the first slave should use random mac address</div><div class='add'>+	eth0_mac=$(ip -n "$s_ns" -j link show eth0 | jq -r '.[]["address"]')</div><div class='add'>+	[ "$eth0_mac" = "${mac[0]}" ] &amp;&amp; RET=1</div><div class='add'>+	log_test "bond fail_over_mac follow" "random first slave mac"</div><div class='add'>+</div><div class='add'>+	# remove the first slave, the permanent MAC address should be restored back</div><div class='add'>+	ip -n "$s_ns" link set eth0 nomaster</div><div class='add'>+	eth0_mac=$(ip -n "$s_ns" -j link show eth0 | jq -r '.[]["address"]')</div><div class='add'>+	[ "$eth0_mac" != "${mac[0]}" ] &amp;&amp; RET=1</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+do_active_backup_failover()</div><div class='add'>+{</div><div class='add'>+	local active_slave=$(cmd_jq "ip -n ${s_ns} -d -j link show bond0" ".[].linkinfo.info_data.active_slave")</div><div class='add'>+	ip -n ${s_ns} link set ${active_slave} down</div><div class='add'>+	slowwait 2 active_slave_changed $active_slave</div><div class='add'>+	ip -n ${s_ns} link set ${active_slave} up</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+fail_over_mac()</div><div class='add'>+{</div><div class='add'>+	# Bring down the first interface on the switch to force the bond to</div><div class='add'>+	# select another active interface instead of the first one that joined.</div><div class='add'>+	ip -n "$g_ns" link set s0 down</div><div class='add'>+</div><div class='add'>+	# fail_over_mac none</div><div class='add'>+	bond_reset "mode active-backup miimon 100 fail_over_mac 0"</div><div class='add'>+	check_all_mac_same</div><div class='add'>+	log_test "fail_over_mac 0" "all slaves have same mac"</div><div class='add'>+	do_active_backup_failover</div><div class='add'>+	check_all_mac_same</div><div class='add'>+	log_test "fail_over_mac 0" "failover: all slaves have same mac"</div><div class='add'>+</div><div class='add'>+	# fail_over_mac active</div><div class='add'>+	bond_reset "mode active-backup miimon 100 fail_over_mac 1"</div><div class='add'>+	check_bond_mac_same_with_active</div><div class='add'>+	log_test "fail_over_mac 1" "bond mac is same with active slave mac"</div><div class='add'>+	check_backup_slave_mac_not_change</div><div class='add'>+	log_test "fail_over_mac 1" "backup slave mac is not changed"</div><div class='add'>+	do_active_backup_failover</div><div class='add'>+	check_bond_mac_same_with_active</div><div class='add'>+	log_test "fail_over_mac 1" "failover: bond mac is same with active slave mac"</div><div class='add'>+	check_backup_slave_mac_not_change</div><div class='add'>+	log_test "fail_over_mac 1" "failover: backup slave mac is not changed"</div><div class='add'>+</div><div class='add'>+	# fail_over_mac follow</div><div class='add'>+	bond_reset "mode active-backup miimon 100 fail_over_mac 2"</div><div class='add'>+	check_bond_mac_same_with_first</div><div class='add'>+	log_test "fail_over_mac 2" "bond mac is same with first slave mac"</div><div class='add'>+	check_bond_mac_same_with_active</div><div class='add'>+	log_test "fail_over_mac 2" "bond mac is same with active slave mac"</div><div class='add'>+	check_backup_slave_mac_inherit</div><div class='add'>+	log_test "fail_over_mac 2" "backup slave mac inherit"</div><div class='add'>+	do_active_backup_failover</div><div class='add'>+	check_bond_mac_same_with_first</div><div class='add'>+	log_test "fail_over_mac 2" "failover: bond mac is same with first slave mac"</div><div class='add'>+	check_bond_mac_same_with_active</div><div class='add'>+	log_test "fail_over_mac 2" "failover: bond mac is same with active slave mac"</div><div class='add'>+	check_backup_slave_mac_inherit</div><div class='add'>+	log_test "fail_over_mac 2" "failover: backup slave mac inherit"</div><div class='add'>+	check_first_slave_random_mac</div><div class='add'>+	log_test "fail_over_mac 2" "first slave mac random"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+vlan_over_bond_arp()</div><div class='add'>+{</div><div class='add'>+	local mode="$1"</div><div class='add'>+	RET=0</div><div class='add'>+</div><div class='add'>+	bond_reset "mode $mode arp_interval 100 arp_ip_target 192.0.3.10"</div><div class='add'>+	ip -n "${s_ns}" link add bond0.3 link bond0 type vlan id 3</div><div class='add'>+	ip -n "${s_ns}" link set bond0.3 up</div><div class='add'>+	ip -n "${s_ns}" addr add 192.0.3.1/24 dev bond0.3</div><div class='add'>+	ip -n "${s_ns}" addr add 2001:db8::3:1/64 dev bond0.3</div><div class='add'>+</div><div class='add'>+	slowwait_for_counter 5 5 tc_rule_handle_stats_get \</div><div class='add'>+		"dev eth0.3 ingress" 101 ".packets" "-n ${c_ns}" &amp;&gt; /dev/null || RET=1</div><div class='add'>+	log_test "vlan over bond arp" "$mode"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+vlan_over_bond_ns()</div><div class='add'>+{</div><div class='add'>+	local mode="$1"</div><div class='add'>+	RET=0</div><div class='add'>+</div><div class='add'>+	if skip_ns; then</div><div class='add'>+		log_test_skip "vlan_over_bond ns" "$mode"</div><div class='add'>+		return 0</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	bond_reset "mode $mode arp_interval 100 ns_ip6_target 2001:db8::3:10"</div><div class='add'>+	ip -n "${s_ns}" link add bond0.3 link bond0 type vlan id 3</div><div class='add'>+	ip -n "${s_ns}" link set bond0.3 up</div><div class='add'>+	ip -n "${s_ns}" addr add 192.0.3.1/24 dev bond0.3</div><div class='add'>+	ip -n "${s_ns}" addr add 2001:db8::3:1/64 dev bond0.3</div><div class='add'>+</div><div class='add'>+	slowwait_for_counter 5 5 tc_rule_handle_stats_get \</div><div class='add'>+		"dev eth0.3 ingress" 102 ".packets" "-n ${c_ns}" &amp;&gt; /dev/null || RET=1</div><div class='add'>+	log_test "vlan over bond ns" "$mode"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+vlan_over_bond()</div><div class='add'>+{</div><div class='add'>+	# add vlan 3 for client</div><div class='add'>+	ip -n "${c_ns}" link add eth0.3 link eth0 type vlan id 3</div><div class='add'>+	ip -n "${c_ns}" link set eth0.3 up</div><div class='add'>+	ip -n "${c_ns}" addr add 192.0.3.10/24 dev eth0.3</div><div class='add'>+	ip -n "${c_ns}" addr add 2001:db8::3:10/64 dev eth0.3</div><div class='add'>+</div><div class='add'>+	# Add tc rule to check the vlan pkts</div><div class='add'>+	tc -n "${c_ns}" qdisc add dev eth0.3 clsact</div><div class='add'>+	tc -n "${c_ns}" filter add dev eth0.3 ingress protocol arp \</div><div class='add'>+		handle 101 flower skip_hw arp_op request \</div><div class='add'>+		arp_sip 192.0.3.1 arp_tip 192.0.3.10 action pass</div><div class='add'>+	tc -n "${c_ns}" filter add dev eth0.3 ingress protocol ipv6 \</div><div class='add'>+		handle 102 flower skip_hw ip_proto icmpv6 \</div><div class='add'>+		type 135 src_ip 2001:db8::3:1 action pass</div><div class='add'>+</div><div class='add'>+	vlan_over_bond_arp "active-backup"</div><div class='add'>+	vlan_over_bond_ns "active-backup"</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> trap cleanup EXIT</div><div class='ctx'> </div><div class='ctx'> setup_prepare</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/bonding/bond_passive_lacp.sh b/tools/testing/selftests/drivers/net/bonding/bond_passive_lacp.sh<br/>new file mode 100755<br/>index 000000000000..9c3b089813df<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/bond_passive_lacp.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/bonding/bond_passive_lacp.sh</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+#!/bin/bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#</div><div class='add'>+# Test if a bond interface works with lacp_active=off.</div><div class='add'>+</div><div class='add'>+# shellcheck disable=SC2034</div><div class='add'>+REQUIRE_MZ=no</div><div class='add'>+NUM_NETIFS=0</div><div class='add'>+lib_dir=$(dirname "$0")</div><div class='add'>+# shellcheck disable=SC1091</div><div class='add'>+source "$lib_dir"/../../../net/forwarding/lib.sh</div><div class='add'>+</div><div class='add'>+# shellcheck disable=SC2317</div><div class='add'>+check_port_state()</div><div class='add'>+{</div><div class='add'>+	local netns=$1</div><div class='add'>+	local port=$2</div><div class='add'>+	local state=$3</div><div class='add'>+</div><div class='add'>+	ip -n "${netns}" -d -j link show "$port" | \</div><div class='add'>+		jq -e ".[].linkinfo.info_slave_data.ad_actor_oper_port_state_str | index(\"${state}\") != null" &gt; /dev/null</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+check_pkt_count()</div><div class='add'>+{</div><div class='add'>+	RET=0</div><div class='add'>+	local ns="$1"</div><div class='add'>+	local iface="$2"</div><div class='add'>+</div><div class='add'>+	# wait 65s, one per 30s</div><div class='add'>+	slowwait_for_counter 65 2 tc_rule_handle_stats_get \</div><div class='add'>+		"dev ${iface} egress" 101 ".packets" "-n ${ns}" &amp;&gt; /dev/null</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+setup() {</div><div class='add'>+	setup_ns c_ns s_ns</div><div class='add'>+</div><div class='add'>+	# shellcheck disable=SC2154</div><div class='add'>+	ip -n "${c_ns}" link add eth0 type veth peer name eth0 netns "${s_ns}"</div><div class='add'>+	ip -n "${c_ns}" link add eth1 type veth peer name eth1 netns "${s_ns}"</div><div class='add'>+</div><div class='add'>+	# Add tc filter to count the pkts</div><div class='add'>+	tc -n "${c_ns}" qdisc add dev eth0 clsact</div><div class='add'>+	tc -n "${c_ns}" filter add dev eth0 egress handle 101 protocol 0x8809 matchall action pass</div><div class='add'>+	tc -n "${s_ns}" qdisc add dev eth1 clsact</div><div class='add'>+	tc -n "${s_ns}" filter add dev eth1 egress handle 101 protocol 0x8809 matchall action pass</div><div class='add'>+</div><div class='add'>+	ip -n "${s_ns}" link add bond0 type bond mode 802.3ad lacp_active on lacp_rate fast</div><div class='add'>+	ip -n "${s_ns}" link set eth0 master bond0</div><div class='add'>+	ip -n "${s_ns}" link set eth1 master bond0</div><div class='add'>+</div><div class='add'>+	ip -n "${c_ns}" link add bond0 type bond mode 802.3ad lacp_active off lacp_rate fast</div><div class='add'>+	ip -n "${c_ns}" link set eth0 master bond0</div><div class='add'>+	ip -n "${c_ns}" link set eth1 master bond0</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+trap cleanup_all_ns EXIT</div><div class='add'>+setup</div><div class='add'>+</div><div class='add'>+# The bond will send 2 lacpdu pkts during init time, let's wait at least 2s</div><div class='add'>+# after interface up</div><div class='add'>+ip -n "${c_ns}" link set bond0 up</div><div class='add'>+sleep 2</div><div class='add'>+</div><div class='add'>+# 1. The passive side shouldn't send LACPDU.</div><div class='add'>+check_pkt_count "${c_ns}" "eth0" &amp;&amp; RET=1</div><div class='add'>+log_test "802.3ad lacp_active off" "init port"</div><div class='add'>+</div><div class='add'>+ip -n "${s_ns}" link set bond0 up</div><div class='add'>+# 2. The passive side should not have the 'active' flag.</div><div class='add'>+RET=0</div><div class='add'>+slowwait 2 check_port_state "${c_ns}" "eth0" "active" &amp;&amp; RET=1</div><div class='add'>+log_test "802.3ad lacp_active off" "port state active"</div><div class='add'>+</div><div class='add'>+# 3. The active side should have the 'active' flag.</div><div class='add'>+RET=0</div><div class='add'>+slowwait 2 check_port_state "${s_ns}" "eth0" "active" || RET=1</div><div class='add'>+log_test "802.3ad lacp_active on" "port state active"</div><div class='add'>+</div><div class='add'>+# 4. Make sure the connection is not expired.</div><div class='add'>+RET=0</div><div class='add'>+slowwait 5 check_port_state "${s_ns}" "eth0" "distributing"</div><div class='add'>+slowwait 10 check_port_state "${s_ns}" "eth0" "expired" &amp;&amp; RET=1</div><div class='add'>+log_test "bond 802.3ad lacp_active off" "port connection"</div><div class='add'>+</div><div class='add'>+# After testing, disconnect one port on each side to check the state.</div><div class='add'>+ip -n "${s_ns}" link set eth0 nomaster</div><div class='add'>+ip -n "${s_ns}" link set eth0 up</div><div class='add'>+ip -n "${c_ns}" link set eth1 nomaster</div><div class='add'>+ip -n "${c_ns}" link set eth1 up</div><div class='add'>+# Due to Periodic Machine and Rx Machine state change, the bond will still</div><div class='add'>+# send lacpdu pkts in a few seconds. sleep at lease 5s to make sure</div><div class='add'>+# negotiation finished</div><div class='add'>+sleep 5</div><div class='add'>+</div><div class='add'>+# 5. The active side should keep sending LACPDU.</div><div class='add'>+check_pkt_count "${s_ns}" "eth1" || RET=1</div><div class='add'>+log_test "bond 802.3ad lacp_active on" "port pkt after disconnect"</div><div class='add'>+</div><div class='add'>+# 6. The passive side shouldn't send LACPDU anymore.</div><div class='add'>+check_pkt_count "${c_ns}" "eth0" &amp;&amp; RET=1</div><div class='add'>+log_test "bond 802.3ad lacp_active off" "port pkt after disconnect"</div><div class='add'>+</div><div class='add'>+exit "$EXIT_STATUS"</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh b/tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh<br/>index 195ef83cfbf1..167aa4a4a12a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh</a></div><div class='hunk'>@@ -39,6 +39,8 @@ g_ip4="192.0.2.254"</div><div class='ctx'> s_ip6="2001:db8::1"</div><div class='ctx'> c_ip6="2001:db8::10"</div><div class='ctx'> g_ip6="2001:db8::254"</div><div class='add'>+mac[0]="00:0a:0b:0c:0d:01"</div><div class='add'>+mac[1]="00:0a:0b:0c:0d:02"</div><div class='ctx'> </div><div class='ctx'> gateway_create()</div><div class='ctx'> {</div><div class='hunk'>@@ -62,6 +64,7 @@ server_create()</div><div class='ctx'> </div><div class='ctx'> 	for i in $(seq 0 1); do</div><div class='ctx'> 		ip -n ${s_ns} link add eth${i} type veth peer name s${i} netns ${g_ns}</div><div class='add'>+		ip -n "${s_ns}" link set "eth${i}" addr "${mac[$i]}"</div><div class='ctx'> </div><div class='ctx'> 		ip -n ${g_ns} link set s${i} up</div><div class='ctx'> 		ip -n ${g_ns} link set s${i} master br0</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh b/tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh<br/>index 3a1333d9a85b..23a2932301cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #  +-------------------------------------+</div><div class='ctx'> </div><div class='ctx'> source bond_topo_2d1c.sh</div><div class='add'>+mac[2]="00:0a:0b:0c:0d:03"</div><div class='ctx'> </div><div class='ctx'> setup_prepare()</div><div class='ctx'> {</div><div class='hunk'>@@ -36,6 +37,7 @@ setup_prepare()</div><div class='ctx'> 	# Add the extra device as we use 3 down links for bond0</div><div class='ctx'> 	local i=2</div><div class='ctx'> 	ip -n ${s_ns} link add eth${i} type veth peer name s${i} netns ${g_ns}</div><div class='add'>+	ip -n "${s_ns}" link set "eth${i}" addr "${mac[$i]}"</div><div class='ctx'> 	ip -n ${g_ns} link set s${i} up</div><div class='ctx'> 	ip -n ${g_ns} link set s${i} master br0</div><div class='ctx'> 	ip -n ${s_ns} link set eth${i} master bond0</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/bonding/config b/tools/testing/selftests/drivers/net/bonding/config<br/>index dad4e5fda4db..991494376223 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/bonding/config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/bonding/config</a></div><div class='hunk'>@@ -1,11 +1,21 @@</div><div class='ctx'> CONFIG_BONDING=y</div><div class='ctx'> CONFIG_BRIDGE=y</div><div class='add'>+CONFIG_CONFIGFS_FS=y</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='add'>+CONFIG_INET_ESP=y</div><div class='add'>+CONFIG_INET_ESP_OFFLOAD=y</div><div class='ctx'> CONFIG_IPV6=y</div><div class='del'>-CONFIG_MACVLAN=y</div><div class='ctx'> CONFIG_IPVLAN=y</div><div class='add'>+CONFIG_MACVLAN=y</div><div class='ctx'> CONFIG_NET_ACT_GACT=y</div><div class='ctx'> CONFIG_NET_CLS_FLOWER=y</div><div class='add'>+CONFIG_NET_CLS_MATCHALL=m</div><div class='add'>+CONFIG_NETCONSOLE=m</div><div class='add'>+CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='add'>+CONFIG_NETCONSOLE_EXTENDED_LOG=y</div><div class='add'>+CONFIG_NETDEVSIM=m</div><div class='ctx'> CONFIG_NET_SCH_INGRESS=y</div><div class='ctx'> CONFIG_NLMON=y</div><div class='ctx'> CONFIG_VETH=y</div><div class='add'>+CONFIG_VLAN_8021Q=m</div><div class='add'>+CONFIG_XFRM_USER=m</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/bonding/netcons_over_bonding.sh b/tools/testing/selftests/drivers/net/bonding/netcons_over_bonding.sh<br/>new file mode 100755<br/>index 000000000000..477cc9379500<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/bonding/netcons_over_bonding.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/bonding/netcons_over_bonding.sh</a></div><div class='hunk'>@@ -0,0 +1,361 @@</div><div class='add'>+#!/usr/bin/env bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#</div><div class='add'>+# This selftest exercises trying to have multiple netpoll users at the same</div><div class='add'>+# time.</div><div class='add'>+#</div><div class='add'>+# This selftest has multiple smalls test inside, and the goal is to</div><div class='add'>+# get interfaces with bonding and netconsole in different orders in order</div><div class='add'>+# to catch any possible issue.</div><div class='add'>+#</div><div class='add'>+# The main test composes of four interfaces being created using netdevsim; two</div><div class='add'>+# of them are bonded to serve as the netconsole's transmit interface. The</div><div class='add'>+# remaining two interfaces are similarly bonded and assigned to a separate</div><div class='add'>+# network namespace, which acts as the receive interface, where socat monitors</div><div class='add'>+# for incoming messages.</div><div class='add'>+#</div><div class='add'>+# A netconsole message is then sent to ensure it is properly received across</div><div class='add'>+# this configuration.</div><div class='add'>+#</div><div class='add'>+# Later, run a few other tests, to make sure that bonding and netconsole</div><div class='add'>+# cannot coexist.</div><div class='add'>+#</div><div class='add'>+# The test's objective is to exercise netpoll usage when managed simultaneously</div><div class='add'>+# by multiple subsystems (netconsole and bonding).</div><div class='add'>+#</div><div class='add'>+# Author: Breno Leitao &lt;leitao@debian.org&gt;</div><div class='add'>+</div><div class='add'>+set -euo pipefail</div><div class='add'>+</div><div class='add'>+SCRIPTDIR=$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")</div><div class='add'>+</div><div class='add'>+source "${SCRIPTDIR}"/../lib/sh/lib_netcons.sh</div><div class='add'>+</div><div class='add'>+modprobe netdevsim 2&gt; /dev/null || true</div><div class='add'>+modprobe netconsole 2&gt; /dev/null || true</div><div class='add'>+modprobe bonding 2&gt; /dev/null || true</div><div class='add'>+modprobe veth 2&gt; /dev/null || true</div><div class='add'>+</div><div class='add'>+# The content of kmsg will be save to the following file</div><div class='add'>+OUTPUT_FILE="/tmp/${TARGET}"</div><div class='add'>+</div><div class='add'>+# Check for basic system dependency and exit if not found</div><div class='add'>+check_for_dependencies</div><div class='add'>+# Set current loglevel to KERN_INFO(6), and default to KERN_NOTICE(5)</div><div class='add'>+echo "6 5" &gt; /proc/sys/kernel/printk</div><div class='add'>+# Remove the namespace, interfaces and netconsole target on exit</div><div class='add'>+trap cleanup_bond EXIT</div><div class='add'>+</div><div class='add'>+FORMAT="extended"</div><div class='add'>+IP_VERSION="ipv4"</div><div class='add'>+VETH0="veth"$(( RANDOM % 256))</div><div class='add'>+VETH1="veth"$((256 +  RANDOM % 256))</div><div class='add'>+TXNS=""</div><div class='add'>+RXNS=""</div><div class='add'>+</div><div class='add'>+# Create "bond_tx_XX" and "bond_rx_XX" interfaces, and set DSTIF and SRCIF with</div><div class='add'>+# the bonding interfaces</div><div class='add'>+function setup_bonding_ifaces() {</div><div class='add'>+	local RAND=$(( RANDOM % 100 ))</div><div class='add'>+	BOND_TX_MAIN_IF="bond_tx_$RAND"</div><div class='add'>+	BOND_RX_MAIN_IF="bond_rx_$RAND"</div><div class='add'>+</div><div class='add'>+	# Setup TX</div><div class='add'>+	if ! ip -n "${TXNS}" link add "${BOND_TX_MAIN_IF}" type bond mode balance-rr</div><div class='add'>+	then</div><div class='add'>+		echo "Failed to create bond TX interface. Is CONFIG_BONDING set?" &gt;&amp;2</div><div class='add'>+		# only clean nsim ifaces and namespace. Nothing else has been</div><div class='add'>+		# initialized</div><div class='add'>+		cleanup_bond_nsim</div><div class='add'>+		trap - EXIT</div><div class='add'>+		exit "${ksft_skip}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# create_netdevsim() got the interface up, but it needs to be down</div><div class='add'>+	# before being enslaved.</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link set "${BOND_TX1_SLAVE_IF}" down</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link set "${BOND_TX2_SLAVE_IF}" down</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link set "${BOND_TX1_SLAVE_IF}" master "${BOND_TX_MAIN_IF}"</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link set "${BOND_TX2_SLAVE_IF}" master "${BOND_TX_MAIN_IF}"</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link set "${BOND_TX_MAIN_IF}" up</div><div class='add'>+</div><div class='add'>+	# Setup RX</div><div class='add'>+	ip -n "${RXNS}" \</div><div class='add'>+		link add "${BOND_RX_MAIN_IF}" type bond mode balance-rr</div><div class='add'>+	ip -n "${RXNS}" \</div><div class='add'>+		link set "${BOND_RX1_SLAVE_IF}" down</div><div class='add'>+	ip -n "${RXNS}" \</div><div class='add'>+		link set "${BOND_RX2_SLAVE_IF}" down</div><div class='add'>+	ip -n "${RXNS}" \</div><div class='add'>+		link set "${BOND_RX1_SLAVE_IF}" master "${BOND_RX_MAIN_IF}"</div><div class='add'>+	ip -n "${RXNS}" \</div><div class='add'>+		link set "${BOND_RX2_SLAVE_IF}" master "${BOND_RX_MAIN_IF}"</div><div class='add'>+	ip -n "${RXNS}" \</div><div class='add'>+		link set "${BOND_RX_MAIN_IF}" up</div><div class='add'>+</div><div class='add'>+	export DSTIF="${BOND_RX_MAIN_IF}"</div><div class='add'>+	export SRCIF="${BOND_TX_MAIN_IF}"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Create 4 netdevsim interfaces. Two of them will be bound to TX bonding iface</div><div class='add'>+# and the other two will be bond to the RX interface (on the other namespace)</div><div class='add'>+function create_ifaces_bond() {</div><div class='add'>+	BOND_TX1_SLAVE_IF=$(create_netdevsim "${NSIM_BOND_TX_1}" "${TXNS}")</div><div class='add'>+	BOND_TX2_SLAVE_IF=$(create_netdevsim "${NSIM_BOND_TX_2}" "${TXNS}")</div><div class='add'>+	BOND_RX1_SLAVE_IF=$(create_netdevsim "${NSIM_BOND_RX_1}" "${RXNS}")</div><div class='add'>+	BOND_RX2_SLAVE_IF=$(create_netdevsim "${NSIM_BOND_RX_2}" "${RXNS}")</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# netdevsim link BOND_TX to BOND_RX interfaces</div><div class='add'>+function link_ifaces_bond() {</div><div class='add'>+	local BOND_TX1_SLAVE_IFIDX</div><div class='add'>+	local BOND_TX2_SLAVE_IFIDX</div><div class='add'>+	local BOND_RX1_SLAVE_IFIDX</div><div class='add'>+	local BOND_RX2_SLAVE_IFIDX</div><div class='add'>+	local TXNS_FD</div><div class='add'>+	local RXNS_FD</div><div class='add'>+</div><div class='add'>+	BOND_TX1_SLAVE_IFIDX=$(ip netns exec "${TXNS}" \</div><div class='add'>+				cat /sys/class/net/"$BOND_TX1_SLAVE_IF"/ifindex)</div><div class='add'>+	BOND_TX2_SLAVE_IFIDX=$(ip netns exec "${TXNS}" \</div><div class='add'>+				cat /sys/class/net/"$BOND_TX2_SLAVE_IF"/ifindex)</div><div class='add'>+	BOND_RX1_SLAVE_IFIDX=$(ip netns exec "${RXNS}" \</div><div class='add'>+				cat /sys/class/net/"$BOND_RX1_SLAVE_IF"/ifindex)</div><div class='add'>+	BOND_RX2_SLAVE_IFIDX=$(ip netns exec "${RXNS}" \</div><div class='add'>+				cat /sys/class/net/"$BOND_RX2_SLAVE_IF"/ifindex)</div><div class='add'>+</div><div class='add'>+	exec {TXNS_FD}&lt;/var/run/netns/"${TXNS}"</div><div class='add'>+	exec {RXNS_FD}&lt;/var/run/netns/"${RXNS}"</div><div class='add'>+</div><div class='add'>+	# Linking TX ifaces to the RX ones (on the other namespace)</div><div class='add'>+	echo "${TXNS_FD}:$BOND_TX1_SLAVE_IFIDX $RXNS_FD:$BOND_RX1_SLAVE_IFIDX"  \</div><div class='add'>+		&gt; "$NSIM_DEV_SYS_LINK"</div><div class='add'>+	echo "${TXNS_FD}:$BOND_TX2_SLAVE_IFIDX $RXNS_FD:$BOND_RX2_SLAVE_IFIDX"  \</div><div class='add'>+		&gt; "$NSIM_DEV_SYS_LINK"</div><div class='add'>+</div><div class='add'>+	exec {TXNS_FD}&lt;&amp;-</div><div class='add'>+	exec {RXNS_FD}&lt;&amp;-</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function create_all_ifaces() {</div><div class='add'>+	# setup_ns function is coming from lib.sh</div><div class='add'>+	setup_ns TXNS RXNS</div><div class='add'>+	export NAMESPACE="${RXNS}"</div><div class='add'>+</div><div class='add'>+	# Create two interfaces for RX and two for TX</div><div class='add'>+	create_ifaces_bond</div><div class='add'>+	# Link netlink ifaces</div><div class='add'>+	link_ifaces_bond</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# configure DSTIF and SRCIF IPs</div><div class='add'>+function configure_ifaces_ips() {</div><div class='add'>+	local IP_VERSION=${1:-"ipv4"}</div><div class='add'>+	select_ipv4_or_ipv6 "${IP_VERSION}"</div><div class='add'>+</div><div class='add'>+	ip -n "${RXNS}" addr add "${DSTIP}"/24 dev "${DSTIF}"</div><div class='add'>+	ip -n "${RXNS}" link set "${DSTIF}" up</div><div class='add'>+</div><div class='add'>+	ip -n "${TXNS}" addr add "${SRCIP}"/24 dev "${SRCIF}"</div><div class='add'>+	ip -n "${TXNS}" link set "${SRCIF}" up</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function test_enable_netpoll_on_enslaved_iface() {</div><div class='add'>+	echo 0 &gt; "${NETCONS_PATH}"/enabled</div><div class='add'>+</div><div class='add'>+	# At this stage, BOND_TX1_SLAVE_IF is enslaved to BOND_TX_MAIN_IF, and</div><div class='add'>+	# linked to BOND_RX1_SLAVE_IF inside the namespace.</div><div class='add'>+	echo "${BOND_TX1_SLAVE_IF}" &gt; "${NETCONS_PATH}"/dev_name</div><div class='add'>+</div><div class='add'>+	# This should fail with the following message in dmesg:</div><div class='add'>+	# netpoll: netconsole: ethX is a slave device, aborting</div><div class='add'>+	set +e</div><div class='add'>+	enable_netcons_ns 2&gt; /dev/null</div><div class='add'>+	set -e</div><div class='add'>+</div><div class='add'>+	if [[ $(cat "${NETCONS_PATH}"/enabled) -eq 1 ]]</div><div class='add'>+	then</div><div class='add'>+		echo "test failed: Bonding and netpoll cannot co-exists." &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function test_delete_bond_and_reenable_target() {</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link delete "${BOND_TX_MAIN_IF}" type bond</div><div class='add'>+</div><div class='add'>+	# BOND_TX1_SLAVE_IF is not attached to a bond interface anymore</div><div class='add'>+	# netpoll can be plugged in there</div><div class='add'>+	echo "${BOND_TX1_SLAVE_IF}" &gt; "${NETCONS_PATH}"/dev_name</div><div class='add'>+</div><div class='add'>+	# this should work, since the interface is not enslaved</div><div class='add'>+	enable_netcons_ns</div><div class='add'>+</div><div class='add'>+	if [[ $(cat "${NETCONS_PATH}"/enabled) -eq 0 ]]</div><div class='add'>+	then</div><div class='add'>+		echo "test failed: Unable to start netpoll on an unbond iface." &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Send a netconsole message to the netconsole target</div><div class='add'>+function test_send_netcons_msg_through_bond_iface() {</div><div class='add'>+	# Listen for netconsole port inside the namespace and</div><div class='add'>+	# destination interface</div><div class='add'>+	listen_port_and_save_to "${OUTPUT_FILE}" "${IP_VERSION}" &amp;</div><div class='add'>+	# Wait for socat to start and listen to the port.</div><div class='add'>+	wait_for_port "${RXNS}" "${PORT}" "${IP_VERSION}"</div><div class='add'>+	# Send the message</div><div class='add'>+	echo "${MSG}: ${TARGET}" &gt; /dev/kmsg</div><div class='add'>+	# Wait until socat saves the file to disk</div><div class='add'>+	busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"</div><div class='add'>+	# Make sure the message was received in the dst part</div><div class='add'>+	# and exit</div><div class='add'>+	validate_result "${OUTPUT_FILE}" "${FORMAT}"</div><div class='add'>+	# kill socat in case it is still running</div><div class='add'>+	pkill_socat</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# BOND_TX1_SLAVE_IF has netconsole enabled on it, bind it to BOND_TX_MAIN_IF.</div><div class='add'>+# Given BOND_TX_MAIN_IF was deleted, recreate it first</div><div class='add'>+function test_enslave_netcons_enabled_iface {</div><div class='add'>+	# netconsole got disabled while the interface was down</div><div class='add'>+	if [[ $(cat "${NETCONS_PATH}"/enabled) -eq 0 ]]</div><div class='add'>+	then</div><div class='add'>+		echo "test failed: netconsole expected to be enabled against BOND_TX1_SLAVE_IF" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# recreate the bonding iface. it got deleted by previous</div><div class='add'>+	# test (test_delete_bond_and_reenable_target)</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link add "${BOND_TX_MAIN_IF}" type bond mode balance-rr</div><div class='add'>+</div><div class='add'>+	# sub-interface need to be down before attaching to bonding</div><div class='add'>+	# This will also disable netconsole.</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link set "${BOND_TX1_SLAVE_IF}" down</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link set "${BOND_TX1_SLAVE_IF}" master "${BOND_TX_MAIN_IF}"</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link set "${BOND_TX_MAIN_IF}" up</div><div class='add'>+</div><div class='add'>+	# netconsole got disabled while the interface was down</div><div class='add'>+	if [[ $(cat "${NETCONS_PATH}"/enabled) -eq 1 ]]</div><div class='add'>+	then</div><div class='add'>+		echo "test failed: Device is part of a bond iface, cannot have netcons enabled" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Get netconsole enabled on a bonding interface and attach a second</div><div class='add'>+# sub-interface.</div><div class='add'>+function test_enslave_iface_to_bond {</div><div class='add'>+	# BOND_TX_MAIN_IF has only BOND_TX1_SLAVE_IF right now</div><div class='add'>+	echo "${BOND_TX_MAIN_IF}" &gt; "${NETCONS_PATH}"/dev_name</div><div class='add'>+	enable_netcons_ns</div><div class='add'>+</div><div class='add'>+	# netcons is attached to bond0 and BOND_TX1_SLAVE_IF is</div><div class='add'>+	# part of BOND_TX_MAIN_IF. Attach BOND_TX2_SLAVE_IF to BOND_TX_MAIN_IF.</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link set "${BOND_TX2_SLAVE_IF}" master "${BOND_TX_MAIN_IF}"</div><div class='add'>+	if [[ $(cat "${NETCONS_PATH}"/enabled) -eq 0 ]]</div><div class='add'>+	then</div><div class='add'>+		echo "test failed: Netconsole should be enabled on bonding interface. Failed" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function test_enslave_iff_disabled_netpoll_iface {</div><div class='add'>+	local ret</div><div class='add'>+</div><div class='add'>+	# Create two interfaces. veth interfaces it known to have</div><div class='add'>+	# IFF_DISABLE_NETPOLL set</div><div class='add'>+	if ! ip link add "${VETH0}" type veth peer name "${VETH1}"</div><div class='add'>+	then</div><div class='add'>+		echo "Failed to create veth TX interface. Is CONFIG_VETH set?" &gt;&amp;2</div><div class='add'>+		exit "${ksft_skip}"</div><div class='add'>+	fi</div><div class='add'>+	set +e</div><div class='add'>+	# This will print RTNETLINK answers: Device or resource busy</div><div class='add'>+	ip link set "${VETH0}" master "${BOND_TX_MAIN_IF}" 2&gt; /dev/null</div><div class='add'>+	ret=$?</div><div class='add'>+	set -e</div><div class='add'>+	if [[ $ret -eq 0 ]]</div><div class='add'>+	then</div><div class='add'>+		echo "test failed: veth interface could not be enslaved"</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Given that netconsole picks the current net namespace, we need to enable it</div><div class='add'>+# from inside the TXNS namespace</div><div class='add'>+function enable_netcons_ns() {</div><div class='add'>+	ip netns exec "${TXNS}" sh -c \</div><div class='add'>+		"mount -t configfs configfs /sys/kernel/config &amp;&amp; echo 1 &gt; $NETCONS_PATH/enabled"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+####################</div><div class='add'>+# Tests start here #</div><div class='add'>+####################</div><div class='add'>+</div><div class='add'>+# Create regular interfaces using netdevsim and link them</div><div class='add'>+create_all_ifaces</div><div class='add'>+</div><div class='add'>+# Setup the bonding interfaces</div><div class='add'>+# BOND_RX_MAIN_IF has BOND_RX{1,2}_SLAVE_IF</div><div class='add'>+# BOND_TX_MAIN_IF has BOND_TX{1,2}_SLAVE_IF</div><div class='add'>+setup_bonding_ifaces</div><div class='add'>+</div><div class='add'>+# Configure the ips as BOND_RX1_SLAVE_IF and BOND_TX1_SLAVE_IF</div><div class='add'>+configure_ifaces_ips "${IP_VERSION}"</div><div class='add'>+</div><div class='add'>+_create_dynamic_target "${FORMAT}" "${NETCONS_PATH}"</div><div class='add'>+enable_netcons_ns</div><div class='add'>+set_user_data</div><div class='add'>+</div><div class='add'>+# Test #1 : Create an bonding interface and attach netpoll into</div><div class='add'>+# the bonding interface. Netconsole/netpoll should work on</div><div class='add'>+# the bonding interface.</div><div class='add'>+test_send_netcons_msg_through_bond_iface</div><div class='add'>+echo "test #1: netpoll on bonding interface worked. Test passed" &gt;&amp;2</div><div class='add'>+</div><div class='add'>+# Test #2: Attach netpoll to an enslaved interface</div><div class='add'>+# Try to attach netpoll to an enslaved sub-interface (while still being part of</div><div class='add'>+# a bonding interface), which shouldn't be allowed</div><div class='add'>+test_enable_netpoll_on_enslaved_iface</div><div class='add'>+echo "test #2: netpoll correctly rejected enslaved interface (expected behavior). Test passed." &gt;&amp;2</div><div class='add'>+</div><div class='add'>+# Test #3: Unplug the sub-interface from bond and enable netconsole</div><div class='add'>+# Detach the interface from a bonding interface and attach netpoll again</div><div class='add'>+test_delete_bond_and_reenable_target</div><div class='add'>+echo "test #3: Able to attach to an unbound interface. Test passed." &gt;&amp;2</div><div class='add'>+</div><div class='add'>+# Test #4: Enslave a sub-interface that had netconsole enabled</div><div class='add'>+# Try to enslave an interface that has netconsole/netpoll enabled.</div><div class='add'>+# Previous test has netconsole enabled in BOND_TX1_SLAVE_IF, try to enslave it</div><div class='add'>+test_enslave_netcons_enabled_iface</div><div class='add'>+echo "test #4: Enslaving an interface with netpoll attached. Test passed." &gt;&amp;2</div><div class='add'>+</div><div class='add'>+# Test #5: Enslave a sub-interface to a bonding interface</div><div class='add'>+# Enslave an interface to a bond interface that has netpoll attached</div><div class='add'>+# At this stage, BOND_TX_MAIN_IF is created and BOND_TX1_SLAVE_IF is part of</div><div class='add'>+# it. Netconsole is currently disabled</div><div class='add'>+test_enslave_iface_to_bond</div><div class='add'>+echo "test #5: Enslaving an interface to bond+netpoll. Test passed." &gt;&amp;2</div><div class='add'>+</div><div class='add'>+# Test #6: Enslave a IFF_DISABLE_NETPOLL sub-interface to a bonding interface</div><div class='add'>+# At this stage, BOND_TX_MAIN_IF has both sub interface and netconsole is</div><div class='add'>+# enabled. This test will try to enslave an a veth (IFF_DISABLE_NETPOLL) interface</div><div class='add'>+# and it should fail, with netpoll: veth0 doesn't support polling</div><div class='add'>+test_enslave_iff_disabled_netpoll_iface</div><div class='add'>+echo "test #6: Enslaving IFF_DISABLE_NETPOLL ifaces to bond iface is not supported. Test passed." &gt;&amp;2</div><div class='add'>+</div><div class='add'>+cleanup_bond</div><div class='add'>+trap - EXIT</div><div class='add'>+exit "${EXIT_STATUS}"</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/config b/tools/testing/selftests/drivers/net/config<br/>index a2d8af60876d..77ccf83d87e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/config</a></div><div class='hunk'>@@ -1,6 +1,10 @@</div><div class='del'>-CONFIG_IPV6=y</div><div class='del'>-CONFIG_NETDEVSIM=m</div><div class='ctx'> CONFIG_CONFIGFS_FS=y</div><div class='add'>+CONFIG_DEBUG_INFO_BTF=y</div><div class='add'>+CONFIG_DEBUG_INFO_BTF_MODULES=n</div><div class='add'>+CONFIG_INET_PSP=y</div><div class='add'>+CONFIG_IPV6=y</div><div class='ctx'> CONFIG_NETCONSOLE=m</div><div class='ctx'> CONFIG_NETCONSOLE_DYNAMIC=y</div><div class='ctx'> CONFIG_NETCONSOLE_EXTENDED_LOG=y</div><div class='add'>+CONFIG_NETDEVSIM=m</div><div class='add'>+CONFIG_XDP_SOCKETS=y</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/dsa/Makefile b/tools/testing/selftests/drivers/net/dsa/Makefile<br/>index cd6817fe5be6..7994bd0e5c44 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/dsa/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/dsa/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/dsa/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/dsa/Makefile</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0+ OR MIT</div><div class='ctx'> </div><div class='del'>-TEST_PROGS = bridge_locked_port.sh \</div><div class='add'>+TEST_PROGS := \</div><div class='add'>+	bridge_locked_port.sh \</div><div class='ctx'> 	bridge_mdb.sh \</div><div class='ctx'> 	bridge_mld.sh \</div><div class='ctx'> 	bridge_vlan_aware.sh \</div><div class='hunk'>@@ -9,11 +10,13 @@ TEST_PROGS = bridge_locked_port.sh \</div><div class='ctx'> 	local_termination.sh \</div><div class='ctx'> 	no_forwarding.sh \</div><div class='ctx'> 	tc_actions.sh \</div><div class='del'>-	test_bridge_fdb_stress.sh</div><div class='add'>+	test_bridge_fdb_stress.sh \</div><div class='add'>+# end of TEST_PROGS</div><div class='ctx'> </div><div class='ctx'> TEST_FILES := \</div><div class='add'>+	forwarding.config \</div><div class='ctx'> 	run_net_forwarding_test.sh \</div><div class='del'>-	forwarding.config</div><div class='add'>+# end of TEST_FILES</div><div class='ctx'> </div><div class='ctx'> TEST_INCLUDES := \</div><div class='ctx'> 	../../../net/forwarding/bridge_locked_port.sh \</div><div class='hunk'>@@ -27,6 +30,7 @@ TEST_INCLUDES := \</div><div class='ctx'> 	../../../net/forwarding/no_forwarding.sh \</div><div class='ctx'> 	../../../net/forwarding/tc_actions.sh \</div><div class='ctx'> 	../../../net/forwarding/tc_common.sh \</div><div class='del'>-	../../../net/lib.sh</div><div class='add'>+	../../../net/lib.sh \</div><div class='add'>+# end of TEST_INCLUDES</div><div class='ctx'> </div><div class='ctx'> include ../../../lib.mk</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/dsa/tc_taprio.sh b/tools/testing/selftests/drivers/net/dsa/tc_taprio.sh<br/>new file mode 120000<br/>index 000000000000..d16a65e7595d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/dsa/tc_taprio.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/dsa/tc_taprio.sh</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+run_net_forwarding_test.sh
\ No newline at end of file</div><div class='head'>diff --git a/tools/testing/selftests/net/gro.c b/tools/testing/selftests/drivers/net/gro.c<br/>index b2184847e388..e894037d2e3e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/net/gro.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/gro.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/gro.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/gro.c</a></div><div class='hunk'>@@ -57,7 +57,8 @@</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='add'>+#include "../../net/lib/ksft.h"</div><div class='ctx'> </div><div class='ctx'> #define DPORT 8000</div><div class='ctx'> #define SPORT 1500</div><div class='hunk'>@@ -93,6 +94,7 @@ static bool tx_socket = true;</div><div class='ctx'> static int tcp_offset = -1;</div><div class='ctx'> static int total_hdr_len = -1;</div><div class='ctx'> static int ethhdr_proto = -1;</div><div class='add'>+static bool ipip;</div><div class='ctx'> static const int num_flush_id_cases = 6;</div><div class='ctx'> </div><div class='ctx'> static void vlog(const char *fmt, ...)</div><div class='hunk'>@@ -114,7 +116,9 @@ static void setup_sock_filter(int fd)</div><div class='ctx'> 	int ipproto_off, opt_ipproto_off;</div><div class='ctx'> 	int next_off;</div><div class='ctx'> </div><div class='del'>-	if (proto == PF_INET)</div><div class='add'>+	if (ipip)</div><div class='add'>+		next_off = sizeof(struct iphdr) + offsetof(struct iphdr, protocol);</div><div class='add'>+	else if (proto == PF_INET)</div><div class='ctx'> 		next_off = offsetof(struct iphdr, protocol);</div><div class='ctx'> 	else</div><div class='ctx'> 		next_off = offsetof(struct ipv6hdr, nexthdr);</div><div class='hunk'>@@ -244,7 +248,7 @@ static void fill_datalinklayer(void *buf)</div><div class='ctx'> 	eth-&gt;h_proto = ethhdr_proto;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fill_networklayer(void *buf, int payload_len)</div><div class='add'>+static void fill_networklayer(void *buf, int payload_len, int protocol)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipv6hdr *ip6h = buf;</div><div class='ctx'> 	struct iphdr *iph = buf;</div><div class='hunk'>@@ -254,7 +258,7 @@ static void fill_networklayer(void *buf, int payload_len)</div><div class='ctx'> </div><div class='ctx'> 		ip6h-&gt;version = 6;</div><div class='ctx'> 		ip6h-&gt;payload_len = htons(sizeof(struct tcphdr) + payload_len);</div><div class='del'>-		ip6h-&gt;nexthdr = IPPROTO_TCP;</div><div class='add'>+		ip6h-&gt;nexthdr = protocol;</div><div class='ctx'> 		ip6h-&gt;hop_limit = 8;</div><div class='ctx'> 		if (inet_pton(AF_INET6, addr6_src, &amp;ip6h-&gt;saddr) != 1)</div><div class='ctx'> 			error(1, errno, "inet_pton source ip6");</div><div class='hunk'>@@ -266,7 +270,7 @@ static void fill_networklayer(void *buf, int payload_len)</div><div class='ctx'> 		iph-&gt;version = 4;</div><div class='ctx'> 		iph-&gt;ihl = 5;</div><div class='ctx'> 		iph-&gt;ttl = 8;</div><div class='del'>-		iph-&gt;protocol	= IPPROTO_TCP;</div><div class='add'>+		iph-&gt;protocol	= protocol;</div><div class='ctx'> 		iph-&gt;tot_len = htons(sizeof(struct tcphdr) +</div><div class='ctx'> 				payload_len + sizeof(struct iphdr));</div><div class='ctx'> 		iph-&gt;frag_off = htons(0x4000); /* DF = 1, MF = 0 */</div><div class='hunk'>@@ -313,9 +317,19 @@ static void create_packet(void *buf, int seq_offset, int ack_offset,</div><div class='ctx'> {</div><div class='ctx'> 	memset(buf, 0, total_hdr_len);</div><div class='ctx'> 	memset(buf + total_hdr_len, 'a', payload_len);</div><div class='add'>+</div><div class='ctx'> 	fill_transportlayer(buf + tcp_offset, seq_offset, ack_offset,</div><div class='ctx'> 			    payload_len, fin);</div><div class='del'>-	fill_networklayer(buf + ETH_HLEN, payload_len);</div><div class='add'>+</div><div class='add'>+	if (ipip) {</div><div class='add'>+		fill_networklayer(buf + ETH_HLEN, payload_len + sizeof(struct iphdr),</div><div class='add'>+				  IPPROTO_IPIP);</div><div class='add'>+		fill_networklayer(buf + ETH_HLEN + sizeof(struct iphdr),</div><div class='add'>+				  payload_len, IPPROTO_TCP);</div><div class='add'>+	} else {</div><div class='add'>+		fill_networklayer(buf + ETH_HLEN, payload_len, IPPROTO_TCP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	fill_datalinklayer(buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -416,6 +430,13 @@ static void recompute_packet(char *buf, char *no_ext, int extlen)</div><div class='ctx'> 		iph-&gt;tot_len = htons(ntohs(iph-&gt;tot_len) + extlen);</div><div class='ctx'> 		iph-&gt;check = 0;</div><div class='ctx'> 		iph-&gt;check = checksum_fold(iph, sizeof(struct iphdr), 0);</div><div class='add'>+</div><div class='add'>+		if (ipip) {</div><div class='add'>+			iph += 1;</div><div class='add'>+			iph-&gt;tot_len = htons(ntohs(iph-&gt;tot_len) + extlen);</div><div class='add'>+			iph-&gt;check = 0;</div><div class='add'>+			iph-&gt;check = checksum_fold(iph, sizeof(struct iphdr), 0);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ip6h-&gt;payload_len = htons(ntohs(ip6h-&gt;payload_len) + extlen);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -670,7 +691,7 @@ static void send_flush_id_case(int fd, struct sockaddr_ll *daddr, int tcase)</div><div class='ctx'> 		iph2-&gt;id = htons(9);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case 3: /* DF=0, Fixed - should not coalesce */</div><div class='add'>+	case 3: /* DF=0, Fixed - should coalesce */</div><div class='ctx'> 		iph1-&gt;frag_off &amp;= ~htons(IP_DF);</div><div class='ctx'> 		iph1-&gt;id = htons(8);</div><div class='ctx'> </div><div class='hunk'>@@ -734,11 +755,11 @@ static void send_ipv6_exthdr(int fd, struct sockaddr_ll *daddr, char *ext_data1,</div><div class='ctx'> 	static char exthdr_pck[sizeof(buf) + MIN_EXTHDR_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	create_packet(buf, 0, 0, PAYLOAD_LEN, 0);</div><div class='del'>-	add_ipv6_exthdr(buf, exthdr_pck, IPPROTO_HOPOPTS, ext_data1);</div><div class='add'>+	add_ipv6_exthdr(buf, exthdr_pck, IPPROTO_DSTOPTS, ext_data1);</div><div class='ctx'> 	write_packet(fd, exthdr_pck, total_hdr_len + PAYLOAD_LEN + MIN_EXTHDR_SIZE, daddr);</div><div class='ctx'> </div><div class='ctx'> 	create_packet(buf, PAYLOAD_LEN * 1, 0, PAYLOAD_LEN, 0);</div><div class='del'>-	add_ipv6_exthdr(buf, exthdr_pck, IPPROTO_HOPOPTS, ext_data2);</div><div class='add'>+	add_ipv6_exthdr(buf, exthdr_pck, IPPROTO_DSTOPTS, ext_data2);</div><div class='ctx'> 	write_packet(fd, exthdr_pck, total_hdr_len + PAYLOAD_LEN + MIN_EXTHDR_SIZE, daddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -777,7 +798,7 @@ static void send_fragment4(int fd, struct sockaddr_ll *daddr)</div><div class='ctx'> 	 */</div><div class='ctx'> 	memset(buf + total_hdr_len, 'a', PAYLOAD_LEN * 2);</div><div class='ctx'> 	fill_transportlayer(buf + tcp_offset, PAYLOAD_LEN, 0, PAYLOAD_LEN * 2, 0);</div><div class='del'>-	fill_networklayer(buf + ETH_HLEN, PAYLOAD_LEN);</div><div class='add'>+	fill_networklayer(buf + ETH_HLEN, PAYLOAD_LEN, IPPROTO_TCP);</div><div class='ctx'> 	fill_datalinklayer(buf);</div><div class='ctx'> </div><div class='ctx'> 	iph-&gt;frag_off = htons(0x6000); // DF = 1, MF = 1</div><div class='hunk'>@@ -969,6 +990,7 @@ static void check_recv_pkts(int fd, int *correct_payload,</div><div class='ctx'> </div><div class='ctx'> static void gro_sender(void)</div><div class='ctx'> {</div><div class='add'>+	const int fin_delay_us = 100 * 1000;</div><div class='ctx'> 	static char fin_pkt[MAX_HDR_LEN];</div><div class='ctx'> 	struct sockaddr_ll daddr = {};</div><div class='ctx'> 	int txfd = -1;</div><div class='hunk'>@@ -1012,15 +1034,22 @@ static void gro_sender(void)</div><div class='ctx'> 		write_packet(txfd, fin_pkt, total_hdr_len, &amp;daddr);</div><div class='ctx'> 	} else if (strcmp(testname, "tcp") == 0) {</div><div class='ctx'> 		send_changed_checksum(txfd, &amp;daddr);</div><div class='add'>+		/* Adding sleep before sending FIN so that it is not</div><div class='add'>+		 * received prior to other packets.</div><div class='add'>+		 */</div><div class='add'>+		usleep(fin_delay_us);</div><div class='ctx'> 		write_packet(txfd, fin_pkt, total_hdr_len, &amp;daddr);</div><div class='ctx'> </div><div class='ctx'> 		send_changed_seq(txfd, &amp;daddr);</div><div class='add'>+		usleep(fin_delay_us);</div><div class='ctx'> 		write_packet(txfd, fin_pkt, total_hdr_len, &amp;daddr);</div><div class='ctx'> </div><div class='ctx'> 		send_changed_ts(txfd, &amp;daddr);</div><div class='add'>+		usleep(fin_delay_us);</div><div class='ctx'> 		write_packet(txfd, fin_pkt, total_hdr_len, &amp;daddr);</div><div class='ctx'> </div><div class='ctx'> 		send_diff_opt(txfd, &amp;daddr);</div><div class='add'>+		usleep(fin_delay_us);</div><div class='ctx'> 		write_packet(txfd, fin_pkt, total_hdr_len, &amp;daddr);</div><div class='ctx'> 	} else if (strcmp(testname, "ip") == 0) {</div><div class='ctx'> 		send_changed_ECN(txfd, &amp;daddr);</div><div class='hunk'>@@ -1071,7 +1100,7 @@ static void gro_sender(void)</div><div class='ctx'> 		 * and min ipv6hdr size. Like MAX_HDR_SIZE,</div><div class='ctx'> 		 * MAX_PAYLOAD is defined with the larger header of the two.</div><div class='ctx'> 		 */</div><div class='del'>-		int offset = proto == PF_INET ? 20 : 0;</div><div class='add'>+		int offset = (proto == PF_INET &amp;&amp; !ipip) ? 20 : 0;</div><div class='ctx'> 		int remainder = (MAX_PAYLOAD + offset) % MSS;</div><div class='ctx'> </div><div class='ctx'> 		send_large(txfd, &amp;daddr, remainder);</div><div class='hunk'>@@ -1099,6 +1128,8 @@ static void gro_receiver(void)</div><div class='ctx'> 	set_timeout(rxfd);</div><div class='ctx'> 	bind_packetsocket(rxfd);</div><div class='ctx'> </div><div class='add'>+	ksft_ready();</div><div class='add'>+</div><div class='ctx'> 	memset(correct_payload, 0, sizeof(correct_payload));</div><div class='ctx'> </div><div class='ctx'> 	if (strcmp(testname, "data") == 0) {</div><div class='hunk'>@@ -1188,10 +1219,9 @@ static void gro_receiver(void)</div><div class='ctx'> 			correct_payload[0] = PAYLOAD_LEN * 2;</div><div class='ctx'> 			check_recv_pkts(rxfd, correct_payload, 1);</div><div class='ctx'> </div><div class='del'>-			printf("DF=0, Fixed - should not coalesce: ");</div><div class='del'>-			correct_payload[0] = PAYLOAD_LEN;</div><div class='del'>-			correct_payload[1] = PAYLOAD_LEN;</div><div class='del'>-			check_recv_pkts(rxfd, correct_payload, 2);</div><div class='add'>+			printf("DF=0, Fixed - should coalesce: ");</div><div class='add'>+			correct_payload[0] = PAYLOAD_LEN * 2;</div><div class='add'>+			check_recv_pkts(rxfd, correct_payload, 1);</div><div class='ctx'> </div><div class='ctx'> 			printf("DF=1, 2 Incrementing and one fixed - should coalesce only first 2 packets: ");</div><div class='ctx'> 			correct_payload[0] = PAYLOAD_LEN * 2;</div><div class='hunk'>@@ -1222,7 +1252,7 @@ static void gro_receiver(void)</div><div class='ctx'> 			check_recv_pkts(rxfd, correct_payload, 2);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (strcmp(testname, "large") == 0) {</div><div class='del'>-		int offset = proto == PF_INET ? 20 : 0;</div><div class='add'>+		int offset = (proto == PF_INET &amp;&amp; !ipip) ? 20 : 0;</div><div class='ctx'> 		int remainder = (MAX_PAYLOAD + offset) % MSS;</div><div class='ctx'> </div><div class='ctx'> 		correct_payload[0] = (MAX_PAYLOAD + offset);</div><div class='hunk'>@@ -1251,6 +1281,7 @@ static void parse_args(int argc, char **argv)</div><div class='ctx'> 		{ "iface", required_argument, NULL, 'i' },</div><div class='ctx'> 		{ "ipv4", no_argument, NULL, '4' },</div><div class='ctx'> 		{ "ipv6", no_argument, NULL, '6' },</div><div class='add'>+		{ "ipip", no_argument, NULL, 'e' },</div><div class='ctx'> 		{ "rx", no_argument, NULL, 'r' },</div><div class='ctx'> 		{ "saddr", required_argument, NULL, 's' },</div><div class='ctx'> 		{ "smac", required_argument, NULL, 'S' },</div><div class='hunk'>@@ -1260,7 +1291,7 @@ static void parse_args(int argc, char **argv)</div><div class='ctx'> 	};</div><div class='ctx'> 	int c;</div><div class='ctx'> </div><div class='del'>-	while ((c = getopt_long(argc, argv, "46d:D:i:rs:S:t:v", opts, NULL)) != -1) {</div><div class='add'>+	while ((c = getopt_long(argc, argv, "46d:D:ei:rs:S:t:v", opts, NULL)) != -1) {</div><div class='ctx'> 		switch (c) {</div><div class='ctx'> 		case '4':</div><div class='ctx'> 			proto = PF_INET;</div><div class='hunk'>@@ -1270,6 +1301,11 @@ static void parse_args(int argc, char **argv)</div><div class='ctx'> 			proto = PF_INET6;</div><div class='ctx'> 			ethhdr_proto = htons(ETH_P_IPV6);</div><div class='ctx'> 			break;</div><div class='add'>+		case 'e':</div><div class='add'>+			ipip = true;</div><div class='add'>+			proto = PF_INET;</div><div class='add'>+			ethhdr_proto = htons(ETH_P_IP);</div><div class='add'>+			break;</div><div class='ctx'> 		case 'd':</div><div class='ctx'> 			addr4_dst = addr6_dst = optarg;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1305,7 +1341,10 @@ int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	parse_args(argc, argv);</div><div class='ctx'> </div><div class='del'>-	if (proto == PF_INET) {</div><div class='add'>+	if (ipip) {</div><div class='add'>+		tcp_offset = ETH_HLEN + sizeof(struct iphdr) * 2;</div><div class='add'>+		total_hdr_len = tcp_offset + sizeof(struct tcphdr);</div><div class='add'>+	} else if (proto == PF_INET) {</div><div class='ctx'> 		tcp_offset = ETH_HLEN + sizeof(struct iphdr);</div><div class='ctx'> 		total_hdr_len = tcp_offset + sizeof(struct tcphdr);</div><div class='ctx'> 	} else if (proto == PF_INET6) {</div><div class='hunk'>@@ -1318,11 +1357,13 @@ int main(int argc, char **argv)</div><div class='ctx'> 	read_MAC(src_mac, smac);</div><div class='ctx'> 	read_MAC(dst_mac, dmac);</div><div class='ctx'> </div><div class='del'>-	if (tx_socket)</div><div class='add'>+	if (tx_socket) {</div><div class='ctx'> 		gro_sender();</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='add'>+		/* Only the receiver exit status determines test success. */</div><div class='ctx'> 		gro_receiver();</div><div class='add'>+		fprintf(stderr, "Gro::%s test passed.\n", testname);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	fprintf(stderr, "Gro::%s test passed.\n", testname);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/gro.py b/tools/testing/selftests/drivers/net/gro.py<br/>new file mode 100755<br/>index 000000000000..ba83713bf7b5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/gro.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/gro.py</a></div><div class='hunk'>@@ -0,0 +1,164 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+"""</div><div class='add'>+GRO (Generic Receive Offload) conformance tests.</div><div class='add'>+</div><div class='add'>+Validates that GRO coalescing works correctly by running the gro</div><div class='add'>+binary in different configurations and checking for correct packet</div><div class='add'>+coalescing behavior.</div><div class='add'>+</div><div class='add'>+Test cases:</div><div class='add'>+  - data: Data packets with same size/headers and correct seq numbers coalesce</div><div class='add'>+  - ack: Pure ACK packets do not coalesce</div><div class='add'>+  - flags: Packets with PSH, SYN, URG, RST flags do not coalesce</div><div class='add'>+  - tcp: Packets with incorrect checksum, non-consecutive seqno don't coalesce</div><div class='add'>+  - ip: Packets with different ECN, TTL, TOS, or IP options don't coalesce</div><div class='add'>+  - large: Packets larger than GRO_MAX_SIZE don't coalesce</div><div class='add'>+"""</div><div class='add'>+</div><div class='add'>+import os</div><div class='add'>+from lib.py import ksft_run, ksft_exit, ksft_pr</div><div class='add'>+from lib.py import NetDrvEpEnv, KsftXfailEx</div><div class='add'>+from lib.py import cmd, defer, bkg, ip</div><div class='add'>+from lib.py import ksft_variants</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _resolve_dmac(cfg, ipver):</div><div class='add'>+    """</div><div class='add'>+    Find the destination MAC address remote host should use to send packets</div><div class='add'>+    towards the local host. It may be a router / gateway address.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    attr = "dmac" + ipver</div><div class='add'>+    # Cache the response across test cases</div><div class='add'>+    if hasattr(cfg, attr):</div><div class='add'>+        return getattr(cfg, attr)</div><div class='add'>+</div><div class='add'>+    route = ip(f"-{ipver} route get {cfg.addr_v[ipver]}",</div><div class='add'>+               json=True, host=cfg.remote)[0]</div><div class='add'>+    gw = route.get("gateway")</div><div class='add'>+    # Local L2 segment, address directly</div><div class='add'>+    if not gw:</div><div class='add'>+        setattr(cfg, attr, cfg.dev['address'])</div><div class='add'>+        return getattr(cfg, attr)</div><div class='add'>+</div><div class='add'>+    # ping to make sure neighbor is resolved,</div><div class='add'>+    # bind to an interface, for v6 the GW is likely link local</div><div class='add'>+    cmd(f"ping -c1 -W0 -I{cfg.remote_ifname} {gw}", host=cfg.remote)</div><div class='add'>+</div><div class='add'>+    neigh = ip(f"neigh get {gw} dev {cfg.remote_ifname}",</div><div class='add'>+               json=True, host=cfg.remote)[0]</div><div class='add'>+    setattr(cfg, attr, neigh['lladdr'])</div><div class='add'>+    return getattr(cfg, attr)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _write_defer_restore(cfg, path, val, defer_undo=False):</div><div class='add'>+    with open(path, "r", encoding="utf-8") as fp:</div><div class='add'>+        orig_val = fp.read().strip()</div><div class='add'>+        if str(val) == orig_val:</div><div class='add'>+            return</div><div class='add'>+    with open(path, "w", encoding="utf-8") as fp:</div><div class='add'>+        fp.write(val)</div><div class='add'>+    if defer_undo:</div><div class='add'>+        defer(_write_defer_restore, cfg, path, orig_val)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _set_mtu_restore(dev, mtu, host):</div><div class='add'>+    if dev['mtu'] &lt; mtu:</div><div class='add'>+        ip(f"link set dev {dev['ifname']} mtu {mtu}", host=host)</div><div class='add'>+        defer(ip, f"link set dev {dev['ifname']} mtu {dev['mtu']}", host=host)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _setup(cfg, test_name):</div><div class='add'>+    """ Setup hardware loopback mode for GRO testing. """</div><div class='add'>+</div><div class='add'>+    if not hasattr(cfg, "bin_remote"):</div><div class='add'>+        cfg.bin_local = cfg.test_dir / "gro"</div><div class='add'>+        cfg.bin_remote = cfg.remote.deploy(cfg.bin_local)</div><div class='add'>+</div><div class='add'>+    # "large" test needs at least 4k MTU</div><div class='add'>+    if test_name == "large":</div><div class='add'>+        _set_mtu_restore(cfg.dev, 4096, None)</div><div class='add'>+        _set_mtu_restore(cfg.remote_dev, 4096, cfg.remote)</div><div class='add'>+</div><div class='add'>+    flush_path = f"/sys/class/net/{cfg.ifname}/gro_flush_timeout"</div><div class='add'>+    irq_path = f"/sys/class/net/{cfg.ifname}/napi_defer_hard_irqs"</div><div class='add'>+</div><div class='add'>+    _write_defer_restore(cfg, flush_path, "200000", defer_undo=True)</div><div class='add'>+    _write_defer_restore(cfg, irq_path, "10", defer_undo=True)</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        # Disable TSO for local tests</div><div class='add'>+        cfg.require_nsim()  # will raise KsftXfailEx if not running on nsim</div><div class='add'>+</div><div class='add'>+        cmd(f"ethtool -K {cfg.ifname} gro on tso off")</div><div class='add'>+        cmd(f"ethtool -K {cfg.remote_ifname} gro on tso off", host=cfg.remote)</div><div class='add'>+    except KsftXfailEx:</div><div class='add'>+        pass</div><div class='add'>+</div><div class='add'>+def _gro_variants():</div><div class='add'>+    """Generator that yields all combinations of protocol and test types."""</div><div class='add'>+</div><div class='add'>+    for protocol in ["ipv4", "ipv6", "ipip"]:</div><div class='add'>+        for test_name in ["data", "ack", "flags", "tcp", "ip", "large"]:</div><div class='add'>+            yield protocol, test_name</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+@ksft_variants(_gro_variants())</div><div class='add'>+def test(cfg, protocol, test_name):</div><div class='add'>+    """Run a single GRO test with retries."""</div><div class='add'>+</div><div class='add'>+    ipver = "6" if protocol[-1] == "6" else "4"</div><div class='add'>+    cfg.require_ipver(ipver)</div><div class='add'>+</div><div class='add'>+    _setup(cfg, test_name)</div><div class='add'>+</div><div class='add'>+    base_cmd_args = [</div><div class='add'>+        f"--{protocol}",</div><div class='add'>+        f"--dmac {_resolve_dmac(cfg, ipver)}",</div><div class='add'>+        f"--smac {cfg.remote_dev['address']}",</div><div class='add'>+        f"--daddr {cfg.addr_v[ipver]}",</div><div class='add'>+        f"--saddr {cfg.remote_addr_v[ipver]}",</div><div class='add'>+        f"--test {test_name}",</div><div class='add'>+        "--verbose"</div><div class='add'>+    ]</div><div class='add'>+    base_args = " ".join(base_cmd_args)</div><div class='add'>+</div><div class='add'>+    # Each test is run 6 times to deflake, because given the receive timing,</div><div class='add'>+    # not all packets that should coalesce will be considered in the same flow</div><div class='add'>+    # on every try.</div><div class='add'>+    max_retries = 6</div><div class='add'>+    for attempt in range(max_retries):</div><div class='add'>+        rx_cmd = f"{cfg.bin_local} {base_args} --rx --iface {cfg.ifname}"</div><div class='add'>+        tx_cmd = f"{cfg.bin_remote} {base_args} --iface {cfg.remote_ifname}"</div><div class='add'>+</div><div class='add'>+        fail_now = attempt &gt;= max_retries - 1</div><div class='add'>+</div><div class='add'>+        with bkg(rx_cmd, ksft_ready=True, exit_wait=True,</div><div class='add'>+                 fail=fail_now) as rx_proc:</div><div class='add'>+            cmd(tx_cmd, host=cfg.remote)</div><div class='add'>+</div><div class='add'>+        if rx_proc.ret == 0:</div><div class='add'>+            return</div><div class='add'>+</div><div class='add'>+        ksft_pr(rx_proc.stdout.strip().replace('\n', '\n# '))</div><div class='add'>+        ksft_pr(rx_proc.stderr.strip().replace('\n', '\n# '))</div><div class='add'>+</div><div class='add'>+        if test_name == "large" and os.environ.get("KSFT_MACHINE_SLOW"):</div><div class='add'>+            ksft_pr(f"Ignoring {protocol}/{test_name} failure due to slow environment")</div><div class='add'>+            return</div><div class='add'>+</div><div class='add'>+        ksft_pr(f"Attempt {attempt + 1}/{max_retries} failed, retrying...")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    """ Ksft boiler plate main """</div><div class='add'>+</div><div class='add'>+    with NetDrvEpEnv(__file__) as cfg:</div><div class='add'>+        ksft_run(cases=[test], args=(cfg,))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hds.py b/tools/testing/selftests/drivers/net/hds.py<br/>index 394971b25c0b..c4fe049e9baa 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hds.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hds.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hds.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hds.py</a></div><div class='hunk'>@@ -2,17 +2,55 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='ctx'> import errno</div><div class='add'>+import os</div><div class='add'>+import random</div><div class='add'>+from typing import Union</div><div class='ctx'> from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_raises, KsftSkipEx</div><div class='del'>-from lib.py import EthtoolFamily, NlError</div><div class='add'>+from lib.py import CmdExitFailure, EthtoolFamily, NlError</div><div class='ctx'> from lib.py import NetDrvEnv</div><div class='add'>+from lib.py import defer, ethtool, ip</div><div class='ctx'> </div><div class='del'>-def get_hds(cfg, netnl) -&gt; None:</div><div class='add'>+</div><div class='add'>+def _get_hds_mode(cfg, netnl) -&gt; str:</div><div class='ctx'>     try:</div><div class='ctx'>         rings = netnl.rings_get({'header': {'dev-index': cfg.ifindex}})</div><div class='ctx'>     except NlError as e:</div><div class='ctx'>         raise KsftSkipEx('ring-get not supported by device')</div><div class='ctx'>     if 'tcp-data-split' not in rings:</div><div class='ctx'>         raise KsftSkipEx('tcp-data-split not supported by device')</div><div class='add'>+    return rings['tcp-data-split']</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _xdp_onoff(cfg):</div><div class='add'>+    prog = cfg.net_lib_dir / "xdp_dummy.bpf.o"</div><div class='add'>+    ip("link set dev %s xdp obj %s sec xdp" %</div><div class='add'>+       (cfg.ifname, prog))</div><div class='add'>+    ip("link set dev %s xdp off" % cfg.ifname)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _ioctl_ringparam_modify(cfg, netnl) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Helper for performing a hopefully unimportant IOCTL SET.</div><div class='add'>+    IOCTL does not support HDS, so it should not affect the HDS config.</div><div class='add'>+    """</div><div class='add'>+    try:</div><div class='add'>+        rings = netnl.rings_get({'header': {'dev-index': cfg.ifindex}})</div><div class='add'>+    except NlError as e:</div><div class='add'>+        raise KsftSkipEx('ring-get not supported by device')</div><div class='add'>+</div><div class='add'>+    if 'tx' not in rings:</div><div class='add'>+        raise KsftSkipEx('setting Tx ring size not supported')</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        ethtool(f"--disable-netlink -G {cfg.ifname} tx {rings['tx'] // 2}")</div><div class='add'>+    except CmdExitFailure as e:</div><div class='add'>+        ethtool(f"--disable-netlink -G {cfg.ifname} tx {rings['tx'] * 2}")</div><div class='add'>+    defer(ethtool, f"-G {cfg.ifname} tx {rings['tx']}")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def get_hds(cfg, netnl) -&gt; None:</div><div class='add'>+    _get_hds_mode(cfg, netnl)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> def get_hds_thresh(cfg, netnl) -&gt; None:</div><div class='ctx'>     try:</div><div class='hunk'>@@ -22,7 +60,39 @@ def get_hds_thresh(cfg, netnl) -&gt; None:</div><div class='ctx'>     if 'hds-thresh' not in rings:</div><div class='ctx'>         raise KsftSkipEx('hds-thresh not supported by device')</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+def _hds_reset(cfg, netnl, rings) -&gt; None:</div><div class='add'>+    cur = netnl.rings_get({'header': {'dev-index': cfg.ifindex}})</div><div class='add'>+</div><div class='add'>+    arg = {'header': {'dev-index': cfg.ifindex}}</div><div class='add'>+    if cur.get('tcp-data-split') != rings.get('tcp-data-split'):</div><div class='add'>+        # Try to reset to "unknown" first, we don't know if the setting</div><div class='add'>+        # was the default or user chose it. Default seems more likely.</div><div class='add'>+        arg['tcp-data-split'] = "unknown"</div><div class='add'>+        netnl.rings_set(arg)</div><div class='add'>+        cur = netnl.rings_get({'header': {'dev-index': cfg.ifindex}})</div><div class='add'>+        if cur['tcp-data-split'] == rings['tcp-data-split']:</div><div class='add'>+            del arg['tcp-data-split']</div><div class='add'>+        else:</div><div class='add'>+            # Try the explicit setting</div><div class='add'>+            arg['tcp-data-split'] = rings['tcp-data-split']</div><div class='add'>+    if cur.get('hds-thresh') != rings.get('hds-thresh'):</div><div class='add'>+        arg['hds-thresh'] = rings['hds-thresh']</div><div class='add'>+    if len(arg) &gt; 1:</div><div class='add'>+        netnl.rings_set(arg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _defer_reset_hds(cfg, netnl) -&gt; Union[dict, None]:</div><div class='add'>+    try:</div><div class='add'>+        rings = netnl.rings_get({'header': {'dev-index': cfg.ifindex}})</div><div class='add'>+        if 'hds-thresh' in rings or 'tcp-data-split' in rings:</div><div class='add'>+            defer(_hds_reset, cfg, netnl, rings)</div><div class='add'>+    except NlError as e:</div><div class='add'>+        pass</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> def set_hds_enable(cfg, netnl) -&gt; None:</div><div class='add'>+    _defer_reset_hds(cfg, netnl)</div><div class='ctx'>     try:</div><div class='ctx'>         netnl.rings_set({'header': {'dev-index': cfg.ifindex}, 'tcp-data-split': 'enabled'})</div><div class='ctx'>     except NlError as e:</div><div class='hunk'>@@ -40,6 +110,7 @@ def set_hds_enable(cfg, netnl) -&gt; None:</div><div class='ctx'>     ksft_eq('enabled', rings['tcp-data-split'])</div><div class='ctx'> </div><div class='ctx'> def set_hds_disable(cfg, netnl) -&gt; None:</div><div class='add'>+    _defer_reset_hds(cfg, netnl)</div><div class='ctx'>     try:</div><div class='ctx'>         netnl.rings_set({'header': {'dev-index': cfg.ifindex}, 'tcp-data-split': 'disabled'})</div><div class='ctx'>     except NlError as e:</div><div class='hunk'>@@ -57,6 +128,7 @@ def set_hds_disable(cfg, netnl) -&gt; None:</div><div class='ctx'>     ksft_eq('disabled', rings['tcp-data-split'])</div><div class='ctx'> </div><div class='ctx'> def set_hds_thresh_zero(cfg, netnl) -&gt; None:</div><div class='add'>+    _defer_reset_hds(cfg, netnl)</div><div class='ctx'>     try:</div><div class='ctx'>         netnl.rings_set({'header': {'dev-index': cfg.ifindex}, 'hds-thresh': 0})</div><div class='ctx'>     except NlError as e:</div><div class='hunk'>@@ -73,7 +145,39 @@ def set_hds_thresh_zero(cfg, netnl) -&gt; None:</div><div class='ctx'> </div><div class='ctx'>     ksft_eq(0, rings['hds-thresh'])</div><div class='ctx'> </div><div class='add'>+def set_hds_thresh_random(cfg, netnl) -&gt; None:</div><div class='add'>+    _defer_reset_hds(cfg, netnl)</div><div class='add'>+    try:</div><div class='add'>+        rings = netnl.rings_get({'header': {'dev-index': cfg.ifindex}})</div><div class='add'>+    except NlError as e:</div><div class='add'>+        raise KsftSkipEx('ring-get not supported by device')</div><div class='add'>+    if 'hds-thresh' not in rings:</div><div class='add'>+        raise KsftSkipEx('hds-thresh not supported by device')</div><div class='add'>+    if 'hds-thresh-max' not in rings:</div><div class='add'>+        raise KsftSkipEx('hds-thresh-max not defined by device')</div><div class='add'>+</div><div class='add'>+    if rings['hds-thresh-max'] &lt; 2:</div><div class='add'>+        raise KsftSkipEx('hds-thresh-max is too small')</div><div class='add'>+    elif rings['hds-thresh-max'] == 2:</div><div class='add'>+        hds_thresh = 1</div><div class='add'>+    else:</div><div class='add'>+        while True:</div><div class='add'>+            hds_thresh = random.randint(1, rings['hds-thresh-max'] - 1)</div><div class='add'>+            if hds_thresh != rings['hds-thresh']:</div><div class='add'>+                break</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        netnl.rings_set({'header': {'dev-index': cfg.ifindex}, 'hds-thresh': hds_thresh})</div><div class='add'>+    except NlError as e:</div><div class='add'>+        if e.error == errno.EINVAL:</div><div class='add'>+            raise KsftSkipEx("hds-thresh-set not supported by the device")</div><div class='add'>+        elif e.error == errno.EOPNOTSUPP:</div><div class='add'>+            raise KsftSkipEx("ring-set not supported by the device")</div><div class='add'>+    rings = netnl.rings_get({'header': {'dev-index': cfg.ifindex}})</div><div class='add'>+    ksft_eq(hds_thresh, rings['hds-thresh'])</div><div class='add'>+</div><div class='ctx'> def set_hds_thresh_max(cfg, netnl) -&gt; None:</div><div class='add'>+    _defer_reset_hds(cfg, netnl)</div><div class='ctx'>     try:</div><div class='ctx'>         rings = netnl.rings_get({'header': {'dev-index': cfg.ifindex}})</div><div class='ctx'>     except NlError as e:</div><div class='hunk'>@@ -91,6 +195,7 @@ def set_hds_thresh_max(cfg, netnl) -&gt; None:</div><div class='ctx'>     ksft_eq(rings['hds-thresh'], rings['hds-thresh-max'])</div><div class='ctx'> </div><div class='ctx'> def set_hds_thresh_gt(cfg, netnl) -&gt; None:</div><div class='add'>+    _defer_reset_hds(cfg, netnl)</div><div class='ctx'>     try:</div><div class='ctx'>         rings = netnl.rings_get({'header': {'dev-index': cfg.ifindex}})</div><div class='ctx'>     except NlError as e:</div><div class='hunk'>@@ -104,15 +209,119 @@ def set_hds_thresh_gt(cfg, netnl) -&gt; None:</div><div class='ctx'>         netnl.rings_set({'header': {'dev-index': cfg.ifindex}, 'hds-thresh': hds_gt})</div><div class='ctx'>     ksft_eq(e.exception.nl_msg.error, -errno.EINVAL)</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+def set_xdp(cfg, netnl) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Enable single-buffer XDP on the device.</div><div class='add'>+    When HDS is in "auto" / UNKNOWN mode, XDP installation should work.</div><div class='add'>+    """</div><div class='add'>+    mode = _get_hds_mode(cfg, netnl)</div><div class='add'>+    if mode == 'enabled':</div><div class='add'>+        _defer_reset_hds(cfg, netnl)</div><div class='add'>+        netnl.rings_set({'header': {'dev-index': cfg.ifindex},</div><div class='add'>+                         'tcp-data-split': 'unknown'})</div><div class='add'>+</div><div class='add'>+    _xdp_onoff(cfg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def enabled_set_xdp(cfg, netnl) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Enable single-buffer XDP on the device.</div><div class='add'>+    When HDS is in "enabled" mode, XDP installation should not work.</div><div class='add'>+    """</div><div class='add'>+    _get_hds_mode(cfg, netnl)</div><div class='add'>+    netnl.rings_set({'header': {'dev-index': cfg.ifindex},</div><div class='add'>+                     'tcp-data-split': 'enabled'})</div><div class='add'>+</div><div class='add'>+    defer(netnl.rings_set, {'header': {'dev-index': cfg.ifindex},</div><div class='add'>+                            'tcp-data-split': 'unknown'})</div><div class='add'>+</div><div class='add'>+    with ksft_raises(CmdExitFailure) as e:</div><div class='add'>+        _xdp_onoff(cfg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def set_xdp(cfg, netnl) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Enable single-buffer XDP on the device.</div><div class='add'>+    When HDS is in "auto" / UNKNOWN mode, XDP installation should work.</div><div class='add'>+    """</div><div class='add'>+    mode = _get_hds_mode(cfg, netnl)</div><div class='add'>+    if mode == 'enabled':</div><div class='add'>+        netnl.rings_set({'header': {'dev-index': cfg.ifindex},</div><div class='add'>+                         'tcp-data-split': 'unknown'})</div><div class='add'>+</div><div class='add'>+    _xdp_onoff(cfg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def enabled_set_xdp(cfg, netnl) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Enable single-buffer XDP on the device.</div><div class='add'>+    When HDS is in "enabled" mode, XDP installation should not work.</div><div class='add'>+    """</div><div class='add'>+    _get_hds_mode(cfg, netnl)  # Trigger skip if not supported</div><div class='add'>+</div><div class='add'>+    netnl.rings_set({'header': {'dev-index': cfg.ifindex},</div><div class='add'>+                     'tcp-data-split': 'enabled'})</div><div class='add'>+    defer(netnl.rings_set, {'header': {'dev-index': cfg.ifindex},</div><div class='add'>+                            'tcp-data-split': 'unknown'})</div><div class='add'>+</div><div class='add'>+    with ksft_raises(CmdExitFailure) as e:</div><div class='add'>+        _xdp_onoff(cfg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def ioctl(cfg, netnl) -&gt; None:</div><div class='add'>+    mode1 = _get_hds_mode(cfg, netnl)</div><div class='add'>+    _ioctl_ringparam_modify(cfg, netnl)</div><div class='add'>+    mode2 = _get_hds_mode(cfg, netnl)</div><div class='add'>+</div><div class='add'>+    ksft_eq(mode1, mode2)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def ioctl_set_xdp(cfg, netnl) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Like set_xdp(), but we perturb the settings via the legacy ioctl.</div><div class='add'>+    """</div><div class='add'>+    mode = _get_hds_mode(cfg, netnl)</div><div class='add'>+    if mode == 'enabled':</div><div class='add'>+        netnl.rings_set({'header': {'dev-index': cfg.ifindex},</div><div class='add'>+                         'tcp-data-split': 'unknown'})</div><div class='add'>+</div><div class='add'>+    _ioctl_ringparam_modify(cfg, netnl)</div><div class='add'>+</div><div class='add'>+    _xdp_onoff(cfg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def ioctl_enabled_set_xdp(cfg, netnl) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Enable single-buffer XDP on the device.</div><div class='add'>+    When HDS is in "enabled" mode, XDP installation should not work.</div><div class='add'>+    """</div><div class='add'>+    _get_hds_mode(cfg, netnl)  # Trigger skip if not supported</div><div class='add'>+</div><div class='add'>+    netnl.rings_set({'header': {'dev-index': cfg.ifindex},</div><div class='add'>+                     'tcp-data-split': 'enabled'})</div><div class='add'>+    defer(netnl.rings_set, {'header': {'dev-index': cfg.ifindex},</div><div class='add'>+                            'tcp-data-split': 'unknown'})</div><div class='add'>+</div><div class='add'>+    with ksft_raises(CmdExitFailure) as e:</div><div class='add'>+        _xdp_onoff(cfg)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> def main() -&gt; None:</div><div class='ctx'>     with NetDrvEnv(__file__, queue_count=3) as cfg:</div><div class='ctx'>         ksft_run([get_hds,</div><div class='ctx'>                   get_hds_thresh,</div><div class='ctx'>                   set_hds_disable,</div><div class='ctx'>                   set_hds_enable,</div><div class='add'>+                  set_hds_thresh_random,</div><div class='ctx'>                   set_hds_thresh_zero,</div><div class='ctx'>                   set_hds_thresh_max,</div><div class='del'>-                  set_hds_thresh_gt],</div><div class='add'>+                  set_hds_thresh_gt,</div><div class='add'>+                  set_xdp,</div><div class='add'>+                  enabled_set_xdp,</div><div class='add'>+                  ioctl,</div><div class='add'>+                  ioctl_set_xdp,</div><div class='add'>+                  ioctl_enabled_set_xdp],</div><div class='ctx'>                  args=(cfg, EthtoolFamily()))</div><div class='ctx'>     ksft_exit()</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/.gitignore b/tools/testing/selftests/drivers/net/hw/.gitignore<br/>index e9fe6ede681a..46540468a775 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/.gitignore?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/.gitignore</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/.gitignore</a></div><div class='hunk'>@@ -1 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+iou-zcrx</div><div class='ctx'> ncdevmem</div><div class='add'>+toeplitz</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/Makefile b/tools/testing/selftests/drivers/net/hw/Makefile<br/>index 21ba64ce1e34..9c163ba6feee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/Makefile</a></div><div class='hunk'>@@ -1,8 +1,26 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0+ OR MIT</div><div class='ctx'> </div><div class='add'>+# Check if io_uring supports zero-copy receive</div><div class='add'>+HAS_IOURING_ZCRX := $(shell \</div><div class='add'>+	echo -e '#include &lt;liburing.h&gt;\n' \</div><div class='add'>+	     'void *func = (void *)io_uring_register_ifq;\n' \</div><div class='add'>+	     'int main() {return 0;}' | \</div><div class='add'>+	$(CC) -luring -x c - -o /dev/null 2&gt;&amp;1 &amp;&amp; echo y)</div><div class='add'>+</div><div class='add'>+ifeq ($(HAS_IOURING_ZCRX),y)</div><div class='add'>+COND_GEN_FILES += iou-zcrx</div><div class='add'>+else</div><div class='add'>+$(warning excluding iouring tests, liburing not installed or too old)</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+TEST_GEN_FILES := \</div><div class='add'>+	$(COND_GEN_FILES) \</div><div class='add'>+# end of TEST_GEN_FILES</div><div class='add'>+</div><div class='ctx'> TEST_PROGS = \</div><div class='ctx'> 	csum.py \</div><div class='ctx'> 	devlink_port_split.py \</div><div class='add'>+	devlink_rate_tc_bw.py \</div><div class='ctx'> 	devmem.py \</div><div class='ctx'> 	ethtool.sh \</div><div class='ctx'> 	ethtool_extended_state.sh \</div><div class='hunk'>@@ -10,11 +28,18 @@ TEST_PROGS = \</div><div class='ctx'> 	ethtool_rmon.sh \</div><div class='ctx'> 	hw_stats_l3.sh \</div><div class='ctx'> 	hw_stats_l3_gre.sh \</div><div class='add'>+	iou-zcrx.py \</div><div class='add'>+	irq.py \</div><div class='ctx'> 	loopback.sh \</div><div class='del'>-	nic_link_layer.py \</div><div class='del'>-	nic_performance.py \</div><div class='add'>+	nic_timestamp.py \</div><div class='ctx'> 	pp_alloc_fail.py \</div><div class='add'>+	rss_api.py \</div><div class='ctx'> 	rss_ctx.py \</div><div class='add'>+	rss_flow_label.py \</div><div class='add'>+	rss_input_xfrm.py \</div><div class='add'>+	toeplitz.py \</div><div class='add'>+	tso.py \</div><div class='add'>+	xsk_reconfig.py \</div><div class='ctx'> 	#</div><div class='ctx'> </div><div class='ctx'> TEST_FILES := \</div><div class='hunk'>@@ -24,17 +49,31 @@ TEST_FILES := \</div><div class='ctx'> TEST_INCLUDES := \</div><div class='ctx'> 	$(wildcard lib/py/*.py ../lib/py/*.py) \</div><div class='ctx'> 	../../../net/lib.sh \</div><div class='del'>-	../../../net/forwarding/lib.sh \</div><div class='ctx'> 	../../../net/forwarding/ipip_lib.sh \</div><div class='add'>+	../../../net/forwarding/lib.sh \</div><div class='ctx'> 	../../../net/forwarding/tc_common.sh \</div><div class='ctx'> 	#</div><div class='ctx'> </div><div class='ctx'> # YNL files, must be before "include ..lib.mk"</div><div class='del'>-YNL_GEN_FILES := ncdevmem</div><div class='add'>+YNL_GEN_FILES := \</div><div class='add'>+	ncdevmem \</div><div class='add'>+	toeplitz \</div><div class='add'>+# end of YNL_GEN_FILES</div><div class='ctx'> TEST_GEN_FILES += $(YNL_GEN_FILES)</div><div class='add'>+TEST_GEN_FILES += $(patsubst %.c,%.o,$(wildcard *.bpf.c))</div><div class='ctx'> </div><div class='ctx'> include ../../../lib.mk</div><div class='ctx'> </div><div class='ctx'> # YNL build</div><div class='del'>-YNL_GENS := ethtool netdev</div><div class='add'>+YNL_GENS := \</div><div class='add'>+	ethtool \</div><div class='add'>+	netdev \</div><div class='add'>+# end of YNL_GENS</div><div class='add'>+</div><div class='ctx'> include ../../../net/ynl.mk</div><div class='add'>+</div><div class='add'>+include ../../../net/bpf.mk</div><div class='add'>+</div><div class='add'>+ifeq ($(HAS_IOURING_ZCRX),y)</div><div class='add'>+$(OUTPUT)/iou-zcrx: LDLIBS += -luring</div><div class='add'>+endif</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/config b/tools/testing/selftests/drivers/net/hw/config<br/>new file mode 100644<br/>index 000000000000..2307aa001be1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/config</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+CONFIG_FAIL_FUNCTION=y</div><div class='add'>+CONFIG_FAULT_INJECTION=y</div><div class='add'>+CONFIG_FAULT_INJECTION_DEBUG_FS=y</div><div class='add'>+CONFIG_FUNCTION_ERROR_INJECTION=y</div><div class='add'>+CONFIG_IO_URING=y</div><div class='add'>+CONFIG_IPV6=y</div><div class='add'>+CONFIG_IPV6_GRE=y</div><div class='add'>+CONFIG_NET_IPGRE=y</div><div class='add'>+CONFIG_NET_IPGRE_DEMUX=y</div><div class='add'>+CONFIG_UDMABUF=y</div><div class='add'>+CONFIG_VXLAN=y</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/csum.py b/tools/testing/selftests/drivers/net/hw/csum.py<br/>index cb40497faee4..3e3a89a34afe 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/csum.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/csum.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/csum.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/csum.py</a></div><div class='hunk'>@@ -9,41 +9,35 @@ from lib.py import ksft_run, ksft_exit, KsftSkipEx</div><div class='ctx'> from lib.py import EthtoolFamily, NetDrvEpEnv</div><div class='ctx'> from lib.py import bkg, cmd, wait_port_listen</div><div class='ctx'> </div><div class='del'>-def test_receive(cfg, ipv4=False, extra_args=None):</div><div class='add'>+def test_receive(cfg, ipver="6", extra_args=None):</div><div class='ctx'>     """Test local nic checksum receive. Remote host sends crafted packets."""</div><div class='ctx'>     if not cfg.have_rx_csum:</div><div class='ctx'>         raise KsftSkipEx(f"Test requires rx checksum offload on {cfg.ifname}")</div><div class='ctx'> </div><div class='del'>-    if ipv4:</div><div class='del'>-        ip_args = f"-4 -S {cfg.remote_v4} -D {cfg.v4}"</div><div class='del'>-    else:</div><div class='del'>-        ip_args = f"-6 -S {cfg.remote_v6} -D {cfg.v6}"</div><div class='add'>+    ip_args = f"-{ipver} -S {cfg.remote_addr_v[ipver]} -D {cfg.addr_v[ipver]}"</div><div class='ctx'> </div><div class='ctx'>     rx_cmd = f"{cfg.bin_local} -i {cfg.ifname} -n 100 {ip_args} -r 1 -R {extra_args}"</div><div class='del'>-    tx_cmd = f"{cfg.bin_remote} -i {cfg.ifname} -n 100 {ip_args} -r 1 -T {extra_args}"</div><div class='add'>+    tx_cmd = f"{cfg.bin_remote} -i {cfg.remote_ifname} -n 100 {ip_args} -r 1 -T {extra_args}"</div><div class='ctx'> </div><div class='ctx'>     with bkg(rx_cmd, exit_wait=True):</div><div class='ctx'>         wait_port_listen(34000, proto="udp")</div><div class='ctx'>         cmd(tx_cmd, host=cfg.remote)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-def test_transmit(cfg, ipv4=False, extra_args=None):</div><div class='add'>+def test_transmit(cfg, ipver="6", extra_args=None):</div><div class='ctx'>     """Test local nic checksum transmit. Remote host verifies packets."""</div><div class='ctx'>     if (not cfg.have_tx_csum_generic and</div><div class='del'>-        not (cfg.have_tx_csum_ipv4 and ipv4) and</div><div class='del'>-        not (cfg.have_tx_csum_ipv6 and not ipv4)):</div><div class='add'>+        not (cfg.have_tx_csum_ipv4 and ipver == "4") and</div><div class='add'>+        not (cfg.have_tx_csum_ipv6 and ipver == "6")):</div><div class='ctx'>         raise KsftSkipEx(f"Test requires tx checksum offload on {cfg.ifname}")</div><div class='ctx'> </div><div class='del'>-    if ipv4:</div><div class='del'>-        ip_args = f"-4 -S {cfg.v4} -D {cfg.remote_v4}"</div><div class='del'>-    else:</div><div class='del'>-        ip_args = f"-6 -S {cfg.v6} -D {cfg.remote_v6}"</div><div class='add'>+    ip_args = f"-{ipver} -S {cfg.addr_v[ipver]} -D {cfg.remote_addr_v[ipver]}"</div><div class='ctx'> </div><div class='ctx'>     # Cannot randomize input when calculating zero checksum</div><div class='ctx'>     if extra_args != "-U -Z":</div><div class='ctx'>         extra_args += " -r 1"</div><div class='ctx'> </div><div class='del'>-    rx_cmd = f"{cfg.bin_remote} -i {cfg.ifname} -L 1 -n 100 {ip_args} -R {extra_args}"</div><div class='add'>+    rx_cmd = f"{cfg.bin_remote} -i {cfg.remote_ifname} -L 1 -n 100 {ip_args} -R {extra_args}"</div><div class='ctx'>     tx_cmd = f"{cfg.bin_local} -i {cfg.ifname} -L 1 -n 100 {ip_args} -T {extra_args}"</div><div class='ctx'> </div><div class='ctx'>     with bkg(rx_cmd, host=cfg.remote, exit_wait=True):</div><div class='hunk'>@@ -51,26 +45,20 @@ def test_transmit(cfg, ipv4=False, extra_args=None):</div><div class='ctx'>         cmd(tx_cmd)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-def test_builder(name, cfg, ipv4=False, tx=False, extra_args=""):</div><div class='add'>+def test_builder(name, cfg, ipver="6", tx=False, extra_args=""):</div><div class='ctx'>     """Construct specific tests from the common template.</div><div class='ctx'> </div><div class='ctx'>        Most tests follow the same basic pattern, differing only in</div><div class='ctx'>        Direction of the test and optional flags passed to csum."""</div><div class='ctx'>     def f(cfg):</div><div class='del'>-        if ipv4:</div><div class='del'>-            cfg.require_v4()</div><div class='del'>-        else:</div><div class='del'>-            cfg.require_v6()</div><div class='add'>+        cfg.require_ipver(ipver)</div><div class='ctx'> </div><div class='ctx'>         if tx:</div><div class='del'>-            test_transmit(cfg, ipv4, extra_args)</div><div class='add'>+            test_transmit(cfg, ipver, extra_args)</div><div class='ctx'>         else:</div><div class='del'>-            test_receive(cfg, ipv4, extra_args)</div><div class='add'>+            test_receive(cfg, ipver, extra_args)</div><div class='ctx'> </div><div class='del'>-    if ipv4:</div><div class='del'>-        f.__name__ = "ipv4_" + name</div><div class='del'>-    else:</div><div class='del'>-        f.__name__ = "ipv6_" + name</div><div class='add'>+    f.__name__ = f"ipv{ipver}_" + name</div><div class='ctx'>     return f</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -100,19 +88,19 @@ def main() -&gt; None:</div><div class='ctx'>     with NetDrvEpEnv(__file__, nsim_test=False) as cfg:</div><div class='ctx'>         check_nic_features(cfg)</div><div class='ctx'> </div><div class='del'>-        cfg.bin_local = path.abspath(path.dirname(__file__) + "/../../../net/lib/csum")</div><div class='add'>+        cfg.bin_local = cfg.net_lib_dir / "csum"</div><div class='ctx'>         cfg.bin_remote = cfg.remote.deploy(cfg.bin_local)</div><div class='ctx'> </div><div class='ctx'>         cases = []</div><div class='del'>-        for ipv4 in [True, False]:</div><div class='del'>-            cases.append(test_builder("rx_tcp", cfg, ipv4, False, "-t"))</div><div class='del'>-            cases.append(test_builder("rx_tcp_invalid", cfg, ipv4, False, "-t -E"))</div><div class='add'>+        for ipver in ["4", "6"]:</div><div class='add'>+            cases.append(test_builder("rx_tcp", cfg, ipver, False, "-t"))</div><div class='add'>+            cases.append(test_builder("rx_tcp_invalid", cfg, ipver, False, "-t -E"))</div><div class='ctx'> </div><div class='del'>-            cases.append(test_builder("rx_udp", cfg, ipv4, False, ""))</div><div class='del'>-            cases.append(test_builder("rx_udp_invalid", cfg, ipv4, False, "-E"))</div><div class='add'>+            cases.append(test_builder("rx_udp", cfg, ipver, False, ""))</div><div class='add'>+            cases.append(test_builder("rx_udp_invalid", cfg, ipver, False, "-E"))</div><div class='ctx'> </div><div class='del'>-            cases.append(test_builder("tx_udp_csum_offload", cfg, ipv4, True, "-U"))</div><div class='del'>-            cases.append(test_builder("tx_udp_zero_checksum", cfg, ipv4, True, "-U -Z"))</div><div class='add'>+            cases.append(test_builder("tx_udp_csum_offload", cfg, ipver, True, "-U"))</div><div class='add'>+            cases.append(test_builder("tx_udp_zero_checksum", cfg, ipver, True, "-U -Z"))</div><div class='ctx'> </div><div class='ctx'>         ksft_run(cases=cases, args=(cfg, ))</div><div class='ctx'>     ksft_exit()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/devlink_rate_tc_bw.py b/tools/testing/selftests/drivers/net/hw/devlink_rate_tc_bw.py<br/>new file mode 100755<br/>index 000000000000..4e4faa9275bb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/devlink_rate_tc_bw.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/devlink_rate_tc_bw.py</a></div><div class='hunk'>@@ -0,0 +1,439 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+"""</div><div class='add'>+Devlink Rate TC Bandwidth Test Suite</div><div class='add'>+===================================</div><div class='add'>+</div><div class='add'>+This test suite verifies the functionality of devlink-rate traffic class (TC)</div><div class='add'>+bandwidth distribution in a virtualized environment. The tests validate that</div><div class='add'>+bandwidth can be properly allocated between different traffic classes and</div><div class='add'>+that TC mapping works as expected.</div><div class='add'>+</div><div class='add'>+Test Environment:</div><div class='add'>+----------------</div><div class='add'>+- Creates 1 VF</div><div class='add'>+- Establishes a bridge connecting the VF representor and the uplink representor</div><div class='add'>+- Sets up 2 VLAN interfaces on the VF with different VLAN IDs (101, 102)</div><div class='add'>+- Configures different traffic classes (TC3 and TC4) for each VLAN</div><div class='add'>+</div><div class='add'>+Test Cases:</div><div class='add'>+----------</div><div class='add'>+1. test_no_tc_mapping_bandwidth:</div><div class='add'>+   - Verifies that without TC mapping, bandwidth is NOT distributed according to</div><div class='add'>+     the configured 20/80 split between TC3 and TC4</div><div class='add'>+   - This test should fail if bandwidth matches the 20/80 split without TC</div><div class='add'>+     mapping</div><div class='add'>+   - Expected: Bandwidth should NOT be distributed as 20/80</div><div class='add'>+</div><div class='add'>+2. test_tc_mapping_bandwidth:</div><div class='add'>+   - Configures TC mapping using mqprio qdisc</div><div class='add'>+   - Verifies that with TC mapping, bandwidth IS distributed according to the</div><div class='add'>+     configured 20/80 split between TC3 and TC4</div><div class='add'>+   - Expected: Bandwidth should be distributed as 20/80</div><div class='add'>+</div><div class='add'>+Bandwidth Distribution:</div><div class='add'>+----------------------</div><div class='add'>+- TC3 (VLAN 101): Configured for 20% of total bandwidth</div><div class='add'>+- TC4 (VLAN 102): Configured for 80% of total bandwidth</div><div class='add'>+- Total bandwidth: 1Gbps</div><div class='add'>+- Tolerance: +-12%</div><div class='add'>+</div><div class='add'>+Hardware-Specific Behavior (mlx5):</div><div class='add'>+--------------------------</div><div class='add'>+mlx5 hardware enforces traffic class separation by ensuring that each transmit</div><div class='add'>+queue (SQ) is associated with a single TC. If a packet is sent on a queue that</div><div class='add'>+doesn't match the expected TC (based on DSCP or VLAN priority and hypervisor-set</div><div class='add'>+mapping), the hardware moves the queue to the correct TC scheduler to preserve</div><div class='add'>+traffic isolation.</div><div class='add'>+</div><div class='add'>+This behavior means that even without explicit TC-to-queue mapping, bandwidth</div><div class='add'>+enforcement may still appear to work—because the hardware dynamically adjusts</div><div class='add'>+the scheduling context. However, this can lead to performance issues in high</div><div class='add'>+rates and HOL blocking if traffic from different TCs is mixed on the same queue.</div><div class='add'>+"""</div><div class='add'>+</div><div class='add'>+import json</div><div class='add'>+import os</div><div class='add'>+import subprocess</div><div class='add'>+import threading</div><div class='add'>+import time</div><div class='add'>+</div><div class='add'>+from lib.py import ksft_pr, ksft_run, ksft_exit</div><div class='add'>+from lib.py import KsftSkipEx, KsftFailEx, KsftXfailEx</div><div class='add'>+from lib.py import NetDrvEpEnv, DevlinkFamily</div><div class='add'>+from lib.py import NlError</div><div class='add'>+from lib.py import cmd, defer, ethtool, ip</div><div class='add'>+from lib.py import Iperf3Runner</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+class BandwidthValidator:</div><div class='add'>+    """</div><div class='add'>+    Validates total bandwidth and individual shares with tolerance</div><div class='add'>+    relative to the overall total.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    def __init__(self, shares):</div><div class='add'>+        self.tolerance_percent = 12</div><div class='add'>+        self.expected_total = sum(shares.values())</div><div class='add'>+        self.bounds = {}</div><div class='add'>+</div><div class='add'>+        for name, exp in shares.items():</div><div class='add'>+            self.bounds[name] = (self.min_expected(exp), self.max_expected(exp))</div><div class='add'>+</div><div class='add'>+    def min_expected(self, value):</div><div class='add'>+        """Calculates the minimum acceptable value based on tolerance."""</div><div class='add'>+        return value - (self.expected_total * self.tolerance_percent / 100)</div><div class='add'>+</div><div class='add'>+    def max_expected(self, value):</div><div class='add'>+        """Calculates the maximum acceptable value based on tolerance."""</div><div class='add'>+        return value + (self.expected_total * self.tolerance_percent / 100)</div><div class='add'>+</div><div class='add'>+    def bound(self, values):</div><div class='add'>+        """</div><div class='add'>+        Return True if all given values fall within tolerance.</div><div class='add'>+        """</div><div class='add'>+        for name, value in values.items():</div><div class='add'>+            low, high = self.bounds[name]</div><div class='add'>+            if not low &lt;= value &lt;= high:</div><div class='add'>+                return False</div><div class='add'>+        return True</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def setup_vf(cfg, set_tc_mapping=True):</div><div class='add'>+    """</div><div class='add'>+    Sets up a VF on the given network interface.</div><div class='add'>+</div><div class='add'>+    Enables SR-IOV and switchdev mode, brings the VF interface up,</div><div class='add'>+    and optionally configures TC mapping using mqprio.</div><div class='add'>+    """</div><div class='add'>+    try:</div><div class='add'>+        cmd(f"devlink dev eswitch set pci/{cfg.pci} mode switchdev")</div><div class='add'>+        defer(cmd, f"devlink dev eswitch set pci/{cfg.pci} mode legacy")</div><div class='add'>+    except Exception as exc:</div><div class='add'>+        raise KsftSkipEx(f"Failed to enable switchdev mode on {cfg.pci}") from exc</div><div class='add'>+    try:</div><div class='add'>+        cmd(f"echo 1 &gt; /sys/class/net/{cfg.ifname}/device/sriov_numvfs", shell=True)</div><div class='add'>+        defer(cmd, f"echo 0 &gt; /sys/class/net/{cfg.ifname}/device/sriov_numvfs", shell=True)</div><div class='add'>+    except Exception as exc:</div><div class='add'>+        raise KsftSkipEx(f"Failed to enable SR-IOV on {cfg.ifname}") from exc</div><div class='add'>+</div><div class='add'>+    time.sleep(2)</div><div class='add'>+    vf_ifc = (os.listdir(</div><div class='add'>+        f"/sys/class/net/{cfg.ifname}/device/virtfn0/net") or [None])[0]</div><div class='add'>+    if vf_ifc:</div><div class='add'>+        ip(f"link set dev {vf_ifc} up")</div><div class='add'>+    else:</div><div class='add'>+        raise KsftSkipEx("VF interface not found")</div><div class='add'>+    if set_tc_mapping:</div><div class='add'>+        cmd(f"tc qdisc add dev {vf_ifc} root handle 5 mqprio mode dcb hw 1 num_tc 8")</div><div class='add'>+</div><div class='add'>+    return vf_ifc</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def setup_vlans_on_vf(vf_ifc):</div><div class='add'>+    """</div><div class='add'>+    Sets up two VLAN interfaces on the given VF, each mapped to a different TC.</div><div class='add'>+    """</div><div class='add'>+    vlan_configs = [</div><div class='add'>+        {"vlan_id": 101, "tc": 3, "ip": "198.51.100.1"},</div><div class='add'>+        {"vlan_id": 102, "tc": 4, "ip": "198.51.100.9"},</div><div class='add'>+    ]</div><div class='add'>+</div><div class='add'>+    for config in vlan_configs:</div><div class='add'>+        vlan_dev = f"{vf_ifc}.{config['vlan_id']}"</div><div class='add'>+        ip(f"link add link {vf_ifc} name {vlan_dev} type vlan id {config['vlan_id']}")</div><div class='add'>+        ip(f"addr add {config['ip']}/29 dev {vlan_dev}")</div><div class='add'>+        ip(f"link set dev {vlan_dev} up")</div><div class='add'>+        ip(f"link set dev {vlan_dev} type vlan egress-qos-map 0:{config['tc']}")</div><div class='add'>+        ksft_pr(f"Created VLAN {vlan_dev} on {vf_ifc} with tc {config['tc']} and IP {config['ip']}")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def get_vf_info(cfg):</div><div class='add'>+    """</div><div class='add'>+    Finds the VF representor interface and devlink port index</div><div class='add'>+    for the given PCI device used in the test environment.</div><div class='add'>+    """</div><div class='add'>+    cfg.vf_representor = None</div><div class='add'>+    cfg.vf_port_index = None</div><div class='add'>+    out = subprocess.check_output(["devlink", "-j", "port", "show"], encoding="utf-8")</div><div class='add'>+    ports = json.loads(out)["port"]</div><div class='add'>+</div><div class='add'>+    for port_name, props in ports.items():</div><div class='add'>+        netdev = props.get("netdev")</div><div class='add'>+</div><div class='add'>+        if (port_name.startswith(f"pci/{cfg.pci}/") and</div><div class='add'>+            props.get("vfnum") == 0):</div><div class='add'>+            cfg.vf_representor = netdev</div><div class='add'>+            cfg.vf_port_index = int(port_name.split("/")[-1])</div><div class='add'>+            break</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def setup_bridge(cfg):</div><div class='add'>+    """</div><div class='add'>+    Creates and configures a Linux bridge, with both the uplink</div><div class='add'>+    and VF representor interfaces attached to it.</div><div class='add'>+    """</div><div class='add'>+    bridge_name = f"br_{os.getpid()}"</div><div class='add'>+    ip(f"link add name {bridge_name} type bridge")</div><div class='add'>+    defer(cmd, f"ip link del name {bridge_name} type bridge")</div><div class='add'>+</div><div class='add'>+    ip(f"link set dev {cfg.ifname} master {bridge_name}")</div><div class='add'>+</div><div class='add'>+    rep_name = cfg.vf_representor</div><div class='add'>+    if rep_name:</div><div class='add'>+        ip(f"link set dev {rep_name} master {bridge_name}")</div><div class='add'>+        ip(f"link set dev {rep_name} up")</div><div class='add'>+        ksft_pr(f"Set representor {rep_name} up and added to bridge")</div><div class='add'>+    else:</div><div class='add'>+        raise KsftSkipEx("Could not find representor for the VF")</div><div class='add'>+</div><div class='add'>+    ip(f"link set dev {bridge_name} up")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def setup_devlink_rate(cfg):</div><div class='add'>+    """</div><div class='add'>+    Configures devlink rate tx_max and traffic class bandwidth for the VF.</div><div class='add'>+    """</div><div class='add'>+    port_index = cfg.vf_port_index</div><div class='add'>+    if port_index is None:</div><div class='add'>+        raise KsftSkipEx("Could not find VF port index")</div><div class='add'>+    try:</div><div class='add'>+        cfg.devnl.rate_set({</div><div class='add'>+            "bus-name": "pci",</div><div class='add'>+            "dev-name": cfg.pci,</div><div class='add'>+            "port-index": port_index,</div><div class='add'>+            "rate-tx-max": 125000000,</div><div class='add'>+            "rate-tc-bws": [</div><div class='add'>+                {"index": 0, "bw": 0},</div><div class='add'>+                {"index": 1, "bw": 0},</div><div class='add'>+                {"index": 2, "bw": 0},</div><div class='add'>+                {"index": 3, "bw": 20},</div><div class='add'>+                {"index": 4, "bw": 80},</div><div class='add'>+                {"index": 5, "bw": 0},</div><div class='add'>+                {"index": 6, "bw": 0},</div><div class='add'>+                {"index": 7, "bw": 0},</div><div class='add'>+            ]</div><div class='add'>+        })</div><div class='add'>+    except NlError as exc:</div><div class='add'>+        if exc.error == 95:  # EOPNOTSUPP</div><div class='add'>+            raise KsftSkipEx("devlink rate configuration is not supported on the VF") from exc</div><div class='add'>+        raise KsftFailEx(f"rate_set failed on VF port {port_index}") from exc</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def setup_remote_vlans(cfg):</div><div class='add'>+    """</div><div class='add'>+    Sets up VLAN interfaces on the remote side.</div><div class='add'>+    """</div><div class='add'>+    remote_dev = cfg.remote_ifname</div><div class='add'>+    vlan_ids = [101, 102]</div><div class='add'>+    remote_ips = ["198.51.100.2", "198.51.100.10"]</div><div class='add'>+</div><div class='add'>+    for vlan_id, ip_addr in zip(vlan_ids, remote_ips):</div><div class='add'>+        vlan_dev = f"{remote_dev}.{vlan_id}"</div><div class='add'>+        cmd(f"ip link add link {remote_dev} name {vlan_dev} "</div><div class='add'>+            f"type vlan id {vlan_id}", host=cfg.remote)</div><div class='add'>+        cmd(f"ip addr add {ip_addr}/29 dev {vlan_dev}", host=cfg.remote)</div><div class='add'>+        cmd(f"ip link set dev {vlan_dev} up", host=cfg.remote)</div><div class='add'>+        defer(cmd, f"ip link del {vlan_dev}", host=cfg.remote)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def setup_test_environment(cfg, set_tc_mapping=True):</div><div class='add'>+    """</div><div class='add'>+    Sets up the complete test environment including VF creation, VLANs,</div><div class='add'>+    bridge configuration and devlink rate setup.</div><div class='add'>+    """</div><div class='add'>+    vf_ifc = setup_vf(cfg, set_tc_mapping)</div><div class='add'>+    ksft_pr(f"Created VF interface: {vf_ifc}")</div><div class='add'>+</div><div class='add'>+    setup_vlans_on_vf(vf_ifc)</div><div class='add'>+</div><div class='add'>+    get_vf_info(cfg)</div><div class='add'>+    setup_bridge(cfg)</div><div class='add'>+</div><div class='add'>+    setup_devlink_rate(cfg)</div><div class='add'>+    setup_remote_vlans(cfg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def measure_bandwidth(cfg, server_ip, client_ip, barrier):</div><div class='add'>+    """</div><div class='add'>+    Synchronizes with peers and runs an iperf3-based bandwidth measurement</div><div class='add'>+    between the given endpoints. Returns average Gbps.</div><div class='add'>+    """</div><div class='add'>+    runner = Iperf3Runner(cfg, server_ip=server_ip, client_ip=client_ip)</div><div class='add'>+    try:</div><div class='add'>+        barrier.wait(timeout=10)</div><div class='add'>+    except Exception as exc:</div><div class='add'>+        raise KsftFailEx("iperf3 barrier wait timed") from exc</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        bw_gbps = runner.measure_bandwidth(reverse=True)</div><div class='add'>+    except Exception as exc:</div><div class='add'>+        raise KsftFailEx("iperf3 bandwidth measurement failed") from exc</div><div class='add'>+</div><div class='add'>+    return bw_gbps</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def run_bandwidth_test(cfg):</div><div class='add'>+    """</div><div class='add'>+    Runs parallel bandwidth measurements for each VLAN/TC pair and collects results.</div><div class='add'>+    """</div><div class='add'>+    def _run_measure_bandwidth_thread(local_ip, remote_ip, results, barrier, tc_ix):</div><div class='add'>+        results[tc_ix] = measure_bandwidth(cfg, local_ip, remote_ip, barrier)</div><div class='add'>+</div><div class='add'>+    vf_vlan_data = [</div><div class='add'>+        # (local_ip, remote_ip, TC)</div><div class='add'>+        ("198.51.100.1",  "198.51.100.2", 3),</div><div class='add'>+        ("198.51.100.9", "198.51.100.10", 4),</div><div class='add'>+    ]</div><div class='add'>+</div><div class='add'>+    results = {}</div><div class='add'>+    threads = []</div><div class='add'>+    start_barrier = threading.Barrier(len(vf_vlan_data))</div><div class='add'>+</div><div class='add'>+    for local_ip, remote_ip, tc_ix in vf_vlan_data:</div><div class='add'>+        thread = threading.Thread(</div><div class='add'>+            target=_run_measure_bandwidth_thread,</div><div class='add'>+            args=(local_ip, remote_ip, results, start_barrier, tc_ix)</div><div class='add'>+        )</div><div class='add'>+        thread.start()</div><div class='add'>+        threads.append(thread)</div><div class='add'>+</div><div class='add'>+    for thread in threads:</div><div class='add'>+        thread.join()</div><div class='add'>+</div><div class='add'>+    for tc_ix, tc_bw in results.items():</div><div class='add'>+        if tc_bw is None:</div><div class='add'>+            raise KsftFailEx("iperf3 failed; cannot evaluate bandwidth")</div><div class='add'>+</div><div class='add'>+    return results</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def calculate_bandwidth_percentages(results):</div><div class='add'>+    """</div><div class='add'>+    Calculates the percentage of total bandwidth received by TC3 and TC4.</div><div class='add'>+    """</div><div class='add'>+    if 3 not in results or 4 not in results:</div><div class='add'>+        raise KsftFailEx(f"Missing expected TC results in {results}")</div><div class='add'>+</div><div class='add'>+    tc3_bw = results[3]</div><div class='add'>+    tc4_bw = results[4]</div><div class='add'>+    total_bw = tc3_bw + tc4_bw</div><div class='add'>+    tc3_percentage = (tc3_bw / total_bw) * 100</div><div class='add'>+    tc4_percentage = (tc4_bw / total_bw) * 100</div><div class='add'>+</div><div class='add'>+    return {</div><div class='add'>+        'tc3_bw': tc3_bw,</div><div class='add'>+        'tc4_bw': tc4_bw,</div><div class='add'>+        'tc3_percentage': tc3_percentage,</div><div class='add'>+        'tc4_percentage': tc4_percentage,</div><div class='add'>+        'total_bw': total_bw</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def print_bandwidth_results(bw_data, test_name):</div><div class='add'>+    """</div><div class='add'>+    Prints bandwidth measurements and TC usage summary for a given test.</div><div class='add'>+    """</div><div class='add'>+    ksft_pr(f"Bandwidth check results {test_name}:")</div><div class='add'>+    ksft_pr(f"TC 3: {bw_data['tc3_bw']:.2f} Gbits/sec")</div><div class='add'>+    ksft_pr(f"TC 4: {bw_data['tc4_bw']:.2f} Gbits/sec")</div><div class='add'>+    ksft_pr(f"Total bandwidth: {bw_data['total_bw']:.2f} Gbits/sec")</div><div class='add'>+    ksft_pr(f"TC 3 percentage: {bw_data['tc3_percentage']:.1f}%")</div><div class='add'>+    ksft_pr(f"TC 4 percentage: {bw_data['tc4_percentage']:.1f}%")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def verify_total_bandwidth(bw_data, validator):</div><div class='add'>+    """</div><div class='add'>+    Ensures the total measured bandwidth falls within the acceptable tolerance.</div><div class='add'>+    """</div><div class='add'>+    total = bw_data['total_bw']</div><div class='add'>+</div><div class='add'>+    if validator.bound({"total": total}):</div><div class='add'>+        return</div><div class='add'>+</div><div class='add'>+    low, high = validator.bounds["total"]</div><div class='add'>+</div><div class='add'>+    if total &lt; low:</div><div class='add'>+        raise KsftSkipEx(</div><div class='add'>+            f"Total bandwidth {total:.2f} Gbps &lt; minimum "</div><div class='add'>+            f"{low:.2f} Gbps; "</div><div class='add'>+            f"parent tx_max ({validator.expected_total:.1f} G) "</div><div class='add'>+            f"not reached, cannot validate share"</div><div class='add'>+        )</div><div class='add'>+</div><div class='add'>+    raise KsftFailEx(</div><div class='add'>+        f"Total bandwidth {total:.2f} Gbps exceeds allowed ceiling "</div><div class='add'>+        f"{high:.2f} Gbps "</div><div class='add'>+        f"(VF tx_max set to {validator.expected_total:.1f} G)"</div><div class='add'>+    )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def run_bandwidth_distribution_test(cfg, set_tc_mapping):</div><div class='add'>+    """</div><div class='add'>+    Runs parallel bandwidth measurements for both TCs and collects results.</div><div class='add'>+    """</div><div class='add'>+    setup_test_environment(cfg, set_tc_mapping)</div><div class='add'>+    bandwidths = run_bandwidth_test(cfg)</div><div class='add'>+    bw_data = calculate_bandwidth_percentages(bandwidths)</div><div class='add'>+    test_name = "with TC mapping" if set_tc_mapping else "without TC mapping"</div><div class='add'>+    print_bandwidth_results(bw_data, test_name)</div><div class='add'>+</div><div class='add'>+    verify_total_bandwidth(bw_data, cfg.traffic_bw_validator)</div><div class='add'>+</div><div class='add'>+    return cfg.tc_bw_validator.bound({"tc3": bw_data['tc3_percentage'],</div><div class='add'>+                                     "tc4": bw_data['tc4_percentage']})</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_no_tc_mapping_bandwidth(cfg):</div><div class='add'>+    """</div><div class='add'>+    Verifies that bandwidth is not split 20/80 without traffic class mapping.</div><div class='add'>+    """</div><div class='add'>+    pass_bw_msg = "Bandwidth is NOT distributed as 20/80 without TC mapping"</div><div class='add'>+    fail_bw_msg = "Bandwidth matched 20/80 split without TC mapping"</div><div class='add'>+    is_mlx5 = "driver: mlx5" in ethtool(f"-i {cfg.ifname}").stdout</div><div class='add'>+</div><div class='add'>+    if run_bandwidth_distribution_test(cfg, set_tc_mapping=False):</div><div class='add'>+        if is_mlx5:</div><div class='add'>+            raise KsftXfailEx(fail_bw_msg)</div><div class='add'>+        raise KsftFailEx(fail_bw_msg)</div><div class='add'>+    if is_mlx5:</div><div class='add'>+        raise KsftFailEx("mlx5 behavior changed:" + pass_bw_msg)</div><div class='add'>+    ksft_pr(pass_bw_msg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_tc_mapping_bandwidth(cfg):</div><div class='add'>+    """</div><div class='add'>+    Verifies that bandwidth is correctly split 20/80 between TC3 and TC4</div><div class='add'>+    when traffic class mapping is set.</div><div class='add'>+    """</div><div class='add'>+    if run_bandwidth_distribution_test(cfg, set_tc_mapping=True):</div><div class='add'>+        ksft_pr("Bandwidth is distributed as 20/80 with TC mapping")</div><div class='add'>+    else:</div><div class='add'>+        raise KsftFailEx("Bandwidth did not match 20/80 split with TC mapping")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Main entry point for running the test cases.</div><div class='add'>+    """</div><div class='add'>+    with NetDrvEpEnv(__file__, nsim_test=False) as cfg:</div><div class='add'>+        cfg.devnl = DevlinkFamily()</div><div class='add'>+</div><div class='add'>+        cfg.pci = os.path.basename(</div><div class='add'>+            os.path.realpath(f"/sys/class/net/{cfg.ifname}/device")</div><div class='add'>+        )</div><div class='add'>+        if not cfg.pci:</div><div class='add'>+            raise KsftSkipEx("Could not get PCI address of the interface")</div><div class='add'>+</div><div class='add'>+        cfg.traffic_bw_validator = BandwidthValidator({"total": 1})</div><div class='add'>+        cfg.tc_bw_validator = BandwidthValidator({"tc3": 20, "tc4": 80})</div><div class='add'>+</div><div class='add'>+        cases = [test_no_tc_mapping_bandwidth, test_tc_mapping_bandwidth]</div><div class='add'>+</div><div class='add'>+        ksft_run(cases=cases, args=(cfg,))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/devmem.py b/tools/testing/selftests/drivers/net/hw/devmem.py<br/>index 1223f0f5c10c..45c2d49d55b6 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/devmem.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/devmem.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/devmem.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/devmem.py</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> #!/usr/bin/env python3</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+from os import path</div><div class='ctx'> from lib.py import ksft_run, ksft_exit</div><div class='ctx'> from lib.py import ksft_eq, KsftSkipEx</div><div class='ctx'> from lib.py import NetDrvEpEnv</div><div class='hunk'>@@ -10,8 +11,7 @@ from lib.py import ksft_disruptive</div><div class='ctx'> </div><div class='ctx'> def require_devmem(cfg):</div><div class='ctx'>     if not hasattr(cfg, "_devmem_probed"):</div><div class='del'>-        port = rand_port()</div><div class='del'>-        probe_command = f"./ncdevmem -f {cfg.ifname}"</div><div class='add'>+        probe_command = f"{cfg.bin_local} -f {cfg.ifname}"</div><div class='ctx'>         cfg._devmem_supported = cmd(probe_command, fail=False, shell=True).ret == 0</div><div class='ctx'>         cfg._devmem_probed = True</div><div class='ctx'> </div><div class='hunk'>@@ -21,22 +21,54 @@ def require_devmem(cfg):</div><div class='ctx'> </div><div class='ctx'> @ksft_disruptive</div><div class='ctx'> def check_rx(cfg) -&gt; None:</div><div class='del'>-    cfg.require_v6()</div><div class='ctx'>     require_devmem(cfg)</div><div class='ctx'> </div><div class='ctx'>     port = rand_port()</div><div class='del'>-    listen_cmd = f"./ncdevmem -l -f {cfg.ifname} -s {cfg.v6} -p {port}"</div><div class='add'>+    socat = f"socat -u - TCP{cfg.addr_ipver}:{cfg.baddr}:{port},bind={cfg.remote_baddr}:{port}"</div><div class='add'>+    listen_cmd = f"{cfg.bin_local} -l -f {cfg.ifname} -s {cfg.addr} -p {port} -c {cfg.remote_addr} -v 7"</div><div class='ctx'> </div><div class='del'>-    with bkg(listen_cmd) as socat:</div><div class='add'>+    with bkg(listen_cmd, exit_wait=True) as ncdevmem:</div><div class='ctx'>         wait_port_listen(port)</div><div class='del'>-        cmd(f"echo -e \"hello\\nworld\"| socat -u - TCP6:[{cfg.v6}]:{port}", host=cfg.remote, shell=True)</div><div class='add'>+        cmd(f"yes $(echo -e \x01\x02\x03\x04\x05\x06) | \</div><div class='add'>+            head -c 1K | {socat}", host=cfg.remote, shell=True)</div><div class='add'>+</div><div class='add'>+    ksft_eq(ncdevmem.ret, 0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+@ksft_disruptive</div><div class='add'>+def check_tx(cfg) -&gt; None:</div><div class='add'>+    require_devmem(cfg)</div><div class='add'>+</div><div class='add'>+    port = rand_port()</div><div class='add'>+    listen_cmd = f"socat -U - TCP{cfg.addr_ipver}-LISTEN:{port}"</div><div class='add'>+</div><div class='add'>+    with bkg(listen_cmd, host=cfg.remote, exit_wait=True) as socat:</div><div class='add'>+        wait_port_listen(port, host=cfg.remote)</div><div class='add'>+        cmd(f"echo -e \"hello\\nworld\"| {cfg.bin_local} -f {cfg.ifname} -s {cfg.remote_addr} -p {port}", shell=True)</div><div class='add'>+</div><div class='add'>+    ksft_eq(socat.stdout.strip(), "hello\nworld")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+@ksft_disruptive</div><div class='add'>+def check_tx_chunks(cfg) -&gt; None:</div><div class='add'>+    require_devmem(cfg)</div><div class='add'>+</div><div class='add'>+    port = rand_port()</div><div class='add'>+    listen_cmd = f"socat -U - TCP{cfg.addr_ipver}-LISTEN:{port}"</div><div class='add'>+</div><div class='add'>+    with bkg(listen_cmd, host=cfg.remote, exit_wait=True) as socat:</div><div class='add'>+        wait_port_listen(port, host=cfg.remote)</div><div class='add'>+        cmd(f"echo -e \"hello\\nworld\"| {cfg.bin_local} -f {cfg.ifname} -s {cfg.remote_addr} -p {port} -z 3", shell=True)</div><div class='ctx'> </div><div class='ctx'>     ksft_eq(socat.stdout.strip(), "hello\nworld")</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> def main() -&gt; None:</div><div class='ctx'>     with NetDrvEpEnv(__file__) as cfg:</div><div class='del'>-        ksft_run([check_rx],</div><div class='add'>+        cfg.bin_local = path.abspath(path.dirname(__file__) + "/ncdevmem")</div><div class='add'>+        cfg.bin_remote = cfg.remote.deploy(cfg.bin_local)</div><div class='add'>+</div><div class='add'>+        ksft_run([check_rx, check_tx, check_tx_chunks],</div><div class='ctx'>                  args=(cfg, ))</div><div class='ctx'>     ksft_exit()</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c b/tools/testing/selftests/drivers/net/hw/iou-zcrx.c<br/>new file mode 100644<br/>index 000000000000..62456df947bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/iou-zcrx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/iou-zcrx.c</a></div><div class='hunk'>@@ -0,0 +1,464 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;assert.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;error.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;limits.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;stdint.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;arpa/inet.h&gt;</div><div class='add'>+#include &lt;linux/errqueue.h&gt;</div><div class='add'>+#include &lt;linux/if_packet.h&gt;</div><div class='add'>+#include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;linux/sockios.h&gt;</div><div class='add'>+#include &lt;net/ethernet.h&gt;</div><div class='add'>+#include &lt;net/if.h&gt;</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+#include &lt;netinet/ip.h&gt;</div><div class='add'>+#include &lt;netinet/ip6.h&gt;</div><div class='add'>+#include &lt;netinet/tcp.h&gt;</div><div class='add'>+#include &lt;netinet/udp.h&gt;</div><div class='add'>+#include &lt;sys/epoll.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+#include &lt;sys/resource.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/un.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;liburing.h&gt;</div><div class='add'>+</div><div class='add'>+static long page_size;</div><div class='add'>+#define AREA_SIZE (8192 * page_size)</div><div class='add'>+#define SEND_SIZE (512 * 4096)</div><div class='add'>+#define min(a, b) \</div><div class='add'>+	({ \</div><div class='add'>+		typeof(a) _a = (a); \</div><div class='add'>+		typeof(b) _b = (b); \</div><div class='add'>+		_a &lt; _b ? _a : _b; \</div><div class='add'>+	})</div><div class='add'>+#define min_t(t, a, b) \</div><div class='add'>+	({ \</div><div class='add'>+		t _ta = (a); \</div><div class='add'>+		t _tb = (b); \</div><div class='add'>+		min(_ta, _tb); \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define ALIGN_UP(v, align) (((v) + (align) - 1) &amp; ~((align) - 1))</div><div class='add'>+</div><div class='add'>+static int cfg_server;</div><div class='add'>+static int cfg_client;</div><div class='add'>+static int cfg_port = 8000;</div><div class='add'>+static int cfg_payload_len;</div><div class='add'>+static const char *cfg_ifname;</div><div class='add'>+static int cfg_queue_id = -1;</div><div class='add'>+static bool cfg_oneshot;</div><div class='add'>+static int cfg_oneshot_recvs;</div><div class='add'>+static int cfg_send_size = SEND_SIZE;</div><div class='add'>+static struct sockaddr_in6 cfg_addr;</div><div class='add'>+</div><div class='add'>+static char *payload;</div><div class='add'>+static void *area_ptr;</div><div class='add'>+static void *ring_ptr;</div><div class='add'>+static size_t ring_size;</div><div class='add'>+static struct io_uring_zcrx_rq rq_ring;</div><div class='add'>+static unsigned long area_token;</div><div class='add'>+static int connfd;</div><div class='add'>+static bool stop;</div><div class='add'>+static size_t received;</div><div class='add'>+</div><div class='add'>+static unsigned long gettimeofday_ms(void)</div><div class='add'>+{</div><div class='add'>+	struct timeval tv;</div><div class='add'>+</div><div class='add'>+	gettimeofday(&amp;tv, NULL);</div><div class='add'>+	return (tv.tv_sec * 1000) + (tv.tv_usec / 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_address(const char *str, int port, struct sockaddr_in6 *sin6)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sin6-&gt;sin6_family = AF_INET6;</div><div class='add'>+	sin6-&gt;sin6_port = htons(port);</div><div class='add'>+</div><div class='add'>+	ret = inet_pton(sin6-&gt;sin6_family, str, &amp;sin6-&gt;sin6_addr);</div><div class='add'>+	if (ret != 1) {</div><div class='add'>+		/* fallback to plain IPv4 */</div><div class='add'>+		ret = inet_pton(AF_INET, str, &amp;sin6-&gt;sin6_addr.s6_addr32[3]);</div><div class='add'>+		if (ret != 1)</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		/* add ::ffff prefix */</div><div class='add'>+		sin6-&gt;sin6_addr.s6_addr32[0] = 0;</div><div class='add'>+		sin6-&gt;sin6_addr.s6_addr32[1] = 0;</div><div class='add'>+		sin6-&gt;sin6_addr.s6_addr16[4] = 0;</div><div class='add'>+		sin6-&gt;sin6_addr.s6_addr16[5] = 0xffff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline size_t get_refill_ring_size(unsigned int rq_entries)</div><div class='add'>+{</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	ring_size = rq_entries * sizeof(struct io_uring_zcrx_rqe);</div><div class='add'>+	/* add space for the header (head/tail/etc.) */</div><div class='add'>+	ring_size += page_size;</div><div class='add'>+	return ALIGN_UP(ring_size, page_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_zcrx(struct io_uring *ring)</div><div class='add'>+{</div><div class='add'>+	unsigned int ifindex;</div><div class='add'>+	unsigned int rq_entries = 4096;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ifindex = if_nametoindex(cfg_ifname);</div><div class='add'>+	if (!ifindex)</div><div class='add'>+		error(1, 0, "bad interface name: %s", cfg_ifname);</div><div class='add'>+</div><div class='add'>+	area_ptr = mmap(NULL,</div><div class='add'>+			AREA_SIZE,</div><div class='add'>+			PROT_READ | PROT_WRITE,</div><div class='add'>+			MAP_ANONYMOUS | MAP_PRIVATE,</div><div class='add'>+			0,</div><div class='add'>+			0);</div><div class='add'>+	if (area_ptr == MAP_FAILED)</div><div class='add'>+		error(1, 0, "mmap(): zero copy area");</div><div class='add'>+</div><div class='add'>+	ring_size = get_refill_ring_size(rq_entries);</div><div class='add'>+	ring_ptr = mmap(NULL,</div><div class='add'>+			ring_size,</div><div class='add'>+			PROT_READ | PROT_WRITE,</div><div class='add'>+			MAP_ANONYMOUS | MAP_PRIVATE,</div><div class='add'>+			0,</div><div class='add'>+			0);</div><div class='add'>+</div><div class='add'>+	struct io_uring_region_desc region_reg = {</div><div class='add'>+		.size = ring_size,</div><div class='add'>+		.user_addr = (__u64)(unsigned long)ring_ptr,</div><div class='add'>+		.flags = IORING_MEM_REGION_TYPE_USER,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	struct io_uring_zcrx_area_reg area_reg = {</div><div class='add'>+		.addr = (__u64)(unsigned long)area_ptr,</div><div class='add'>+		.len = AREA_SIZE,</div><div class='add'>+		.flags = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	struct io_uring_zcrx_ifq_reg reg = {</div><div class='add'>+		.if_idx = ifindex,</div><div class='add'>+		.if_rxq = cfg_queue_id,</div><div class='add'>+		.rq_entries = rq_entries,</div><div class='add'>+		.area_ptr = (__u64)(unsigned long)&amp;area_reg,</div><div class='add'>+		.region_ptr = (__u64)(unsigned long)&amp;region_reg,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ret = io_uring_register_ifq(ring, &amp;reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		error(1, 0, "io_uring_register_ifq(): %d", ret);</div><div class='add'>+</div><div class='add'>+	rq_ring.khead = (unsigned int *)((char *)ring_ptr + reg.offsets.head);</div><div class='add'>+	rq_ring.ktail = (unsigned int *)((char *)ring_ptr + reg.offsets.tail);</div><div class='add'>+	rq_ring.rqes = (struct io_uring_zcrx_rqe *)((char *)ring_ptr + reg.offsets.rqes);</div><div class='add'>+	rq_ring.rq_tail = 0;</div><div class='add'>+	rq_ring.ring_entries = reg.rq_entries;</div><div class='add'>+</div><div class='add'>+	area_token = area_reg.rq_area_token;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_accept(struct io_uring *ring, int sockfd)</div><div class='add'>+{</div><div class='add'>+	struct io_uring_sqe *sqe;</div><div class='add'>+</div><div class='add'>+	sqe = io_uring_get_sqe(ring);</div><div class='add'>+</div><div class='add'>+	io_uring_prep_accept(sqe, sockfd, NULL, NULL, 0);</div><div class='add'>+	sqe-&gt;user_data = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_recvzc(struct io_uring *ring, int sockfd)</div><div class='add'>+{</div><div class='add'>+	struct io_uring_sqe *sqe;</div><div class='add'>+</div><div class='add'>+	sqe = io_uring_get_sqe(ring);</div><div class='add'>+</div><div class='add'>+	io_uring_prep_rw(IORING_OP_RECV_ZC, sqe, sockfd, NULL, 0, 0);</div><div class='add'>+	sqe-&gt;ioprio |= IORING_RECV_MULTISHOT;</div><div class='add'>+	sqe-&gt;user_data = 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_recvzc_oneshot(struct io_uring *ring, int sockfd, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct io_uring_sqe *sqe;</div><div class='add'>+</div><div class='add'>+	sqe = io_uring_get_sqe(ring);</div><div class='add'>+</div><div class='add'>+	io_uring_prep_rw(IORING_OP_RECV_ZC, sqe, sockfd, NULL, len, 0);</div><div class='add'>+	sqe-&gt;ioprio |= IORING_RECV_MULTISHOT;</div><div class='add'>+	sqe-&gt;user_data = 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_accept(struct io_uring *ring, struct io_uring_cqe *cqe)</div><div class='add'>+{</div><div class='add'>+	if (cqe-&gt;res &lt; 0)</div><div class='add'>+		error(1, 0, "accept()");</div><div class='add'>+	if (connfd)</div><div class='add'>+		error(1, 0, "Unexpected second connection");</div><div class='add'>+</div><div class='add'>+	connfd = cqe-&gt;res;</div><div class='add'>+	if (cfg_oneshot)</div><div class='add'>+		add_recvzc_oneshot(ring, connfd, page_size);</div><div class='add'>+	else</div><div class='add'>+		add_recvzc(ring, connfd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_recvzc(struct io_uring *ring, struct io_uring_cqe *cqe)</div><div class='add'>+{</div><div class='add'>+	unsigned rq_mask = rq_ring.ring_entries - 1;</div><div class='add'>+	struct io_uring_zcrx_cqe *rcqe;</div><div class='add'>+	struct io_uring_zcrx_rqe *rqe;</div><div class='add'>+	struct io_uring_sqe *sqe;</div><div class='add'>+	uint64_t mask;</div><div class='add'>+	char *data;</div><div class='add'>+	ssize_t n;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (cqe-&gt;res == 0 &amp;&amp; cqe-&gt;flags == 0 &amp;&amp; cfg_oneshot_recvs == 0) {</div><div class='add'>+		stop = true;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cqe-&gt;res &lt; 0)</div><div class='add'>+		error(1, 0, "recvzc(): %d", cqe-&gt;res);</div><div class='add'>+</div><div class='add'>+	if (cfg_oneshot) {</div><div class='add'>+		if (cqe-&gt;res == 0 &amp;&amp; cqe-&gt;flags == 0 &amp;&amp; cfg_oneshot_recvs) {</div><div class='add'>+			add_recvzc_oneshot(ring, connfd, page_size);</div><div class='add'>+			cfg_oneshot_recvs--;</div><div class='add'>+		}</div><div class='add'>+	} else if (!(cqe-&gt;flags &amp; IORING_CQE_F_MORE)) {</div><div class='add'>+		add_recvzc(ring, connfd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcqe = (struct io_uring_zcrx_cqe *)(cqe + 1);</div><div class='add'>+</div><div class='add'>+	n = cqe-&gt;res;</div><div class='add'>+	mask = (1ULL &lt;&lt; IORING_ZCRX_AREA_SHIFT) - 1;</div><div class='add'>+	data = (char *)area_ptr + (rcqe-&gt;off &amp; mask);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++) {</div><div class='add'>+		if (*(data + i) != payload[(received + i)])</div><div class='add'>+			error(1, 0, "payload mismatch at %d", i);</div><div class='add'>+	}</div><div class='add'>+	received += n;</div><div class='add'>+</div><div class='add'>+	rqe = &amp;rq_ring.rqes[(rq_ring.rq_tail &amp; rq_mask)];</div><div class='add'>+	rqe-&gt;off = (rcqe-&gt;off &amp; ~IORING_ZCRX_AREA_MASK) | area_token;</div><div class='add'>+	rqe-&gt;len = cqe-&gt;res;</div><div class='add'>+	io_uring_smp_store_release(rq_ring.ktail, ++rq_ring.rq_tail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void server_loop(struct io_uring *ring)</div><div class='add'>+{</div><div class='add'>+	struct io_uring_cqe *cqe;</div><div class='add'>+	unsigned int count = 0;</div><div class='add'>+	unsigned int head;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	io_uring_submit_and_wait(ring, 1);</div><div class='add'>+</div><div class='add'>+	io_uring_for_each_cqe(ring, head, cqe) {</div><div class='add'>+		if (cqe-&gt;user_data == 1)</div><div class='add'>+			process_accept(ring, cqe);</div><div class='add'>+		else if (cqe-&gt;user_data == 2)</div><div class='add'>+			process_recvzc(ring, cqe);</div><div class='add'>+		else</div><div class='add'>+			error(1, 0, "unknown cqe");</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+	io_uring_cq_advance(ring, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void run_server(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int flags = 0;</div><div class='add'>+	struct io_uring ring;</div><div class='add'>+	int fd, enable, ret;</div><div class='add'>+	uint64_t tstop;</div><div class='add'>+</div><div class='add'>+	fd = socket(AF_INET6, SOCK_STREAM, 0);</div><div class='add'>+	if (fd == -1)</div><div class='add'>+		error(1, 0, "socket()");</div><div class='add'>+</div><div class='add'>+	enable = 1;</div><div class='add'>+	ret = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &amp;enable, sizeof(int));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		error(1, 0, "setsockopt(SO_REUSEADDR)");</div><div class='add'>+</div><div class='add'>+	ret = bind(fd, (struct sockaddr *)&amp;cfg_addr, sizeof(cfg_addr));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		error(1, 0, "bind()");</div><div class='add'>+</div><div class='add'>+	if (listen(fd, 1024) &lt; 0)</div><div class='add'>+		error(1, 0, "listen()");</div><div class='add'>+</div><div class='add'>+	flags |= IORING_SETUP_COOP_TASKRUN;</div><div class='add'>+	flags |= IORING_SETUP_SINGLE_ISSUER;</div><div class='add'>+	flags |= IORING_SETUP_DEFER_TASKRUN;</div><div class='add'>+	flags |= IORING_SETUP_SUBMIT_ALL;</div><div class='add'>+	flags |= IORING_SETUP_CQE32;</div><div class='add'>+</div><div class='add'>+	io_uring_queue_init(512, &amp;ring, flags);</div><div class='add'>+</div><div class='add'>+	setup_zcrx(&amp;ring);</div><div class='add'>+</div><div class='add'>+	add_accept(&amp;ring, fd);</div><div class='add'>+</div><div class='add'>+	tstop = gettimeofday_ms() + 5000;</div><div class='add'>+	while (!stop &amp;&amp; gettimeofday_ms() &lt; tstop)</div><div class='add'>+		server_loop(&amp;ring);</div><div class='add'>+</div><div class='add'>+	if (!stop)</div><div class='add'>+		error(1, 0, "test failed\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void run_client(void)</div><div class='add'>+{</div><div class='add'>+	ssize_t to_send = cfg_send_size;</div><div class='add'>+	ssize_t sent = 0;</div><div class='add'>+	ssize_t chunk, res;</div><div class='add'>+	int fd;</div><div class='add'>+</div><div class='add'>+	fd = socket(AF_INET6, SOCK_STREAM, 0);</div><div class='add'>+	if (fd == -1)</div><div class='add'>+		error(1, 0, "socket()");</div><div class='add'>+</div><div class='add'>+	if (connect(fd, (struct sockaddr *)&amp;cfg_addr, sizeof(cfg_addr)))</div><div class='add'>+		error(1, 0, "connect()");</div><div class='add'>+</div><div class='add'>+	while (to_send) {</div><div class='add'>+		void *src = &amp;payload[sent];</div><div class='add'>+</div><div class='add'>+		chunk = min_t(ssize_t, cfg_payload_len, to_send);</div><div class='add'>+		res = send(fd, src, chunk, 0);</div><div class='add'>+		if (res &lt; 0)</div><div class='add'>+			error(1, 0, "send(): %zd", sent);</div><div class='add'>+		sent += res;</div><div class='add'>+		to_send -= res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	close(fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usage(const char *filepath)</div><div class='add'>+{</div><div class='add'>+	error(1, 0, "Usage: %s (-4|-6) (-s|-c) -h&lt;server_ip&gt; -p&lt;port&gt; "</div><div class='add'>+		    "-l&lt;payload_size&gt; -i&lt;ifname&gt; -q&lt;rxq_id&gt;", filepath);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_opts(int argc, char **argv)</div><div class='add'>+{</div><div class='add'>+	const int max_payload_len = SEND_SIZE -</div><div class='add'>+				    sizeof(struct ipv6hdr) -</div><div class='add'>+				    sizeof(struct tcphdr) -</div><div class='add'>+				    40 /* max tcp options */;</div><div class='add'>+	struct sockaddr_in6 *addr6 = (void *) &amp;cfg_addr;</div><div class='add'>+	char *addr = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	if (argc &lt;= 1)</div><div class='add'>+		usage(argv[0]);</div><div class='add'>+	cfg_payload_len = max_payload_len;</div><div class='add'>+</div><div class='add'>+	while ((c = getopt(argc, argv, "sch:p:l:i:q:o:z:")) != -1) {</div><div class='add'>+		switch (c) {</div><div class='add'>+		case 's':</div><div class='add'>+			if (cfg_client)</div><div class='add'>+				error(1, 0, "Pass one of -s or -c");</div><div class='add'>+			cfg_server = 1;</div><div class='add'>+			break;</div><div class='add'>+		case 'c':</div><div class='add'>+			if (cfg_server)</div><div class='add'>+				error(1, 0, "Pass one of -s or -c");</div><div class='add'>+			cfg_client = 1;</div><div class='add'>+			break;</div><div class='add'>+		case 'h':</div><div class='add'>+			addr = optarg;</div><div class='add'>+			break;</div><div class='add'>+		case 'p':</div><div class='add'>+			cfg_port = strtoul(optarg, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case 'l':</div><div class='add'>+			cfg_payload_len = strtoul(optarg, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case 'i':</div><div class='add'>+			cfg_ifname = optarg;</div><div class='add'>+			break;</div><div class='add'>+		case 'q':</div><div class='add'>+			cfg_queue_id = strtoul(optarg, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		case 'o': {</div><div class='add'>+			cfg_oneshot = true;</div><div class='add'>+			cfg_oneshot_recvs = strtoul(optarg, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case 'z':</div><div class='add'>+			cfg_send_size = strtoul(optarg, NULL, 0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg_server &amp;&amp; addr)</div><div class='add'>+		error(1, 0, "Receiver cannot have -h specified");</div><div class='add'>+</div><div class='add'>+	memset(addr6, 0, sizeof(*addr6));</div><div class='add'>+	addr6-&gt;sin6_family = AF_INET6;</div><div class='add'>+	addr6-&gt;sin6_port = htons(cfg_port);</div><div class='add'>+	addr6-&gt;sin6_addr = in6addr_any;</div><div class='add'>+	if (addr) {</div><div class='add'>+		ret = parse_address(addr, cfg_port, addr6);</div><div class='add'>+		if (ret)</div><div class='add'>+			error(1, 0, "receiver address parse error: %s", addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg_payload_len &gt; max_payload_len)</div><div class='add'>+		error(1, 0, "-l: payload exceeds max (%d)", max_payload_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char **argv)</div><div class='add'>+{</div><div class='add'>+	const char *cfg_test = argv[argc - 1];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	page_size = sysconf(_SC_PAGESIZE);</div><div class='add'>+	if (page_size &lt; 0)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (posix_memalign((void **)&amp;payload, page_size, SEND_SIZE))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	parse_opts(argc, argv);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SEND_SIZE; i++)</div><div class='add'>+		payload[i] = 'a' + (i % 26);</div><div class='add'>+</div><div class='add'>+	if (cfg_server)</div><div class='add'>+		run_server();</div><div class='add'>+	else if (cfg_client)</div><div class='add'>+		run_client();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py<br/>new file mode 100755<br/>index 000000000000..712c806508b5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/iou-zcrx.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/iou-zcrx.py</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+import re</div><div class='add'>+from os import path</div><div class='add'>+from lib.py import ksft_run, ksft_exit, KsftSkipEx</div><div class='add'>+from lib.py import NetDrvEpEnv</div><div class='add'>+from lib.py import bkg, cmd, defer, ethtool, rand_port, wait_port_listen</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _get_current_settings(cfg):</div><div class='add'>+    output = ethtool(f"-g {cfg.ifname}", json=True)[0]</div><div class='add'>+    return (output['rx'], output['hds-thresh'])</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _get_combined_channels(cfg):</div><div class='add'>+    output = ethtool(f"-l {cfg.ifname}").stdout</div><div class='add'>+    values = re.findall(r'Combined:\s+(\d+)', output)</div><div class='add'>+    return int(values[1])</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _create_rss_ctx(cfg, chan):</div><div class='add'>+    output = ethtool(f"-X {cfg.ifname} context new start {chan} equal 1").stdout</div><div class='add'>+    values = re.search(r'New RSS context is (\d+)', output).group(1)</div><div class='add'>+    ctx_id = int(values)</div><div class='add'>+    return (ctx_id, defer(ethtool, f"-X {cfg.ifname} delete context {ctx_id}"))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _set_flow_rule(cfg, port, chan):</div><div class='add'>+    output = ethtool(f"-N {cfg.ifname} flow-type tcp6 dst-port {port} action {chan}").stdout</div><div class='add'>+    values = re.search(r'ID (\d+)', output).group(1)</div><div class='add'>+    return int(values)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _set_flow_rule_rss(cfg, port, ctx_id):</div><div class='add'>+    output = ethtool(f"-N {cfg.ifname} flow-type tcp6 dst-port {port} context {ctx_id}").stdout</div><div class='add'>+    values = re.search(r'ID (\d+)', output).group(1)</div><div class='add'>+    return int(values)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_zcrx(cfg) -&gt; None:</div><div class='add'>+    cfg.require_ipver('6')</div><div class='add'>+</div><div class='add'>+    combined_chans = _get_combined_channels(cfg)</div><div class='add'>+    if combined_chans &lt; 2:</div><div class='add'>+        raise KsftSkipEx('at least 2 combined channels required')</div><div class='add'>+    (rx_ring, hds_thresh) = _get_current_settings(cfg)</div><div class='add'>+    port = rand_port()</div><div class='add'>+</div><div class='add'>+    ethtool(f"-G {cfg.ifname} tcp-data-split on")</div><div class='add'>+    defer(ethtool, f"-G {cfg.ifname} tcp-data-split auto")</div><div class='add'>+</div><div class='add'>+    ethtool(f"-G {cfg.ifname} hds-thresh 0")</div><div class='add'>+    defer(ethtool, f"-G {cfg.ifname} hds-thresh {hds_thresh}")</div><div class='add'>+</div><div class='add'>+    ethtool(f"-G {cfg.ifname} rx 64")</div><div class='add'>+    defer(ethtool, f"-G {cfg.ifname} rx {rx_ring}")</div><div class='add'>+</div><div class='add'>+    ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}")</div><div class='add'>+    defer(ethtool, f"-X {cfg.ifname} default")</div><div class='add'>+</div><div class='add'>+    flow_rule_id = _set_flow_rule(cfg, port, combined_chans - 1)</div><div class='add'>+    defer(ethtool, f"-N {cfg.ifname} delete {flow_rule_id}")</div><div class='add'>+</div><div class='add'>+    rx_cmd = f"{cfg.bin_local} -s -p {port} -i {cfg.ifname} -q {combined_chans - 1}"</div><div class='add'>+    tx_cmd = f"{cfg.bin_remote} -c -h {cfg.addr_v['6']} -p {port} -l 12840"</div><div class='add'>+    with bkg(rx_cmd, exit_wait=True):</div><div class='add'>+        wait_port_listen(port, proto="tcp")</div><div class='add'>+        cmd(tx_cmd, host=cfg.remote)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_zcrx_oneshot(cfg) -&gt; None:</div><div class='add'>+    cfg.require_ipver('6')</div><div class='add'>+</div><div class='add'>+    combined_chans = _get_combined_channels(cfg)</div><div class='add'>+    if combined_chans &lt; 2:</div><div class='add'>+        raise KsftSkipEx('at least 2 combined channels required')</div><div class='add'>+    (rx_ring, hds_thresh) = _get_current_settings(cfg)</div><div class='add'>+    port = rand_port()</div><div class='add'>+</div><div class='add'>+    ethtool(f"-G {cfg.ifname} tcp-data-split on")</div><div class='add'>+    defer(ethtool, f"-G {cfg.ifname} tcp-data-split auto")</div><div class='add'>+</div><div class='add'>+    ethtool(f"-G {cfg.ifname} hds-thresh 0")</div><div class='add'>+    defer(ethtool, f"-G {cfg.ifname} hds-thresh {hds_thresh}")</div><div class='add'>+</div><div class='add'>+    ethtool(f"-G {cfg.ifname} rx 64")</div><div class='add'>+    defer(ethtool, f"-G {cfg.ifname} rx {rx_ring}")</div><div class='add'>+</div><div class='add'>+    ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}")</div><div class='add'>+    defer(ethtool, f"-X {cfg.ifname} default")</div><div class='add'>+</div><div class='add'>+    flow_rule_id = _set_flow_rule(cfg, port, combined_chans - 1)</div><div class='add'>+    defer(ethtool, f"-N {cfg.ifname} delete {flow_rule_id}")</div><div class='add'>+</div><div class='add'>+    rx_cmd = f"{cfg.bin_local} -s -p {port} -i {cfg.ifname} -q {combined_chans - 1} -o 4"</div><div class='add'>+    tx_cmd = f"{cfg.bin_remote} -c -h {cfg.addr_v['6']} -p {port} -l 4096 -z 16384"</div><div class='add'>+    with bkg(rx_cmd, exit_wait=True):</div><div class='add'>+        wait_port_listen(port, proto="tcp")</div><div class='add'>+        cmd(tx_cmd, host=cfg.remote)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_zcrx_rss(cfg) -&gt; None:</div><div class='add'>+    cfg.require_ipver('6')</div><div class='add'>+</div><div class='add'>+    combined_chans = _get_combined_channels(cfg)</div><div class='add'>+    if combined_chans &lt; 2:</div><div class='add'>+        raise KsftSkipEx('at least 2 combined channels required')</div><div class='add'>+    (rx_ring, hds_thresh) = _get_current_settings(cfg)</div><div class='add'>+    port = rand_port()</div><div class='add'>+</div><div class='add'>+    ethtool(f"-G {cfg.ifname} tcp-data-split on")</div><div class='add'>+    defer(ethtool, f"-G {cfg.ifname} tcp-data-split auto")</div><div class='add'>+</div><div class='add'>+    ethtool(f"-G {cfg.ifname} hds-thresh 0")</div><div class='add'>+    defer(ethtool, f"-G {cfg.ifname} hds-thresh {hds_thresh}")</div><div class='add'>+</div><div class='add'>+    ethtool(f"-G {cfg.ifname} rx 64")</div><div class='add'>+    defer(ethtool, f"-G {cfg.ifname} rx {rx_ring}")</div><div class='add'>+</div><div class='add'>+    ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}")</div><div class='add'>+    defer(ethtool, f"-X {cfg.ifname} default")</div><div class='add'>+</div><div class='add'>+    (ctx_id, delete_ctx) = _create_rss_ctx(cfg, combined_chans - 1)</div><div class='add'>+    flow_rule_id = _set_flow_rule_rss(cfg, port, ctx_id)</div><div class='add'>+    defer(ethtool, f"-N {cfg.ifname} delete {flow_rule_id}")</div><div class='add'>+</div><div class='add'>+    rx_cmd = f"{cfg.bin_local} -s -p {port} -i {cfg.ifname} -q {combined_chans - 1}"</div><div class='add'>+    tx_cmd = f"{cfg.bin_remote} -c -h {cfg.addr_v['6']} -p {port} -l 12840"</div><div class='add'>+    with bkg(rx_cmd, exit_wait=True):</div><div class='add'>+        wait_port_listen(port, proto="tcp")</div><div class='add'>+        cmd(tx_cmd, host=cfg.remote)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    with NetDrvEpEnv(__file__) as cfg:</div><div class='add'>+        cfg.bin_local = path.abspath(path.dirname(__file__) + "/../../../drivers/net/hw/iou-zcrx")</div><div class='add'>+        cfg.bin_remote = cfg.remote.deploy(cfg.bin_local)</div><div class='add'>+</div><div class='add'>+        ksft_run(globs=globals(), case_pfx={"test_"}, args=(cfg, ))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/irq.py b/tools/testing/selftests/drivers/net/hw/irq.py<br/>new file mode 100755<br/>index 000000000000..0699d6a8b4e2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/irq.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/irq.py</a></div><div class='hunk'>@@ -0,0 +1,99 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+from lib.py import ksft_run, ksft_exit</div><div class='add'>+from lib.py import ksft_ge, ksft_eq</div><div class='add'>+from lib.py import KsftSkipEx</div><div class='add'>+from lib.py import ksft_disruptive</div><div class='add'>+from lib.py import EthtoolFamily, NetdevFamily</div><div class='add'>+from lib.py import NetDrvEnv</div><div class='add'>+from lib.py import cmd, ip, defer</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def read_affinity(irq) -&gt; str:</div><div class='add'>+    with open(f'/proc/irq/{irq}/smp_affinity', 'r') as fp:</div><div class='add'>+        return fp.read().lstrip("0,").strip()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def write_affinity(irq, what) -&gt; str:</div><div class='add'>+    if what != read_affinity(irq):</div><div class='add'>+        with open(f'/proc/irq/{irq}/smp_affinity', 'w') as fp:</div><div class='add'>+            fp.write(what)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def check_irqs_reported(cfg) -&gt; None:</div><div class='add'>+    """ Check that device reports IRQs for NAPI instances """</div><div class='add'>+    napis = cfg.netnl.napi_get({"ifindex": cfg.ifindex}, dump=True)</div><div class='add'>+    irqs = sum(['irq' in x for x in napis])</div><div class='add'>+</div><div class='add'>+    ksft_ge(irqs, 1)</div><div class='add'>+    ksft_eq(irqs, len(napis))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _check_reconfig(cfg, reconfig_cb) -&gt; None:</div><div class='add'>+    napis = cfg.netnl.napi_get({"ifindex": cfg.ifindex}, dump=True)</div><div class='add'>+    for n in reversed(napis):</div><div class='add'>+        if 'irq' in n:</div><div class='add'>+            break</div><div class='add'>+    else:</div><div class='add'>+        raise KsftSkipEx(f"Device has no NAPI with IRQ attribute (#napis: {len(napis)}")</div><div class='add'>+</div><div class='add'>+    old = read_affinity(n['irq'])</div><div class='add'>+    # pick an affinity that's not the current one</div><div class='add'>+    new = "3" if old != "3" else "5"</div><div class='add'>+    write_affinity(n['irq'], new)</div><div class='add'>+    defer(write_affinity, n['irq'], old)</div><div class='add'>+</div><div class='add'>+    reconfig_cb(cfg)</div><div class='add'>+</div><div class='add'>+    ksft_eq(read_affinity(n['irq']), new, comment="IRQ affinity changed after reconfig")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def check_reconfig_queues(cfg) -&gt; None:</div><div class='add'>+    def reconfig(cfg) -&gt; None:</div><div class='add'>+        channels = cfg.ethnl.channels_get({'header': {'dev-index': cfg.ifindex}})</div><div class='add'>+        if channels['combined-count'] == 0:</div><div class='add'>+            rx_type = 'rx'</div><div class='add'>+        else:</div><div class='add'>+            rx_type = 'combined'</div><div class='add'>+        cur_queue_cnt = channels[f'{rx_type}-count']</div><div class='add'>+        max_queue_cnt = channels[f'{rx_type}-max']</div><div class='add'>+</div><div class='add'>+        cmd(f"ethtool -L {cfg.ifname} {rx_type} 1")</div><div class='add'>+        cmd(f"ethtool -L {cfg.ifname} {rx_type} {max_queue_cnt}")</div><div class='add'>+        cmd(f"ethtool -L {cfg.ifname} {rx_type} {cur_queue_cnt}")</div><div class='add'>+</div><div class='add'>+    _check_reconfig(cfg, reconfig)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def check_reconfig_xdp(cfg) -&gt; None:</div><div class='add'>+    def reconfig(cfg) -&gt; None:</div><div class='add'>+        ip(f"link set dev %s xdp obj %s sec xdp" %</div><div class='add'>+           (cfg.ifname, cfg.net_lib_dir / "xdp_dummy.bpf.o"))</div><div class='add'>+        ip(f"link set dev %s xdp off" % cfg.ifname)</div><div class='add'>+</div><div class='add'>+    _check_reconfig(cfg, reconfig)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+@ksft_disruptive</div><div class='add'>+def check_down(cfg) -&gt; None:</div><div class='add'>+    def reconfig(cfg) -&gt; None:</div><div class='add'>+        ip("link set dev %s down" % cfg.ifname)</div><div class='add'>+        ip("link set dev %s up" % cfg.ifname)</div><div class='add'>+</div><div class='add'>+    _check_reconfig(cfg, reconfig)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    with NetDrvEnv(__file__, nsim_test=False) as cfg:</div><div class='add'>+        cfg.ethnl = EthtoolFamily()</div><div class='add'>+        cfg.netnl = NetdevFamily()</div><div class='add'>+</div><div class='add'>+        ksft_run([check_irqs_reported, check_reconfig_queues,</div><div class='add'>+                  check_reconfig_xdp, check_down],</div><div class='add'>+                 args=(cfg, ))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/lib/py/__init__.py b/tools/testing/selftests/drivers/net/hw/lib/py/__init__.py<br/>index 399789a9676a..766bfc4ad842 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/lib/py/__init__.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/lib/py/__init__.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/lib/py/__init__.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/lib/py/__init__.py</a></div><div class='hunk'>@@ -1,5 +1,13 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+"""</div><div class='add'>+Driver test environment (hardware-only tests).</div><div class='add'>+NetDrvEnv and NetDrvEpEnv are the main environment classes.</div><div class='add'>+Former is for local host only tests, latter creates / connects</div><div class='add'>+to a remote endpoint. See NIPA wiki for more information about</div><div class='add'>+running and writing driver tests.</div><div class='add'>+"""</div><div class='add'>+</div><div class='ctx'> import sys</div><div class='ctx'> from pathlib import Path</div><div class='ctx'> </div><div class='hunk'>@@ -7,11 +15,38 @@ KSFT_DIR = (Path(__file__).parent / "../../../../..").resolve()</div><div class='ctx'> </div><div class='ctx'> try:</div><div class='ctx'>     sys.path.append(KSFT_DIR.as_posix())</div><div class='del'>-    from net.lib.py import *</div><div class='del'>-    from drivers.net.lib.py import *</div><div class='del'>-    from .linkconfig import LinkConfig</div><div class='add'>+</div><div class='add'>+    # Import one by one to avoid pylint false positives</div><div class='add'>+    from net.lib.py import NetNS, NetNSEnter, NetdevSimDev</div><div class='add'>+    from net.lib.py import EthtoolFamily, NetdevFamily, NetshaperFamily, \</div><div class='add'>+        NlError, RtnlFamily, DevlinkFamily, PSPFamily</div><div class='add'>+    from net.lib.py import CmdExitFailure</div><div class='add'>+    from net.lib.py import bkg, cmd, bpftool, bpftrace, defer, ethtool, \</div><div class='add'>+        fd_read_timeout, ip, rand_port, wait_port_listen, wait_file</div><div class='add'>+    from net.lib.py import KsftSkipEx, KsftFailEx, KsftXfailEx</div><div class='add'>+    from net.lib.py import ksft_disruptive, ksft_exit, ksft_pr, ksft_run, \</div><div class='add'>+        ksft_setup, ksft_variants, KsftNamedVariant</div><div class='add'>+    from net.lib.py import ksft_eq, ksft_ge, ksft_in, ksft_is, ksft_lt, \</div><div class='add'>+        ksft_ne, ksft_not_in, ksft_raises, ksft_true, ksft_gt, ksft_not_none</div><div class='add'>+    from drivers.net.lib.py import GenerateTraffic, Remote, Iperf3Runner</div><div class='add'>+    from drivers.net.lib.py import NetDrvEnv, NetDrvEpEnv</div><div class='add'>+</div><div class='add'>+    __all__ = ["NetNS", "NetNSEnter", "NetdevSimDev",</div><div class='add'>+               "EthtoolFamily", "NetdevFamily", "NetshaperFamily",</div><div class='add'>+               "NlError", "RtnlFamily", "DevlinkFamily", "PSPFamily",</div><div class='add'>+               "CmdExitFailure",</div><div class='add'>+               "bkg", "cmd", "bpftool", "bpftrace", "defer", "ethtool",</div><div class='add'>+               "fd_read_timeout", "ip", "rand_port",</div><div class='add'>+               "wait_port_listen", "wait_file",</div><div class='add'>+               "KsftSkipEx", "KsftFailEx", "KsftXfailEx",</div><div class='add'>+               "ksft_disruptive", "ksft_exit", "ksft_pr", "ksft_run",</div><div class='add'>+               "ksft_setup", "ksft_variants", "KsftNamedVariant",</div><div class='add'>+               "ksft_eq", "ksft_ge", "ksft_in", "ksft_is", "ksft_lt",</div><div class='add'>+               "ksft_ne", "ksft_not_in", "ksft_raises", "ksft_true", "ksft_gt",</div><div class='add'>+               "ksft_not_none", "ksft_not_none",</div><div class='add'>+               "NetDrvEnv", "NetDrvEpEnv", "GenerateTraffic", "Remote",</div><div class='add'>+               "Iperf3Runner"]</div><div class='ctx'> except ModuleNotFoundError as e:</div><div class='del'>-    ksft_pr("Failed importing `net` library from kernel sources")</div><div class='del'>-    ksft_pr(str(e))</div><div class='del'>-    ktap_result(True, comment="SKIP")</div><div class='add'>+    print("Failed importing `net` library from kernel sources")</div><div class='add'>+    print(str(e))</div><div class='ctx'>     sys.exit(4)</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/lib/py/linkconfig.py b/tools/testing/selftests/drivers/net/hw/lib/py/linkconfig.py<br/>deleted file mode 100644<br/>index 79fde603cbbc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/lib/py/linkconfig.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/lib/py/linkconfig.py</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,222 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-from lib.py import cmd, ethtool, ip</div><div class='del'>-from lib.py import ksft_pr, ksft_eq, KsftSkipEx</div><div class='del'>-from typing import Optional</div><div class='del'>-import re</div><div class='del'>-import time</div><div class='del'>-import json</div><div class='del'>-</div><div class='del'>-#The LinkConfig class is implemented to handle the link layer configurations.</div><div class='del'>-#Required minimum ethtool version is 6.10</div><div class='del'>-</div><div class='del'>-class LinkConfig:</div><div class='del'>-    """Class for handling the link layer configurations"""</div><div class='del'>-    def __init__(self, cfg: object) -&gt; None:</div><div class='del'>-        self.cfg = cfg</div><div class='del'>-        self.partner_netif = self.get_partner_netif_name()</div><div class='del'>-</div><div class='del'>-        """Get the initial link configuration of local interface"""</div><div class='del'>-        self.common_link_modes = self.get_common_link_modes()</div><div class='del'>-</div><div class='del'>-    def get_partner_netif_name(self) -&gt; Optional[str]:</div><div class='del'>-        partner_netif = None</div><div class='del'>-        try:</div><div class='del'>-            if not self.verify_link_up():</div><div class='del'>-                return None</div><div class='del'>-            """Get partner interface name"""</div><div class='del'>-            partner_json_output = ip("addr show", json=True, host=self.cfg.remote)</div><div class='del'>-            for interface in partner_json_output:</div><div class='del'>-                for addr in interface.get('addr_info', []):</div><div class='del'>-                    if addr.get('local') == self.cfg.remote_addr:</div><div class='del'>-                        partner_netif = interface['ifname']</div><div class='del'>-                        ksft_pr(f"Partner Interface name: {partner_netif}")</div><div class='del'>-            if partner_netif is None:</div><div class='del'>-                ksft_pr("Unable to get the partner interface name")</div><div class='del'>-        except Exception as e:</div><div class='del'>-            print(f"Unexpected error occurred while getting partner interface name: {e}")</div><div class='del'>-        self.partner_netif = partner_netif</div><div class='del'>-        return partner_netif</div><div class='del'>-</div><div class='del'>-    def verify_link_up(self) -&gt; bool:</div><div class='del'>-        """Verify whether the local interface link is up"""</div><div class='del'>-        with open(f"/sys/class/net/{self.cfg.ifname}/operstate", "r") as fp:</div><div class='del'>-            link_state = fp.read().strip()</div><div class='del'>-</div><div class='del'>-        if link_state == "down":</div><div class='del'>-            ksft_pr(f"Link state of interface {self.cfg.ifname} is DOWN")</div><div class='del'>-            return False</div><div class='del'>-        else:</div><div class='del'>-            return True</div><div class='del'>-</div><div class='del'>-    def reset_interface(self, local: bool = True, remote: bool = True) -&gt; bool:</div><div class='del'>-        ksft_pr("Resetting interfaces in local and remote")</div><div class='del'>-        if remote:</div><div class='del'>-            if self.verify_link_up():</div><div class='del'>-                if self.partner_netif is not None:</div><div class='del'>-                    ifname = self.partner_netif</div><div class='del'>-                    link_up_cmd = f"ip link set up {ifname}"</div><div class='del'>-                    link_down_cmd = f"ip link set down {ifname}"</div><div class='del'>-                    reset_cmd = f"{link_down_cmd} &amp;&amp; sleep 5 &amp;&amp; {link_up_cmd}"</div><div class='del'>-                    try:</div><div class='del'>-                        cmd(reset_cmd, host=self.cfg.remote)</div><div class='del'>-                    except Exception as e:</div><div class='del'>-                        ksft_pr(f"Unexpected error occurred while resetting remote: {e}")</div><div class='del'>-                else:</div><div class='del'>-                    ksft_pr("Partner interface not available")</div><div class='del'>-        if local:</div><div class='del'>-            ifname = self.cfg.ifname</div><div class='del'>-            link_up_cmd = f"ip link set up {ifname}"</div><div class='del'>-            link_down_cmd = f"ip link set down {ifname}"</div><div class='del'>-            reset_cmd = f"{link_down_cmd} &amp;&amp; sleep 5 &amp;&amp; {link_up_cmd}"</div><div class='del'>-            try:</div><div class='del'>-                cmd(reset_cmd)</div><div class='del'>-            except Exception as e:</div><div class='del'>-                ksft_pr(f"Unexpected error occurred while resetting local: {e}")</div><div class='del'>-        time.sleep(10)</div><div class='del'>-        if self.verify_link_up() and self.get_ethtool_field("link-detected"):</div><div class='del'>-            ksft_pr("Local and remote interfaces reset to original state")</div><div class='del'>-            return True</div><div class='del'>-        else:</div><div class='del'>-            ksft_pr("Error occurred after resetting interfaces. Link is DOWN.")</div><div class='del'>-            return False</div><div class='del'>-</div><div class='del'>-    def set_speed_and_duplex(self, speed: str, duplex: str, autoneg: bool = True) -&gt; bool:</div><div class='del'>-        """Set the speed and duplex state for the interface"""</div><div class='del'>-        autoneg_state = "on" if autoneg is True else "off"</div><div class='del'>-        process = None</div><div class='del'>-        try:</div><div class='del'>-            process = ethtool(f"--change {self.cfg.ifname} speed {speed} duplex {duplex} autoneg {autoneg_state}")</div><div class='del'>-        except Exception as e:</div><div class='del'>-            ksft_pr(f"Unexpected error occurred while setting speed/duplex: {e}")</div><div class='del'>-        if process is None or process.ret != 0:</div><div class='del'>-            return False</div><div class='del'>-        else:</div><div class='del'>-            ksft_pr(f"Speed: {speed} Mbps, Duplex: {duplex} set for Interface: {self.cfg.ifname}")</div><div class='del'>-            return True</div><div class='del'>-</div><div class='del'>-    def verify_speed_and_duplex(self, expected_speed: str, expected_duplex: str) -&gt; bool:</div><div class='del'>-        if not self.verify_link_up():</div><div class='del'>-            return False</div><div class='del'>-        """Verifying the speed and duplex state for the interface"""</div><div class='del'>-        with open(f"/sys/class/net/{self.cfg.ifname}/speed", "r") as fp:</div><div class='del'>-            actual_speed = fp.read().strip()</div><div class='del'>-        with open(f"/sys/class/net/{self.cfg.ifname}/duplex", "r") as fp:</div><div class='del'>-            actual_duplex = fp.read().strip()</div><div class='del'>-</div><div class='del'>-        ksft_eq(actual_speed, expected_speed)</div><div class='del'>-        ksft_eq(actual_duplex, expected_duplex)</div><div class='del'>-        return True</div><div class='del'>-</div><div class='del'>-    def set_autonegotiation_state(self, state: str, remote: bool = False) -&gt; bool:</div><div class='del'>-        common_link_modes = self.common_link_modes</div><div class='del'>-        speeds, duplex_modes = self.get_speed_duplex_values(self.common_link_modes)</div><div class='del'>-        speed = speeds[0]</div><div class='del'>-        duplex = duplex_modes[0]</div><div class='del'>-        if not speed or not duplex:</div><div class='del'>-            ksft_pr("No speed or duplex modes found")</div><div class='del'>-            return False</div><div class='del'>-</div><div class='del'>-        speed_duplex_cmd = f"speed {speed} duplex {duplex}" if state == "off" else ""</div><div class='del'>-        if remote:</div><div class='del'>-            if not self.verify_link_up():</div><div class='del'>-                return False</div><div class='del'>-            """Set the autonegotiation state for the partner"""</div><div class='del'>-            command = f"-s {self.partner_netif} {speed_duplex_cmd} autoneg {state}"</div><div class='del'>-            partner_autoneg_change = None</div><div class='del'>-            """Set autonegotiation state for interface in remote pc"""</div><div class='del'>-            try:</div><div class='del'>-                partner_autoneg_change = ethtool(command, host=self.cfg.remote)</div><div class='del'>-            except Exception as e:</div><div class='del'>-                ksft_pr(f"Unexpected error occurred while changing auto-neg in remote: {e}")</div><div class='del'>-            if partner_autoneg_change is None or partner_autoneg_change.ret != 0:</div><div class='del'>-                ksft_pr(f"Not able to set autoneg parameter for interface {self.partner_netif}.")</div><div class='del'>-                return False</div><div class='del'>-            ksft_pr(f"Autoneg set as {state} for {self.partner_netif}")</div><div class='del'>-        else:</div><div class='del'>-            """Set the autonegotiation state for the interface"""</div><div class='del'>-            try:</div><div class='del'>-                process = ethtool(f"-s {self.cfg.ifname} {speed_duplex_cmd} autoneg {state}")</div><div class='del'>-                if process.ret != 0:</div><div class='del'>-                    ksft_pr(f"Not able to set autoneg parameter for interface {self.cfg.ifname}")</div><div class='del'>-                    return False</div><div class='del'>-            except Exception as e:</div><div class='del'>-                ksft_pr(f"Unexpected error occurred while changing auto-neg in local: {e}")</div><div class='del'>-                return False</div><div class='del'>-            ksft_pr(f"Autoneg set as {state} for {self.cfg.ifname}")</div><div class='del'>-        return True</div><div class='del'>-</div><div class='del'>-    def check_autoneg_supported(self, remote: bool = False) -&gt; bool:</div><div class='del'>-        if not remote:</div><div class='del'>-            local_autoneg = self.get_ethtool_field("supports-auto-negotiation")</div><div class='del'>-            if local_autoneg is None:</div><div class='del'>-                ksft_pr(f"Unable to fetch auto-negotiation status for interface {self.cfg.ifname}")</div><div class='del'>-            """Return autoneg status of the local interface"""</div><div class='del'>-            return local_autoneg</div><div class='del'>-        else:</div><div class='del'>-            if not self.verify_link_up():</div><div class='del'>-                raise KsftSkipEx("Link is DOWN")</div><div class='del'>-            """Check remote auto-negotiation support status"""</div><div class='del'>-            partner_autoneg = False</div><div class='del'>-            if self.partner_netif is not None:</div><div class='del'>-                partner_autoneg = self.get_ethtool_field("supports-auto-negotiation", remote=True)</div><div class='del'>-                if partner_autoneg is None:</div><div class='del'>-                    ksft_pr(f"Unable to fetch auto-negotiation status for interface {self.partner_netif}")</div><div class='del'>-            return partner_autoneg</div><div class='del'>-</div><div class='del'>-    def get_common_link_modes(self) -&gt; set[str]:</div><div class='del'>-        common_link_modes = []</div><div class='del'>-        """Populate common link modes"""</div><div class='del'>-        link_modes = self.get_ethtool_field("supported-link-modes")</div><div class='del'>-        partner_link_modes = self.get_ethtool_field("link-partner-advertised-link-modes")</div><div class='del'>-        if link_modes is None:</div><div class='del'>-            raise KsftSkipEx(f"Link modes not available for {self.cfg.ifname}")</div><div class='del'>-        if partner_link_modes is None:</div><div class='del'>-            raise KsftSkipEx(f"Partner link modes not available for {self.cfg.ifname}")</div><div class='del'>-        common_link_modes = set(link_modes) and set(partner_link_modes)</div><div class='del'>-        return common_link_modes</div><div class='del'>-</div><div class='del'>-    def get_speed_duplex_values(self, link_modes: list[str]) -&gt; tuple[list[str], list[str]]:</div><div class='del'>-        speed = []</div><div class='del'>-        duplex = []</div><div class='del'>-        """Check the link modes"""</div><div class='del'>-        for data in link_modes:</div><div class='del'>-            parts = data.split('/')</div><div class='del'>-            speed_value = re.match(r'\d+', parts[0])</div><div class='del'>-            if speed_value:</div><div class='del'>-                speed.append(speed_value.group())</div><div class='del'>-            else:</div><div class='del'>-                ksft_pr(f"No speed value found for interface {self.ifname}")</div><div class='del'>-                return None, None</div><div class='del'>-            duplex.append(parts[1].lower())</div><div class='del'>-        return speed, duplex</div><div class='del'>-</div><div class='del'>-    def get_ethtool_field(self, field: str, remote: bool = False) -&gt; Optional[str]:</div><div class='del'>-        process = None</div><div class='del'>-        if not remote:</div><div class='del'>-            """Get the ethtool field value for the local interface"""</div><div class='del'>-            try:</div><div class='del'>-                process = ethtool(self.cfg.ifname, json=True)</div><div class='del'>-            except Exception as e:</div><div class='del'>-                ksft_pr("Required minimum ethtool version is 6.10")</div><div class='del'>-                ksft_pr(f"Unexpected error occurred while getting ethtool field in local: {e}")</div><div class='del'>-                return None</div><div class='del'>-        else:</div><div class='del'>-            if not self.verify_link_up():</div><div class='del'>-                return None</div><div class='del'>-            """Get the ethtool field value for the remote interface"""</div><div class='del'>-            self.cfg.require_cmd("ethtool", remote=True)</div><div class='del'>-            if self.partner_netif is None:</div><div class='del'>-                ksft_pr(f"Partner interface name is unavailable.")</div><div class='del'>-                return None</div><div class='del'>-            try:</div><div class='del'>-                process = ethtool(self.partner_netif, json=True, host=self.cfg.remote)</div><div class='del'>-            except Exception as e:</div><div class='del'>-                ksft_pr("Required minimum ethtool version is 6.10")</div><div class='del'>-                ksft_pr(f"Unexpected error occurred while getting ethtool field in remote: {e}")</div><div class='del'>-                return None</div><div class='del'>-        json_data = process[0]</div><div class='del'>-        """Check if the field exist in the json data"""</div><div class='del'>-        if field not in json_data:</div><div class='del'>-            raise KsftSkipEx(f'Field {field} does not exist in the output of interface {json_data["ifname"]}')</div><div class='del'>-        return json_data[field]</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/ncdevmem.c b/tools/testing/selftests/drivers/net/hw/ncdevmem.c<br/>index 19a6969643f4..3288ed04ce08 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/ncdevmem.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/ncdevmem.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/ncdevmem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/ncdevmem.c</a></div><div class='hunk'>@@ -9,27 +9,37 @@</div><div class='ctx'>  *     ncdevmem -s &lt;server IP&gt; [-c &lt;client IP&gt;] -f eth1 -l -p 5201</div><div class='ctx'>  *</div><div class='ctx'>  *     On client:</div><div class='del'>- *     echo -n "hello\nworld" | nc -s &lt;server IP&gt; 5201 -p 5201</div><div class='add'>+ *     echo -n "hello\nworld" | \</div><div class='add'>+ *		ncdevmem -s &lt;server IP&gt; [-c &lt;client IP&gt;] -p 5201 -f eth1</div><div class='ctx'>  *</div><div class='del'>- * Test data validation:</div><div class='add'>+ * Note this is compatible with regular netcat. i.e. the sender or receiver can</div><div class='add'>+ * be replaced with regular netcat to test the RX or TX path in isolation.</div><div class='add'>+ *</div><div class='add'>+ * Test data validation (devmem TCP on RX only):</div><div class='ctx'>  *</div><div class='ctx'>  *     On server:</div><div class='ctx'>  *     ncdevmem -s &lt;server IP&gt; [-c &lt;client IP&gt;] -f eth1 -l -p 5201 -v 7</div><div class='ctx'>  *</div><div class='ctx'>  *     On client:</div><div class='ctx'>  *     yes $(echo -e \\x01\\x02\\x03\\x04\\x05\\x06) | \</div><div class='del'>- *             tr \\n \\0 | \</div><div class='del'>- *             head -c 5G | \</div><div class='add'>+ *             head -c 1G | \</div><div class='ctx'>  *             nc &lt;server IP&gt; 5201 -p 5201</div><div class='ctx'>  *</div><div class='add'>+ * Test data validation (devmem TCP on RX and TX, validation happens on RX):</div><div class='ctx'>  *</div><div class='del'>- * Note this is compatible with regular netcat. i.e. the sender or receiver can</div><div class='del'>- * be replaced with regular netcat to test the RX or TX path in isolation.</div><div class='add'>+ *	On server:</div><div class='add'>+ *	ncdevmem -s &lt;server IP&gt; [-c &lt;client IP&gt;] -l -p 5201 -v 8 -f eth1</div><div class='add'>+ *</div><div class='add'>+ *	On client:</div><div class='add'>+ *	yes $(echo -e \\x01\\x02\\x03\\x04\\x05\\x06\\x07) | \</div><div class='add'>+ *		head -c 1M | \</div><div class='add'>+ *		ncdevmem -s &lt;server IP&gt; [-c &lt;client IP&gt;] -p 5201 -f eth1</div><div class='ctx'>  */</div><div class='ctx'> #define _GNU_SOURCE</div><div class='ctx'> #define __EXPORTED_HEADERS__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='add'>+#include &lt;stdarg.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='hunk'>@@ -40,17 +50,19 @@</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> #include &lt;malloc.h&gt;</div><div class='ctx'> #include &lt;error.h&gt;</div><div class='add'>+#include &lt;poll.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;arpa/inet.h&gt;</div><div class='ctx'> #include &lt;sys/socket.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include &lt;sys/ioctl.h&gt;</div><div class='ctx'> #include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/memfd.h&gt;</div><div class='ctx'> #include &lt;linux/dma-buf.h&gt;</div><div class='add'>+#include &lt;linux/errqueue.h&gt;</div><div class='ctx'> #include &lt;linux/udmabuf.h&gt;</div><div class='del'>-#include &lt;libmnl/libmnl.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;linux/genetlink.h&gt;</div><div class='hunk'>@@ -71,6 +83,9 @@</div><div class='ctx'> #define MSG_SOCK_DEVMEM 0x2000000</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define MAX_IOV 1024</div><div class='add'>+</div><div class='add'>+static size_t max_chunk;</div><div class='ctx'> static char *server_ip;</div><div class='ctx'> static char *client_ip;</div><div class='ctx'> static char *port;</div><div class='hunk'>@@ -80,6 +95,12 @@ static int num_queues = -1;</div><div class='ctx'> static char *ifname;</div><div class='ctx'> static unsigned int ifindex;</div><div class='ctx'> static unsigned int dmabuf_id;</div><div class='add'>+static uint32_t tx_dmabuf_id;</div><div class='add'>+static int waittime_ms = 500;</div><div class='add'>+</div><div class='add'>+/* System state loaded by current_config_load() */</div><div class='add'>+#define MAX_FLOWS	8</div><div class='add'>+static int ntuple_ids[MAX_FLOWS] = { -1, -1, -1, -1, -1, -1, -1, -1, };</div><div class='ctx'> </div><div class='ctx'> struct memory_buffer {</div><div class='ctx'> 	int fd;</div><div class='hunk'>@@ -93,10 +114,27 @@ struct memory_buffer {</div><div class='ctx'> struct memory_provider {</div><div class='ctx'> 	struct memory_buffer *(*alloc)(size_t size);</div><div class='ctx'> 	void (*free)(struct memory_buffer *ctx);</div><div class='add'>+	void (*memcpy_to_device)(struct memory_buffer *dst, size_t off,</div><div class='add'>+				 void *src, int n);</div><div class='ctx'> 	void (*memcpy_from_device)(void *dst, struct memory_buffer *src,</div><div class='ctx'> 				   size_t off, int n);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void pr_err(const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "%s: ", TEST_PREFIX);</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	vfprintf(stderr, fmt, args);</div><div class='add'>+	va_end(args);</div><div class='add'>+</div><div class='add'>+	if (errno != 0)</div><div class='add'>+		fprintf(stderr, ": %s", strerror(errno));</div><div class='add'>+	fprintf(stderr, "\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct memory_buffer *udmabuf_alloc(size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct udmabuf_create create;</div><div class='hunk'>@@ -105,27 +143,33 @@ static struct memory_buffer *udmabuf_alloc(size_t size)</div><div class='ctx'> </div><div class='ctx'> 	ctx = malloc(sizeof(*ctx));</div><div class='ctx'> 	if (!ctx)</div><div class='del'>-		error(1, ENOMEM, "malloc failed");</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;size = size;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;devfd = open("/dev/udmabuf", O_RDWR);</div><div class='del'>-	if (ctx-&gt;devfd &lt; 0)</div><div class='del'>-		error(1, errno,</div><div class='del'>-		      "%s: [skip,no-udmabuf: Unable to access DMA buffer device file]\n",</div><div class='del'>-		      TEST_PREFIX);</div><div class='add'>+	if (ctx-&gt;devfd &lt; 0) {</div><div class='add'>+		pr_err("[skip,no-udmabuf: Unable to access DMA buffer device file]");</div><div class='add'>+		goto err_free_ctx;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;memfd = memfd_create("udmabuf-test", MFD_ALLOW_SEALING);</div><div class='del'>-	if (ctx-&gt;memfd &lt; 0)</div><div class='del'>-		error(1, errno, "%s: [skip,no-memfd]\n", TEST_PREFIX);</div><div class='add'>+	if (ctx-&gt;memfd &lt; 0) {</div><div class='add'>+		pr_err("[skip,no-memfd]");</div><div class='add'>+		goto err_close_dev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = fcntl(ctx-&gt;memfd, F_ADD_SEALS, F_SEAL_SHRINK);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		error(1, errno, "%s: [skip,fcntl-add-seals]\n", TEST_PREFIX);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("[skip,fcntl-add-seals]");</div><div class='add'>+		goto err_close_memfd;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ftruncate(ctx-&gt;memfd, size);</div><div class='del'>-	if (ret == -1)</div><div class='del'>-		error(1, errno, "%s: [FAIL,memfd-truncate]\n", TEST_PREFIX);</div><div class='add'>+	if (ret == -1) {</div><div class='add'>+		pr_err("[FAIL,memfd-truncate]");</div><div class='add'>+		goto err_close_memfd;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;create, 0, sizeof(create));</div><div class='ctx'> </div><div class='hunk'>@@ -133,15 +177,29 @@ static struct memory_buffer *udmabuf_alloc(size_t size)</div><div class='ctx'> 	create.offset = 0;</div><div class='ctx'> 	create.size = size;</div><div class='ctx'> 	ctx-&gt;fd = ioctl(ctx-&gt;devfd, UDMABUF_CREATE, &amp;create);</div><div class='del'>-	if (ctx-&gt;fd &lt; 0)</div><div class='del'>-		error(1, errno, "%s: [FAIL, create udmabuf]\n", TEST_PREFIX);</div><div class='add'>+	if (ctx-&gt;fd &lt; 0) {</div><div class='add'>+		pr_err("[FAIL, create udmabuf]");</div><div class='add'>+		goto err_close_fd;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;buf_mem = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,</div><div class='ctx'> 			    ctx-&gt;fd, 0);</div><div class='del'>-	if (ctx-&gt;buf_mem == MAP_FAILED)</div><div class='del'>-		error(1, errno, "%s: [FAIL, map udmabuf]\n", TEST_PREFIX);</div><div class='add'>+	if (ctx-&gt;buf_mem == MAP_FAILED) {</div><div class='add'>+		pr_err("[FAIL, map udmabuf]");</div><div class='add'>+		goto err_close_fd;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ctx;</div><div class='add'>+</div><div class='add'>+err_close_fd:</div><div class='add'>+	close(ctx-&gt;fd);</div><div class='add'>+err_close_memfd:</div><div class='add'>+	close(ctx-&gt;memfd);</div><div class='add'>+err_close_dev:</div><div class='add'>+	close(ctx-&gt;devfd);</div><div class='add'>+err_free_ctx:</div><div class='add'>+	free(ctx);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void udmabuf_free(struct memory_buffer *ctx)</div><div class='hunk'>@@ -153,6 +211,20 @@ static void udmabuf_free(struct memory_buffer *ctx)</div><div class='ctx'> 	free(ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void udmabuf_memcpy_to_device(struct memory_buffer *dst, size_t off,</div><div class='add'>+				     void *src, int n)</div><div class='add'>+{</div><div class='add'>+	struct dma_buf_sync sync = {};</div><div class='add'>+</div><div class='add'>+	sync.flags = DMA_BUF_SYNC_START | DMA_BUF_SYNC_WRITE;</div><div class='add'>+	ioctl(dst-&gt;fd, DMA_BUF_IOCTL_SYNC, &amp;sync);</div><div class='add'>+</div><div class='add'>+	memcpy(dst-&gt;buf_mem + off, src, n);</div><div class='add'>+</div><div class='add'>+	sync.flags = DMA_BUF_SYNC_END | DMA_BUF_SYNC_WRITE;</div><div class='add'>+	ioctl(dst-&gt;fd, DMA_BUF_IOCTL_SYNC, &amp;sync);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void udmabuf_memcpy_from_device(void *dst, struct memory_buffer *src,</div><div class='ctx'> 				       size_t off, int n)</div><div class='ctx'> {</div><div class='hunk'>@@ -170,6 +242,7 @@ static void udmabuf_memcpy_from_device(void *dst, struct memory_buffer *src,</div><div class='ctx'> static struct memory_provider udmabuf_memory_provider = {</div><div class='ctx'> 	.alloc = udmabuf_alloc,</div><div class='ctx'> 	.free = udmabuf_free,</div><div class='add'>+	.memcpy_to_device = udmabuf_memcpy_to_device,</div><div class='ctx'> 	.memcpy_from_device = udmabuf_memcpy_from_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -184,21 +257,25 @@ static void print_nonzero_bytes(void *ptr, size_t size)</div><div class='ctx'> 		putchar(p[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void validate_buffer(void *line, size_t size)</div><div class='add'>+int validate_buffer(void *line, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	static unsigned char seed = 1;</div><div class='ctx'> 	unsigned char *ptr = line;</div><div class='del'>-	int errors = 0;</div><div class='add'>+	unsigned char expected;</div><div class='add'>+	static int errors;</div><div class='ctx'> 	size_t i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; size; i++) {</div><div class='del'>-		if (ptr[i] != seed) {</div><div class='add'>+		expected = seed ? seed : '\n';</div><div class='add'>+		if (ptr[i] != expected) {</div><div class='ctx'> 			fprintf(stderr,</div><div class='ctx'> 				"Failed validation: expected=%u, actual=%u, index=%lu\n",</div><div class='del'>-				seed, ptr[i], i);</div><div class='add'>+				expected, ptr[i], i);</div><div class='ctx'> 			errors++;</div><div class='del'>-			if (errors &gt; 20)</div><div class='del'>-				error(1, 0, "validation failed.");</div><div class='add'>+			if (errors &gt; 20) {</div><div class='add'>+				pr_err("validation failed");</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		seed++;</div><div class='ctx'> 		if (seed == do_validation)</div><div class='hunk'>@@ -206,6 +283,86 @@ void validate_buffer(void *line, size_t size)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fprintf(stdout, "Validated buffer\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__run_command(char *out, size_t outlen, const char *cmd, va_list args)</div><div class='add'>+{</div><div class='add'>+	char command[256];</div><div class='add'>+	FILE *fp;</div><div class='add'>+</div><div class='add'>+	vsnprintf(command, sizeof(command), cmd, args);</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "Running: %s\n", command);</div><div class='add'>+	fp = popen(command, "r");</div><div class='add'>+	if (!fp)</div><div class='add'>+		return -1;</div><div class='add'>+	if (out) {</div><div class='add'>+		size_t len;</div><div class='add'>+</div><div class='add'>+		if (!fgets(out, outlen, fp))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		/* Remove trailing newline if present */</div><div class='add'>+		len = strlen(out);</div><div class='add'>+		if (len &amp;&amp; out[len - 1] == '\n')</div><div class='add'>+			out[len - 1] = '\0';</div><div class='add'>+	}</div><div class='add'>+	return pclose(fp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int run_command(const char *cmd, ...)</div><div class='add'>+{</div><div class='add'>+	va_list args;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	va_start(args, cmd);</div><div class='add'>+	ret = __run_command(NULL, 0, cmd, args);</div><div class='add'>+	va_end(args);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethtool_add_flow(const char *format, ...)</div><div class='add'>+{</div><div class='add'>+	char local_output[256], cmd[256];</div><div class='add'>+	const char *id_start;</div><div class='add'>+	int flow_idx, ret;</div><div class='add'>+	char *endptr;</div><div class='add'>+	long flow_id;</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	for (flow_idx = 0; flow_idx &lt; MAX_FLOWS; flow_idx++)</div><div class='add'>+		if (ntuple_ids[flow_idx] == -1)</div><div class='add'>+			break;</div><div class='add'>+	if (flow_idx == MAX_FLOWS) {</div><div class='add'>+		fprintf(stderr, "Error: too many flows\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(cmd, sizeof(cmd), "ethtool -N %s %s", ifname, format);</div><div class='add'>+</div><div class='add'>+	va_start(args, format);</div><div class='add'>+	ret = __run_command(local_output, sizeof(local_output), cmd, args);</div><div class='add'>+	va_end(args);</div><div class='add'>+</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Extract the ID from the output */</div><div class='add'>+	id_start = strstr(local_output, "Added rule with ID ");</div><div class='add'>+	if (!id_start)</div><div class='add'>+		return -1;</div><div class='add'>+	id_start += strlen("Added rule with ID ");</div><div class='add'>+</div><div class='add'>+	flow_id = strtol(id_start, &amp;endptr, 10);</div><div class='add'>+	if (endptr == id_start || flow_id &lt; 0 || flow_id &gt; INT_MAX)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "Added flow rule with ID %ld\n", flow_id);</div><div class='add'>+	ntuple_ids[flow_idx] = flow_id;</div><div class='add'>+	return flow_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rxq_num(int ifindex)</div><div class='hunk'>@@ -235,29 +392,17 @@ static int rxq_num(int ifindex)</div><div class='ctx'> 	return num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define run_command(cmd, ...)                                           \</div><div class='del'>-	({                                                              \</div><div class='del'>-		char command[256];                                      \</div><div class='del'>-		memset(command, 0, sizeof(command));                    \</div><div class='del'>-		snprintf(command, sizeof(command), cmd, ##__VA_ARGS__); \</div><div class='del'>-		fprintf(stderr, "Running: %s\n", command);                       \</div><div class='del'>-		system(command);                                        \</div><div class='del'>-	})</div><div class='del'>-</div><div class='del'>-static int reset_flow_steering(void)</div><div class='del'>-{</div><div class='del'>-	/* Depending on the NIC, toggling ntuple off and on might not</div><div class='del'>-	 * be allowed. Additionally, attempting to delete existing filters</div><div class='del'>-	 * will fail if no filters are present. Therefore, do not enforce</div><div class='del'>-	 * the exit status.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	run_command("sudo ethtool -K %s ntuple off &gt;&amp;2", ifname);</div><div class='del'>-	run_command("sudo ethtool -K %s ntuple on &gt;&amp;2", ifname);</div><div class='del'>-	run_command(</div><div class='del'>-		"sudo ethtool -n %s | grep 'Filter:' | awk '{print $2}' | xargs -n1 ethtool -N %s delete &gt;&amp;2",</div><div class='del'>-		ifname, ifname);</div><div class='del'>-	return 0;</div><div class='add'>+static void reset_flow_steering(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_FLOWS; i++) {</div><div class='add'>+		if (ntuple_ids[i] == -1)</div><div class='add'>+			continue;</div><div class='add'>+		run_command("ethtool -N %s delete %d",</div><div class='add'>+			    ifname, ntuple_ids[i]);</div><div class='add'>+		ntuple_ids[i] = -1;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *tcp_data_split_str(int val)</div><div class='hunk'>@@ -274,7 +419,81 @@ static const char *tcp_data_split_str(int val)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int configure_headersplit(bool on)</div><div class='add'>+static struct ethtool_rings_get_rsp *get_ring_config(void)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rings_get_req *get_req;</div><div class='add'>+	struct ethtool_rings_get_rsp *get_rsp;</div><div class='add'>+	struct ynl_error yerr;</div><div class='add'>+	struct ynl_sock *ys;</div><div class='add'>+</div><div class='add'>+	ys = ynl_sock_create(&amp;ynl_ethtool_family, &amp;yerr);</div><div class='add'>+	if (!ys) {</div><div class='add'>+		fprintf(stderr, "YNL: %s\n", yerr.msg);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	get_req = ethtool_rings_get_req_alloc();</div><div class='add'>+	ethtool_rings_get_req_set_header_dev_index(get_req, ifindex);</div><div class='add'>+	get_rsp = ethtool_rings_get(ys, get_req);</div><div class='add'>+	ethtool_rings_get_req_free(get_req);</div><div class='add'>+</div><div class='add'>+	ynl_sock_destroy(ys);</div><div class='add'>+</div><div class='add'>+	return get_rsp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void restore_ring_config(const struct ethtool_rings_get_rsp *config)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rings_get_req *get_req;</div><div class='add'>+	struct ethtool_rings_get_rsp *get_rsp;</div><div class='add'>+	struct ethtool_rings_set_req *req;</div><div class='add'>+	struct ynl_error yerr;</div><div class='add'>+	struct ynl_sock *ys;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!config)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ys = ynl_sock_create(&amp;ynl_ethtool_family, &amp;yerr);</div><div class='add'>+	if (!ys) {</div><div class='add'>+		fprintf(stderr, "YNL: %s\n", yerr.msg);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req = ethtool_rings_set_req_alloc();</div><div class='add'>+	ethtool_rings_set_req_set_header_dev_index(req, ifindex);</div><div class='add'>+	ethtool_rings_set_req_set_tcp_data_split(req,</div><div class='add'>+						ETHTOOL_TCP_DATA_SPLIT_UNKNOWN);</div><div class='add'>+	if (config-&gt;_present.hds_thresh)</div><div class='add'>+		ethtool_rings_set_req_set_hds_thresh(req, config-&gt;hds_thresh);</div><div class='add'>+</div><div class='add'>+	ret = ethtool_rings_set(ys, req);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		fprintf(stderr, "YNL restoring HDS cfg: %s\n", ys-&gt;err.msg);</div><div class='add'>+</div><div class='add'>+	get_req = ethtool_rings_get_req_alloc();</div><div class='add'>+	ethtool_rings_get_req_set_header_dev_index(get_req, ifindex);</div><div class='add'>+	get_rsp = ethtool_rings_get(ys, get_req);</div><div class='add'>+	ethtool_rings_get_req_free(get_req);</div><div class='add'>+</div><div class='add'>+	/* use explicit value if UKNOWN didn't give us the previous */</div><div class='add'>+	if (get_rsp-&gt;tcp_data_split != config-&gt;tcp_data_split) {</div><div class='add'>+		ethtool_rings_set_req_set_tcp_data_split(req,</div><div class='add'>+							config-&gt;tcp_data_split);</div><div class='add'>+		ret = ethtool_rings_set(ys, req);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			fprintf(stderr, "YNL restoring expl HDS cfg: %s\n",</div><div class='add'>+				ys-&gt;err.msg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ethtool_rings_get_rsp_free(get_rsp);</div><div class='add'>+	ethtool_rings_set_req_free(req);</div><div class='add'>+</div><div class='add'>+	ynl_sock_destroy(ys);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+configure_headersplit(const struct ethtool_rings_get_rsp *old, bool on)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_rings_get_req *get_req;</div><div class='ctx'> 	struct ethtool_rings_get_rsp *get_rsp;</div><div class='hunk'>@@ -291,8 +510,15 @@ static int configure_headersplit(bool on)</div><div class='ctx'> </div><div class='ctx'> 	req = ethtool_rings_set_req_alloc();</div><div class='ctx'> 	ethtool_rings_set_req_set_header_dev_index(req, ifindex);</div><div class='del'>-	/* 0 - off, 1 - auto, 2 - on */</div><div class='del'>-	ethtool_rings_set_req_set_tcp_data_split(req, on ? 2 : 0);</div><div class='add'>+	if (on) {</div><div class='add'>+		ethtool_rings_set_req_set_tcp_data_split(req,</div><div class='add'>+						ETHTOOL_TCP_DATA_SPLIT_ENABLED);</div><div class='add'>+		if (old-&gt;_present.hds_thresh)</div><div class='add'>+			ethtool_rings_set_req_set_hds_thresh(req, 0);</div><div class='add'>+	} else {</div><div class='add'>+		ethtool_rings_set_req_set_tcp_data_split(req,</div><div class='add'>+						ETHTOOL_TCP_DATA_SPLIT_UNKNOWN);</div><div class='add'>+	}</div><div class='ctx'> 	ret = ethtool_rings_set(ys, req);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		fprintf(stderr, "YNL failed: %s\n", ys-&gt;err.msg);</div><div class='hunk'>@@ -316,12 +542,103 @@ static int configure_headersplit(bool on)</div><div class='ctx'> </div><div class='ctx'> static int configure_rss(void)</div><div class='ctx'> {</div><div class='del'>-	return run_command("sudo ethtool -X %s equal %d &gt;&amp;2", ifname, start_queue);</div><div class='add'>+	return run_command("ethtool -X %s equal %d &gt;&amp;2", ifname, start_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_rss(void)</div><div class='add'>+{</div><div class='add'>+	run_command("ethtool -X %s default &gt;&amp;2", ifname, start_queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int configure_channels(unsigned int rx, unsigned int tx)</div><div class='add'>+static int check_changing_channels(unsigned int rx, unsigned int tx)</div><div class='ctx'> {</div><div class='del'>-	return run_command("sudo ethtool -L %s rx %u tx %u", ifname, rx, tx);</div><div class='add'>+	struct ethtool_channels_get_req *gchan;</div><div class='add'>+	struct ethtool_channels_set_req *schan;</div><div class='add'>+	struct ethtool_channels_get_rsp *chan;</div><div class='add'>+	struct ynl_error yerr;</div><div class='add'>+	struct ynl_sock *ys;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "setting channel count rx:%u tx:%u\n", rx, tx);</div><div class='add'>+</div><div class='add'>+	ys = ynl_sock_create(&amp;ynl_ethtool_family, &amp;yerr);</div><div class='add'>+	if (!ys) {</div><div class='add'>+		fprintf(stderr, "YNL: %s\n", yerr.msg);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gchan = ethtool_channels_get_req_alloc();</div><div class='add'>+	if (!gchan) {</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto exit_close_sock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ethtool_channels_get_req_set_header_dev_index(gchan, ifindex);</div><div class='add'>+	chan = ethtool_channels_get(ys, gchan);</div><div class='add'>+	ethtool_channels_get_req_free(gchan);</div><div class='add'>+	if (!chan) {</div><div class='add'>+		fprintf(stderr, "YNL get channels: %s\n", ys-&gt;err.msg);</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto exit_close_sock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	schan =	ethtool_channels_set_req_alloc();</div><div class='add'>+	if (!schan) {</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto exit_free_chan;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ethtool_channels_set_req_set_header_dev_index(schan, ifindex);</div><div class='add'>+</div><div class='add'>+	if (chan-&gt;_present.combined_count) {</div><div class='add'>+		if (chan-&gt;_present.rx_count || chan-&gt;_present.tx_count) {</div><div class='add'>+			ethtool_channels_set_req_set_rx_count(schan, 0);</div><div class='add'>+			ethtool_channels_set_req_set_tx_count(schan, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (rx == tx) {</div><div class='add'>+			ethtool_channels_set_req_set_combined_count(schan, rx);</div><div class='add'>+		} else if (rx &gt; tx) {</div><div class='add'>+			ethtool_channels_set_req_set_combined_count(schan, tx);</div><div class='add'>+			ethtool_channels_set_req_set_rx_count(schan, rx - tx);</div><div class='add'>+		} else {</div><div class='add'>+			ethtool_channels_set_req_set_combined_count(schan, rx);</div><div class='add'>+			ethtool_channels_set_req_set_tx_count(schan, tx - rx);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else if (chan-&gt;_present.rx_count) {</div><div class='add'>+		ethtool_channels_set_req_set_rx_count(schan, rx);</div><div class='add'>+		ethtool_channels_set_req_set_tx_count(schan, tx);</div><div class='add'>+	} else {</div><div class='add'>+		fprintf(stderr, "Error: device has neither combined nor rx channels\n");</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto exit_free_schan;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ethtool_channels_set(ys, schan);</div><div class='add'>+	if (ret) {</div><div class='add'>+		fprintf(stderr, "YNL set channels: %s\n", ys-&gt;err.msg);</div><div class='add'>+	} else {</div><div class='add'>+		/* We were expecting a failure, go back to previous settings */</div><div class='add'>+		ethtool_channels_set_req_set_combined_count(schan,</div><div class='add'>+							    chan-&gt;combined_count);</div><div class='add'>+		ethtool_channels_set_req_set_rx_count(schan, chan-&gt;rx_count);</div><div class='add'>+		ethtool_channels_set_req_set_tx_count(schan, chan-&gt;tx_count);</div><div class='add'>+</div><div class='add'>+		ret = ethtool_channels_set(ys, schan);</div><div class='add'>+		if (ret)</div><div class='add'>+			fprintf(stderr, "YNL un-setting channels: %s\n",</div><div class='add'>+				ys-&gt;err.msg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit_free_schan:</div><div class='add'>+	ethtool_channels_set_req_free(schan);</div><div class='add'>+exit_free_chan:</div><div class='add'>+	ethtool_channels_get_rsp_free(chan);</div><div class='add'>+exit_close_sock:</div><div class='add'>+	ynl_sock_destroy(ys);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int configure_flow_steering(struct sockaddr_in6 *server_sin)</div><div class='hunk'>@@ -329,6 +646,7 @@ static int configure_flow_steering(struct sockaddr_in6 *server_sin)</div><div class='ctx'> 	const char *type = "tcp6";</div><div class='ctx'> 	const char *server_addr;</div><div class='ctx'> 	char buf[40];</div><div class='add'>+	int flow_id;</div><div class='ctx'> </div><div class='ctx'> 	inet_ntop(AF_INET6, &amp;server_sin-&gt;sin6_addr, buf, sizeof(buf));</div><div class='ctx'> 	server_addr = buf;</div><div class='hunk'>@@ -338,15 +656,25 @@ static int configure_flow_steering(struct sockaddr_in6 *server_sin)</div><div class='ctx'> 		server_addr = strrchr(server_addr, ':') + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return run_command("sudo ethtool -N %s flow-type %s %s %s dst-ip %s %s %s dst-port %s queue %d &gt;&amp;2",</div><div class='del'>-			   ifname,</div><div class='del'>-			   type,</div><div class='del'>-			   client_ip ? "src-ip" : "",</div><div class='del'>-			   client_ip ?: "",</div><div class='del'>-			   server_addr,</div><div class='del'>-			   client_ip ? "src-port" : "",</div><div class='del'>-			   client_ip ? port : "",</div><div class='del'>-			   port, start_queue);</div><div class='add'>+	/* Try configure 5-tuple */</div><div class='add'>+	flow_id = ethtool_add_flow("flow-type %s %s %s dst-ip %s %s %s dst-port %s queue %d",</div><div class='add'>+				   type,</div><div class='add'>+				   client_ip ? "src-ip" : "",</div><div class='add'>+				   client_ip ?: "",</div><div class='add'>+				   server_addr,</div><div class='add'>+				   client_ip ? "src-port" : "",</div><div class='add'>+				   client_ip ? port : "",</div><div class='add'>+				   port, start_queue);</div><div class='add'>+	if (flow_id &lt; 0) {</div><div class='add'>+		/* If that fails, try configure 3-tuple */</div><div class='add'>+		flow_id = ethtool_add_flow("flow-type %s dst-ip %s dst-port %s queue %d",</div><div class='add'>+					   type, server_addr, port, start_queue);</div><div class='add'>+		if (flow_id &lt; 0)</div><div class='add'>+			/* If that fails, return error */</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bind_rx_queue(unsigned int ifindex, unsigned int dmabuf_fd,</div><div class='hunk'>@@ -359,6 +687,7 @@ static int bind_rx_queue(unsigned int ifindex, unsigned int dmabuf_fd,</div><div class='ctx'> </div><div class='ctx'> 	*ys = ynl_sock_create(&amp;ynl_netdev_family, &amp;yerr);</div><div class='ctx'> 	if (!*ys) {</div><div class='add'>+		netdev_queue_id_free(queues);</div><div class='ctx'> 		fprintf(stderr, "YNL: %s\n", yerr.msg);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -394,18 +723,67 @@ err_close:</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void enable_reuseaddr(int fd)</div><div class='add'>+static int bind_tx_queue(unsigned int ifindex, unsigned int dmabuf_fd,</div><div class='add'>+			 struct ynl_sock **ys)</div><div class='add'>+{</div><div class='add'>+	struct netdev_bind_tx_req *req = NULL;</div><div class='add'>+	struct netdev_bind_tx_rsp *rsp = NULL;</div><div class='add'>+	struct ynl_error yerr;</div><div class='add'>+</div><div class='add'>+	*ys = ynl_sock_create(&amp;ynl_netdev_family, &amp;yerr);</div><div class='add'>+	if (!*ys) {</div><div class='add'>+		fprintf(stderr, "YNL: %s\n", yerr.msg);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req = netdev_bind_tx_req_alloc();</div><div class='add'>+	netdev_bind_tx_req_set_ifindex(req, ifindex);</div><div class='add'>+	netdev_bind_tx_req_set_fd(req, dmabuf_fd);</div><div class='add'>+</div><div class='add'>+	rsp = netdev_bind_tx(*ys, req);</div><div class='add'>+	if (!rsp) {</div><div class='add'>+		perror("netdev_bind_tx");</div><div class='add'>+		goto err_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rsp-&gt;_present.id) {</div><div class='add'>+		perror("id not present");</div><div class='add'>+		goto err_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "got tx dmabuf id=%d\n", rsp-&gt;id);</div><div class='add'>+	tx_dmabuf_id = rsp-&gt;id;</div><div class='add'>+</div><div class='add'>+	netdev_bind_tx_req_free(req);</div><div class='add'>+	netdev_bind_tx_rsp_free(rsp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_close:</div><div class='add'>+	fprintf(stderr, "YNL failed: %s\n", (*ys)-&gt;err.msg);</div><div class='add'>+	netdev_bind_tx_req_free(req);</div><div class='add'>+	ynl_sock_destroy(*ys);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enable_reuseaddr(int fd)</div><div class='ctx'> {</div><div class='ctx'> 	int opt = 1;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &amp;opt, sizeof(opt));</div><div class='del'>-	if (ret)</div><div class='del'>-		error(1, errno, "%s: [FAIL, SO_REUSEPORT]\n", TEST_PREFIX);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("SO_REUSEPORT failed");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &amp;opt, sizeof(opt));</div><div class='del'>-	if (ret)</div><div class='del'>-		error(1, errno, "%s: [FAIL, SO_REUSEADDR]\n", TEST_PREFIX);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("SO_REUSEADDR failed");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int parse_address(const char *str, int port, struct sockaddr_in6 *sin6)</div><div class='hunk'>@@ -432,10 +810,24 @@ static int parse_address(const char *str, int port, struct sockaddr_in6 *sin6)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int do_server(struct memory_buffer *mem)</div><div class='add'>+static struct netdev_queue_id *create_queues(void)</div><div class='ctx'> {</div><div class='del'>-	char ctrl_data[sizeof(int) * 20000];</div><div class='ctx'> 	struct netdev_queue_id *queues;</div><div class='add'>+	size_t i = 0;</div><div class='add'>+</div><div class='add'>+	queues = netdev_queue_id_alloc(num_queues);</div><div class='add'>+	for (i = 0; i &lt; num_queues; i++) {</div><div class='add'>+		netdev_queue_id_set_type(&amp;queues[i], NETDEV_QUEUE_TYPE_RX);</div><div class='add'>+		netdev_queue_id_set_id(&amp;queues[i], start_queue + i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return queues;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_server(struct memory_buffer *mem)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rings_get_rsp *ring_config;</div><div class='add'>+	char ctrl_data[sizeof(int) * 20000];</div><div class='ctx'> 	size_t non_page_aligned_frags = 0;</div><div class='ctx'> 	struct sockaddr_in6 client_addr;</div><div class='ctx'> 	struct sockaddr_in6 server_sin;</div><div class='hunk'>@@ -446,64 +838,72 @@ int do_server(struct memory_buffer *mem)</div><div class='ctx'> 	char *tmp_mem = NULL;</div><div class='ctx'> 	struct ynl_sock *ys;</div><div class='ctx'> 	char iobuf[819200];</div><div class='add'>+	int ret, err = -1;</div><div class='ctx'> 	char buffer[256];</div><div class='ctx'> 	int socket_fd;</div><div class='ctx'> 	int client_fd;</div><div class='del'>-	size_t i = 0;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = parse_address(server_ip, atoi(port), &amp;server_sin);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		error(1, 0, "parse server address");</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("parse server address");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (reset_flow_steering())</div><div class='del'>-		error(1, 0, "Failed to reset flow steering\n");</div><div class='add'>+	ring_config = get_ring_config();</div><div class='add'>+	if (!ring_config) {</div><div class='add'>+		pr_err("Failed to get current ring configuration");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (configure_headersplit(1))</div><div class='del'>-		error(1, 0, "Failed to enable TCP header split\n");</div><div class='add'>+	if (configure_headersplit(ring_config, 1)) {</div><div class='add'>+		pr_err("Failed to enable TCP header split");</div><div class='add'>+		goto err_free_ring_config;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Configure RSS to divert all traffic from our devmem queues */</div><div class='del'>-	if (configure_rss())</div><div class='del'>-		error(1, 0, "Failed to configure rss\n");</div><div class='add'>+	if (configure_rss()) {</div><div class='add'>+		pr_err("Failed to configure rss");</div><div class='add'>+		goto err_reset_headersplit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Flow steer our devmem flows to start_queue */</div><div class='del'>-	if (configure_flow_steering(&amp;server_sin))</div><div class='del'>-		error(1, 0, "Failed to configure flow steering\n");</div><div class='del'>-</div><div class='del'>-	sleep(1);</div><div class='del'>-</div><div class='del'>-	queues = malloc(sizeof(*queues) * num_queues);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_queues; i++) {</div><div class='del'>-		queues[i]._present.type = 1;</div><div class='del'>-		queues[i]._present.id = 1;</div><div class='del'>-		queues[i].type = NETDEV_QUEUE_TYPE_RX;</div><div class='del'>-		queues[i].id = start_queue + i;</div><div class='add'>+	if (configure_flow_steering(&amp;server_sin)) {</div><div class='add'>+		pr_err("Failed to configure flow steering");</div><div class='add'>+		goto err_reset_rss;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bind_rx_queue(ifindex, mem-&gt;fd, queues, num_queues, &amp;ys))</div><div class='del'>-		error(1, 0, "Failed to bind\n");</div><div class='add'>+	if (bind_rx_queue(ifindex, mem-&gt;fd, create_queues(), num_queues, &amp;ys)) {</div><div class='add'>+		pr_err("Failed to bind");</div><div class='add'>+		goto err_reset_flow_steering;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tmp_mem = malloc(mem-&gt;size);</div><div class='ctx'> 	if (!tmp_mem)</div><div class='del'>-		error(1, ENOMEM, "malloc failed");</div><div class='add'>+		goto err_unbind;</div><div class='ctx'> </div><div class='ctx'> 	socket_fd = socket(AF_INET6, SOCK_STREAM, 0);</div><div class='del'>-	if (socket_fd &lt; 0)</div><div class='del'>-		error(1, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX);</div><div class='add'>+	if (socket_fd &lt; 0) {</div><div class='add'>+		pr_err("Failed to create socket");</div><div class='add'>+		goto err_free_tmp;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	enable_reuseaddr(socket_fd);</div><div class='add'>+	if (enable_reuseaddr(socket_fd))</div><div class='add'>+		goto err_close_socket;</div><div class='ctx'> </div><div class='ctx'> 	fprintf(stderr, "binding to address %s:%d\n", server_ip,</div><div class='ctx'> 		ntohs(server_sin.sin6_port));</div><div class='ctx'> </div><div class='ctx'> 	ret = bind(socket_fd, &amp;server_sin, sizeof(server_sin));</div><div class='del'>-	if (ret)</div><div class='del'>-		error(1, errno, "%s: [FAIL, bind]\n", TEST_PREFIX);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Failed to bind");</div><div class='add'>+		goto err_close_socket;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = listen(socket_fd, 1);</div><div class='del'>-	if (ret)</div><div class='del'>-		error(1, errno, "%s: [FAIL, listen]\n", TEST_PREFIX);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("Failed to listen");</div><div class='add'>+		goto err_close_socket;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	client_addr_len = sizeof(client_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -512,6 +912,10 @@ int do_server(struct memory_buffer *mem)</div><div class='ctx'> 	fprintf(stderr, "Waiting or connection on %s:%d\n", buffer,</div><div class='ctx'> 		ntohs(server_sin.sin6_port));</div><div class='ctx'> 	client_fd = accept(socket_fd, &amp;client_addr, &amp;client_addr_len);</div><div class='add'>+	if (client_fd &lt; 0) {</div><div class='add'>+		pr_err("Failed to accept");</div><div class='add'>+		goto err_close_socket;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	inet_ntop(AF_INET6, &amp;client_addr.sin6_addr, buffer,</div><div class='ctx'> 		  sizeof(buffer));</div><div class='hunk'>@@ -539,14 +943,18 @@ int do_server(struct memory_buffer *mem)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			perror("recvmsg");</div><div class='add'>+			if (errno == EFAULT) {</div><div class='add'>+				pr_err("received EFAULT, won't recover");</div><div class='add'>+				goto err_close_client;</div><div class='add'>+			}</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret == 0) {</div><div class='del'>-			fprintf(stderr, "client exited\n");</div><div class='add'>+			errno = 0;</div><div class='add'>+			pr_err("client exited");</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		i++;</div><div class='ctx'> 		for (cm = CMSG_FIRSTHDR(&amp;msg); cm; cm = CMSG_NXTHDR(&amp;msg, cm)) {</div><div class='ctx'> 			if (cm-&gt;cmsg_level != SOL_SOCKET ||</div><div class='ctx'> 			    (cm-&gt;cmsg_type != SCM_DEVMEM_DMABUF &amp;&amp;</div><div class='hunk'>@@ -581,9 +989,10 @@ int do_server(struct memory_buffer *mem)</div><div class='ctx'> 				dmabuf_cmsg-&gt;frag_size, dmabuf_cmsg-&gt;frag_token,</div><div class='ctx'> 				total_received, dmabuf_cmsg-&gt;dmabuf_id);</div><div class='ctx'> </div><div class='del'>-			if (dmabuf_cmsg-&gt;dmabuf_id != dmabuf_id)</div><div class='del'>-				error(1, 0,</div><div class='del'>-				      "received on wrong dmabuf_id: flow steering error\n");</div><div class='add'>+			if (dmabuf_cmsg-&gt;dmabuf_id != dmabuf_id) {</div><div class='add'>+				pr_err("received on wrong dmabuf_id: flow steering error");</div><div class='add'>+				goto err_close_client;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			if (dmabuf_cmsg-&gt;frag_size % getpagesize())</div><div class='ctx'> 				non_page_aligned_frags++;</div><div class='hunk'>@@ -594,22 +1003,27 @@ int do_server(struct memory_buffer *mem)</div><div class='ctx'> 						     dmabuf_cmsg-&gt;frag_offset,</div><div class='ctx'> 						     dmabuf_cmsg-&gt;frag_size);</div><div class='ctx'> </div><div class='del'>-			if (do_validation)</div><div class='del'>-				validate_buffer(tmp_mem,</div><div class='del'>-						dmabuf_cmsg-&gt;frag_size);</div><div class='del'>-			else</div><div class='add'>+			if (do_validation) {</div><div class='add'>+				if (validate_buffer(tmp_mem,</div><div class='add'>+						    dmabuf_cmsg-&gt;frag_size))</div><div class='add'>+					goto err_close_client;</div><div class='add'>+			} else {</div><div class='ctx'> 				print_nonzero_bytes(tmp_mem,</div><div class='ctx'> 						    dmabuf_cmsg-&gt;frag_size);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			ret = setsockopt(client_fd, SOL_SOCKET,</div><div class='ctx'> 					 SO_DEVMEM_DONTNEED, &amp;token,</div><div class='ctx'> 					 sizeof(token));</div><div class='del'>-			if (ret != 1)</div><div class='del'>-				error(1, 0,</div><div class='del'>-				      "SO_DEVMEM_DONTNEED not enough tokens");</div><div class='add'>+			if (ret != 1) {</div><div class='add'>+				pr_err("SO_DEVMEM_DONTNEED not enough tokens");</div><div class='add'>+				goto err_close_client;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!is_devmem) {</div><div class='add'>+			pr_err("flow steering error");</div><div class='add'>+			goto err_close_client;</div><div class='ctx'> 		}</div><div class='del'>-		if (!is_devmem)</div><div class='del'>-			error(1, 0, "flow steering error\n");</div><div class='ctx'> </div><div class='ctx'> 		fprintf(stderr, "total_received=%lu\n", total_received);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -620,79 +1034,370 @@ int do_server(struct memory_buffer *mem)</div><div class='ctx'> 		page_aligned_frags, non_page_aligned_frags);</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='add'>+	err = 0;</div><div class='ctx'> </div><div class='del'>-	free(tmp_mem);</div><div class='add'>+err_close_client:</div><div class='ctx'> 	close(client_fd);</div><div class='add'>+err_close_socket:</div><div class='ctx'> 	close(socket_fd);</div><div class='add'>+err_free_tmp:</div><div class='add'>+	free(tmp_mem);</div><div class='add'>+err_unbind:</div><div class='ctx'> 	ynl_sock_destroy(ys);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+err_reset_flow_steering:</div><div class='add'>+	reset_flow_steering();</div><div class='add'>+err_reset_rss:</div><div class='add'>+	reset_rss();</div><div class='add'>+err_reset_headersplit:</div><div class='add'>+	restore_ring_config(ring_config);</div><div class='add'>+err_free_ring_config:</div><div class='add'>+	ethtool_rings_get_rsp_free(ring_config);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void run_devmem_tests(void)</div><div class='add'>+int run_devmem_tests(void)</div><div class='ctx'> {</div><div class='add'>+	struct ethtool_rings_get_rsp *ring_config;</div><div class='ctx'> 	struct netdev_queue_id *queues;</div><div class='ctx'> 	struct memory_buffer *mem;</div><div class='ctx'> 	struct ynl_sock *ys;</div><div class='del'>-	size_t i = 0;</div><div class='add'>+	int err = -1;</div><div class='ctx'> </div><div class='ctx'> 	mem = provider-&gt;alloc(getpagesize() * NUM_PAGES);</div><div class='add'>+	if (!mem) {</div><div class='add'>+		pr_err("Failed to allocate memory buffer");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ring_config = get_ring_config();</div><div class='add'>+	if (!ring_config) {</div><div class='add'>+		pr_err("Failed to get current ring configuration");</div><div class='add'>+		goto err_free_mem;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Configure RSS to divert all traffic from our devmem queues */</div><div class='del'>-	if (configure_rss())</div><div class='del'>-		error(1, 0, "rss error\n");</div><div class='add'>+	if (configure_rss()) {</div><div class='add'>+		pr_err("rss error");</div><div class='add'>+		goto err_free_ring_config;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	queues = calloc(num_queues, sizeof(*queues));</div><div class='add'>+	if (configure_headersplit(ring_config, 1)) {</div><div class='add'>+		pr_err("Failed to configure header split");</div><div class='add'>+		goto err_reset_rss;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (configure_headersplit(1))</div><div class='del'>-		error(1, 0, "Failed to configure header split\n");</div><div class='add'>+	queues = netdev_queue_id_alloc(num_queues);</div><div class='add'>+	if (!queues) {</div><div class='add'>+		pr_err("Failed to allocate empty queues array");</div><div class='add'>+		goto err_reset_headersplit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!bind_rx_queue(ifindex, mem-&gt;fd, queues, num_queues, &amp;ys))</div><div class='del'>-		error(1, 0, "Binding empty queues array should have failed\n");</div><div class='add'>+	if (!bind_rx_queue(ifindex, mem-&gt;fd, queues, num_queues, &amp;ys)) {</div><div class='add'>+		pr_err("Binding empty queues array should have failed");</div><div class='add'>+		goto err_unbind;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_queues; i++) {</div><div class='del'>-		queues[i]._present.type = 1;</div><div class='del'>-		queues[i]._present.id = 1;</div><div class='del'>-		queues[i].type = NETDEV_QUEUE_TYPE_RX;</div><div class='del'>-		queues[i].id = start_queue + i;</div><div class='add'>+	if (configure_headersplit(ring_config, 0)) {</div><div class='add'>+		pr_err("Failed to configure header split");</div><div class='add'>+		goto err_reset_headersplit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (configure_headersplit(0))</div><div class='del'>-		error(1, 0, "Failed to configure header split\n");</div><div class='add'>+	queues = create_queues();</div><div class='add'>+	if (!queues) {</div><div class='add'>+		pr_err("Failed to create queues");</div><div class='add'>+		goto err_reset_headersplit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!bind_rx_queue(ifindex, mem-&gt;fd, queues, num_queues, &amp;ys))</div><div class='del'>-		error(1, 0, "Configure dmabuf with header split off should have failed\n");</div><div class='add'>+	if (!bind_rx_queue(ifindex, mem-&gt;fd, queues, num_queues, &amp;ys)) {</div><div class='add'>+		pr_err("Configure dmabuf with header split off should have failed");</div><div class='add'>+		goto err_unbind;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (configure_headersplit(1))</div><div class='del'>-		error(1, 0, "Failed to configure header split\n");</div><div class='add'>+	if (configure_headersplit(ring_config, 1)) {</div><div class='add'>+		pr_err("Failed to configure header split");</div><div class='add'>+		goto err_reset_headersplit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_queues; i++) {</div><div class='del'>-		queues[i]._present.type = 1;</div><div class='del'>-		queues[i]._present.id = 1;</div><div class='del'>-		queues[i].type = NETDEV_QUEUE_TYPE_RX;</div><div class='del'>-		queues[i].id = start_queue + i;</div><div class='add'>+	queues = create_queues();</div><div class='add'>+	if (!queues) {</div><div class='add'>+		pr_err("Failed to create queues");</div><div class='add'>+		goto err_reset_headersplit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bind_rx_queue(ifindex, mem-&gt;fd, queues, num_queues, &amp;ys))</div><div class='del'>-		error(1, 0, "Failed to bind\n");</div><div class='add'>+	if (bind_rx_queue(ifindex, mem-&gt;fd, queues, num_queues, &amp;ys)) {</div><div class='add'>+		pr_err("Failed to bind");</div><div class='add'>+		goto err_reset_headersplit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Deactivating a bound queue should not be legal */</div><div class='del'>-	if (!configure_channels(num_queues, num_queues - 1))</div><div class='del'>-		error(1, 0, "Deactivating a bound queue should be illegal.\n");</div><div class='add'>+	if (!check_changing_channels(num_queues, num_queues)) {</div><div class='add'>+		pr_err("Deactivating a bound queue should be illegal");</div><div class='add'>+		goto err_unbind;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Closing the netlink socket does an implicit unbind */</div><div class='del'>-	ynl_sock_destroy(ys);</div><div class='add'>+	err = 0;</div><div class='add'>+	goto err_unbind;</div><div class='ctx'> </div><div class='add'>+err_unbind:</div><div class='add'>+	ynl_sock_destroy(ys);</div><div class='add'>+err_reset_headersplit:</div><div class='add'>+	restore_ring_config(ring_config);</div><div class='add'>+err_reset_rss:</div><div class='add'>+	reset_rss();</div><div class='add'>+err_free_ring_config:</div><div class='add'>+	ethtool_rings_get_rsp_free(ring_config);</div><div class='add'>+err_free_mem:</div><div class='ctx'> 	provider-&gt;free(mem);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint64_t gettimeofday_ms(void)</div><div class='add'>+{</div><div class='add'>+	struct timeval tv;</div><div class='add'>+</div><div class='add'>+	gettimeofday(&amp;tv, NULL);</div><div class='add'>+	return (tv.tv_sec * 1000ULL) + (tv.tv_usec / 1000ULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_poll(int fd)</div><div class='add'>+{</div><div class='add'>+	struct pollfd pfd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pfd.revents = 0;</div><div class='add'>+	pfd.fd = fd;</div><div class='add'>+</div><div class='add'>+	ret = poll(&amp;pfd, 1, waittime_ms);</div><div class='add'>+	if (ret == -1) {</div><div class='add'>+		pr_err("poll");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret &amp;&amp; (pfd.revents &amp; POLLERR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wait_compl(int fd)</div><div class='add'>+{</div><div class='add'>+	int64_t tstop = gettimeofday_ms() + waittime_ms;</div><div class='add'>+	char control[CMSG_SPACE(100)] = {};</div><div class='add'>+	struct sock_extended_err *serr;</div><div class='add'>+	struct msghdr msg = {};</div><div class='add'>+	struct cmsghdr *cm;</div><div class='add'>+	__u32 hi, lo;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	msg.msg_control = control;</div><div class='add'>+	msg.msg_controllen = sizeof(control);</div><div class='add'>+</div><div class='add'>+	while (gettimeofday_ms() &lt; tstop) {</div><div class='add'>+		ret = do_poll(fd);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		if (!ret)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = recvmsg(fd, &amp;msg, MSG_ERRQUEUE);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			if (errno == EAGAIN)</div><div class='add'>+				continue;</div><div class='add'>+			pr_err("recvmsg(MSG_ERRQUEUE)");</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		if (msg.msg_flags &amp; MSG_CTRUNC) {</div><div class='add'>+			pr_err("MSG_CTRUNC");</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (cm = CMSG_FIRSTHDR(&amp;msg); cm; cm = CMSG_NXTHDR(&amp;msg, cm)) {</div><div class='add'>+			if (cm-&gt;cmsg_level != SOL_IP &amp;&amp;</div><div class='add'>+			    cm-&gt;cmsg_level != SOL_IPV6)</div><div class='add'>+				continue;</div><div class='add'>+			if (cm-&gt;cmsg_level == SOL_IP &amp;&amp;</div><div class='add'>+			    cm-&gt;cmsg_type != IP_RECVERR)</div><div class='add'>+				continue;</div><div class='add'>+			if (cm-&gt;cmsg_level == SOL_IPV6 &amp;&amp;</div><div class='add'>+			    cm-&gt;cmsg_type != IPV6_RECVERR)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			serr = (void *)CMSG_DATA(cm);</div><div class='add'>+			if (serr-&gt;ee_origin != SO_EE_ORIGIN_ZEROCOPY) {</div><div class='add'>+				pr_err("wrong origin %u", serr-&gt;ee_origin);</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+			if (serr-&gt;ee_errno != 0) {</div><div class='add'>+				pr_err("wrong errno %d", serr-&gt;ee_errno);</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			hi = serr-&gt;ee_data;</div><div class='add'>+			lo = serr-&gt;ee_info;</div><div class='add'>+</div><div class='add'>+			fprintf(stderr, "tx complete [%d,%d]\n", lo, hi);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_err("did not receive tx completion");</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_client(struct memory_buffer *mem)</div><div class='add'>+{</div><div class='add'>+	char ctrl_data[CMSG_SPACE(sizeof(__u32))];</div><div class='add'>+	struct sockaddr_in6 server_sin;</div><div class='add'>+	struct sockaddr_in6 client_sin;</div><div class='add'>+	struct ynl_sock *ys = NULL;</div><div class='add'>+	struct iovec iov[MAX_IOV];</div><div class='add'>+	struct msghdr msg = {};</div><div class='add'>+	ssize_t line_size = 0;</div><div class='add'>+	struct cmsghdr *cmsg;</div><div class='add'>+	char *line = NULL;</div><div class='add'>+	int ret, err = -1;</div><div class='add'>+	size_t len = 0;</div><div class='add'>+	int socket_fd;</div><div class='add'>+	__u32 ddmabuf;</div><div class='add'>+	int opt = 1;</div><div class='add'>+</div><div class='add'>+	ret = parse_address(server_ip, atoi(port), &amp;server_sin);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("parse server address");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (client_ip) {</div><div class='add'>+		ret = parse_address(client_ip, atoi(port), &amp;client_sin);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			pr_err("parse client address");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	socket_fd = socket(AF_INET6, SOCK_STREAM, 0);</div><div class='add'>+	if (socket_fd &lt; 0) {</div><div class='add'>+		pr_err("create socket");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable_reuseaddr(socket_fd))</div><div class='add'>+		goto err_close_socket;</div><div class='add'>+</div><div class='add'>+	ret = setsockopt(socket_fd, SOL_SOCKET, SO_BINDTODEVICE, ifname,</div><div class='add'>+			 strlen(ifname) + 1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("bindtodevice");</div><div class='add'>+		goto err_close_socket;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bind_tx_queue(ifindex, mem-&gt;fd, &amp;ys)) {</div><div class='add'>+		pr_err("Failed to bind");</div><div class='add'>+		goto err_close_socket;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (client_ip) {</div><div class='add'>+		ret = bind(socket_fd, &amp;client_sin, sizeof(client_sin));</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_err("bind");</div><div class='add'>+			goto err_unbind;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = setsockopt(socket_fd, SOL_SOCKET, SO_ZEROCOPY, &amp;opt, sizeof(opt));</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("set sock opt");</div><div class='add'>+		goto err_unbind;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "Connect to %s %d (via %s)\n", server_ip,</div><div class='add'>+		ntohs(server_sin.sin6_port), ifname);</div><div class='add'>+</div><div class='add'>+	ret = connect(socket_fd, &amp;server_sin, sizeof(server_sin));</div><div class='add'>+	if (ret) {</div><div class='add'>+		pr_err("connect");</div><div class='add'>+		goto err_unbind;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		free(line);</div><div class='add'>+		line = NULL;</div><div class='add'>+		line_size = getline(&amp;line, &amp;len, stdin);</div><div class='add'>+</div><div class='add'>+		if (line_size &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (max_chunk) {</div><div class='add'>+			msg.msg_iovlen =</div><div class='add'>+				(line_size + max_chunk - 1) / max_chunk;</div><div class='add'>+			if (msg.msg_iovlen &gt; MAX_IOV) {</div><div class='add'>+				pr_err("can't partition %zd bytes into maximum of %d chunks",</div><div class='add'>+				       line_size, MAX_IOV);</div><div class='add'>+				goto err_free_line;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			for (int i = 0; i &lt; msg.msg_iovlen; i++) {</div><div class='add'>+				iov[i].iov_base = (void *)(i * max_chunk);</div><div class='add'>+				iov[i].iov_len = max_chunk;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			iov[msg.msg_iovlen - 1].iov_len =</div><div class='add'>+				line_size - (msg.msg_iovlen - 1) * max_chunk;</div><div class='add'>+		} else {</div><div class='add'>+			iov[0].iov_base = 0;</div><div class='add'>+			iov[0].iov_len = line_size;</div><div class='add'>+			msg.msg_iovlen = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msg.msg_iov = iov;</div><div class='add'>+		provider-&gt;memcpy_to_device(mem, 0, line, line_size);</div><div class='add'>+</div><div class='add'>+		msg.msg_control = ctrl_data;</div><div class='add'>+		msg.msg_controllen = sizeof(ctrl_data);</div><div class='add'>+</div><div class='add'>+		cmsg = CMSG_FIRSTHDR(&amp;msg);</div><div class='add'>+		cmsg-&gt;cmsg_level = SOL_SOCKET;</div><div class='add'>+		cmsg-&gt;cmsg_type = SCM_DEVMEM_DMABUF;</div><div class='add'>+		cmsg-&gt;cmsg_len = CMSG_LEN(sizeof(__u32));</div><div class='add'>+</div><div class='add'>+		ddmabuf = tx_dmabuf_id;</div><div class='add'>+</div><div class='add'>+		*((__u32 *)CMSG_DATA(cmsg)) = ddmabuf;</div><div class='add'>+</div><div class='add'>+		ret = sendmsg(socket_fd, &amp;msg, MSG_ZEROCOPY);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			pr_err("Failed sendmsg");</div><div class='add'>+			goto err_free_line;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fprintf(stderr, "sendmsg_ret=%d\n", ret);</div><div class='add'>+</div><div class='add'>+		if (ret != line_size) {</div><div class='add'>+			pr_err("Did not send all bytes %d vs %zd", ret, line_size);</div><div class='add'>+			goto err_free_line;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (wait_compl(socket_fd))</div><div class='add'>+			goto err_free_line;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "%s: tx ok\n", TEST_PREFIX);</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+err_free_line:</div><div class='add'>+	free(line);</div><div class='add'>+err_unbind:</div><div class='add'>+	ynl_sock_destroy(ys);</div><div class='add'>+err_close_socket:</div><div class='add'>+	close(socket_fd);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	struct memory_buffer *mem;</div><div class='ctx'> 	int is_server = 0, opt;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, err = 1;</div><div class='ctx'> </div><div class='del'>-	while ((opt = getopt(argc, argv, "ls:c:p:v:q:t:f:")) != -1) {</div><div class='add'>+	while ((opt = getopt(argc, argv, "ls:c:p:v:q:t:f:z:")) != -1) {</div><div class='ctx'> 		switch (opt) {</div><div class='ctx'> 		case 'l':</div><div class='ctx'> 			is_server = 1;</div><div class='hunk'>@@ -718,47 +1423,62 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		case 'f':</div><div class='ctx'> 			ifname = optarg;</div><div class='ctx'> 			break;</div><div class='add'>+		case 'z':</div><div class='add'>+			max_chunk = atoi(optarg);</div><div class='add'>+			break;</div><div class='ctx'> 		case '?':</div><div class='ctx'> 			fprintf(stderr, "unknown option: %c\n", optopt);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ifname)</div><div class='del'>-		error(1, 0, "Missing -f argument\n");</div><div class='add'>+	if (!ifname) {</div><div class='add'>+		pr_err("Missing -f argument");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ifindex = if_nametoindex(ifname);</div><div class='ctx'> </div><div class='add'>+	fprintf(stderr, "using ifindex=%u\n", ifindex);</div><div class='add'>+</div><div class='ctx'> 	if (!server_ip &amp;&amp; !client_ip) {</div><div class='ctx'> 		if (start_queue &lt; 0 &amp;&amp; num_queues &lt; 0) {</div><div class='ctx'> 			num_queues = rxq_num(ifindex);</div><div class='del'>-			if (num_queues &lt; 0)</div><div class='del'>-				error(1, 0, "couldn't detect number of queues\n");</div><div class='del'>-			if (num_queues &lt; 2)</div><div class='del'>-				error(1, 0,</div><div class='del'>-				      "number of device queues is too low\n");</div><div class='add'>+			if (num_queues &lt; 0) {</div><div class='add'>+				pr_err("couldn't detect number of queues");</div><div class='add'>+				return 1;</div><div class='add'>+			}</div><div class='add'>+			if (num_queues &lt; 2) {</div><div class='add'>+				pr_err("number of device queues is too low");</div><div class='add'>+				return 1;</div><div class='add'>+			}</div><div class='ctx'> 			/* make sure can bind to multiple queues */</div><div class='ctx'> 			start_queue = num_queues / 2;</div><div class='ctx'> 			num_queues /= 2;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (start_queue &lt; 0 || num_queues &lt; 0)</div><div class='del'>-			error(1, 0, "Both -t and -q are required\n");</div><div class='add'>+		if (start_queue &lt; 0 || num_queues &lt; 0) {</div><div class='add'>+			pr_err("Both -t and -q are required");</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		run_devmem_tests();</div><div class='del'>-		return 0;</div><div class='add'>+		return run_devmem_tests();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (start_queue &lt; 0 &amp;&amp; num_queues &lt; 0) {</div><div class='ctx'> 		num_queues = rxq_num(ifindex);</div><div class='del'>-		if (num_queues &lt; 2)</div><div class='del'>-			error(1, 0, "number of device queues is too low\n");</div><div class='add'>+		if (num_queues &lt; 2) {</div><div class='add'>+			pr_err("number of device queues is too low");</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		num_queues = 1;</div><div class='ctx'> 		start_queue = rxq_num(ifindex) - num_queues;</div><div class='ctx'> </div><div class='del'>-		if (start_queue &lt; 0)</div><div class='del'>-			error(1, 0, "couldn't detect number of queues\n");</div><div class='add'>+		if (start_queue &lt; 0) {</div><div class='add'>+			pr_err("couldn't detect number of queues");</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		fprintf(stderr, "using queues %d..%d\n", start_queue, start_queue + num_queues);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -766,21 +1486,39 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	for (; optind &lt; argc; optind++)</div><div class='ctx'> 		fprintf(stderr, "extra arguments: %s\n", argv[optind]);</div><div class='ctx'> </div><div class='del'>-	if (start_queue &lt; 0)</div><div class='del'>-		error(1, 0, "Missing -t argument\n");</div><div class='add'>+	if (start_queue &lt; 0) {</div><div class='add'>+		pr_err("Missing -t argument");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (num_queues &lt; 0)</div><div class='del'>-		error(1, 0, "Missing -q argument\n");</div><div class='add'>+	if (num_queues &lt; 0) {</div><div class='add'>+		pr_err("Missing -q argument");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!server_ip)</div><div class='del'>-		error(1, 0, "Missing -s argument\n");</div><div class='add'>+	if (!server_ip) {</div><div class='add'>+		pr_err("Missing -s argument");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!port)</div><div class='del'>-		error(1, 0, "Missing -p argument\n");</div><div class='add'>+	if (!port) {</div><div class='add'>+		pr_err("Missing -p argument");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mem = provider-&gt;alloc(getpagesize() * NUM_PAGES);</div><div class='del'>-	ret = is_server ? do_server(mem) : 1;</div><div class='del'>-	provider-&gt;free(mem);</div><div class='add'>+	if (!mem) {</div><div class='add'>+		pr_err("Failed to allocate memory buffer");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ret = is_server ? do_server(mem) : do_client(mem);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_mem;</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+err_free_mem:</div><div class='add'>+	provider-&gt;free(mem);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/nic_link_layer.py b/tools/testing/selftests/drivers/net/hw/nic_link_layer.py<br/>deleted file mode 100644<br/>index efd921180532..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/nic_link_layer.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/nic_link_layer.py</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,113 +0,0 @@</div><div class='del'>-#!/usr/bin/env python3</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#Introduction:</div><div class='del'>-#This file has basic link layer tests for generic NIC drivers.</div><div class='del'>-#The test comprises of auto-negotiation, speed and duplex checks.</div><div class='del'>-#</div><div class='del'>-#Setup:</div><div class='del'>-#Connect the DUT PC with NIC card to partner pc back via ethernet medium of your choice(RJ45, T1)</div><div class='del'>-#</div><div class='del'>-#        DUT PC                                              Partner PC</div><div class='del'>-#┌───────────────────────┐                         ┌──────────────────────────┐</div><div class='del'>-#│                       │                         │                          │</div><div class='del'>-#│                       │                         │                          │</div><div class='del'>-#│           ┌───────────┐                         │                          │</div><div class='del'>-#│           │DUT NIC    │         Eth             │                          │</div><div class='del'>-#│           │Interface ─┼─────────────────────────┼─    any eth Interface    │</div><div class='del'>-#│           └───────────┘                         │                          │</div><div class='del'>-#│                       │                         │                          │</div><div class='del'>-#│                       │                         │                          │</div><div class='del'>-#└───────────────────────┘                         └──────────────────────────┘</div><div class='del'>-#</div><div class='del'>-#Configurations:</div><div class='del'>-#Required minimum ethtool version is 6.10 (supports json)</div><div class='del'>-#Default values:</div><div class='del'>-#time_delay = 8 #time taken to wait for transitions to happen, in seconds.</div><div class='del'>-</div><div class='del'>-import time</div><div class='del'>-import argparse</div><div class='del'>-from lib.py import ksft_run, ksft_exit, ksft_pr, ksft_eq</div><div class='del'>-from lib.py import KsftFailEx, KsftSkipEx</div><div class='del'>-from lib.py import NetDrvEpEnv</div><div class='del'>-from lib.py import LinkConfig</div><div class='del'>-</div><div class='del'>-def _pre_test_checks(cfg: object, link_config: LinkConfig) -&gt; None:</div><div class='del'>-    if link_config.partner_netif is None:</div><div class='del'>-        KsftSkipEx("Partner interface is not available")</div><div class='del'>-    if not link_config.check_autoneg_supported() or not link_config.check_autoneg_supported(remote=True):</div><div class='del'>-        KsftSkipEx(f"Auto-negotiation not supported for interface {cfg.ifname} or {link_config.partner_netif}")</div><div class='del'>-    if not link_config.verify_link_up():</div><div class='del'>-        raise KsftSkipEx(f"Link state of interface {cfg.ifname} is DOWN")</div><div class='del'>-</div><div class='del'>-def verify_autonegotiation(cfg: object, expected_state: str, link_config: LinkConfig) -&gt; None:</div><div class='del'>-    if not link_config.verify_link_up():</div><div class='del'>-        raise KsftSkipEx(f"Link state of interface {cfg.ifname} is DOWN")</div><div class='del'>-    """Verifying the autonegotiation state in partner"""</div><div class='del'>-    partner_autoneg_output = link_config.get_ethtool_field("auto-negotiation", remote=True)</div><div class='del'>-    if partner_autoneg_output is None:</div><div class='del'>-        KsftSkipEx(f"Auto-negotiation state not available for interface {link_config.partner_netif}")</div><div class='del'>-    partner_autoneg_state = "on" if partner_autoneg_output is True else "off"</div><div class='del'>-</div><div class='del'>-    ksft_eq(partner_autoneg_state, expected_state)</div><div class='del'>-</div><div class='del'>-    """Verifying the autonegotiation state of local"""</div><div class='del'>-    autoneg_output = link_config.get_ethtool_field("auto-negotiation")</div><div class='del'>-    if autoneg_output is None:</div><div class='del'>-        KsftSkipEx(f"Auto-negotiation state not available for interface {cfg.ifname}")</div><div class='del'>-    actual_state = "on" if autoneg_output is True else "off"</div><div class='del'>-</div><div class='del'>-    ksft_eq(actual_state, expected_state)</div><div class='del'>-</div><div class='del'>-    """Verifying the link establishment"""</div><div class='del'>-    link_available = link_config.get_ethtool_field("link-detected")</div><div class='del'>-    if link_available is None:</div><div class='del'>-        KsftSkipEx(f"Link status not available for interface {cfg.ifname}")</div><div class='del'>-    if link_available != True:</div><div class='del'>-        raise KsftSkipEx("Link not established at interface {cfg.ifname} after changing auto-negotiation")</div><div class='del'>-</div><div class='del'>-def test_autonegotiation(cfg: object, link_config: LinkConfig, time_delay: int) -&gt; None:</div><div class='del'>-    _pre_test_checks(cfg, link_config)</div><div class='del'>-    for state in ["off", "on"]:</div><div class='del'>-        if not link_config.set_autonegotiation_state(state, remote=True):</div><div class='del'>-            raise KsftSkipEx(f"Unable to set auto-negotiation state for interface {link_config.partner_netif}")</div><div class='del'>-        if not link_config.set_autonegotiation_state(state):</div><div class='del'>-            raise KsftSkipEx(f"Unable to set auto-negotiation state for interface {cfg.ifname}")</div><div class='del'>-        time.sleep(time_delay)</div><div class='del'>-        verify_autonegotiation(cfg, state, link_config)</div><div class='del'>-</div><div class='del'>-def test_network_speed(cfg: object, link_config: LinkConfig, time_delay: int) -&gt; None:</div><div class='del'>-    _pre_test_checks(cfg, link_config)</div><div class='del'>-    common_link_modes = link_config.common_link_modes</div><div class='del'>-    if not common_link_modes:</div><div class='del'>-        KsftSkipEx("No common link modes exist")</div><div class='del'>-    speeds, duplex_modes = link_config.get_speed_duplex_values(common_link_modes)</div><div class='del'>-</div><div class='del'>-    if speeds and duplex_modes and len(speeds) == len(duplex_modes):</div><div class='del'>-        for idx in range(len(speeds)):</div><div class='del'>-            speed = speeds[idx]</div><div class='del'>-            duplex = duplex_modes[idx]</div><div class='del'>-            if not link_config.set_speed_and_duplex(speed, duplex):</div><div class='del'>-                raise KsftFailEx(f"Unable to set speed and duplex parameters for {cfg.ifname}")</div><div class='del'>-            time.sleep(time_delay)</div><div class='del'>-            if not link_config.verify_speed_and_duplex(speed, duplex):</div><div class='del'>-                raise KsftSkipEx(f"Error occurred while verifying speed and duplex states for interface {cfg.ifname}")</div><div class='del'>-    else:</div><div class='del'>-        if not speeds or not duplex_modes:</div><div class='del'>-            KsftSkipEx(f"No supported speeds or duplex modes found for interface {cfg.ifname}")</div><div class='del'>-        else:</div><div class='del'>-            KsftSkipEx("Mismatch in the number of speeds and duplex modes")</div><div class='del'>-</div><div class='del'>-def main() -&gt; None:</div><div class='del'>-    parser = argparse.ArgumentParser(description="Run basic link layer tests for NIC driver")</div><div class='del'>-    parser.add_argument('--time-delay', type=int, default=8, help='Time taken to wait for transitions to happen(in seconds). Default is 8 seconds.')</div><div class='del'>-    args = parser.parse_args()</div><div class='del'>-    time_delay = args.time_delay</div><div class='del'>-    with NetDrvEpEnv(__file__, nsim_test=False) as cfg:</div><div class='del'>-        link_config = LinkConfig(cfg)</div><div class='del'>-        ksft_run(globs=globals(), case_pfx={"test_"}, args=(cfg, link_config, time_delay,))</div><div class='del'>-        link_config.reset_interface()</div><div class='del'>-    ksft_exit()</div><div class='del'>-</div><div class='del'>-if __name__ == "__main__":</div><div class='del'>-    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/nic_performance.py b/tools/testing/selftests/drivers/net/hw/nic_performance.py<br/>deleted file mode 100644<br/>index 201403b76ea3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/nic_performance.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/nic_performance.py</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,137 +0,0 @@</div><div class='del'>-#!/usr/bin/env python3</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-</div><div class='del'>-#Introduction:</div><div class='del'>-#This file has basic performance test for generic NIC drivers.</div><div class='del'>-#The test comprises of throughput check for TCP and UDP streams.</div><div class='del'>-#</div><div class='del'>-#Setup:</div><div class='del'>-#Connect the DUT PC with NIC card to partner pc back via ethernet medium of your choice(RJ45, T1)</div><div class='del'>-#</div><div class='del'>-#        DUT PC                                              Partner PC</div><div class='del'>-#┌───────────────────────┐                         ┌──────────────────────────┐</div><div class='del'>-#│                       │                         │                          │</div><div class='del'>-#│                       │                         │                          │</div><div class='del'>-#│           ┌───────────┐                         │                          │</div><div class='del'>-#│           │DUT NIC    │         Eth             │                          │</div><div class='del'>-#│           │Interface ─┼─────────────────────────┼─    any eth Interface    │</div><div class='del'>-#│           └───────────┘                         │                          │</div><div class='del'>-#│                       │                         │                          │</div><div class='del'>-#│                       │                         │                          │</div><div class='del'>-#└───────────────────────┘                         └──────────────────────────┘</div><div class='del'>-#</div><div class='del'>-#Configurations:</div><div class='del'>-#To prevent interruptions, Add ethtool, ip to the sudoers list in remote PC and get the ssh key from remote.</div><div class='del'>-#Required minimum ethtool version is 6.10</div><div class='del'>-#Change the below configuration based on your hw needs.</div><div class='del'>-# """Default values"""</div><div class='del'>-#time_delay = 8 #time taken to wait for transitions to happen, in seconds.</div><div class='del'>-#test_duration = 10  #performance test duration for the throughput check, in seconds.</div><div class='del'>-#send_throughput_threshold = 80 #percentage of send throughput required to pass the check</div><div class='del'>-#receive_throughput_threshold = 50 #percentage of receive throughput required to pass the check</div><div class='del'>-</div><div class='del'>-import time</div><div class='del'>-import json</div><div class='del'>-import argparse</div><div class='del'>-from lib.py import ksft_run, ksft_exit, ksft_pr, ksft_true</div><div class='del'>-from lib.py import KsftFailEx, KsftSkipEx, GenerateTraffic</div><div class='del'>-from lib.py import NetDrvEpEnv, bkg, wait_port_listen</div><div class='del'>-from lib.py import cmd</div><div class='del'>-from lib.py import LinkConfig</div><div class='del'>-</div><div class='del'>-class TestConfig:</div><div class='del'>-    def __init__(self, time_delay: int, test_duration: int, send_throughput_threshold: int, receive_throughput_threshold: int) -&gt; None:</div><div class='del'>-        self.time_delay = time_delay</div><div class='del'>-        self.test_duration = test_duration</div><div class='del'>-        self.send_throughput_threshold = send_throughput_threshold</div><div class='del'>-        self.receive_throughput_threshold = receive_throughput_threshold</div><div class='del'>-</div><div class='del'>-def _pre_test_checks(cfg: object, link_config: LinkConfig) -&gt; None:</div><div class='del'>-    if not link_config.verify_link_up():</div><div class='del'>-        KsftSkipEx(f"Link state of interface {cfg.ifname} is DOWN")</div><div class='del'>-    common_link_modes = link_config.common_link_modes</div><div class='del'>-    if common_link_modes is None:</div><div class='del'>-        KsftSkipEx("No common link modes found")</div><div class='del'>-    if link_config.partner_netif == None:</div><div class='del'>-        KsftSkipEx("Partner interface is not available")</div><div class='del'>-    if link_config.check_autoneg_supported():</div><div class='del'>-        KsftSkipEx("Auto-negotiation not supported by local")</div><div class='del'>-    if link_config.check_autoneg_supported(remote=True):</div><div class='del'>-        KsftSkipEx("Auto-negotiation not supported by remote")</div><div class='del'>-    cfg.require_cmd("iperf3", remote=True)</div><div class='del'>-</div><div class='del'>-def check_throughput(cfg: object, link_config: LinkConfig, test_config: TestConfig, protocol: str, traffic: GenerateTraffic) -&gt; None:</div><div class='del'>-    common_link_modes = link_config.common_link_modes</div><div class='del'>-    speeds, duplex_modes = link_config.get_speed_duplex_values(common_link_modes)</div><div class='del'>-    """Test duration in seconds"""</div><div class='del'>-    duration = test_config.test_duration</div><div class='del'>-</div><div class='del'>-    ksft_pr(f"{protocol} test")</div><div class='del'>-    test_type = "-u" if protocol == "UDP" else ""</div><div class='del'>-</div><div class='del'>-    send_throughput = []</div><div class='del'>-    receive_throughput = []</div><div class='del'>-    for idx in range(0, len(speeds)):</div><div class='del'>-        if link_config.set_speed_and_duplex(speeds[idx], duplex_modes[idx]) == False:</div><div class='del'>-            raise KsftFailEx(f"Not able to set speed and duplex parameters for {cfg.ifname}")</div><div class='del'>-        time.sleep(test_config.time_delay)</div><div class='del'>-        if not link_config.verify_link_up():</div><div class='del'>-            raise KsftSkipEx(f"Link state of interface {cfg.ifname} is DOWN")</div><div class='del'>-</div><div class='del'>-        send_command=f"{test_type} -b 0 -t {duration} --json"</div><div class='del'>-        receive_command=f"{test_type} -b 0 -t {duration} --reverse --json"</div><div class='del'>-</div><div class='del'>-        send_result = traffic.run_remote_test(cfg, command=send_command)</div><div class='del'>-        if send_result.ret != 0:</div><div class='del'>-            raise KsftSkipEx("Error occurred during data transmit: {send_result.stdout}")</div><div class='del'>-</div><div class='del'>-        send_output = send_result.stdout</div><div class='del'>-        send_data = json.loads(send_output)</div><div class='del'>-</div><div class='del'>-        """Convert throughput to Mbps"""</div><div class='del'>-        send_throughput.append(round(send_data['end']['sum_sent']['bits_per_second'] / 1e6, 2))</div><div class='del'>-        ksft_pr(f"{protocol}: Send throughput: {send_throughput[idx]} Mbps")</div><div class='del'>-</div><div class='del'>-        receive_result = traffic.run_remote_test(cfg, command=receive_command)</div><div class='del'>-        if receive_result.ret != 0:</div><div class='del'>-            raise KsftSkipEx("Error occurred during data receive: {receive_result.stdout}")</div><div class='del'>-</div><div class='del'>-        receive_output = receive_result.stdout</div><div class='del'>-        receive_data = json.loads(receive_output)</div><div class='del'>-</div><div class='del'>-        """Convert throughput to Mbps"""</div><div class='del'>-        receive_throughput.append(round(receive_data['end']['sum_received']['bits_per_second'] / 1e6, 2))</div><div class='del'>-        ksft_pr(f"{protocol}: Receive throughput: {receive_throughput[idx]} Mbps")</div><div class='del'>-</div><div class='del'>-    """Check whether throughput is not below the threshold (default values set at start)"""</div><div class='del'>-    for idx in range(0, len(speeds)):</div><div class='del'>-        send_threshold = float(speeds[idx]) * float(test_config.send_throughput_threshold / 100)</div><div class='del'>-        receive_threshold = float(speeds[idx]) * float(test_config.receive_throughput_threshold / 100)</div><div class='del'>-        ksft_true(send_throughput[idx] &gt;= send_threshold, f"{protocol}: Send throughput is below threshold for {speeds[idx]} Mbps in {duplex_modes[idx]} duplex")</div><div class='del'>-        ksft_true(receive_throughput[idx] &gt;= receive_threshold, f"{protocol}: Receive throughput is below threshold for {speeds[idx]} Mbps in {duplex_modes[idx]} duplex")</div><div class='del'>-</div><div class='del'>-def test_tcp_throughput(cfg: object, link_config: LinkConfig, test_config: TestConfig, traffic: GenerateTraffic) -&gt; None:</div><div class='del'>-    _pre_test_checks(cfg, link_config)</div><div class='del'>-    check_throughput(cfg, link_config, test_config, 'TCP', traffic)</div><div class='del'>-</div><div class='del'>-def test_udp_throughput(cfg: object, link_config: LinkConfig, test_config: TestConfig, traffic: GenerateTraffic) -&gt; None:</div><div class='del'>-    _pre_test_checks(cfg, link_config)</div><div class='del'>-    check_throughput(cfg, link_config, test_config, 'UDP', traffic)</div><div class='del'>-</div><div class='del'>-def main() -&gt; None:</div><div class='del'>-    parser = argparse.ArgumentParser(description="Run basic performance test for NIC driver")</div><div class='del'>-    parser.add_argument('--time-delay', type=int, default=8, help='Time taken to wait for transitions to happen(in seconds). Default is 8 seconds.')</div><div class='del'>-    parser.add_argument('--test-duration', type=int, default=10, help='Performance test duration for the throughput check, in seconds. Default is 10 seconds.')</div><div class='del'>-    parser.add_argument('--stt', type=int, default=80, help='Send throughput Threshold: Percentage of send throughput upon actual throughput required to pass the throughput check (in percentage). Default is 80.')</div><div class='del'>-    parser.add_argument('--rtt', type=int, default=50, help='Receive throughput Threshold: Percentage of receive throughput upon actual throughput required to pass the throughput check (in percentage). Default is 50.')</div><div class='del'>-    args=parser.parse_args()</div><div class='del'>-    test_config = TestConfig(args.time_delay, args.test_duration, args.stt, args.rtt)</div><div class='del'>-    with NetDrvEpEnv(__file__, nsim_test=False) as cfg:</div><div class='del'>-        traffic = GenerateTraffic(cfg)</div><div class='del'>-        link_config = LinkConfig(cfg)</div><div class='del'>-        ksft_run(globs=globals(), case_pfx={"test_"}, args=(cfg, link_config, test_config, traffic,  ))</div><div class='del'>-        link_config.reset_interface()</div><div class='del'>-    ksft_exit()</div><div class='del'>-</div><div class='del'>-if __name__ == "__main__":</div><div class='del'>-    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/nic_timestamp.py b/tools/testing/selftests/drivers/net/hw/nic_timestamp.py<br/>new file mode 100755<br/>index 000000000000..c1e943d53f19<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/nic_timestamp.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/nic_timestamp.py</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+"""</div><div class='add'>+Tests related to configuration of HW timestamping</div><div class='add'>+"""</div><div class='add'>+</div><div class='add'>+import errno</div><div class='add'>+from lib.py import ksft_run, ksft_exit, ksft_ge, ksft_eq, KsftSkipEx</div><div class='add'>+from lib.py import NetDrvEnv, EthtoolFamily, NlError</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def __get_hwtimestamp_support(cfg):</div><div class='add'>+    """ Retrieve supported configuration information """</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        tsinfo = cfg.ethnl.tsinfo_get({'header': {'dev-name': cfg.ifname}})</div><div class='add'>+    except NlError as e:</div><div class='add'>+        if e.error == errno.EOPNOTSUPP:</div><div class='add'>+            raise KsftSkipEx("timestamping configuration is not supported") from e</div><div class='add'>+        raise</div><div class='add'>+</div><div class='add'>+    ctx = {}</div><div class='add'>+    tx = tsinfo.get('tx-types', {})</div><div class='add'>+    rx = tsinfo.get('rx-filters', {})</div><div class='add'>+</div><div class='add'>+    bits = tx.get('bits', {})</div><div class='add'>+    ctx['tx'] = bits.get('bit', [])</div><div class='add'>+    bits = rx.get('bits', {})</div><div class='add'>+    ctx['rx'] = bits.get('bit', [])</div><div class='add'>+    return ctx</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def __get_hwtimestamp_config(cfg):</div><div class='add'>+    """ Retrieve current TS configuration information """</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        tscfg = cfg.ethnl.tsconfig_get({'header': {'dev-name': cfg.ifname}})</div><div class='add'>+    except NlError as e:</div><div class='add'>+        if e.error == errno.EOPNOTSUPP:</div><div class='add'>+            raise KsftSkipEx("timestamping configuration is not supported via netlink") from e</div><div class='add'>+        raise</div><div class='add'>+    return tscfg</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def __set_hwtimestamp_config(cfg, ts):</div><div class='add'>+    """ Setup new TS configuration information """</div><div class='add'>+</div><div class='add'>+    ts['header'] = {'dev-name': cfg.ifname}</div><div class='add'>+    try:</div><div class='add'>+        res = cfg.ethnl.tsconfig_set(ts)</div><div class='add'>+    except NlError as e:</div><div class='add'>+        if e.error == errno.EOPNOTSUPP:</div><div class='add'>+            raise KsftSkipEx("timestamping configuration is not supported via netlink") from e</div><div class='add'>+        raise</div><div class='add'>+    return res</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_hwtstamp_tx(cfg):</div><div class='add'>+    """</div><div class='add'>+    Test TX timestamp configuration.</div><div class='add'>+    The driver should apply provided config and report back proper state.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    orig_tscfg = __get_hwtimestamp_config(cfg)</div><div class='add'>+    ts = __get_hwtimestamp_support(cfg)</div><div class='add'>+    tx = ts['tx']</div><div class='add'>+    for t in tx:</div><div class='add'>+        tscfg = orig_tscfg</div><div class='add'>+        tscfg['tx-types']['bits']['bit'] = [t]</div><div class='add'>+        res = __set_hwtimestamp_config(cfg, tscfg)</div><div class='add'>+        if res is None:</div><div class='add'>+            res = __get_hwtimestamp_config(cfg)</div><div class='add'>+        ksft_eq(res['tx-types']['bits']['bit'], [t])</div><div class='add'>+    __set_hwtimestamp_config(cfg, orig_tscfg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_hwtstamp_rx(cfg):</div><div class='add'>+    """</div><div class='add'>+    Test RX timestamp configuration.</div><div class='add'>+    The filter configuration is taken from the list of supported filters.</div><div class='add'>+    The driver should apply the config without error and report back proper state.</div><div class='add'>+    Some extension of the timestamping scope is allowed for PTP filters.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    orig_tscfg = __get_hwtimestamp_config(cfg)</div><div class='add'>+    ts = __get_hwtimestamp_support(cfg)</div><div class='add'>+    rx = ts['rx']</div><div class='add'>+    for r in rx:</div><div class='add'>+        tscfg = orig_tscfg</div><div class='add'>+        tscfg['rx-filters']['bits']['bit'] = [r]</div><div class='add'>+        res = __set_hwtimestamp_config(cfg, tscfg)</div><div class='add'>+        if res is None:</div><div class='add'>+            res = __get_hwtimestamp_config(cfg)</div><div class='add'>+        if r['index'] == 0 or r['index'] == 1:</div><div class='add'>+            ksft_eq(res['rx-filters']['bits']['bit'][0]['index'], r['index'])</div><div class='add'>+        else:</div><div class='add'>+            # the driver can fallback to some value which has higher coverage for timestamping</div><div class='add'>+            ksft_ge(res['rx-filters']['bits']['bit'][0]['index'], r['index'])</div><div class='add'>+    __set_hwtimestamp_config(cfg, orig_tscfg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    """ Ksft boiler plate main """</div><div class='add'>+</div><div class='add'>+    with NetDrvEnv(__file__, nsim_test=False) as cfg:</div><div class='add'>+        cfg.ethnl = EthtoolFamily()</div><div class='add'>+        ksft_run([test_hwtstamp_tx, test_hwtstamp_rx], args=(cfg,))</div><div class='add'>+        ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/pp_alloc_fail.py b/tools/testing/selftests/drivers/net/hw/pp_alloc_fail.py<br/>index ad192fef3117..2a51b60df8a1 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/pp_alloc_fail.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/pp_alloc_fail.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/pp_alloc_fail.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/pp_alloc_fail.py</a></div><div class='hunk'>@@ -1,8 +1,13 @@</div><div class='ctx'> #!/usr/bin/env python3</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+"""</div><div class='add'>+Test driver resilience vs page pool allocation failures.</div><div class='add'>+"""</div><div class='add'>+</div><div class='ctx'> import errno</div><div class='ctx'> import time</div><div class='add'>+import math</div><div class='ctx'> import os</div><div class='ctx'> from lib.py import ksft_run, ksft_exit, ksft_pr</div><div class='ctx'> from lib.py import KsftSkipEx, KsftFailEx</div><div class='hunk'>@@ -13,7 +18,8 @@ from lib.py import cmd, tool, GenerateTraffic</div><div class='ctx'> </div><div class='ctx'> def _write_fail_config(config):</div><div class='ctx'>     for key, value in config.items():</div><div class='del'>-        with open("/sys/kernel/debug/fail_function/" + key, "w") as fp:</div><div class='add'>+        path = "/sys/kernel/debug/fail_function/"</div><div class='add'>+        with open(path + key, "w", encoding='ascii') as fp:</div><div class='ctx'>             fp.write(str(value) + "\n")</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -22,8 +28,7 @@ def _enable_pp_allocation_fail():</div><div class='ctx'>         raise KsftSkipEx("Kernel built without function error injection (or DebugFS)")</div><div class='ctx'> </div><div class='ctx'>     if not os.path.exists("/sys/kernel/debug/fail_function/page_pool_alloc_netmems"):</div><div class='del'>-        with open("/sys/kernel/debug/fail_function/inject", "w") as fp:</div><div class='del'>-            fp.write("page_pool_alloc_netmems\n")</div><div class='add'>+        _write_fail_config({"inject": "page_pool_alloc_netmems"})</div><div class='ctx'> </div><div class='ctx'>     _write_fail_config({</div><div class='ctx'>         "verbose": 0,</div><div class='hunk'>@@ -38,8 +43,7 @@ def _disable_pp_allocation_fail():</div><div class='ctx'>         return</div><div class='ctx'> </div><div class='ctx'>     if os.path.exists("/sys/kernel/debug/fail_function/page_pool_alloc_netmems"):</div><div class='del'>-        with open("/sys/kernel/debug/fail_function/inject", "w") as fp:</div><div class='del'>-            fp.write("\n")</div><div class='add'>+        _write_fail_config({"inject": ""})</div><div class='ctx'> </div><div class='ctx'>     _write_fail_config({</div><div class='ctx'>         "probability": 0,</div><div class='hunk'>@@ -48,6 +52,10 @@ def _disable_pp_allocation_fail():</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> def test_pp_alloc(cfg, netdevnl):</div><div class='add'>+    """</div><div class='add'>+    Configure page pool allocation fail injection while traffic is running.</div><div class='add'>+    """</div><div class='add'>+</div><div class='ctx'>     def get_stats():</div><div class='ctx'>         return netdevnl.qstats_get({"ifindex": cfg.ifindex}, dump=True)[0]</div><div class='ctx'> </div><div class='hunk'>@@ -55,7 +63,7 @@ def test_pp_alloc(cfg, netdevnl):</div><div class='ctx'>         stat1 = get_stats()</div><div class='ctx'>         time.sleep(1)</div><div class='ctx'>         stat2 = get_stats()</div><div class='del'>-        if stat2['rx-packets'] - stat1['rx-packets'] &lt; 15000:</div><div class='add'>+        if stat2['rx-packets'] - stat1['rx-packets'] &lt; 4000:</div><div class='ctx'>             raise KsftFailEx("Traffic seems low:", stat2['rx-packets'] - stat1['rx-packets'])</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -82,11 +90,16 @@ def test_pp_alloc(cfg, netdevnl):</div><div class='ctx'>         time.sleep(3)</div><div class='ctx'>         s2 = get_stats()</div><div class='ctx'> </div><div class='del'>-        if s2['rx-alloc-fail'] - s1['rx-alloc-fail'] &lt; 1:</div><div class='add'>+        seen_fails = s2['rx-alloc-fail'] - s1['rx-alloc-fail']</div><div class='add'>+        if seen_fails &lt; 1:</div><div class='ctx'>             raise KsftSkipEx("Allocation failures not increasing")</div><div class='del'>-        if s2['rx-alloc-fail'] - s1['rx-alloc-fail'] &lt; 100:</div><div class='del'>-            raise KsftSkipEx("Allocation increasing too slowly", s2['rx-alloc-fail'] - s1['rx-alloc-fail'],</div><div class='del'>-                             "packets:", s2['rx-packets'] - s1['rx-packets'])</div><div class='add'>+        pkts = s2['rx-packets'] - s1['rx-packets']</div><div class='add'>+        # Expecting one failure per 512 buffers, 3.1x safety margin</div><div class='add'>+        want_fails = math.floor(pkts / 512 / 3.1)</div><div class='add'>+        if seen_fails &lt; want_fails:</div><div class='add'>+            raise KsftSkipEx("Allocation increasing too slowly", seen_fails,</div><div class='add'>+                             "packets:", pkts)</div><div class='add'>+        ksft_pr(f"Seen: pkts:{pkts} fails:{seen_fails} (pass thrs:{want_fails})")</div><div class='ctx'> </div><div class='ctx'>         # Basic failures are fine, try to wobble some settings to catch extra failures</div><div class='ctx'>         check_traffic_flowing()</div><div class='hunk'>@@ -105,7 +118,7 @@ def test_pp_alloc(cfg, netdevnl):</div><div class='ctx'>             else:</div><div class='ctx'>                 ksft_pr("ethtool -G change retval: did not succeed", new_g)</div><div class='ctx'>         else:</div><div class='del'>-                ksft_pr("ethtool -G change retval: did not try")</div><div class='add'>+            ksft_pr("ethtool -G change retval: did not try")</div><div class='ctx'> </div><div class='ctx'>         time.sleep(0.1)</div><div class='ctx'>         check_traffic_flowing()</div><div class='hunk'>@@ -119,6 +132,7 @@ def test_pp_alloc(cfg, netdevnl):</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> def main() -&gt; None:</div><div class='add'>+    """ Ksft boiler plate main """</div><div class='ctx'>     netdevnl = NetdevFamily()</div><div class='ctx'>     with NetDrvEpEnv(__file__, nsim_test=False) as cfg:</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/rss_api.py b/tools/testing/selftests/drivers/net/hw/rss_api.py<br/>new file mode 100755<br/>index 000000000000..19847f3d4a00<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/rss_api.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/rss_api.py</a></div><div class='hunk'>@@ -0,0 +1,476 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+"""</div><div class='add'>+API level tests for RSS (mostly Netlink vs IOCTL).</div><div class='add'>+"""</div><div class='add'>+</div><div class='add'>+import errno</div><div class='add'>+import glob</div><div class='add'>+import random</div><div class='add'>+from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_is, ksft_ne, ksft_raises</div><div class='add'>+from lib.py import KsftSkipEx, KsftFailEx</div><div class='add'>+from lib.py import defer, ethtool, CmdExitFailure</div><div class='add'>+from lib.py import EthtoolFamily, NlError</div><div class='add'>+from lib.py import NetDrvEnv</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _require_2qs(cfg):</div><div class='add'>+    qcnt = len(glob.glob(f"/sys/class/net/{cfg.ifname}/queues/rx-*"))</div><div class='add'>+    if qcnt &lt; 2:</div><div class='add'>+        raise KsftSkipEx(f"Local has only {qcnt} queues")</div><div class='add'>+    return qcnt</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _ethtool_create(cfg, act, opts):</div><div class='add'>+    output = ethtool(f"{act} {cfg.ifname} {opts}").stdout</div><div class='add'>+    # Output will be something like: "New RSS context is 1" or</div><div class='add'>+    # "Added rule with ID 7", we want the integer from the end</div><div class='add'>+    return int(output.split()[-1])</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _ethtool_get_cfg(cfg, fl_type, to_nl=False):</div><div class='add'>+    descr = ethtool(f"-n {cfg.ifname} rx-flow-hash {fl_type}").stdout</div><div class='add'>+</div><div class='add'>+    if to_nl:</div><div class='add'>+        converter = {</div><div class='add'>+            "IP SA": "ip-src",</div><div class='add'>+            "IP DA": "ip-dst",</div><div class='add'>+            "L4 bytes 0 &amp; 1 [TCP/UDP src port]": "l4-b-0-1",</div><div class='add'>+            "L4 bytes 2 &amp; 3 [TCP/UDP dst port]": "l4-b-2-3",</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        ret = set()</div><div class='add'>+    else:</div><div class='add'>+        converter = {</div><div class='add'>+            "IP SA": "s",</div><div class='add'>+            "IP DA": "d",</div><div class='add'>+            "L3 proto": "t",</div><div class='add'>+            "L4 bytes 0 &amp; 1 [TCP/UDP src port]": "f",</div><div class='add'>+            "L4 bytes 2 &amp; 3 [TCP/UDP dst port]": "n",</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        ret = ""</div><div class='add'>+</div><div class='add'>+    for line in descr.split("\n")[1:-2]:</div><div class='add'>+        # if this raises we probably need to add more keys to converter above</div><div class='add'>+        if to_nl:</div><div class='add'>+            ret.add(converter[line])</div><div class='add'>+        else:</div><div class='add'>+            ret += converter[line]</div><div class='add'>+    return ret</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rxfh_nl_set_fail(cfg):</div><div class='add'>+    """</div><div class='add'>+    Test error path of Netlink SET.</div><div class='add'>+    """</div><div class='add'>+    _require_2qs(cfg)</div><div class='add'>+</div><div class='add'>+    ethnl = EthtoolFamily()</div><div class='add'>+    ethnl.ntf_subscribe("monitor")</div><div class='add'>+</div><div class='add'>+    with ksft_raises(NlError):</div><div class='add'>+        ethnl.rss_set({"header": {"dev-name": "lo"},</div><div class='add'>+                       "indir": None})</div><div class='add'>+</div><div class='add'>+    with ksft_raises(NlError):</div><div class='add'>+        ethnl.rss_set({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                       "indir": [100000]})</div><div class='add'>+    ntf = next(ethnl.poll_ntf(duration=0.2), None)</div><div class='add'>+    ksft_is(ntf, None)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rxfh_nl_set_indir(cfg):</div><div class='add'>+    """</div><div class='add'>+    Test setting indirection table via Netlink.</div><div class='add'>+    """</div><div class='add'>+    qcnt = _require_2qs(cfg)</div><div class='add'>+</div><div class='add'>+    # Test some SETs with a value</div><div class='add'>+    reset = defer(cfg.ethnl.rss_set,</div><div class='add'>+                  {"header": {"dev-index": cfg.ifindex}, "indir": None})</div><div class='add'>+    cfg.ethnl.rss_set({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                       "indir": [1]})</div><div class='add'>+    rss = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    ksft_eq(set(rss.get("indir", [-1])), {1})</div><div class='add'>+</div><div class='add'>+    cfg.ethnl.rss_set({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                       "indir": [0, 1]})</div><div class='add'>+    rss = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    ksft_eq(set(rss.get("indir", [-1])), {0, 1})</div><div class='add'>+</div><div class='add'>+    # Make sure we can't set the queue count below max queue used</div><div class='add'>+    with ksft_raises(CmdExitFailure):</div><div class='add'>+        ethtool(f"-L {cfg.ifname} combined 0 rx 1")</div><div class='add'>+    with ksft_raises(CmdExitFailure):</div><div class='add'>+        ethtool(f"-L {cfg.ifname} combined 1 rx 0")</div><div class='add'>+</div><div class='add'>+    # Test reset back to default</div><div class='add'>+    reset.exec()</div><div class='add'>+    rss = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    ksft_eq(set(rss.get("indir", [-1])), set(range(qcnt)))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rxfh_nl_set_indir_ctx(cfg):</div><div class='add'>+    """</div><div class='add'>+    Test setting indirection table for a custom context via Netlink.</div><div class='add'>+    """</div><div class='add'>+    _require_2qs(cfg)</div><div class='add'>+</div><div class='add'>+    # Get setting for ctx 0, we'll make sure they don't get clobbered</div><div class='add'>+    dflt = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+</div><div class='add'>+    # Create context</div><div class='add'>+    ctx_id = _ethtool_create(cfg, "-X", "context new")</div><div class='add'>+    defer(ethtool, f"-X {cfg.ifname} context {ctx_id} delete")</div><div class='add'>+</div><div class='add'>+    cfg.ethnl.rss_set({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                       "context": ctx_id, "indir": [1]})</div><div class='add'>+    rss = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                             "context": ctx_id})</div><div class='add'>+    ksft_eq(set(rss.get("indir", [-1])), {1})</div><div class='add'>+</div><div class='add'>+    ctx0 = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    ksft_eq(ctx0, dflt)</div><div class='add'>+</div><div class='add'>+    cfg.ethnl.rss_set({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                       "context": ctx_id, "indir": [0, 1]})</div><div class='add'>+    rss = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                             "context": ctx_id})</div><div class='add'>+    ksft_eq(set(rss.get("indir", [-1])), {0, 1})</div><div class='add'>+</div><div class='add'>+    ctx0 = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    ksft_eq(ctx0, dflt)</div><div class='add'>+</div><div class='add'>+    # Make sure we can't set the queue count below max queue used</div><div class='add'>+    with ksft_raises(CmdExitFailure):</div><div class='add'>+        ethtool(f"-L {cfg.ifname} combined 0 rx 1")</div><div class='add'>+    with ksft_raises(CmdExitFailure):</div><div class='add'>+        ethtool(f"-L {cfg.ifname} combined 1 rx 0")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rxfh_indir_ntf(cfg):</div><div class='add'>+    """</div><div class='add'>+    Check that Netlink notifications are generated when RSS indirection</div><div class='add'>+    table was modified.</div><div class='add'>+    """</div><div class='add'>+    _require_2qs(cfg)</div><div class='add'>+</div><div class='add'>+    ethnl = EthtoolFamily()</div><div class='add'>+    ethnl.ntf_subscribe("monitor")</div><div class='add'>+</div><div class='add'>+    ethtool(f"--disable-netlink -X {cfg.ifname} weight 0 1")</div><div class='add'>+    reset = defer(ethtool, f"-X {cfg.ifname} default")</div><div class='add'>+</div><div class='add'>+    ntf = next(ethnl.poll_ntf(duration=0.2), None)</div><div class='add'>+    if ntf is None:</div><div class='add'>+        raise KsftFailEx("No notification received")</div><div class='add'>+    ksft_eq(ntf["name"], "rss-ntf")</div><div class='add'>+    ksft_eq(set(ntf["msg"]["indir"]), {1})</div><div class='add'>+</div><div class='add'>+    reset.exec()</div><div class='add'>+    ntf = next(ethnl.poll_ntf(duration=0.2), None)</div><div class='add'>+    if ntf is None:</div><div class='add'>+        raise KsftFailEx("No notification received after reset")</div><div class='add'>+    ksft_eq(ntf["name"], "rss-ntf")</div><div class='add'>+    ksft_is(ntf["msg"].get("context"), None)</div><div class='add'>+    ksft_ne(set(ntf["msg"]["indir"]), {1})</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rxfh_indir_ctx_ntf(cfg):</div><div class='add'>+    """</div><div class='add'>+    Check that Netlink notifications are generated when RSS indirection</div><div class='add'>+    table was modified on an additional RSS context.</div><div class='add'>+    """</div><div class='add'>+    _require_2qs(cfg)</div><div class='add'>+</div><div class='add'>+    ctx_id = _ethtool_create(cfg, "-X", "context new")</div><div class='add'>+    defer(ethtool, f"-X {cfg.ifname} context {ctx_id} delete")</div><div class='add'>+</div><div class='add'>+    ethnl = EthtoolFamily()</div><div class='add'>+    ethnl.ntf_subscribe("monitor")</div><div class='add'>+</div><div class='add'>+    ethtool(f"--disable-netlink -X {cfg.ifname} context {ctx_id} weight 0 1")</div><div class='add'>+</div><div class='add'>+    ntf = next(ethnl.poll_ntf(duration=0.2), None)</div><div class='add'>+    if ntf is None:</div><div class='add'>+        raise KsftFailEx("No notification received")</div><div class='add'>+    ksft_eq(ntf["name"], "rss-ntf")</div><div class='add'>+    ksft_eq(ntf["msg"].get("context"), ctx_id)</div><div class='add'>+    ksft_eq(set(ntf["msg"]["indir"]), {1})</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rxfh_nl_set_key(cfg):</div><div class='add'>+    """</div><div class='add'>+    Test setting hashing key via Netlink.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    dflt = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    defer(cfg.ethnl.rss_set,</div><div class='add'>+          {"header": {"dev-index": cfg.ifindex},</div><div class='add'>+           "hkey": dflt["hkey"], "indir": None})</div><div class='add'>+</div><div class='add'>+    # Empty key should error out</div><div class='add'>+    with ksft_raises(NlError) as cm:</div><div class='add'>+        cfg.ethnl.rss_set({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                           "hkey": None})</div><div class='add'>+    ksft_eq(cm.exception.nl_msg.extack['bad-attr'], '.hkey')</div><div class='add'>+</div><div class='add'>+    # Set key to random</div><div class='add'>+    mod = random.randbytes(len(dflt["hkey"]))</div><div class='add'>+    cfg.ethnl.rss_set({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                       "hkey": mod})</div><div class='add'>+    rss = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    ksft_eq(rss.get("hkey", [-1]), mod)</div><div class='add'>+</div><div class='add'>+    # Set key to random and indir tbl to something at once</div><div class='add'>+    mod = random.randbytes(len(dflt["hkey"]))</div><div class='add'>+    cfg.ethnl.rss_set({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                       "indir": [0, 1], "hkey": mod})</div><div class='add'>+    rss = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    ksft_eq(rss.get("hkey", [-1]), mod)</div><div class='add'>+    ksft_eq(set(rss.get("indir", [-1])), {0, 1})</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rxfh_fields(cfg):</div><div class='add'>+    """</div><div class='add'>+    Test reading Rx Flow Hash over Netlink.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    flow_types = ["tcp4", "tcp6", "udp4", "udp6"]</div><div class='add'>+    ethnl = EthtoolFamily()</div><div class='add'>+</div><div class='add'>+    cfg_nl = ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    for fl_type in flow_types:</div><div class='add'>+        one = _ethtool_get_cfg(cfg, fl_type, to_nl=True)</div><div class='add'>+        ksft_eq(one, cfg_nl["flow-hash"][fl_type],</div><div class='add'>+                comment="Config for " + fl_type)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rxfh_fields_set(cfg):</div><div class='add'>+    """ Test configuring Rx Flow Hash over Netlink. """</div><div class='add'>+</div><div class='add'>+    flow_types = ["tcp4", "tcp6", "udp4", "udp6"]</div><div class='add'>+</div><div class='add'>+    # Collect current settings</div><div class='add'>+    cfg_old = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    # symmetric hashing is config-order-sensitive make sure we leave</div><div class='add'>+    # symmetric mode, or make the flow-hash sym-compatible first</div><div class='add'>+    changes = [{"flow-hash": cfg_old["flow-hash"],},</div><div class='add'>+               {"input-xfrm": cfg_old.get("input-xfrm", {}),}]</div><div class='add'>+    if cfg_old.get("input-xfrm"):</div><div class='add'>+        changes = list(reversed(changes))</div><div class='add'>+    for old in changes:</div><div class='add'>+        defer(cfg.ethnl.rss_set, {"header": {"dev-index": cfg.ifindex},} | old)</div><div class='add'>+</div><div class='add'>+    # symmetric hashing prevents some of the configs below</div><div class='add'>+    if cfg_old.get("input-xfrm"):</div><div class='add'>+        cfg.ethnl.rss_set({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                           "input-xfrm": {}})</div><div class='add'>+</div><div class='add'>+    for fl_type in flow_types:</div><div class='add'>+        cur = _ethtool_get_cfg(cfg, fl_type)</div><div class='add'>+        if cur == "sdfn":</div><div class='add'>+            change_nl = {"ip-src", "ip-dst"}</div><div class='add'>+            change_ic = "sd"</div><div class='add'>+        else:</div><div class='add'>+            change_nl = {"l4-b-0-1", "l4-b-2-3", "ip-src", "ip-dst"}</div><div class='add'>+            change_ic = "sdfn"</div><div class='add'>+</div><div class='add'>+        cfg.ethnl.rss_set({</div><div class='add'>+            "header": {"dev-index": cfg.ifindex},</div><div class='add'>+            "flow-hash": {fl_type: change_nl}</div><div class='add'>+        })</div><div class='add'>+        reset = defer(ethtool, f"--disable-netlink -N {cfg.ifname} "</div><div class='add'>+                      f"rx-flow-hash {fl_type} {cur}")</div><div class='add'>+</div><div class='add'>+        cfg_nl = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+        ksft_eq(change_nl, cfg_nl["flow-hash"][fl_type],</div><div class='add'>+                comment=f"Config for {fl_type} over Netlink")</div><div class='add'>+        cfg_ic = _ethtool_get_cfg(cfg, fl_type)</div><div class='add'>+        ksft_eq(change_ic, cfg_ic,</div><div class='add'>+                comment=f"Config for {fl_type} over IOCTL")</div><div class='add'>+</div><div class='add'>+        reset.exec()</div><div class='add'>+        cfg_nl = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+        ksft_eq(cfg_old["flow-hash"][fl_type], cfg_nl["flow-hash"][fl_type],</div><div class='add'>+                comment=f"Un-config for {fl_type} over Netlink")</div><div class='add'>+        cfg_ic = _ethtool_get_cfg(cfg, fl_type)</div><div class='add'>+        ksft_eq(cur, cfg_ic, comment=f"Un-config for {fl_type} over IOCTL")</div><div class='add'>+</div><div class='add'>+    # Try to set multiple at once, the defer was already installed at the start</div><div class='add'>+    change = {"ip-src"}</div><div class='add'>+    if change == cfg_old["flow-hash"]["tcp4"]:</div><div class='add'>+        change = {"ip-dst"}</div><div class='add'>+    cfg.ethnl.rss_set({</div><div class='add'>+        "header": {"dev-index": cfg.ifindex},</div><div class='add'>+        "flow-hash": {x: change for x in flow_types}</div><div class='add'>+    })</div><div class='add'>+</div><div class='add'>+    cfg_nl = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    for fl_type in flow_types:</div><div class='add'>+        ksft_eq(change, cfg_nl["flow-hash"][fl_type],</div><div class='add'>+                comment=f"multi-config for {fl_type} over Netlink")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rxfh_fields_set_xfrm(cfg):</div><div class='add'>+    """ Test changing Rx Flow Hash vs xfrm_input at once.  """</div><div class='add'>+</div><div class='add'>+    def set_rss(cfg, xfrm, fh):</div><div class='add'>+        cfg.ethnl.rss_set({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                           "input-xfrm": xfrm, "flow-hash": fh})</div><div class='add'>+</div><div class='add'>+    # Install the reset handler</div><div class='add'>+    cfg_old = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    # symmetric hashing is config-order-sensitive make sure we leave</div><div class='add'>+    # symmetric mode, or make the flow-hash sym-compatible first</div><div class='add'>+    changes = [{"flow-hash": cfg_old["flow-hash"],},</div><div class='add'>+               {"input-xfrm": cfg_old.get("input-xfrm", {}),}]</div><div class='add'>+    if cfg_old.get("input-xfrm"):</div><div class='add'>+        changes = list(reversed(changes))</div><div class='add'>+    for old in changes:</div><div class='add'>+        defer(cfg.ethnl.rss_set, {"header": {"dev-index": cfg.ifindex},} | old)</div><div class='add'>+</div><div class='add'>+    # Make sure we start with input-xfrm off, and tcp4 config non-sym</div><div class='add'>+    set_rss(cfg, {}, {})</div><div class='add'>+    set_rss(cfg, {}, {"tcp4": {"ip-src"}})</div><div class='add'>+</div><div class='add'>+    # Setting sym and fixing tcp4 config not expected to pass right now</div><div class='add'>+    with ksft_raises(NlError):</div><div class='add'>+        set_rss(cfg, {"sym-xor"}, {"tcp4": {"ip-src", "ip-dst"}})</div><div class='add'>+    # One at a time should work, hopefully</div><div class='add'>+    set_rss(cfg, 0, {"tcp4": {"ip-src", "ip-dst"}})</div><div class='add'>+    no_support = False</div><div class='add'>+    try:</div><div class='add'>+        set_rss(cfg, {"sym-xor"}, {})</div><div class='add'>+    except NlError:</div><div class='add'>+        try:</div><div class='add'>+            set_rss(cfg, {"sym-or-xor"}, {})</div><div class='add'>+        except NlError:</div><div class='add'>+            no_support = True</div><div class='add'>+    if no_support:</div><div class='add'>+        raise KsftSkipEx("no input-xfrm supported")</div><div class='add'>+    # Disabling two at once should not work either without kernel changes</div><div class='add'>+    with ksft_raises(NlError):</div><div class='add'>+        set_rss(cfg, {}, {"tcp4": {"ip-src"}})</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rxfh_fields_ntf(cfg):</div><div class='add'>+    """ Test Rx Flow Hash notifications. """</div><div class='add'>+</div><div class='add'>+    cur = _ethtool_get_cfg(cfg, "tcp4")</div><div class='add'>+    if cur == "sdfn":</div><div class='add'>+        change = {"ip-src", "ip-dst"}</div><div class='add'>+    else:</div><div class='add'>+        change = {"l4-b-0-1", "l4-b-2-3", "ip-src", "ip-dst"}</div><div class='add'>+</div><div class='add'>+    ethnl = EthtoolFamily()</div><div class='add'>+    ethnl.ntf_subscribe("monitor")</div><div class='add'>+</div><div class='add'>+    ethnl.rss_set({</div><div class='add'>+        "header": {"dev-index": cfg.ifindex},</div><div class='add'>+        "flow-hash": {"tcp4": change}</div><div class='add'>+    })</div><div class='add'>+    reset = defer(ethtool,</div><div class='add'>+                  f"--disable-netlink -N {cfg.ifname} rx-flow-hash tcp4 {cur}")</div><div class='add'>+</div><div class='add'>+    ntf = next(ethnl.poll_ntf(duration=0.2), None)</div><div class='add'>+    if ntf is None:</div><div class='add'>+        raise KsftFailEx("No notification received after IOCTL change")</div><div class='add'>+    ksft_eq(ntf["name"], "rss-ntf")</div><div class='add'>+    ksft_eq(ntf["msg"]["flow-hash"]["tcp4"], change)</div><div class='add'>+    ksft_eq(next(ethnl.poll_ntf(duration=0.01), None), None)</div><div class='add'>+</div><div class='add'>+    reset.exec()</div><div class='add'>+    ntf = next(ethnl.poll_ntf(duration=0.2), None)</div><div class='add'>+    if ntf is None:</div><div class='add'>+        raise KsftFailEx("No notification received after Netlink change")</div><div class='add'>+    ksft_eq(ntf["name"], "rss-ntf")</div><div class='add'>+    ksft_ne(ntf["msg"]["flow-hash"]["tcp4"], change)</div><div class='add'>+    ksft_eq(next(ethnl.poll_ntf(duration=0.01), None), None)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rss_ctx_add(cfg):</div><div class='add'>+    """ Test creating an additional RSS context via Netlink """</div><div class='add'>+</div><div class='add'>+    _require_2qs(cfg)</div><div class='add'>+</div><div class='add'>+    # Test basic creation</div><div class='add'>+    ctx = cfg.ethnl.rss_create_act({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    d = defer(ethtool, f"-X {cfg.ifname} context {ctx.get('context')} delete")</div><div class='add'>+    ksft_ne(ctx.get("context", 0), 0)</div><div class='add'>+    ksft_ne(set(ctx.get("indir", [0])), {0},</div><div class='add'>+            comment="Driver should init the indirection table")</div><div class='add'>+</div><div class='add'>+    # Try requesting the ID we just got allocated</div><div class='add'>+    with ksft_raises(NlError) as cm:</div><div class='add'>+        ctx = cfg.ethnl.rss_create_act({</div><div class='add'>+            "header": {"dev-index": cfg.ifindex},</div><div class='add'>+            "context": ctx.get("context"),</div><div class='add'>+        })</div><div class='add'>+        ethtool(f"-X {cfg.ifname} context {ctx.get('context')} delete")</div><div class='add'>+    d.exec()</div><div class='add'>+    ksft_eq(cm.exception.nl_msg.error, -errno.EBUSY)</div><div class='add'>+</div><div class='add'>+    # Test creating with a specified RSS table, and context ID</div><div class='add'>+    ctx_id = ctx.get("context")</div><div class='add'>+    ctx = cfg.ethnl.rss_create_act({</div><div class='add'>+        "header": {"dev-index": cfg.ifindex},</div><div class='add'>+        "context": ctx_id,</div><div class='add'>+        "indir": [1],</div><div class='add'>+    })</div><div class='add'>+    ethtool(f"-X {cfg.ifname} context {ctx.get('context')} delete")</div><div class='add'>+    ksft_eq(ctx.get("context"), ctx_id)</div><div class='add'>+    ksft_eq(set(ctx.get("indir", [0])), {1})</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rss_ctx_ntf(cfg):</div><div class='add'>+    """ Test notifications for creating additional RSS contexts """</div><div class='add'>+</div><div class='add'>+    ethnl = EthtoolFamily()</div><div class='add'>+    ethnl.ntf_subscribe("monitor")</div><div class='add'>+</div><div class='add'>+    # Create / delete via Netlink</div><div class='add'>+    ctx = cfg.ethnl.rss_create_act({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    cfg.ethnl.rss_delete_act({</div><div class='add'>+        "header": {"dev-index": cfg.ifindex},</div><div class='add'>+        "context": ctx["context"],</div><div class='add'>+    })</div><div class='add'>+</div><div class='add'>+    ntf = next(ethnl.poll_ntf(duration=0.2), None)</div><div class='add'>+    if ntf is None:</div><div class='add'>+        raise KsftFailEx("[NL] No notification after context creation")</div><div class='add'>+    ksft_eq(ntf["name"], "rss-create-ntf")</div><div class='add'>+    ksft_eq(ctx, ntf["msg"])</div><div class='add'>+</div><div class='add'>+    ntf = next(ethnl.poll_ntf(duration=0.2), None)</div><div class='add'>+    if ntf is None:</div><div class='add'>+        raise KsftFailEx("[NL] No notification after context deletion")</div><div class='add'>+    ksft_eq(ntf["name"], "rss-delete-ntf")</div><div class='add'>+</div><div class='add'>+    # Create / deleve via IOCTL</div><div class='add'>+    ctx_id = _ethtool_create(cfg, "--disable-netlink -X", "context new")</div><div class='add'>+    ethtool(f"--disable-netlink -X {cfg.ifname} context {ctx_id} delete")</div><div class='add'>+    ntf = next(ethnl.poll_ntf(duration=0.2), None)</div><div class='add'>+    if ntf is None:</div><div class='add'>+        raise KsftFailEx("[IOCTL] No notification after context creation")</div><div class='add'>+    ksft_eq(ntf["name"], "rss-create-ntf")</div><div class='add'>+</div><div class='add'>+    ntf = next(ethnl.poll_ntf(duration=0.2), None)</div><div class='add'>+    if ntf is None:</div><div class='add'>+        raise KsftFailEx("[IOCTL] No notification after context deletion")</div><div class='add'>+    ksft_eq(ntf["name"], "rss-delete-ntf")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    """ Ksft boiler plate main """</div><div class='add'>+</div><div class='add'>+    with NetDrvEnv(__file__, nsim_test=False) as cfg:</div><div class='add'>+        cfg.ethnl = EthtoolFamily()</div><div class='add'>+        ksft_run(globs=globals(), case_pfx={"test_"}, args=(cfg, ))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/rss_ctx.py b/tools/testing/selftests/drivers/net/hw/rss_ctx.py<br/>index 319aaa004c40..ed7e405682f0 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/rss_ctx.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/hw/rss_ctx.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/rss_ctx.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/rss_ctx.py</a></div><div class='hunk'>@@ -4,7 +4,8 @@</div><div class='ctx'> import datetime</div><div class='ctx'> import random</div><div class='ctx'> import re</div><div class='del'>-from lib.py import ksft_run, ksft_pr, ksft_exit, ksft_eq, ksft_ne, ksft_ge, ksft_lt, ksft_true</div><div class='add'>+from lib.py import ksft_run, ksft_pr, ksft_exit</div><div class='add'>+from lib.py import ksft_eq, ksft_ne, ksft_ge, ksft_in, ksft_lt, ksft_true, ksft_raises</div><div class='ctx'> from lib.py import NetDrvEpEnv</div><div class='ctx'> from lib.py import EthtoolFamily, NetdevFamily</div><div class='ctx'> from lib.py import KsftSkipEx, KsftFailEx</div><div class='hunk'>@@ -58,6 +59,14 @@ def require_ntuple(cfg):</div><div class='ctx'>         raise KsftSkipEx("Ntuple filters not enabled on the device: " + str(features["ntuple-filters"]))</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+def require_context_cnt(cfg, need_cnt):</div><div class='add'>+    # There's no good API to get the context count, so the tests</div><div class='add'>+    # which try to add a lot opportunisitically set the count they</div><div class='add'>+    # discovered. Careful with test ordering!</div><div class='add'>+    if need_cnt and cfg.context_cnt and cfg.context_cnt &lt; need_cnt:</div><div class='add'>+        raise KsftSkipEx(f"Test requires at least {need_cnt} contexts, but device only has {cfg.context_cnt}")</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> # Get Rx packet counts for all queues, as a simple list of integers</div><div class='ctx'> # if @prev is specified the prev counts will be subtracted</div><div class='ctx'> def _get_rx_cnts(cfg, prev=None):</div><div class='hunk'>@@ -109,7 +118,7 @@ def test_rss_key_indir(cfg):</div><div class='ctx'> </div><div class='ctx'>     qcnt = len(_get_rx_cnts(cfg))</div><div class='ctx'>     if qcnt &lt; 3:</div><div class='del'>-        KsftSkipEx("Device has fewer than 3 queues (or doesn't support queue stats)")</div><div class='add'>+        raise KsftSkipEx("Device has fewer than 3 queues (or doesn't support queue stats)")</div><div class='ctx'> </div><div class='ctx'>     data = get_rss(cfg)</div><div class='ctx'>     want_keys = ['rss-hash-key', 'rss-hash-function', 'rss-indirection-table']</div><div class='hunk'>@@ -169,8 +178,13 @@ def test_rss_key_indir(cfg):</div><div class='ctx'>     cnts = _get_rx_cnts(cfg)</div><div class='ctx'>     GenerateTraffic(cfg).wait_pkts_and_stop(20000)</div><div class='ctx'>     cnts = _get_rx_cnts(cfg, prev=cnts)</div><div class='del'>-    # First two queues get less traffic than all the rest</div><div class='del'>-    ksft_lt(sum(cnts[:2]), sum(cnts[2:]), "traffic distributed: " + str(cnts))</div><div class='add'>+    if qcnt &gt; 4:</div><div class='add'>+        # First two queues get less traffic than all the rest</div><div class='add'>+        ksft_lt(sum(cnts[:2]), sum(cnts[2:]),</div><div class='add'>+                "traffic distributed: " + str(cnts))</div><div class='add'>+    else:</div><div class='add'>+        # When queue count is low make sure third queue got significant pkts</div><div class='add'>+        ksft_ge(cnts[2], 3500, "traffic distributed: " + str(cnts))</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> def test_rss_queue_reconfigure(cfg, main_ctx=True):</div><div class='hunk'>@@ -326,19 +340,20 @@ def test_hitless_key_update(cfg):</div><div class='ctx'>     data = get_rss(cfg)</div><div class='ctx'>     key_len = len(data['rss-hash-key'])</div><div class='ctx'> </div><div class='del'>-    key = _rss_key_rand(key_len)</div><div class='add'>+    ethnl = EthtoolFamily()</div><div class='add'>+    key = random.randbytes(key_len)</div><div class='ctx'> </div><div class='ctx'>     tgen = GenerateTraffic(cfg)</div><div class='ctx'>     try:</div><div class='ctx'>         errors0, carrier0 = get_drop_err_sum(cfg)</div><div class='ctx'>         t0 = datetime.datetime.now()</div><div class='del'>-        ethtool(f"-X {cfg.ifname} hkey " + _rss_key_str(key))</div><div class='add'>+        ethnl.rss_set({"header": {"dev-index": cfg.ifindex}, "hkey": key})</div><div class='ctx'>         t1 = datetime.datetime.now()</div><div class='ctx'>         errors1, carrier1 = get_drop_err_sum(cfg)</div><div class='ctx'>     finally:</div><div class='ctx'>         tgen.wait_pkts_and_stop(5000)</div><div class='ctx'> </div><div class='del'>-    ksft_lt((t1 - t0).total_seconds(), 0.2)</div><div class='add'>+    ksft_lt((t1 - t0).total_seconds(), 0.15)</div><div class='ctx'>     ksft_eq(errors1 - errors1, 0)</div><div class='ctx'>     ksft_eq(carrier1 - carrier0, 0)</div><div class='ctx'> </div><div class='hunk'>@@ -383,7 +398,7 @@ def test_rss_context_dump(cfg):</div><div class='ctx'> </div><div class='ctx'>     # Sanity-check the results</div><div class='ctx'>     for data in ctxs:</div><div class='del'>-        ksft_ne(set(data['indir']), {0}, "indir table is all zero")</div><div class='add'>+        ksft_ne(set(data.get('indir', [1])), {0}, "indir table is all zero")</div><div class='ctx'>         ksft_ne(set(data.get('hkey', [1])), {0}, "key is all zero")</div><div class='ctx'> </div><div class='ctx'>         # More specific checks</div><div class='hunk'>@@ -456,6 +471,8 @@ def test_rss_context(cfg, ctx_cnt=1, create_with_cfg=None):</div><div class='ctx'>                 raise</div><div class='ctx'>             ksft_pr(f"Failed to create context {i + 1}, trying to test what we got")</div><div class='ctx'>             ctx_cnt = i</div><div class='add'>+            if cfg.context_cnt is None:</div><div class='add'>+                cfg.context_cnt = ctx_cnt</div><div class='ctx'>             break</div><div class='ctx'> </div><div class='ctx'>         _rss_key_check(cfg, context=ctx_id)</div><div class='hunk'>@@ -511,8 +528,7 @@ def test_rss_context_out_of_order(cfg, ctx_cnt=4):</div><div class='ctx'>     """</div><div class='ctx'> </div><div class='ctx'>     require_ntuple(cfg)</div><div class='del'>-</div><div class='del'>-    requested_ctx_cnt = ctx_cnt</div><div class='add'>+    require_context_cnt(cfg, 4)</div><div class='ctx'> </div><div class='ctx'>     # Try to allocate more queues when necessary</div><div class='ctx'>     qcnt = len(_get_rx_cnts(cfg))</div><div class='hunk'>@@ -577,9 +593,6 @@ def test_rss_context_out_of_order(cfg, ctx_cnt=4):</div><div class='ctx'>     remove_ctx(-1)</div><div class='ctx'>     check_traffic()</div><div class='ctx'> </div><div class='del'>-    if requested_ctx_cnt != ctx_cnt:</div><div class='del'>-        raise KsftSkipEx(f"Tested only {ctx_cnt} contexts, wanted {requested_ctx_cnt}")</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> def test_rss_context_overlap(cfg, other_ctx=0):</div><div class='ctx'>     """</div><div class='hunk'>@@ -588,6 +601,8 @@ def test_rss_context_overlap(cfg, other_ctx=0):</div><div class='ctx'>     """</div><div class='ctx'> </div><div class='ctx'>     require_ntuple(cfg)</div><div class='add'>+    if other_ctx:</div><div class='add'>+        require_context_cnt(cfg, 2)</div><div class='ctx'> </div><div class='ctx'>     queue_cnt = len(_get_rx_cnts(cfg))</div><div class='ctx'>     if queue_cnt &lt; 4:</div><div class='hunk'>@@ -649,6 +664,29 @@ def test_rss_context_overlap2(cfg):</div><div class='ctx'>     test_rss_context_overlap(cfg, True)</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+def test_flow_add_context_missing(cfg):</div><div class='add'>+    """</div><div class='add'>+    Test that we are not allowed to add a rule pointing to an RSS context</div><div class='add'>+    which was never created.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    require_ntuple(cfg)</div><div class='add'>+</div><div class='add'>+    # Find a context which doesn't exist</div><div class='add'>+    for ctx_id in range(1, 100):</div><div class='add'>+        try:</div><div class='add'>+            get_rss(cfg, context=ctx_id)</div><div class='add'>+        except CmdExitFailure:</div><div class='add'>+            break</div><div class='add'>+</div><div class='add'>+    with ksft_raises(CmdExitFailure) as cm:</div><div class='add'>+        flow = f"flow-type tcp{cfg.addr_ipver} dst-ip {cfg.addr} dst-port 1234 context {ctx_id}"</div><div class='add'>+        ntuple_id = ethtool_create(cfg, "-N", flow)</div><div class='add'>+        ethtool(f"-N {cfg.ifname} delete {ntuple_id}")</div><div class='add'>+    if cm.exception:</div><div class='add'>+        ksft_in('Invalid argument', cm.exception.cmd.stderr)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> def test_delete_rss_context_busy(cfg):</div><div class='ctx'>     """</div><div class='ctx'>     Test that deletion returns -EBUSY when an rss context is being used</div><div class='hunk'>@@ -715,8 +753,65 @@ def test_rss_ntuple_addition(cfg):</div><div class='ctx'>                                                           'noise' : (0,) })</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+def test_rss_default_context_rule(cfg):</div><div class='add'>+    """</div><div class='add'>+    Allocate a port, direct this port to context 0, then create a new RSS</div><div class='add'>+    context and steer all TCP traffic to it (context 1).  Verify that:</div><div class='add'>+      * Traffic to the specific port continues to use queues of the main</div><div class='add'>+        context (0/1).</div><div class='add'>+      * Traffic to any other TCP port is redirected to the new context</div><div class='add'>+        (queues 2/3).</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    require_ntuple(cfg)</div><div class='add'>+</div><div class='add'>+    queue_cnt = len(_get_rx_cnts(cfg))</div><div class='add'>+    if queue_cnt &lt; 4:</div><div class='add'>+        try:</div><div class='add'>+            ksft_pr(f"Increasing queue count {queue_cnt} -&gt; 4")</div><div class='add'>+            ethtool(f"-L {cfg.ifname} combined 4")</div><div class='add'>+            defer(ethtool, f"-L {cfg.ifname} combined {queue_cnt}")</div><div class='add'>+        except Exception as exc:</div><div class='add'>+            raise KsftSkipEx("Not enough queues for the test") from exc</div><div class='add'>+</div><div class='add'>+    # Use queues 0 and 1 for the main context</div><div class='add'>+    ethtool(f"-X {cfg.ifname} equal 2")</div><div class='add'>+    defer(ethtool, f"-X {cfg.ifname} default")</div><div class='add'>+</div><div class='add'>+    # Create a new RSS context that uses queues 2 and 3</div><div class='add'>+    ctx_id = ethtool_create(cfg, "-X", "context new start 2 equal 2")</div><div class='add'>+    defer(ethtool, f"-X {cfg.ifname} context {ctx_id} delete")</div><div class='add'>+</div><div class='add'>+    # Generic low-priority rule: redirect all TCP traffic to the new context.</div><div class='add'>+    # Give it an explicit higher location number (lower priority).</div><div class='add'>+    flow_generic = f"flow-type tcp{cfg.addr_ipver} dst-ip {cfg.addr} context {ctx_id} loc 1"</div><div class='add'>+    ethtool(f"-N {cfg.ifname} {flow_generic}")</div><div class='add'>+    defer(ethtool, f"-N {cfg.ifname} delete 1")</div><div class='add'>+</div><div class='add'>+    # Specific high-priority rule for a random port that should stay on context 0.</div><div class='add'>+    # Assign loc 0 so it is evaluated before the generic rule.</div><div class='add'>+    port_main = rand_port()</div><div class='add'>+    flow_main = f"flow-type tcp{cfg.addr_ipver} dst-ip {cfg.addr} dst-port {port_main} context 0 loc 0"</div><div class='add'>+    ethtool(f"-N {cfg.ifname} {flow_main}")</div><div class='add'>+    defer(ethtool, f"-N {cfg.ifname} delete 0")</div><div class='add'>+</div><div class='add'>+    _ntuple_rule_check(cfg, 1, ctx_id)</div><div class='add'>+</div><div class='add'>+    # Verify that traffic matching the specific rule still goes to queues 0/1</div><div class='add'>+    _send_traffic_check(cfg, port_main, "context 0",</div><div class='add'>+                        { 'target': (0, 1),</div><div class='add'>+                          'empty' : (2, 3) })</div><div class='add'>+</div><div class='add'>+    # And that traffic for any other port is steered to the new context</div><div class='add'>+    port_other = rand_port()</div><div class='add'>+    _send_traffic_check(cfg, port_other, f"context {ctx_id}",</div><div class='add'>+                        { 'target': (2, 3),</div><div class='add'>+                          'noise' : (0, 1) })</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> def main() -&gt; None:</div><div class='ctx'>     with NetDrvEpEnv(__file__, nsim_test=False) as cfg:</div><div class='add'>+        cfg.context_cnt = None</div><div class='ctx'>         cfg.ethnl = EthtoolFamily()</div><div class='ctx'>         cfg.netdevnl = NetdevFamily()</div><div class='ctx'> </div><div class='hunk'>@@ -726,7 +821,9 @@ def main() -&gt; None:</div><div class='ctx'>                   test_rss_context_dump, test_rss_context_queue_reconfigure,</div><div class='ctx'>                   test_rss_context_overlap, test_rss_context_overlap2,</div><div class='ctx'>                   test_rss_context_out_of_order, test_rss_context4_create_with_cfg,</div><div class='del'>-                  test_delete_rss_context_busy, test_rss_ntuple_addition],</div><div class='add'>+                  test_flow_add_context_missing,</div><div class='add'>+                  test_delete_rss_context_busy, test_rss_ntuple_addition,</div><div class='add'>+                  test_rss_default_context_rule],</div><div class='ctx'>                  args=(cfg, ))</div><div class='ctx'>     ksft_exit()</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/rss_flow_label.py b/tools/testing/selftests/drivers/net/hw/rss_flow_label.py<br/>new file mode 100755<br/>index 000000000000..6fa95fe27c47<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/rss_flow_label.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/rss_flow_label.py</a></div><div class='hunk'>@@ -0,0 +1,167 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+"""</div><div class='add'>+Tests for RSS hashing on IPv6 Flow Label.</div><div class='add'>+"""</div><div class='add'>+</div><div class='add'>+import glob</div><div class='add'>+import os</div><div class='add'>+import socket</div><div class='add'>+from lib.py import CmdExitFailure</div><div class='add'>+from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_ge, ksft_in, \</div><div class='add'>+    ksft_not_in, ksft_raises, KsftSkipEx</div><div class='add'>+from lib.py import bkg, cmd, defer, fd_read_timeout, rand_port</div><div class='add'>+from lib.py import NetDrvEpEnv</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _check_system(cfg):</div><div class='add'>+    if not hasattr(socket, "SO_INCOMING_CPU"):</div><div class='add'>+        raise KsftSkipEx("socket.SO_INCOMING_CPU was added in Python 3.11")</div><div class='add'>+</div><div class='add'>+    qcnt = len(glob.glob(f"/sys/class/net/{cfg.ifname}/queues/rx-*"))</div><div class='add'>+    if qcnt &lt; 2:</div><div class='add'>+        raise KsftSkipEx(f"Local has only {qcnt} queues")</div><div class='add'>+</div><div class='add'>+    for f in [f"/sys/class/net/{cfg.ifname}/queues/rx-0/rps_flow_cnt",</div><div class='add'>+              f"/sys/class/net/{cfg.ifname}/queues/rx-0/rps_cpus"]:</div><div class='add'>+        try:</div><div class='add'>+            with open(f, 'r') as fp:</div><div class='add'>+                setting = fp.read().strip()</div><div class='add'>+                # CPU mask will be zeros and commas</div><div class='add'>+                if setting.replace("0", "").replace(",", ""):</div><div class='add'>+                    raise KsftSkipEx(f"RPS/RFS is configured: {f}: {setting}")</div><div class='add'>+        except FileNotFoundError:</div><div class='add'>+            pass</div><div class='add'>+</div><div class='add'>+    # 1 is the default, if someone changed it we probably shouldn"t mess with it</div><div class='add'>+    af = cmd("cat /proc/sys/net/ipv6/auto_flowlabels", host=cfg.remote).stdout</div><div class='add'>+    if af.strip() != "1":</div><div class='add'>+        raise KsftSkipEx("Remote does not have auto_flowlabels enabled")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _ethtool_get_cfg(cfg, fl_type):</div><div class='add'>+    descr = cmd(f"ethtool -n {cfg.ifname} rx-flow-hash {fl_type}").stdout</div><div class='add'>+</div><div class='add'>+    converter = {</div><div class='add'>+        "IP SA": "s",</div><div class='add'>+        "IP DA": "d",</div><div class='add'>+        "L3 proto": "t",</div><div class='add'>+        "L4 bytes 0 &amp; 1 [TCP/UDP src port]": "f",</div><div class='add'>+        "L4 bytes 2 &amp; 3 [TCP/UDP dst port]": "n",</div><div class='add'>+        "IPv6 Flow Label": "l",</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    ret = ""</div><div class='add'>+    for line in descr.split("\n")[1:-2]:</div><div class='add'>+        # if this raises we probably need to add more keys to converter above</div><div class='add'>+        ret += converter[line]</div><div class='add'>+    return ret</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _traffic(cfg, one_sock, one_cpu):</div><div class='add'>+    local_port  = rand_port(socket.SOCK_DGRAM)</div><div class='add'>+    remote_port = rand_port(socket.SOCK_DGRAM)</div><div class='add'>+</div><div class='add'>+    sock = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)</div><div class='add'>+    sock.bind(("", local_port))</div><div class='add'>+    sock.connect((cfg.remote_addr_v["6"], 0))</div><div class='add'>+    if one_sock:</div><div class='add'>+        send = f"exec 5&lt;&gt;/dev/udp/{cfg.addr_v['6']}/{local_port}; " \</div><div class='add'>+                "for i in `seq 20`; do echo a &gt;&amp;5; sleep 0.02; done; exec 5&gt;&amp;-"</div><div class='add'>+    else:</div><div class='add'>+        send = "for i in `seq 20`; do echo a | socat -t0.02 - UDP6:" \</div><div class='add'>+              f"[{cfg.addr_v['6']}]:{local_port},sourceport={remote_port}; done"</div><div class='add'>+</div><div class='add'>+    cpus = set()</div><div class='add'>+    with bkg(send, shell=True, host=cfg.remote, exit_wait=True):</div><div class='add'>+        for _ in range(20):</div><div class='add'>+            fd_read_timeout(sock.fileno(), 1)</div><div class='add'>+            cpu = sock.getsockopt(socket.SOL_SOCKET, socket.SO_INCOMING_CPU)</div><div class='add'>+            cpus.add(cpu)</div><div class='add'>+</div><div class='add'>+    if one_cpu:</div><div class='add'>+        ksft_eq(len(cpus), 1,</div><div class='add'>+                f"{one_sock=} - expected one CPU, got traffic on: {cpus=}")</div><div class='add'>+    else:</div><div class='add'>+        ksft_ge(len(cpus), 2,</div><div class='add'>+                f"{one_sock=} - expected many CPUs, got traffic on: {cpus=}")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rss_flow_label(cfg):</div><div class='add'>+    """</div><div class='add'>+    Test hashing on IPv6 flow label. Send traffic over a single socket</div><div class='add'>+    and over multiple sockets. Depend on the remote having auto-label</div><div class='add'>+    enabled so that it randomizes the label per socket.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    cfg.require_ipver("6")</div><div class='add'>+    cfg.require_cmd("socat", remote=True)</div><div class='add'>+    _check_system(cfg)</div><div class='add'>+</div><div class='add'>+    # Enable flow label hashing for UDP6</div><div class='add'>+    initial = _ethtool_get_cfg(cfg, "udp6")</div><div class='add'>+    no_lbl = initial.replace("l", "")</div><div class='add'>+    if "l" not in initial:</div><div class='add'>+        try:</div><div class='add'>+            cmd(f"ethtool -N {cfg.ifname} rx-flow-hash udp6 l{no_lbl}")</div><div class='add'>+        except CmdExitFailure as exc:</div><div class='add'>+            raise KsftSkipEx("Device doesn't support Flow Label for UDP6") from exc</div><div class='add'>+</div><div class='add'>+        defer(cmd, f"ethtool -N {cfg.ifname} rx-flow-hash udp6 {initial}")</div><div class='add'>+</div><div class='add'>+    _traffic(cfg, one_sock=True, one_cpu=True)</div><div class='add'>+    _traffic(cfg, one_sock=False, one_cpu=False)</div><div class='add'>+</div><div class='add'>+    # Disable it, we should see no hashing (reset was already defer()ed)</div><div class='add'>+    cmd(f"ethtool -N {cfg.ifname} rx-flow-hash udp6 {no_lbl}")</div><div class='add'>+</div><div class='add'>+    _traffic(cfg, one_sock=False, one_cpu=True)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _check_v4_flow_types(cfg):</div><div class='add'>+    for fl_type in ["tcp4", "udp4", "ah4", "esp4", "sctp4"]:</div><div class='add'>+        try:</div><div class='add'>+            cur = cmd(f"ethtool -n {cfg.ifname} rx-flow-hash {fl_type}").stdout</div><div class='add'>+            ksft_not_in("Flow Label", cur,</div><div class='add'>+                        comment=f"{fl_type=} has Flow Label:" + cur)</div><div class='add'>+        except CmdExitFailure:</div><div class='add'>+            # Probably does not support this flow type</div><div class='add'>+            pass</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rss_flow_label_6only(cfg):</div><div class='add'>+    """</div><div class='add'>+    Test interactions with IPv4 flow types. It should not be possible to set</div><div class='add'>+    IPv6 Flow Label hashing for an IPv4 flow type. The Flow Label should also</div><div class='add'>+    not appear in the IPv4 "current config".</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    with ksft_raises(CmdExitFailure) as cm:</div><div class='add'>+        cmd(f"ethtool -N {cfg.ifname} rx-flow-hash tcp4 sdfnl")</div><div class='add'>+    ksft_in("Invalid argument", cm.exception.cmd.stderr)</div><div class='add'>+</div><div class='add'>+    _check_v4_flow_types(cfg)</div><div class='add'>+</div><div class='add'>+    # Try to enable Flow Labels and check again, in case it leaks thru</div><div class='add'>+    initial = _ethtool_get_cfg(cfg, "udp6")</div><div class='add'>+    changed = initial.replace("l", "") if "l" in initial else initial + "l"</div><div class='add'>+</div><div class='add'>+    cmd(f"ethtool -N {cfg.ifname} rx-flow-hash udp6 {changed}")</div><div class='add'>+    restore = defer(cmd, f"ethtool -N {cfg.ifname} rx-flow-hash udp6 {initial}")</div><div class='add'>+</div><div class='add'>+    _check_v4_flow_types(cfg)</div><div class='add'>+    restore.exec()</div><div class='add'>+    _check_v4_flow_types(cfg)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    with NetDrvEpEnv(__file__, nsim_test=False) as cfg:</div><div class='add'>+        ksft_run([test_rss_flow_label,</div><div class='add'>+                  test_rss_flow_label_6only],</div><div class='add'>+                 args=(cfg, ))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py b/tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py<br/>new file mode 100755<br/>index 000000000000..72880e388478<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py</a></div><div class='hunk'>@@ -0,0 +1,92 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+import multiprocessing</div><div class='add'>+import socket</div><div class='add'>+from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_ge, cmd, fd_read_timeout</div><div class='add'>+from lib.py import NetDrvEpEnv</div><div class='add'>+from lib.py import EthtoolFamily, NetdevFamily</div><div class='add'>+from lib.py import KsftSkipEx, KsftFailEx</div><div class='add'>+from lib.py import rand_port</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def traffic(cfg, local_port, remote_port, ipver):</div><div class='add'>+    af_inet = socket.AF_INET if ipver == "4" else socket.AF_INET6</div><div class='add'>+    sock = socket.socket(af_inet, socket.SOCK_DGRAM)</div><div class='add'>+    sock.bind(("", local_port))</div><div class='add'>+    sock.connect((cfg.remote_addr_v[ipver], remote_port))</div><div class='add'>+    tgt = f"{ipver}:[{cfg.addr_v[ipver]}]:{local_port},sourceport={remote_port}"</div><div class='add'>+    cmd("echo a | socat - UDP" + tgt, host=cfg.remote)</div><div class='add'>+    fd_read_timeout(sock.fileno(), 5)</div><div class='add'>+    return sock.getsockopt(socket.SOL_SOCKET, socket.SO_INCOMING_CPU)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rss_input_xfrm(cfg, ipver):</div><div class='add'>+    """</div><div class='add'>+    Test symmetric input_xfrm.</div><div class='add'>+    If symmetric RSS hash is configured, send traffic twice, swapping the</div><div class='add'>+    src/dst UDP ports, and verify that the same queue is receiving the traffic</div><div class='add'>+    in both cases (IPs are constant).</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    if multiprocessing.cpu_count() &lt; 2:</div><div class='add'>+        raise KsftSkipEx("Need at least two CPUs to test symmetric RSS hash")</div><div class='add'>+</div><div class='add'>+    cfg.require_cmd("socat", local=False, remote=True)</div><div class='add'>+</div><div class='add'>+    if not hasattr(socket, "SO_INCOMING_CPU"):</div><div class='add'>+        raise KsftSkipEx("socket.SO_INCOMING_CPU was added in Python 3.11")</div><div class='add'>+</div><div class='add'>+    rss = cfg.ethnl.rss_get({'header': {'dev-name': cfg.ifname}})</div><div class='add'>+    input_xfrm = set(filter(lambda x: 'sym' in x, rss.get('input-xfrm', {})))</div><div class='add'>+</div><div class='add'>+    # Check for symmetric xor/or-xor</div><div class='add'>+    if not input_xfrm:</div><div class='add'>+        raise KsftSkipEx("Symmetric RSS hash not requested")</div><div class='add'>+</div><div class='add'>+    cpus = set()</div><div class='add'>+    successful = 0</div><div class='add'>+    for _ in range(100):</div><div class='add'>+        try:</div><div class='add'>+            port1 = rand_port(socket.SOCK_DGRAM)</div><div class='add'>+            port2 = rand_port(socket.SOCK_DGRAM)</div><div class='add'>+            cpu1 = traffic(cfg, port1, port2, ipver)</div><div class='add'>+            cpu2 = traffic(cfg, port2, port1, ipver)</div><div class='add'>+            cpus.update([cpu1, cpu2])</div><div class='add'>+            ksft_eq(</div><div class='add'>+                cpu1, cpu2, comment=f"Received traffic on different cpus with ports ({port1 = }, {port2 = }) while symmetric hash is configured")</div><div class='add'>+</div><div class='add'>+            successful += 1</div><div class='add'>+            if successful == 10:</div><div class='add'>+                break</div><div class='add'>+        except:</div><div class='add'>+            continue</div><div class='add'>+    else:</div><div class='add'>+        raise KsftFailEx("Failed to run traffic")</div><div class='add'>+</div><div class='add'>+    ksft_ge(len(cpus), 2,</div><div class='add'>+            comment=f"Received traffic on less than two cpus {cpus = }")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rss_input_xfrm_ipv4(cfg):</div><div class='add'>+    cfg.require_ipver("4")</div><div class='add'>+    test_rss_input_xfrm(cfg, "4")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_rss_input_xfrm_ipv6(cfg):</div><div class='add'>+    cfg.require_ipver("6")</div><div class='add'>+    test_rss_input_xfrm(cfg, "6")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    with NetDrvEpEnv(__file__, nsim_test=False) as cfg:</div><div class='add'>+        cfg.ethnl = EthtoolFamily()</div><div class='add'>+        cfg.netdevnl = NetdevFamily()</div><div class='add'>+</div><div class='add'>+        ksft_run([test_rss_input_xfrm_ipv4, test_rss_input_xfrm_ipv6],</div><div class='add'>+                 args=(cfg, ))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/net/toeplitz.c b/tools/testing/selftests/drivers/net/hw/toeplitz.c<br/>index 9ba03164d73a..d23b3b0c20a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/net/toeplitz.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/net/toeplitz.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/toeplitz.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/toeplitz.c</a></div><div class='hunk'>@@ -52,7 +52,11 @@</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include &lt;ynl.h&gt;</div><div class='add'>+#include "ethtool-user.h"</div><div class='add'>+</div><div class='add'>+#include "kselftest.h"</div><div class='add'>+#include "../../../net/lib/ksft.h"</div><div class='ctx'> </div><div class='ctx'> #define TOEPLITZ_KEY_MIN_LEN	40</div><div class='ctx'> #define TOEPLITZ_KEY_MAX_LEN	60</div><div class='hunk'>@@ -64,6 +68,7 @@</div><div class='ctx'> #define FOUR_TUPLE_MAX_LEN	((sizeof(struct in6_addr) * 2) + (sizeof(uint16_t) * 2))</div><div class='ctx'> </div><div class='ctx'> #define RSS_MAX_CPUS (1 &lt;&lt; 16)	/* real constraint is PACKET_FANOUT_MAX */</div><div class='add'>+#define RSS_MAX_INDIR	(1 &lt;&lt; 16)</div><div class='ctx'> </div><div class='ctx'> #define RPS_MAX_CPUS 16UL	/* must be a power of 2 */</div><div class='ctx'> </div><div class='hunk'>@@ -101,6 +106,8 @@ struct ring_state {</div><div class='ctx'> static unsigned int rx_irq_cpus[RSS_MAX_CPUS];	/* map from rxq to cpu */</div><div class='ctx'> static int rps_silo_to_cpu[RPS_MAX_CPUS];</div><div class='ctx'> static unsigned char toeplitz_key[TOEPLITZ_KEY_MAX_LEN];</div><div class='add'>+static unsigned int rss_indir_tbl[RSS_MAX_INDIR];</div><div class='add'>+static unsigned int rss_indir_tbl_size;</div><div class='ctx'> static struct ring_state rings[RSS_MAX_CPUS];</div><div class='ctx'> </div><div class='ctx'> static inline uint32_t toeplitz(const unsigned char *four_tuple,</div><div class='hunk'>@@ -129,7 +136,12 @@ static inline uint32_t toeplitz(const unsigned char *four_tuple,</div><div class='ctx'> /* Compare computed cpu with arrival cpu from packet_fanout_cpu */</div><div class='ctx'> static void verify_rss(uint32_t rx_hash, int cpu)</div><div class='ctx'> {</div><div class='del'>-	int queue = rx_hash % cfg_num_queues;</div><div class='add'>+	int queue;</div><div class='add'>+</div><div class='add'>+	if (rss_indir_tbl_size)</div><div class='add'>+		queue = rss_indir_tbl[rx_hash % rss_indir_tbl_size];</div><div class='add'>+	else</div><div class='add'>+		queue = rx_hash % cfg_num_queues;</div><div class='ctx'> </div><div class='ctx'> 	log_verbose(" rxq %d (cpu %d)", queue, rx_irq_cpus[queue]);</div><div class='ctx'> 	if (rx_irq_cpus[queue] != cpu) {</div><div class='hunk'>@@ -482,6 +494,56 @@ static void parse_rps_bitmap(const char *arg)</div><div class='ctx'> 			rps_silo_to_cpu[cfg_num_rps_cpus++] = i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void read_rss_dev_info_ynl(void)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rss_get_req *req;</div><div class='add'>+	struct ethtool_rss_get_rsp *rsp;</div><div class='add'>+	struct ynl_sock *ys;</div><div class='add'>+</div><div class='add'>+	ys = ynl_sock_create(&amp;ynl_ethtool_family, NULL);</div><div class='add'>+	if (!ys)</div><div class='add'>+		error(1, errno, "ynl_sock_create failed");</div><div class='add'>+</div><div class='add'>+	req = ethtool_rss_get_req_alloc();</div><div class='add'>+	if (!req)</div><div class='add'>+		error(1, errno, "ethtool_rss_get_req_alloc failed");</div><div class='add'>+</div><div class='add'>+	ethtool_rss_get_req_set_header_dev_name(req, cfg_ifname);</div><div class='add'>+</div><div class='add'>+	rsp = ethtool_rss_get(ys, req);</div><div class='add'>+	if (!rsp)</div><div class='add'>+		error(1, ys-&gt;err.code, "YNL: %s", ys-&gt;err.msg);</div><div class='add'>+</div><div class='add'>+	if (!rsp-&gt;_len.hkey)</div><div class='add'>+		error(1, 0, "RSS key not available for %s", cfg_ifname);</div><div class='add'>+</div><div class='add'>+	if (rsp-&gt;_len.hkey &lt; TOEPLITZ_KEY_MIN_LEN ||</div><div class='add'>+	    rsp-&gt;_len.hkey &gt; TOEPLITZ_KEY_MAX_LEN)</div><div class='add'>+		error(1, 0, "RSS key length %u out of bounds [%u, %u]",</div><div class='add'>+		      rsp-&gt;_len.hkey, TOEPLITZ_KEY_MIN_LEN,</div><div class='add'>+		      TOEPLITZ_KEY_MAX_LEN);</div><div class='add'>+</div><div class='add'>+	memcpy(toeplitz_key, rsp-&gt;hkey, rsp-&gt;_len.hkey);</div><div class='add'>+</div><div class='add'>+	if (rsp-&gt;_count.indir &gt; RSS_MAX_INDIR)</div><div class='add'>+		error(1, 0, "RSS indirection table too large (%u &gt; %u)",</div><div class='add'>+		      rsp-&gt;_count.indir, RSS_MAX_INDIR);</div><div class='add'>+</div><div class='add'>+	/* If indir table not available we'll fallback to simple modulo math */</div><div class='add'>+	if (rsp-&gt;_count.indir) {</div><div class='add'>+		memcpy(rss_indir_tbl, rsp-&gt;indir,</div><div class='add'>+		       rsp-&gt;_count.indir * sizeof(rss_indir_tbl[0]));</div><div class='add'>+		rss_indir_tbl_size = rsp-&gt;_count.indir;</div><div class='add'>+</div><div class='add'>+		log_verbose("RSS indirection table size: %u\n",</div><div class='add'>+			    rss_indir_tbl_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ethtool_rss_get_rsp_free(rsp);</div><div class='add'>+	ethtool_rss_get_req_free(req);</div><div class='add'>+	ynl_sock_destroy(ys);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void parse_opts(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	static struct option long_options[] = {</div><div class='hunk'>@@ -550,7 +612,7 @@ static void parse_opts(int argc, char **argv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!have_toeplitz)</div><div class='del'>-		error(1, 0, "Must supply rss key ('-k')");</div><div class='add'>+		read_rss_dev_info_ynl();</div><div class='ctx'> </div><div class='ctx'> 	num_cpus = get_nprocs();</div><div class='ctx'> 	if (num_cpus &gt; RSS_MAX_CPUS)</div><div class='hunk'>@@ -576,6 +638,10 @@ int main(int argc, char **argv)</div><div class='ctx'> 		fd_sink = setup_sink();</div><div class='ctx'> </div><div class='ctx'> 	setup_rings();</div><div class='add'>+</div><div class='add'>+	/* Signal to test framework that we're ready to receive */</div><div class='add'>+	ksft_ready();</div><div class='add'>+</div><div class='ctx'> 	process_rings();</div><div class='ctx'> 	cleanup_rings();</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/toeplitz.py b/tools/testing/selftests/drivers/net/hw/toeplitz.py<br/>new file mode 100755<br/>index 000000000000..d2db5ee9e358<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/toeplitz.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/toeplitz.py</a></div><div class='hunk'>@@ -0,0 +1,211 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+"""</div><div class='add'>+Toeplitz Rx hashing test:</div><div class='add'>+ - rxhash (the hash value calculation itself);</div><div class='add'>+ - RSS mapping from rxhash to rx queue;</div><div class='add'>+ - RPS mapping from rxhash to cpu.</div><div class='add'>+"""</div><div class='add'>+</div><div class='add'>+import glob</div><div class='add'>+import os</div><div class='add'>+import socket</div><div class='add'>+from lib.py import ksft_run, ksft_exit, ksft_pr</div><div class='add'>+from lib.py import NetDrvEpEnv, EthtoolFamily, NetdevFamily</div><div class='add'>+from lib.py import cmd, bkg, rand_port, defer</div><div class='add'>+from lib.py import ksft_in</div><div class='add'>+from lib.py import ksft_variants, KsftNamedVariant, KsftSkipEx, KsftFailEx</div><div class='add'>+</div><div class='add'>+# "define" for the ID of the Toeplitz hash function</div><div class='add'>+ETH_RSS_HASH_TOP = 1</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _check_rps_and_rfs_not_configured(cfg):</div><div class='add'>+    """Verify that RPS is not already configured."""</div><div class='add'>+</div><div class='add'>+    for rps_file in glob.glob(f"/sys/class/net/{cfg.ifname}/queues/rx-*/rps_cpus"):</div><div class='add'>+        with open(rps_file, "r", encoding="utf-8") as fp:</div><div class='add'>+            val = fp.read().strip()</div><div class='add'>+            if set(val) - {"0", ","}:</div><div class='add'>+                raise KsftSkipEx(f"RPS already configured on {rps_file}: {val}")</div><div class='add'>+</div><div class='add'>+    rfs_file = "/proc/sys/net/core/rps_sock_flow_entries"</div><div class='add'>+    with open(rfs_file, "r", encoding="utf-8") as fp:</div><div class='add'>+        val = fp.read().strip()</div><div class='add'>+        if val != "0":</div><div class='add'>+            raise KsftSkipEx(f"RFS already configured {rfs_file}: {val}")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _get_cpu_for_irq(irq):</div><div class='add'>+    with open(f"/proc/irq/{irq}/smp_affinity_list", "r",</div><div class='add'>+              encoding="utf-8") as fp:</div><div class='add'>+        data = fp.read().strip()</div><div class='add'>+        if "," in data or "-" in data:</div><div class='add'>+            raise KsftFailEx(f"IRQ{irq} is not mapped to a single core: {data}")</div><div class='add'>+        return int(data)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _get_irq_cpus(cfg):</div><div class='add'>+    """</div><div class='add'>+    Read the list of IRQs for the device Rx queues.</div><div class='add'>+    """</div><div class='add'>+    queues = cfg.netnl.queue_get({"ifindex": cfg.ifindex}, dump=True)</div><div class='add'>+    napis = cfg.netnl.napi_get({"ifindex": cfg.ifindex}, dump=True)</div><div class='add'>+</div><div class='add'>+    # Remap into ID-based dicts</div><div class='add'>+    napis = {n["id"]: n for n in napis}</div><div class='add'>+    queues = {f"{q['type']}{q['id']}": q for q in queues}</div><div class='add'>+</div><div class='add'>+    cpus = []</div><div class='add'>+    for rx in range(9999):</div><div class='add'>+        name = f"rx{rx}"</div><div class='add'>+        if name not in queues:</div><div class='add'>+            break</div><div class='add'>+        cpus.append(_get_cpu_for_irq(napis[queues[name]["napi-id"]]["irq"]))</div><div class='add'>+</div><div class='add'>+    return cpus</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _get_unused_cpus(cfg, count=2):</div><div class='add'>+    """</div><div class='add'>+    Get CPUs that are not used by Rx queues.</div><div class='add'>+    Returns a list of at least 'count' CPU numbers.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    # Get CPUs used by Rx queues</div><div class='add'>+    rx_cpus = set(_get_irq_cpus(cfg))</div><div class='add'>+</div><div class='add'>+    # Get total number of CPUs</div><div class='add'>+    num_cpus = os.cpu_count()</div><div class='add'>+</div><div class='add'>+    # Find unused CPUs</div><div class='add'>+    unused_cpus = [cpu for cpu in range(num_cpus) if cpu not in rx_cpus]</div><div class='add'>+</div><div class='add'>+    if len(unused_cpus) &lt; count:</div><div class='add'>+        raise KsftSkipEx(f"Need at {count} CPUs not used by Rx queues, found {len(unused_cpus)}")</div><div class='add'>+</div><div class='add'>+    return unused_cpus[:count]</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _configure_rps(cfg, rps_cpus):</div><div class='add'>+    """Configure RPS for all Rx queues."""</div><div class='add'>+</div><div class='add'>+    mask = 0</div><div class='add'>+    for cpu in rps_cpus:</div><div class='add'>+        mask |= (1 &lt;&lt; cpu)</div><div class='add'>+    mask = hex(mask)[2:]</div><div class='add'>+</div><div class='add'>+    # Set RPS bitmap for all rx queues</div><div class='add'>+    for rps_file in glob.glob(f"/sys/class/net/{cfg.ifname}/queues/rx-*/rps_cpus"):</div><div class='add'>+        with open(rps_file, "w", encoding="utf-8") as fp:</div><div class='add'>+            fp.write(mask)</div><div class='add'>+</div><div class='add'>+    return mask</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _send_traffic(cfg, proto_flag, ipver, port):</div><div class='add'>+    """Send 20 packets of requested type."""</div><div class='add'>+</div><div class='add'>+    # Determine protocol and IP version for socat</div><div class='add'>+    if proto_flag == "-u":</div><div class='add'>+        proto = "UDP"</div><div class='add'>+    else:</div><div class='add'>+        proto = "TCP"</div><div class='add'>+</div><div class='add'>+    baddr = f"[{cfg.addr_v['6']}]" if ipver == "6" else cfg.addr_v["4"]</div><div class='add'>+</div><div class='add'>+    # Run socat in a loop to send traffic periodically</div><div class='add'>+    # Use sh -c with a loop similar to toeplitz_client.sh</div><div class='add'>+    socat_cmd = f"""</div><div class='add'>+    for i in `seq 20`; do</div><div class='add'>+        echo "msg $i" | socat -{ipver} -t 0.1 - {proto}:{baddr}:{port};</div><div class='add'>+        sleep 0.001;</div><div class='add'>+    done</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    cmd(socat_cmd, shell=True, host=cfg.remote)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _test_variants():</div><div class='add'>+    for grp in ["", "rss", "rps"]:</div><div class='add'>+        for l4 in ["tcp", "udp"]:</div><div class='add'>+            for l3 in ["4", "6"]:</div><div class='add'>+                name = f"{l4}_ipv{l3}"</div><div class='add'>+                if grp:</div><div class='add'>+                    name = f"{grp}_{name}"</div><div class='add'>+                yield KsftNamedVariant(name, "-" + l4[0], l3, grp)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+@ksft_variants(_test_variants())</div><div class='add'>+def test(cfg, proto_flag, ipver, grp):</div><div class='add'>+    """Run a single toeplitz test."""</div><div class='add'>+</div><div class='add'>+    cfg.require_ipver(ipver)</div><div class='add'>+</div><div class='add'>+    # Check that rxhash is enabled</div><div class='add'>+    ksft_in("receive-hashing: on", cmd(f"ethtool -k {cfg.ifname}").stdout)</div><div class='add'>+</div><div class='add'>+    rss = cfg.ethnl.rss_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+    # Make sure NIC is configured to use Toeplitz hash, and no key xfrm.</div><div class='add'>+    if rss.get('hfunc') != ETH_RSS_HASH_TOP or rss.get('input-xfrm'):</div><div class='add'>+        cfg.ethnl.rss_set({"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                           "hfunc": ETH_RSS_HASH_TOP,</div><div class='add'>+                           "input-xfrm": {}})</div><div class='add'>+        defer(cfg.ethnl.rss_set, {"header": {"dev-index": cfg.ifindex},</div><div class='add'>+                                  "hfunc": rss.get('hfunc'),</div><div class='add'>+                                  "input-xfrm": rss.get('input-xfrm', {})</div><div class='add'>+                                  })</div><div class='add'>+</div><div class='add'>+    port = rand_port(socket.SOCK_DGRAM)</div><div class='add'>+</div><div class='add'>+    toeplitz_path = cfg.test_dir / "toeplitz"</div><div class='add'>+    rx_cmd = [</div><div class='add'>+        str(toeplitz_path),</div><div class='add'>+        "-" + ipver,</div><div class='add'>+        proto_flag,</div><div class='add'>+        "-d", str(port),</div><div class='add'>+        "-i", cfg.ifname,</div><div class='add'>+        "-T", "4000",</div><div class='add'>+        "-s",</div><div class='add'>+        "-v"</div><div class='add'>+    ]</div><div class='add'>+</div><div class='add'>+    if grp:</div><div class='add'>+        _check_rps_and_rfs_not_configured(cfg)</div><div class='add'>+    if grp == "rss":</div><div class='add'>+        irq_cpus = ",".join([str(x) for x in _get_irq_cpus(cfg)])</div><div class='add'>+        rx_cmd += ["-C", irq_cpus]</div><div class='add'>+        ksft_pr(f"RSS using CPUs: {irq_cpus}")</div><div class='add'>+    elif grp == "rps":</div><div class='add'>+        # Get CPUs not used by Rx queues and configure them for RPS</div><div class='add'>+        rps_cpus = _get_unused_cpus(cfg, count=2)</div><div class='add'>+        rps_mask = _configure_rps(cfg, rps_cpus)</div><div class='add'>+        defer(_configure_rps, cfg, [])</div><div class='add'>+        rx_cmd += ["-r", rps_mask]</div><div class='add'>+        ksft_pr(f"RPS using CPUs: {rps_cpus}, mask: {rps_mask}")</div><div class='add'>+</div><div class='add'>+    # Run rx in background, it will exit once it has seen enough packets</div><div class='add'>+    with bkg(" ".join(rx_cmd), ksft_ready=True, exit_wait=True) as rx_proc:</div><div class='add'>+        while rx_proc.proc.poll() is None:</div><div class='add'>+            _send_traffic(cfg, proto_flag, ipver, port)</div><div class='add'>+</div><div class='add'>+    # Check rx result</div><div class='add'>+    ksft_pr("Receiver output:")</div><div class='add'>+    ksft_pr(rx_proc.stdout.strip().replace('\n', '\n# '))</div><div class='add'>+    if rx_proc.stderr:</div><div class='add'>+        ksft_pr(rx_proc.stderr.strip().replace('\n', '\n# '))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    """Ksft boilerplate main."""</div><div class='add'>+</div><div class='add'>+    with NetDrvEpEnv(__file__) as cfg:</div><div class='add'>+        cfg.ethnl = EthtoolFamily()</div><div class='add'>+        cfg.netnl = NetdevFamily()</div><div class='add'>+        ksft_run(cases=[test], args=(cfg,))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/tso.py b/tools/testing/selftests/drivers/net/hw/tso.py<br/>new file mode 100755<br/>index 000000000000..0998e68ebaf0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/tso.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/tso.py</a></div><div class='hunk'>@@ -0,0 +1,261 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+"""Run the tools/testing/selftests/net/csum testsuite."""</div><div class='add'>+</div><div class='add'>+import fcntl</div><div class='add'>+import socket</div><div class='add'>+import struct</div><div class='add'>+import termios</div><div class='add'>+import time</div><div class='add'>+</div><div class='add'>+from lib.py import ksft_pr, ksft_run, ksft_exit, KsftSkipEx, KsftXfailEx</div><div class='add'>+from lib.py import ksft_eq, ksft_ge, ksft_lt</div><div class='add'>+from lib.py import EthtoolFamily, NetdevFamily, NetDrvEpEnv</div><div class='add'>+from lib.py import bkg, cmd, defer, ethtool, ip, rand_port, wait_port_listen</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def sock_wait_drain(sock, max_wait=1000):</div><div class='add'>+    """Wait for all pending write data on the socket to get ACKed."""</div><div class='add'>+    for _ in range(max_wait):</div><div class='add'>+        one = b'\0' * 4</div><div class='add'>+        outq = fcntl.ioctl(sock.fileno(), termios.TIOCOUTQ, one)</div><div class='add'>+        outq = struct.unpack("I", outq)[0]</div><div class='add'>+        if outq == 0:</div><div class='add'>+            break</div><div class='add'>+        time.sleep(0.01)</div><div class='add'>+    ksft_eq(outq, 0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def tcp_sock_get_retrans(sock):</div><div class='add'>+    """Get the number of retransmissions for the TCP socket."""</div><div class='add'>+    info = sock.getsockopt(socket.SOL_TCP, socket.TCP_INFO, 512)</div><div class='add'>+    return struct.unpack("I", info[100:104])[0]</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def run_one_stream(cfg, ipver, remote_v4, remote_v6, should_lso):</div><div class='add'>+    cfg.require_cmd("socat", local=False, remote=True)</div><div class='add'>+</div><div class='add'>+    port = rand_port()</div><div class='add'>+    listen_cmd = f"socat -{ipver} -t 2 -u TCP-LISTEN:{port},reuseport /dev/null,ignoreeof"</div><div class='add'>+</div><div class='add'>+    with bkg(listen_cmd, host=cfg.remote, exit_wait=True) as nc:</div><div class='add'>+        wait_port_listen(port, host=cfg.remote)</div><div class='add'>+</div><div class='add'>+        if ipver == "4":</div><div class='add'>+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)</div><div class='add'>+            sock.connect((remote_v4, port))</div><div class='add'>+        else:</div><div class='add'>+            sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)</div><div class='add'>+            sock.connect((remote_v6, port))</div><div class='add'>+</div><div class='add'>+        # Small send to make sure the connection is working.</div><div class='add'>+        sock.send("ping".encode())</div><div class='add'>+        sock_wait_drain(sock)</div><div class='add'>+</div><div class='add'>+        # Send 4MB of data, record the LSO packet count.</div><div class='add'>+        qstat_old = cfg.netnl.qstats_get({"ifindex": cfg.ifindex}, dump=True)[0]</div><div class='add'>+        buf = b"0" * 1024 * 1024 * 4</div><div class='add'>+        sock.send(buf)</div><div class='add'>+        sock_wait_drain(sock)</div><div class='add'>+        qstat_new = cfg.netnl.qstats_get({"ifindex": cfg.ifindex}, dump=True)[0]</div><div class='add'>+</div><div class='add'>+        # Check that at least 90% of the data was sent as LSO packets.</div><div class='add'>+        # System noise may cause false negatives. Also header overheads</div><div class='add'>+        # will add up to 5% of extra packes... The check is best effort.</div><div class='add'>+        total_lso_wire  = len(buf) * 0.90 // cfg.dev["mtu"]</div><div class='add'>+        total_lso_super = len(buf) * 0.90 // cfg.dev["tso_max_size"]</div><div class='add'>+</div><div class='add'>+        # Make sure we have order of magnitude more LSO packets than</div><div class='add'>+        # retransmits, in case TCP retransmitted all the LSO packets.</div><div class='add'>+        ksft_lt(tcp_sock_get_retrans(sock), total_lso_wire / 4)</div><div class='add'>+        sock.close()</div><div class='add'>+</div><div class='add'>+        if should_lso:</div><div class='add'>+            if cfg.have_stat_super_count:</div><div class='add'>+                ksft_ge(qstat_new['tx-hw-gso-packets'] -</div><div class='add'>+                        qstat_old['tx-hw-gso-packets'],</div><div class='add'>+                        total_lso_super,</div><div class='add'>+                        comment="Number of LSO super-packets with LSO enabled")</div><div class='add'>+            if cfg.have_stat_wire_count:</div><div class='add'>+                ksft_ge(qstat_new['tx-hw-gso-wire-packets'] -</div><div class='add'>+                        qstat_old['tx-hw-gso-wire-packets'],</div><div class='add'>+                        total_lso_wire,</div><div class='add'>+                        comment="Number of LSO wire-packets with LSO enabled")</div><div class='add'>+        else:</div><div class='add'>+            if cfg.have_stat_super_count:</div><div class='add'>+                ksft_lt(qstat_new['tx-hw-gso-packets'] -</div><div class='add'>+                        qstat_old['tx-hw-gso-packets'],</div><div class='add'>+                        15, comment="Number of LSO super-packets with LSO disabled")</div><div class='add'>+            if cfg.have_stat_wire_count:</div><div class='add'>+                ksft_lt(qstat_new['tx-hw-gso-wire-packets'] -</div><div class='add'>+                        qstat_old['tx-hw-gso-wire-packets'],</div><div class='add'>+                        500, comment="Number of LSO wire-packets with LSO disabled")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def build_tunnel(cfg, outer_ipver, tun_info):</div><div class='add'>+    local_v4  = NetDrvEpEnv.nsim_v4_pfx + "1"</div><div class='add'>+    local_v6  = NetDrvEpEnv.nsim_v6_pfx + "1"</div><div class='add'>+    remote_v4 = NetDrvEpEnv.nsim_v4_pfx + "2"</div><div class='add'>+    remote_v6 = NetDrvEpEnv.nsim_v6_pfx + "2"</div><div class='add'>+</div><div class='add'>+    local_addr  = cfg.addr_v[outer_ipver]</div><div class='add'>+    remote_addr = cfg.remote_addr_v[outer_ipver]</div><div class='add'>+</div><div class='add'>+    tun_type = tun_info[0]</div><div class='add'>+    tun_arg  = tun_info[1]</div><div class='add'>+    ip(f"link add {tun_type}-ksft type {tun_type} {tun_arg} local {local_addr} remote {remote_addr} dev {cfg.ifname}")</div><div class='add'>+    defer(ip, f"link del {tun_type}-ksft")</div><div class='add'>+    ip(f"link set dev {tun_type}-ksft up")</div><div class='add'>+    ip(f"addr add {local_v4}/24 dev {tun_type}-ksft")</div><div class='add'>+    ip(f"addr add {local_v6}/64 dev {tun_type}-ksft")</div><div class='add'>+</div><div class='add'>+    ip(f"link add {tun_type}-ksft type {tun_type} {tun_arg} local {remote_addr} remote {local_addr} dev {cfg.remote_ifname}",</div><div class='add'>+        host=cfg.remote)</div><div class='add'>+    defer(ip, f"link del {tun_type}-ksft", host=cfg.remote)</div><div class='add'>+    ip(f"link set dev {tun_type}-ksft up", host=cfg.remote)</div><div class='add'>+    ip(f"addr add {remote_v4}/24 dev {tun_type}-ksft", host=cfg.remote)</div><div class='add'>+    ip(f"addr add {remote_v6}/64 dev {tun_type}-ksft", host=cfg.remote)</div><div class='add'>+</div><div class='add'>+    return remote_v4, remote_v6</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def restore_wanted_features(cfg):</div><div class='add'>+    features_cmd = ""</div><div class='add'>+    for feature in cfg.hw_features:</div><div class='add'>+        setting = "on" if feature in cfg.wanted_features else "off"</div><div class='add'>+        features_cmd += f" {feature} {setting}"</div><div class='add'>+    try:</div><div class='add'>+        ethtool(f"-K {cfg.ifname} {features_cmd}")</div><div class='add'>+    except Exception as e:</div><div class='add'>+        ksft_pr(f"WARNING: failure restoring wanted features: {e}")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_builder(name, cfg, outer_ipver, feature, tun=None, inner_ipver=None):</div><div class='add'>+    """Construct specific tests from the common template."""</div><div class='add'>+    def f(cfg):</div><div class='add'>+        cfg.require_ipver(outer_ipver)</div><div class='add'>+        defer(restore_wanted_features, cfg)</div><div class='add'>+</div><div class='add'>+        if not cfg.have_stat_super_count and \</div><div class='add'>+           not cfg.have_stat_wire_count:</div><div class='add'>+            raise KsftSkipEx(f"Device does not support LSO queue stats")</div><div class='add'>+</div><div class='add'>+        if feature not in cfg.hw_features:</div><div class='add'>+            raise KsftSkipEx(f"Device does not support {feature}")</div><div class='add'>+</div><div class='add'>+        ipver = outer_ipver</div><div class='add'>+        if tun:</div><div class='add'>+            remote_v4, remote_v6 = build_tunnel(cfg, ipver, tun)</div><div class='add'>+            ipver = inner_ipver</div><div class='add'>+        else:</div><div class='add'>+            remote_v4 = cfg.remote_addr_v["4"]</div><div class='add'>+            remote_v6 = cfg.remote_addr_v["6"]</div><div class='add'>+</div><div class='add'>+        # First test without the feature enabled.</div><div class='add'>+        ethtool(f"-K {cfg.ifname} {feature} off")</div><div class='add'>+        run_one_stream(cfg, ipver, remote_v4, remote_v6, should_lso=False)</div><div class='add'>+</div><div class='add'>+        ethtool(f"-K {cfg.ifname} tx-gso-partial off")</div><div class='add'>+        ethtool(f"-K {cfg.ifname} tx-tcp-mangleid-segmentation off")</div><div class='add'>+        if feature in cfg.partial_features:</div><div class='add'>+            ethtool(f"-K {cfg.ifname} tx-gso-partial on")</div><div class='add'>+            if ipver == "4":</div><div class='add'>+                ksft_pr("Testing with mangleid enabled")</div><div class='add'>+                ethtool(f"-K {cfg.ifname} tx-tcp-mangleid-segmentation on")</div><div class='add'>+</div><div class='add'>+        # Full feature enabled.</div><div class='add'>+        ethtool(f"-K {cfg.ifname} {feature} on")</div><div class='add'>+        run_one_stream(cfg, ipver, remote_v4, remote_v6, should_lso=True)</div><div class='add'>+</div><div class='add'>+    f.__name__ = name + ((outer_ipver + "_") if tun else "") + "ipv" + inner_ipver</div><div class='add'>+    return f</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def query_nic_features(cfg) -&gt; None:</div><div class='add'>+    """Query and cache the NIC features."""</div><div class='add'>+    cfg.have_stat_super_count = False</div><div class='add'>+    cfg.have_stat_wire_count = False</div><div class='add'>+</div><div class='add'>+    features = cfg.ethnl.features_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+</div><div class='add'>+    cfg.wanted_features = set()</div><div class='add'>+    for f in features["wanted"]["bits"]["bit"]:</div><div class='add'>+        cfg.wanted_features.add(f["name"])</div><div class='add'>+</div><div class='add'>+    cfg.hw_features = set()</div><div class='add'>+    hw_all_features_cmd = ""</div><div class='add'>+    for f in features["hw"]["bits"]["bit"]:</div><div class='add'>+        if f.get("value", False):</div><div class='add'>+            feature = f["name"]</div><div class='add'>+            cfg.hw_features.add(feature)</div><div class='add'>+            hw_all_features_cmd += f" {feature} on"</div><div class='add'>+    try:</div><div class='add'>+        ethtool(f"-K {cfg.ifname} {hw_all_features_cmd}")</div><div class='add'>+    except Exception as e:</div><div class='add'>+        ksft_pr(f"WARNING: failure enabling all hw features: {e}")</div><div class='add'>+        ksft_pr("partial gso feature detection may be impacted")</div><div class='add'>+</div><div class='add'>+    # Check which features are supported via GSO partial</div><div class='add'>+    cfg.partial_features = set()</div><div class='add'>+    if 'tx-gso-partial' in cfg.hw_features:</div><div class='add'>+        ethtool(f"-K {cfg.ifname} tx-gso-partial off")</div><div class='add'>+</div><div class='add'>+        no_partial = set()</div><div class='add'>+        features = cfg.ethnl.features_get({"header": {"dev-index": cfg.ifindex}})</div><div class='add'>+        for f in features["active"]["bits"]["bit"]:</div><div class='add'>+            no_partial.add(f["name"])</div><div class='add'>+        cfg.partial_features = cfg.hw_features - no_partial</div><div class='add'>+        ethtool(f"-K {cfg.ifname} tx-gso-partial on")</div><div class='add'>+</div><div class='add'>+    restore_wanted_features(cfg)</div><div class='add'>+</div><div class='add'>+    stats = cfg.netnl.qstats_get({"ifindex": cfg.ifindex}, dump=True)</div><div class='add'>+    if stats:</div><div class='add'>+        if 'tx-hw-gso-packets' in stats[0]:</div><div class='add'>+            ksft_pr("Detected qstat for LSO super-packets")</div><div class='add'>+            cfg.have_stat_super_count = True</div><div class='add'>+        if 'tx-hw-gso-wire-packets' in stats[0]:</div><div class='add'>+            ksft_pr("Detected qstat for LSO wire-packets")</div><div class='add'>+            cfg.have_stat_wire_count = True</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    with NetDrvEpEnv(__file__, nsim_test=False) as cfg:</div><div class='add'>+        cfg.ethnl = EthtoolFamily()</div><div class='add'>+        cfg.netnl = NetdevFamily()</div><div class='add'>+</div><div class='add'>+        query_nic_features(cfg)</div><div class='add'>+</div><div class='add'>+        test_info = (</div><div class='add'>+            # name,       v4/v6  ethtool_feature               tun:(type, args, inner ip versions)</div><div class='add'>+            ("",           "4", "tx-tcp-segmentation",         None),</div><div class='add'>+            ("",           "6", "tx-tcp6-segmentation",        None),</div><div class='add'>+            ("vxlan",      "4", "tx-udp_tnl-segmentation",     ("vxlan", "id 100 dstport 4789 noudpcsum", ("4", "6"))),</div><div class='add'>+            ("vxlan",      "6", "tx-udp_tnl-segmentation",     ("vxlan", "id 100 dstport 4789 udp6zerocsumtx udp6zerocsumrx", ("4", "6"))),</div><div class='add'>+            ("vxlan_csum", "", "tx-udp_tnl-csum-segmentation", ("vxlan", "id 100 dstport 4789 udpcsum", ("4", "6"))),</div><div class='add'>+            ("gre",        "4", "tx-gre-segmentation",         ("gre",   "", ("4", "6"))),</div><div class='add'>+            ("gre",        "6", "tx-gre-segmentation",         ("ip6gre","", ("4", "6"))),</div><div class='add'>+        )</div><div class='add'>+</div><div class='add'>+        cases = []</div><div class='add'>+        for outer_ipver in ["4", "6"]:</div><div class='add'>+            for info in test_info:</div><div class='add'>+                # Skip if test which only works for a specific IP version</div><div class='add'>+                if info[1] and outer_ipver != info[1]:</div><div class='add'>+                    continue</div><div class='add'>+</div><div class='add'>+                if info[3]:</div><div class='add'>+                    cases += [</div><div class='add'>+                        test_builder(info[0], cfg, outer_ipver, info[2], info[3], inner_ipver)</div><div class='add'>+                        for inner_ipver in info[3][2]</div><div class='add'>+                    ]</div><div class='add'>+                else:</div><div class='add'>+                    cases.append(test_builder(info[0], cfg, outer_ipver, info[2], None, outer_ipver))</div><div class='add'>+</div><div class='add'>+        ksft_run(cases=cases, args=(cfg, ))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/hw/xsk_reconfig.py b/tools/testing/selftests/drivers/net/hw/xsk_reconfig.py<br/>new file mode 100755<br/>index 000000000000..d19d1d518208<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/hw/xsk_reconfig.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/hw/xsk_reconfig.py</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+# This is intended to be run on a virtio-net guest interface.</div><div class='add'>+# The test binds the XDP socket to the interface without setting</div><div class='add'>+# the fill ring to trigger delayed refill_work. This helps to</div><div class='add'>+# make it easier to reproduce the deadlock when XDP program,</div><div class='add'>+# XDP socket bind/unbind, rx ring resize race with refill_work on</div><div class='add'>+# the buggy kernel.</div><div class='add'>+#</div><div class='add'>+# The Qemu command to setup virtio-net</div><div class='add'>+# -netdev tap,id=hostnet1,vhost=on,script=no,downscript=no</div><div class='add'>+# -device virtio-net-pci,netdev=hostnet1,iommu_platform=on,disable-legacy=on</div><div class='add'>+</div><div class='add'>+from lib.py import ksft_exit, ksft_run</div><div class='add'>+from lib.py import KsftSkipEx, KsftFailEx</div><div class='add'>+from lib.py import NetDrvEnv</div><div class='add'>+from lib.py import bkg, ip, cmd, ethtool</div><div class='add'>+import time</div><div class='add'>+</div><div class='add'>+def _get_rx_ring_entries(cfg):</div><div class='add'>+    output = ethtool(f"-g {cfg.ifname}", json=True)</div><div class='add'>+    return output[0]["rx"]</div><div class='add'>+</div><div class='add'>+def setup_xsk(cfg, xdp_queue_id = 0) -&gt; bkg:</div><div class='add'>+    # Probe for support</div><div class='add'>+    xdp = cmd(f'{cfg.net_lib_dir / "xdp_helper"} - -', fail=False)</div><div class='add'>+    if xdp.ret == 255:</div><div class='add'>+        raise KsftSkipEx('AF_XDP unsupported')</div><div class='add'>+    elif xdp.ret &gt; 0:</div><div class='add'>+        raise KsftFailEx('unable to create AF_XDP socket')</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        return bkg(f'{cfg.net_lib_dir / "xdp_helper"} {cfg.ifindex} ' \</div><div class='add'>+                   '{xdp_queue_id} -z', ksft_wait=3)</div><div class='add'>+    except:</div><div class='add'>+        raise KsftSkipEx('Failed to bind XDP socket in zerocopy.\n' \</div><div class='add'>+                         'Please consider adding iommu_platform=on ' \</div><div class='add'>+                         'when setting up virtio-net-pci')</div><div class='add'>+</div><div class='add'>+def check_xdp_bind(cfg):</div><div class='add'>+    with setup_xsk(cfg):</div><div class='add'>+        ip(f"link set dev %s xdp obj %s sec xdp" %</div><div class='add'>+           (cfg.ifname, cfg.net_lib_dir / "xdp_dummy.bpf.o"))</div><div class='add'>+        ip(f"link set dev %s xdp off" % cfg.ifname)</div><div class='add'>+</div><div class='add'>+def check_rx_resize(cfg):</div><div class='add'>+    with setup_xsk(cfg):</div><div class='add'>+        rx_ring = _get_rx_ring_entries(cfg)</div><div class='add'>+        ethtool(f"-G %s rx %d" % (cfg.ifname, rx_ring // 2))</div><div class='add'>+        ethtool(f"-G %s rx %d" % (cfg.ifname, rx_ring))</div><div class='add'>+</div><div class='add'>+def main():</div><div class='add'>+    with NetDrvEnv(__file__, nsim_test=False) as cfg:</div><div class='add'>+        ksft_run([check_xdp_bind, check_rx_resize],</div><div class='add'>+                 args=(cfg, ))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/lib/py/__init__.py b/tools/testing/selftests/drivers/net/lib/py/__init__.py<br/>index 401e70f7f136..8b75faa9af6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/lib/py/__init__.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/lib/py/__init__.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/lib/py/__init__.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/lib/py/__init__.py</a></div><div class='hunk'>@@ -1,5 +1,13 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+"""</div><div class='add'>+Driver test environment.</div><div class='add'>+NetDrvEnv and NetDrvEpEnv are the main environment classes.</div><div class='add'>+Former is for local host only tests, latter creates / connects</div><div class='add'>+to a remote endpoint. See NIPA wiki for more information about</div><div class='add'>+running and writing driver tests.</div><div class='add'>+"""</div><div class='add'>+</div><div class='ctx'> import sys</div><div class='ctx'> from pathlib import Path</div><div class='ctx'> </div><div class='hunk'>@@ -7,13 +15,41 @@ KSFT_DIR = (Path(__file__).parent / "../../../..").resolve()</div><div class='ctx'> </div><div class='ctx'> try:</div><div class='ctx'>     sys.path.append(KSFT_DIR.as_posix())</div><div class='del'>-    from net.lib.py import *</div><div class='add'>+</div><div class='add'>+    # Import one by one to avoid pylint false positives</div><div class='add'>+    from net.lib.py import NetNS, NetNSEnter, NetdevSimDev</div><div class='add'>+    from net.lib.py import EthtoolFamily, NetdevFamily, NetshaperFamily, \</div><div class='add'>+        NlError, RtnlFamily, DevlinkFamily, PSPFamily</div><div class='add'>+    from net.lib.py import CmdExitFailure</div><div class='add'>+    from net.lib.py import bkg, cmd, bpftool, bpftrace, defer, ethtool, \</div><div class='add'>+        fd_read_timeout, ip, rand_port, wait_port_listen, wait_file</div><div class='add'>+    from net.lib.py import KsftSkipEx, KsftFailEx, KsftXfailEx</div><div class='add'>+    from net.lib.py import ksft_disruptive, ksft_exit, ksft_pr, ksft_run, \</div><div class='add'>+        ksft_setup, ksft_variants, KsftNamedVariant</div><div class='add'>+    from net.lib.py import ksft_eq, ksft_ge, ksft_in, ksft_is, ksft_lt, \</div><div class='add'>+        ksft_ne, ksft_not_in, ksft_raises, ksft_true, ksft_gt, ksft_not_none</div><div class='add'>+</div><div class='add'>+    __all__ = ["NetNS", "NetNSEnter", "NetdevSimDev",</div><div class='add'>+               "EthtoolFamily", "NetdevFamily", "NetshaperFamily",</div><div class='add'>+               "NlError", "RtnlFamily", "DevlinkFamily", "PSPFamily",</div><div class='add'>+               "CmdExitFailure",</div><div class='add'>+               "bkg", "cmd", "bpftool", "bpftrace", "defer", "ethtool",</div><div class='add'>+               "fd_read_timeout", "ip", "rand_port",</div><div class='add'>+               "wait_port_listen", "wait_file",</div><div class='add'>+               "KsftSkipEx", "KsftFailEx", "KsftXfailEx",</div><div class='add'>+               "ksft_disruptive", "ksft_exit", "ksft_pr", "ksft_run",</div><div class='add'>+               "ksft_setup", "ksft_variants", "KsftNamedVariant",</div><div class='add'>+               "ksft_eq", "ksft_ge", "ksft_in", "ksft_is", "ksft_lt",</div><div class='add'>+               "ksft_ne", "ksft_not_in", "ksft_raises", "ksft_true", "ksft_gt",</div><div class='add'>+               "ksft_not_none", "ksft_not_none"]</div><div class='add'>+</div><div class='add'>+    from .env import NetDrvEnv, NetDrvEpEnv</div><div class='add'>+    from .load import GenerateTraffic, Iperf3Runner</div><div class='add'>+    from .remote import Remote</div><div class='add'>+</div><div class='add'>+    __all__ += ["NetDrvEnv", "NetDrvEpEnv", "GenerateTraffic", "Remote",</div><div class='add'>+                "Iperf3Runner"]</div><div class='ctx'> except ModuleNotFoundError as e:</div><div class='del'>-    ksft_pr("Failed importing `net` library from kernel sources")</div><div class='del'>-    ksft_pr(str(e))</div><div class='del'>-    ktap_result(True, comment="SKIP")</div><div class='add'>+    print("Failed importing `net` library from kernel sources")</div><div class='add'>+    print(str(e))</div><div class='ctx'>     sys.exit(4)</div><div class='del'>-</div><div class='del'>-from .env import *</div><div class='del'>-from .load import *</div><div class='del'>-from .remote import Remote</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/lib/py/env.py b/tools/testing/selftests/drivers/net/lib/py/env.py<br/>index 987e452d3a45..8b644fd84ff2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/lib/py/env.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/lib/py/env.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/lib/py/env.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/lib/py/env.py</a></div><div class='hunk'>@@ -4,55 +4,60 @@ import os</div><div class='ctx'> import time</div><div class='ctx'> from pathlib import Path</div><div class='ctx'> from lib.py import KsftSkipEx, KsftXfailEx</div><div class='del'>-from lib.py import ksft_setup</div><div class='add'>+from lib.py import ksft_setup, wait_file</div><div class='ctx'> from lib.py import cmd, ethtool, ip, CmdExitFailure</div><div class='ctx'> from lib.py import NetNS, NetdevSimDev</div><div class='ctx'> from .remote import Remote</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-def _load_env_file(src_path):</div><div class='del'>-    env = os.environ.copy()</div><div class='del'>-</div><div class='del'>-    src_dir = Path(src_path).parent.resolve()</div><div class='del'>-    if not (src_dir / "net.config").exists():</div><div class='del'>-        return ksft_setup(env)</div><div class='del'>-</div><div class='del'>-    with open((src_dir / "net.config").as_posix(), 'r') as fp:</div><div class='del'>-        for line in fp.readlines():</div><div class='del'>-            full_file = line</div><div class='del'>-            # Strip comments</div><div class='del'>-            pos = line.find("#")</div><div class='del'>-            if pos &gt;= 0:</div><div class='del'>-                line = line[:pos]</div><div class='del'>-            line = line.strip()</div><div class='del'>-            if not line:</div><div class='del'>-                continue</div><div class='del'>-            pair = line.split('=', maxsplit=1)</div><div class='del'>-            if len(pair) != 2:</div><div class='del'>-                raise Exception("Can't parse configuration line:", full_file)</div><div class='del'>-            env[pair[0]] = pair[1]</div><div class='del'>-    return ksft_setup(env)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-class NetDrvEnv:</div><div class='add'>+class NetDrvEnvBase:</div><div class='ctx'>     """</div><div class='del'>-    Class for a single NIC / host env, with no remote end</div><div class='del'>-    """</div><div class='del'>-    def __init__(self, src_path, **kwargs):</div><div class='del'>-        self._ns = None</div><div class='add'>+    Base class for a NIC / host environments</div><div class='ctx'> </div><div class='del'>-        self.env = _load_env_file(src_path)</div><div class='add'>+    Attributes:</div><div class='add'>+      test_dir: Path to the source directory of the test</div><div class='add'>+      net_lib_dir: Path to the net/lib directory</div><div class='add'>+    """</div><div class='add'>+    def __init__(self, src_path):</div><div class='add'>+        self.src_path = Path(src_path)</div><div class='add'>+        self.test_dir = self.src_path.parent.resolve()</div><div class='add'>+        self.net_lib_dir = (Path(__file__).parent / "../../../../net/lib").resolve()</div><div class='add'>+</div><div class='add'>+        self.env = self._load_env_file()</div><div class='add'>+</div><div class='add'>+        # Following attrs must be set be inheriting classes</div><div class='add'>+        self.dev = None</div><div class='add'>+</div><div class='add'>+    def _load_env_file(self):</div><div class='add'>+        env = os.environ.copy()</div><div class='add'>+</div><div class='add'>+        src_dir = Path(self.src_path).parent.resolve()</div><div class='add'>+        if not (src_dir / "net.config").exists():</div><div class='add'>+            return ksft_setup(env)</div><div class='add'>+</div><div class='add'>+        with open((src_dir / "net.config").as_posix(), 'r') as fp:</div><div class='add'>+            for line in fp.readlines():</div><div class='add'>+                full_file = line</div><div class='add'>+                # Strip comments</div><div class='add'>+                pos = line.find("#")</div><div class='add'>+                if pos &gt;= 0:</div><div class='add'>+                    line = line[:pos]</div><div class='add'>+                line = line.strip()</div><div class='add'>+                if not line:</div><div class='add'>+                    continue</div><div class='add'>+                pair = line.split('=', maxsplit=1)</div><div class='add'>+                if len(pair) != 2:</div><div class='add'>+                    raise Exception("Can't parse configuration line:", full_file)</div><div class='add'>+                env[pair[0]] = pair[1]</div><div class='add'>+        return ksft_setup(env)</div><div class='ctx'> </div><div class='del'>-        if 'NETIF' in self.env:</div><div class='del'>-            self.dev = ip("link show dev " + self.env['NETIF'], json=True)[0]</div><div class='del'>-        else:</div><div class='del'>-            self._ns = NetdevSimDev(**kwargs)</div><div class='del'>-            self.dev = self._ns.nsims[0].dev</div><div class='del'>-        self.ifname = self.dev['ifname']</div><div class='del'>-        self.ifindex = self.dev['ifindex']</div><div class='add'>+    def __del__(self):</div><div class='add'>+        pass</div><div class='ctx'> </div><div class='ctx'>     def __enter__(self):</div><div class='ctx'>         ip(f"link set dev {self.dev['ifname']} up")</div><div class='add'>+        wait_file(f"/sys/class/net/{self.dev['ifname']}/carrier",</div><div class='add'>+                  lambda x: x.strip() == "1")</div><div class='ctx'> </div><div class='ctx'>         return self</div><div class='ctx'> </div><div class='hunk'>@@ -62,13 +67,37 @@ class NetDrvEnv:</div><div class='ctx'>         """</div><div class='ctx'>         self.__del__()</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+class NetDrvEnv(NetDrvEnvBase):</div><div class='add'>+    """</div><div class='add'>+    Class for a single NIC / host env, with no remote end</div><div class='add'>+    """</div><div class='add'>+    def __init__(self, src_path, nsim_test=None, **kwargs):</div><div class='add'>+        super().__init__(src_path)</div><div class='add'>+</div><div class='add'>+        self._ns = None</div><div class='add'>+</div><div class='add'>+        if 'NETIF' in self.env:</div><div class='add'>+            if nsim_test is True:</div><div class='add'>+                raise KsftXfailEx("Test only works on netdevsim")</div><div class='add'>+</div><div class='add'>+            self.dev = ip("-d link show dev " + self.env['NETIF'], json=True)[0]</div><div class='add'>+        else:</div><div class='add'>+            if nsim_test is False:</div><div class='add'>+                raise KsftXfailEx("Test does not work on netdevsim")</div><div class='add'>+</div><div class='add'>+            self._ns = NetdevSimDev(**kwargs)</div><div class='add'>+            self.dev = self._ns.nsims[0].dev</div><div class='add'>+        self.ifname = self.dev['ifname']</div><div class='add'>+        self.ifindex = self.dev['ifindex']</div><div class='add'>+</div><div class='ctx'>     def __del__(self):</div><div class='ctx'>         if self._ns:</div><div class='ctx'>             self._ns.remove()</div><div class='ctx'>             self._ns = None</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-class NetDrvEpEnv:</div><div class='add'>+class NetDrvEpEnv(NetDrvEnvBase):</div><div class='ctx'>     """</div><div class='ctx'>     Class for an environment with a local device and "remote endpoint"</div><div class='ctx'>     which can be used to send traffic in.</div><div class='hunk'>@@ -82,8 +111,7 @@ class NetDrvEpEnv:</div><div class='ctx'>     nsim_v6_pfx = "2001:db8::"</div><div class='ctx'> </div><div class='ctx'>     def __init__(self, src_path, nsim_test=None):</div><div class='del'>-</div><div class='del'>-        self.env = _load_env_file(src_path)</div><div class='add'>+        super().__init__(src_path)</div><div class='ctx'> </div><div class='ctx'>         self._stats_settle_time = None</div><div class='ctx'> </div><div class='hunk'>@@ -94,17 +122,20 @@ class NetDrvEpEnv:</div><div class='ctx'>         self._ns = None</div><div class='ctx'>         self._ns_peer = None</div><div class='ctx'> </div><div class='add'>+        self.addr_v        = { "4": None, "6": None }</div><div class='add'>+        self.remote_addr_v = { "4": None, "6": None }</div><div class='add'>+</div><div class='ctx'>         if "NETIF" in self.env:</div><div class='ctx'>             if nsim_test is True:</div><div class='ctx'>                 raise KsftXfailEx("Test only works on netdevsim")</div><div class='ctx'>             self._check_env()</div><div class='ctx'> </div><div class='del'>-            self.dev = ip("link show dev " + self.env['NETIF'], json=True)[0]</div><div class='add'>+            self.dev = ip("-d link show dev " + self.env['NETIF'], json=True)[0]</div><div class='ctx'> </div><div class='del'>-            self.v4 = self.env.get("LOCAL_V4")</div><div class='del'>-            self.v6 = self.env.get("LOCAL_V6")</div><div class='del'>-            self.remote_v4 = self.env.get("REMOTE_V4")</div><div class='del'>-            self.remote_v6 = self.env.get("REMOTE_V6")</div><div class='add'>+            self.addr_v["4"] = self.env.get("LOCAL_V4")</div><div class='add'>+            self.addr_v["6"] = self.env.get("LOCAL_V6")</div><div class='add'>+            self.remote_addr_v["4"] = self.env.get("REMOTE_V4")</div><div class='add'>+            self.remote_addr_v["6"] = self.env.get("REMOTE_V6")</div><div class='ctx'>             kind = self.env["REMOTE_TYPE"]</div><div class='ctx'>             args = self.env["REMOTE_ARGS"]</div><div class='ctx'>         else:</div><div class='hunk'>@@ -115,26 +146,31 @@ class NetDrvEpEnv:</div><div class='ctx'> </div><div class='ctx'>             self.dev = self._ns.nsims[0].dev</div><div class='ctx'> </div><div class='del'>-            self.v4 = self.nsim_v4_pfx + "1"</div><div class='del'>-            self.v6 = self.nsim_v6_pfx + "1"</div><div class='del'>-            self.remote_v4 = self.nsim_v4_pfx + "2"</div><div class='del'>-            self.remote_v6 = self.nsim_v6_pfx + "2"</div><div class='add'>+            self.addr_v["4"] = self.nsim_v4_pfx + "1"</div><div class='add'>+            self.addr_v["6"] = self.nsim_v6_pfx + "1"</div><div class='add'>+            self.remote_addr_v["4"] = self.nsim_v4_pfx + "2"</div><div class='add'>+            self.remote_addr_v["6"] = self.nsim_v6_pfx + "2"</div><div class='ctx'>             kind = "netns"</div><div class='ctx'>             args = self._netns.name</div><div class='ctx'> </div><div class='ctx'>         self.remote = Remote(kind, args, src_path)</div><div class='ctx'> </div><div class='del'>-        self.addr = self.v6 if self.v6 else self.v4</div><div class='del'>-        self.remote_addr = self.remote_v6 if self.remote_v6 else self.remote_v4</div><div class='add'>+        self.addr_ipver = "6" if self.addr_v["6"] else "4"</div><div class='add'>+        self.addr = self.addr_v[self.addr_ipver]</div><div class='add'>+        self.remote_addr = self.remote_addr_v[self.addr_ipver]</div><div class='ctx'> </div><div class='del'>-        self.addr_ipver = "6" if self.v6 else "4"</div><div class='ctx'>         # Bracketed addresses, some commands need IPv6 to be inside []</div><div class='del'>-        self.baddr = f"[{self.v6}]" if self.v6 else self.v4</div><div class='del'>-        self.remote_baddr = f"[{self.remote_v6}]" if self.remote_v6 else self.remote_v4</div><div class='add'>+        self.baddr = f"[{self.addr_v['6']}]" if self.addr_v["6"] else self.addr_v["4"]</div><div class='add'>+        self.remote_baddr = f"[{self.remote_addr_v['6']}]" if self.remote_addr_v["6"] else self.remote_addr_v["4"]</div><div class='ctx'> </div><div class='ctx'>         self.ifname = self.dev['ifname']</div><div class='ctx'>         self.ifindex = self.dev['ifindex']</div><div class='ctx'> </div><div class='add'>+        # resolve remote interface name</div><div class='add'>+        self.remote_ifname = self.resolve_remote_ifc()</div><div class='add'>+        self.remote_dev = ip("-d link show dev " + self.remote_ifname,</div><div class='add'>+                             host=self.remote, json=True)[0]</div><div class='add'>+</div><div class='ctx'>         self._required_cmd = {}</div><div class='ctx'> </div><div class='ctx'>     def create_local(self):</div><div class='hunk'>@@ -181,14 +217,17 @@ class NetDrvEpEnv:</div><div class='ctx'>             raise Exception("Invalid environment, missing configuration:", missing,</div><div class='ctx'>                             "Please see tools/testing/selftests/drivers/net/README.rst")</div><div class='ctx'> </div><div class='del'>-    def __enter__(self):</div><div class='del'>-        return self</div><div class='del'>-</div><div class='del'>-    def __exit__(self, ex_type, ex_value, ex_tb):</div><div class='del'>-        """</div><div class='del'>-        __exit__ gets called at the end of a "with" block.</div><div class='del'>-        """</div><div class='del'>-        self.__del__()</div><div class='add'>+    def resolve_remote_ifc(self):</div><div class='add'>+        v4 = v6 = None</div><div class='add'>+        if self.remote_addr_v["4"]:</div><div class='add'>+            v4 = ip("addr show to " + self.remote_addr_v["4"], json=True, host=self.remote)</div><div class='add'>+        if self.remote_addr_v["6"]:</div><div class='add'>+            v6 = ip("addr show to " + self.remote_addr_v["6"], json=True, host=self.remote)</div><div class='add'>+        if v4 and v6 and v4[0]["ifname"] != v6[0]["ifname"]:</div><div class='add'>+            raise Exception("Can't resolve remote interface name, v4 and v6 don't match")</div><div class='add'>+        if (v4 and len(v4) &gt; 1) or (v6 and len(v6) &gt; 1):</div><div class='add'>+            raise Exception("Can't resolve remote interface name, multiple interfaces match")</div><div class='add'>+        return v6[0]["ifname"] if v6 else v4[0]["ifname"]</div><div class='ctx'> </div><div class='ctx'>     def __del__(self):</div><div class='ctx'>         if self._ns:</div><div class='hunk'>@@ -204,13 +243,13 @@ class NetDrvEpEnv:</div><div class='ctx'>             del self.remote</div><div class='ctx'>             self.remote = None</div><div class='ctx'> </div><div class='del'>-    def require_v4(self):</div><div class='del'>-        if not self.v4 or not self.remote_v4:</div><div class='del'>-            raise KsftSkipEx("Test requires IPv4 connectivity")</div><div class='add'>+    def require_ipver(self, ipver):</div><div class='add'>+        if not self.addr_v[ipver] or not self.remote_addr_v[ipver]:</div><div class='add'>+            raise KsftSkipEx(f"Test requires IPv{ipver} connectivity")</div><div class='ctx'> </div><div class='del'>-    def require_v6(self):</div><div class='del'>-        if not self.v6 or not self.remote_v6:</div><div class='del'>-            raise KsftSkipEx("Test requires IPv6 connectivity")</div><div class='add'>+    def require_nsim(self):</div><div class='add'>+        if self._ns is None:</div><div class='add'>+            raise KsftXfailEx("Test only works on netdevsim")</div><div class='ctx'> </div><div class='ctx'>     def _require_cmd(self, comm, key, host=None):</div><div class='ctx'>         cached = self._required_cmd.get(comm, {})</div><div class='hunk'>@@ -225,7 +264,7 @@ class NetDrvEpEnv:</div><div class='ctx'>             if not self._require_cmd(comm, "local"):</div><div class='ctx'>                 raise KsftSkipEx("Test requires command: " + comm)</div><div class='ctx'>         if remote:</div><div class='del'>-            if not self._require_cmd(comm, "remote"):</div><div class='add'>+            if not self._require_cmd(comm, "remote", host=self.remote):</div><div class='ctx'>                 raise KsftSkipEx("Test requires (remote) command: " + comm)</div><div class='ctx'> </div><div class='ctx'>     def wait_hw_stats_settle(self):</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/lib/py/load.py b/tools/testing/selftests/drivers/net/lib/py/load.py<br/>index da5af2c680fa..f181fa2d38fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/lib/py/load.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/lib/py/load.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/lib/py/load.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/lib/py/load.py</a></div><div class='hunk'>@@ -1,46 +1,96 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+import re</div><div class='ctx'> import time</div><div class='add'>+import json</div><div class='ctx'> </div><div class='del'>-from lib.py import ksft_pr, cmd, ip, rand_port, wait_port_listen, bkg</div><div class='add'>+from lib.py import ksft_pr, cmd, ip, rand_port, wait_port_listen</div><div class='ctx'> </div><div class='del'>-class GenerateTraffic:</div><div class='del'>-    def __init__(self, env, port=None):</div><div class='del'>-        env.require_cmd("iperf3", remote=True)</div><div class='ctx'> </div><div class='add'>+class Iperf3Runner:</div><div class='add'>+    """</div><div class='add'>+    Sets up and runs iperf3 traffic.</div><div class='add'>+    """</div><div class='add'>+    def __init__(self, env, port=None, server_ip=None, client_ip=None):</div><div class='add'>+        env.require_cmd("iperf3", local=True, remote=True)</div><div class='ctx'>         self.env = env</div><div class='add'>+        self.port = rand_port() if port is None else port</div><div class='add'>+        self.server_ip = server_ip</div><div class='add'>+        self.client_ip = client_ip</div><div class='add'>+</div><div class='add'>+    def _build_server(self):</div><div class='add'>+        cmdline = f"iperf3 -s -1 -p {self.port}"</div><div class='add'>+        if self.server_ip:</div><div class='add'>+            cmdline += f" -B {self.server_ip}"</div><div class='add'>+        return cmdline</div><div class='add'>+</div><div class='add'>+    def _build_client(self, streams, duration, reverse):</div><div class='add'>+        host = self.env.addr if self.server_ip is None else self.server_ip</div><div class='add'>+        cmdline = f"iperf3 -c {host} -p {self.port} -P {streams} -t {duration} -J"</div><div class='add'>+        if self.client_ip:</div><div class='add'>+            cmdline += f" -B {self.client_ip}"</div><div class='add'>+        if reverse:</div><div class='add'>+            cmdline += " --reverse"</div><div class='add'>+        return cmdline</div><div class='ctx'> </div><div class='del'>-        if port is None:</div><div class='del'>-            port = rand_port()</div><div class='del'>-        self._iperf_server = cmd(f"iperf3 -s -1 -p {port}", background=True)</div><div class='del'>-        wait_port_listen(port)</div><div class='add'>+    def start_server(self):</div><div class='add'>+        """</div><div class='add'>+        Starts an iperf3 server with optional bind IP.</div><div class='add'>+        """</div><div class='add'>+        cmdline = self._build_server()</div><div class='add'>+        proc = cmd(cmdline, background=True)</div><div class='add'>+        wait_port_listen(self.port)</div><div class='ctx'>         time.sleep(0.1)</div><div class='del'>-        self._iperf_client = cmd(f"iperf3 -c {env.addr} -P 16 -p {port} -t 86400",</div><div class='del'>-                                 background=True, host=env.remote)</div><div class='add'>+        return proc</div><div class='add'>+</div><div class='add'>+    def start_client(self, background=False, streams=1, duration=10, reverse=False):</div><div class='add'>+        """</div><div class='add'>+        Starts the iperf3 client with the configured options.</div><div class='add'>+        """</div><div class='add'>+        cmdline = self._build_client(streams, duration, reverse)</div><div class='add'>+        return cmd(cmdline, background=background, host=self.env.remote)</div><div class='add'>+</div><div class='add'>+    def measure_bandwidth(self, reverse=False):</div><div class='add'>+        """</div><div class='add'>+        Runs an iperf3 measurement and returns the average bandwidth (Gbps).</div><div class='add'>+        Discards the first and last few reporting intervals and uses only the</div><div class='add'>+        middle part of the run where throughput is typically stable.</div><div class='add'>+        """</div><div class='add'>+        self.start_server()</div><div class='add'>+        result = self.start_client(duration=10, reverse=reverse)</div><div class='add'>+</div><div class='add'>+        if result.ret != 0:</div><div class='add'>+            raise RuntimeError("iperf3 failed to run successfully")</div><div class='add'>+        try:</div><div class='add'>+            out = json.loads(result.stdout)</div><div class='add'>+        except json.JSONDecodeError as exc:</div><div class='add'>+            raise ValueError("Failed to parse iperf3 JSON output") from exc</div><div class='add'>+</div><div class='add'>+        intervals = out.get("intervals", [])</div><div class='add'>+        samples = [i["sum"]["bits_per_second"] / 1e9 for i in intervals]</div><div class='add'>+        if len(samples) &lt; 10:</div><div class='add'>+            raise ValueError(f"iperf3 returned too few intervals: {len(samples)}")</div><div class='add'>+        # Discard potentially unstable first and last 3 seconds.</div><div class='add'>+        stable = samples[3:-3]</div><div class='add'>+</div><div class='add'>+        avg = sum(stable) / len(stable)</div><div class='add'>+</div><div class='add'>+        return avg</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+class GenerateTraffic:</div><div class='add'>+    def __init__(self, env, port=None):</div><div class='add'>+        self.env = env</div><div class='add'>+        self.runner = Iperf3Runner(env, port)</div><div class='add'>+</div><div class='add'>+        self._iperf_server = self.runner.start_server()</div><div class='add'>+        self._iperf_client = self.runner.start_client(background=True, streams=16, duration=86400)</div><div class='ctx'> </div><div class='ctx'>         # Wait for traffic to ramp up</div><div class='ctx'>         if not self._wait_pkts(pps=1000):</div><div class='ctx'>             self.stop(verbose=True)</div><div class='ctx'>             raise Exception("iperf3 traffic did not ramp up")</div><div class='ctx'> </div><div class='del'>-    def run_remote_test(self, env: object, port=None, command=None):</div><div class='del'>-        if port is None:</div><div class='del'>-            port = rand_port()</div><div class='del'>-        try:</div><div class='del'>-            server_cmd = f"iperf3 -s 1 -p {port} --one-off"</div><div class='del'>-            with bkg(server_cmd, host=env.remote):</div><div class='del'>-                #iperf3 opens TCP connection as default in server</div><div class='del'>-                #-u to be specified in client command for UDP</div><div class='del'>-                wait_port_listen(port, host=env.remote)</div><div class='del'>-        except Exception as e:</div><div class='del'>-            raise Exception(f"Unexpected error occurred while running server command: {e}")</div><div class='del'>-        try:</div><div class='del'>-            client_cmd = f"iperf3 -c {env.remote_addr} -p {port} {command}"</div><div class='del'>-            proc = cmd(client_cmd)</div><div class='del'>-            return proc</div><div class='del'>-        except Exception as e:</div><div class='del'>-            raise Exception(f"Unexpected error occurred while running client command: {e}")</div><div class='del'>-</div><div class='ctx'>     def _wait_pkts(self, pkt_cnt=None, pps=None):</div><div class='ctx'>         """</div><div class='ctx'>         Wait until we've seen pkt_cnt or until traffic ramps up to pps.</div><div class='hunk'>@@ -74,3 +124,16 @@ class GenerateTraffic:</div><div class='ctx'>             ksft_pr("&gt;&gt; Server:")</div><div class='ctx'>             ksft_pr(self._iperf_server.stdout)</div><div class='ctx'>             ksft_pr(self._iperf_server.stderr)</div><div class='add'>+        self._wait_client_stopped()</div><div class='add'>+</div><div class='add'>+    def _wait_client_stopped(self, sleep=0.005, timeout=5):</div><div class='add'>+        end = time.monotonic() + timeout</div><div class='add'>+</div><div class='add'>+        live_port_pattern = re.compile(fr":{self.runner.port:04X} 0[^6] ")</div><div class='add'>+</div><div class='add'>+        while time.monotonic() &lt; end:</div><div class='add'>+            data = cmd("cat /proc/net/tcp*", host=self.env.remote).stdout</div><div class='add'>+            if not live_port_pattern.search(data):</div><div class='add'>+                return</div><div class='add'>+            time.sleep(sleep)</div><div class='add'>+        raise Exception(f"Waiting for client to stop timed out after {timeout}s")</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh b/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh<br/>index 3acaba41ac7b..ae8abff4be40 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh</a></div><div class='hunk'>@@ -11,9 +11,13 @@ set -euo pipefail</div><div class='ctx'> LIBDIR=$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")</div><div class='ctx'> </div><div class='ctx'> SRCIF="" # to be populated later</div><div class='del'>-SRCIP=192.0.2.1</div><div class='add'>+SRCIP="" # to be populated later</div><div class='add'>+SRCIP4="192.0.2.1"</div><div class='add'>+SRCIP6="fc00::1"</div><div class='ctx'> DSTIF="" # to be populated later</div><div class='del'>-DSTIP=192.0.2.2</div><div class='add'>+DSTIP="" # to be populated later</div><div class='add'>+DSTIP4="192.0.2.2"</div><div class='add'>+DSTIP6="fc00::2"</div><div class='ctx'> </div><div class='ctx'> PORT="6666"</div><div class='ctx'> MSG="netconsole selftest"</div><div class='hunk'>@@ -26,18 +30,23 @@ NETCONS_PATH="${NETCONS_CONFIGFS}"/"${TARGET}"</div><div class='ctx'> # NAMESPACE will be populated by setup_ns with a random value</div><div class='ctx'> NAMESPACE=""</div><div class='ctx'> </div><div class='del'>-# IDs for netdevsim</div><div class='add'>+# IDs for netdevsim. We either use NSIM_DEV_{1,2}_ID for standard test</div><div class='add'>+# or NSIM_BOND_{T,R}X_{1,2} for the bonding tests. Not both at the</div><div class='add'>+# same time.</div><div class='ctx'> NSIM_DEV_1_ID=$((256 + RANDOM % 256))</div><div class='ctx'> NSIM_DEV_2_ID=$((512 + RANDOM % 256))</div><div class='add'>+NSIM_BOND_TX_1=$((768 + RANDOM % 256))</div><div class='add'>+NSIM_BOND_TX_2=$((1024 + RANDOM % 256))</div><div class='add'>+NSIM_BOND_RX_1=$((1280 + RANDOM % 256))</div><div class='add'>+NSIM_BOND_RX_2=$((1536 + RANDOM % 256))</div><div class='ctx'> NSIM_DEV_SYS_NEW="/sys/bus/netdevsim/new_device"</div><div class='add'>+NSIM_DEV_SYS_LINK="/sys/bus/netdevsim/link_device"</div><div class='ctx'> </div><div class='ctx'> # Used to create and delete namespaces</div><div class='ctx'> source "${LIBDIR}"/../../../../net/lib.sh</div><div class='del'>-source "${LIBDIR}"/../../../../net/net_helper.sh</div><div class='ctx'> </div><div class='ctx'> # Create netdevsim interfaces</div><div class='ctx'> create_ifaces() {</div><div class='del'>-</div><div class='ctx'> 	echo "$NSIM_DEV_2_ID" &gt; "$NSIM_DEV_SYS_NEW"</div><div class='ctx'> 	echo "$NSIM_DEV_1_ID" &gt; "$NSIM_DEV_SYS_NEW"</div><div class='ctx'> 	udevadm settle 2&gt; /dev/null || true</div><div class='hunk'>@@ -81,7 +90,23 @@ function configure_ip() {</div><div class='ctx'> 	ip link set "${SRCIF}" up</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+function select_ipv4_or_ipv6()</div><div class='add'>+{</div><div class='add'>+	local VERSION=${1}</div><div class='add'>+</div><div class='add'>+	if [[ "$VERSION" == "ipv6" ]]</div><div class='add'>+	then</div><div class='add'>+		DSTIP="${DSTIP6}"</div><div class='add'>+		SRCIP="${SRCIP6}"</div><div class='add'>+	else</div><div class='add'>+		DSTIP="${DSTIP4}"</div><div class='add'>+		SRCIP="${SRCIP4}"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> function set_network() {</div><div class='add'>+	local IP_VERSION=${1:-"ipv4"}</div><div class='add'>+</div><div class='ctx'> 	# setup_ns function is coming from lib.sh</div><div class='ctx'> 	setup_ns NAMESPACE</div><div class='ctx'> </div><div class='hunk'>@@ -92,33 +117,77 @@ function set_network() {</div><div class='ctx'> 	# Link both interfaces back to back</div><div class='ctx'> 	link_ifaces</div><div class='ctx'> </div><div class='add'>+	select_ipv4_or_ipv6 "${IP_VERSION}"</div><div class='ctx'> 	configure_ip</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-function create_dynamic_target() {</div><div class='add'>+function _create_dynamic_target() {</div><div class='add'>+	local FORMAT="${1:?FORMAT parameter required}"</div><div class='add'>+	local NCPATH="${2:?NCPATH parameter required}"</div><div class='add'>+</div><div class='ctx'> 	DSTMAC=$(ip netns exec "${NAMESPACE}" \</div><div class='ctx'> 		 ip link show "${DSTIF}" | awk '/ether/ {print $2}')</div><div class='ctx'> </div><div class='ctx'> 	# Create a dynamic target</div><div class='del'>-	mkdir "${NETCONS_PATH}"</div><div class='add'>+	mkdir "${NCPATH}"</div><div class='ctx'> </div><div class='del'>-	echo "${DSTIP}" &gt; "${NETCONS_PATH}"/remote_ip</div><div class='del'>-	echo "${SRCIP}" &gt; "${NETCONS_PATH}"/local_ip</div><div class='del'>-	echo "${DSTMAC}" &gt; "${NETCONS_PATH}"/remote_mac</div><div class='del'>-	echo "${SRCIF}" &gt; "${NETCONS_PATH}"/dev_name</div><div class='add'>+	echo "${DSTIP}" &gt; "${NCPATH}"/remote_ip</div><div class='add'>+	echo "${SRCIP}" &gt; "${NCPATH}"/local_ip</div><div class='add'>+	echo "${DSTMAC}" &gt; "${NCPATH}"/remote_mac</div><div class='add'>+	echo "${SRCIF}" &gt; "${NCPATH}"/dev_name</div><div class='ctx'> </div><div class='del'>-	echo 1 &gt; "${NETCONS_PATH}"/enabled</div><div class='add'>+	if [ "${FORMAT}" == "basic" ]</div><div class='add'>+	then</div><div class='add'>+		# Basic target does not support release</div><div class='add'>+		echo 0 &gt; "${NCPATH}"/release</div><div class='add'>+		echo 0 &gt; "${NCPATH}"/extended</div><div class='add'>+	elif [ "${FORMAT}" == "extended" ]</div><div class='add'>+	then</div><div class='add'>+		echo 1 &gt; "${NCPATH}"/extended</div><div class='add'>+	fi</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-function cleanup() {</div><div class='del'>-	local NSIM_DEV_SYS_DEL="/sys/bus/netdevsim/del_device"</div><div class='add'>+function create_dynamic_target() {</div><div class='add'>+	local FORMAT=${1:-"extended"}</div><div class='add'>+	local NCPATH=${2:-"$NETCONS_PATH"}</div><div class='add'>+	_create_dynamic_target "${FORMAT}" "${NCPATH}"</div><div class='ctx'> </div><div class='del'>-	# delete netconsole dynamic reconfiguration</div><div class='add'>+	echo 1 &gt; "${NCPATH}"/enabled</div><div class='add'>+</div><div class='add'>+	# This will make sure that the kernel was able to</div><div class='add'>+	# load the netconsole driver configuration. The console message</div><div class='add'>+	# gets more organized/sequential as well.</div><div class='add'>+	sleep 1</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Generate the command line argument for netconsole following:</div><div class='add'>+#  netconsole=[+][src-port]@[src-ip]/[&lt;dev&gt;],[tgt-port]@&lt;tgt-ip&gt;/[tgt-macaddr]</div><div class='add'>+function create_cmdline_str() {</div><div class='add'>+	local BINDMODE=${1:-"ifname"}</div><div class='add'>+	if [ "${BINDMODE}" == "ifname" ]</div><div class='add'>+	then</div><div class='add'>+		SRCDEV=${SRCIF}</div><div class='add'>+	else</div><div class='add'>+		SRCDEV=$(mac_get "${SRCIF}")</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	DSTMAC=$(ip netns exec "${NAMESPACE}" \</div><div class='add'>+		 ip link show "${DSTIF}" | awk '/ether/ {print $2}')</div><div class='add'>+	SRCPORT="1514"</div><div class='add'>+	TGTPORT="6666"</div><div class='add'>+</div><div class='add'>+	echo "netconsole=\"+${SRCPORT}@${SRCIP}/${SRCDEV},${TGTPORT}@${DSTIP}/${DSTMAC}\""</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Do not append the release to the header of the message</div><div class='add'>+function disable_release_append() {</div><div class='ctx'> 	echo 0 &gt; "${NETCONS_PATH}"/enabled</div><div class='del'>-	# Remove all the keys that got created during the selftest</div><div class='del'>-	find "${NETCONS_PATH}/userdata/" -mindepth 1 -type d -delete</div><div class='del'>-	# Remove the configfs entry</div><div class='del'>-	rmdir "${NETCONS_PATH}"</div><div class='add'>+	echo 0 &gt; "${NETCONS_PATH}"/release</div><div class='add'>+	echo 1 &gt; "${NETCONS_PATH}"/enabled</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function do_cleanup() {</div><div class='add'>+	local NSIM_DEV_SYS_DEL="/sys/bus/netdevsim/del_device"</div><div class='ctx'> </div><div class='ctx'> 	# Delete netdevsim devices</div><div class='ctx'> 	echo "$NSIM_DEV_2_ID" &gt; "$NSIM_DEV_SYS_DEL"</div><div class='hunk'>@@ -131,6 +200,29 @@ function cleanup() {</div><div class='ctx'> 	echo "${DEFAULT_PRINTK_VALUES}" &gt; /proc/sys/kernel/printk</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+function cleanup_netcons() {</div><div class='add'>+	# delete netconsole dynamic reconfiguration</div><div class='add'>+	# do not fail if the target is already disabled</div><div class='add'>+	if [[ ! -d "${NETCONS_PATH}" ]]</div><div class='add'>+	then</div><div class='add'>+		# in some cases this is called before netcons path is created</div><div class='add'>+		return</div><div class='add'>+	fi</div><div class='add'>+	if [[ $(cat "${NETCONS_PATH}"/enabled) != 0 ]]</div><div class='add'>+	then</div><div class='add'>+		echo 0 &gt; "${NETCONS_PATH}"/enabled || true</div><div class='add'>+	fi</div><div class='add'>+	# Remove all the keys that got created during the selftest</div><div class='add'>+	find "${NETCONS_PATH}/userdata/" -mindepth 1 -type d -delete</div><div class='add'>+	# Remove the configfs entry</div><div class='add'>+	rmdir "${NETCONS_PATH}"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function cleanup() {</div><div class='add'>+	cleanup_netcons</div><div class='add'>+	do_cleanup</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> function set_user_data() {</div><div class='ctx'> 	if [[ ! -d "${NETCONS_PATH}""/userdata" ]]</div><div class='ctx'> 	then</div><div class='hunk'>@@ -146,18 +238,24 @@ function set_user_data() {</div><div class='ctx'> </div><div class='ctx'> function listen_port_and_save_to() {</div><div class='ctx'> 	local OUTPUT=${1}</div><div class='add'>+	local IPVERSION=${2:-"ipv4"}</div><div class='add'>+</div><div class='add'>+	if [ "${IPVERSION}" == "ipv4" ]</div><div class='add'>+	then</div><div class='add'>+		SOCAT_MODE="UDP-LISTEN"</div><div class='add'>+	else</div><div class='add'>+		SOCAT_MODE="UDP6-LISTEN"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='ctx'> 	# Just wait for 2 seconds</div><div class='ctx'> 	timeout 2 ip netns exec "${NAMESPACE}" \</div><div class='del'>-		socat UDP-LISTEN:"${PORT}",fork "${OUTPUT}"</div><div class='add'>+		socat "${SOCAT_MODE}":"${PORT}",fork "${OUTPUT}" 2&gt; /dev/null</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-function validate_result() {</div><div class='add'>+# Only validate that the message arrived properly</div><div class='add'>+function validate_msg() {</div><div class='ctx'> 	local TMPFILENAME="$1"</div><div class='ctx'> </div><div class='del'>-	# TMPFILENAME will contain something like:</div><div class='del'>-	# 6.11.1-0_fbk0_rc13_509_g30d75cea12f7,13,1822,115075213798,-;netconsole selftest: netcons_gtJHM</div><div class='del'>-	#  key=value</div><div class='del'>-</div><div class='ctx'> 	# Check if the file exists</div><div class='ctx'> 	if [ ! -f "$TMPFILENAME" ]; then</div><div class='ctx'> 		echo "FAIL: File was not generated." &gt;&amp;2</div><div class='hunk'>@@ -169,17 +267,32 @@ function validate_result() {</div><div class='ctx'> 		cat "${TMPFILENAME}" &gt;&amp;2</div><div class='ctx'> 		exit "${ksft_fail}"</div><div class='ctx'> 	fi</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if ! grep -q "${USERDATA_KEY}=${USERDATA_VALUE}" "${TMPFILENAME}"; then</div><div class='del'>-		echo "FAIL: ${USERDATA_KEY}=${USERDATA_VALUE} not found in ${TMPFILENAME}" &gt;&amp;2</div><div class='del'>-		cat "${TMPFILENAME}" &gt;&amp;2</div><div class='del'>-		exit "${ksft_fail}"</div><div class='add'>+# Validate the message and userdata</div><div class='add'>+function validate_result() {</div><div class='add'>+	local TMPFILENAME="$1"</div><div class='add'>+</div><div class='add'>+	# TMPFILENAME will contain something like:</div><div class='add'>+	# 6.11.1-0_fbk0_rc13_509_g30d75cea12f7,13,1822,115075213798,-;netconsole selftest: netcons_gtJHM</div><div class='add'>+	#  key=value</div><div class='add'>+</div><div class='add'>+	validate_msg "${TMPFILENAME}"</div><div class='add'>+</div><div class='add'>+	# userdata is not supported on basic format target,</div><div class='add'>+	# thus, do not validate it.</div><div class='add'>+	if [ "${FORMAT}" != "basic" ];</div><div class='add'>+	then</div><div class='add'>+		if ! grep -q "${USERDATA_KEY}=${USERDATA_VALUE}" "${TMPFILENAME}"; then</div><div class='add'>+			echo "FAIL: ${USERDATA_KEY}=${USERDATA_VALUE} not found in ${TMPFILENAME}" &gt;&amp;2</div><div class='add'>+			cat "${TMPFILENAME}" &gt;&amp;2</div><div class='add'>+			exit "${ksft_fail}"</div><div class='add'>+		fi</div><div class='ctx'> 	fi</div><div class='ctx'> </div><div class='ctx'> 	# Delete the file once it is validated, otherwise keep it</div><div class='ctx'> 	# for debugging purposes</div><div class='ctx'> 	rm "${TMPFILENAME}"</div><div class='del'>-	exit "${ksft_pass}"</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> function check_for_dependencies() {</div><div class='hunk'>@@ -203,6 +316,11 @@ function check_for_dependencies() {</div><div class='ctx'> 		exit "${ksft_skip}"</div><div class='ctx'> 	fi</div><div class='ctx'> </div><div class='add'>+	if [ ! -f /proc/net/if_inet6 ]; then</div><div class='add'>+		echo "SKIP: IPv6 not configured. Check if CONFIG_IPV6 is enabled" &gt;&amp;2</div><div class='add'>+		exit "${ksft_skip}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='ctx'> 	if [ ! -f "${NSIM_DEV_SYS_NEW}" ]; then</div><div class='ctx'> 		echo "SKIP: file ${NSIM_DEV_SYS_NEW} does not exist. Check if CONFIG_NETDEVSIM is enabled" &gt;&amp;2</div><div class='ctx'> 		exit "${ksft_skip}"</div><div class='hunk'>@@ -218,8 +336,84 @@ function check_for_dependencies() {</div><div class='ctx'> 		exit "${ksft_skip}"</div><div class='ctx'> 	fi</div><div class='ctx'> </div><div class='del'>-	if ip addr list | grep -E "inet.*(${SRCIP}|${DSTIP})" 2&gt; /dev/null; then</div><div class='del'>-		echo "SKIP: IPs already in use. Skipping it" &gt;&amp;2</div><div class='add'>+	REGEXP4="inet.*(${SRCIP4}|${DSTIP4})"</div><div class='add'>+	REGEXP6="inet.*(${SRCIP6}|${DSTIP6})"</div><div class='add'>+	if ip addr list | grep -E "${REGEXP4}" 2&gt; /dev/null; then</div><div class='add'>+		echo "SKIP: IPv4s already in use. Skipping it" &gt;&amp;2</div><div class='ctx'> 		exit "${ksft_skip}"</div><div class='ctx'> 	fi</div><div class='add'>+</div><div class='add'>+	if ip addr list | grep -E "${REGEXP6}" 2&gt; /dev/null; then</div><div class='add'>+		echo "SKIP: IPv6s already in use. Skipping it" &gt;&amp;2</div><div class='add'>+		exit "${ksft_skip}"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function check_for_taskset() {</div><div class='add'>+	if ! which taskset &gt; /dev/null ; then</div><div class='add'>+		echo "SKIP: taskset(1) is not available" &gt;&amp;2</div><div class='add'>+		exit "${ksft_skip}"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# This is necessary if running multiple tests in a row</div><div class='add'>+function pkill_socat() {</div><div class='add'>+	PROCESS_NAME4="socat UDP-LISTEN:6666,fork ${OUTPUT_FILE}"</div><div class='add'>+	PROCESS_NAME6="socat UDP6-LISTEN:6666,fork ${OUTPUT_FILE}"</div><div class='add'>+	# socat runs under timeout(1), kill it if it is still alive</div><div class='add'>+	# do not fail if socat doesn't exist anymore</div><div class='add'>+	set +e</div><div class='add'>+	pkill -f "${PROCESS_NAME4}"</div><div class='add'>+	pkill -f "${PROCESS_NAME6}"</div><div class='add'>+	set -e</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Check if netconsole was compiled as a module, otherwise exit</div><div class='add'>+function check_netconsole_module() {</div><div class='add'>+	if modinfo netconsole | grep filename: | grep -q builtin</div><div class='add'>+	then</div><div class='add'>+		echo "SKIP: netconsole should be compiled as a module" &gt;&amp;2</div><div class='add'>+		exit "${ksft_skip}"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# A wrapper to translate protocol version to udp version</div><div class='add'>+function wait_for_port() {</div><div class='add'>+	local NAMESPACE=${1}</div><div class='add'>+	local PORT=${2}</div><div class='add'>+	IP_VERSION=${3}</div><div class='add'>+</div><div class='add'>+	if [ "${IP_VERSION}" == "ipv6" ]</div><div class='add'>+	then</div><div class='add'>+		PROTOCOL="udp6"</div><div class='add'>+	else</div><div class='add'>+		PROTOCOL="udp"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	wait_local_port_listen "${NAMESPACE}" "${PORT}" "${PROTOCOL}"</div><div class='add'>+	# even after the port is open, let's wait 1 second before writing</div><div class='add'>+	# otherwise the packet could be missed, and the test will fail. Happens</div><div class='add'>+	# more frequently on IPv6</div><div class='add'>+	sleep 1</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Clean up netdevsim ifaces created for bonding test</div><div class='add'>+function cleanup_bond_nsim() {</div><div class='add'>+	ip -n "${TXNS}" \</div><div class='add'>+		link delete "${BOND_TX_MAIN_IF}" type bond || true</div><div class='add'>+	ip -n "${RXNS}" \</div><div class='add'>+		link delete "${BOND_RX_MAIN_IF}" type bond || true</div><div class='add'>+</div><div class='add'>+	cleanup_netdevsim "$NSIM_BOND_TX_1"</div><div class='add'>+	cleanup_netdevsim "$NSIM_BOND_TX_2"</div><div class='add'>+	cleanup_netdevsim "$NSIM_BOND_RX_1"</div><div class='add'>+	cleanup_netdevsim "$NSIM_BOND_RX_2"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# cleanup tests that use bonding interfaces</div><div class='add'>+function cleanup_bond() {</div><div class='add'>+	cleanup_netcons</div><div class='add'>+	cleanup_bond_nsim</div><div class='add'>+	cleanup_all_ns</div><div class='add'>+	ip link delete "${VETH0}" || true</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh<br/>index 29a672c2270f..e212ad8ccef6 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh</a></div><div class='hunk'>@@ -44,8 +44,7 @@ source $lib_dir/devlink_lib.sh</div><div class='ctx'> </div><div class='ctx'> h1_create()</div><div class='ctx'> {</div><div class='del'>-	simple_if_init $h1 192.0.2.1/24</div><div class='del'>-	defer simple_if_fini $h1 192.0.2.1/24</div><div class='add'>+	adf_simple_if_init $h1 192.0.2.1/24</div><div class='ctx'> </div><div class='ctx'> 	mtu_set $h1 10000</div><div class='ctx'> 	defer mtu_restore $h1</div><div class='hunk'>@@ -56,8 +55,7 @@ h1_create()</div><div class='ctx'> </div><div class='ctx'> h2_create()</div><div class='ctx'> {</div><div class='del'>-	simple_if_init $h2 198.51.100.1/24</div><div class='del'>-	defer simple_if_fini $h2 198.51.100.1/24</div><div class='add'>+	adf_simple_if_init $h2 198.51.100.1/24</div><div class='ctx'> </div><div class='ctx'> 	mtu_set $h2 10000</div><div class='ctx'> 	defer mtu_restore $h2</div><div class='hunk'>@@ -106,8 +104,7 @@ setup_prepare()</div><div class='ctx'> 	# Reload to ensure devlink-trap settings are back to default.</div><div class='ctx'> 	defer devlink_reload</div><div class='ctx'> </div><div class='del'>-	vrf_prepare</div><div class='del'>-	defer vrf_cleanup</div><div class='add'>+	adf_vrf_prepare</div><div class='ctx'> </div><div class='ctx'> 	h1_create</div><div class='ctx'> 	h2_create</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh<br/>index d5b6f2cc9a29..9ca340c5f3a6 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh</a></div><div class='hunk'>@@ -57,8 +57,7 @@ source qos_lib.sh</div><div class='ctx'> </div><div class='ctx'> h1_create()</div><div class='ctx'> {</div><div class='del'>-	simple_if_init $h1</div><div class='del'>-	defer simple_if_fini $h1</div><div class='add'>+	adf_simple_if_init $h1</div><div class='ctx'> </div><div class='ctx'> 	mtu_set $h1 10000</div><div class='ctx'> 	defer mtu_restore $h1</div><div class='hunk'>@@ -70,8 +69,7 @@ h1_create()</div><div class='ctx'> </div><div class='ctx'> h2_create()</div><div class='ctx'> {</div><div class='del'>-	simple_if_init $h2</div><div class='del'>-	defer simple_if_fini $h2</div><div class='add'>+	adf_simple_if_init $h2</div><div class='ctx'> </div><div class='ctx'> 	mtu_set $h2 10000</div><div class='ctx'> 	defer mtu_restore $h2</div><div class='hunk'>@@ -83,8 +81,7 @@ h2_create()</div><div class='ctx'> </div><div class='ctx'> h3_create()</div><div class='ctx'> {</div><div class='del'>-	simple_if_init $h3</div><div class='del'>-	defer simple_if_fini $h3</div><div class='add'>+	adf_simple_if_init $h3</div><div class='ctx'> </div><div class='ctx'> 	mtu_set $h3 10000</div><div class='ctx'> 	defer mtu_restore $h3</div><div class='hunk'>@@ -225,8 +222,7 @@ setup_prepare()</div><div class='ctx'> </div><div class='ctx'> 	h3mac=$(mac_get $h3)</div><div class='ctx'> </div><div class='del'>-	vrf_prepare</div><div class='del'>-	defer vrf_cleanup</div><div class='add'>+	adf_vrf_prepare</div><div class='ctx'> </div><div class='ctx'> 	h1_create</div><div class='ctx'> 	h2_create</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh<br/>index 2b5d2c2751d5..a4a25637fe2a 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh</a></div><div class='hunk'>@@ -68,8 +68,7 @@ mlxsw_only_on_spectrum 2+ || exit</div><div class='ctx'> </div><div class='ctx'> h1_create()</div><div class='ctx'> {</div><div class='del'>-	simple_if_init $h1</div><div class='del'>-	defer simple_if_fini $h1</div><div class='add'>+	adf_simple_if_init $h1</div><div class='ctx'> </div><div class='ctx'> 	vlan_create $h1 111 v$h1 192.0.2.33/28</div><div class='ctx'> 	defer vlan_destroy $h1 111</div><div class='hunk'>@@ -78,8 +77,7 @@ h1_create()</div><div class='ctx'> </div><div class='ctx'> h2_create()</div><div class='ctx'> {</div><div class='del'>-	simple_if_init $h2</div><div class='del'>-	defer simple_if_fini $h2</div><div class='add'>+	adf_simple_if_init $h2</div><div class='ctx'> </div><div class='ctx'> 	vlan_create $h2 111 v$h2 192.0.2.34/28</div><div class='ctx'> 	defer vlan_destroy $h2 111</div><div class='hunk'>@@ -178,8 +176,7 @@ setup_prepare()</div><div class='ctx'> </div><div class='ctx'> 	h2mac=$(mac_get $h2)</div><div class='ctx'> </div><div class='del'>-	vrf_prepare</div><div class='del'>-	defer vrf_cleanup</div><div class='add'>+	adf_vrf_prepare</div><div class='ctx'> </div><div class='ctx'> 	h1_create</div><div class='ctx'> 	h2_create</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh<br/>index cd4a5c21360c..d8f8ae8533cd 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh</a></div><div class='hunk'>@@ -72,8 +72,7 @@ source qos_lib.sh</div><div class='ctx'> </div><div class='ctx'> h1_create()</div><div class='ctx'> {</div><div class='del'>-	simple_if_init $h1 192.0.2.65/28</div><div class='del'>-	defer simple_if_fini $h1 192.0.2.65/28</div><div class='add'>+	adf_simple_if_init $h1 192.0.2.65/28</div><div class='ctx'> </div><div class='ctx'> 	mtu_set $h1 10000</div><div class='ctx'> 	defer mtu_restore $h1</div><div class='hunk'>@@ -81,8 +80,7 @@ h1_create()</div><div class='ctx'> </div><div class='ctx'> h2_create()</div><div class='ctx'> {</div><div class='del'>-	simple_if_init $h2</div><div class='del'>-	defer simple_if_fini $h2</div><div class='add'>+	adf_simple_if_init $h2</div><div class='ctx'> </div><div class='ctx'> 	mtu_set $h2 10000</div><div class='ctx'> 	defer mtu_restore $h2</div><div class='hunk'>@@ -94,8 +92,7 @@ h2_create()</div><div class='ctx'> </div><div class='ctx'> h3_create()</div><div class='ctx'> {</div><div class='del'>-	simple_if_init $h3 192.0.2.66/28</div><div class='del'>-	defer simple_if_fini $h3 192.0.2.66/28</div><div class='add'>+	adf_simple_if_init $h3 192.0.2.66/28</div><div class='ctx'> </div><div class='ctx'> 	mtu_set $h3 10000</div><div class='ctx'> 	defer mtu_restore $h3</div><div class='hunk'>@@ -196,8 +193,7 @@ setup_prepare()</div><div class='ctx'> </div><div class='ctx'> 	h3mac=$(mac_get $h3)</div><div class='ctx'> </div><div class='del'>-	vrf_prepare</div><div class='del'>-	defer vrf_cleanup</div><div class='add'>+	adf_vrf_prepare</div><div class='ctx'> </div><div class='ctx'> 	h1_create</div><div class='ctx'> 	h2_create</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh b/tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh<br/>index 537d6baa77b7..47d2ffcf366e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh</a></div><div class='hunk'>@@ -100,8 +100,7 @@ host_create()</div><div class='ctx'> 	local dev=$1; shift</div><div class='ctx'> 	local host=$1; shift</div><div class='ctx'> </div><div class='del'>-	simple_if_init $dev</div><div class='del'>-	defer simple_if_fini $dev</div><div class='add'>+	adf_simple_if_init $dev</div><div class='ctx'> </div><div class='ctx'> 	mtu_set $dev 10000</div><div class='ctx'> 	defer mtu_restore $dev</div><div class='hunk'>@@ -250,8 +249,7 @@ setup_prepare()</div><div class='ctx'> </div><div class='ctx'> 	h3_mac=$(mac_get $h3)</div><div class='ctx'> </div><div class='del'>-	vrf_prepare</div><div class='del'>-	defer vrf_cleanup</div><div class='add'>+	adf_vrf_prepare</div><div class='ctx'> </div><div class='ctx'> 	h1_create</div><div class='ctx'> 	h2_create</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh b/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh<br/>index 899b6892603f..d7505b933aef 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh</a></div><div class='hunk'>@@ -51,7 +51,7 @@ for current_test in ${TESTS:-$ALL_TESTS}; do</div><div class='ctx'> 		fi</div><div class='ctx'> </div><div class='ctx'> 		${current_test}_setup_prepare</div><div class='del'>-		setup_wait $num_netifs</div><div class='add'>+		setup_wait_n $num_netifs</div><div class='ctx'> 		# Update target in case occupancy of a certain resource changed</div><div class='ctx'> 		# following the test setup.</div><div class='ctx'> 		target=$(${current_test}_get_target "$should_fail")</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh b/tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh<br/>index 482ebb744eba..7b98cdd0580d 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh</a></div><div class='hunk'>@@ -55,7 +55,7 @@ for current_test in ${TESTS:-$ALL_TESTS}; do</div><div class='ctx'> 				continue</div><div class='ctx'> 			fi</div><div class='ctx'> 			${current_test}_setup_prepare</div><div class='del'>-			setup_wait $num_netifs</div><div class='add'>+			setup_wait_n $num_netifs</div><div class='ctx'> 			# Update target in case occupancy of a certain resource</div><div class='ctx'> 			# changed following the test setup.</div><div class='ctx'> 			target=$(${current_test}_get_target "$should_fail")</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/napi_id.py b/tools/testing/selftests/drivers/net/napi_id.py<br/>new file mode 100755<br/>index 000000000000..d05eddcad539<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/napi_id.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/napi_id.py</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+from lib.py import ksft_run, ksft_exit</div><div class='add'>+from lib.py import ksft_eq, NetDrvEpEnv</div><div class='add'>+from lib.py import bkg, cmd, rand_port, NetNSEnter</div><div class='add'>+</div><div class='add'>+def test_napi_id(cfg) -&gt; None:</div><div class='add'>+    port = rand_port()</div><div class='add'>+    listen_cmd = f"{cfg.test_dir}/napi_id_helper {cfg.addr} {port}"</div><div class='add'>+</div><div class='add'>+    with bkg(listen_cmd, ksft_wait=3) as server:</div><div class='add'>+        cmd(f"echo a | socat - TCP:{cfg.baddr}:{port}", host=cfg.remote, shell=True)</div><div class='add'>+</div><div class='add'>+    ksft_eq(0, server.ret)</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    with NetDrvEpEnv(__file__) as cfg:</div><div class='add'>+        ksft_run([test_napi_id], args=(cfg,))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/napi_id_helper.c b/tools/testing/selftests/drivers/net/napi_id_helper.c<br/>new file mode 100644<br/>index 000000000000..7f49ca6c8637<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/napi_id_helper.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/napi_id_helper.c</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;arpa/inet.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;netdb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../../net/lib/ksft.h"</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_storage address;</div><div class='add'>+	struct addrinfo *result;</div><div class='add'>+	struct addrinfo hints;</div><div class='add'>+	unsigned int napi_id;</div><div class='add'>+	socklen_t addr_len;</div><div class='add'>+	socklen_t optlen;</div><div class='add'>+	char buf[1024];</div><div class='add'>+	int opt = 1;</div><div class='add'>+	int family;</div><div class='add'>+	int server;</div><div class='add'>+	int client;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;hints, 0, sizeof(hints));</div><div class='add'>+	hints.ai_family = AF_UNSPEC;</div><div class='add'>+	hints.ai_socktype = SOCK_STREAM;</div><div class='add'>+	hints.ai_flags = AI_PASSIVE;</div><div class='add'>+</div><div class='add'>+	ret = getaddrinfo(argv[1], argv[2], &amp;hints, &amp;result);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(ret));</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	family = result-&gt;ai_family;</div><div class='add'>+	addr_len = result-&gt;ai_addrlen;</div><div class='add'>+</div><div class='add'>+	server = socket(family, SOCK_STREAM, IPPROTO_TCP);</div><div class='add'>+	if (server &lt; 0) {</div><div class='add'>+		perror("socket creation failed");</div><div class='add'>+		freeaddrinfo(result);</div><div class='add'>+		if (errno == EAFNOSUPPORT)</div><div class='add'>+			return -1;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (setsockopt(server, SOL_SOCKET, SO_REUSEADDR, &amp;opt, sizeof(opt))) {</div><div class='add'>+		perror("setsockopt");</div><div class='add'>+		freeaddrinfo(result);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;address, result-&gt;ai_addr, result-&gt;ai_addrlen);</div><div class='add'>+	freeaddrinfo(result);</div><div class='add'>+</div><div class='add'>+	if (bind(server, (struct sockaddr *)&amp;address, addr_len) &lt; 0) {</div><div class='add'>+		perror("bind failed");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (listen(server, 1) &lt; 0) {</div><div class='add'>+		perror("listen");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksft_ready();</div><div class='add'>+</div><div class='add'>+	client = accept(server, NULL, 0);</div><div class='add'>+	if (client &lt; 0) {</div><div class='add'>+		perror("accept");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	optlen = sizeof(napi_id);</div><div class='add'>+	ret = getsockopt(client, SOL_SOCKET, SO_INCOMING_NAPI_ID, &amp;napi_id,</div><div class='add'>+			 &amp;optlen);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		perror("getsockopt");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read(client, buf, 1024);</div><div class='add'>+</div><div class='add'>+	ksft_wait();</div><div class='add'>+</div><div class='add'>+	if (napi_id == 0) {</div><div class='add'>+		fprintf(stderr, "napi ID is 0\n");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	close(client);</div><div class='add'>+	close(server);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/napi_threaded.py b/tools/testing/selftests/drivers/net/napi_threaded.py<br/>new file mode 100755<br/>index 000000000000..f4be72b2145a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/napi_threaded.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/napi_threaded.py</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+"""</div><div class='add'>+Test napi threaded states.</div><div class='add'>+"""</div><div class='add'>+</div><div class='add'>+from lib.py import ksft_run, ksft_exit</div><div class='add'>+from lib.py import ksft_eq, ksft_ne, ksft_ge</div><div class='add'>+from lib.py import NetDrvEnv, NetdevFamily</div><div class='add'>+from lib.py import cmd, defer, ethtool</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _assert_napi_threaded_enabled(nl, napi_id) -&gt; None:</div><div class='add'>+    napi = nl.napi_get({'id': napi_id})</div><div class='add'>+    ksft_eq(napi['threaded'], 'enabled')</div><div class='add'>+    ksft_ne(napi.get('pid'), None)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _assert_napi_threaded_disabled(nl, napi_id) -&gt; None:</div><div class='add'>+    napi = nl.napi_get({'id': napi_id})</div><div class='add'>+    ksft_eq(napi['threaded'], 'disabled')</div><div class='add'>+    ksft_eq(napi.get('pid'), None)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _set_threaded_state(cfg, threaded) -&gt; None:</div><div class='add'>+    with open(f"/sys/class/net/{cfg.ifname}/threaded", "wb") as fp:</div><div class='add'>+        fp.write(str(threaded).encode('utf-8'))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _setup_deferred_cleanup(cfg) -&gt; None:</div><div class='add'>+    combined = ethtool(f"-l {cfg.ifname}", json=True)[0].get("combined", 0)</div><div class='add'>+    ksft_ge(combined, 2)</div><div class='add'>+    defer(ethtool, f"-L {cfg.ifname} combined {combined}")</div><div class='add'>+</div><div class='add'>+    threaded = cmd(f"cat /sys/class/net/{cfg.ifname}/threaded").stdout</div><div class='add'>+    defer(_set_threaded_state, cfg, threaded)</div><div class='add'>+</div><div class='add'>+    return combined</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def napi_init(cfg, nl) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Test that threaded state (in the persistent NAPI config) gets updated</div><div class='add'>+    even when NAPI with given ID is not allocated at the time.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    qcnt = _setup_deferred_cleanup(cfg)</div><div class='add'>+</div><div class='add'>+    _set_threaded_state(cfg, 1)</div><div class='add'>+    cmd(f"ethtool -L {cfg.ifname} combined 1")</div><div class='add'>+    _set_threaded_state(cfg, 0)</div><div class='add'>+    cmd(f"ethtool -L {cfg.ifname} combined {qcnt}")</div><div class='add'>+</div><div class='add'>+    napis = nl.napi_get({'ifindex': cfg.ifindex}, dump=True)</div><div class='add'>+    for napi in napis:</div><div class='add'>+        ksft_eq(napi['threaded'], 'disabled')</div><div class='add'>+        ksft_eq(napi.get('pid'), None)</div><div class='add'>+</div><div class='add'>+    cmd(f"ethtool -L {cfg.ifname} combined 1")</div><div class='add'>+    _set_threaded_state(cfg, 1)</div><div class='add'>+    cmd(f"ethtool -L {cfg.ifname} combined {qcnt}")</div><div class='add'>+</div><div class='add'>+    napis = nl.napi_get({'ifindex': cfg.ifindex}, dump=True)</div><div class='add'>+    for napi in napis:</div><div class='add'>+        ksft_eq(napi['threaded'], 'enabled')</div><div class='add'>+        ksft_ne(napi.get('pid'), None)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def enable_dev_threaded_disable_napi_threaded(cfg, nl) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Test that when napi threaded is enabled at device level and</div><div class='add'>+    then disabled at napi level for one napi, the threaded state</div><div class='add'>+    of all napis is preserved after a change in number of queues.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    napis = nl.napi_get({'ifindex': cfg.ifindex}, dump=True)</div><div class='add'>+    ksft_ge(len(napis), 2)</div><div class='add'>+</div><div class='add'>+    napi0_id = napis[0]['id']</div><div class='add'>+    napi1_id = napis[1]['id']</div><div class='add'>+</div><div class='add'>+    qcnt = _setup_deferred_cleanup(cfg)</div><div class='add'>+</div><div class='add'>+    # set threaded</div><div class='add'>+    _set_threaded_state(cfg, 1)</div><div class='add'>+</div><div class='add'>+    # check napi threaded is set for both napis</div><div class='add'>+    _assert_napi_threaded_enabled(nl, napi0_id)</div><div class='add'>+    _assert_napi_threaded_enabled(nl, napi1_id)</div><div class='add'>+</div><div class='add'>+    # disable threaded for napi1</div><div class='add'>+    nl.napi_set({'id': napi1_id, 'threaded': 'disabled'})</div><div class='add'>+</div><div class='add'>+    cmd(f"ethtool -L {cfg.ifname} combined 1")</div><div class='add'>+    cmd(f"ethtool -L {cfg.ifname} combined {qcnt}")</div><div class='add'>+    _assert_napi_threaded_enabled(nl, napi0_id)</div><div class='add'>+    _assert_napi_threaded_disabled(nl, napi1_id)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def change_num_queues(cfg, nl) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Test that when napi threaded is enabled at device level,</div><div class='add'>+    the napi threaded state is preserved after a change in</div><div class='add'>+    number of queues.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    napis = nl.napi_get({'ifindex': cfg.ifindex}, dump=True)</div><div class='add'>+    ksft_ge(len(napis), 2)</div><div class='add'>+</div><div class='add'>+    napi0_id = napis[0]['id']</div><div class='add'>+    napi1_id = napis[1]['id']</div><div class='add'>+</div><div class='add'>+    qcnt = _setup_deferred_cleanup(cfg)</div><div class='add'>+</div><div class='add'>+    # set threaded</div><div class='add'>+    _set_threaded_state(cfg, 1)</div><div class='add'>+</div><div class='add'>+    # check napi threaded is set for both napis</div><div class='add'>+    _assert_napi_threaded_enabled(nl, napi0_id)</div><div class='add'>+    _assert_napi_threaded_enabled(nl, napi1_id)</div><div class='add'>+</div><div class='add'>+    cmd(f"ethtool -L {cfg.ifname} combined 1")</div><div class='add'>+    cmd(f"ethtool -L {cfg.ifname} combined {qcnt}")</div><div class='add'>+</div><div class='add'>+    # check napi threaded is set for both napis</div><div class='add'>+    _assert_napi_threaded_enabled(nl, napi0_id)</div><div class='add'>+    _assert_napi_threaded_enabled(nl, napi1_id)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    """ Ksft boiler plate main """</div><div class='add'>+</div><div class='add'>+    with NetDrvEnv(__file__, queue_count=2) as cfg:</div><div class='add'>+        ksft_run([napi_init,</div><div class='add'>+                  change_num_queues,</div><div class='add'>+                  enable_dev_threaded_disable_napi_threaded],</div><div class='add'>+                 args=(cfg, NetdevFamily()))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netcons_basic.sh b/tools/testing/selftests/drivers/net/netcons_basic.sh<br/>index fe765da498e8..2022f3061738 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netcons_basic.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netcons_basic.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netcons_basic.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netcons_basic.sh</a></div><div class='hunk'>@@ -28,25 +28,47 @@ OUTPUT_FILE="/tmp/${TARGET}"</div><div class='ctx'> </div><div class='ctx'> # Check for basic system dependency and exit if not found</div><div class='ctx'> check_for_dependencies</div><div class='del'>-# Set current loglevel to KERN_INFO(6), and default to KERN_NOTICE(5)</div><div class='del'>-echo "6 5" &gt; /proc/sys/kernel/printk</div><div class='ctx'> # Remove the namespace, interfaces and netconsole target on exit</div><div class='ctx'> trap cleanup EXIT</div><div class='del'>-# Create one namespace and two interfaces</div><div class='del'>-set_network</div><div class='del'>-# Create a dynamic target for netconsole</div><div class='del'>-create_dynamic_target</div><div class='del'>-# Set userdata "key" with the "value" value</div><div class='del'>-set_user_data</div><div class='del'>-# Listed for netconsole port inside the namespace and destination interface</div><div class='del'>-listen_port_and_save_to "${OUTPUT_FILE}" &amp;</div><div class='del'>-# Wait for socat to start and listen to the port.</div><div class='del'>-wait_local_port_listen "${NAMESPACE}" "${PORT}" udp</div><div class='del'>-# Send the message</div><div class='del'>-echo "${MSG}: ${TARGET}" &gt; /dev/kmsg</div><div class='del'>-# Wait until socat saves the file to disk</div><div class='del'>-busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"</div><div class='del'>-</div><div class='del'>-# Make sure the message was received in the dst part</div><div class='del'>-# and exit</div><div class='del'>-validate_result "${OUTPUT_FILE}"</div><div class='add'>+</div><div class='add'>+# Run the test twice, with different format modes</div><div class='add'>+for FORMAT in "basic" "extended"</div><div class='add'>+do</div><div class='add'>+	for IP_VERSION in "ipv6" "ipv4"</div><div class='add'>+	do</div><div class='add'>+		echo "Running with target mode: ${FORMAT} (${IP_VERSION})"</div><div class='add'>+		# Set current loglevel to KERN_INFO(6), and default to</div><div class='add'>+		# KERN_NOTICE(5)</div><div class='add'>+		echo "6 5" &gt; /proc/sys/kernel/printk</div><div class='add'>+		# Create one namespace and two interfaces</div><div class='add'>+		set_network "${IP_VERSION}"</div><div class='add'>+		# Create a dynamic target for netconsole</div><div class='add'>+		create_dynamic_target "${FORMAT}"</div><div class='add'>+		# Only set userdata for extended format</div><div class='add'>+		if [ "$FORMAT" == "extended" ]</div><div class='add'>+		then</div><div class='add'>+			# Set userdata "key" with the "value" value</div><div class='add'>+			set_user_data</div><div class='add'>+		fi</div><div class='add'>+		# Listed for netconsole port inside the namespace and</div><div class='add'>+		# destination interface</div><div class='add'>+		listen_port_and_save_to "${OUTPUT_FILE}" "${IP_VERSION}" &amp;</div><div class='add'>+		# Wait for socat to start and listen to the port.</div><div class='add'>+		wait_for_port "${NAMESPACE}" "${PORT}" "${IP_VERSION}"</div><div class='add'>+		# Send the message</div><div class='add'>+		echo "${MSG}: ${TARGET}" &gt; /dev/kmsg</div><div class='add'>+		# Wait until socat saves the file to disk</div><div class='add'>+		busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"</div><div class='add'>+</div><div class='add'>+		# Make sure the message was received in the dst part</div><div class='add'>+		# and exit</div><div class='add'>+		validate_result "${OUTPUT_FILE}" "${FORMAT}"</div><div class='add'>+		# kill socat in case it is still running</div><div class='add'>+		pkill_socat</div><div class='add'>+		cleanup</div><div class='add'>+		echo "${FORMAT} : ${IP_VERSION} : Test passed" &gt;&amp;2</div><div class='add'>+	done</div><div class='add'>+done</div><div class='add'>+</div><div class='add'>+trap - EXIT</div><div class='add'>+exit "${ksft_pass}"</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netcons_cmdline.sh b/tools/testing/selftests/drivers/net/netcons_cmdline.sh<br/>new file mode 100755<br/>index 000000000000..d1d23dc67f99<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netcons_cmdline.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netcons_cmdline.sh</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+#!/usr/bin/env bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+# This is a selftest to test cmdline arguments on netconsole.</div><div class='add'>+# It exercises loading of netconsole from cmdline instead of the dynamic</div><div class='add'>+# reconfiguration. This includes parsing the long netconsole= line and all the</div><div class='add'>+# flow through init_netconsole().</div><div class='add'>+#</div><div class='add'>+# Author: Breno Leitao &lt;leitao@debian.org&gt;</div><div class='add'>+</div><div class='add'>+set -euo pipefail</div><div class='add'>+</div><div class='add'>+SCRIPTDIR=$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")</div><div class='add'>+</div><div class='add'>+source "${SCRIPTDIR}"/lib/sh/lib_netcons.sh</div><div class='add'>+</div><div class='add'>+check_netconsole_module</div><div class='add'>+</div><div class='add'>+modprobe netdevsim 2&gt; /dev/null || true</div><div class='add'>+rmmod netconsole 2&gt; /dev/null || true</div><div class='add'>+</div><div class='add'>+# Check for basic system dependency and exit if not found</div><div class='add'>+# check_for_dependencies</div><div class='add'>+# Set current loglevel to KERN_INFO(6), and default to KERN_NOTICE(5)</div><div class='add'>+echo "6 5" &gt; /proc/sys/kernel/printk</div><div class='add'>+# Remove the namespace and network interfaces</div><div class='add'>+trap do_cleanup EXIT</div><div class='add'>+# Create one namespace and two interfaces</div><div class='add'>+set_network</div><div class='add'>+</div><div class='add'>+# Run the test twice, with different cmdline parameters</div><div class='add'>+for BINDMODE in "ifname" "mac"</div><div class='add'>+do</div><div class='add'>+	echo "Running with bind mode: ${BINDMODE}" &gt;&amp;2</div><div class='add'>+	# Create the command line for netconsole, with the configuration from</div><div class='add'>+	# the function above</div><div class='add'>+	CMDLINE=$(create_cmdline_str "${BINDMODE}")</div><div class='add'>+</div><div class='add'>+	# The content of kmsg will be save to the following file</div><div class='add'>+	OUTPUT_FILE="/tmp/${TARGET}-${BINDMODE}"</div><div class='add'>+</div><div class='add'>+	# Load the module, with the cmdline set</div><div class='add'>+	modprobe netconsole "${CMDLINE}"</div><div class='add'>+</div><div class='add'>+	# Listed for netconsole port inside the namespace and destination</div><div class='add'>+	# interface</div><div class='add'>+	listen_port_and_save_to "${OUTPUT_FILE}" &amp;</div><div class='add'>+	# Wait for socat to start and listen to the port.</div><div class='add'>+	wait_local_port_listen "${NAMESPACE}" "${PORT}" udp</div><div class='add'>+	# Send the message</div><div class='add'>+	echo "${MSG}: ${TARGET}" &gt; /dev/kmsg</div><div class='add'>+	# Wait until socat saves the file to disk</div><div class='add'>+	busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"</div><div class='add'>+	# Make sure the message was received in the dst part</div><div class='add'>+	# and exit</div><div class='add'>+	validate_msg "${OUTPUT_FILE}"</div><div class='add'>+</div><div class='add'>+	# kill socat in case it is still running</div><div class='add'>+	pkill_socat</div><div class='add'>+	# Unload the module</div><div class='add'>+	rmmod netconsole</div><div class='add'>+	echo "${BINDMODE} : Test passed" &gt;&amp;2</div><div class='add'>+done</div><div class='add'>+</div><div class='add'>+exit "${ksft_pass}"</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh b/tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh<br/>new file mode 100755<br/>index 000000000000..4a71e01a230c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh</a></div><div class='hunk'>@@ -0,0 +1,122 @@</div><div class='add'>+#!/usr/bin/env bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+# Test netconsole's message fragmentation functionality.</div><div class='add'>+#</div><div class='add'>+# When a message exceeds the maximum packet size, netconsole splits it into</div><div class='add'>+# multiple fragments for transmission. This test verifies:</div><div class='add'>+#  - Correct fragmentation of large messages</div><div class='add'>+#  - Proper reassembly of fragments at the receiver</div><div class='add'>+#  - Preservation of userdata across fragments</div><div class='add'>+#  - Behavior with and without kernel release version appending</div><div class='add'>+#</div><div class='add'>+# Author: Breno Leitao &lt;leitao@debian.org&gt;</div><div class='add'>+</div><div class='add'>+set -euo pipefail</div><div class='add'>+</div><div class='add'>+SCRIPTDIR=$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")</div><div class='add'>+</div><div class='add'>+source "${SCRIPTDIR}"/lib/sh/lib_netcons.sh</div><div class='add'>+</div><div class='add'>+modprobe netdevsim 2&gt; /dev/null || true</div><div class='add'>+modprobe netconsole 2&gt; /dev/null || true</div><div class='add'>+</div><div class='add'>+# The content of kmsg will be save to the following file</div><div class='add'>+OUTPUT_FILE="/tmp/${TARGET}"</div><div class='add'>+</div><div class='add'>+# set userdata to a long value. In this case, it is "1-2-3-4...50-"</div><div class='add'>+USERDATA_VALUE=$(printf -- '%.2s-' {1..60})</div><div class='add'>+</div><div class='add'>+# Convert the header string in a regexp, so, we can remove</div><div class='add'>+# the second header as well.</div><div class='add'>+# A header looks like "13,468,514729715,-,ncfrag=0/1135;". If</div><div class='add'>+# release is appended, you might find something like:L</div><div class='add'>+# "6.13.0-04048-g4f561a87745a,13,468,514729715,-,ncfrag=0/1135;"</div><div class='add'>+function header_to_regex() {</div><div class='add'>+	# header is everything before ;</div><div class='add'>+	local HEADER="${1}"</div><div class='add'>+	REGEX=$(echo "${HEADER}" | cut -d'=' -f1)</div><div class='add'>+	echo "${REGEX}=[0-9]*\/[0-9]*;"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# We have two headers in the message. Remove both to get the full message,</div><div class='add'>+# and extract the full message.</div><div class='add'>+function extract_msg() {</div><div class='add'>+	local MSGFILE="${1}"</div><div class='add'>+	# Extract the header, which is the very first thing that arrives in the</div><div class='add'>+	# first list.</div><div class='add'>+	HEADER=$(sed -n '1p' "${MSGFILE}" | cut -d';' -f1)</div><div class='add'>+	HEADER_REGEX=$(header_to_regex "${HEADER}")</div><div class='add'>+</div><div class='add'>+	# Remove the two headers from the received message</div><div class='add'>+	# This will return the message without any header, similarly to what</div><div class='add'>+	# was sent.</div><div class='add'>+	sed "s/""${HEADER_REGEX}""//g" "${MSGFILE}"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Validate the message, which has two messages glued together.</div><div class='add'>+# unwrap them to make sure all the characters were transmitted.</div><div class='add'>+# File will look like the following:</div><div class='add'>+#  13,468,514729715,-,ncfrag=0/1135;&lt;message&gt;</div><div class='add'>+#   key=&lt;part of key&gt;-13,468,514729715,-,ncfrag=967/1135;&lt;rest of the key&gt;</div><div class='add'>+function validate_fragmented_result() {</div><div class='add'>+	# Discard the netconsole headers, and assemble the full message</div><div class='add'>+	RCVMSG=$(extract_msg "${1}")</div><div class='add'>+</div><div class='add'>+	# check for the main message</div><div class='add'>+	if ! echo "${RCVMSG}" | grep -q "${MSG}"; then</div><div class='add'>+		echo "Message body doesn't match." &gt;&amp;2</div><div class='add'>+		echo "msg received=" "${RCVMSG}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# check userdata</div><div class='add'>+	if ! echo "${RCVMSG}" | grep -q "${USERDATA_VALUE}"; then</div><div class='add'>+		echo "message userdata doesn't match" &gt;&amp;2</div><div class='add'>+		echo "msg received=" "${RCVMSG}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+	# test passed. hooray</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Check for basic system dependency and exit if not found</div><div class='add'>+check_for_dependencies</div><div class='add'>+# Set current loglevel to KERN_INFO(6), and default to KERN_NOTICE(5)</div><div class='add'>+echo "6 5" &gt; /proc/sys/kernel/printk</div><div class='add'>+# Remove the namespace, interfaces and netconsole target on exit</div><div class='add'>+trap cleanup EXIT</div><div class='add'>+# Create one namespace and two interfaces</div><div class='add'>+set_network</div><div class='add'>+# Create a dynamic target for netconsole</div><div class='add'>+create_dynamic_target</div><div class='add'>+# Set userdata "key" with the "value" value</div><div class='add'>+set_user_data</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+# TEST 1: Send message and userdata. They will fragment</div><div class='add'>+# =======</div><div class='add'>+MSG=$(printf -- 'MSG%.3s=' {1..150})</div><div class='add'>+</div><div class='add'>+# Listen for netconsole port inside the namespace and destination interface</div><div class='add'>+listen_port_and_save_to "${OUTPUT_FILE}" &amp;</div><div class='add'>+# Wait for socat to start and listen to the port.</div><div class='add'>+wait_local_port_listen "${NAMESPACE}" "${PORT}" udp</div><div class='add'>+# Send the message</div><div class='add'>+echo "${MSG}: ${TARGET}" &gt; /dev/kmsg</div><div class='add'>+# Wait until socat saves the file to disk</div><div class='add'>+busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"</div><div class='add'>+# Check if the message was not corrupted</div><div class='add'>+validate_fragmented_result "${OUTPUT_FILE}"</div><div class='add'>+</div><div class='add'>+# TEST 2: Test with smaller message, and without release appended</div><div class='add'>+# =======</div><div class='add'>+MSG=$(printf -- 'FOOBAR%.3s=' {1..100})</div><div class='add'>+# Let's disable release and test again.</div><div class='add'>+disable_release_append</div><div class='add'>+</div><div class='add'>+listen_port_and_save_to "${OUTPUT_FILE}" &amp;</div><div class='add'>+wait_local_port_listen "${NAMESPACE}" "${PORT}" udp</div><div class='add'>+echo "${MSG}: ${TARGET}" &gt; /dev/kmsg</div><div class='add'>+busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"</div><div class='add'>+validate_fragmented_result "${OUTPUT_FILE}"</div><div class='add'>+exit "${ksft_pass}"</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netcons_overflow.sh b/tools/testing/selftests/drivers/net/netcons_overflow.sh<br/>index 29bad56448a2..06089643b771 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netcons_overflow.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netcons_overflow.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netcons_overflow.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netcons_overflow.sh</a></div><div class='hunk'>@@ -15,7 +15,7 @@ SCRIPTDIR=$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")</div><div class='ctx'> </div><div class='ctx'> source "${SCRIPTDIR}"/lib/sh/lib_netcons.sh</div><div class='ctx'> # This is coming from netconsole code. Check for it in drivers/net/netconsole.c</div><div class='del'>-MAX_USERDATA_ITEMS=16</div><div class='add'>+MAX_USERDATA_ITEMS=256</div><div class='ctx'> </div><div class='ctx'> # Function to create userdata entries</div><div class='ctx'> function create_userdata_max_entries() {</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netcons_sysdata.sh b/tools/testing/selftests/drivers/net/netcons_sysdata.sh<br/>new file mode 100755<br/>index 000000000000..baf69031089e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netcons_sysdata.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netcons_sysdata.sh</a></div><div class='hunk'>@@ -0,0 +1,272 @@</div><div class='add'>+#!/usr/bin/env bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+# A test that makes sure that sysdata runtime CPU data is properly set</div><div class='add'>+# when a message is sent.</div><div class='add'>+#</div><div class='add'>+# There are 3 different tests, every time sent using a random CPU.</div><div class='add'>+#  - Test #1</div><div class='add'>+#    * Only enable cpu_nr sysdata feature.</div><div class='add'>+#  - Test #2</div><div class='add'>+#    * Keep cpu_nr sysdata feature enable and enable userdata.</div><div class='add'>+#  - Test #3</div><div class='add'>+#    * keep userdata enabled, and disable sysdata cpu_nr feature.</div><div class='add'>+#</div><div class='add'>+# Author: Breno Leitao &lt;leitao@debian.org&gt;</div><div class='add'>+</div><div class='add'>+set -euo pipefail</div><div class='add'>+</div><div class='add'>+SCRIPTDIR=$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")</div><div class='add'>+</div><div class='add'>+source "${SCRIPTDIR}"/lib/sh/lib_netcons.sh</div><div class='add'>+</div><div class='add'>+# Enable the sysdata cpu_nr feature</div><div class='add'>+function set_cpu_nr() {</div><div class='add'>+	if [[ ! -f "${NETCONS_PATH}/userdata/cpu_nr_enabled" ]]</div><div class='add'>+	then</div><div class='add'>+		echo "Populate CPU configfs path not available in ${NETCONS_PATH}/userdata/cpu_nr_enabled" &gt;&amp;2</div><div class='add'>+		exit "${ksft_skip}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	echo 1 &gt; "${NETCONS_PATH}/userdata/cpu_nr_enabled"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Enable the taskname to be appended to sysdata</div><div class='add'>+function set_taskname() {</div><div class='add'>+	if [[ ! -f "${NETCONS_PATH}/userdata/taskname_enabled" ]]</div><div class='add'>+	then</div><div class='add'>+		echo "Not able to enable taskname sysdata append. Configfs not available in ${NETCONS_PATH}/userdata/taskname_enabled" &gt;&amp;2</div><div class='add'>+		exit "${ksft_skip}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	echo 1 &gt; "${NETCONS_PATH}/userdata/taskname_enabled"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Enable the release to be appended to sysdata</div><div class='add'>+function set_release() {</div><div class='add'>+	if [[ ! -f "${NETCONS_PATH}/userdata/release_enabled" ]]</div><div class='add'>+	then</div><div class='add'>+		echo "Not able to enable release sysdata append. Configfs not available in ${NETCONS_PATH}/userdata/release_enabled" &gt;&amp;2</div><div class='add'>+		exit "${ksft_skip}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	echo 1 &gt; "${NETCONS_PATH}/userdata/release_enabled"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Enable the msgid to be appended to sysdata</div><div class='add'>+function set_msgid() {</div><div class='add'>+	if [[ ! -f "${NETCONS_PATH}/userdata/msgid_enabled" ]]</div><div class='add'>+	then</div><div class='add'>+		echo "Not able to enable msgid sysdata append. Configfs not available in ${NETCONS_PATH}/userdata/msgid_enabled" &gt;&amp;2</div><div class='add'>+		exit "${ksft_skip}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	echo 1 &gt; "${NETCONS_PATH}/userdata/msgid_enabled"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Disable the sysdata cpu_nr feature</div><div class='add'>+function unset_cpu_nr() {</div><div class='add'>+	echo 0 &gt; "${NETCONS_PATH}/userdata/cpu_nr_enabled"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Once called, taskname=&lt;..&gt; will not be appended anymore</div><div class='add'>+function unset_taskname() {</div><div class='add'>+	echo 0 &gt; "${NETCONS_PATH}/userdata/taskname_enabled"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function unset_release() {</div><div class='add'>+	echo 0 &gt; "${NETCONS_PATH}/userdata/release_enabled"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function unset_msgid() {</div><div class='add'>+	echo 0 &gt; "${NETCONS_PATH}/userdata/msgid_enabled"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Test if MSG contains sysdata</div><div class='add'>+function validate_sysdata() {</div><div class='add'>+	# OUTPUT_FILE will contain something like:</div><div class='add'>+	# 6.11.1-0_fbk0_rc13_509_g30d75cea12f7,13,1822,115075213798,-;netconsole selftest: netcons_gtJHM</div><div class='add'>+	#  userdatakey=userdatavalue</div><div class='add'>+	#  cpu=X</div><div class='add'>+	#  taskname=&lt;taskname&gt;</div><div class='add'>+	#  msgid=&lt;id&gt;</div><div class='add'>+</div><div class='add'>+	# Echo is what this test uses to create the message. See runtest()</div><div class='add'>+	# function</div><div class='add'>+	SENDER="echo"</div><div class='add'>+</div><div class='add'>+	if [ ! -f "$OUTPUT_FILE" ]; then</div><div class='add'>+		echo "FAIL: File was not generated." &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if ! grep -q "${MSG}" "${OUTPUT_FILE}"; then</div><div class='add'>+		echo "FAIL: ${MSG} not found in ${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		cat "${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# Check if cpu=XX exists in the file and matches the one used</div><div class='add'>+	# in taskset(1)</div><div class='add'>+	if ! grep -q "cpu=${CPU}\+" "${OUTPUT_FILE}"; then</div><div class='add'>+		echo "FAIL: 'cpu=${CPU}' not found in ${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		cat "${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if ! grep -q "taskname=${SENDER}" "${OUTPUT_FILE}"; then</div><div class='add'>+		echo "FAIL: 'taskname=echo' not found in ${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		cat "${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if ! grep -q "msgid=[0-9]\+$" "${OUTPUT_FILE}"; then</div><div class='add'>+		echo "FAIL: 'msgid=&lt;id&gt;' not found in ${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		cat "${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	rm "${OUTPUT_FILE}"</div><div class='add'>+	pkill_socat</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function validate_release() {</div><div class='add'>+	RELEASE=$(uname -r)</div><div class='add'>+</div><div class='add'>+	if [ ! -f "$OUTPUT_FILE" ]; then</div><div class='add'>+		echo "FAIL: File was not generated." &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if ! grep -q "release=${RELEASE}" "${OUTPUT_FILE}"; then</div><div class='add'>+		echo "FAIL: 'release=${RELEASE}' not found in ${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		cat "${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Test if MSG content exists in OUTPUT_FILE but no `cpu=` and `taskname=`</div><div class='add'>+# strings</div><div class='add'>+function validate_no_sysdata() {</div><div class='add'>+	if [ ! -f "$OUTPUT_FILE" ]; then</div><div class='add'>+		echo "FAIL: File was not generated." &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if ! grep -q "${MSG}" "${OUTPUT_FILE}"; then</div><div class='add'>+		echo "FAIL: ${MSG} not found in ${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		cat "${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if grep -q "cpu=" "${OUTPUT_FILE}"; then</div><div class='add'>+		echo "FAIL: 'cpu=  found in ${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		cat "${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if grep -q "taskname=" "${OUTPUT_FILE}"; then</div><div class='add'>+		echo "FAIL: 'taskname=  found in ${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		cat "${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if grep -q "release=" "${OUTPUT_FILE}"; then</div><div class='add'>+		echo "FAIL: 'release=  found in ${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		cat "${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if grep -q "msgid=" "${OUTPUT_FILE}"; then</div><div class='add'>+		echo "FAIL: 'msgid=  found in ${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		cat "${OUTPUT_FILE}" &gt;&amp;2</div><div class='add'>+		exit "${ksft_fail}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	rm "${OUTPUT_FILE}"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Start socat, send the message and wait for the file to show up in the file</div><div class='add'>+# system</div><div class='add'>+function runtest {</div><div class='add'>+	# Listen for netconsole port inside the namespace and destination</div><div class='add'>+	# interface</div><div class='add'>+	listen_port_and_save_to "${OUTPUT_FILE}" &amp;</div><div class='add'>+	# Wait for socat to start and listen to the port.</div><div class='add'>+	wait_local_port_listen "${NAMESPACE}" "${PORT}" udp</div><div class='add'>+	# Send the message</div><div class='add'>+	taskset -c "${CPU}" echo "${MSG}: ${TARGET}" &gt; /dev/kmsg</div><div class='add'>+	# Wait until socat saves the file to disk</div><div class='add'>+	busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# ========== #</div><div class='add'>+# Start here #</div><div class='add'>+# ========== #</div><div class='add'>+</div><div class='add'>+modprobe netdevsim 2&gt; /dev/null || true</div><div class='add'>+modprobe netconsole 2&gt; /dev/null || true</div><div class='add'>+</div><div class='add'>+# Check for basic system dependency and exit if not found</div><div class='add'>+check_for_dependencies</div><div class='add'>+# This test also depends on taskset(1). Check for it before starting the test</div><div class='add'>+check_for_taskset</div><div class='add'>+</div><div class='add'>+# Set current loglevel to KERN_INFO(6), and default to KERN_NOTICE(5)</div><div class='add'>+echo "6 5" &gt; /proc/sys/kernel/printk</div><div class='add'>+# Remove the namespace, interfaces and netconsole target on exit</div><div class='add'>+trap cleanup EXIT</div><div class='add'>+# Create one namespace and two interfaces</div><div class='add'>+set_network</div><div class='add'>+# Create a dynamic target for netconsole</div><div class='add'>+create_dynamic_target</div><div class='add'>+</div><div class='add'>+#====================================================</div><div class='add'>+# TEST #1</div><div class='add'>+# Send message from a random CPU</div><div class='add'>+#====================================================</div><div class='add'>+# Random CPU in the system</div><div class='add'>+CPU=$((RANDOM % $(nproc)))</div><div class='add'>+OUTPUT_FILE="/tmp/${TARGET}_1"</div><div class='add'>+MSG="Test #1 from CPU${CPU}"</div><div class='add'>+# Enable the auto population of cpu_nr</div><div class='add'>+set_cpu_nr</div><div class='add'>+# Enable taskname to be appended to sysdata</div><div class='add'>+set_taskname</div><div class='add'>+set_release</div><div class='add'>+set_msgid</div><div class='add'>+runtest</div><div class='add'>+# Make sure the message was received in the dst part</div><div class='add'>+# and exit</div><div class='add'>+validate_release</div><div class='add'>+validate_sysdata</div><div class='add'>+</div><div class='add'>+#====================================================</div><div class='add'>+# TEST #2</div><div class='add'>+# This test now adds userdata together with sysdata</div><div class='add'>+# ===================================================</div><div class='add'>+# Get a new random CPU</div><div class='add'>+CPU=$((RANDOM % $(nproc)))</div><div class='add'>+OUTPUT_FILE="/tmp/${TARGET}_2"</div><div class='add'>+MSG="Test #2 from CPU${CPU}"</div><div class='add'>+set_user_data</div><div class='add'>+runtest</div><div class='add'>+validate_release</div><div class='add'>+validate_sysdata</div><div class='add'>+</div><div class='add'>+# ===================================================</div><div class='add'>+# TEST #3</div><div class='add'>+# Unset all sysdata, fail if any userdata is set</div><div class='add'>+# ===================================================</div><div class='add'>+CPU=$((RANDOM % $(nproc)))</div><div class='add'>+OUTPUT_FILE="/tmp/${TARGET}_3"</div><div class='add'>+MSG="Test #3 from CPU${CPU}"</div><div class='add'>+unset_cpu_nr</div><div class='add'>+unset_taskname</div><div class='add'>+unset_release</div><div class='add'>+unset_msgid</div><div class='add'>+runtest</div><div class='add'>+# At this time, cpu= shouldn't be present in the msg</div><div class='add'>+validate_no_sysdata</div><div class='add'>+</div><div class='add'>+exit "${ksft_pass}"</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netcons_torture.sh b/tools/testing/selftests/drivers/net/netcons_torture.sh<br/>new file mode 100755<br/>index 000000000000..2ce9ee3719d1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netcons_torture.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netcons_torture.sh</a></div><div class='hunk'>@@ -0,0 +1,130 @@</div><div class='add'>+#!/usr/bin/env bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+# Repeatedly send kernel messages, toggles netconsole targets on and off,</div><div class='add'>+# creates and deletes targets in parallel, and toggles the source interface to</div><div class='add'>+# simulate stress conditions.</div><div class='add'>+#</div><div class='add'>+# This test aims to verify the robustness of netconsole under dynamic</div><div class='add'>+# configurations and concurrent operations.</div><div class='add'>+#</div><div class='add'>+# The major goal is to run this test with LOCKDEP, Kmemleak and KASAN to make</div><div class='add'>+# sure no issues is reported.</div><div class='add'>+#</div><div class='add'>+# Author: Breno Leitao &lt;leitao@debian.org&gt;</div><div class='add'>+</div><div class='add'>+set -euo pipefail</div><div class='add'>+</div><div class='add'>+SCRIPTDIR=$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")</div><div class='add'>+</div><div class='add'>+source "${SCRIPTDIR}"/lib/sh/lib_netcons.sh</div><div class='add'>+</div><div class='add'>+# Number of times the main loop run</div><div class='add'>+ITERATIONS=${1:-150}</div><div class='add'>+</div><div class='add'>+# Only test extended format</div><div class='add'>+FORMAT="extended"</div><div class='add'>+# And ipv6 only</div><div class='add'>+IP_VERSION="ipv6"</div><div class='add'>+</div><div class='add'>+# Create, enable and delete some targets.</div><div class='add'>+create_and_delete_random_target() {</div><div class='add'>+	COUNT=2</div><div class='add'>+	RND_PREFIX=$(mktemp -u netcons_rnd_XXXX_)</div><div class='add'>+</div><div class='add'>+	if [ -d "${NETCONS_CONFIGFS}/${RND_PREFIX}${COUNT}"  ] || \</div><div class='add'>+	   [ -d "${NETCONS_CONFIGFS}/${RND_PREFIX}0" ]; then</div><div class='add'>+		echo "Function didn't finish yet, skipping it." &gt;&amp;2</div><div class='add'>+		return</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# enable COUNT targets</div><div class='add'>+	for i in $(seq ${COUNT})</div><div class='add'>+	do</div><div class='add'>+		RND_TARGET="${RND_PREFIX}"${i}</div><div class='add'>+		RND_TARGET_PATH="${NETCONS_CONFIGFS}"/"${RND_TARGET}"</div><div class='add'>+</div><div class='add'>+		# Basic population so the target can come up</div><div class='add'>+		_create_dynamic_target "${FORMAT}" "${RND_TARGET_PATH}"</div><div class='add'>+	done</div><div class='add'>+</div><div class='add'>+	echo "netconsole selftest: ${COUNT} additional targets were created" &gt; /dev/kmsg</div><div class='add'>+	# disable them all</div><div class='add'>+	for i in $(seq ${COUNT})</div><div class='add'>+	do</div><div class='add'>+		RND_TARGET="${RND_PREFIX}"${i}</div><div class='add'>+		RND_TARGET_PATH="${NETCONS_CONFIGFS}"/"${RND_TARGET}"</div><div class='add'>+		if [[ $(cat "${RND_TARGET_PATH}/enabled") -eq 1 ]]</div><div class='add'>+		then</div><div class='add'>+			echo 0 &gt; "${RND_TARGET_PATH}"/enabled</div><div class='add'>+		fi</div><div class='add'>+		rmdir "${RND_TARGET_PATH}"</div><div class='add'>+	done</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Disable and enable the target mid-air, while messages</div><div class='add'>+# are being transmitted.</div><div class='add'>+toggle_netcons_target() {</div><div class='add'>+	for i in $(seq 2)</div><div class='add'>+	do</div><div class='add'>+		if [ ! -d "${NETCONS_PATH}" ]</div><div class='add'>+		then</div><div class='add'>+			break</div><div class='add'>+		fi</div><div class='add'>+		echo 0 &gt; "${NETCONS_PATH}"/enabled 2&gt; /dev/null || true</div><div class='add'>+		# Try to enable a bit harder, given it might fail to enable</div><div class='add'>+		# Write to `enabled` might fail depending on the lock, which is</div><div class='add'>+		# highly contentious here</div><div class='add'>+		for _ in $(seq 5)</div><div class='add'>+		do</div><div class='add'>+			echo 1 &gt; "${NETCONS_PATH}"/enabled 2&gt; /dev/null || true</div><div class='add'>+		done</div><div class='add'>+	done</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+toggle_iface(){</div><div class='add'>+	ip link set "${SRCIF}" down</div><div class='add'>+	ip link set "${SRCIF}" up</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Start here</div><div class='add'>+</div><div class='add'>+modprobe netdevsim 2&gt; /dev/null || true</div><div class='add'>+modprobe netconsole 2&gt; /dev/null || true</div><div class='add'>+</div><div class='add'>+# Check for basic system dependency and exit if not found</div><div class='add'>+check_for_dependencies</div><div class='add'>+# Set current loglevel to KERN_INFO(6), and default to KERN_NOTICE(5)</div><div class='add'>+echo "6 5" &gt; /proc/sys/kernel/printk</div><div class='add'>+# Remove the namespace, interfaces and netconsole target on exit</div><div class='add'>+trap cleanup EXIT</div><div class='add'>+# Create one namespace and two interfaces</div><div class='add'>+set_network "${IP_VERSION}"</div><div class='add'>+# Create a dynamic target for netconsole</div><div class='add'>+create_dynamic_target "${FORMAT}"</div><div class='add'>+</div><div class='add'>+for i in $(seq "$ITERATIONS")</div><div class='add'>+do</div><div class='add'>+	for _ in $(seq 10)</div><div class='add'>+	do</div><div class='add'>+		echo "${MSG}: ${TARGET} ${i}" &gt; /dev/kmsg</div><div class='add'>+	done</div><div class='add'>+	wait</div><div class='add'>+</div><div class='add'>+	if (( i % 30 == 0 )); then</div><div class='add'>+		toggle_netcons_target &amp;</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if (( i % 50 == 0 )); then</div><div class='add'>+		# create some targets, enable them, send msg and disable</div><div class='add'>+		# all in a parallel thread</div><div class='add'>+		create_and_delete_random_target &amp;</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if (( i % 70 == 0 )); then</div><div class='add'>+		toggle_iface &amp;</div><div class='add'>+	fi</div><div class='add'>+done</div><div class='add'>+wait</div><div class='add'>+</div><div class='add'>+exit "${EXIT_STATUS}"</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netdevsim/Makefile b/tools/testing/selftests/drivers/net/netdevsim/Makefile<br/>index 07b7c46d3311..1a228c5430f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netdevsim/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netdevsim/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netdevsim/Makefile</a></div><div class='hunk'>@@ -1,13 +1,13 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0+ OR MIT</div><div class='ctx'> </div><div class='del'>-TEST_PROGS = devlink.sh \</div><div class='add'>+TEST_PROGS := \</div><div class='add'>+	devlink.sh \</div><div class='ctx'> 	devlink_in_netns.sh \</div><div class='ctx'> 	devlink_trap.sh \</div><div class='ctx'> 	ethtool-coalesce.sh \</div><div class='ctx'> 	ethtool-features.sh \</div><div class='ctx'> 	ethtool-fec.sh \</div><div class='ctx'> 	ethtool-pause.sh \</div><div class='del'>-	ethtool-ring.sh \</div><div class='ctx'> 	fib.sh \</div><div class='ctx'> 	fib_notifications.sh \</div><div class='ctx'> 	hw_stats_l3.sh \</div><div class='hunk'>@@ -17,5 +17,10 @@ TEST_PROGS = devlink.sh \</div><div class='ctx'> 	psample.sh \</div><div class='ctx'> 	tc-mq-visibility.sh \</div><div class='ctx'> 	udp_tunnel_nic.sh \</div><div class='add'>+# end of TEST_PROGS</div><div class='add'>+</div><div class='add'>+TEST_FILES := \</div><div class='add'>+	ethtool-common.sh</div><div class='add'>+# end of TEST_FILES</div><div class='ctx'> </div><div class='ctx'> include ../../../lib.mk</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh<br/>index b5ea2526f23c..1b529ccaf050 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netdevsim/devlink.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/devlink.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netdevsim/devlink.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netdevsim/devlink.sh</a></div><div class='hunk'>@@ -3,7 +3,8 @@</div><div class='ctx'> </div><div class='ctx'> lib_dir=$(dirname $0)/../../../net/forwarding</div><div class='ctx'> </div><div class='del'>-ALL_TESTS="fw_flash_test params_test regions_test reload_test \</div><div class='add'>+ALL_TESTS="fw_flash_test params_test  \</div><div class='add'>+	   params_default_test regions_test reload_test \</div><div class='ctx'> 	   netns_reload_test resource_test dev_info_test \</div><div class='ctx'> 	   empty_reporter_test dummy_reporter_test rate_test"</div><div class='ctx'> NUM_NETIFS=0</div><div class='hunk'>@@ -40,6 +41,8 @@ fw_flash_test()</div><div class='ctx'> 		return</div><div class='ctx'> 	fi</div><div class='ctx'> </div><div class='add'>+	echo "10"&gt; $DEBUGFS_DIR/fw_update_flash_chunk_time_ms</div><div class='add'>+</div><div class='ctx'> 	devlink dev flash $DL_HANDLE file $DUMMYFILE</div><div class='ctx'> 	check_err $? "Failed to flash with status updates on"</div><div class='ctx'> </div><div class='hunk'>@@ -76,17 +79,28 @@ fw_flash_test()</div><div class='ctx'> param_get()</div><div class='ctx'> {</div><div class='ctx'> 	local name=$1</div><div class='add'>+	local attr=${2:-value}</div><div class='add'>+	local cmode=${3:-driverinit}</div><div class='ctx'> </div><div class='ctx'> 	cmd_jq "devlink dev param show $DL_HANDLE name $name -j" \</div><div class='del'>-	       '.[][][].values[] | select(.cmode == "driverinit").value'</div><div class='add'>+	       '.[][][].values[] | select(.cmode == "'"$cmode"'").'"$attr"</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> param_set()</div><div class='ctx'> {</div><div class='ctx'> 	local name=$1</div><div class='ctx'> 	local value=$2</div><div class='add'>+	local cmode=${3:-driverinit}</div><div class='ctx'> </div><div class='del'>-	devlink dev param set $DL_HANDLE name $name cmode driverinit value $value</div><div class='add'>+	devlink dev param set $DL_HANDLE name $name cmode $cmode value $value</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+param_set_default()</div><div class='add'>+{</div><div class='add'>+	local name=$1</div><div class='add'>+	local cmode=${2:-driverinit}</div><div class='add'>+</div><div class='add'>+	devlink dev param set $DL_HANDLE name $name default cmode $cmode</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> check_value()</div><div class='hunk'>@@ -95,12 +109,18 @@ check_value()</div><div class='ctx'> 	local phase_name=$2</div><div class='ctx'> 	local expected_param_value=$3</div><div class='ctx'> 	local expected_debugfs_value=$4</div><div class='add'>+	local cmode=${5:-driverinit}</div><div class='ctx'> 	local value</div><div class='add'>+	local attr="value"</div><div class='add'>+</div><div class='add'>+	if [[ "$phase_name" == *"default"* ]]; then</div><div class='add'>+		attr="default"</div><div class='add'>+	fi</div><div class='ctx'> </div><div class='del'>-	value=$(param_get $name)</div><div class='del'>-	check_err $? "Failed to get $name param value"</div><div class='add'>+	value=$(param_get $name $attr $cmode)</div><div class='add'>+	check_err $? "Failed to get $name param $attr"</div><div class='ctx'> 	[ "$value" == "$expected_param_value" ]</div><div class='del'>-	check_err $? "Unexpected $phase_name $name param value"</div><div class='add'>+	check_err $? "Unexpected $phase_name $name param $attr"</div><div class='ctx'> 	value=$(&lt;$DEBUGFS_DIR/$name)</div><div class='ctx'> 	check_err $? "Failed to get $name debugfs value"</div><div class='ctx'> 	[ "$value" == "$expected_debugfs_value" ]</div><div class='hunk'>@@ -133,6 +153,92 @@ params_test()</div><div class='ctx'> 	log_test "params test"</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+value_to_debugfs()</div><div class='add'>+{</div><div class='add'>+	local value=$1</div><div class='add'>+</div><div class='add'>+	case "$value" in</div><div class='add'>+		true)</div><div class='add'>+			echo "Y"</div><div class='add'>+			;;</div><div class='add'>+		false)</div><div class='add'>+			echo "N"</div><div class='add'>+			;;</div><div class='add'>+		*)</div><div class='add'>+			echo "$value"</div><div class='add'>+			;;</div><div class='add'>+	esac</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+test_default()</div><div class='add'>+{</div><div class='add'>+	local param_name=$1</div><div class='add'>+	local new_value=$2</div><div class='add'>+	local expected_default=$3</div><div class='add'>+	local cmode=${4:-driverinit}</div><div class='add'>+	local default_debugfs</div><div class='add'>+	local new_debugfs</div><div class='add'>+	local expected_debugfs</div><div class='add'>+</div><div class='add'>+	default_debugfs=$(value_to_debugfs $expected_default)</div><div class='add'>+	new_debugfs=$(value_to_debugfs $new_value)</div><div class='add'>+</div><div class='add'>+	expected_debugfs=$default_debugfs</div><div class='add'>+	check_value $param_name initial-default $expected_default $expected_debugfs $cmode</div><div class='add'>+</div><div class='add'>+	param_set $param_name $new_value $cmode</div><div class='add'>+	check_err $? "Failed to set $param_name to $new_value"</div><div class='add'>+</div><div class='add'>+	expected_debugfs=$([ "$cmode" == "runtime" ] &amp;&amp; echo "$new_debugfs" || echo "$default_debugfs")</div><div class='add'>+	check_value $param_name post-set $new_value $expected_debugfs $cmode</div><div class='add'>+</div><div class='add'>+	devlink dev reload $DL_HANDLE</div><div class='add'>+	check_err $? "Failed to reload device"</div><div class='add'>+</div><div class='add'>+	expected_debugfs=$new_debugfs</div><div class='add'>+	check_value $param_name post-reload-new-value $new_value $expected_debugfs $cmode</div><div class='add'>+</div><div class='add'>+	param_set_default $param_name $cmode</div><div class='add'>+	check_err $? "Failed to set $param_name to default"</div><div class='add'>+</div><div class='add'>+	expected_debugfs=$([ "$cmode" == "runtime" ] &amp;&amp; echo "$default_debugfs" || echo "$new_debugfs")</div><div class='add'>+	check_value $param_name post-set-default $expected_default $expected_debugfs $cmode</div><div class='add'>+</div><div class='add'>+	devlink dev reload $DL_HANDLE</div><div class='add'>+	check_err $? "Failed to reload device"</div><div class='add'>+</div><div class='add'>+	expected_debugfs=$default_debugfs</div><div class='add'>+	check_value $param_name post-reload-default $expected_default $expected_debugfs $cmode</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+params_default_test()</div><div class='add'>+{</div><div class='add'>+	RET=0</div><div class='add'>+</div><div class='add'>+	if ! devlink dev param help 2&gt;&amp;1 | grep -q "value VALUE | default"; then</div><div class='add'>+		echo "SKIP: devlink cli missing default feature"</div><div class='add'>+		return</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	# Remove side effects of previous tests. Use plain param_set, because</div><div class='add'>+	# param_set_default is a feature under test here.</div><div class='add'>+	param_set max_macs 32 driverinit</div><div class='add'>+	check_err $? "Failed to reset max_macs to default value"</div><div class='add'>+	param_set test1 true driverinit</div><div class='add'>+	check_err $? "Failed to reset test1 to default value"</div><div class='add'>+	param_set test2 1234 runtime</div><div class='add'>+	check_err $? "Failed to reset test2 to default value"</div><div class='add'>+</div><div class='add'>+	devlink dev reload $DL_HANDLE</div><div class='add'>+	check_err $? "Failed to reload device for clean state"</div><div class='add'>+</div><div class='add'>+	test_default max_macs 16 32 driverinit</div><div class='add'>+	test_default test1 false true driverinit</div><div class='add'>+	test_default test2 100 1234 runtime</div><div class='add'>+</div><div class='add'>+	log_test "params default test"</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> check_region_size()</div><div class='ctx'> {</div><div class='ctx'> 	local name=$1</div><div class='hunk'>@@ -608,6 +714,46 @@ rate_attr_parent_check()</div><div class='ctx'> 	check_err $? "Unexpected parent attr value $api_value != $parent"</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+rate_attr_tc_bw_check()</div><div class='add'>+{</div><div class='add'>+	local handle=$1</div><div class='add'>+	local tc_bw=$2</div><div class='add'>+	local debug_file=$3</div><div class='add'>+</div><div class='add'>+	local tc_bw_str=""</div><div class='add'>+	for bw in $tc_bw; do</div><div class='add'>+		local tc=${bw%%:*}</div><div class='add'>+		local value=${bw##*:}</div><div class='add'>+		tc_bw_str="$tc_bw_str $tc:$value"</div><div class='add'>+	done</div><div class='add'>+	tc_bw_str=${tc_bw_str# }</div><div class='add'>+</div><div class='add'>+	rate_attr_set "$handle" tc-bw "$tc_bw_str"</div><div class='add'>+	check_err $? "Failed to set tc-bw values"</div><div class='add'>+</div><div class='add'>+	for bw in $tc_bw; do</div><div class='add'>+		local tc=${bw%%:*}</div><div class='add'>+		local value=${bw##*:}</div><div class='add'>+		local debug_value</div><div class='add'>+		debug_value=$(cat "$debug_file"/tc"${tc}"_bw)</div><div class='add'>+		check_err $? "Failed to read tc-bw value from debugfs for tc$tc"</div><div class='add'>+		[ "$debug_value" == "$value" ]</div><div class='add'>+		check_err $? "Unexpected tc-bw debug value for tc$tc: $debug_value != $value"</div><div class='add'>+	done</div><div class='add'>+</div><div class='add'>+	for bw in $tc_bw; do</div><div class='add'>+		local tc=${bw%%:*}</div><div class='add'>+		local expected_value=${bw##*:}</div><div class='add'>+		local api_value</div><div class='add'>+		api_value=$(rate_attr_get "$handle" tc_"$tc")</div><div class='add'>+		if [ "$api_value" = "null" ]; then</div><div class='add'>+			api_value=0</div><div class='add'>+		fi</div><div class='add'>+		[ "$api_value" == "$expected_value" ]</div><div class='add'>+		check_err $? "Unexpected tc-bw value for tc$tc: $api_value != $expected_value"</div><div class='add'>+	done</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> rate_node_add()</div><div class='ctx'> {</div><div class='ctx'> 	local handle=$1</div><div class='hunk'>@@ -649,6 +795,13 @@ rate_test()</div><div class='ctx'> 		rate=$(($rate+100))</div><div class='ctx'> 	done</div><div class='ctx'> </div><div class='add'>+	local tc_bw="0:0 1:40 2:0 3:0 4:0 5:0 6:60 7:0"</div><div class='add'>+	for r_obj in $leafs</div><div class='add'>+	do</div><div class='add'>+		rate_attr_tc_bw_check "$r_obj" "$tc_bw" \</div><div class='add'>+			"$DEBUGFS_DIR"/ports/"${r_obj##*/}"</div><div class='add'>+	done</div><div class='add'>+</div><div class='ctx'> 	local node1_name='group1'</div><div class='ctx'> 	local node1="$DL_HANDLE/$node1_name"</div><div class='ctx'> 	rate_node_add "$node1"</div><div class='hunk'>@@ -666,6 +819,12 @@ rate_test()</div><div class='ctx'> 	rate_attr_tx_rate_check $node1 tx_max $node_tx_max \</div><div class='ctx'> 		$DEBUGFS_DIR/rate_nodes/${node1##*/}/tx_max</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+	local tc_bw="0:20 1:0 2:0 3:0 4:0 5:20 6:60 7:0"</div><div class='add'>+	rate_attr_tc_bw_check $node1 "$tc_bw" \</div><div class='add'>+		"$DEBUGFS_DIR"/rate_nodes/"${node1##*/}"</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	rate_node_del "$node1"</div><div class='ctx'> 	check_err $? "Failed to delete node $node1"</div><div class='ctx'> 	local num_nodes=`rate_nodes_get $DL_HANDLE | wc -w`</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netdevsim/ethtool-ring.sh b/tools/testing/selftests/drivers/net/netdevsim/ethtool-ring.sh<br/>deleted file mode 100755<br/>index c969559ffa7a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netdevsim/ethtool-ring.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/ethtool-ring.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-#!/bin/bash</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-</div><div class='del'>-source ethtool-common.sh</div><div class='del'>-</div><div class='del'>-function get_value {</div><div class='del'>-    local query="${SETTINGS_MAP[$1]}"</div><div class='del'>-</div><div class='del'>-    echo $(ethtool -g $NSIM_NETDEV | \</div><div class='del'>-        tail -n +$CURR_SETT_LINE | \</div><div class='del'>-        awk -F':' -v pattern="$query:" '$0 ~ pattern {gsub(/[\t ]/, "", $2); print $2}')</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-function update_current_settings {</div><div class='del'>-    for key in ${!SETTINGS_MAP[@]}; do</div><div class='del'>-        CURRENT_SETTINGS[$key]=$(get_value $key)</div><div class='del'>-    done</div><div class='del'>-    echo ${CURRENT_SETTINGS[@]}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-if ! ethtool -h | grep -q set-ring &gt;/dev/null; then</div><div class='del'>-    echo "SKIP: No --set-ring support in ethtool"</div><div class='del'>-    exit 4</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-NSIM_NETDEV=$(make_netdev)</div><div class='del'>-</div><div class='del'>-set -o pipefail</div><div class='del'>-</div><div class='del'>-declare -A SETTINGS_MAP=(</div><div class='del'>-    ["rx"]="RX"</div><div class='del'>-    ["rx-mini"]="RX Mini"</div><div class='del'>-    ["rx-jumbo"]="RX Jumbo"</div><div class='del'>-    ["tx"]="TX"</div><div class='del'>-)</div><div class='del'>-</div><div class='del'>-declare -A EXPECTED_SETTINGS=(</div><div class='del'>-    ["rx"]=""</div><div class='del'>-    ["rx-mini"]=""</div><div class='del'>-    ["rx-jumbo"]=""</div><div class='del'>-    ["tx"]=""</div><div class='del'>-)</div><div class='del'>-</div><div class='del'>-declare -A CURRENT_SETTINGS=(</div><div class='del'>-    ["rx"]=""</div><div class='del'>-    ["rx-mini"]=""</div><div class='del'>-    ["rx-jumbo"]=""</div><div class='del'>-    ["tx"]=""</div><div class='del'>-)</div><div class='del'>-</div><div class='del'>-MAX_VALUE=$((RANDOM % $((2**32-1))))</div><div class='del'>-RING_MAX_LIST=$(ls $NSIM_DEV_DFS/ethtool/ring/)</div><div class='del'>-</div><div class='del'>-for ring_max_entry in $RING_MAX_LIST; do</div><div class='del'>-    echo $MAX_VALUE &gt; $NSIM_DEV_DFS/ethtool/ring/$ring_max_entry</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-CURR_SETT_LINE=$(ethtool -g $NSIM_NETDEV | grep -i -m1 -n 'Current hardware settings' | cut -f1 -d:)</div><div class='del'>-</div><div class='del'>-# populate the expected settings map</div><div class='del'>-for key in ${!SETTINGS_MAP[@]}; do</div><div class='del'>-    EXPECTED_SETTINGS[$key]=$(get_value $key)</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-# test</div><div class='del'>-for key in ${!SETTINGS_MAP[@]}; do</div><div class='del'>-    value=$((RANDOM % $MAX_VALUE))</div><div class='del'>-</div><div class='del'>-    ethtool -G $NSIM_NETDEV "$key" "$value"</div><div class='del'>-</div><div class='del'>-    EXPECTED_SETTINGS[$key]="$value"</div><div class='del'>-    expected=${EXPECTED_SETTINGS[@]}</div><div class='del'>-    current=$(update_current_settings)</div><div class='del'>-</div><div class='del'>-    check $? "$current" "$expected"</div><div class='del'>-    set +x</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-if [ $num_errors -eq 0 ]; then</div><div class='del'>-    echo "PASSED all $((num_passes)) checks"</div><div class='del'>-    exit 0</div><div class='del'>-else</div><div class='del'>-    echo "FAILED $num_errors/$((num_errors+num_passes)) checks"</div><div class='del'>-    exit 1</div><div class='del'>-fi</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netdevsim/nexthop.sh b/tools/testing/selftests/drivers/net/netdevsim/nexthop.sh<br/>index e8e0dc088d6a..01d0c044a5fc 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netdevsim/nexthop.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/nexthop.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netdevsim/nexthop.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netdevsim/nexthop.sh</a></div><div class='hunk'>@@ -1053,6 +1053,6 @@ trap cleanup EXIT</div><div class='ctx'> </div><div class='ctx'> setup_prepare</div><div class='ctx'> </div><div class='del'>-tests_run</div><div class='add'>+xfail_on_slow tests_run</div><div class='ctx'> </div><div class='ctx'> exit $EXIT_STATUS</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netdevsim/peer.sh b/tools/testing/selftests/drivers/net/netdevsim/peer.sh<br/>index aed62d9e6c0a..7f32b5600925 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netdevsim/peer.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/peer.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netdevsim/peer.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netdevsim/peer.sh</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='ctx'> #!/bin/bash</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> </div><div class='del'>-source ../../../net/net_helper.sh</div><div class='add'>+lib_dir=$(dirname $0)/../../../net</div><div class='add'>+source $lib_dir/lib.sh</div><div class='ctx'> </div><div class='ctx'> NSIM_DEV_1_ID=$((256 + RANDOM % 256))</div><div class='ctx'> NSIM_DEV_1_SYS=/sys/bus/netdevsim/devices/netdevsim$NSIM_DEV_1_ID</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh b/tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh<br/>index 92c2f0376c08..4c859ecdad94 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh</a></div><div class='hunk'>@@ -266,7 +266,6 @@ for port in 0 1; do</div><div class='ctx'> 	echo $NSIM_ID &gt; /sys/bus/netdevsim/new_device</div><div class='ctx'>     else</div><div class='ctx'> 	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_open_only</div><div class='del'>-	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_sleep</div><div class='ctx'> 	echo 1 &gt; $NSIM_DEV_SYS/new_port</div><div class='ctx'>     fi</div><div class='ctx'>     NSIM_NETDEV=`get_netdev_name old_netdevs`</div><div class='hunk'>@@ -350,23 +349,11 @@ old_netdevs=$(ls /sys/class/net)</div><div class='ctx'> port=0</div><div class='ctx'> echo $NSIM_ID &gt; /sys/bus/netdevsim/new_device</div><div class='ctx'> echo 0 &gt; $NSIM_DEV_SYS/del_port</div><div class='del'>-echo 1000 &gt; $NSIM_DEV_DFS/udp_ports_sleep</div><div class='ctx'> echo 0 &gt; $NSIM_DEV_SYS/new_port</div><div class='ctx'> NSIM_NETDEV=`get_netdev_name old_netdevs`</div><div class='ctx'> </div><div class='ctx'> msg="create VxLANs"</div><div class='del'>-exp0=( 0 0 0 0 ) # sleep is longer than out wait</div><div class='del'>-new_vxlan vxlan0 10000 $NSIM_NETDEV</div><div class='del'>-</div><div class='del'>-modprobe -r vxlan</div><div class='del'>-modprobe -r udp_tunnel</div><div class='del'>-</div><div class='del'>-msg="remove tunnels"</div><div class='del'>-exp0=( 0 0 0 0 )</div><div class='del'>-check_tables</div><div class='del'>-</div><div class='del'>-msg="create VxLANs"</div><div class='del'>-exp0=( 0 0 0 0 ) # sleep is longer than out wait</div><div class='add'>+exp0=( `mke 10000 1` 0 0 0 )</div><div class='ctx'> new_vxlan vxlan0 10000 $NSIM_NETDEV</div><div class='ctx'> </div><div class='ctx'> exp0=( 0 0 0 0 )</div><div class='hunk'>@@ -428,7 +415,6 @@ echo 0 &gt; $NSIM_DEV_SYS/del_port</div><div class='ctx'> for port in 0 1; do</div><div class='ctx'>     if [ $port -ne 0 ]; then</div><div class='ctx'> 	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_open_only</div><div class='del'>-	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_sleep</div><div class='ctx'>     fi</div><div class='ctx'> </div><div class='ctx'>     echo $port &gt; $NSIM_DEV_SYS/new_port</div><div class='hunk'>@@ -486,7 +472,6 @@ echo 1 &gt; $NSIM_DEV_DFS/udp_ports_sync_all</div><div class='ctx'> for port in 0 1; do</div><div class='ctx'>     if [ $port -ne 0 ]; then</div><div class='ctx'> 	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_open_only</div><div class='del'>-	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_sleep</div><div class='ctx'>     fi</div><div class='ctx'> </div><div class='ctx'>     echo $port &gt; $NSIM_DEV_SYS/new_port</div><div class='hunk'>@@ -543,7 +528,6 @@ echo 0 &gt; $NSIM_DEV_SYS/del_port</div><div class='ctx'> for port in 0 1; do</div><div class='ctx'>     if [ $port -ne 0 ]; then</div><div class='ctx'> 	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_open_only</div><div class='del'>-	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_sleep</div><div class='ctx'>     fi</div><div class='ctx'> </div><div class='ctx'>     echo $port &gt; $NSIM_DEV_SYS/new_port</div><div class='hunk'>@@ -573,7 +557,6 @@ echo 1 &gt; $NSIM_DEV_DFS/udp_ports_ipv4_only</div><div class='ctx'> for port in 0 1; do</div><div class='ctx'>     if [ $port -ne 0 ]; then</div><div class='ctx'> 	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_open_only</div><div class='del'>-	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_sleep</div><div class='ctx'>     fi</div><div class='ctx'> </div><div class='ctx'>     echo $port &gt; $NSIM_DEV_SYS/new_port</div><div class='hunk'>@@ -634,7 +617,6 @@ echo 0 &gt; $NSIM_DEV_SYS/del_port</div><div class='ctx'> for port in 0 1; do</div><div class='ctx'>     if [ $port -ne 0 ]; then</div><div class='ctx'> 	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_open_only</div><div class='del'>-	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_sleep</div><div class='ctx'>     fi</div><div class='ctx'> </div><div class='ctx'>     echo $port &gt; $NSIM_DEV_SYS/new_port</div><div class='hunk'>@@ -690,7 +672,6 @@ echo 0 &gt; $NSIM_DEV_SYS/del_port</div><div class='ctx'> for port in 0 1; do</div><div class='ctx'>     if [ $port -ne 0 ]; then</div><div class='ctx'> 	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_open_only</div><div class='del'>-	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_sleep</div><div class='ctx'>     fi</div><div class='ctx'> </div><div class='ctx'>     echo $port &gt; $NSIM_DEV_SYS/new_port</div><div class='hunk'>@@ -750,7 +731,6 @@ echo 0 &gt; $NSIM_DEV_SYS/del_port</div><div class='ctx'> for port in 0 1; do</div><div class='ctx'>     if [ $port -ne 0 ]; then</div><div class='ctx'> 	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_open_only</div><div class='del'>-	echo 1 &gt; $NSIM_DEV_DFS/udp_ports_sleep</div><div class='ctx'>     fi</div><div class='ctx'> </div><div class='ctx'>     echo $port &gt; $NSIM_DEV_SYS/new_port</div><div class='hunk'>@@ -809,7 +789,6 @@ echo $NSIM_ID &gt; /sys/bus/netdevsim/new_device</div><div class='ctx'> echo 0 &gt; $NSIM_DEV_SYS/del_port</div><div class='ctx'> </div><div class='ctx'> echo 0 &gt; $NSIM_DEV_DFS/udp_ports_open_only</div><div class='del'>-echo 1 &gt; $NSIM_DEV_DFS/udp_ports_sleep</div><div class='ctx'> echo 1 &gt; $NSIM_DEV_DFS/udp_ports_shared</div><div class='ctx'> </div><div class='ctx'> old_netdevs=$(ls /sys/class/net)</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/netpoll_basic.py b/tools/testing/selftests/drivers/net/netpoll_basic.py<br/>new file mode 100755<br/>index 000000000000..408bd54d6779<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/netpoll_basic.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/netpoll_basic.py</a></div><div class='hunk'>@@ -0,0 +1,396 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+# Author: Breno Leitao &lt;leitao@debian.org&gt;</div><div class='add'>+"""</div><div class='add'>+ This test aims to evaluate the netpoll polling mechanism (as in</div><div class='add'>+ netpoll_poll_dev()). It presents a complex scenario where the network</div><div class='add'>+ attempts to send a packet but fails, prompting it to poll the NIC from within</div><div class='add'>+ the netpoll TX side.</div><div class='add'>+</div><div class='add'>+ This has been a crucial path in netpoll that was previously untested. Jakub</div><div class='add'>+ suggested using a single RX/TX queue, pushing traffic to the NIC, and then</div><div class='add'>+ sending netpoll messages (via netconsole) to trigger the poll.</div><div class='add'>+</div><div class='add'>+ In parallel, bpftrace is used to detect if netpoll_poll_dev() was called. If</div><div class='add'>+ so, the test passes, otherwise it will be skipped. This test is very dependent on</div><div class='add'>+ the driver and environment, given we are trying to trigger a tricky scenario.</div><div class='add'>+"""</div><div class='add'>+</div><div class='add'>+import errno</div><div class='add'>+import logging</div><div class='add'>+import os</div><div class='add'>+import random</div><div class='add'>+import string</div><div class='add'>+import threading</div><div class='add'>+import time</div><div class='add'>+from typing import Optional</div><div class='add'>+</div><div class='add'>+from lib.py import (</div><div class='add'>+    bpftrace,</div><div class='add'>+    CmdExitFailure,</div><div class='add'>+    defer,</div><div class='add'>+    ethtool,</div><div class='add'>+    GenerateTraffic,</div><div class='add'>+    ksft_exit,</div><div class='add'>+    ksft_pr,</div><div class='add'>+    ksft_run,</div><div class='add'>+    KsftFailEx,</div><div class='add'>+    KsftSkipEx,</div><div class='add'>+    NetDrvEpEnv,</div><div class='add'>+    KsftXfailEx,</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+# Configure logging</div><div class='add'>+logging.basicConfig(</div><div class='add'>+    level=logging.INFO,</div><div class='add'>+    format="%(asctime)s - %(levelname)s - %(message)s",</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+NETCONSOLE_CONFIGFS_PATH: str = "/sys/kernel/config/netconsole"</div><div class='add'>+NETCONS_REMOTE_PORT: int = 6666</div><div class='add'>+NETCONS_LOCAL_PORT: int = 1514</div><div class='add'>+</div><div class='add'>+# Max number of netcons messages to send. Each iteration will setup</div><div class='add'>+# netconsole and send MAX_WRITES messages</div><div class='add'>+ITERATIONS: int = 20</div><div class='add'>+# Number of writes to /dev/kmsg per iteration</div><div class='add'>+MAX_WRITES: int = 40</div><div class='add'>+# MAPS contains the information coming from bpftrace it will have only one</div><div class='add'>+# key: "hits", which tells the number of times netpoll_poll_dev() was called</div><div class='add'>+MAPS: dict[str, int] = {}</div><div class='add'>+# Thread to run bpftrace in parallel</div><div class='add'>+BPF_THREAD: Optional[threading.Thread] = None</div><div class='add'>+# Time bpftrace will be running in parallel.</div><div class='add'>+BPFTRACE_TIMEOUT: int = 10</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def ethtool_get_ringsize(interface_name: str) -&gt; tuple[int, int]:</div><div class='add'>+    """</div><div class='add'>+    Read the ringsize using ethtool. This will be used to restore it after the test</div><div class='add'>+    """</div><div class='add'>+    try:</div><div class='add'>+        ethtool_result = ethtool(f"-g {interface_name}", json=True)[0]</div><div class='add'>+        rxs = ethtool_result["rx"]</div><div class='add'>+        txs = ethtool_result["tx"]</div><div class='add'>+    except (KeyError, IndexError) as exception:</div><div class='add'>+        raise KsftSkipEx(</div><div class='add'>+            f"Failed to read RX/TX ringsize: {exception}. Not going to mess with them."</div><div class='add'>+        ) from exception</div><div class='add'>+</div><div class='add'>+    return rxs, txs</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def ethtool_set_ringsize(interface_name: str, ring_size: tuple[int, int]) -&gt; bool:</div><div class='add'>+    """Try to the number of RX and TX ringsize."""</div><div class='add'>+    rxs = ring_size[0]</div><div class='add'>+    txs = ring_size[1]</div><div class='add'>+</div><div class='add'>+    logging.debug("Setting ring size to %d/%d", rxs, txs)</div><div class='add'>+    try:</div><div class='add'>+        ethtool(f"-G {interface_name} rx {rxs} tx {txs}")</div><div class='add'>+    except CmdExitFailure:</div><div class='add'>+        # This might fail on real device, retry with a higher value,</div><div class='add'>+        # worst case, keep it as it is.</div><div class='add'>+        return False</div><div class='add'>+</div><div class='add'>+    return True</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def ethtool_get_queues_cnt(interface_name: str) -&gt; tuple[int, int, int]:</div><div class='add'>+    """Read the number of RX, TX and combined queues using ethtool"""</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        ethtool_result = ethtool(f"-l {interface_name}", json=True)[0]</div><div class='add'>+        rxq = ethtool_result.get("rx", -1)</div><div class='add'>+        txq = ethtool_result.get("tx", -1)</div><div class='add'>+        combined = ethtool_result.get("combined", -1)</div><div class='add'>+</div><div class='add'>+    except IndexError as exception:</div><div class='add'>+        raise KsftSkipEx(</div><div class='add'>+            f"Failed to read queues numbers: {exception}. Not going to mess with them."</div><div class='add'>+        ) from exception</div><div class='add'>+</div><div class='add'>+    return rxq, txq, combined</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def ethtool_set_queues_cnt(interface_name: str, queues: tuple[int, int, int]) -&gt; None:</div><div class='add'>+    """Set the number of RX, TX and combined queues using ethtool"""</div><div class='add'>+    rxq, txq, combined = queues</div><div class='add'>+</div><div class='add'>+    cmdline = f"-L {interface_name}"</div><div class='add'>+</div><div class='add'>+    if rxq != -1:</div><div class='add'>+        cmdline += f" rx {rxq}"</div><div class='add'>+    if txq != -1:</div><div class='add'>+        cmdline += f" tx {txq}"</div><div class='add'>+    if combined != -1:</div><div class='add'>+        cmdline += f" combined {combined}"</div><div class='add'>+</div><div class='add'>+    logging.debug("calling: ethtool %s", cmdline)</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        ethtool(cmdline)</div><div class='add'>+    except CmdExitFailure as exception:</div><div class='add'>+        raise KsftSkipEx(</div><div class='add'>+            f"Failed to configure RX/TX queues: {exception}. Ethtool not available?"</div><div class='add'>+        ) from exception</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def netcons_generate_random_target_name() -&gt; str:</div><div class='add'>+    """Generate a random target name starting with 'netcons'"""</div><div class='add'>+    random_suffix = "".join(random.choices(string.ascii_lowercase + string.digits, k=8))</div><div class='add'>+    return f"netcons_{random_suffix}"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def netcons_create_target(</div><div class='add'>+    config_data: dict[str, str],</div><div class='add'>+    target_name: str,</div><div class='add'>+) -&gt; None:</div><div class='add'>+    """Create a netconsole dynamic target against the interfaces"""</div><div class='add'>+    logging.debug("Using netconsole name: %s", target_name)</div><div class='add'>+    try:</div><div class='add'>+        os.makedirs(f"{NETCONSOLE_CONFIGFS_PATH}/{target_name}", exist_ok=True)</div><div class='add'>+        logging.debug(</div><div class='add'>+            "Created target directory: %s/%s", NETCONSOLE_CONFIGFS_PATH, target_name</div><div class='add'>+        )</div><div class='add'>+    except OSError as exception:</div><div class='add'>+        if exception.errno != errno.EEXIST:</div><div class='add'>+            raise KsftFailEx(</div><div class='add'>+                f"Failed to create netconsole target directory: {exception}"</div><div class='add'>+            ) from exception</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        for key, value in config_data.items():</div><div class='add'>+            path = f"{NETCONSOLE_CONFIGFS_PATH}/{target_name}/{key}"</div><div class='add'>+            logging.debug("Writing %s to %s", key, path)</div><div class='add'>+            with open(path, "w", encoding="utf-8") as file:</div><div class='add'>+                # Always convert to string to write to file</div><div class='add'>+                file.write(str(value))</div><div class='add'>+</div><div class='add'>+        # Read all configuration values for debugging purposes</div><div class='add'>+        for debug_key in config_data.keys():</div><div class='add'>+            with open(</div><div class='add'>+                f"{NETCONSOLE_CONFIGFS_PATH}/{target_name}/{debug_key}",</div><div class='add'>+                "r",</div><div class='add'>+                encoding="utf-8",</div><div class='add'>+            ) as file:</div><div class='add'>+                content = file.read()</div><div class='add'>+                logging.debug(</div><div class='add'>+                    "%s/%s/%s : %s",</div><div class='add'>+                    NETCONSOLE_CONFIGFS_PATH,</div><div class='add'>+                    target_name,</div><div class='add'>+                    debug_key,</div><div class='add'>+                    content.strip(),</div><div class='add'>+                )</div><div class='add'>+</div><div class='add'>+    except Exception as exception:</div><div class='add'>+        raise KsftFailEx(</div><div class='add'>+            f"Failed to configure netconsole target: {exception}"</div><div class='add'>+        ) from exception</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def netcons_configure_target(</div><div class='add'>+    cfg: NetDrvEpEnv, interface_name: str, target_name: str</div><div class='add'>+) -&gt; None:</div><div class='add'>+    """Configure netconsole on the interface with the given target name"""</div><div class='add'>+    config_data = {</div><div class='add'>+        "extended": "1",</div><div class='add'>+        "dev_name": interface_name,</div><div class='add'>+        "local_port": NETCONS_LOCAL_PORT,</div><div class='add'>+        "remote_port": NETCONS_REMOTE_PORT,</div><div class='add'>+        "local_ip": cfg.addr,</div><div class='add'>+        "remote_ip": cfg.remote_addr,</div><div class='add'>+        "remote_mac": "00:00:00:00:00:00",  # Not important for this test</div><div class='add'>+        "enabled": "1",</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    netcons_create_target(config_data, target_name)</div><div class='add'>+    logging.debug(</div><div class='add'>+        "Created netconsole target: %s on interface %s", target_name, interface_name</div><div class='add'>+    )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def netcons_delete_target(name: str) -&gt; None:</div><div class='add'>+    """Delete a netconsole dynamic target"""</div><div class='add'>+    target_path = f"{NETCONSOLE_CONFIGFS_PATH}/{name}"</div><div class='add'>+    try:</div><div class='add'>+        if os.path.exists(target_path):</div><div class='add'>+            os.rmdir(target_path)</div><div class='add'>+    except OSError as exception:</div><div class='add'>+        raise KsftFailEx(</div><div class='add'>+            f"Failed to delete netconsole target: {exception}"</div><div class='add'>+        ) from exception</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def netcons_load_module() -&gt; None:</div><div class='add'>+    """Try to load the netconsole module"""</div><div class='add'>+    os.system("modprobe netconsole")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def bpftrace_call() -&gt; None:</div><div class='add'>+    """Call bpftrace to find how many times netpoll_poll_dev() is called.</div><div class='add'>+    Output is saved in the global variable `maps`"""</div><div class='add'>+</div><div class='add'>+    # This is going to update the global variable, that will be seen by the</div><div class='add'>+    # main function</div><div class='add'>+    global MAPS  # pylint: disable=W0603</div><div class='add'>+</div><div class='add'>+    # This will be passed to bpftrace as in bpftrace -e "expr"</div><div class='add'>+    expr = "kprobe:netpoll_poll_dev { @hits = count(); }"</div><div class='add'>+</div><div class='add'>+    MAPS = bpftrace(expr, timeout=BPFTRACE_TIMEOUT, json=True)</div><div class='add'>+    logging.debug("BPFtrace output: %s", MAPS)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def bpftrace_start():</div><div class='add'>+    """Start a thread to call `call_bpf` in a parallel thread"""</div><div class='add'>+    global BPF_THREAD  # pylint: disable=W0603</div><div class='add'>+</div><div class='add'>+    BPF_THREAD = threading.Thread(target=bpftrace_call)</div><div class='add'>+    BPF_THREAD.start()</div><div class='add'>+    if not BPF_THREAD.is_alive():</div><div class='add'>+        raise KsftSkipEx("BPFtrace thread is not alive. Skipping test")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def bpftrace_stop() -&gt; None:</div><div class='add'>+    """Stop the bpftrace thread"""</div><div class='add'>+    if BPF_THREAD:</div><div class='add'>+        BPF_THREAD.join()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def bpftrace_any_hit(join: bool) -&gt; bool:</div><div class='add'>+    """Check if netpoll_poll_dev() was called by checking the global variable `maps`"""</div><div class='add'>+    if not BPF_THREAD:</div><div class='add'>+        raise KsftFailEx("BPFtrace didn't start")</div><div class='add'>+</div><div class='add'>+    if BPF_THREAD.is_alive():</div><div class='add'>+        if join:</div><div class='add'>+            # Wait for bpftrace to finish</div><div class='add'>+            BPF_THREAD.join()</div><div class='add'>+        else:</div><div class='add'>+            # bpftrace is still running, so, we will not check the result yet</div><div class='add'>+            return False</div><div class='add'>+</div><div class='add'>+    logging.debug("MAPS coming from bpftrace = %s", MAPS)</div><div class='add'>+    if "hits" not in MAPS.keys():</div><div class='add'>+        raise KsftFailEx(f"bpftrace failed to run!?: {MAPS}")</div><div class='add'>+</div><div class='add'>+    logging.debug("Got a total of %d hits", MAPS["hits"])</div><div class='add'>+    return MAPS["hits"] &gt; 0</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def do_netpoll_flush_monitored(cfg: NetDrvEpEnv, ifname: str, target_name: str) -&gt; None:</div><div class='add'>+    """Print messages to the console, trying to trigger a netpoll poll"""</div><div class='add'>+    # Start bpftrace in parallel, so, it is watching</div><div class='add'>+    # netpoll_poll_dev() while we are sending netconsole messages</div><div class='add'>+    bpftrace_start()</div><div class='add'>+    defer(bpftrace_stop)</div><div class='add'>+</div><div class='add'>+    do_netpoll_flush(cfg, ifname, target_name)</div><div class='add'>+</div><div class='add'>+    if bpftrace_any_hit(join=True):</div><div class='add'>+        ksft_pr("netpoll_poll_dev() was called. Success")</div><div class='add'>+        return</div><div class='add'>+</div><div class='add'>+    raise KsftXfailEx("netpoll_poll_dev() was not called during the test...")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def do_netpoll_flush(cfg: NetDrvEpEnv, ifname: str, target_name: str) -&gt; None:</div><div class='add'>+    """Print messages to the console, trying to trigger a netpoll poll"""</div><div class='add'>+    netcons_configure_target(cfg, ifname, target_name)</div><div class='add'>+    retry = 0</div><div class='add'>+</div><div class='add'>+    for i in range(int(ITERATIONS)):</div><div class='add'>+        if not BPF_THREAD.is_alive() or bpftrace_any_hit(join=False):</div><div class='add'>+            # bpftrace is done, stop sending messages</div><div class='add'>+            break</div><div class='add'>+</div><div class='add'>+        msg = f"netcons test #{i}"</div><div class='add'>+        with open("/dev/kmsg", "w", encoding="utf-8") as kmsg:</div><div class='add'>+            for j in range(MAX_WRITES):</div><div class='add'>+                try:</div><div class='add'>+                    kmsg.write(f"{msg}-{j}\n")</div><div class='add'>+                except OSError as exception:</div><div class='add'>+                    # in some cases, kmsg can be busy, so, we will retry</div><div class='add'>+                    time.sleep(1)</div><div class='add'>+                    retry += 1</div><div class='add'>+                    if retry &lt; 5:</div><div class='add'>+                        logging.info("Failed to write to kmsg. Retrying")</div><div class='add'>+                        # Just retry a few times</div><div class='add'>+                        continue</div><div class='add'>+                    raise KsftFailEx(</div><div class='add'>+                        f"Failed to write to kmsg: {exception}"</div><div class='add'>+                    ) from exception</div><div class='add'>+</div><div class='add'>+        netcons_delete_target(target_name)</div><div class='add'>+        netcons_configure_target(cfg, ifname, target_name)</div><div class='add'>+        # If we sleep here, we will have a better chance of triggering</div><div class='add'>+        # This number is based on a few tests I ran while developing this test</div><div class='add'>+        time.sleep(0.4)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def configure_network(ifname: str) -&gt; None:</div><div class='add'>+    """Configure ring size and queue numbers"""</div><div class='add'>+</div><div class='add'>+    # Set defined queues to 1 to force congestion</div><div class='add'>+    prev_queues = ethtool_get_queues_cnt(ifname)</div><div class='add'>+    logging.debug("RX/TX/combined queues: %s", prev_queues)</div><div class='add'>+    # Only set the queues to 1 if they exists in the device. I.e, they are &gt; 0</div><div class='add'>+    ethtool_set_queues_cnt(ifname, tuple(1 if x &gt; 0 else x for x in prev_queues))</div><div class='add'>+    defer(ethtool_set_queues_cnt, ifname, prev_queues)</div><div class='add'>+</div><div class='add'>+    # Try to set the ring size to some low value.</div><div class='add'>+    # Do not fail if the hardware do not accepted desired values</div><div class='add'>+    prev_ring_size = ethtool_get_ringsize(ifname)</div><div class='add'>+    for size in [(1, 1), (128, 128), (256, 256)]:</div><div class='add'>+        if ethtool_set_ringsize(ifname, size):</div><div class='add'>+            # hardware accepted the desired ringsize</div><div class='add'>+            logging.debug("Set RX/TX ringsize to: %s from %s", size, prev_ring_size)</div><div class='add'>+            break</div><div class='add'>+    defer(ethtool_set_ringsize, ifname, prev_ring_size)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_netpoll(cfg: NetDrvEpEnv) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Test netpoll by sending traffic to the interface and then sending</div><div class='add'>+    netconsole messages to trigger a poll</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    ifname = cfg.ifname</div><div class='add'>+    configure_network(ifname)</div><div class='add'>+    target_name = netcons_generate_random_target_name()</div><div class='add'>+    traffic = None</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        traffic = GenerateTraffic(cfg)</div><div class='add'>+        do_netpoll_flush_monitored(cfg, ifname, target_name)</div><div class='add'>+    finally:</div><div class='add'>+        if traffic:</div><div class='add'>+            traffic.stop()</div><div class='add'>+</div><div class='add'>+        # Revert RX/TX queues</div><div class='add'>+        netcons_delete_target(target_name)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_check_dependencies() -&gt; None:</div><div class='add'>+    """Check if the dependencies are met"""</div><div class='add'>+    if not os.path.exists(NETCONSOLE_CONFIGFS_PATH):</div><div class='add'>+        raise KsftSkipEx(</div><div class='add'>+            f"Directory {NETCONSOLE_CONFIGFS_PATH} does not exist. CONFIG_NETCONSOLE_DYNAMIC might not be set."  # pylint: disable=C0301</div><div class='add'>+        )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    """Main function to run the test"""</div><div class='add'>+    netcons_load_module()</div><div class='add'>+    test_check_dependencies()</div><div class='add'>+    with NetDrvEpEnv(__file__) as cfg:</div><div class='add'>+        ksft_run(</div><div class='add'>+            [test_netpoll],</div><div class='add'>+            args=(cfg,),</div><div class='add'>+        )</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/ocelot/psfp.sh b/tools/testing/selftests/drivers/net/ocelot/psfp.sh<br/>index bed748dde4b0..8972f42dfe03 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/ocelot/psfp.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/ocelot/psfp.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/ocelot/psfp.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/ocelot/psfp.sh</a></div><div class='hunk'>@@ -266,18 +266,14 @@ run_test()</div><div class='ctx'> 		"${base_time}" \</div><div class='ctx'> 		"${CYCLE_TIME_NS}" \</div><div class='ctx'> 		"${SHIFT_TIME_NS}" \</div><div class='add'>+		"${GATE_DURATION_NS}" \</div><div class='ctx'> 		"${NUM_PKTS}" \</div><div class='ctx'> 		"${STREAM_VID}" \</div><div class='ctx'> 		"${STREAM_PRIO}" \</div><div class='ctx'> 		"" \</div><div class='ctx'> 		"${isochron_dat}"</div><div class='ctx'> </div><div class='del'>-	# Count all received packets by looking at the non-zero RX timestamps</div><div class='del'>-	received=$(isochron report \</div><div class='del'>-		--input-file "${isochron_dat}" \</div><div class='del'>-		--printf-format "%u\n" --printf-args "R" | \</div><div class='del'>-		grep -w -v '0' | wc -l)</div><div class='del'>-</div><div class='add'>+	received=$(isochron_report_num_received "${isochron_dat}")</div><div class='ctx'> 	if [ "${received}" = "${expected}" ]; then</div><div class='ctx'> 		RET=0</div><div class='ctx'> 	else</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/ping.py b/tools/testing/selftests/drivers/net/ping.py<br/>index eb83e7b48797..da3623c5e8a9 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/ping.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/ping.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/ping.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/ping.py</a></div><div class='hunk'>@@ -1,49 +1,239 @@</div><div class='ctx'> #!/usr/bin/env python3</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+import os</div><div class='add'>+import random, string, time</div><div class='ctx'> from lib.py import ksft_run, ksft_exit</div><div class='del'>-from lib.py import ksft_eq</div><div class='del'>-from lib.py import NetDrvEpEnv</div><div class='add'>+from lib.py import ksft_eq, KsftSkipEx, KsftFailEx</div><div class='add'>+from lib.py import EthtoolFamily, NetDrvEpEnv</div><div class='ctx'> from lib.py import bkg, cmd, wait_port_listen, rand_port</div><div class='add'>+from lib.py import defer, ethtool, ip</div><div class='ctx'> </div><div class='add'>+no_sleep=False</div><div class='ctx'> </div><div class='del'>-def test_v4(cfg) -&gt; None:</div><div class='del'>-    cfg.require_v4()</div><div class='add'>+def _test_v4(cfg) -&gt; None:</div><div class='add'>+    if not cfg.addr_v["4"]:</div><div class='add'>+        return</div><div class='ctx'> </div><div class='del'>-    cmd(f"ping -c 1 -W0.5 {cfg.remote_v4}")</div><div class='del'>-    cmd(f"ping -c 1 -W0.5 {cfg.v4}", host=cfg.remote)</div><div class='add'>+    cmd("ping -c 1 -W0.5 " + cfg.remote_addr_v["4"])</div><div class='add'>+    cmd("ping -c 1 -W0.5 " + cfg.addr_v["4"], host=cfg.remote)</div><div class='add'>+    cmd("ping -s 65000 -c 1 -W0.5 " + cfg.remote_addr_v["4"])</div><div class='add'>+    cmd("ping -s 65000 -c 1 -W0.5 " + cfg.addr_v["4"], host=cfg.remote)</div><div class='ctx'> </div><div class='add'>+def _test_v6(cfg) -&gt; None:</div><div class='add'>+    if not cfg.addr_v["6"]:</div><div class='add'>+        return</div><div class='ctx'> </div><div class='del'>-def test_v6(cfg) -&gt; None:</div><div class='del'>-    cfg.require_v6()</div><div class='add'>+    cmd("ping -c 1 -W5 " + cfg.remote_addr_v["6"])</div><div class='add'>+    cmd("ping -c 1 -W5 " + cfg.addr_v["6"], host=cfg.remote)</div><div class='add'>+    cmd("ping -s 65000 -c 1 -W0.5 " + cfg.remote_addr_v["6"])</div><div class='add'>+    cmd("ping -s 65000 -c 1 -W0.5 " + cfg.addr_v["6"], host=cfg.remote)</div><div class='ctx'> </div><div class='del'>-    cmd(f"ping -c 1 -W0.5 {cfg.remote_v6}")</div><div class='del'>-    cmd(f"ping -c 1 -W0.5 {cfg.v6}", host=cfg.remote)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-def test_tcp(cfg) -&gt; None:</div><div class='del'>-    cfg.require_cmd("socat", remote=True)</div><div class='add'>+def _test_tcp(cfg) -&gt; None:</div><div class='add'>+    cfg.require_cmd("socat", local=False, remote=True)</div><div class='ctx'> </div><div class='ctx'>     port = rand_port()</div><div class='ctx'>     listen_cmd = f"socat -{cfg.addr_ipver} -t 2 -u TCP-LISTEN:{port},reuseport STDOUT"</div><div class='ctx'> </div><div class='add'>+    test_string = ''.join(random.choice(string.ascii_lowercase) for _ in range(65536))</div><div class='ctx'>     with bkg(listen_cmd, exit_wait=True) as nc:</div><div class='ctx'>         wait_port_listen(port)</div><div class='ctx'> </div><div class='del'>-        cmd(f"echo ping | socat -t 2 -u STDIN TCP:{cfg.baddr}:{port}",</div><div class='add'>+        cmd(f"echo {test_string} | socat -t 2 -u STDIN TCP:{cfg.baddr}:{port}",</div><div class='ctx'>             shell=True, host=cfg.remote)</div><div class='del'>-    ksft_eq(nc.stdout.strip(), "ping")</div><div class='add'>+    ksft_eq(nc.stdout.strip(), test_string)</div><div class='ctx'> </div><div class='add'>+    test_string = ''.join(random.choice(string.ascii_lowercase) for _ in range(65536))</div><div class='ctx'>     with bkg(listen_cmd, host=cfg.remote, exit_wait=True) as nc:</div><div class='ctx'>         wait_port_listen(port, host=cfg.remote)</div><div class='ctx'> </div><div class='del'>-        cmd(f"echo ping | socat -t 2 -u STDIN TCP:{cfg.remote_baddr}:{port}", shell=True)</div><div class='del'>-    ksft_eq(nc.stdout.strip(), "ping")</div><div class='del'>-</div><div class='add'>+        cmd(f"echo {test_string} | socat -t 2 -u STDIN TCP:{cfg.remote_baddr}:{port}", shell=True)</div><div class='add'>+    ksft_eq(nc.stdout.strip(), test_string)</div><div class='add'>+</div><div class='add'>+def _schedule_checksum_reset(cfg, netnl) -&gt; None:</div><div class='add'>+    features = ethtool(f"-k {cfg.ifname}", json=True)</div><div class='add'>+    setting = ""</div><div class='add'>+    for side in ["tx", "rx"]:</div><div class='add'>+        f = features[0][side + "-checksumming"]</div><div class='add'>+        if not f["fixed"]:</div><div class='add'>+            setting += " " + side</div><div class='add'>+            setting += " " + ("on" if f["requested"] or f["active"] else "off")</div><div class='add'>+    defer(ethtool, f" -K {cfg.ifname} " + setting)</div><div class='add'>+</div><div class='add'>+def _set_offload_checksum(cfg, netnl, on) -&gt; None:</div><div class='add'>+    try:</div><div class='add'>+        ethtool(f" -K {cfg.ifname} rx {on} tx {on} ")</div><div class='add'>+    except:</div><div class='add'>+        return</div><div class='add'>+</div><div class='add'>+def _set_xdp_generic_sb_on(cfg) -&gt; None:</div><div class='add'>+    prog = cfg.net_lib_dir / "xdp_dummy.bpf.o"</div><div class='add'>+    cmd(f"ip link set dev {cfg.remote_ifname} mtu 1500", shell=True, host=cfg.remote)</div><div class='add'>+    cmd(f"ip link set dev {cfg.ifname} mtu 1500 xdpgeneric obj {prog} sec xdp", shell=True)</div><div class='add'>+    defer(cmd, f"ip link set dev {cfg.ifname} xdpgeneric off")</div><div class='add'>+</div><div class='add'>+    if no_sleep != True:</div><div class='add'>+        time.sleep(10)</div><div class='add'>+</div><div class='add'>+def _set_xdp_generic_mb_on(cfg) -&gt; None:</div><div class='add'>+    prog = cfg.net_lib_dir / "xdp_dummy.bpf.o"</div><div class='add'>+    cmd(f"ip link set dev {cfg.remote_ifname} mtu 9000", shell=True, host=cfg.remote)</div><div class='add'>+    defer(ip, f"link set dev {cfg.remote_ifname} mtu 1500", host=cfg.remote)</div><div class='add'>+    ip("link set dev %s mtu 9000 xdpgeneric obj %s sec xdp.frags" % (cfg.ifname, prog))</div><div class='add'>+    defer(ip, f"link set dev {cfg.ifname} mtu 1500 xdpgeneric off")</div><div class='add'>+</div><div class='add'>+    if no_sleep != True:</div><div class='add'>+        time.sleep(10)</div><div class='add'>+</div><div class='add'>+def _set_xdp_native_sb_on(cfg) -&gt; None:</div><div class='add'>+    prog = cfg.net_lib_dir / "xdp_dummy.bpf.o"</div><div class='add'>+    cmd(f"ip link set dev {cfg.remote_ifname} mtu 1500", shell=True, host=cfg.remote)</div><div class='add'>+    cmd(f"ip -j link set dev {cfg.ifname} mtu 1500 xdp obj {prog} sec xdp", shell=True)</div><div class='add'>+    defer(ip, f"link set dev {cfg.ifname} mtu 1500 xdp off")</div><div class='add'>+    xdp_info = ip("-d link show %s" % (cfg.ifname), json=True)[0]</div><div class='add'>+    if xdp_info['xdp']['mode'] != 1:</div><div class='add'>+        """</div><div class='add'>+        If the interface doesn't support native-mode, it falls back to generic mode.</div><div class='add'>+        The mode value 1 is native and 2 is generic.</div><div class='add'>+        So it raises an exception if mode is not 1(native mode).</div><div class='add'>+        """</div><div class='add'>+        raise KsftSkipEx('device does not support native-XDP')</div><div class='add'>+</div><div class='add'>+    if no_sleep != True:</div><div class='add'>+        time.sleep(10)</div><div class='add'>+</div><div class='add'>+def _set_xdp_native_mb_on(cfg) -&gt; None:</div><div class='add'>+    prog = cfg.net_lib_dir / "xdp_dummy.bpf.o"</div><div class='add'>+    cmd(f"ip link set dev {cfg.remote_ifname} mtu 9000", shell=True, host=cfg.remote)</div><div class='add'>+    defer(ip, f"link set dev {cfg.remote_ifname} mtu 1500", host=cfg.remote)</div><div class='add'>+    try:</div><div class='add'>+        cmd(f"ip link set dev {cfg.ifname} mtu 9000 xdp obj {prog} sec xdp.frags", shell=True)</div><div class='add'>+        defer(ip, f"link set dev {cfg.ifname} mtu 1500 xdp off")</div><div class='add'>+    except Exception as e:</div><div class='add'>+        raise KsftSkipEx('device does not support native-multi-buffer XDP')</div><div class='add'>+</div><div class='add'>+    if no_sleep != True:</div><div class='add'>+        time.sleep(10)</div><div class='add'>+</div><div class='add'>+def _set_xdp_offload_on(cfg) -&gt; None:</div><div class='add'>+    prog = cfg.net_lib_dir / "xdp_dummy.bpf.o"</div><div class='add'>+    cmd(f"ip link set dev {cfg.ifname} mtu 1500", shell=True)</div><div class='add'>+    try:</div><div class='add'>+        cmd(f"ip link set dev {cfg.ifname} xdpoffload obj {prog} sec xdp", shell=True)</div><div class='add'>+    except Exception as e:</div><div class='add'>+        raise KsftSkipEx('device does not support offloaded XDP')</div><div class='add'>+    defer(ip, f"link set dev {cfg.ifname} xdpoffload off")</div><div class='add'>+    cmd(f"ip link set dev {cfg.remote_ifname} mtu 1500", shell=True, host=cfg.remote)</div><div class='add'>+</div><div class='add'>+    if no_sleep != True:</div><div class='add'>+        time.sleep(10)</div><div class='add'>+</div><div class='add'>+def get_interface_info(cfg) -&gt; None:</div><div class='add'>+    global no_sleep</div><div class='add'>+</div><div class='add'>+    if cfg.remote_ifname == "":</div><div class='add'>+        raise KsftFailEx('Can not get remote interface')</div><div class='add'>+    local_info = ip("-d link show %s" % (cfg.ifname), json=True)[0]</div><div class='add'>+    if 'parentbus' in local_info and local_info['parentbus'] == "netdevsim":</div><div class='add'>+        no_sleep=True</div><div class='add'>+    if 'linkinfo' in local_info and local_info['linkinfo']['info_kind'] == "veth":</div><div class='add'>+        no_sleep=True</div><div class='add'>+</div><div class='add'>+def set_interface_init(cfg) -&gt; None:</div><div class='add'>+    cmd(f"ip link set dev {cfg.ifname} mtu 1500", shell=True)</div><div class='add'>+    cmd(f"ip link set dev {cfg.ifname} xdp off ", shell=True)</div><div class='add'>+    cmd(f"ip link set dev {cfg.ifname} xdpgeneric off ", shell=True)</div><div class='add'>+    cmd(f"ip link set dev {cfg.ifname} xdpoffload off", shell=True)</div><div class='add'>+    cmd(f"ip link set dev {cfg.remote_ifname} mtu 1500", shell=True, host=cfg.remote)</div><div class='add'>+</div><div class='add'>+def test_default_v4(cfg, netnl) -&gt; None:</div><div class='add'>+    cfg.require_ipver("4")</div><div class='add'>+</div><div class='add'>+    _schedule_checksum_reset(cfg, netnl)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "off")</div><div class='add'>+    _test_v4(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "on")</div><div class='add'>+    _test_v4(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+</div><div class='add'>+def test_default_v6(cfg, netnl) -&gt; None:</div><div class='add'>+    cfg.require_ipver("6")</div><div class='add'>+</div><div class='add'>+    _schedule_checksum_reset(cfg, netnl)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "off")</div><div class='add'>+    _test_v6(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "on")</div><div class='add'>+    _test_v6(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+</div><div class='add'>+def test_xdp_generic_sb(cfg, netnl) -&gt; None:</div><div class='add'>+    _schedule_checksum_reset(cfg, netnl)</div><div class='add'>+    _set_xdp_generic_sb_on(cfg)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "off")</div><div class='add'>+    _test_v4(cfg)</div><div class='add'>+    _test_v6(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "on")</div><div class='add'>+    _test_v4(cfg)</div><div class='add'>+    _test_v6(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+</div><div class='add'>+def test_xdp_generic_mb(cfg, netnl) -&gt; None:</div><div class='add'>+    _schedule_checksum_reset(cfg, netnl)</div><div class='add'>+    _set_xdp_generic_mb_on(cfg)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "off")</div><div class='add'>+    _test_v4(cfg)</div><div class='add'>+    _test_v6(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "on")</div><div class='add'>+    _test_v4(cfg)</div><div class='add'>+    _test_v6(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+</div><div class='add'>+def test_xdp_native_sb(cfg, netnl) -&gt; None:</div><div class='add'>+    _schedule_checksum_reset(cfg, netnl)</div><div class='add'>+    _set_xdp_native_sb_on(cfg)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "off")</div><div class='add'>+    _test_v4(cfg)</div><div class='add'>+    _test_v6(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "on")</div><div class='add'>+    _test_v4(cfg)</div><div class='add'>+    _test_v6(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+</div><div class='add'>+def test_xdp_native_mb(cfg, netnl) -&gt; None:</div><div class='add'>+    _schedule_checksum_reset(cfg, netnl)</div><div class='add'>+    _set_xdp_native_mb_on(cfg)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "off")</div><div class='add'>+    _test_v4(cfg)</div><div class='add'>+    _test_v6(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+    _set_offload_checksum(cfg, netnl, "on")</div><div class='add'>+    _test_v4(cfg)</div><div class='add'>+    _test_v6(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='add'>+</div><div class='add'>+def test_xdp_offload(cfg, netnl) -&gt; None:</div><div class='add'>+    _set_xdp_offload_on(cfg)</div><div class='add'>+    _test_v4(cfg)</div><div class='add'>+    _test_v6(cfg)</div><div class='add'>+    _test_tcp(cfg)</div><div class='ctx'> </div><div class='ctx'> def main() -&gt; None:</div><div class='ctx'>     with NetDrvEpEnv(__file__) as cfg:</div><div class='del'>-        ksft_run(globs=globals(), case_pfx={"test_"}, args=(cfg, ))</div><div class='add'>+        get_interface_info(cfg)</div><div class='add'>+        set_interface_init(cfg)</div><div class='add'>+        ksft_run([test_default_v4,</div><div class='add'>+                  test_default_v6,</div><div class='add'>+                  test_xdp_generic_sb,</div><div class='add'>+                  test_xdp_generic_mb,</div><div class='add'>+                  test_xdp_native_sb,</div><div class='add'>+                  test_xdp_native_mb,</div><div class='add'>+                  test_xdp_offload],</div><div class='add'>+                 args=(cfg, EthtoolFamily()))</div><div class='ctx'>     ksft_exit()</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/psp.py b/tools/testing/selftests/drivers/net/psp.py<br/>new file mode 100755<br/>index 000000000000..06559ef49b9a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/psp.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/psp.py</a></div><div class='hunk'>@@ -0,0 +1,640 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+"""Test suite for PSP capable drivers."""</div><div class='add'>+</div><div class='add'>+import errno</div><div class='add'>+import fcntl</div><div class='add'>+import socket</div><div class='add'>+import struct</div><div class='add'>+import termios</div><div class='add'>+import time</div><div class='add'>+</div><div class='add'>+from lib.py import defer</div><div class='add'>+from lib.py import ksft_run, ksft_exit, ksft_pr</div><div class='add'>+from lib.py import ksft_true, ksft_eq, ksft_ne, ksft_gt, ksft_raises</div><div class='add'>+from lib.py import ksft_not_none</div><div class='add'>+from lib.py import KsftSkipEx</div><div class='add'>+from lib.py import NetDrvEpEnv, PSPFamily, NlError</div><div class='add'>+from lib.py import bkg, rand_port, wait_port_listen</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _get_outq(s):</div><div class='add'>+    one = b'\0' * 4</div><div class='add'>+    outq = fcntl.ioctl(s.fileno(), termios.TIOCOUTQ, one)</div><div class='add'>+    return struct.unpack("I", outq)[0]</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _send_with_ack(cfg, msg):</div><div class='add'>+    cfg.comm_sock.send(msg)</div><div class='add'>+    response = cfg.comm_sock.recv(4)</div><div class='add'>+    if response != b'ack\0':</div><div class='add'>+        raise RuntimeError("Unexpected server response", response)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _remote_read_len(cfg):</div><div class='add'>+    cfg.comm_sock.send(b'read len\0')</div><div class='add'>+    return int(cfg.comm_sock.recv(1024)[:-1].decode('utf-8'))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _make_clr_conn(cfg, ipver=None):</div><div class='add'>+    _send_with_ack(cfg, b'conn clr\0')</div><div class='add'>+    remote_addr = cfg.remote_addr_v[ipver] if ipver else cfg.remote_addr</div><div class='add'>+    s = socket.create_connection((remote_addr, cfg.comm_port), )</div><div class='add'>+    return s</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _make_psp_conn(cfg, version=0, ipver=None):</div><div class='add'>+    _send_with_ack(cfg, b'conn psp\0' + struct.pack('BB', version, version))</div><div class='add'>+    remote_addr = cfg.remote_addr_v[ipver] if ipver else cfg.remote_addr</div><div class='add'>+    s = socket.create_connection((remote_addr, cfg.comm_port), )</div><div class='add'>+    return s</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _close_conn(cfg, s):</div><div class='add'>+    _send_with_ack(cfg, b'data close\0')</div><div class='add'>+    s.close()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _close_psp_conn(cfg, s):</div><div class='add'>+    _close_conn(cfg, s)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _spi_xchg(s, rx):</div><div class='add'>+    s.send(struct.pack('I', rx['spi']) + rx['key'])</div><div class='add'>+    tx = s.recv(4 + len(rx['key']))</div><div class='add'>+    return {</div><div class='add'>+        'spi': struct.unpack('I', tx[:4])[0],</div><div class='add'>+        'key': tx[4:]</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _send_careful(cfg, s, rounds):</div><div class='add'>+    data = b'0123456789' * 200</div><div class='add'>+    for i in range(rounds):</div><div class='add'>+        n = 0</div><div class='add'>+        for _ in range(10): # allow 10 retries</div><div class='add'>+            try:</div><div class='add'>+                n += s.send(data[n:], socket.MSG_DONTWAIT)</div><div class='add'>+                if n == len(data):</div><div class='add'>+                    break</div><div class='add'>+            except BlockingIOError:</div><div class='add'>+                time.sleep(0.05)</div><div class='add'>+        else:</div><div class='add'>+            rlen = _remote_read_len(cfg)</div><div class='add'>+            outq = _get_outq(s)</div><div class='add'>+            report = f'sent: {i * len(data) + n} remote len: {rlen} outq: {outq}'</div><div class='add'>+            raise RuntimeError(report)</div><div class='add'>+</div><div class='add'>+    return len(data) * rounds</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _check_data_rx(cfg, exp_len):</div><div class='add'>+    read_len = -1</div><div class='add'>+    for _ in range(30):</div><div class='add'>+        cfg.comm_sock.send(b'read len\0')</div><div class='add'>+        read_len = int(cfg.comm_sock.recv(1024)[:-1].decode('utf-8'))</div><div class='add'>+        if read_len == exp_len:</div><div class='add'>+            break</div><div class='add'>+        time.sleep(0.01)</div><div class='add'>+    ksft_eq(read_len, exp_len)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _check_data_outq(s, exp_len, force_wait=False):</div><div class='add'>+    outq = 0</div><div class='add'>+    for _ in range(10):</div><div class='add'>+        outq = _get_outq(s)</div><div class='add'>+        if not force_wait and outq == exp_len:</div><div class='add'>+            break</div><div class='add'>+        time.sleep(0.01)</div><div class='add'>+    ksft_eq(outq, exp_len)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _get_stat(cfg, key):</div><div class='add'>+    return cfg.pspnl.get_stats({'dev-id': cfg.psp_dev_id})[key]</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Test case boiler plate</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+def _init_psp_dev(cfg):</div><div class='add'>+    if not hasattr(cfg, 'psp_dev_id'):</div><div class='add'>+        # Figure out which local device we are testing against</div><div class='add'>+        for dev in cfg.pspnl.dev_get({}, dump=True):</div><div class='add'>+            if dev['ifindex'] == cfg.ifindex:</div><div class='add'>+                cfg.psp_info = dev</div><div class='add'>+                cfg.psp_dev_id = cfg.psp_info['id']</div><div class='add'>+                break</div><div class='add'>+        else:</div><div class='add'>+            raise KsftSkipEx("No PSP devices found")</div><div class='add'>+</div><div class='add'>+    # Enable PSP if necessary</div><div class='add'>+    cap = cfg.psp_info['psp-versions-cap']</div><div class='add'>+    ena = cfg.psp_info['psp-versions-ena']</div><div class='add'>+    if cap != ena:</div><div class='add'>+        cfg.pspnl.dev_set({'id': cfg.psp_dev_id, 'psp-versions-ena': cap})</div><div class='add'>+        defer(cfg.pspnl.dev_set, {'id': cfg.psp_dev_id,</div><div class='add'>+                                  'psp-versions-ena': ena })</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Test cases</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+def dev_list_devices(cfg):</div><div class='add'>+    """ Dump all devices """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    devices = cfg.pspnl.dev_get({}, dump=True)</div><div class='add'>+</div><div class='add'>+    found = False</div><div class='add'>+    for dev in devices:</div><div class='add'>+        found |= dev['id'] == cfg.psp_dev_id</div><div class='add'>+    ksft_true(found)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def dev_get_device(cfg):</div><div class='add'>+    """ Get the device we intend to use """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    dev = cfg.pspnl.dev_get({'id': cfg.psp_dev_id})</div><div class='add'>+    ksft_eq(dev['id'], cfg.psp_dev_id)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def dev_get_device_bad(cfg):</div><div class='add'>+    """ Test getting device which doesn't exist """</div><div class='add'>+    raised = False</div><div class='add'>+    try:</div><div class='add'>+        cfg.pspnl.dev_get({'id': 1234567})</div><div class='add'>+    except NlError as e:</div><div class='add'>+        ksft_eq(e.nl_msg.error, -errno.ENODEV)</div><div class='add'>+        raised = True</div><div class='add'>+    ksft_true(raised)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def dev_rotate(cfg):</div><div class='add'>+    """ Test key rotation """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    prev_rotations = _get_stat(cfg, 'key-rotations')</div><div class='add'>+</div><div class='add'>+    rot = cfg.pspnl.key_rotate({"id": cfg.psp_dev_id})</div><div class='add'>+    ksft_eq(rot['id'], cfg.psp_dev_id)</div><div class='add'>+    rot = cfg.pspnl.key_rotate({"id": cfg.psp_dev_id})</div><div class='add'>+    ksft_eq(rot['id'], cfg.psp_dev_id)</div><div class='add'>+</div><div class='add'>+    cur_rotations = _get_stat(cfg, 'key-rotations')</div><div class='add'>+    ksft_eq(cur_rotations, prev_rotations + 2)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def dev_rotate_spi(cfg):</div><div class='add'>+    """ Test key rotation and SPI check """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    top_a = top_b = 0</div><div class='add'>+    with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s:</div><div class='add'>+        assoc_a = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                     "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                     "sock-fd": s.fileno()})</div><div class='add'>+        top_a = assoc_a['rx-key']['spi'] &gt;&gt; 31</div><div class='add'>+        s.close()</div><div class='add'>+    rot = cfg.pspnl.key_rotate({"id": cfg.psp_dev_id})</div><div class='add'>+    with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s:</div><div class='add'>+        ksft_eq(rot['id'], cfg.psp_dev_id)</div><div class='add'>+        assoc_b = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                    "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                    "sock-fd": s.fileno()})</div><div class='add'>+        top_b = assoc_b['rx-key']['spi'] &gt;&gt; 31</div><div class='add'>+        s.close()</div><div class='add'>+    ksft_ne(top_a, top_b)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def assoc_basic(cfg):</div><div class='add'>+    """ Test creating associations """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s:</div><div class='add'>+        assoc = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                  "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                  "sock-fd": s.fileno()})</div><div class='add'>+        ksft_eq(assoc['dev-id'], cfg.psp_dev_id)</div><div class='add'>+        ksft_gt(assoc['rx-key']['spi'], 0)</div><div class='add'>+        ksft_eq(len(assoc['rx-key']['key']), 16)</div><div class='add'>+</div><div class='add'>+        assoc = cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id,</div><div class='add'>+                                  "version": 0,</div><div class='add'>+                                  "tx-key": assoc['rx-key'],</div><div class='add'>+                                  "sock-fd": s.fileno()})</div><div class='add'>+        ksft_eq(len(assoc), 0)</div><div class='add'>+        s.close()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def assoc_bad_dev(cfg):</div><div class='add'>+    """ Test creating associations with bad device ID """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s:</div><div class='add'>+        with ksft_raises(NlError) as cm:</div><div class='add'>+            cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                              "dev-id": cfg.psp_dev_id + 1234567,</div><div class='add'>+                              "sock-fd": s.fileno()})</div><div class='add'>+        ksft_eq(cm.exception.nl_msg.error, -errno.ENODEV)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def assoc_sk_only_conn(cfg):</div><div class='add'>+    """ Test creating associations based on socket """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    with _make_clr_conn(cfg) as s:</div><div class='add'>+        assoc = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                  "sock-fd": s.fileno()})</div><div class='add'>+        ksft_eq(assoc['dev-id'], cfg.psp_dev_id)</div><div class='add'>+        cfg.pspnl.tx_assoc({"version": 0,</div><div class='add'>+                          "tx-key": assoc['rx-key'],</div><div class='add'>+                          "sock-fd": s.fileno()})</div><div class='add'>+        _close_conn(cfg, s)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def assoc_sk_only_mismatch(cfg):</div><div class='add'>+    """ Test creating associations based on socket (dev mismatch) """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    with _make_clr_conn(cfg) as s:</div><div class='add'>+        with ksft_raises(NlError) as cm:</div><div class='add'>+            cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                              "dev-id": cfg.psp_dev_id + 1234567,</div><div class='add'>+                              "sock-fd": s.fileno()})</div><div class='add'>+        the_exception = cm.exception</div><div class='add'>+        ksft_eq(the_exception.nl_msg.extack['bad-attr'], ".dev-id")</div><div class='add'>+        ksft_eq(the_exception.nl_msg.error, -errno.EINVAL)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def assoc_sk_only_mismatch_tx(cfg):</div><div class='add'>+    """ Test creating associations based on socket (dev mismatch) """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    with _make_clr_conn(cfg) as s:</div><div class='add'>+        with ksft_raises(NlError) as cm:</div><div class='add'>+            assoc = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                      "sock-fd": s.fileno()})</div><div class='add'>+            cfg.pspnl.tx_assoc({"version": 0,</div><div class='add'>+                              "tx-key": assoc['rx-key'],</div><div class='add'>+                              "dev-id": cfg.psp_dev_id + 1234567,</div><div class='add'>+                              "sock-fd": s.fileno()})</div><div class='add'>+        the_exception = cm.exception</div><div class='add'>+        ksft_eq(the_exception.nl_msg.extack['bad-attr'], ".dev-id")</div><div class='add'>+        ksft_eq(the_exception.nl_msg.error, -errno.EINVAL)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def assoc_sk_only_unconn(cfg):</div><div class='add'>+    """ Test creating associations based on socket (unconnected, should fail) """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s:</div><div class='add'>+        with ksft_raises(NlError) as cm:</div><div class='add'>+            cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                              "sock-fd": s.fileno()})</div><div class='add'>+        the_exception = cm.exception</div><div class='add'>+        ksft_eq(the_exception.nl_msg.extack['miss-type'], "dev-id")</div><div class='add'>+        ksft_eq(the_exception.nl_msg.error, -errno.EINVAL)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def assoc_version_mismatch(cfg):</div><div class='add'>+    """ Test creating associations where Rx and Tx PSP versions do not match """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    versions = list(cfg.psp_info['psp-versions-cap'])</div><div class='add'>+    if len(versions) &lt; 2:</div><div class='add'>+        raise KsftSkipEx("Not enough PSP versions supported by the device for the test")</div><div class='add'>+</div><div class='add'>+    # Translate versions to integers</div><div class='add'>+    versions = [cfg.pspnl.consts["version"].entries[v].value for v in versions]</div><div class='add'>+</div><div class='add'>+    with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s:</div><div class='add'>+        rx = cfg.pspnl.rx_assoc({"version": versions[0],</div><div class='add'>+                                 "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                 "sock-fd": s.fileno()})</div><div class='add'>+</div><div class='add'>+        for version in versions[1:]:</div><div class='add'>+            with ksft_raises(NlError) as cm:</div><div class='add'>+                cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id,</div><div class='add'>+                                    "version": version,</div><div class='add'>+                                    "tx-key": rx['rx-key'],</div><div class='add'>+                                    "sock-fd": s.fileno()})</div><div class='add'>+            the_exception = cm.exception</div><div class='add'>+            ksft_eq(the_exception.nl_msg.error, -errno.EINVAL)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def assoc_twice(cfg):</div><div class='add'>+    """ Test reusing Tx assoc for two sockets """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    def rx_assoc_check(s):</div><div class='add'>+        assoc = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                  "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                  "sock-fd": s.fileno()})</div><div class='add'>+        ksft_eq(assoc['dev-id'], cfg.psp_dev_id)</div><div class='add'>+        ksft_gt(assoc['rx-key']['spi'], 0)</div><div class='add'>+        ksft_eq(len(assoc['rx-key']['key']), 16)</div><div class='add'>+</div><div class='add'>+        return assoc</div><div class='add'>+</div><div class='add'>+    with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s:</div><div class='add'>+        assoc = rx_assoc_check(s)</div><div class='add'>+        tx = cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id,</div><div class='add'>+                               "version": 0,</div><div class='add'>+                               "tx-key": assoc['rx-key'],</div><div class='add'>+                               "sock-fd": s.fileno()})</div><div class='add'>+        ksft_eq(len(tx), 0)</div><div class='add'>+</div><div class='add'>+        # Use the same Tx assoc second time</div><div class='add'>+        with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s2:</div><div class='add'>+            rx_assoc_check(s2)</div><div class='add'>+            tx = cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id,</div><div class='add'>+                                   "version": 0,</div><div class='add'>+                                   "tx-key": assoc['rx-key'],</div><div class='add'>+                                   "sock-fd": s2.fileno()})</div><div class='add'>+            ksft_eq(len(tx), 0)</div><div class='add'>+</div><div class='add'>+        s.close()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _data_basic_send(cfg, version, ipver):</div><div class='add'>+    """ Test basic data send """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    # Version 0 is required by spec, don't let it skip</div><div class='add'>+    if version:</div><div class='add'>+        name = cfg.pspnl.consts["version"].entries_by_val[version].name</div><div class='add'>+        if name not in cfg.psp_info['psp-versions-cap']:</div><div class='add'>+            with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s:</div><div class='add'>+                with ksft_raises(NlError) as cm:</div><div class='add'>+                    cfg.pspnl.rx_assoc({"version": version,</div><div class='add'>+                                        "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                        "sock-fd": s.fileno()})</div><div class='add'>+                ksft_eq(cm.exception.nl_msg.error, -errno.EOPNOTSUPP)</div><div class='add'>+            raise KsftSkipEx("PSP version not supported", name)</div><div class='add'>+</div><div class='add'>+    s = _make_psp_conn(cfg, version, ipver)</div><div class='add'>+</div><div class='add'>+    rx_assoc = cfg.pspnl.rx_assoc({"version": version,</div><div class='add'>+                                   "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                   "sock-fd": s.fileno()})</div><div class='add'>+    rx = rx_assoc['rx-key']</div><div class='add'>+    tx = _spi_xchg(s, rx)</div><div class='add'>+</div><div class='add'>+    cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id,</div><div class='add'>+                        "version": version,</div><div class='add'>+                        "tx-key": tx,</div><div class='add'>+                        "sock-fd": s.fileno()})</div><div class='add'>+</div><div class='add'>+    data_len = _send_careful(cfg, s, 100)</div><div class='add'>+    _check_data_rx(cfg, data_len)</div><div class='add'>+    _close_psp_conn(cfg, s)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def __bad_xfer_do(cfg, s, tx, version='hdr0-aes-gcm-128'):</div><div class='add'>+    # Make sure we accept the ACK for the SPI before we seal with the bad assoc</div><div class='add'>+    _check_data_outq(s, 0)</div><div class='add'>+</div><div class='add'>+    cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id,</div><div class='add'>+                        "version": version,</div><div class='add'>+                        "tx-key": tx,</div><div class='add'>+                        "sock-fd": s.fileno()})</div><div class='add'>+</div><div class='add'>+    data_len = _send_careful(cfg, s, 20)</div><div class='add'>+    _check_data_outq(s, data_len, force_wait=True)</div><div class='add'>+    _check_data_rx(cfg, 0)</div><div class='add'>+    _close_psp_conn(cfg, s)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def data_send_bad_key(cfg):</div><div class='add'>+    """ Test send data with bad key """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    s = _make_psp_conn(cfg)</div><div class='add'>+</div><div class='add'>+    rx_assoc = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                   "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                   "sock-fd": s.fileno()})</div><div class='add'>+    rx = rx_assoc['rx-key']</div><div class='add'>+    tx = _spi_xchg(s, rx)</div><div class='add'>+    tx['key'] = (tx['key'][0] ^ 0xff).to_bytes(1, 'little') + tx['key'][1:]</div><div class='add'>+    __bad_xfer_do(cfg, s, tx)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def data_send_disconnect(cfg):</div><div class='add'>+    """ Test socket close after sending data """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    with _make_psp_conn(cfg) as s:</div><div class='add'>+        assoc = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                  "sock-fd": s.fileno()})</div><div class='add'>+        tx = _spi_xchg(s, assoc['rx-key'])</div><div class='add'>+        cfg.pspnl.tx_assoc({"version": 0,</div><div class='add'>+                          "tx-key": tx,</div><div class='add'>+                          "sock-fd": s.fileno()})</div><div class='add'>+</div><div class='add'>+        data_len = _send_careful(cfg, s, 100)</div><div class='add'>+        _check_data_rx(cfg, data_len)</div><div class='add'>+</div><div class='add'>+        s.shutdown(socket.SHUT_RDWR)</div><div class='add'>+        s.close()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _data_mss_adjust(cfg, ipver):</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    # First figure out what the MSS would be without any adjustments</div><div class='add'>+    s = _make_clr_conn(cfg, ipver)</div><div class='add'>+    s.send(b"0123456789abcdef" * 1024)</div><div class='add'>+    _check_data_rx(cfg, 16 * 1024)</div><div class='add'>+    mss = s.getsockopt(socket.IPPROTO_TCP, socket.TCP_MAXSEG)</div><div class='add'>+    _close_conn(cfg, s)</div><div class='add'>+</div><div class='add'>+    s = _make_psp_conn(cfg, 0, ipver)</div><div class='add'>+    try:</div><div class='add'>+        rx_assoc = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                     "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                     "sock-fd": s.fileno()})</div><div class='add'>+        rx = rx_assoc['rx-key']</div><div class='add'>+        tx = _spi_xchg(s, rx)</div><div class='add'>+</div><div class='add'>+        rxmss = s.getsockopt(socket.IPPROTO_TCP, socket.TCP_MAXSEG)</div><div class='add'>+        ksft_eq(mss, rxmss)</div><div class='add'>+</div><div class='add'>+        cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id,</div><div class='add'>+                          "version": 0,</div><div class='add'>+                          "tx-key": tx,</div><div class='add'>+                          "sock-fd": s.fileno()})</div><div class='add'>+</div><div class='add'>+        txmss = s.getsockopt(socket.IPPROTO_TCP, socket.TCP_MAXSEG)</div><div class='add'>+        ksft_eq(mss, txmss + 40)</div><div class='add'>+</div><div class='add'>+        data_len = _send_careful(cfg, s, 100)</div><div class='add'>+        _check_data_rx(cfg, data_len)</div><div class='add'>+        _check_data_outq(s, 0)</div><div class='add'>+</div><div class='add'>+        txmss = s.getsockopt(socket.IPPROTO_TCP, socket.TCP_MAXSEG)</div><div class='add'>+        ksft_eq(mss, txmss + 40)</div><div class='add'>+    finally:</div><div class='add'>+        _close_psp_conn(cfg, s)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def data_stale_key(cfg):</div><div class='add'>+    """ Test send on a double-rotated key """</div><div class='add'>+    _init_psp_dev(cfg)</div><div class='add'>+</div><div class='add'>+    prev_stale = _get_stat(cfg, 'stale-events')</div><div class='add'>+    s = _make_psp_conn(cfg)</div><div class='add'>+    try:</div><div class='add'>+        rx_assoc = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                     "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                     "sock-fd": s.fileno()})</div><div class='add'>+        rx = rx_assoc['rx-key']</div><div class='add'>+        tx = _spi_xchg(s, rx)</div><div class='add'>+</div><div class='add'>+        cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id,</div><div class='add'>+                          "version": 0,</div><div class='add'>+                          "tx-key": tx,</div><div class='add'>+                          "sock-fd": s.fileno()})</div><div class='add'>+</div><div class='add'>+        data_len = _send_careful(cfg, s, 100)</div><div class='add'>+        _check_data_rx(cfg, data_len)</div><div class='add'>+        _check_data_outq(s, 0)</div><div class='add'>+</div><div class='add'>+        cfg.pspnl.key_rotate({"id": cfg.psp_dev_id})</div><div class='add'>+        cfg.pspnl.key_rotate({"id": cfg.psp_dev_id})</div><div class='add'>+</div><div class='add'>+        cur_stale = _get_stat(cfg, 'stale-events')</div><div class='add'>+        ksft_gt(cur_stale, prev_stale)</div><div class='add'>+</div><div class='add'>+        s.send(b'0123456789' * 200)</div><div class='add'>+        _check_data_outq(s, 2000, force_wait=True)</div><div class='add'>+    finally:</div><div class='add'>+        _close_psp_conn(cfg, s)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def __nsim_psp_rereg(cfg):</div><div class='add'>+    # The PSP dev ID will change, remember what was there before</div><div class='add'>+    before = set([x['id'] for x in cfg.pspnl.dev_get({}, dump=True)])</div><div class='add'>+</div><div class='add'>+    cfg._ns.nsims[0].dfs_write('psp_rereg', '1')</div><div class='add'>+</div><div class='add'>+    after = set([x['id'] for x in cfg.pspnl.dev_get({}, dump=True)])</div><div class='add'>+</div><div class='add'>+    new_devs = list(after - before)</div><div class='add'>+    ksft_eq(len(new_devs), 1)</div><div class='add'>+    cfg.psp_dev_id = list(after - before)[0]</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def removal_device_rx(cfg):</div><div class='add'>+    """ Test removing a netdev / PSD with active Rx assoc """</div><div class='add'>+</div><div class='add'>+    # We could technically devlink reload real devices, too</div><div class='add'>+    # but that kills the control socket. So test this on</div><div class='add'>+    # netdevsim only for now</div><div class='add'>+    cfg.require_nsim()</div><div class='add'>+</div><div class='add'>+    s = _make_clr_conn(cfg)</div><div class='add'>+    try:</div><div class='add'>+        rx_assoc = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                       "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                       "sock-fd": s.fileno()})</div><div class='add'>+        ksft_not_none(rx_assoc)</div><div class='add'>+</div><div class='add'>+        __nsim_psp_rereg(cfg)</div><div class='add'>+    finally:</div><div class='add'>+        _close_conn(cfg, s)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def removal_device_bi(cfg):</div><div class='add'>+    """ Test removing a netdev / PSD with active Rx/Tx assoc """</div><div class='add'>+</div><div class='add'>+    # We could technically devlink reload real devices, too</div><div class='add'>+    # but that kills the control socket. So test this on</div><div class='add'>+    # netdevsim only for now</div><div class='add'>+    cfg.require_nsim()</div><div class='add'>+</div><div class='add'>+    s = _make_clr_conn(cfg)</div><div class='add'>+    try:</div><div class='add'>+        rx_assoc = cfg.pspnl.rx_assoc({"version": 0,</div><div class='add'>+                                       "dev-id": cfg.psp_dev_id,</div><div class='add'>+                                       "sock-fd": s.fileno()})</div><div class='add'>+        cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id,</div><div class='add'>+                            "version": 0,</div><div class='add'>+                            "tx-key": rx_assoc['rx-key'],</div><div class='add'>+                            "sock-fd": s.fileno()})</div><div class='add'>+        __nsim_psp_rereg(cfg)</div><div class='add'>+    finally:</div><div class='add'>+        _close_conn(cfg, s)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def psp_ip_ver_test_builder(name, test_func, psp_ver, ipver):</div><div class='add'>+    """Build test cases for each combo of PSP version and IP version"""</div><div class='add'>+    def test_case(cfg):</div><div class='add'>+        cfg.require_ipver(ipver)</div><div class='add'>+        test_case.__name__ = f"{name}_v{psp_ver}_ip{ipver}"</div><div class='add'>+        test_func(cfg, psp_ver, ipver)</div><div class='add'>+    return test_case</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def ipver_test_builder(name, test_func, ipver):</div><div class='add'>+    """Build test cases for each IP version"""</div><div class='add'>+    def test_case(cfg):</div><div class='add'>+        cfg.require_ipver(ipver)</div><div class='add'>+        test_case.__name__ = f"{name}_ip{ipver}"</div><div class='add'>+        test_func(cfg, ipver)</div><div class='add'>+    return test_case</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    """ Ksft boiler plate main """</div><div class='add'>+</div><div class='add'>+    with NetDrvEpEnv(__file__) as cfg:</div><div class='add'>+        cfg.pspnl = PSPFamily()</div><div class='add'>+</div><div class='add'>+        # Set up responder and communication sock</div><div class='add'>+        responder = cfg.remote.deploy("psp_responder")</div><div class='add'>+</div><div class='add'>+        cfg.comm_port = rand_port()</div><div class='add'>+        srv = None</div><div class='add'>+        try:</div><div class='add'>+            with bkg(responder + f" -p {cfg.comm_port}", host=cfg.remote,</div><div class='add'>+                     exit_wait=True) as srv:</div><div class='add'>+                wait_port_listen(cfg.comm_port, host=cfg.remote)</div><div class='add'>+</div><div class='add'>+                cfg.comm_sock = socket.create_connection((cfg.remote_addr,</div><div class='add'>+                                                          cfg.comm_port),</div><div class='add'>+                                                         timeout=1)</div><div class='add'>+</div><div class='add'>+                cases = [</div><div class='add'>+                    psp_ip_ver_test_builder(</div><div class='add'>+                        "data_basic_send", _data_basic_send, version, ipver</div><div class='add'>+                    )</div><div class='add'>+                    for version in range(0, 4)</div><div class='add'>+                    for ipver in ("4", "6")</div><div class='add'>+                ]</div><div class='add'>+                cases += [</div><div class='add'>+                    ipver_test_builder("data_mss_adjust", _data_mss_adjust, ipver)</div><div class='add'>+                    for ipver in ("4", "6")</div><div class='add'>+                ]</div><div class='add'>+</div><div class='add'>+                ksft_run(cases=cases, globs=globals(),</div><div class='add'>+                         case_pfx={"dev_", "data_", "assoc_", "removal_"},</div><div class='add'>+                         args=(cfg, ))</div><div class='add'>+</div><div class='add'>+                cfg.comm_sock.send(b"exit\0")</div><div class='add'>+                cfg.comm_sock.close()</div><div class='add'>+        finally:</div><div class='add'>+            if srv and (srv.stdout or srv.stderr):</div><div class='add'>+                ksft_pr("")</div><div class='add'>+                ksft_pr(f"Responder logs ({srv.ret}):")</div><div class='add'>+            if srv and srv.stdout:</div><div class='add'>+                ksft_pr("STDOUT:\n#  " + srv.stdout.strip().replace("\n", "\n#  "))</div><div class='add'>+            if srv and srv.stderr:</div><div class='add'>+                ksft_pr("STDERR:\n#  " + srv.stderr.strip().replace("\n", "\n#  "))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/psp_responder.c b/tools/testing/selftests/drivers/net/psp_responder.c<br/>new file mode 100644<br/>index 000000000000..f309e0d73cbf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/psp_responder.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/psp_responder.c</a></div><div class='hunk'>@@ -0,0 +1,483 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/poll.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;ynl.h&gt;</div><div class='add'>+</div><div class='add'>+#include "psp-user.h"</div><div class='add'>+</div><div class='add'>+#define dbg(msg...)				\</div><div class='add'>+do {						\</div><div class='add'>+	if (opts-&gt;verbose)			\</div><div class='add'>+		fprintf(stderr, "DEBUG: " msg);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static bool should_quit;</div><div class='add'>+</div><div class='add'>+struct opts {</div><div class='add'>+	int port;</div><div class='add'>+	int devid;</div><div class='add'>+	bool verbose;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum accept_cfg {</div><div class='add'>+	ACCEPT_CFG_NONE = 0,</div><div class='add'>+	ACCEPT_CFG_CLEAR,</div><div class='add'>+	ACCEPT_CFG_PSP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	unsigned char tx;</div><div class='add'>+	unsigned char rx;</div><div class='add'>+} psp_vers;</div><div class='add'>+</div><div class='add'>+static int conn_setup_psp(struct ynl_sock *ys, struct opts *opts, int data_sock)</div><div class='add'>+{</div><div class='add'>+	struct psp_rx_assoc_rsp *rsp;</div><div class='add'>+	struct psp_rx_assoc_req *req;</div><div class='add'>+	struct psp_tx_assoc_rsp *tsp;</div><div class='add'>+	struct psp_tx_assoc_req *teq;</div><div class='add'>+	char info[300];</div><div class='add'>+	int key_len;</div><div class='add'>+	ssize_t sz;</div><div class='add'>+	__u32 spi;</div><div class='add'>+</div><div class='add'>+	dbg("create PSP connection\n");</div><div class='add'>+</div><div class='add'>+	// Rx assoc alloc</div><div class='add'>+	req = psp_rx_assoc_req_alloc();</div><div class='add'>+</div><div class='add'>+	psp_rx_assoc_req_set_sock_fd(req, data_sock);</div><div class='add'>+	psp_rx_assoc_req_set_version(req, psp_vers.rx);</div><div class='add'>+</div><div class='add'>+	rsp = psp_rx_assoc(ys, req);</div><div class='add'>+	psp_rx_assoc_req_free(req);</div><div class='add'>+</div><div class='add'>+	if (!rsp) {</div><div class='add'>+		perror("ERROR: failed to Rx assoc");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// SPI exchange</div><div class='add'>+	key_len = rsp-&gt;rx_key._len.key;</div><div class='add'>+	memcpy(info, &amp;rsp-&gt;rx_key.spi, sizeof(spi));</div><div class='add'>+	memcpy(&amp;info[sizeof(spi)], rsp-&gt;rx_key.key, key_len);</div><div class='add'>+	sz = sizeof(spi) + key_len;</div><div class='add'>+</div><div class='add'>+	send(data_sock, info, sz, MSG_WAITALL);</div><div class='add'>+	psp_rx_assoc_rsp_free(rsp);</div><div class='add'>+</div><div class='add'>+	sz = recv(data_sock, info, sz, MSG_WAITALL);</div><div class='add'>+	if (sz &lt; 0) {</div><div class='add'>+		perror("ERROR: failed to read PSP key from sock");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	memcpy(&amp;spi, info, sizeof(spi));</div><div class='add'>+</div><div class='add'>+	// Setup Tx assoc</div><div class='add'>+	teq = psp_tx_assoc_req_alloc();</div><div class='add'>+</div><div class='add'>+	psp_tx_assoc_req_set_sock_fd(teq, data_sock);</div><div class='add'>+	psp_tx_assoc_req_set_version(teq, psp_vers.tx);</div><div class='add'>+	psp_tx_assoc_req_set_tx_key_spi(teq, spi);</div><div class='add'>+	psp_tx_assoc_req_set_tx_key_key(teq, &amp;info[sizeof(spi)], key_len);</div><div class='add'>+</div><div class='add'>+	tsp = psp_tx_assoc(ys, teq);</div><div class='add'>+	psp_tx_assoc_req_free(teq);</div><div class='add'>+	if (!tsp) {</div><div class='add'>+		perror("ERROR: failed to Tx assoc");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	psp_tx_assoc_rsp_free(tsp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void send_ack(int sock)</div><div class='add'>+{</div><div class='add'>+	send(sock, "ack", 4, MSG_WAITALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void send_err(int sock)</div><div class='add'>+{</div><div class='add'>+	send(sock, "err", 4, MSG_WAITALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void send_str(int sock, int value)</div><div class='add'>+{</div><div class='add'>+	char buf[128];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = snprintf(buf, sizeof(buf), "%d", value);</div><div class='add'>+	send(sock, buf, ret + 1, MSG_WAITALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+run_session(struct ynl_sock *ys, struct opts *opts,</div><div class='add'>+	    int server_sock, int comm_sock)</div><div class='add'>+{</div><div class='add'>+	enum accept_cfg accept_cfg = ACCEPT_CFG_NONE;</div><div class='add'>+	struct pollfd pfds[3];</div><div class='add'>+	size_t data_read = 0;</div><div class='add'>+	int data_sock = -1;</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		bool race_close = false;</div><div class='add'>+		int nfds;</div><div class='add'>+</div><div class='add'>+		memset(pfds, 0, sizeof(pfds));</div><div class='add'>+</div><div class='add'>+		pfds[0].fd = server_sock;</div><div class='add'>+		pfds[0].events = POLLIN;</div><div class='add'>+</div><div class='add'>+		pfds[1].fd = comm_sock;</div><div class='add'>+		pfds[1].events = POLLIN;</div><div class='add'>+</div><div class='add'>+		nfds = 2;</div><div class='add'>+		if (data_sock &gt;= 0) {</div><div class='add'>+			pfds[2].fd = data_sock;</div><div class='add'>+			pfds[2].events = POLLIN;</div><div class='add'>+			nfds++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dbg(" ...\n");</div><div class='add'>+		if (poll(pfds, nfds, -1) &lt; 0) {</div><div class='add'>+			perror("poll");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* data sock */</div><div class='add'>+		if (pfds[2].revents &amp; POLLIN) {</div><div class='add'>+			char buf[8192];</div><div class='add'>+			ssize_t n;</div><div class='add'>+</div><div class='add'>+			n = recv(data_sock, buf, sizeof(buf), 0);</div><div class='add'>+			if (n &lt;= 0) {</div><div class='add'>+				if (n &lt; 0)</div><div class='add'>+					perror("data read");</div><div class='add'>+				close(data_sock);</div><div class='add'>+				data_sock = -1;</div><div class='add'>+				dbg("data sock closed\n");</div><div class='add'>+			} else {</div><div class='add'>+				data_read += n;</div><div class='add'>+				dbg("data read %zd\n", data_read);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* comm sock */</div><div class='add'>+		if (pfds[1].revents &amp; POLLIN) {</div><div class='add'>+			static char buf[4096];</div><div class='add'>+			static ssize_t off;</div><div class='add'>+			bool consumed;</div><div class='add'>+			ssize_t n;</div><div class='add'>+</div><div class='add'>+			n = recv(comm_sock, &amp;buf[off], sizeof(buf) - off, 0);</div><div class='add'>+			if (n &lt;= 0) {</div><div class='add'>+				if (n &lt; 0)</div><div class='add'>+					perror("comm read");</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			off += n;</div><div class='add'>+			n = off;</div><div class='add'>+</div><div class='add'>+#define __consume(sz)						\</div><div class='add'>+		({						\</div><div class='add'>+			if (n == (sz)) {			\</div><div class='add'>+				off = 0;			\</div><div class='add'>+			} else {				\</div><div class='add'>+				off -= (sz);			\</div><div class='add'>+				memmove(buf, &amp;buf[(sz)], off);	\</div><div class='add'>+			}					\</div><div class='add'>+		})</div><div class='add'>+</div><div class='add'>+#define cmd(_name)							\</div><div class='add'>+		({							\</div><div class='add'>+			ssize_t sz = sizeof(_name);			\</div><div class='add'>+			bool match = n &gt;= sz &amp;&amp;	!memcmp(buf, _name, sz); \</div><div class='add'>+									\</div><div class='add'>+			if (match) {					\</div><div class='add'>+				dbg("command: " _name "\n");		\</div><div class='add'>+				__consume(sz);				\</div><div class='add'>+			}						\</div><div class='add'>+			consumed |= match;				\</div><div class='add'>+			match;						\</div><div class='add'>+		})</div><div class='add'>+</div><div class='add'>+			do {</div><div class='add'>+				consumed = false;</div><div class='add'>+</div><div class='add'>+				if (cmd("read len"))</div><div class='add'>+					send_str(comm_sock, data_read);</div><div class='add'>+</div><div class='add'>+				if (cmd("data echo")) {</div><div class='add'>+					if (data_sock &gt;= 0)</div><div class='add'>+						send(data_sock, "echo", 5,</div><div class='add'>+						     MSG_WAITALL);</div><div class='add'>+					else</div><div class='add'>+						fprintf(stderr, "WARN: echo but no data sock\n");</div><div class='add'>+					send_ack(comm_sock);</div><div class='add'>+				}</div><div class='add'>+				if (cmd("data close")) {</div><div class='add'>+					if (data_sock &gt;= 0) {</div><div class='add'>+						close(data_sock);</div><div class='add'>+						data_sock = -1;</div><div class='add'>+						send_ack(comm_sock);</div><div class='add'>+					} else {</div><div class='add'>+						race_close = true;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				if (cmd("conn psp")) {</div><div class='add'>+					if (accept_cfg != ACCEPT_CFG_NONE)</div><div class='add'>+						fprintf(stderr, "WARN: old conn config still set!\n");</div><div class='add'>+					accept_cfg = ACCEPT_CFG_PSP;</div><div class='add'>+					send_ack(comm_sock);</div><div class='add'>+					/* next two bytes are versions */</div><div class='add'>+					if (off &gt;= 2) {</div><div class='add'>+						memcpy(&amp;psp_vers, buf, 2);</div><div class='add'>+						__consume(2);</div><div class='add'>+					} else {</div><div class='add'>+						fprintf(stderr, "WARN: short conn psp command!\n");</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				if (cmd("conn clr")) {</div><div class='add'>+					if (accept_cfg != ACCEPT_CFG_NONE)</div><div class='add'>+						fprintf(stderr, "WARN: old conn config still set!\n");</div><div class='add'>+					accept_cfg = ACCEPT_CFG_CLEAR;</div><div class='add'>+					send_ack(comm_sock);</div><div class='add'>+				}</div><div class='add'>+				if (cmd("exit"))</div><div class='add'>+					should_quit = true;</div><div class='add'>+#undef cmd</div><div class='add'>+</div><div class='add'>+				if (!consumed) {</div><div class='add'>+					fprintf(stderr, "WARN: unknown cmd: [%zd] %s\n",</div><div class='add'>+						off, buf);</div><div class='add'>+				}</div><div class='add'>+			} while (consumed &amp;&amp; off);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* server sock */</div><div class='add'>+		if (pfds[0].revents &amp; POLLIN) {</div><div class='add'>+			if (data_sock &gt;= 0) {</div><div class='add'>+				fprintf(stderr, "WARN: new data sock but old one still here\n");</div><div class='add'>+				close(data_sock);</div><div class='add'>+				data_sock = -1;</div><div class='add'>+			}</div><div class='add'>+			data_sock = accept(server_sock, NULL, NULL);</div><div class='add'>+			if (data_sock &lt; 0) {</div><div class='add'>+				perror("accept");</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			data_read = 0;</div><div class='add'>+</div><div class='add'>+			if (accept_cfg == ACCEPT_CFG_CLEAR) {</div><div class='add'>+				dbg("new data sock: clear\n");</div><div class='add'>+				/* nothing to do */</div><div class='add'>+			} else if (accept_cfg == ACCEPT_CFG_PSP) {</div><div class='add'>+				dbg("new data sock: psp\n");</div><div class='add'>+				conn_setup_psp(ys, opts, data_sock);</div><div class='add'>+			} else {</div><div class='add'>+				fprintf(stderr, "WARN: new data sock but no config\n");</div><div class='add'>+			}</div><div class='add'>+			accept_cfg = ACCEPT_CFG_NONE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (race_close) {</div><div class='add'>+			if (data_sock &gt;= 0) {</div><div class='add'>+				/* indeed, ordering problem, handle the close */</div><div class='add'>+				close(data_sock);</div><div class='add'>+				data_sock = -1;</div><div class='add'>+				send_ack(comm_sock);</div><div class='add'>+			} else {</div><div class='add'>+				fprintf(stderr, "WARN: close but no data sock\n");</div><div class='add'>+				send_err(comm_sock);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	dbg("session ending\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spawn_server(struct opts *opts)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_in6 addr;</div><div class='add'>+	int fd;</div><div class='add'>+</div><div class='add'>+	fd = socket(AF_INET6, SOCK_STREAM, 0);</div><div class='add'>+	if (fd &lt; 0) {</div><div class='add'>+		perror("can't open socket");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;addr, 0, sizeof(addr));</div><div class='add'>+</div><div class='add'>+	addr.sin6_family = AF_INET6;</div><div class='add'>+	addr.sin6_addr = in6addr_any;</div><div class='add'>+	addr.sin6_port = htons(opts-&gt;port);</div><div class='add'>+</div><div class='add'>+	if (bind(fd, (struct sockaddr *)&amp;addr, sizeof(addr))) {</div><div class='add'>+		perror("can't bind socket");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (listen(fd, 5)) {</div><div class='add'>+		perror("can't listen");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int run_responder(struct ynl_sock *ys, struct opts *opts)</div><div class='add'>+{</div><div class='add'>+	int server_sock, comm;</div><div class='add'>+</div><div class='add'>+	server_sock = spawn_server(opts);</div><div class='add'>+	if (server_sock &lt; 0)</div><div class='add'>+		return 4;</div><div class='add'>+</div><div class='add'>+	while (!should_quit) {</div><div class='add'>+		comm = accept(server_sock, NULL, NULL);</div><div class='add'>+		if (comm &lt; 0) {</div><div class='add'>+			perror("accept failed");</div><div class='add'>+		} else {</div><div class='add'>+			run_session(ys, opts, server_sock, comm);</div><div class='add'>+			close(comm);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usage(const char *name, const char *miss)</div><div class='add'>+{</div><div class='add'>+	if (miss)</div><div class='add'>+		fprintf(stderr, "Missing argument: %s\n", miss);</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "Usage: %s -p port [-v] [-d psp-dev-id]\n", name);</div><div class='add'>+	exit(EXIT_FAILURE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_cmd_opts(int argc, char **argv, struct opts *opts)</div><div class='add'>+{</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	while ((opt = getopt(argc, argv, "vp:d:")) != -1) {</div><div class='add'>+		switch (opt) {</div><div class='add'>+		case 'v':</div><div class='add'>+			opts-&gt;verbose = 1;</div><div class='add'>+			break;</div><div class='add'>+		case 'p':</div><div class='add'>+			opts-&gt;port = atoi(optarg);</div><div class='add'>+			break;</div><div class='add'>+		case 'd':</div><div class='add'>+			opts-&gt;devid = atoi(optarg);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			usage(argv[0], NULL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psp_dev_set_ena(struct ynl_sock *ys, __u32 dev_id, __u32 versions)</div><div class='add'>+{</div><div class='add'>+	struct psp_dev_set_req *sreq;</div><div class='add'>+	struct psp_dev_set_rsp *srsp;</div><div class='add'>+</div><div class='add'>+	fprintf(stderr, "Set PSP enable on device %d to 0x%x\n",</div><div class='add'>+		dev_id, versions);</div><div class='add'>+</div><div class='add'>+	sreq = psp_dev_set_req_alloc();</div><div class='add'>+</div><div class='add'>+	psp_dev_set_req_set_id(sreq, dev_id);</div><div class='add'>+	psp_dev_set_req_set_psp_versions_ena(sreq, versions);</div><div class='add'>+</div><div class='add'>+	srsp = psp_dev_set(ys, sreq);</div><div class='add'>+	psp_dev_set_req_free(sreq);</div><div class='add'>+	if (!srsp)</div><div class='add'>+		return 10;</div><div class='add'>+</div><div class='add'>+	psp_dev_set_rsp_free(srsp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char **argv)</div><div class='add'>+{</div><div class='add'>+	struct psp_dev_get_list *dev_list;</div><div class='add'>+	bool devid_found = false;</div><div class='add'>+	__u32 ver_ena, ver_cap;</div><div class='add'>+	struct opts opts = {};</div><div class='add'>+	struct ynl_error yerr;</div><div class='add'>+	struct ynl_sock *ys;</div><div class='add'>+	int first_id = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	parse_cmd_opts(argc, argv, &amp;opts);</div><div class='add'>+	if (!opts.port)</div><div class='add'>+		usage(argv[0], "port"); // exits</div><div class='add'>+</div><div class='add'>+	ys = ynl_sock_create(&amp;ynl_psp_family, &amp;yerr);</div><div class='add'>+	if (!ys) {</div><div class='add'>+		fprintf(stderr, "YNL: %s\n", yerr.msg);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_list = psp_dev_get_dump(ys);</div><div class='add'>+	if (ynl_dump_empty(dev_list)) {</div><div class='add'>+		if (ys-&gt;err.code)</div><div class='add'>+			goto err_close;</div><div class='add'>+		fprintf(stderr, "No PSP devices\n");</div><div class='add'>+		goto err_close_silent;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ynl_dump_foreach(dev_list, d) {</div><div class='add'>+		if (opts.devid) {</div><div class='add'>+			devid_found = true;</div><div class='add'>+			ver_ena = d-&gt;psp_versions_ena;</div><div class='add'>+			ver_cap = d-&gt;psp_versions_cap;</div><div class='add'>+		} else if (!first_id) {</div><div class='add'>+			first_id = d-&gt;id;</div><div class='add'>+			ver_ena = d-&gt;psp_versions_ena;</div><div class='add'>+			ver_cap = d-&gt;psp_versions_cap;</div><div class='add'>+		} else {</div><div class='add'>+			fprintf(stderr, "Multiple PSP devices found\n");</div><div class='add'>+			goto err_close_silent;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	psp_dev_get_list_free(dev_list);</div><div class='add'>+</div><div class='add'>+	if (opts.devid &amp;&amp; !devid_found) {</div><div class='add'>+		fprintf(stderr, "PSP device %d requested on cmdline, not found\n",</div><div class='add'>+			opts.devid);</div><div class='add'>+		goto err_close_silent;</div><div class='add'>+	} else if (!opts.devid) {</div><div class='add'>+		opts.devid = first_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ver_ena != ver_cap) {</div><div class='add'>+		ret = psp_dev_set_ena(ys, opts.devid, ver_cap);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = run_responder(ys, &amp;opts);</div><div class='add'>+</div><div class='add'>+	if (ver_ena != ver_cap &amp;&amp; psp_dev_set_ena(ys, opts.devid, ver_ena))</div><div class='add'>+		fprintf(stderr, "WARN: failed to set the PSP versions back\n");</div><div class='add'>+</div><div class='add'>+	ynl_sock_destroy(ys);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_close:</div><div class='add'>+	fprintf(stderr, "YNL: %s\n", ys-&gt;err.msg);</div><div class='add'>+err_close_silent:</div><div class='add'>+	ynl_sock_destroy(ys);</div><div class='add'>+	return 2;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/selftests/drivers/net/queues.py<br/>index 38303da957ee..236005290a33 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/queues.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/queues.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/queues.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/queues.py</a></div><div class='hunk'>@@ -2,13 +2,15 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='ctx'> from lib.py import ksft_disruptive, ksft_exit, ksft_run</div><div class='del'>-from lib.py import ksft_eq, ksft_raises, KsftSkipEx</div><div class='add'>+from lib.py import ksft_eq, ksft_not_in, ksft_raises, KsftSkipEx, KsftFailEx</div><div class='ctx'> from lib.py import EthtoolFamily, NetdevFamily, NlError</div><div class='ctx'> from lib.py import NetDrvEnv</div><div class='del'>-from lib.py import cmd, defer, ip</div><div class='add'>+from lib.py import bkg, cmd, defer, ip</div><div class='ctx'> import errno</div><div class='ctx'> import glob</div><div class='del'>-</div><div class='add'>+import os</div><div class='add'>+import socket</div><div class='add'>+import struct</div><div class='ctx'> </div><div class='ctx'> def sys_get_queues(ifname, qtype='rx') -&gt; int:</div><div class='ctx'>     folders = glob.glob(f'/sys/class/net/{ifname}/queues/{qtype}-*')</div><div class='hunk'>@@ -22,6 +24,40 @@ def nl_get_queues(cfg, nl, qtype='rx'):</div><div class='ctx'>     return None</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+def check_xsk(cfg, nl, xdp_queue_id=0) -&gt; None:</div><div class='add'>+    # Probe for support</div><div class='add'>+    xdp = cmd(f'{cfg.net_lib_dir / "xdp_helper"} - -', fail=False)</div><div class='add'>+    if xdp.ret == 255:</div><div class='add'>+        raise KsftSkipEx('AF_XDP unsupported')</div><div class='add'>+    elif xdp.ret &gt; 0:</div><div class='add'>+        raise KsftFailEx('unable to create AF_XDP socket')</div><div class='add'>+</div><div class='add'>+    with bkg(f'{cfg.net_lib_dir / "xdp_helper"} {cfg.ifindex} {xdp_queue_id}',</div><div class='add'>+             ksft_wait=3):</div><div class='add'>+</div><div class='add'>+        rx = tx = False</div><div class='add'>+</div><div class='add'>+        queues = nl.queue_get({'ifindex': cfg.ifindex}, dump=True)</div><div class='add'>+        if not queues:</div><div class='add'>+            raise KsftSkipEx("Netlink reports no queues")</div><div class='add'>+</div><div class='add'>+        for q in queues:</div><div class='add'>+            if q['id'] == 0:</div><div class='add'>+                if q['type'] == 'rx':</div><div class='add'>+                    rx = True</div><div class='add'>+                if q['type'] == 'tx':</div><div class='add'>+                    tx = True</div><div class='add'>+</div><div class='add'>+                ksft_eq(q.get('xsk', None), {},</div><div class='add'>+                        comment="xsk attr on queue we configured")</div><div class='add'>+            else:</div><div class='add'>+                ksft_not_in('xsk', q,</div><div class='add'>+                            comment="xsk attr on queue we didn't configure")</div><div class='add'>+</div><div class='add'>+        ksft_eq(rx, True)</div><div class='add'>+        ksft_eq(tx, True)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> def get_queues(cfg, nl) -&gt; None:</div><div class='ctx'>     snl = NetdevFamily(recv_size=4096)</div><div class='ctx'> </div><div class='hunk'>@@ -45,10 +81,9 @@ def addremove_queues(cfg, nl) -&gt; None:</div><div class='ctx'> </div><div class='ctx'>     netnl = EthtoolFamily()</div><div class='ctx'>     channels = netnl.channels_get({'header': {'dev-index': cfg.ifindex}})</div><div class='del'>-    if channels['combined-count'] == 0:</div><div class='del'>-        rx_type = 'rx'</div><div class='del'>-    else:</div><div class='del'>-        rx_type = 'combined'</div><div class='add'>+    rx_type = 'rx'</div><div class='add'>+    if channels.get('combined-count', 0) &gt; 0:</div><div class='add'>+            rx_type = 'combined'</div><div class='ctx'> </div><div class='ctx'>     expected = curr_queues - 1</div><div class='ctx'>     cmd(f"ethtool -L {cfg.dev['ifname']} {rx_type} {expected}", timeout=10)</div><div class='hunk'>@@ -81,7 +116,8 @@ def check_down(cfg, nl) -&gt; None:</div><div class='ctx'> </div><div class='ctx'> def main() -&gt; None:</div><div class='ctx'>     with NetDrvEnv(__file__, queue_count=100) as cfg:</div><div class='del'>-        ksft_run([get_queues, addremove_queues, check_down], args=(cfg, NetdevFamily()))</div><div class='add'>+        ksft_run([get_queues, addremove_queues, check_down, check_xsk],</div><div class='add'>+                 args=(cfg, NetdevFamily()))</div><div class='ctx'>     ksft_exit()</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/ring_reconfig.py b/tools/testing/selftests/drivers/net/ring_reconfig.py<br/>new file mode 100755<br/>index 000000000000..f9530a8b0856<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/ring_reconfig.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/ring_reconfig.py</a></div><div class='hunk'>@@ -0,0 +1,167 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+"""</div><div class='add'>+Test channel and ring size configuration via ethtool (-L / -G).</div><div class='add'>+"""</div><div class='add'>+</div><div class='add'>+from lib.py import ksft_run, ksft_exit, ksft_pr</div><div class='add'>+from lib.py import ksft_eq</div><div class='add'>+from lib.py import NetDrvEpEnv, EthtoolFamily, GenerateTraffic</div><div class='add'>+from lib.py import defer, NlError</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def channels(cfg) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Twiddle channel counts in various combinations of parameters.</div><div class='add'>+    We're only looking for driver adhering to the requested config</div><div class='add'>+    if the config is accepted and crashes.</div><div class='add'>+    """</div><div class='add'>+    ehdr = {'header':{'dev-index': cfg.ifindex}}</div><div class='add'>+    chans = cfg.eth.channels_get(ehdr)</div><div class='add'>+</div><div class='add'>+    all_keys = ["rx", "tx", "combined"]</div><div class='add'>+    mixes = [{"combined"}, {"rx", "tx"}, {"rx", "combined"}, {"tx", "combined"},</div><div class='add'>+             {"rx", "tx", "combined"},]</div><div class='add'>+</div><div class='add'>+    # Get the set of keys that device actually supports</div><div class='add'>+    restore = {}</div><div class='add'>+    supported = set()</div><div class='add'>+    for key in all_keys:</div><div class='add'>+        if key + "-max" in chans:</div><div class='add'>+            supported.add(key)</div><div class='add'>+            restore |= {key + "-count": chans[key + "-count"]}</div><div class='add'>+</div><div class='add'>+    defer(cfg.eth.channels_set, ehdr | restore)</div><div class='add'>+</div><div class='add'>+    def test_config(config):</div><div class='add'>+        try:</div><div class='add'>+            cfg.eth.channels_set(ehdr | config)</div><div class='add'>+            get = cfg.eth.channels_get(ehdr)</div><div class='add'>+            for k, v in config.items():</div><div class='add'>+                ksft_eq(get.get(k, 0), v)</div><div class='add'>+        except NlError as e:</div><div class='add'>+            failed.append(mix)</div><div class='add'>+            ksft_pr("Can't set", config, e)</div><div class='add'>+        else:</div><div class='add'>+            ksft_pr("Okay", config)</div><div class='add'>+</div><div class='add'>+    failed = []</div><div class='add'>+    for mix in mixes:</div><div class='add'>+        if not mix.issubset(supported):</div><div class='add'>+            continue</div><div class='add'>+</div><div class='add'>+        # Set all the values in the mix to 1, other supported to 0</div><div class='add'>+        config = {}</div><div class='add'>+        for key in all_keys:</div><div class='add'>+            config[key + "-count"] = 1 if key in mix else 0</div><div class='add'>+        test_config(config)</div><div class='add'>+</div><div class='add'>+    for mix in mixes:</div><div class='add'>+        if not mix.issubset(supported):</div><div class='add'>+            continue</div><div class='add'>+        if mix in failed:</div><div class='add'>+            continue</div><div class='add'>+</div><div class='add'>+        # Set all the values in the mix to max, other supported to 0</div><div class='add'>+        config = {}</div><div class='add'>+        for key in all_keys:</div><div class='add'>+            config[key + "-count"] = chans[key + '-max'] if key in mix else 0</div><div class='add'>+        test_config(config)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _configure_min_ring_cnt(cfg) -&gt; None:</div><div class='add'>+    """ Try to configure a single Rx/Tx ring. """</div><div class='add'>+    ehdr = {'header':{'dev-index': cfg.ifindex}}</div><div class='add'>+    chans = cfg.eth.channels_get(ehdr)</div><div class='add'>+</div><div class='add'>+    all_keys = ["rx-count", "tx-count", "combined-count"]</div><div class='add'>+    restore = {}</div><div class='add'>+    config = {}</div><div class='add'>+    for key in all_keys:</div><div class='add'>+        if key in chans:</div><div class='add'>+            restore[key] = chans[key]</div><div class='add'>+            config[key] = 0</div><div class='add'>+</div><div class='add'>+    if chans.get('combined-count', 0) &gt; 1:</div><div class='add'>+        config['combined-count'] = 1</div><div class='add'>+    elif chans.get('rx-count', 0) &gt; 1 and chans.get('tx-count', 0) &gt; 1:</div><div class='add'>+        config['tx-count'] = 1</div><div class='add'>+        config['rx-count'] = 1</div><div class='add'>+    else:</div><div class='add'>+        # looks like we're already on 1 channel</div><div class='add'>+        return</div><div class='add'>+</div><div class='add'>+    cfg.eth.channels_set(ehdr | config)</div><div class='add'>+    defer(cfg.eth.channels_set, ehdr | restore)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def ringparam(cfg) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Tweak the ringparam configuration. Try to run some traffic over min</div><div class='add'>+    ring size to make sure it actually functions.</div><div class='add'>+    """</div><div class='add'>+    ehdr = {'header':{'dev-index': cfg.ifindex}}</div><div class='add'>+    rings = cfg.eth.rings_get(ehdr)</div><div class='add'>+</div><div class='add'>+    restore = {}</div><div class='add'>+    maxes = {}</div><div class='add'>+    params = set()</div><div class='add'>+    for key in rings.keys():</div><div class='add'>+        if 'max' in key:</div><div class='add'>+            param = key[:-4]</div><div class='add'>+            maxes[param] = rings[key]</div><div class='add'>+            params.add(param)</div><div class='add'>+            restore[param] = rings[param]</div><div class='add'>+</div><div class='add'>+    defer(cfg.eth.rings_set, ehdr | restore)</div><div class='add'>+</div><div class='add'>+    # Speed up the reconfig by configuring just one ring</div><div class='add'>+    _configure_min_ring_cnt(cfg)</div><div class='add'>+</div><div class='add'>+    # Try to reach min on all settings</div><div class='add'>+    for param in params:</div><div class='add'>+        val = rings[param]</div><div class='add'>+        while True:</div><div class='add'>+            try:</div><div class='add'>+                cfg.eth.rings_set({'header':{'dev-index': cfg.ifindex},</div><div class='add'>+                                   param: val // 2})</div><div class='add'>+                if val == 0:</div><div class='add'>+                    break</div><div class='add'>+                val //= 2</div><div class='add'>+            except NlError:</div><div class='add'>+                break</div><div class='add'>+</div><div class='add'>+        get = cfg.eth.rings_get(ehdr)</div><div class='add'>+        ksft_eq(get[param], val)</div><div class='add'>+</div><div class='add'>+        ksft_pr(f"Reached min for '{param}' at {val} (max {rings[param]})")</div><div class='add'>+</div><div class='add'>+    GenerateTraffic(cfg).wait_pkts_and_stop(10000)</div><div class='add'>+</div><div class='add'>+    # Try max across all params, if the driver supports large rings</div><div class='add'>+    # this may OOM so we ignore errors</div><div class='add'>+    try:</div><div class='add'>+        ksft_pr("Applying max settings")</div><div class='add'>+        config = {p: maxes[p] for p in params}</div><div class='add'>+        cfg.eth.rings_set(ehdr | config)</div><div class='add'>+    except NlError as e:</div><div class='add'>+        ksft_pr("Can't set max params", config, e)</div><div class='add'>+    else:</div><div class='add'>+        GenerateTraffic(cfg).wait_pkts_and_stop(10000)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main() -&gt; None:</div><div class='add'>+    """ Ksft boiler plate main """</div><div class='add'>+</div><div class='add'>+    with NetDrvEpEnv(__file__) as cfg:</div><div class='add'>+        cfg.eth = EthtoolFamily()</div><div class='add'>+</div><div class='add'>+        ksft_run([channels,</div><div class='add'>+                  ringparam],</div><div class='add'>+                 args=(cfg, ))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/stats.py b/tools/testing/selftests/drivers/net/stats.py<br/>index efcc1e10575b..b08e4d48b15c 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/stats.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/stats.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/stats.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/stats.py</a></div><div class='hunk'>@@ -1,12 +1,16 @@</div><div class='ctx'> #!/usr/bin/env python3</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='add'>+"""</div><div class='add'>+Tests related to standard netdevice statistics.</div><div class='add'>+"""</div><div class='add'>+</div><div class='ctx'> import errno</div><div class='ctx'> import subprocess</div><div class='ctx'> import time</div><div class='ctx'> from lib.py import ksft_run, ksft_exit, ksft_pr</div><div class='ctx'> from lib.py import ksft_ge, ksft_eq, ksft_is, ksft_in, ksft_lt, ksft_true, ksft_raises</div><div class='del'>-from lib.py import KsftSkipEx, KsftXfailEx</div><div class='add'>+from lib.py import KsftSkipEx, KsftFailEx</div><div class='ctx'> from lib.py import ksft_disruptive</div><div class='ctx'> from lib.py import EthtoolFamily, NetdevFamily, RtnlFamily, NlError</div><div class='ctx'> from lib.py import NetDrvEnv</div><div class='hunk'>@@ -18,13 +22,16 @@ rtnl = RtnlFamily()</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> def check_pause(cfg) -&gt; None:</div><div class='del'>-    global ethnl</div><div class='add'>+    """</div><div class='add'>+    Check that drivers which support Pause config also report standard</div><div class='add'>+    pause stats.</div><div class='add'>+    """</div><div class='ctx'> </div><div class='ctx'>     try:</div><div class='ctx'>         ethnl.pause_get({"header": {"dev-index": cfg.ifindex}})</div><div class='ctx'>     except NlError as e:</div><div class='ctx'>         if e.error == errno.EOPNOTSUPP:</div><div class='del'>-            raise KsftXfailEx("pause not supported by the device")</div><div class='add'>+            raise KsftSkipEx("pause not supported by the device") from e</div><div class='ctx'>         raise</div><div class='ctx'> </div><div class='ctx'>     data = ethnl.pause_get({"header": {"dev-index": cfg.ifindex,</div><div class='hunk'>@@ -33,13 +40,16 @@ def check_pause(cfg) -&gt; None:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> def check_fec(cfg) -&gt; None:</div><div class='del'>-    global ethnl</div><div class='add'>+    """</div><div class='add'>+    Check that drivers which support FEC config also report standard</div><div class='add'>+    FEC stats.</div><div class='add'>+    """</div><div class='ctx'> </div><div class='ctx'>     try:</div><div class='ctx'>         ethnl.fec_get({"header": {"dev-index": cfg.ifindex}})</div><div class='ctx'>     except NlError as e:</div><div class='ctx'>         if e.error == errno.EOPNOTSUPP:</div><div class='del'>-            raise KsftXfailEx("FEC not supported by the device")</div><div class='add'>+            raise KsftSkipEx("FEC not supported by the device") from e</div><div class='ctx'>         raise</div><div class='ctx'> </div><div class='ctx'>     data = ethnl.fec_get({"header": {"dev-index": cfg.ifindex,</div><div class='hunk'>@@ -47,16 +57,48 @@ def check_fec(cfg) -&gt; None:</div><div class='ctx'>     ksft_true(data['stats'], "driver does not report stats")</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+def check_fec_hist(cfg) -&gt; None:</div><div class='add'>+    """</div><div class='add'>+    Check that drivers which support FEC histogram statistics report</div><div class='add'>+    reasonable values.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        data = ethnl.fec_get({"header": {"dev-index": cfg.ifindex,</div><div class='add'>+                                         "flags": {'stats'}}})</div><div class='add'>+    except NlError as e:</div><div class='add'>+        if e.error == errno.EOPNOTSUPP:</div><div class='add'>+            raise KsftSkipEx("FEC not supported by the device") from e</div><div class='add'>+        raise</div><div class='add'>+    if 'stats' not in data:</div><div class='add'>+        raise KsftSkipEx("FEC stats not supported by the device")</div><div class='add'>+    if 'hist' not in data['stats']:</div><div class='add'>+        raise KsftSkipEx("FEC histogram not supported by the device")</div><div class='add'>+</div><div class='add'>+    hist = data['stats']['hist']</div><div class='add'>+    for fec_bin in hist:</div><div class='add'>+        for key in ['bin-low', 'bin-high', 'bin-val']:</div><div class='add'>+            ksft_in(key, fec_bin,</div><div class='add'>+	            "Drivers should always report FEC bin range and value")</div><div class='add'>+        ksft_ge(fec_bin['bin-high'], fec_bin['bin-low'],</div><div class='add'>+                "FEC bin range should be valid")</div><div class='add'>+        if 'bin-val-per-lane' in fec_bin:</div><div class='add'>+            ksft_eq(sum(fec_bin['bin-val-per-lane']), fec_bin['bin-val'],</div><div class='add'>+                    "FEC bin value should be equal to sum of per-plane values")</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> def pkt_byte_sum(cfg) -&gt; None:</div><div class='del'>-    global netfam, rtnl</div><div class='add'>+    """</div><div class='add'>+    Check that qstat and interface stats match in value.</div><div class='add'>+    """</div><div class='ctx'> </div><div class='ctx'>     def get_qstat(test):</div><div class='del'>-        global netfam</div><div class='ctx'>         stats = netfam.qstats_get({}, dump=True)</div><div class='ctx'>         if stats:</div><div class='ctx'>             for qs in stats:</div><div class='ctx'>                 if qs["ifindex"]== test.ifindex:</div><div class='ctx'>                     return qs</div><div class='add'>+        return None</div><div class='ctx'> </div><div class='ctx'>     qstat = get_qstat(cfg)</div><div class='ctx'>     if qstat is None:</div><div class='hunk'>@@ -77,15 +119,14 @@ def pkt_byte_sum(cfg) -&gt; None:</div><div class='ctx'>     for _ in range(10):</div><div class='ctx'>         rtstat = rtnl.getlink({"ifi-index": cfg.ifindex})['stats64']</div><div class='ctx'>         if stat_cmp(rtstat, qstat) &lt; 0:</div><div class='del'>-            raise Exception("RTNL stats are lower, fetched later")</div><div class='add'>+            raise KsftFailEx("RTNL stats are lower, fetched later")</div><div class='ctx'>         qstat = get_qstat(cfg)</div><div class='ctx'>         if stat_cmp(rtstat, qstat) &gt; 0:</div><div class='del'>-            raise Exception("Qstats are lower, fetched later")</div><div class='add'>+            raise KsftFailEx("Qstats are lower, fetched later")</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> def qstat_by_ifindex(cfg) -&gt; None:</div><div class='del'>-    global netfam</div><div class='del'>-    global rtnl</div><div class='add'>+    """ Qstats Netlink API tests - querying by ifindex. """</div><div class='ctx'> </div><div class='ctx'>     # Construct a map ifindex -&gt; [dump, by-index, dump]</div><div class='ctx'>     ifindexes = {}</div><div class='hunk'>@@ -93,7 +134,7 @@ def qstat_by_ifindex(cfg) -&gt; None:</div><div class='ctx'>     for entry in stats:</div><div class='ctx'>         ifindexes[entry['ifindex']] = [entry, None, None]</div><div class='ctx'> </div><div class='del'>-    for ifindex in ifindexes.keys():</div><div class='add'>+    for ifindex in ifindexes:</div><div class='ctx'>         entry = netfam.qstats_get({"ifindex": ifindex}, dump=True)</div><div class='ctx'>         ksft_eq(len(entry), 1)</div><div class='ctx'>         ifindexes[entry[0]['ifindex']][1] = entry[0]</div><div class='hunk'>@@ -145,7 +186,7 @@ def qstat_by_ifindex(cfg) -&gt; None:</div><div class='ctx'> </div><div class='ctx'>     # Try to get stats for lowest unused ifindex but not 0</div><div class='ctx'>     devs = rtnl.getlink({}, dump=True)</div><div class='del'>-    all_ifindexes = set([dev["ifi-index"] for dev in devs])</div><div class='add'>+    all_ifindexes = set(dev["ifi-index"] for dev in devs)</div><div class='ctx'>     lowest = 2</div><div class='ctx'>     while lowest in all_ifindexes:</div><div class='ctx'>         lowest += 1</div><div class='hunk'>@@ -158,18 +199,20 @@ def qstat_by_ifindex(cfg) -&gt; None:</div><div class='ctx'> </div><div class='ctx'> @ksft_disruptive</div><div class='ctx'> def check_down(cfg) -&gt; None:</div><div class='add'>+    """ Test statistics (interface and qstat) are not impacted by ifdown """</div><div class='add'>+</div><div class='ctx'>     try:</div><div class='ctx'>         qstat = netfam.qstats_get({"ifindex": cfg.ifindex}, dump=True)[0]</div><div class='ctx'>     except NlError as e:</div><div class='ctx'>         if e.error == errno.EOPNOTSUPP:</div><div class='del'>-            raise KsftSkipEx("qstats not supported by the device")</div><div class='add'>+            raise KsftSkipEx("qstats not supported by the device") from e</div><div class='ctx'>         raise</div><div class='ctx'> </div><div class='ctx'>     ip(f"link set dev {cfg.dev['ifname']} down")</div><div class='ctx'>     defer(ip, f"link set dev {cfg.dev['ifname']} up")</div><div class='ctx'> </div><div class='ctx'>     qstat2 = netfam.qstats_get({"ifindex": cfg.ifindex}, dump=True)[0]</div><div class='del'>-    for k, v in qstat.items():</div><div class='add'>+    for k in qstat:</div><div class='ctx'>         ksft_ge(qstat2[k], qstat[k], comment=f"{k} went backwards on device down")</div><div class='ctx'> </div><div class='ctx'>     # exercise per-queue API to make sure that "device down" state</div><div class='hunk'>@@ -220,14 +263,15 @@ def procfs_downup_hammer(cfg) -&gt; None:</div><div class='ctx'>     Reading stats via procfs only holds the RCU lock, drivers often try</div><div class='ctx'>     to sleep when reading the stats, or don't protect against races.</div><div class='ctx'>     """</div><div class='del'>-    # Max out the queues, we'll flip between max and 1</div><div class='add'>+    # Set a large number of queues,</div><div class='add'>+    # we'll flip between min(max_queues, 64) and 1</div><div class='ctx'>     channels = ethnl.channels_get({'header': {'dev-index': cfg.ifindex}})</div><div class='ctx'>     if channels['combined-count'] == 0:</div><div class='ctx'>         rx_type = 'rx'</div><div class='ctx'>     else:</div><div class='ctx'>         rx_type = 'combined'</div><div class='ctx'>     cur_queue_cnt = channels[f'{rx_type}-count']</div><div class='del'>-    max_queue_cnt = channels[f'{rx_type}-max']</div><div class='add'>+    max_queue_cnt = min(channels[f'{rx_type}-max'], 64)</div><div class='ctx'> </div><div class='ctx'>     cmd(f"ethtool -L {cfg.ifname} {rx_type} {max_queue_cnt}")</div><div class='ctx'>     defer(cmd, f"ethtool -L {cfg.ifname} {rx_type} {cur_queue_cnt}")</div><div class='hunk'>@@ -263,9 +307,12 @@ def procfs_downup_hammer(cfg) -&gt; None:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> def main() -&gt; None:</div><div class='add'>+    """ Ksft boiler plate main """</div><div class='add'>+</div><div class='ctx'>     with NetDrvEnv(__file__, queue_count=100) as cfg:</div><div class='del'>-        ksft_run([check_pause, check_fec, pkt_byte_sum, qstat_by_ifindex,</div><div class='del'>-                  check_down, procfs_hammer, procfs_downup_hammer],</div><div class='add'>+        ksft_run([check_pause, check_fec, check_fec_hist, pkt_byte_sum,</div><div class='add'>+		  qstat_by_ifindex, check_down, procfs_hammer,</div><div class='add'>+		  procfs_downup_hammer],</div><div class='ctx'>                  args=(cfg, ))</div><div class='ctx'>     ksft_exit()</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/team/Makefile b/tools/testing/selftests/drivers/net/team/Makefile<br/>index 2d5a76d99181..1340b3df9c31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/team/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/team/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/team/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/team/Makefile</a></div><div class='hunk'>@@ -1,11 +1,18 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> # Makefile for net selftests</div><div class='ctx'> </div><div class='del'>-TEST_PROGS := dev_addr_lists.sh</div><div class='add'>+TEST_PROGS := \</div><div class='add'>+	dev_addr_lists.sh \</div><div class='add'>+	options.sh \</div><div class='add'>+	propagation.sh \</div><div class='add'>+# end of TEST_PROGS</div><div class='ctx'> </div><div class='ctx'> TEST_INCLUDES := \</div><div class='ctx'> 	../bonding/lag_lib.sh \</div><div class='ctx'> 	../../../net/forwarding/lib.sh \</div><div class='del'>-	../../../net/lib.sh</div><div class='add'>+	../../../net/in_netns.sh \</div><div class='add'>+	../../../net/lib.sh \</div><div class='add'>+	../../../net/lib/sh/defer.sh \</div><div class='add'>+# end of TEST_INCLUDES</div><div class='ctx'> </div><div class='ctx'> include ../../../lib.mk</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/team/config b/tools/testing/selftests/drivers/net/team/config<br/>index b5e3a3aad4bf..558e1d0cf565 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/team/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/team/config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/team/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/team/config</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='ctx'> CONFIG_DUMMY=y</div><div class='ctx'> CONFIG_IPV6=y</div><div class='ctx'> CONFIG_MACVLAN=y</div><div class='add'>+CONFIG_NETDEVSIM=m</div><div class='ctx'> CONFIG_NET_TEAM=y</div><div class='add'>+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=y</div><div class='ctx'> CONFIG_NET_TEAM_MODE_LOADBALANCE=y</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/team/options.sh b/tools/testing/selftests/drivers/net/team/options.sh<br/>new file mode 100755<br/>index 000000000000..44888f32b513<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/team/options.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/team/options.sh</a></div><div class='hunk'>@@ -0,0 +1,188 @@</div><div class='add'>+#!/bin/bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+# These tests verify basic set and get functionality of the team</div><div class='add'>+# driver options over netlink.</div><div class='add'>+</div><div class='add'>+# Run in private netns.</div><div class='add'>+test_dir="$(dirname "$0")"</div><div class='add'>+if [[ $# -eq 0 ]]; then</div><div class='add'>+        "${test_dir}"/../../../net/in_netns.sh "$0" __subprocess</div><div class='add'>+        exit $?</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+ALL_TESTS="</div><div class='add'>+        team_test_options</div><div class='add'>+"</div><div class='add'>+</div><div class='add'>+source "${test_dir}/../../../net/lib.sh"</div><div class='add'>+</div><div class='add'>+TEAM_PORT="team0"</div><div class='add'>+MEMBER_PORT="dummy0"</div><div class='add'>+</div><div class='add'>+setup()</div><div class='add'>+{</div><div class='add'>+        ip link add name "${MEMBER_PORT}" type dummy</div><div class='add'>+        ip link add name "${TEAM_PORT}" type team</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+get_and_check_value()</div><div class='add'>+{</div><div class='add'>+        local option_name="$1"</div><div class='add'>+        local expected_value="$2"</div><div class='add'>+        local port_flag="$3"</div><div class='add'>+</div><div class='add'>+        local value_from_get</div><div class='add'>+</div><div class='add'>+        if ! value_from_get=$(teamnl "${TEAM_PORT}" getoption "${option_name}" \</div><div class='add'>+                        "${port_flag}"); then</div><div class='add'>+                echo "Could not get option '${option_name}'" &gt;&amp;2</div><div class='add'>+                return 1</div><div class='add'>+        fi</div><div class='add'>+</div><div class='add'>+        if [[ "${value_from_get}" != "${expected_value}" ]]; then</div><div class='add'>+                echo "Incorrect value for option '${option_name}'" &gt;&amp;2</div><div class='add'>+                echo "get (${value_from_get}) != set (${expected_value})" &gt;&amp;2</div><div class='add'>+                return 1</div><div class='add'>+        fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+set_and_check_get()</div><div class='add'>+{</div><div class='add'>+        local option_name="$1"</div><div class='add'>+        local option_value="$2"</div><div class='add'>+        local port_flag="$3"</div><div class='add'>+</div><div class='add'>+        local value_from_get</div><div class='add'>+</div><div class='add'>+        if ! teamnl "${TEAM_PORT}" setoption "${option_name}" \</div><div class='add'>+                        "${option_value}" "${port_flag}"; then</div><div class='add'>+                echo "'setoption ${option_name} ${option_value}' failed" &gt;&amp;2</div><div class='add'>+                return 1</div><div class='add'>+        fi</div><div class='add'>+</div><div class='add'>+        get_and_check_value "${option_name}" "${option_value}" "${port_flag}"</div><div class='add'>+        return $?</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Get a "port flag" to pass to the `teamnl` command.</div><div class='add'>+# E.g. $1="dummy0" -&gt; "port=dummy0",</div><div class='add'>+#      $1=""       -&gt; ""</div><div class='add'>+get_port_flag()</div><div class='add'>+{</div><div class='add'>+        local port_name="$1"</div><div class='add'>+</div><div class='add'>+        if [[ -n "${port_name}" ]]; then</div><div class='add'>+                echo "--port=${port_name}"</div><div class='add'>+        fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+attach_port_if_specified()</div><div class='add'>+{</div><div class='add'>+        local port_name="$1"</div><div class='add'>+</div><div class='add'>+        if [[ -n "${port_name}" ]]; then</div><div class='add'>+                ip link set dev "${port_name}" master "${TEAM_PORT}"</div><div class='add'>+                return $?</div><div class='add'>+        fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+detach_port_if_specified()</div><div class='add'>+{</div><div class='add'>+        local port_name="$1"</div><div class='add'>+</div><div class='add'>+        if [[ -n "${port_name}" ]]; then</div><div class='add'>+                ip link set dev "${port_name}" nomaster</div><div class='add'>+                return $?</div><div class='add'>+        fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Test that an option's get value matches its set value.</div><div class='add'>+# Globals:</div><div class='add'>+#   RET - Used by testing infra like `check_err`.</div><div class='add'>+#   EXIT_STATUS - Used by `log_test` for whole script exit value.</div><div class='add'>+# Arguments:</div><div class='add'>+#   option_name - The name of the option.</div><div class='add'>+#   value_1 - The first value to try setting.</div><div class='add'>+#   value_2 - The second value to try setting.</div><div class='add'>+#   port_name - The (optional) name of the attached port.</div><div class='add'>+team_test_option()</div><div class='add'>+{</div><div class='add'>+        local option_name="$1"</div><div class='add'>+        local value_1="$2"</div><div class='add'>+        local value_2="$3"</div><div class='add'>+        local possible_values="$2 $3 $2"</div><div class='add'>+        local port_name="$4"</div><div class='add'>+        local port_flag</div><div class='add'>+</div><div class='add'>+        RET=0</div><div class='add'>+</div><div class='add'>+        echo "Setting '${option_name}' to '${value_1}' and '${value_2}'"</div><div class='add'>+</div><div class='add'>+        attach_port_if_specified "${port_name}"</div><div class='add'>+        check_err $? "Couldn't attach ${port_name} to master"</div><div class='add'>+        port_flag=$(get_port_flag "${port_name}")</div><div class='add'>+</div><div class='add'>+        # Set and get both possible values.</div><div class='add'>+        for value in ${possible_values}; do</div><div class='add'>+                set_and_check_get "${option_name}" "${value}" "${port_flag}"</div><div class='add'>+                check_err $? "Failed to set '${option_name}' to '${value}'"</div><div class='add'>+        done</div><div class='add'>+</div><div class='add'>+        detach_port_if_specified "${port_name}"</div><div class='add'>+        check_err $? "Couldn't detach ${port_name} from its master"</div><div class='add'>+</div><div class='add'>+        log_test "Set + Get '${option_name}' test"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Test that getting a non-existant option fails.</div><div class='add'>+# Globals:</div><div class='add'>+#   RET - Used by testing infra like `check_err`.</div><div class='add'>+#   EXIT_STATUS - Used by `log_test` for whole script exit value.</div><div class='add'>+# Arguments:</div><div class='add'>+#   option_name - The name of the option.</div><div class='add'>+#   port_name - The (optional) name of the attached port.</div><div class='add'>+team_test_get_option_fails()</div><div class='add'>+{</div><div class='add'>+        local option_name="$1"</div><div class='add'>+        local port_name="$2"</div><div class='add'>+        local port_flag</div><div class='add'>+</div><div class='add'>+        RET=0</div><div class='add'>+</div><div class='add'>+        attach_port_if_specified "${port_name}"</div><div class='add'>+        check_err $? "Couldn't attach ${port_name} to master"</div><div class='add'>+        port_flag=$(get_port_flag "${port_name}")</div><div class='add'>+</div><div class='add'>+        # Just confirm that getting the value fails.</div><div class='add'>+        teamnl "${TEAM_PORT}" getoption "${option_name}" "${port_flag}"</div><div class='add'>+        check_fail $? "Shouldn't be able to get option '${option_name}'"</div><div class='add'>+</div><div class='add'>+        detach_port_if_specified "${port_name}"</div><div class='add'>+</div><div class='add'>+        log_test "Get '${option_name}' fails"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+team_test_options()</div><div class='add'>+{</div><div class='add'>+        # Wrong option name behavior.</div><div class='add'>+        team_test_get_option_fails fake_option1</div><div class='add'>+        team_test_get_option_fails fake_option2 "${MEMBER_PORT}"</div><div class='add'>+</div><div class='add'>+        # Correct set and get behavior.</div><div class='add'>+        team_test_option mode activebackup loadbalance</div><div class='add'>+        team_test_option notify_peers_count 0 5</div><div class='add'>+        team_test_option notify_peers_interval 0 5</div><div class='add'>+        team_test_option mcast_rejoin_count 0 5</div><div class='add'>+        team_test_option mcast_rejoin_interval 0 5</div><div class='add'>+        team_test_option enabled true false "${MEMBER_PORT}"</div><div class='add'>+        team_test_option user_linkup true false "${MEMBER_PORT}"</div><div class='add'>+        team_test_option user_linkup_enabled true false "${MEMBER_PORT}"</div><div class='add'>+        team_test_option priority 10 20 "${MEMBER_PORT}"</div><div class='add'>+        team_test_option queue_id 0 1 "${MEMBER_PORT}"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+require_command teamnl</div><div class='add'>+setup</div><div class='add'>+tests_run</div><div class='add'>+exit "${EXIT_STATUS}"</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/team/propagation.sh b/tools/testing/selftests/drivers/net/team/propagation.sh<br/>new file mode 100755<br/>index 000000000000..4bea75b79878<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/team/propagation.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/team/propagation.sh</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+#!/bin/bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+set -e</div><div class='add'>+</div><div class='add'>+NSIM_LRO_ID=$((256 + RANDOM % 256))</div><div class='add'>+NSIM_LRO_SYS=/sys/bus/netdevsim/devices/netdevsim$NSIM_LRO_ID</div><div class='add'>+</div><div class='add'>+NSIM_DEV_SYS_NEW=/sys/bus/netdevsim/new_device</div><div class='add'>+NSIM_DEV_SYS_DEL=/sys/bus/netdevsim/del_device</div><div class='add'>+</div><div class='add'>+cleanup()</div><div class='add'>+{</div><div class='add'>+	set +e</div><div class='add'>+	ip link del dummyteam &amp;&gt;/dev/null</div><div class='add'>+	ip link del team0 &amp;&gt;/dev/null</div><div class='add'>+	echo $NSIM_LRO_ID &gt; $NSIM_DEV_SYS_DEL</div><div class='add'>+	modprobe -r netdevsim</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Trigger LRO propagation to the lower.</div><div class='add'>+# https://lore.kernel.org/netdev/aBvOpkIoxcr9PfDg@mini-arch/</div><div class='add'>+team_lro()</div><div class='add'>+{</div><div class='add'>+	# using netdevsim because it supports NETIF_F_LRO</div><div class='add'>+	NSIM_LRO_NAME=$(find $NSIM_LRO_SYS/net -maxdepth 1 -type d ! \</div><div class='add'>+		-path $NSIM_LRO_SYS/net -exec basename {} \;)</div><div class='add'>+</div><div class='add'>+	ip link add name team0 type team</div><div class='add'>+	ip link set $NSIM_LRO_NAME down</div><div class='add'>+	ip link set dev $NSIM_LRO_NAME master team0</div><div class='add'>+	ip link set team0 up</div><div class='add'>+	ethtool -K team0 large-receive-offload off</div><div class='add'>+</div><div class='add'>+	ip link del team0</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Trigger promisc propagation to the lower during IFLA_MASTER.</div><div class='add'>+# https://lore.kernel.org/netdev/20250506032328.3003050-1-sdf@fomichev.me/</div><div class='add'>+team_promisc()</div><div class='add'>+{</div><div class='add'>+	ip link add name dummyteam type dummy</div><div class='add'>+	ip link add name team0 type team</div><div class='add'>+	ip link set dummyteam down</div><div class='add'>+	ip link set team0 promisc on</div><div class='add'>+	ip link set dev dummyteam master team0</div><div class='add'>+	ip link set team0 up</div><div class='add'>+</div><div class='add'>+	ip link del team0</div><div class='add'>+	ip link del dummyteam</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Trigger promisc propagation to the lower via netif_change_flags (aka</div><div class='add'>+# ndo_change_rx_flags).</div><div class='add'>+# https://lore.kernel.org/netdev/20250514220319.3505158-1-stfomichev@gmail.com/</div><div class='add'>+team_change_flags()</div><div class='add'>+{</div><div class='add'>+	ip link add name dummyteam type dummy</div><div class='add'>+	ip link add name team0 type team</div><div class='add'>+	ip link set dummyteam down</div><div class='add'>+	ip link set dev dummyteam master team0</div><div class='add'>+	ip link set team0 up</div><div class='add'>+	ip link set team0 promisc on</div><div class='add'>+</div><div class='add'>+	# Make sure we can add more L2 addresses without any issues.</div><div class='add'>+	ip link add link team0 address 00:00:00:00:00:01 team0.1 type macvlan</div><div class='add'>+	ip link set team0.1 up</div><div class='add'>+</div><div class='add'>+	ip link del team0.1</div><div class='add'>+	ip link del team0</div><div class='add'>+	ip link del dummyteam</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+trap cleanup EXIT</div><div class='add'>+modprobe netdevsim || :</div><div class='add'>+echo $NSIM_LRO_ID &gt; $NSIM_DEV_SYS_NEW</div><div class='add'>+udevadm settle</div><div class='add'>+team_lro</div><div class='add'>+team_promisc</div><div class='add'>+team_change_flags</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/virtio_net/Makefile b/tools/testing/selftests/drivers/net/virtio_net/Makefile<br/>index 7ec7cd3ab2cc..868ece3fea1f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/virtio_net/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/net/virtio_net/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/virtio_net/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/virtio_net/Makefile</a></div><div class='hunk'>@@ -1,15 +1,12 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0+ OR MIT</div><div class='ctx'> </div><div class='del'>-TEST_PROGS = basic_features.sh \</div><div class='del'>-        #</div><div class='add'>+TEST_PROGS = basic_features.sh</div><div class='ctx'> </div><div class='del'>-TEST_FILES = \</div><div class='del'>-        virtio_net_common.sh \</div><div class='del'>-        #</div><div class='add'>+TEST_FILES = virtio_net_common.sh</div><div class='ctx'> </div><div class='ctx'> TEST_INCLUDES = \</div><div class='del'>-        ../../../net/forwarding/lib.sh \</div><div class='del'>-        ../../../net/lib.sh \</div><div class='del'>-        #</div><div class='add'>+	../../../net/forwarding/lib.sh \</div><div class='add'>+	../../../net/lib.sh \</div><div class='add'>+# end of TEST_INCLUDES</div><div class='ctx'> </div><div class='ctx'> include ../../../lib.mk</div><div class='head'>diff --git a/tools/testing/selftests/drivers/net/xdp.py b/tools/testing/selftests/drivers/net/xdp.py<br/>new file mode 100755<br/>index 000000000000..e54df158dfe9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/net/xdp.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/net/xdp.py</a></div><div class='hunk'>@@ -0,0 +1,779 @@</div><div class='add'>+#!/usr/bin/env python3</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+"""</div><div class='add'>+This file contains tests to verify native XDP support in network drivers.</div><div class='add'>+The tests utilize the BPF program `xdp_native.bpf.o` from the `selftests.net.lib`</div><div class='add'>+directory, with each test focusing on a specific aspect of XDP functionality.</div><div class='add'>+"""</div><div class='add'>+import random</div><div class='add'>+import string</div><div class='add'>+from dataclasses import dataclass</div><div class='add'>+from enum import Enum</div><div class='add'>+</div><div class='add'>+from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_ge, ksft_ne, ksft_pr</div><div class='add'>+from lib.py import KsftNamedVariant, ksft_variants</div><div class='add'>+from lib.py import KsftFailEx, NetDrvEpEnv</div><div class='add'>+from lib.py import EthtoolFamily, NetdevFamily, NlError</div><div class='add'>+from lib.py import bkg, cmd, rand_port, wait_port_listen</div><div class='add'>+from lib.py import ip, bpftool, defer</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+class TestConfig(Enum):</div><div class='add'>+    """Enum for XDP configuration options."""</div><div class='add'>+    MODE = 0  # Configures the BPF program for a specific test</div><div class='add'>+    PORT = 1  # Port configuration to communicate with the remote host</div><div class='add'>+    ADJST_OFFSET = 2  # Tail/Head adjustment offset for extension/shrinking</div><div class='add'>+    ADJST_TAG = 3  # Adjustment tag to annotate the start and end of extension</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+class XDPAction(Enum):</div><div class='add'>+    """Enum for XDP actions."""</div><div class='add'>+    PASS = 0  # Pass the packet up to the stack</div><div class='add'>+    DROP = 1  # Drop the packet</div><div class='add'>+    TX = 2    # Route the packet to the remote host</div><div class='add'>+    TAIL_ADJST = 3  # Adjust the tail of the packet</div><div class='add'>+    HEAD_ADJST = 4  # Adjust the head of the packet</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+class XDPStats(Enum):</div><div class='add'>+    """Enum for XDP statistics."""</div><div class='add'>+    RX = 0    # Count of valid packets received for testing</div><div class='add'>+    PASS = 1  # Count of packets passed up to the stack</div><div class='add'>+    DROP = 2  # Count of packets dropped</div><div class='add'>+    TX = 3    # Count of incoming packets routed to the remote host</div><div class='add'>+    ABORT = 4 # Count of packets that were aborted</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+@dataclass</div><div class='add'>+class BPFProgInfo:</div><div class='add'>+    """Data class to store information about a BPF program."""</div><div class='add'>+    name: str               # Name of the BPF program</div><div class='add'>+    file: str               # BPF program object file</div><div class='add'>+    xdp_sec: str = "xdp"    # XDP section name (e.g., "xdp" or "xdp.frags")</div><div class='add'>+    mtu: int = 1500         # Maximum Transmission Unit, default is 1500</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _exchg_udp(cfg, port, test_string):</div><div class='add'>+    """</div><div class='add'>+    Exchanges UDP packets between a local and remote host using the socat tool.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+        port: Port number to use for the UDP communication.</div><div class='add'>+        test_string: String that the remote host will send.</div><div class='add'>+</div><div class='add'>+    Returns:</div><div class='add'>+        The string received by the test host.</div><div class='add'>+    """</div><div class='add'>+    cfg.require_cmd("socat", remote=True)</div><div class='add'>+</div><div class='add'>+    rx_udp_cmd = f"socat -{cfg.addr_ipver} -T 2 -u UDP-RECV:{port},reuseport STDOUT"</div><div class='add'>+    tx_udp_cmd = f"echo -n {test_string} | socat -t 2 -u STDIN UDP:{cfg.baddr}:{port}"</div><div class='add'>+</div><div class='add'>+    with bkg(rx_udp_cmd, exit_wait=True) as nc:</div><div class='add'>+        wait_port_listen(port, proto="udp")</div><div class='add'>+        cmd(tx_udp_cmd, host=cfg.remote, shell=True)</div><div class='add'>+</div><div class='add'>+    return nc.stdout.strip()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _test_udp(cfg, port, size=256):</div><div class='add'>+    """</div><div class='add'>+    Tests UDP packet exchange between a local and remote host.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+        port: Port number to use for the UDP communication.</div><div class='add'>+        size: The length of the test string to be exchanged, default is 256 characters.</div><div class='add'>+</div><div class='add'>+    Returns:</div><div class='add'>+        bool: True if the received string matches the sent string, False otherwise.</div><div class='add'>+    """</div><div class='add'>+    test_str = "".join(random.choice(string.ascii_lowercase) for _ in range(size))</div><div class='add'>+    recvd_str = _exchg_udp(cfg, port, test_str)</div><div class='add'>+</div><div class='add'>+    return recvd_str == test_str</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _load_xdp_prog(cfg, bpf_info):</div><div class='add'>+    """</div><div class='add'>+    Loads an XDP program onto a network interface.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+        bpf_info: BPFProgInfo object containing information about the BPF program.</div><div class='add'>+</div><div class='add'>+    Returns:</div><div class='add'>+        dict: A dictionary containing the XDP program ID, name, and associated map IDs.</div><div class='add'>+    """</div><div class='add'>+    abs_path = cfg.net_lib_dir / bpf_info.file</div><div class='add'>+    prog_info = {}</div><div class='add'>+</div><div class='add'>+    cmd(f"ip link set dev {cfg.remote_ifname} mtu {bpf_info.mtu}", shell=True, host=cfg.remote)</div><div class='add'>+    defer(ip, f"link set dev {cfg.remote_ifname} mtu 1500", host=cfg.remote)</div><div class='add'>+</div><div class='add'>+    cmd(</div><div class='add'>+    f"ip link set dev {cfg.ifname} mtu {bpf_info.mtu} xdpdrv obj {abs_path} sec {bpf_info.xdp_sec}",</div><div class='add'>+    shell=True</div><div class='add'>+    )</div><div class='add'>+    defer(ip, f"link set dev {cfg.ifname} mtu 1500 xdpdrv off")</div><div class='add'>+</div><div class='add'>+    xdp_info = ip(f"-d link show dev {cfg.ifname}", json=True)[0]</div><div class='add'>+    prog_info["id"] = xdp_info["xdp"]["prog"]["id"]</div><div class='add'>+    prog_info["name"] = xdp_info["xdp"]["prog"]["name"]</div><div class='add'>+    prog_id = prog_info["id"]</div><div class='add'>+</div><div class='add'>+    map_ids = bpftool(f"prog show id {prog_id}", json=True)["map_ids"]</div><div class='add'>+    prog_info["maps"] = {}</div><div class='add'>+    for map_id in map_ids:</div><div class='add'>+        name = bpftool(f"map show id {map_id}", json=True)["name"]</div><div class='add'>+        prog_info["maps"][name] = map_id</div><div class='add'>+</div><div class='add'>+    return prog_info</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def format_hex_bytes(value):</div><div class='add'>+    """</div><div class='add'>+    Helper function that converts an integer into a formatted hexadecimal byte string.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        value: An integer representing the number to be converted.</div><div class='add'>+</div><div class='add'>+    Returns:</div><div class='add'>+        A string representing hexadecimal equivalent of value, with bytes separated by spaces.</div><div class='add'>+    """</div><div class='add'>+    hex_str = value.to_bytes(4, byteorder='little', signed=True)</div><div class='add'>+    return ' '.join(f'{byte:02x}' for byte in hex_str)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _set_xdp_map(map_name, key, value):</div><div class='add'>+    """</div><div class='add'>+    Updates an XDP map with a given key-value pair using bpftool.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        map_name: The name of the XDP map to update.</div><div class='add'>+        key: The key to update in the map, formatted as a hexadecimal string.</div><div class='add'>+        value: The value to associate with the key, formatted as a hexadecimal string.</div><div class='add'>+    """</div><div class='add'>+    key_formatted = format_hex_bytes(key)</div><div class='add'>+    value_formatted = format_hex_bytes(value)</div><div class='add'>+    bpftool(</div><div class='add'>+        f"map update name {map_name} key hex {key_formatted} value hex {value_formatted}"</div><div class='add'>+    )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _get_stats(xdp_map_id):</div><div class='add'>+    """</div><div class='add'>+    Retrieves and formats statistics from an XDP map.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        xdp_map_id: The ID of the XDP map from which to retrieve statistics.</div><div class='add'>+</div><div class='add'>+    Returns:</div><div class='add'>+        A dictionary containing formatted packet statistics for various XDP actions.</div><div class='add'>+        The keys are based on the XDPStats Enum values.</div><div class='add'>+</div><div class='add'>+    Raises:</div><div class='add'>+        KsftFailEx: If the stats retrieval fails.</div><div class='add'>+    """</div><div class='add'>+    stats_dump = bpftool(f"map dump id {xdp_map_id}", json=True)</div><div class='add'>+    if not stats_dump:</div><div class='add'>+        raise KsftFailEx(f"Failed to get stats for map {xdp_map_id}")</div><div class='add'>+</div><div class='add'>+    stats_formatted = {}</div><div class='add'>+    for key in range(0, 5):</div><div class='add'>+        val = stats_dump[key]["formatted"]["value"]</div><div class='add'>+        if stats_dump[key]["formatted"]["key"] == XDPStats.RX.value:</div><div class='add'>+            stats_formatted[XDPStats.RX.value] = val</div><div class='add'>+        elif stats_dump[key]["formatted"]["key"] == XDPStats.PASS.value:</div><div class='add'>+            stats_formatted[XDPStats.PASS.value] = val</div><div class='add'>+        elif stats_dump[key]["formatted"]["key"] == XDPStats.DROP.value:</div><div class='add'>+            stats_formatted[XDPStats.DROP.value] = val</div><div class='add'>+        elif stats_dump[key]["formatted"]["key"] == XDPStats.TX.value:</div><div class='add'>+            stats_formatted[XDPStats.TX.value] = val</div><div class='add'>+        elif stats_dump[key]["formatted"]["key"] == XDPStats.ABORT.value:</div><div class='add'>+            stats_formatted[XDPStats.ABORT.value] = val</div><div class='add'>+</div><div class='add'>+    return stats_formatted</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _test_pass(cfg, bpf_info, msg_sz):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP_PASS action by exchanging UDP packets.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+        bpf_info: BPFProgInfo object containing information about the BPF program.</div><div class='add'>+        msg_sz: Size of the test message to send.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    prog_info = _load_xdp_prog(cfg, bpf_info)</div><div class='add'>+    port = rand_port()</div><div class='add'>+</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.MODE.value, XDPAction.PASS.value)</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.PORT.value, port)</div><div class='add'>+</div><div class='add'>+    ksft_eq(_test_udp(cfg, port, msg_sz), True, "UDP packet exchange failed")</div><div class='add'>+    stats = _get_stats(prog_info["maps"]["map_xdp_stats"])</div><div class='add'>+</div><div class='add'>+    ksft_ne(stats[XDPStats.RX.value], 0, "RX stats should not be zero")</div><div class='add'>+    ksft_eq(stats[XDPStats.RX.value], stats[XDPStats.PASS.value], "RX and PASS stats mismatch")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_xdp_native_pass_sb(cfg):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP_PASS action for single buffer case.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+    """</div><div class='add'>+    bpf_info = BPFProgInfo("xdp_prog", "xdp_native.bpf.o", "xdp", 1500)</div><div class='add'>+</div><div class='add'>+    _test_pass(cfg, bpf_info, 256)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_xdp_native_pass_mb(cfg):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP_PASS action for a multi-buff size.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+    """</div><div class='add'>+    bpf_info = BPFProgInfo("xdp_prog_frags", "xdp_native.bpf.o", "xdp.frags", 9000)</div><div class='add'>+</div><div class='add'>+    _test_pass(cfg, bpf_info, 8000)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _test_drop(cfg, bpf_info, msg_sz):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP_DROP action by exchanging UDP packets.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+        bpf_info: BPFProgInfo object containing information about the BPF program.</div><div class='add'>+        msg_sz: Size of the test message to send.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    prog_info = _load_xdp_prog(cfg, bpf_info)</div><div class='add'>+    port = rand_port()</div><div class='add'>+</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.MODE.value, XDPAction.DROP.value)</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.PORT.value, port)</div><div class='add'>+</div><div class='add'>+    ksft_eq(_test_udp(cfg, port, msg_sz), False, "UDP packet exchange should fail")</div><div class='add'>+    stats = _get_stats(prog_info["maps"]["map_xdp_stats"])</div><div class='add'>+</div><div class='add'>+    ksft_ne(stats[XDPStats.RX.value], 0, "RX stats should be zero")</div><div class='add'>+    ksft_eq(stats[XDPStats.RX.value], stats[XDPStats.DROP.value], "RX and DROP stats mismatch")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_xdp_native_drop_sb(cfg):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP_DROP action for a signle-buff case.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+    """</div><div class='add'>+    bpf_info = BPFProgInfo("xdp_prog", "xdp_native.bpf.o", "xdp", 1500)</div><div class='add'>+</div><div class='add'>+    _test_drop(cfg, bpf_info, 256)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_xdp_native_drop_mb(cfg):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP_DROP action for a multi-buff case.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+    """</div><div class='add'>+    bpf_info = BPFProgInfo("xdp_prog_frags", "xdp_native.bpf.o", "xdp.frags", 9000)</div><div class='add'>+</div><div class='add'>+    _test_drop(cfg, bpf_info, 8000)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _test_xdp_native_tx(cfg, bpf_info, payload_lens):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP_TX action.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+        bpf_info: BPFProgInfo object containing the BPF program metadata.</div><div class='add'>+        payload_lens: Array of packet lengths to send.</div><div class='add'>+    """</div><div class='add'>+    cfg.require_cmd("socat", remote=True)</div><div class='add'>+    prog_info = _load_xdp_prog(cfg, bpf_info)</div><div class='add'>+    port = rand_port()</div><div class='add'>+</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.MODE.value, XDPAction.TX.value)</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.PORT.value, port)</div><div class='add'>+</div><div class='add'>+    expected_pkts = 0</div><div class='add'>+    for payload_len in payload_lens:</div><div class='add'>+        test_string = "".join(</div><div class='add'>+            random.choice(string.ascii_lowercase) for _ in range(payload_len)</div><div class='add'>+        )</div><div class='add'>+</div><div class='add'>+        rx_udp = f"socat -{cfg.addr_ipver} -T 2 " + \</div><div class='add'>+                 f"-u UDP-RECV:{port},reuseport STDOUT"</div><div class='add'>+</div><div class='add'>+        # Writing zero bytes to stdin gets ignored by socat,</div><div class='add'>+        # but with the shut-null flag socat generates a zero sized packet</div><div class='add'>+        # when the socket is closed.</div><div class='add'>+        tx_cmd_suffix = ",shut-null" if payload_len == 0 else ""</div><div class='add'>+        tx_udp = f"echo -n {test_string} | socat -t 2 " + \</div><div class='add'>+                 f"-u STDIN UDP:{cfg.baddr}:{port}{tx_cmd_suffix}"</div><div class='add'>+</div><div class='add'>+        with bkg(rx_udp, host=cfg.remote, exit_wait=True) as rnc:</div><div class='add'>+            wait_port_listen(port, proto="udp", host=cfg.remote)</div><div class='add'>+            cmd(tx_udp, host=cfg.remote, shell=True)</div><div class='add'>+</div><div class='add'>+        ksft_eq(rnc.stdout.strip(), test_string, "UDP packet exchange failed")</div><div class='add'>+</div><div class='add'>+        expected_pkts += 1</div><div class='add'>+        stats = _get_stats(prog_info["maps"]["map_xdp_stats"])</div><div class='add'>+        ksft_eq(stats[XDPStats.RX.value], expected_pkts, "RX stats mismatch")</div><div class='add'>+        ksft_eq(stats[XDPStats.TX.value], expected_pkts, "TX stats mismatch")</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_xdp_native_tx_sb(cfg):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP_TX action for a single-buff case.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+    """</div><div class='add'>+    bpf_info = BPFProgInfo("xdp_prog", "xdp_native.bpf.o", "xdp", 1500)</div><div class='add'>+</div><div class='add'>+    # Ensure there's enough room for an ETH / IP / UDP header</div><div class='add'>+    pkt_hdr_len = 42 if cfg.addr_ipver == "4" else 62</div><div class='add'>+</div><div class='add'>+    _test_xdp_native_tx(cfg, bpf_info, [0, 1500 // 2, 1500 - pkt_hdr_len])</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_xdp_native_tx_mb(cfg):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP_TX action for a multi-buff case.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+    """</div><div class='add'>+    bpf_info = BPFProgInfo("xdp_prog_frags", "xdp_native.bpf.o",</div><div class='add'>+                           "xdp.frags", 9000)</div><div class='add'>+    # The first packet ensures we exercise the fragmented code path.</div><div class='add'>+    # And the subsequent 0-sized packet ensures the driver</div><div class='add'>+    # reinitializes xdp_buff correctly.</div><div class='add'>+    _test_xdp_native_tx(cfg, bpf_info, [8000, 0])</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _validate_res(res, offset_lst, pkt_sz_lst):</div><div class='add'>+    """</div><div class='add'>+    Validates the result of a test.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        res: The result of the test, which should be a dictionary with a "status" key.</div><div class='add'>+</div><div class='add'>+    Raises:</div><div class='add'>+        KsftFailEx: If the test fails to pass any combination of offset and packet size.</div><div class='add'>+    """</div><div class='add'>+    if "status" not in res:</div><div class='add'>+        raise KsftFailEx("Missing 'status' key in result dictionary")</div><div class='add'>+</div><div class='add'>+    # Validate that not a single case was successful</div><div class='add'>+    if res["status"] == "fail":</div><div class='add'>+        if res["offset"] == offset_lst[0] and res["pkt_sz"] == pkt_sz_lst[0]:</div><div class='add'>+            raise KsftFailEx(f"{res['reason']}")</div><div class='add'>+</div><div class='add'>+        # Get the previous offset and packet size to report the successful run</div><div class='add'>+        tmp_idx = offset_lst.index(res["offset"])</div><div class='add'>+        prev_offset = offset_lst[tmp_idx - 1]</div><div class='add'>+        if tmp_idx == 0:</div><div class='add'>+            tmp_idx = pkt_sz_lst.index(res["pkt_sz"])</div><div class='add'>+            prev_pkt_sz = pkt_sz_lst[tmp_idx - 1]</div><div class='add'>+        else:</div><div class='add'>+            prev_pkt_sz = res["pkt_sz"]</div><div class='add'>+</div><div class='add'>+        # Use these values for error reporting</div><div class='add'>+        ksft_pr(</div><div class='add'>+        f"Failed run: pkt_sz {res['pkt_sz']}, offset {res['offset']}. "</div><div class='add'>+        f"Last successful run: pkt_sz {prev_pkt_sz}, offset {prev_offset}. "</div><div class='add'>+        f"Reason: {res['reason']}"</div><div class='add'>+        )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _check_for_failures(recvd_str, stats):</div><div class='add'>+    """</div><div class='add'>+    Checks for common failures while adjusting headroom or tailroom.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        recvd_str: The string received from the remote host after sending a test string.</div><div class='add'>+        stats: A dictionary containing formatted packet statistics for various XDP actions.</div><div class='add'>+</div><div class='add'>+    Returns:</div><div class='add'>+        str: A string describing the failure reason if a failure is detected, otherwise None.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    # Any adjustment failure result in an abort hence, we track this counter</div><div class='add'>+    if stats[XDPStats.ABORT.value] != 0:</div><div class='add'>+        return "Adjustment failed"</div><div class='add'>+</div><div class='add'>+    # Since we are using aggregate stats for a single test across all offsets and packet sizes</div><div class='add'>+    # we can't use RX stats only to track data exchange failure without taking a previous</div><div class='add'>+    # snapshot. An easier way is to simply check for non-zero length of received string.</div><div class='add'>+    if len(recvd_str) == 0:</div><div class='add'>+        return "Data exchange failed"</div><div class='add'>+</div><div class='add'>+    # Check for RX and PASS stats mismatch. Ideally, they should be equal for a successful run</div><div class='add'>+    if stats[XDPStats.RX.value] != stats[XDPStats.PASS.value]:</div><div class='add'>+        return "RX stats mismatch"</div><div class='add'>+</div><div class='add'>+    return None</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _test_xdp_native_tail_adjst(cfg, pkt_sz_lst, offset_lst):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP tail adjustment functionality.</div><div class='add'>+</div><div class='add'>+    This function loads the appropriate XDP program based on the provided</div><div class='add'>+    program name and configures the XDP map for tail adjustment. It then</div><div class='add'>+    validates the tail adjustment by sending and receiving UDP packets</div><div class='add'>+    with specified packet sizes and offsets.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+        prog: Name of the XDP program to load.</div><div class='add'>+        pkt_sz_lst: List of packet sizes to test.</div><div class='add'>+        offset_lst: List of offsets to validate support for tail adjustment.</div><div class='add'>+</div><div class='add'>+    Returns:</div><div class='add'>+        dict: A dictionary with test status and failure details if applicable.</div><div class='add'>+    """</div><div class='add'>+    port = rand_port()</div><div class='add'>+    bpf_info = BPFProgInfo("xdp_prog_frags", "xdp_native.bpf.o", "xdp.frags", 9000)</div><div class='add'>+</div><div class='add'>+    prog_info = _load_xdp_prog(cfg, bpf_info)</div><div class='add'>+</div><div class='add'>+    # Configure the XDP map for tail adjustment</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.MODE.value, XDPAction.TAIL_ADJST.value)</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.PORT.value, port)</div><div class='add'>+</div><div class='add'>+    for offset in offset_lst:</div><div class='add'>+        tag = format(random.randint(65, 90), "02x")</div><div class='add'>+</div><div class='add'>+        _set_xdp_map("map_xdp_setup", TestConfig.ADJST_OFFSET.value, offset)</div><div class='add'>+        if offset &gt; 0:</div><div class='add'>+            _set_xdp_map("map_xdp_setup", TestConfig.ADJST_TAG.value, int(tag, 16))</div><div class='add'>+</div><div class='add'>+        for pkt_sz in pkt_sz_lst:</div><div class='add'>+            test_str = "".join(random.choice(string.ascii_lowercase) for _ in range(pkt_sz))</div><div class='add'>+            recvd_str = _exchg_udp(cfg, port, test_str)</div><div class='add'>+            stats = _get_stats(prog_info["maps"]["map_xdp_stats"])</div><div class='add'>+</div><div class='add'>+            failure = _check_for_failures(recvd_str, stats)</div><div class='add'>+            if failure is not None:</div><div class='add'>+                return {</div><div class='add'>+                    "status": "fail",</div><div class='add'>+                    "reason": failure,</div><div class='add'>+                    "offset": offset,</div><div class='add'>+                    "pkt_sz": pkt_sz,</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+            # Validate data content based on offset direction</div><div class='add'>+            expected_data = None</div><div class='add'>+            if offset &gt; 0:</div><div class='add'>+                expected_data = test_str + (offset * chr(int(tag, 16)))</div><div class='add'>+            else:</div><div class='add'>+                expected_data = test_str[0:pkt_sz + offset]</div><div class='add'>+</div><div class='add'>+            if recvd_str != expected_data:</div><div class='add'>+                return {</div><div class='add'>+                    "status": "fail",</div><div class='add'>+                    "reason": "Data mismatch",</div><div class='add'>+                    "offset": offset,</div><div class='add'>+                    "pkt_sz": pkt_sz,</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+    return {"status": "pass"}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_xdp_native_adjst_tail_grow_data(cfg):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP tail adjustment by growing packet data.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+    """</div><div class='add'>+    pkt_sz_lst = [512, 1024, 2048]</div><div class='add'>+    offset_lst = [1, 16, 32, 64, 128, 256]</div><div class='add'>+    res = _test_xdp_native_tail_adjst(</div><div class='add'>+        cfg,</div><div class='add'>+        pkt_sz_lst,</div><div class='add'>+        offset_lst,</div><div class='add'>+    )</div><div class='add'>+</div><div class='add'>+    _validate_res(res, offset_lst, pkt_sz_lst)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_xdp_native_adjst_tail_shrnk_data(cfg):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP tail adjustment by shrinking packet data.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+    """</div><div class='add'>+    pkt_sz_lst = [512, 1024, 2048]</div><div class='add'>+    offset_lst = [-16, -32, -64, -128, -256]</div><div class='add'>+    res = _test_xdp_native_tail_adjst(</div><div class='add'>+        cfg,</div><div class='add'>+        pkt_sz_lst,</div><div class='add'>+        offset_lst,</div><div class='add'>+    )</div><div class='add'>+</div><div class='add'>+    _validate_res(res, offset_lst, pkt_sz_lst)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def get_hds_thresh(cfg):</div><div class='add'>+    """</div><div class='add'>+    Retrieves the header data split (HDS) threshold for a network interface.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+</div><div class='add'>+    Returns:</div><div class='add'>+        The HDS threshold value. If the threshold is not supported or an error occurs,</div><div class='add'>+        a default value of 1500 is returned.</div><div class='add'>+    """</div><div class='add'>+    ethnl = cfg.ethnl</div><div class='add'>+    hds_thresh = 1500</div><div class='add'>+</div><div class='add'>+    try:</div><div class='add'>+        rings = ethnl.rings_get({'header': {'dev-index': cfg.ifindex}})</div><div class='add'>+        if 'hds-thresh' not in rings:</div><div class='add'>+            ksft_pr(f'hds-thresh not supported. Using default: {hds_thresh}')</div><div class='add'>+            return hds_thresh</div><div class='add'>+        hds_thresh = rings['hds-thresh']</div><div class='add'>+    except NlError as e:</div><div class='add'>+        ksft_pr(f"Failed to get rings: {e}. Using default: {hds_thresh}")</div><div class='add'>+</div><div class='add'>+    return hds_thresh</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def _test_xdp_native_head_adjst(cfg, prog, pkt_sz_lst, offset_lst):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP head adjustment action for a multi-buffer case.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+        ethnl: Network namespace or link object (not used in this function).</div><div class='add'>+</div><div class='add'>+    This function sets up the packet size and offset lists, then performs</div><div class='add'>+    the head adjustment test by sending and receiving UDP packets.</div><div class='add'>+    """</div><div class='add'>+    cfg.require_cmd("socat", remote=True)</div><div class='add'>+</div><div class='add'>+    prog_info = _load_xdp_prog(cfg, BPFProgInfo(prog, "xdp_native.bpf.o", "xdp.frags", 9000))</div><div class='add'>+    port = rand_port()</div><div class='add'>+</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.MODE.value, XDPAction.HEAD_ADJST.value)</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.PORT.value, port)</div><div class='add'>+</div><div class='add'>+    hds_thresh = get_hds_thresh(cfg)</div><div class='add'>+    for offset in offset_lst:</div><div class='add'>+        for pkt_sz in pkt_sz_lst:</div><div class='add'>+            # The "head" buffer must contain at least the Ethernet header</div><div class='add'>+            # after we eat into it. We send large-enough packets, but if HDS</div><div class='add'>+            # is enabled head will only contain headers. Don't try to eat</div><div class='add'>+            # more than 28 bytes (UDPv4 + eth hdr left: (14 + 20 + 8) - 14)</div><div class='add'>+            l2_cut_off = 28 if cfg.addr_ipver == 4 else 48</div><div class='add'>+            if pkt_sz &gt; hds_thresh and offset &gt; l2_cut_off:</div><div class='add'>+                ksft_pr(</div><div class='add'>+                f"Failed run: pkt_sz ({pkt_sz}) &gt; HDS threshold ({hds_thresh}) and "</div><div class='add'>+                f"offset {offset} &gt; {l2_cut_off}"</div><div class='add'>+                )</div><div class='add'>+                return {"status": "pass"}</div><div class='add'>+</div><div class='add'>+            test_str = ''.join(random.choice(string.ascii_lowercase) for _ in range(pkt_sz))</div><div class='add'>+            tag = format(random.randint(65, 90), '02x')</div><div class='add'>+</div><div class='add'>+            _set_xdp_map("map_xdp_setup",</div><div class='add'>+                     TestConfig.ADJST_OFFSET.value,</div><div class='add'>+                     offset)</div><div class='add'>+            _set_xdp_map("map_xdp_setup", TestConfig.ADJST_TAG.value, int(tag, 16))</div><div class='add'>+            _set_xdp_map("map_xdp_setup", TestConfig.ADJST_OFFSET.value, offset)</div><div class='add'>+</div><div class='add'>+            recvd_str = _exchg_udp(cfg, port, test_str)</div><div class='add'>+</div><div class='add'>+            # Check for failures around adjustment and data exchange</div><div class='add'>+            failure = _check_for_failures(recvd_str, _get_stats(prog_info['maps']['map_xdp_stats']))</div><div class='add'>+            if failure is not None:</div><div class='add'>+                return {</div><div class='add'>+                    "status": "fail",</div><div class='add'>+                    "reason": failure,</div><div class='add'>+                    "offset": offset,</div><div class='add'>+                    "pkt_sz": pkt_sz</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+            # Validate data content based on offset direction</div><div class='add'>+            expected_data = None</div><div class='add'>+            if offset &lt; 0:</div><div class='add'>+                expected_data = chr(int(tag, 16)) * (0 - offset) + test_str</div><div class='add'>+            else:</div><div class='add'>+                expected_data = test_str[offset:]</div><div class='add'>+</div><div class='add'>+            if recvd_str != expected_data:</div><div class='add'>+                return {</div><div class='add'>+                    "status": "fail",</div><div class='add'>+                    "reason": "Data mismatch",</div><div class='add'>+                    "offset": offset,</div><div class='add'>+                    "pkt_sz": pkt_sz</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+    return {"status": "pass"}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_xdp_native_adjst_head_grow_data(cfg):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP headroom growth support.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+</div><div class='add'>+    This function sets up the packet size and offset lists, then calls the</div><div class='add'>+    _test_xdp_native_head_adjst_mb function to perform the actual test. The</div><div class='add'>+    test is passed if the headroom is successfully extended for given packet</div><div class='add'>+    sizes and offsets.</div><div class='add'>+    """</div><div class='add'>+    pkt_sz_lst = [512, 1024, 2048]</div><div class='add'>+</div><div class='add'>+    # Negative values result in headroom shrinking, resulting in growing of payload</div><div class='add'>+    offset_lst = [-16, -32, -64, -128, -256]</div><div class='add'>+    res = _test_xdp_native_head_adjst(cfg, "xdp_prog_frags", pkt_sz_lst, offset_lst)</div><div class='add'>+</div><div class='add'>+    _validate_res(res, offset_lst, pkt_sz_lst)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def test_xdp_native_adjst_head_shrnk_data(cfg):</div><div class='add'>+    """</div><div class='add'>+    Tests the XDP headroom shrinking support.</div><div class='add'>+</div><div class='add'>+    Args:</div><div class='add'>+        cfg: Configuration object containing network settings.</div><div class='add'>+</div><div class='add'>+    This function sets up the packet size and offset lists, then calls the</div><div class='add'>+    _test_xdp_native_head_adjst_mb function to perform the actual test. The</div><div class='add'>+    test is passed if the headroom is successfully shrunk for given packet</div><div class='add'>+    sizes and offsets.</div><div class='add'>+    """</div><div class='add'>+    pkt_sz_lst = [512, 1024, 2048]</div><div class='add'>+</div><div class='add'>+    # Positive values result in headroom growing, resulting in shrinking of payload</div><div class='add'>+    offset_lst = [16, 32, 64, 128, 256]</div><div class='add'>+    res = _test_xdp_native_head_adjst(cfg, "xdp_prog_frags", pkt_sz_lst, offset_lst)</div><div class='add'>+</div><div class='add'>+    _validate_res(res, offset_lst, pkt_sz_lst)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+@ksft_variants([</div><div class='add'>+    KsftNamedVariant("pass", XDPAction.PASS),</div><div class='add'>+    KsftNamedVariant("drop", XDPAction.DROP),</div><div class='add'>+    KsftNamedVariant("tx", XDPAction.TX),</div><div class='add'>+])</div><div class='add'>+def test_xdp_native_qstats(cfg, act):</div><div class='add'>+    """</div><div class='add'>+    Send 1000 messages. Expect XDP action specified in @act.</div><div class='add'>+    Make sure the packets were counted to interface level qstats</div><div class='add'>+    (Rx, and Tx if act is TX).</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    cfg.require_cmd("socat")</div><div class='add'>+</div><div class='add'>+    bpf_info = BPFProgInfo("xdp_prog", "xdp_native.bpf.o", "xdp", 1500)</div><div class='add'>+    prog_info = _load_xdp_prog(cfg, bpf_info)</div><div class='add'>+    port = rand_port()</div><div class='add'>+</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.MODE.value, act.value)</div><div class='add'>+    _set_xdp_map("map_xdp_setup", TestConfig.PORT.value, port)</div><div class='add'>+</div><div class='add'>+    # Discard the input, but we need a listener to avoid ICMP errors</div><div class='add'>+    rx_udp = f"socat -{cfg.addr_ipver} -T 2 -u UDP-RECV:{port},reuseport " + \</div><div class='add'>+        "/dev/null"</div><div class='add'>+    # Listener runs on "remote" in case of XDP_TX</div><div class='add'>+    rx_host = cfg.remote if act == XDPAction.TX else None</div><div class='add'>+    # We want to spew 1000 packets quickly, bash seems to do a good enough job</div><div class='add'>+    # Each reopening of the socket gives us a differenot local port (for RSS)</div><div class='add'>+    tx_udp = "for _ in `seq 20`; do " \</div><div class='add'>+        f"exec 5&lt;&gt;/dev/udp/{cfg.addr}/{port}; " \</div><div class='add'>+        "for i in `seq 50`; do echo a &gt;&amp;5; done; " \</div><div class='add'>+        "exec 5&gt;&amp;-; done"</div><div class='add'>+</div><div class='add'>+    cfg.wait_hw_stats_settle()</div><div class='add'>+    # Qstats have more clearly defined semantics than rtnetlink.</div><div class='add'>+    # XDP is the "first layer of the stack" so XDP packets should be counted</div><div class='add'>+    # as received and sent as if the decision was made in the routing layer.</div><div class='add'>+    before = cfg.netnl.qstats_get({"ifindex": cfg.ifindex}, dump=True)[0]</div><div class='add'>+</div><div class='add'>+    with bkg(rx_udp, host=rx_host, exit_wait=True):</div><div class='add'>+        wait_port_listen(port, proto="udp", host=rx_host)</div><div class='add'>+        cmd(tx_udp, host=cfg.remote, shell=True)</div><div class='add'>+</div><div class='add'>+    cfg.wait_hw_stats_settle()</div><div class='add'>+    after = cfg.netnl.qstats_get({"ifindex": cfg.ifindex}, dump=True)[0]</div><div class='add'>+</div><div class='add'>+    expected_pkts = 1000</div><div class='add'>+    ksft_ge(after['rx-packets'] - before['rx-packets'], expected_pkts)</div><div class='add'>+    if act == XDPAction.TX:</div><div class='add'>+        ksft_ge(after['tx-packets'] - before['tx-packets'], expected_pkts)</div><div class='add'>+</div><div class='add'>+    stats = _get_stats(prog_info["maps"]["map_xdp_stats"])</div><div class='add'>+    ksft_eq(stats[XDPStats.RX.value], expected_pkts, "XDP RX stats mismatch")</div><div class='add'>+    if act == XDPAction.TX:</div><div class='add'>+        ksft_eq(stats[XDPStats.TX.value], expected_pkts, "XDP TX stats mismatch")</div><div class='add'>+</div><div class='add'>+    # Flip the ring count back and forth to make sure the stats from XDP rings</div><div class='add'>+    # don't get lost.</div><div class='add'>+    chans = cfg.ethnl.channels_get({'header': {'dev-index': cfg.ifindex}})</div><div class='add'>+    if chans.get('combined-count', 0) &gt; 1:</div><div class='add'>+        cfg.ethnl.channels_set({'header': {'dev-index': cfg.ifindex},</div><div class='add'>+                                'combined-count': 1})</div><div class='add'>+        cfg.ethnl.channels_set({'header': {'dev-index': cfg.ifindex},</div><div class='add'>+                                'combined-count': chans['combined-count']})</div><div class='add'>+        before = after</div><div class='add'>+        after = cfg.netnl.qstats_get({"ifindex": cfg.ifindex}, dump=True)[0]</div><div class='add'>+</div><div class='add'>+        ksft_ge(after['rx-packets'], before['rx-packets'])</div><div class='add'>+        if act == XDPAction.TX:</div><div class='add'>+            ksft_ge(after['tx-packets'], before['tx-packets'])</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+def main():</div><div class='add'>+    """</div><div class='add'>+    Main function to execute the XDP tests.</div><div class='add'>+</div><div class='add'>+    This function runs a series of tests to validate the XDP support for</div><div class='add'>+    both the single and multi-buffer. It uses the NetDrvEpEnv context</div><div class='add'>+    manager to manage the network driver environment and the ksft_run</div><div class='add'>+    function to execute the tests.</div><div class='add'>+    """</div><div class='add'>+    with NetDrvEpEnv(__file__) as cfg:</div><div class='add'>+        cfg.ethnl = EthtoolFamily()</div><div class='add'>+        cfg.netnl = NetdevFamily()</div><div class='add'>+        ksft_run(</div><div class='add'>+            [</div><div class='add'>+                test_xdp_native_pass_sb,</div><div class='add'>+                test_xdp_native_pass_mb,</div><div class='add'>+                test_xdp_native_drop_sb,</div><div class='add'>+                test_xdp_native_drop_mb,</div><div class='add'>+                test_xdp_native_tx_sb,</div><div class='add'>+                test_xdp_native_tx_mb,</div><div class='add'>+                test_xdp_native_adjst_tail_grow_data,</div><div class='add'>+                test_xdp_native_adjst_tail_shrnk_data,</div><div class='add'>+                test_xdp_native_adjst_head_grow_data,</div><div class='add'>+                test_xdp_native_adjst_head_shrnk_data,</div><div class='add'>+                test_xdp_native_qstats,</div><div class='add'>+            ],</div><div class='add'>+            args=(cfg,))</div><div class='add'>+    ksft_exit()</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+if __name__ == "__main__":</div><div class='add'>+    main()</div><div class='head'>diff --git a/tools/testing/selftests/drivers/ntsync/ntsync.c b/tools/testing/selftests/drivers/ntsync/ntsync.c<br/>index 3aad311574c4..e6a37214aa46 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/ntsync/ntsync.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/ntsync/ntsync.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/ntsync/ntsync.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/ntsync/ntsync.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;time.h&gt;</div><div class='ctx'> #include &lt;pthread.h&gt;</div><div class='ctx'> #include &lt;linux/ntsync.h&gt;</div><div class='del'>-#include "../../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> static int read_sem_state(int sem, __u32 *count, __u32 *max)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c b/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c<br/>index 7ee7492138c6..14df9aa07308 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uvdevice.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> #define UV_PATH  "/dev/uv"</div><div class='ctx'> #define BUFFER_SIZE 0x200</div><div class='head'>diff --git a/tools/testing/selftests/exec/check-exec.c b/tools/testing/selftests/exec/check-exec.c<br/>index 55bce47e56b7..f2397e75aa7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/check-exec.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/check-exec.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/check-exec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/exec/check-exec.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #define _ASM_GENERIC_FCNTL_H</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> static int sys_execveat(int dirfd, const char *pathname, char *const argv[],</div><div class='ctx'> 			char *const envp[], int flags)</div><div class='head'>diff --git a/tools/testing/selftests/exec/execveat.c b/tools/testing/selftests/exec/execveat.c<br/>index 8fb7395fd35b..d37c068ed5fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/execveat.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/execveat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/execveat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/exec/execveat.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define TESTS_EXPECTED 54</div><div class='ctx'> #define TEST_NAME_LEN (PATH_MAX * 4)</div><div class='head'>diff --git a/tools/testing/selftests/exec/load_address.c b/tools/testing/selftests/exec/load_address.c<br/>index 8257fddba8c8..55fd3732f029 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/load_address.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/load_address.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/load_address.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/exec/load_address.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;stdbool.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> struct Statistics {</div><div class='ctx'> 	unsigned long long load_address;</div><div class='head'>diff --git a/tools/testing/selftests/exec/non-regular.c b/tools/testing/selftests/exec/non-regular.c<br/>index cd3a34aca93e..14ac36487df5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/non-regular.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/non-regular.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/non-regular.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/exec/non-regular.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;sys/sysmacros.h&gt;</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> /* Remove a file, ignoring the result if it didn't exist. */</div><div class='ctx'> void rm(struct __test_metadata *_metadata, const char *pathname,</div><div class='head'>diff --git a/tools/testing/selftests/exec/null-argv.c b/tools/testing/selftests/exec/null-argv.c<br/>index c19726e710d1..4940aee5bb38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/null-argv.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/null-argv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/null-argv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/exec/null-argv.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define FORK(exec)				\</div><div class='ctx'> do {						\</div><div class='head'>diff --git a/tools/testing/selftests/exec/recursion-depth.c b/tools/testing/selftests/exec/recursion-depth.c<br/>index 438c8ff2fd26..7b5c4f6d1928 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/recursion-depth.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/exec/recursion-depth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/exec/recursion-depth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/exec/recursion-depth.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> #include &lt;sys/mount.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> int main(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/fchmodat2/fchmodat2_test.c b/tools/testing/selftests/fchmodat2/fchmodat2_test.c<br/>index e0319417124d..e397339495f6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/fchmodat2/fchmodat2_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/fchmodat2/fchmodat2_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/fchmodat2/fchmodat2_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/fchmodat2/fchmodat2_test.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;syscall.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> int sys_fchmodat2(int dfd, const char *filename, mode_t mode, int flags)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/filelock/ofdlocks.c b/tools/testing/selftests/filelock/ofdlocks.c<br/>index a55b79810ab2..ff8d47fc373a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filelock/ofdlocks.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filelock/ofdlocks.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filelock/ofdlocks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filelock/ofdlocks.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> static int lock_set(int fd, struct flock *fl)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/.gitignore b/tools/testing/selftests/filesystems/.gitignore<br/>index 828b66a10c63..64ac0dfa46b7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/.gitignore?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/.gitignore</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/.gitignore</a></div><div class='hunk'>@@ -1,4 +1,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> dnotify_test</div><div class='ctx'> devpts_pts</div><div class='add'>+fclog</div><div class='ctx'> file_stressor</div><div class='add'>+anon_inode_test</div><div class='add'>+kernfs_test</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/Makefile b/tools/testing/selftests/filesystems/Makefile<br/>index 66305fc34c60..85427d7f19b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/Makefile</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='ctx'> CFLAGS += $(KHDR_INCLUDES)</div><div class='del'>-TEST_GEN_PROGS := devpts_pts file_stressor</div><div class='add'>+TEST_GEN_PROGS := devpts_pts file_stressor anon_inode_test kernfs_test fclog</div><div class='ctx'> TEST_GEN_PROGS_EXTENDED := dnotify_test</div><div class='ctx'> </div><div class='ctx'> include ../lib.mk</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/anon_inode_test.c b/tools/testing/selftests/filesystems/anon_inode_test.c<br/>new file mode 100644<br/>index 000000000000..94c6c81c2301<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/anon_inode_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/anon_inode_test.c</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#define __SANE_USERSPACE_TYPES__</div><div class='add'>+</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+#include "wrappers.h"</div><div class='add'>+</div><div class='add'>+TEST(anon_inode_no_chown)</div><div class='add'>+{</div><div class='add'>+	int fd_context;</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("tmpfs", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_LT(fchown(fd_context, 1234, 5678), 0);</div><div class='add'>+	ASSERT_EQ(errno, EOPNOTSUPP);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(fd_context), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(anon_inode_no_chmod)</div><div class='add'>+{</div><div class='add'>+	int fd_context;</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("tmpfs", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_LT(fchmod(fd_context, 0777), 0);</div><div class='add'>+	ASSERT_EQ(errno, EOPNOTSUPP);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(fd_context), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(anon_inode_no_exec)</div><div class='add'>+{</div><div class='add'>+	int fd_context;</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("tmpfs", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_LT(execveat(fd_context, "", NULL, NULL, AT_EMPTY_PATH), 0);</div><div class='add'>+	ASSERT_EQ(errno, EACCES);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(fd_context), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(anon_inode_no_open)</div><div class='add'>+{</div><div class='add'>+	int fd_context;</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("tmpfs", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_GE(dup2(fd_context, 500), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+	fd_context = 500;</div><div class='add'>+</div><div class='add'>+	ASSERT_LT(open("/proc/self/fd/500", 0), 0);</div><div class='add'>+	ASSERT_EQ(errno, ENXIO);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(close(fd_context), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='add'>+</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c<br/>index 81db85a5cc16..a1a79a6fef17 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/binderfs/binderfs_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/binderfs/binderfs_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/binderfs/binderfs_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/binderfs/binderfs_test.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/android/binder.h&gt;</div><div class='ctx'> #include &lt;linux/android/binderfs.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_THREADS 4</div><div class='ctx'> </div><div class='hunk'>@@ -65,6 +65,7 @@ static int __do_binderfs_test(struct __test_metadata *_metadata)</div><div class='ctx'> 		"oneway_spam_detection",</div><div class='ctx'> 		"extended_error",</div><div class='ctx'> 		"freeze_notification",</div><div class='add'>+		"transaction_report",</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	change_mountns(_metadata);</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/devpts_pts.c b/tools/testing/selftests/filesystems/devpts_pts.c<br/>index b1fc9b916ace..54fea349204e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/devpts_pts.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/devpts_pts.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/devpts_pts.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/devpts_pts.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;asm/ioctls.h&gt;</div><div class='ctx'> #include &lt;sys/mount.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> static bool terminal_dup2(int duplicate, int original)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c b/tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c<br/>index 65ede506305c..8bc57a2ef966 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;sys/epoll.h&gt;</div><div class='ctx'> #include &lt;sys/socket.h&gt;</div><div class='ctx'> #include &lt;sys/eventfd.h&gt;</div><div class='del'>-#include "../../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> struct epoll_mtcontext</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/eventfd/eventfd_test.c b/tools/testing/selftests/filesystems/eventfd/eventfd_test.c<br/>index 85acb4e3ef00..1b48f267157d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/eventfd/eventfd_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/eventfd/eventfd_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/eventfd/eventfd_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/eventfd/eventfd_test.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;pthread.h&gt;</div><div class='ctx'> #include &lt;sys/epoll.h&gt;</div><div class='ctx'> #include &lt;sys/eventfd.h&gt;</div><div class='del'>-#include "../../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> #define EVENTFD_TEST_ITERATIONS 100000UL</div><div class='ctx'> </div><div class='hunk'>@@ -50,7 +50,7 @@ TEST(eventfd_check_flag_rdwr)</div><div class='ctx'> 	ASSERT_GE(fd, 0);</div><div class='ctx'> </div><div class='ctx'> 	flags = fcntl(fd, F_GETFL);</div><div class='del'>-	// since the kernel automatically added O_RDWR.</div><div class='add'>+	// The kernel automatically adds the O_RDWR flag.</div><div class='ctx'> 	EXPECT_EQ(flags, O_RDWR);</div><div class='ctx'> </div><div class='ctx'> 	close(fd);</div><div class='hunk'>@@ -85,7 +85,7 @@ TEST(eventfd_check_flag_nonblock)</div><div class='ctx'> 	close(fd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-TEST(eventfd_chek_flag_cloexec_and_nonblock)</div><div class='add'>+TEST(eventfd_check_flag_cloexec_and_nonblock)</div><div class='ctx'> {</div><div class='ctx'> 	int fd, flags;</div><div class='ctx'> </div><div class='hunk'>@@ -178,8 +178,7 @@ TEST(eventfd_check_flag_semaphore)</div><div class='ctx'> 	// The semaphore could only be obtained from fdinfo.</div><div class='ctx'> 	ret = verify_fdinfo(fd, &amp;err, "eventfd-semaphore: ", 19, "1\n");</div><div class='ctx'> 	if (ret != 0)</div><div class='del'>-		ksft_print_msg("eventfd-semaphore check failed, msg: %s\n",</div><div class='del'>-				err.msg);</div><div class='add'>+		ksft_print_msg("eventfd semaphore flag check failed: %s\n", err.msg);</div><div class='ctx'> 	EXPECT_EQ(ret, 0);</div><div class='ctx'> </div><div class='ctx'> 	close(fd);</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/fclog.c b/tools/testing/selftests/filesystems/fclog.c<br/>new file mode 100644<br/>index 000000000000..551c4a0f395a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/fclog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/fclog.c</a></div><div class='hunk'>@@ -0,0 +1,130 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Author: Aleksa Sarai &lt;cyphar@cyphar.com&gt;</div><div class='add'>+ * Copyright (C) 2025 SUSE LLC.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;assert.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;sched.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;sys/mount.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+</div><div class='add'>+#define ASSERT_ERRNO(expected, _t, seen)				\</div><div class='add'>+	__EXPECT(expected, #expected,					\</div><div class='add'>+		({__typeof__(seen) _tmp_seen = (seen);			\</div><div class='add'>+		  _tmp_seen &gt;= 0 ? _tmp_seen : -errno; }), #seen, _t, 1)</div><div class='add'>+</div><div class='add'>+#define ASSERT_ERRNO_EQ(expected, seen) \</div><div class='add'>+	ASSERT_ERRNO(expected, ==, seen)</div><div class='add'>+</div><div class='add'>+#define ASSERT_SUCCESS(seen) \</div><div class='add'>+	ASSERT_ERRNO(0, &lt;=, seen)</div><div class='add'>+</div><div class='add'>+FIXTURE(ns)</div><div class='add'>+{</div><div class='add'>+	int host_mntns;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(ns)</div><div class='add'>+{</div><div class='add'>+	/* Stash the old mntns. */</div><div class='add'>+	self-&gt;host_mntns = open("/proc/self/ns/mnt", O_RDONLY|O_CLOEXEC);</div><div class='add'>+	ASSERT_SUCCESS(self-&gt;host_mntns);</div><div class='add'>+</div><div class='add'>+	/* Create a new mount namespace and make it private. */</div><div class='add'>+	ASSERT_SUCCESS(unshare(CLONE_NEWNS));</div><div class='add'>+	ASSERT_SUCCESS(mount(NULL, "/", NULL, MS_PRIVATE|MS_REC, NULL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(ns)</div><div class='add'>+{</div><div class='add'>+	ASSERT_SUCCESS(setns(self-&gt;host_mntns, CLONE_NEWNS));</div><div class='add'>+	ASSERT_SUCCESS(close(self-&gt;host_mntns));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(ns, fscontext_log_enodata)</div><div class='add'>+{</div><div class='add'>+	int fsfd = fsopen("tmpfs", FSOPEN_CLOEXEC);</div><div class='add'>+	ASSERT_SUCCESS(fsfd);</div><div class='add'>+</div><div class='add'>+	/* A brand new fscontext has no log entries. */</div><div class='add'>+	char buf[128] = {};</div><div class='add'>+	for (int i = 0; i &lt; 16; i++)</div><div class='add'>+		ASSERT_ERRNO_EQ(-ENODATA, read(fsfd, buf, sizeof(buf)));</div><div class='add'>+</div><div class='add'>+	ASSERT_SUCCESS(close(fsfd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(ns, fscontext_log_errorfc)</div><div class='add'>+{</div><div class='add'>+	int fsfd = fsopen("tmpfs", FSOPEN_CLOEXEC);</div><div class='add'>+	ASSERT_SUCCESS(fsfd);</div><div class='add'>+</div><div class='add'>+	ASSERT_ERRNO_EQ(-EINVAL, fsconfig(fsfd, FSCONFIG_SET_STRING, "invalid-arg", "123", 0));</div><div class='add'>+</div><div class='add'>+	char buf[128] = {};</div><div class='add'>+	ASSERT_SUCCESS(read(fsfd, buf, sizeof(buf)));</div><div class='add'>+	EXPECT_STREQ("e tmpfs: Unknown parameter 'invalid-arg'\n", buf);</div><div class='add'>+</div><div class='add'>+	/* The message has been consumed. */</div><div class='add'>+	ASSERT_ERRNO_EQ(-ENODATA, read(fsfd, buf, sizeof(buf)));</div><div class='add'>+	ASSERT_SUCCESS(close(fsfd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(ns, fscontext_log_errorfc_after_fsmount)</div><div class='add'>+{</div><div class='add'>+	int fsfd = fsopen("tmpfs", FSOPEN_CLOEXEC);</div><div class='add'>+	ASSERT_SUCCESS(fsfd);</div><div class='add'>+</div><div class='add'>+	ASSERT_ERRNO_EQ(-EINVAL, fsconfig(fsfd, FSCONFIG_SET_STRING, "invalid-arg", "123", 0));</div><div class='add'>+</div><div class='add'>+	ASSERT_SUCCESS(fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0));</div><div class='add'>+	int mfd = fsmount(fsfd, FSMOUNT_CLOEXEC, MOUNT_ATTR_NOEXEC | MOUNT_ATTR_NOSUID);</div><div class='add'>+	ASSERT_SUCCESS(mfd);</div><div class='add'>+	ASSERT_SUCCESS(move_mount(mfd, "", AT_FDCWD, "/tmp", MOVE_MOUNT_F_EMPTY_PATH));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The fscontext log should still contain data even after</div><div class='add'>+	 * FSCONFIG_CMD_CREATE and fsmount().</div><div class='add'>+	 */</div><div class='add'>+	char buf[128] = {};</div><div class='add'>+	ASSERT_SUCCESS(read(fsfd, buf, sizeof(buf)));</div><div class='add'>+	EXPECT_STREQ("e tmpfs: Unknown parameter 'invalid-arg'\n", buf);</div><div class='add'>+</div><div class='add'>+	/* The message has been consumed. */</div><div class='add'>+	ASSERT_ERRNO_EQ(-ENODATA, read(fsfd, buf, sizeof(buf)));</div><div class='add'>+	ASSERT_SUCCESS(close(fsfd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(ns, fscontext_log_emsgsize)</div><div class='add'>+{</div><div class='add'>+	int fsfd = fsopen("tmpfs", FSOPEN_CLOEXEC);</div><div class='add'>+	ASSERT_SUCCESS(fsfd);</div><div class='add'>+</div><div class='add'>+	ASSERT_ERRNO_EQ(-EINVAL, fsconfig(fsfd, FSCONFIG_SET_STRING, "invalid-arg", "123", 0));</div><div class='add'>+</div><div class='add'>+	char buf[128] = {};</div><div class='add'>+	/*</div><div class='add'>+	 * Attempting to read a message with too small a buffer should not</div><div class='add'>+	 * result in the message getting consumed.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_ERRNO_EQ(-EMSGSIZE, read(fsfd, buf, 0));</div><div class='add'>+	ASSERT_ERRNO_EQ(-EMSGSIZE, read(fsfd, buf, 1));</div><div class='add'>+	for (int i = 0; i &lt; 16; i++)</div><div class='add'>+		ASSERT_ERRNO_EQ(-EMSGSIZE, read(fsfd, buf, 16));</div><div class='add'>+</div><div class='add'>+	ASSERT_SUCCESS(read(fsfd, buf, sizeof(buf)));</div><div class='add'>+	EXPECT_STREQ("e tmpfs: Unknown parameter 'invalid-arg'\n", buf);</div><div class='add'>+</div><div class='add'>+	/* The message has been consumed. */</div><div class='add'>+	ASSERT_ERRNO_EQ(-ENODATA, read(fsfd, buf, sizeof(buf)));</div><div class='add'>+	ASSERT_SUCCESS(close(fsfd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/file_stressor.c b/tools/testing/selftests/filesystems/file_stressor.c<br/>index 1136f93a9977..141badd671a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/file_stressor.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/file_stressor.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/file_stressor.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/file_stressor.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;sys/mount.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='hunk'>@@ -156,7 +156,7 @@ TEST_F_TIMEOUT(file_stressor, slab_typesafe_by_rcu, 900 * 2)</div><div class='ctx'> 			ssize_t nr_read;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			 * Concurrently read /proc/&lt;pid&gt;/fd/ which rougly does:</div><div class='add'>+			 * Concurrently read /proc/&lt;pid&gt;/fd/ which roughly does:</div><div class='ctx'> 			 *</div><div class='ctx'> 			 * f = fget_task_next(p, &amp;fd);</div><div class='ctx'> 			 * if (!f)</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/fuse/.gitignore b/tools/testing/selftests/filesystems/fuse/.gitignore<br/>new file mode 100644<br/>index 000000000000..3e72e742d08e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/fuse/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/fuse/.gitignore</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+fuse_mnt</div><div class='add'>+fusectl_test</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/fuse/Makefile b/tools/testing/selftests/filesystems/fuse/Makefile<br/>new file mode 100644<br/>index 000000000000..612aad69a93a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/fuse/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/fuse/Makefile</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+CFLAGS += -Wall -O2 -g $(KHDR_INCLUDES)</div><div class='add'>+</div><div class='add'>+TEST_GEN_PROGS := fusectl_test</div><div class='add'>+TEST_GEN_FILES := fuse_mnt</div><div class='add'>+</div><div class='add'>+include ../../lib.mk</div><div class='add'>+</div><div class='add'>+VAR_CFLAGS := $(shell pkg-config fuse --cflags 2&gt;/dev/null)</div><div class='add'>+ifeq ($(VAR_CFLAGS),)</div><div class='add'>+VAR_CFLAGS := -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+VAR_LDLIBS := $(shell pkg-config fuse --libs 2&gt;/dev/null)</div><div class='add'>+ifeq ($(VAR_LDLIBS),)</div><div class='add'>+VAR_LDLIBS := -lfuse -pthread</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+$(OUTPUT)/fuse_mnt: CFLAGS += $(VAR_CFLAGS)</div><div class='add'>+$(OUTPUT)/fuse_mnt: LDLIBS += $(VAR_LDLIBS)</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/fuse/fuse_mnt.c b/tools/testing/selftests/filesystems/fuse/fuse_mnt.c<br/>new file mode 100644<br/>index 000000000000..d12b17f30fad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/fuse/fuse_mnt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/fuse/fuse_mnt.c</a></div><div class='hunk'>@@ -0,0 +1,146 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * fusectl test file-system</div><div class='add'>+ * Creates a simple FUSE filesystem with a single read-write file (/test)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define FUSE_USE_VERSION 26</div><div class='add'>+</div><div class='add'>+#include &lt;fuse.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX(a, b) ((a) &gt; (b) ? (a) : (b))</div><div class='add'>+</div><div class='add'>+static char *content;</div><div class='add'>+static size_t content_size = 0;</div><div class='add'>+static const char test_path[] = "/test";</div><div class='add'>+</div><div class='add'>+static int test_getattr(const char *path, struct stat *st)</div><div class='add'>+{</div><div class='add'>+	memset(st, 0, sizeof(*st));</div><div class='add'>+</div><div class='add'>+	if (!strcmp(path, "/")) {</div><div class='add'>+		st-&gt;st_mode = S_IFDIR | 0755;</div><div class='add'>+		st-&gt;st_nlink = 2;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!strcmp(path, test_path)) {</div><div class='add'>+		st-&gt;st_mode = S_IFREG | 0664;</div><div class='add'>+		st-&gt;st_nlink = 1;</div><div class='add'>+		st-&gt;st_size = content_size;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_readdir(const char *path, void *buf, fuse_fill_dir_t filler,</div><div class='add'>+			off_t offset, struct fuse_file_info *fi)</div><div class='add'>+{</div><div class='add'>+	if (strcmp(path, "/"))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	filler(buf, ".", NULL, 0);</div><div class='add'>+	filler(buf, "..", NULL, 0);</div><div class='add'>+	filler(buf, test_path + 1, NULL, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_open(const char *path, struct fuse_file_info *fi)</div><div class='add'>+{</div><div class='add'>+	if (strcmp(path, test_path))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_read(const char *path, char *buf, size_t size, off_t offset,</div><div class='add'>+		     struct fuse_file_info *fi)</div><div class='add'>+{</div><div class='add'>+	if (strcmp(path, test_path) != 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (!content || content_size == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (offset &gt;= content_size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (offset + size &gt; content_size)</div><div class='add'>+		size = content_size - offset;</div><div class='add'>+</div><div class='add'>+	memcpy(buf, content + offset, size);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_write(const char *path, const char *buf, size_t size,</div><div class='add'>+		      off_t offset, struct fuse_file_info *fi)</div><div class='add'>+{</div><div class='add'>+	size_t new_size;</div><div class='add'>+</div><div class='add'>+	if (strcmp(path, test_path) != 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if(offset &gt; content_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	new_size = MAX(offset + size, content_size);</div><div class='add'>+</div><div class='add'>+	if (new_size &gt; content_size)</div><div class='add'>+		content = realloc(content, new_size);</div><div class='add'>+</div><div class='add'>+	content_size = new_size;</div><div class='add'>+</div><div class='add'>+	if (!content)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(content + offset, buf, size);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_truncate(const char *path, off_t size)</div><div class='add'>+{</div><div class='add'>+	if (strcmp(path, test_path) != 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (size == 0) {</div><div class='add'>+		free(content);</div><div class='add'>+		content = NULL;</div><div class='add'>+		content_size = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	content = realloc(content, size);</div><div class='add'>+</div><div class='add'>+	if (!content)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (size &gt; content_size)</div><div class='add'>+		memset(content + content_size, 0, size - content_size);</div><div class='add'>+</div><div class='add'>+	content_size = size;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fuse_operations memfd_ops = {</div><div class='add'>+	.getattr = test_getattr,</div><div class='add'>+	.readdir = test_readdir,</div><div class='add'>+	.open = test_open,</div><div class='add'>+	.read = test_read,</div><div class='add'>+	.write = test_write,</div><div class='add'>+	.truncate = test_truncate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	return fuse_main(argc, argv, &amp;memfd_ops, NULL);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/fuse/fusectl_test.c b/tools/testing/selftests/filesystems/fuse/fusectl_test.c<br/>new file mode 100644<br/>index 000000000000..0d1d012c35ed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/fuse/fusectl_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/fuse/fusectl_test.c</a></div><div class='hunk'>@@ -0,0 +1,140 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+// Copyright (c) 2025 Chen Linxuan &lt;chenlinxuan@uniontech.com&gt;</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/mount.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;dirent.h&gt;</div><div class='add'>+#include &lt;sched.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+</div><div class='add'>+#define FUSECTL_MOUNTPOINT "/sys/fs/fuse/connections"</div><div class='add'>+#define FUSE_MOUNTPOINT "/tmp/fuse_mnt_XXXXXX"</div><div class='add'>+#define FUSE_DEVICE "/dev/fuse"</div><div class='add'>+#define FUSECTL_TEST_VALUE "1"</div><div class='add'>+</div><div class='add'>+static void write_file(struct __test_metadata *const _metadata,</div><div class='add'>+		       const char *path, const char *val)</div><div class='add'>+{</div><div class='add'>+	int fd = open(path, O_WRONLY);</div><div class='add'>+	size_t len = strlen(val);</div><div class='add'>+</div><div class='add'>+	ASSERT_GE(fd, 0);</div><div class='add'>+	ASSERT_EQ(write(fd, val, len), len);</div><div class='add'>+	ASSERT_EQ(close(fd), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE(fusectl){</div><div class='add'>+	char fuse_mountpoint[sizeof(FUSE_MOUNTPOINT)];</div><div class='add'>+	int connection;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(fusectl)</div><div class='add'>+{</div><div class='add'>+	const char *fuse_mnt_prog = "./fuse_mnt";</div><div class='add'>+	int status, pid;</div><div class='add'>+	struct stat statbuf;</div><div class='add'>+	uid_t uid = getuid();</div><div class='add'>+	gid_t gid = getgid();</div><div class='add'>+	char buf[32];</div><div class='add'>+</div><div class='add'>+	/* Setup userns */</div><div class='add'>+	ASSERT_EQ(unshare(CLONE_NEWNS|CLONE_NEWUSER), 0);</div><div class='add'>+	sprintf(buf, "0 %d 1", uid);</div><div class='add'>+	write_file(_metadata, "/proc/self/uid_map", buf);</div><div class='add'>+	write_file(_metadata, "/proc/self/setgroups", "deny");</div><div class='add'>+	sprintf(buf, "0 %d 1", gid);</div><div class='add'>+	write_file(_metadata, "/proc/self/gid_map", buf);</div><div class='add'>+	ASSERT_EQ(mount("", "/", NULL, MS_REC|MS_PRIVATE, NULL), 0);</div><div class='add'>+</div><div class='add'>+	strcpy(self-&gt;fuse_mountpoint, FUSE_MOUNTPOINT);</div><div class='add'>+</div><div class='add'>+	if (!mkdtemp(self-&gt;fuse_mountpoint))</div><div class='add'>+		SKIP(return,</div><div class='add'>+		     "Failed to create FUSE mountpoint %s",</div><div class='add'>+		     strerror(errno));</div><div class='add'>+</div><div class='add'>+	if (access(FUSECTL_MOUNTPOINT, F_OK))</div><div class='add'>+		SKIP(return,</div><div class='add'>+		     "FUSE control filesystem not mounted");</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	if (pid &lt; 0)</div><div class='add'>+		SKIP(return,</div><div class='add'>+		     "Failed to fork FUSE daemon process: %s",</div><div class='add'>+		     strerror(errno));</div><div class='add'>+</div><div class='add'>+	if (pid == 0) {</div><div class='add'>+		execlp(fuse_mnt_prog, fuse_mnt_prog, self-&gt;fuse_mountpoint, NULL);</div><div class='add'>+		exit(errno);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	waitpid(pid, &amp;status, 0);</div><div class='add'>+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {</div><div class='add'>+		SKIP(return,</div><div class='add'>+		     "Failed to start FUSE daemon %s",</div><div class='add'>+		     strerror(WEXITSTATUS(status)));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stat(self-&gt;fuse_mountpoint, &amp;statbuf))</div><div class='add'>+		SKIP(return,</div><div class='add'>+		     "Failed to stat FUSE mountpoint %s",</div><div class='add'>+		     strerror(errno));</div><div class='add'>+</div><div class='add'>+	self-&gt;connection = statbuf.st_dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(fusectl)</div><div class='add'>+{</div><div class='add'>+	umount2(self-&gt;fuse_mountpoint, MNT_DETACH);</div><div class='add'>+	rmdir(self-&gt;fuse_mountpoint);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fusectl, abort)</div><div class='add'>+{</div><div class='add'>+	char path_buf[PATH_MAX];</div><div class='add'>+	int abort_fd, test_fd, ret;</div><div class='add'>+</div><div class='add'>+	sprintf(path_buf, "/sys/fs/fuse/connections/%d/abort", self-&gt;connection);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(0, access(path_buf, F_OK));</div><div class='add'>+</div><div class='add'>+	abort_fd = open(path_buf, O_WRONLY);</div><div class='add'>+	ASSERT_GE(abort_fd, 0);</div><div class='add'>+</div><div class='add'>+	sprintf(path_buf, "%s/test", self-&gt;fuse_mountpoint);</div><div class='add'>+</div><div class='add'>+	test_fd = open(path_buf, O_RDWR);</div><div class='add'>+	ASSERT_GE(test_fd, 0);</div><div class='add'>+</div><div class='add'>+	ret = read(test_fd, path_buf, sizeof(path_buf));</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = write(test_fd, "test", sizeof("test"));</div><div class='add'>+	ASSERT_EQ(ret, sizeof("test"));</div><div class='add'>+</div><div class='add'>+	ret = lseek(test_fd, 0, SEEK_SET);</div><div class='add'>+	ASSERT_GE(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = write(abort_fd, FUSECTL_TEST_VALUE, sizeof(FUSECTL_TEST_VALUE));</div><div class='add'>+	ASSERT_GT(ret, 0);</div><div class='add'>+</div><div class='add'>+	close(abort_fd);</div><div class='add'>+</div><div class='add'>+	ret = read(test_fd, path_buf, sizeof(path_buf));</div><div class='add'>+	ASSERT_EQ(ret, -1);</div><div class='add'>+	ASSERT_EQ(errno, ENOTCONN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/kernfs_test.c b/tools/testing/selftests/filesystems/kernfs_test.c<br/>new file mode 100644<br/>index 000000000000..84c2b910a60d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/kernfs_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/kernfs_test.c</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#define __SANE_USERSPACE_TYPES__</div><div class='add'>+</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/xattr.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+#include "wrappers.h"</div><div class='add'>+</div><div class='add'>+TEST(kernfs_listxattr)</div><div class='add'>+{</div><div class='add'>+	int fd;</div><div class='add'>+</div><div class='add'>+	/* Read-only file that can never have any extended attributes set. */</div><div class='add'>+	fd = open("/sys/kernel/warn_count", O_RDONLY | O_CLOEXEC);</div><div class='add'>+	ASSERT_GE(fd, 0);</div><div class='add'>+	ASSERT_EQ(flistxattr(fd, NULL, 0), 0);</div><div class='add'>+	EXPECT_EQ(close(fd), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(kernfs_getxattr)</div><div class='add'>+{</div><div class='add'>+	int fd;</div><div class='add'>+	char buf[1];</div><div class='add'>+</div><div class='add'>+	/* Read-only file that can never have any extended attributes set. */</div><div class='add'>+	fd = open("/sys/kernel/warn_count", O_RDONLY | O_CLOEXEC);</div><div class='add'>+	ASSERT_GE(fd, 0);</div><div class='add'>+	ASSERT_LT(fgetxattr(fd, "user.foo", buf, sizeof(buf)), 0);</div><div class='add'>+	ASSERT_EQ(errno, ENODATA);</div><div class='add'>+	EXPECT_EQ(close(fd), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='add'>+</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/mount-notify/.gitignore b/tools/testing/selftests/filesystems/mount-notify/.gitignore<br/>new file mode 100644<br/>index 000000000000..124339ea7845<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/mount-notify/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/mount-notify/.gitignore</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*_test</div><div class='add'>+/*_test_ns</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/mount-notify/Makefile b/tools/testing/selftests/filesystems/mount-notify/Makefile<br/>new file mode 100644<br/>index 000000000000..836a4eb7be06<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/mount-notify/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/mount-notify/Makefile</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+CFLAGS += -Wall -O2 -g $(KHDR_INCLUDES) $(TOOLS_INCLUDES)</div><div class='add'>+LDLIBS += -lcap</div><div class='add'>+</div><div class='add'>+TEST_GEN_PROGS := mount-notify_test mount-notify_test_ns</div><div class='add'>+</div><div class='add'>+include ../../lib.mk</div><div class='add'>+</div><div class='add'>+$(OUTPUT)/mount-notify_test: ../utils.c</div><div class='add'>+$(OUTPUT)/mount-notify_test_ns: ../utils.c</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c b/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c<br/>new file mode 100644<br/>index 000000000000..6381af6a40e3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c</a></div><div class='hunk'>@@ -0,0 +1,528 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+// Copyright (c) 2025 Miklos Szeredi &lt;miklos@szeredi.hu&gt;</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+</div><div class='add'>+// Needed for linux/fanotify.h</div><div class='add'>+typedef struct {</div><div class='add'>+	int	val[2];</div><div class='add'>+} __kernel_fsid_t;</div><div class='add'>+#define __kernel_fsid_t __kernel_fsid_t</div><div class='add'>+</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;sched.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/mount.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;sys/fanotify.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+#include "../statmount/statmount.h"</div><div class='add'>+#include "../utils.h"</div><div class='add'>+</div><div class='add'>+static const char root_mntpoint_templ[] = "/tmp/mount-notify_test_root.XXXXXX";</div><div class='add'>+</div><div class='add'>+static const int mark_cmds[] = {</div><div class='add'>+	FAN_MARK_ADD,</div><div class='add'>+	FAN_MARK_REMOVE,</div><div class='add'>+	FAN_MARK_FLUSH</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_FAN_FDS ARRAY_SIZE(mark_cmds)</div><div class='add'>+</div><div class='add'>+FIXTURE(fanotify) {</div><div class='add'>+	int fan_fd[NUM_FAN_FDS];</div><div class='add'>+	char buf[256];</div><div class='add'>+	unsigned int rem;</div><div class='add'>+	void *next;</div><div class='add'>+	char root_mntpoint[sizeof(root_mntpoint_templ)];</div><div class='add'>+	int orig_root;</div><div class='add'>+	int ns_fd;</div><div class='add'>+	uint64_t root_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(fanotify)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(unshare(CLONE_NEWNS), 0);</div><div class='add'>+</div><div class='add'>+	self-&gt;ns_fd = open("/proc/self/ns/mnt", O_RDONLY);</div><div class='add'>+	ASSERT_GE(self-&gt;ns_fd, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mount("", "/", NULL, MS_REC|MS_PRIVATE, NULL), 0);</div><div class='add'>+</div><div class='add'>+	strcpy(self-&gt;root_mntpoint, root_mntpoint_templ);</div><div class='add'>+	ASSERT_NE(mkdtemp(self-&gt;root_mntpoint), NULL);</div><div class='add'>+</div><div class='add'>+	self-&gt;orig_root = open("/", O_PATH | O_CLOEXEC);</div><div class='add'>+	ASSERT_GE(self-&gt;orig_root, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mount("tmpfs", self-&gt;root_mntpoint, "tmpfs", 0, NULL), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(chroot(self-&gt;root_mntpoint), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(chdir("/"), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mkdir("a", 0700), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mkdir("b", 0700), 0);</div><div class='add'>+</div><div class='add'>+	self-&gt;root_id = get_unique_mnt_id("/");</div><div class='add'>+	ASSERT_NE(self-&gt;root_id, 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_FAN_FDS; i++) {</div><div class='add'>+		self-&gt;fan_fd[i] = fanotify_init(FAN_REPORT_MNT | FAN_NONBLOCK,</div><div class='add'>+						0);</div><div class='add'>+		ASSERT_GE(self-&gt;fan_fd[i], 0);</div><div class='add'>+		ret = fanotify_mark(self-&gt;fan_fd[i], FAN_MARK_ADD |</div><div class='add'>+				    FAN_MARK_MNTNS,</div><div class='add'>+				    FAN_MNT_ATTACH | FAN_MNT_DETACH,</div><div class='add'>+				    self-&gt;ns_fd, NULL);</div><div class='add'>+		ASSERT_EQ(ret, 0);</div><div class='add'>+		// On fd[0] we do an extra ADD that changes nothing.</div><div class='add'>+		// On fd[1]/fd[2] we REMOVE/FLUSH which removes the mark.</div><div class='add'>+		ret = fanotify_mark(self-&gt;fan_fd[i], mark_cmds[i] |</div><div class='add'>+				    FAN_MARK_MNTNS,</div><div class='add'>+				    FAN_MNT_ATTACH | FAN_MNT_DETACH,</div><div class='add'>+				    self-&gt;ns_fd, NULL);</div><div class='add'>+		ASSERT_EQ(ret, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	self-&gt;rem = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(fanotify)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(self-&gt;rem, 0);</div><div class='add'>+	for (i = 0; i &lt; NUM_FAN_FDS; i++)</div><div class='add'>+		close(self-&gt;fan_fd[i]);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(fchdir(self-&gt;orig_root), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(chroot("."), 0);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(umount2(self-&gt;root_mntpoint, MNT_DETACH), 0);</div><div class='add'>+	EXPECT_EQ(chdir(self-&gt;root_mntpoint), 0);</div><div class='add'>+	EXPECT_EQ(chdir("/"), 0);</div><div class='add'>+	EXPECT_EQ(rmdir(self-&gt;root_mntpoint), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint64_t expect_notify(struct __test_metadata *const _metadata,</div><div class='add'>+			      FIXTURE_DATA(fanotify) *self,</div><div class='add'>+			      uint64_t *mask)</div><div class='add'>+{</div><div class='add'>+	struct fanotify_event_metadata *meta;</div><div class='add'>+	struct fanotify_event_info_mnt *mnt;</div><div class='add'>+	unsigned int thislen;</div><div class='add'>+</div><div class='add'>+	if (!self-&gt;rem) {</div><div class='add'>+		ssize_t len;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = NUM_FAN_FDS - 1; i &gt;= 0; i--) {</div><div class='add'>+			len = read(self-&gt;fan_fd[i], self-&gt;buf,</div><div class='add'>+				   sizeof(self-&gt;buf));</div><div class='add'>+			if (i &gt; 0) {</div><div class='add'>+				// Groups 1,2 should get EAGAIN</div><div class='add'>+				ASSERT_EQ(len, -1);</div><div class='add'>+				ASSERT_EQ(errno, EAGAIN);</div><div class='add'>+			} else {</div><div class='add'>+				// Group 0 should get events</div><div class='add'>+				ASSERT_GT(len, 0);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		self-&gt;rem = len;</div><div class='add'>+		self-&gt;next = (void *) self-&gt;buf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	meta = self-&gt;next;</div><div class='add'>+	ASSERT_TRUE(FAN_EVENT_OK(meta, self-&gt;rem));</div><div class='add'>+</div><div class='add'>+	thislen = meta-&gt;event_len;</div><div class='add'>+	self-&gt;rem -= thislen;</div><div class='add'>+	self-&gt;next += thislen;</div><div class='add'>+</div><div class='add'>+	*mask = meta-&gt;mask;</div><div class='add'>+	thislen -= sizeof(*meta);</div><div class='add'>+</div><div class='add'>+	mnt = ((void *) meta) + meta-&gt;event_len - thislen;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(thislen, sizeof(*mnt));</div><div class='add'>+</div><div class='add'>+	return mnt-&gt;mnt_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void expect_notify_n(struct __test_metadata *const _metadata,</div><div class='add'>+				 FIXTURE_DATA(fanotify) *self,</div><div class='add'>+				 unsigned int n, uint64_t mask[], uint64_t mnts[])</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++)</div><div class='add'>+		mnts[i] = expect_notify(_metadata, self, &amp;mask[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint64_t expect_notify_mask(struct __test_metadata *const _metadata,</div><div class='add'>+				   FIXTURE_DATA(fanotify) *self,</div><div class='add'>+				   uint64_t expect_mask)</div><div class='add'>+{</div><div class='add'>+	uint64_t mntid, mask;</div><div class='add'>+</div><div class='add'>+	mntid = expect_notify(_metadata, self, &amp;mask);</div><div class='add'>+	ASSERT_EQ(expect_mask, mask);</div><div class='add'>+</div><div class='add'>+	return mntid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void expect_notify_mask_n(struct __test_metadata *const _metadata,</div><div class='add'>+				 FIXTURE_DATA(fanotify) *self,</div><div class='add'>+				 uint64_t mask, unsigned int n, uint64_t mnts[])</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++)</div><div class='add'>+		mnts[i] = expect_notify_mask(_metadata, self, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void verify_mount_ids(struct __test_metadata *const _metadata,</div><div class='add'>+			     const uint64_t list1[], const uint64_t list2[],</div><div class='add'>+			     size_t num)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	// Check that neither list has any duplicates</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		for (j = 0; j &lt; num; j++) {</div><div class='add'>+			if (i != j) {</div><div class='add'>+				ASSERT_NE(list1[i], list1[j]);</div><div class='add'>+				ASSERT_NE(list2[i], list2[j]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	// Check that all list1 memebers can be found in list2. Together with</div><div class='add'>+	// the above it means that the list1 and list2 represent the same sets.</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		for (j = 0; j &lt; num; j++) {</div><div class='add'>+			if (list1[i] == list2[j])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		ASSERT_NE(j, num);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_mounted(struct __test_metadata *const _metadata,</div><div class='add'>+			  const uint64_t mnts[], size_t num)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	uint64_t *list;</div><div class='add'>+</div><div class='add'>+	list = malloc((num + 1) * sizeof(list[0]));</div><div class='add'>+	ASSERT_NE(list, NULL);</div><div class='add'>+</div><div class='add'>+	ret = listmount(LSMT_ROOT, 0, 0, list, num + 1, 0);</div><div class='add'>+	ASSERT_EQ(ret, num);</div><div class='add'>+</div><div class='add'>+	verify_mount_ids(_metadata, mnts, list, num);</div><div class='add'>+</div><div class='add'>+	free(list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_mount_tree(struct __test_metadata *const _metadata,</div><div class='add'>+			    int log2_num)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = mount("", "/", NULL, MS_SHARED, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; log2_num; i++) {</div><div class='add'>+		ret = mount("/", "/", NULL, MS_BIND, NULL);</div><div class='add'>+		ASSERT_EQ(ret, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, bind)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	uint64_t mnts[2] = { self-&gt;root_id };</div><div class='add'>+</div><div class='add'>+	ret = mount("/", "/", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts[1] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+	ASSERT_NE(mnts[0], mnts[1]);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 2);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	uint64_t detach_id;</div><div class='add'>+	ret = umount("/");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	detach_id = expect_notify_mask(_metadata, self, FAN_MNT_DETACH);</div><div class='add'>+	ASSERT_EQ(detach_id, mnts[1]);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, move)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	uint64_t mnts[2] = { self-&gt;root_id };</div><div class='add'>+	uint64_t move_id;</div><div class='add'>+</div><div class='add'>+	ret = mount("/", "/a", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts[1] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+	ASSERT_NE(mnts[0], mnts[1]);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 2);</div><div class='add'>+</div><div class='add'>+	ret = move_mount(AT_FDCWD, "/a", AT_FDCWD, "/b", 0);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	move_id = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH | FAN_MNT_DETACH);</div><div class='add'>+	ASSERT_EQ(move_id, mnts[1]);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	ret = umount("/b");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, propagate)</div><div class='add'>+{</div><div class='add'>+	const unsigned int log2_num = 4;</div><div class='add'>+	const unsigned int num = (1 &lt;&lt; log2_num);</div><div class='add'>+	uint64_t mnts[num];</div><div class='add'>+</div><div class='add'>+	setup_mount_tree(_metadata, log2_num);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_ATTACH, num - 1, mnts + 1);</div><div class='add'>+</div><div class='add'>+	mnts[0] = self-&gt;root_id;</div><div class='add'>+	check_mounted(_metadata, mnts, num);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	int ret;</div><div class='add'>+	uint64_t mnts2[num];</div><div class='add'>+	ret = umount2("/", MNT_DETACH);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("", "/", NULL, MS_PRIVATE, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts2[0] = self-&gt;root_id;</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_DETACH, num - 1, mnts2 + 1);</div><div class='add'>+	verify_mount_ids(_metadata, mnts, mnts2, num);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, fsmount)</div><div class='add'>+{</div><div class='add'>+	int ret, fs, mnt;</div><div class='add'>+	uint64_t mnts[2] = { self-&gt;root_id };</div><div class='add'>+</div><div class='add'>+	fs = fsopen("tmpfs", 0);</div><div class='add'>+	ASSERT_GE(fs, 0);</div><div class='add'>+</div><div class='add'>+        ret = fsconfig(fs, FSCONFIG_CMD_CREATE, 0, 0, 0);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+        mnt = fsmount(fs, 0, 0);</div><div class='add'>+	ASSERT_GE(mnt, 0);</div><div class='add'>+</div><div class='add'>+        close(fs);</div><div class='add'>+</div><div class='add'>+	ret = move_mount(mnt, "", AT_FDCWD, "/a", MOVE_MOUNT_F_EMPTY_PATH);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+        close(mnt);</div><div class='add'>+</div><div class='add'>+	mnts[1] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+	ASSERT_NE(mnts[0], mnts[1]);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 2);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	uint64_t detach_id;</div><div class='add'>+	ret = umount("/a");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	detach_id = expect_notify_mask(_metadata, self, FAN_MNT_DETACH);</div><div class='add'>+	ASSERT_EQ(detach_id, mnts[1]);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, reparent)</div><div class='add'>+{</div><div class='add'>+	uint64_t mnts[6] = { self-&gt;root_id };</div><div class='add'>+	uint64_t dmnts[3];</div><div class='add'>+	uint64_t masks[3];</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	// Create setup with a[1] -&gt; b[2] propagation</div><div class='add'>+	ret = mount("/", "/a", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("", "/a", NULL, MS_SHARED, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("/a", "/b", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("", "/b", NULL, MS_SLAVE, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_ATTACH, 2, mnts + 1);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 3);</div><div class='add'>+</div><div class='add'>+	// Mount on a[3], which is propagated to b[4]</div><div class='add'>+	ret = mount("/", "/a", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_ATTACH, 2, mnts + 3);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 5);</div><div class='add'>+</div><div class='add'>+	// Mount on b[5], not propagated</div><div class='add'>+	ret = mount("/", "/b", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts[5] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 6);</div><div class='add'>+</div><div class='add'>+	// Umount a[3], which is propagated to b[4], but not b[5]</div><div class='add'>+	// This will result in b[5] "falling" on b[2]</div><div class='add'>+	ret = umount("/a");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_n(_metadata, self, 3, masks, dmnts);</div><div class='add'>+	verify_mount_ids(_metadata, mnts + 3, dmnts, 3);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		if (dmnts[i] == mnts[5]) {</div><div class='add'>+			ASSERT_EQ(masks[i], FAN_MNT_ATTACH | FAN_MNT_DETACH);</div><div class='add'>+		} else {</div><div class='add'>+			ASSERT_EQ(masks[i], FAN_MNT_DETACH);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mnts[3] = mnts[5];</div><div class='add'>+	check_mounted(_metadata, mnts, 4);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	ret = umount("/b");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = umount("/a");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = umount("/b");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_DETACH, 3, dmnts);</div><div class='add'>+	verify_mount_ids(_metadata, mnts + 1, dmnts, 3);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, rmdir)</div><div class='add'>+{</div><div class='add'>+	uint64_t mnts[3] = { self-&gt;root_id };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mount("/", "/a", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("/", "/a/b", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_ATTACH, 2, mnts + 1);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 3);</div><div class='add'>+</div><div class='add'>+	ret = chdir("/a");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = fork();</div><div class='add'>+	ASSERT_GE(ret, 0);</div><div class='add'>+</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		chdir("/");</div><div class='add'>+		unshare(CLONE_NEWNS);</div><div class='add'>+		mount("", "/", NULL, MS_REC|MS_PRIVATE, NULL);</div><div class='add'>+		umount2("/a", MNT_DETACH);</div><div class='add'>+		// This triggers a detach in the other namespace</div><div class='add'>+		rmdir("/a");</div><div class='add'>+		exit(0);</div><div class='add'>+	}</div><div class='add'>+	wait(NULL);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_DETACH, 2, mnts + 1);</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	ret = chdir("/");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, pivot_root)</div><div class='add'>+{</div><div class='add'>+	uint64_t mnts[3] = { self-&gt;root_id };</div><div class='add'>+	uint64_t mnts2[3];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mount("tmpfs", "/a", "tmpfs", 0, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts[2] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+</div><div class='add'>+	ret = mkdir("/a/new", 0700);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mkdir("/a/old", 0700);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("/a", "/a/new", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts[1] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+	check_mounted(_metadata, mnts, 3);</div><div class='add'>+</div><div class='add'>+	ret = syscall(SYS_pivot_root, "/a/new", "/a/new/old");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_ATTACH | FAN_MNT_DETACH, 2, mnts2);</div><div class='add'>+	verify_mount_ids(_metadata, mnts, mnts2, 2);</div><div class='add'>+	check_mounted(_metadata, mnts, 3);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	ret = syscall(SYS_pivot_root, "/old", "/old/a/new");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = umount("/a/new");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = umount("/a");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c b/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c<br/>new file mode 100644<br/>index 000000000000..320ee25dc8a5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c</a></div><div class='hunk'>@@ -0,0 +1,555 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+// Copyright (c) 2025 Miklos Szeredi &lt;miklos@szeredi.hu&gt;</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+</div><div class='add'>+// Needed for linux/fanotify.h</div><div class='add'>+typedef struct {</div><div class='add'>+	int	val[2];</div><div class='add'>+} __kernel_fsid_t;</div><div class='add'>+#define __kernel_fsid_t __kernel_fsid_t</div><div class='add'>+</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;sched.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/mount.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;sys/fanotify.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+#include "../statmount/statmount.h"</div><div class='add'>+#include "../utils.h"</div><div class='add'>+</div><div class='add'>+static const char root_mntpoint_templ[] = "/tmp/mount-notify_test_root.XXXXXX";</div><div class='add'>+</div><div class='add'>+static const int mark_types[] = {</div><div class='add'>+	FAN_MARK_FILESYSTEM,</div><div class='add'>+	FAN_MARK_MOUNT,</div><div class='add'>+	FAN_MARK_INODE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int mark_cmds[] = {</div><div class='add'>+	FAN_MARK_ADD,</div><div class='add'>+	FAN_MARK_REMOVE,</div><div class='add'>+	FAN_MARK_FLUSH</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_FAN_FDS ARRAY_SIZE(mark_cmds)</div><div class='add'>+</div><div class='add'>+FIXTURE(fanotify) {</div><div class='add'>+	int fan_fd[NUM_FAN_FDS];</div><div class='add'>+	char buf[256];</div><div class='add'>+	unsigned int rem;</div><div class='add'>+	void *next;</div><div class='add'>+	char root_mntpoint[sizeof(root_mntpoint_templ)];</div><div class='add'>+	int orig_root;</div><div class='add'>+	int orig_ns_fd;</div><div class='add'>+	int ns_fd;</div><div class='add'>+	uint64_t root_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(fanotify)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	self-&gt;orig_ns_fd = open("/proc/self/ns/mnt", O_RDONLY);</div><div class='add'>+	ASSERT_GE(self-&gt;orig_ns_fd, 0);</div><div class='add'>+</div><div class='add'>+	ret = setup_userns();</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	self-&gt;ns_fd = open("/proc/self/ns/mnt", O_RDONLY);</div><div class='add'>+	ASSERT_GE(self-&gt;ns_fd, 0);</div><div class='add'>+</div><div class='add'>+	strcpy(self-&gt;root_mntpoint, root_mntpoint_templ);</div><div class='add'>+	ASSERT_NE(mkdtemp(self-&gt;root_mntpoint), NULL);</div><div class='add'>+</div><div class='add'>+	self-&gt;orig_root = open("/", O_PATH | O_CLOEXEC);</div><div class='add'>+	ASSERT_GE(self-&gt;orig_root, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mount("tmpfs", self-&gt;root_mntpoint, "tmpfs", 0, NULL), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(chroot(self-&gt;root_mntpoint), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(chdir("/"), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mkdir("a", 0700), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mkdir("b", 0700), 0);</div><div class='add'>+</div><div class='add'>+	self-&gt;root_id = get_unique_mnt_id("/");</div><div class='add'>+	ASSERT_NE(self-&gt;root_id, 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_FAN_FDS; i++) {</div><div class='add'>+		int fan_fd = fanotify_init(FAN_REPORT_FID, 0);</div><div class='add'>+		// Verify that watching tmpfs mounted inside userns is allowed</div><div class='add'>+		ret = fanotify_mark(fan_fd, FAN_MARK_ADD | mark_types[i],</div><div class='add'>+				    FAN_OPEN, AT_FDCWD, "/");</div><div class='add'>+		ASSERT_EQ(ret, 0);</div><div class='add'>+		// ...but watching entire orig root filesystem is not allowed</div><div class='add'>+		ret = fanotify_mark(fan_fd, FAN_MARK_ADD | FAN_MARK_FILESYSTEM,</div><div class='add'>+				    FAN_OPEN, self-&gt;orig_root, ".");</div><div class='add'>+		ASSERT_NE(ret, 0);</div><div class='add'>+		close(fan_fd);</div><div class='add'>+</div><div class='add'>+		self-&gt;fan_fd[i] = fanotify_init(FAN_REPORT_MNT | FAN_NONBLOCK,</div><div class='add'>+						0);</div><div class='add'>+		ASSERT_GE(self-&gt;fan_fd[i], 0);</div><div class='add'>+		// Verify that watching mntns where group was created is allowed</div><div class='add'>+		ret = fanotify_mark(self-&gt;fan_fd[i], FAN_MARK_ADD |</div><div class='add'>+				    FAN_MARK_MNTNS,</div><div class='add'>+				    FAN_MNT_ATTACH | FAN_MNT_DETACH,</div><div class='add'>+				    self-&gt;ns_fd, NULL);</div><div class='add'>+		ASSERT_EQ(ret, 0);</div><div class='add'>+		// ...but watching orig mntns is not allowed</div><div class='add'>+		ret = fanotify_mark(self-&gt;fan_fd[i], FAN_MARK_ADD |</div><div class='add'>+				    FAN_MARK_MNTNS,</div><div class='add'>+				    FAN_MNT_ATTACH | FAN_MNT_DETACH,</div><div class='add'>+				    self-&gt;orig_ns_fd, NULL);</div><div class='add'>+		ASSERT_NE(ret, 0);</div><div class='add'>+		// On fd[0] we do an extra ADD that changes nothing.</div><div class='add'>+		// On fd[1]/fd[2] we REMOVE/FLUSH which removes the mark.</div><div class='add'>+		ret = fanotify_mark(self-&gt;fan_fd[i], mark_cmds[i] |</div><div class='add'>+				    FAN_MARK_MNTNS,</div><div class='add'>+				    FAN_MNT_ATTACH | FAN_MNT_DETACH,</div><div class='add'>+				    self-&gt;ns_fd, NULL);</div><div class='add'>+		ASSERT_EQ(ret, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	self-&gt;rem = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(fanotify)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(self-&gt;rem, 0);</div><div class='add'>+	for (i = 0; i &lt; NUM_FAN_FDS; i++)</div><div class='add'>+		close(self-&gt;fan_fd[i]);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(fchdir(self-&gt;orig_root), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(chroot("."), 0);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(umount2(self-&gt;root_mntpoint, MNT_DETACH), 0);</div><div class='add'>+	EXPECT_EQ(chdir(self-&gt;root_mntpoint), 0);</div><div class='add'>+	EXPECT_EQ(chdir("/"), 0);</div><div class='add'>+	EXPECT_EQ(rmdir(self-&gt;root_mntpoint), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint64_t expect_notify(struct __test_metadata *const _metadata,</div><div class='add'>+			      FIXTURE_DATA(fanotify) *self,</div><div class='add'>+			      uint64_t *mask)</div><div class='add'>+{</div><div class='add'>+	struct fanotify_event_metadata *meta;</div><div class='add'>+	struct fanotify_event_info_mnt *mnt;</div><div class='add'>+	unsigned int thislen;</div><div class='add'>+</div><div class='add'>+	if (!self-&gt;rem) {</div><div class='add'>+		ssize_t len;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = NUM_FAN_FDS - 1; i &gt;= 0; i--) {</div><div class='add'>+			len = read(self-&gt;fan_fd[i], self-&gt;buf,</div><div class='add'>+				   sizeof(self-&gt;buf));</div><div class='add'>+			if (i &gt; 0) {</div><div class='add'>+				// Groups 1,2 should get EAGAIN</div><div class='add'>+				ASSERT_EQ(len, -1);</div><div class='add'>+				ASSERT_EQ(errno, EAGAIN);</div><div class='add'>+			} else {</div><div class='add'>+				// Group 0 should get events</div><div class='add'>+				ASSERT_GT(len, 0);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		self-&gt;rem = len;</div><div class='add'>+		self-&gt;next = (void *) self-&gt;buf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	meta = self-&gt;next;</div><div class='add'>+	ASSERT_TRUE(FAN_EVENT_OK(meta, self-&gt;rem));</div><div class='add'>+</div><div class='add'>+	thislen = meta-&gt;event_len;</div><div class='add'>+	self-&gt;rem -= thislen;</div><div class='add'>+	self-&gt;next += thislen;</div><div class='add'>+</div><div class='add'>+	*mask = meta-&gt;mask;</div><div class='add'>+	thislen -= sizeof(*meta);</div><div class='add'>+</div><div class='add'>+	mnt = ((void *) meta) + meta-&gt;event_len - thislen;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(thislen, sizeof(*mnt));</div><div class='add'>+</div><div class='add'>+	return mnt-&gt;mnt_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void expect_notify_n(struct __test_metadata *const _metadata,</div><div class='add'>+				 FIXTURE_DATA(fanotify) *self,</div><div class='add'>+				 unsigned int n, uint64_t mask[], uint64_t mnts[])</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++)</div><div class='add'>+		mnts[i] = expect_notify(_metadata, self, &amp;mask[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint64_t expect_notify_mask(struct __test_metadata *const _metadata,</div><div class='add'>+				   FIXTURE_DATA(fanotify) *self,</div><div class='add'>+				   uint64_t expect_mask)</div><div class='add'>+{</div><div class='add'>+	uint64_t mntid, mask;</div><div class='add'>+</div><div class='add'>+	mntid = expect_notify(_metadata, self, &amp;mask);</div><div class='add'>+	ASSERT_EQ(expect_mask, mask);</div><div class='add'>+</div><div class='add'>+	return mntid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void expect_notify_mask_n(struct __test_metadata *const _metadata,</div><div class='add'>+				 FIXTURE_DATA(fanotify) *self,</div><div class='add'>+				 uint64_t mask, unsigned int n, uint64_t mnts[])</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++)</div><div class='add'>+		mnts[i] = expect_notify_mask(_metadata, self, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void verify_mount_ids(struct __test_metadata *const _metadata,</div><div class='add'>+			     const uint64_t list1[], const uint64_t list2[],</div><div class='add'>+			     size_t num)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+</div><div class='add'>+	// Check that neither list has any duplicates</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		for (j = 0; j &lt; num; j++) {</div><div class='add'>+			if (i != j) {</div><div class='add'>+				ASSERT_NE(list1[i], list1[j]);</div><div class='add'>+				ASSERT_NE(list2[i], list2[j]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	// Check that all list1 memebers can be found in list2. Together with</div><div class='add'>+	// the above it means that the list1 and list2 represent the same sets.</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		for (j = 0; j &lt; num; j++) {</div><div class='add'>+			if (list1[i] == list2[j])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		ASSERT_NE(j, num);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_mounted(struct __test_metadata *const _metadata,</div><div class='add'>+			  const uint64_t mnts[], size_t num)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	uint64_t *list;</div><div class='add'>+</div><div class='add'>+	list = malloc((num + 1) * sizeof(list[0]));</div><div class='add'>+	ASSERT_NE(list, NULL);</div><div class='add'>+</div><div class='add'>+	ret = listmount(LSMT_ROOT, 0, 0, list, num + 1, 0);</div><div class='add'>+	ASSERT_EQ(ret, num);</div><div class='add'>+</div><div class='add'>+	verify_mount_ids(_metadata, mnts, list, num);</div><div class='add'>+</div><div class='add'>+	free(list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_mount_tree(struct __test_metadata *const _metadata,</div><div class='add'>+			    int log2_num)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = mount("", "/", NULL, MS_SHARED, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; log2_num; i++) {</div><div class='add'>+		ret = mount("/", "/", NULL, MS_BIND, NULL);</div><div class='add'>+		ASSERT_EQ(ret, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, bind)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	uint64_t mnts[2] = { self-&gt;root_id };</div><div class='add'>+</div><div class='add'>+	ret = mount("/", "/", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts[1] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+	ASSERT_NE(mnts[0], mnts[1]);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 2);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	uint64_t detach_id;</div><div class='add'>+	ret = umount("/");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	detach_id = expect_notify_mask(_metadata, self, FAN_MNT_DETACH);</div><div class='add'>+	ASSERT_EQ(detach_id, mnts[1]);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, move)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	uint64_t mnts[2] = { self-&gt;root_id };</div><div class='add'>+	uint64_t move_id;</div><div class='add'>+</div><div class='add'>+	ret = mount("/", "/a", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts[1] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+	ASSERT_NE(mnts[0], mnts[1]);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 2);</div><div class='add'>+</div><div class='add'>+	ret = move_mount(AT_FDCWD, "/a", AT_FDCWD, "/b", 0);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	move_id = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH | FAN_MNT_DETACH);</div><div class='add'>+	ASSERT_EQ(move_id, mnts[1]);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	ret = umount("/b");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, propagate)</div><div class='add'>+{</div><div class='add'>+	const unsigned int log2_num = 4;</div><div class='add'>+	const unsigned int num = (1 &lt;&lt; log2_num);</div><div class='add'>+	uint64_t mnts[num];</div><div class='add'>+</div><div class='add'>+	setup_mount_tree(_metadata, log2_num);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_ATTACH, num - 1, mnts + 1);</div><div class='add'>+</div><div class='add'>+	mnts[0] = self-&gt;root_id;</div><div class='add'>+	check_mounted(_metadata, mnts, num);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	int ret;</div><div class='add'>+	uint64_t mnts2[num];</div><div class='add'>+	ret = umount2("/", MNT_DETACH);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("", "/", NULL, MS_PRIVATE, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts2[0] = self-&gt;root_id;</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_DETACH, num - 1, mnts2 + 1);</div><div class='add'>+	verify_mount_ids(_metadata, mnts, mnts2, num);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, fsmount)</div><div class='add'>+{</div><div class='add'>+	int ret, fs, mnt;</div><div class='add'>+	uint64_t mnts[2] = { self-&gt;root_id };</div><div class='add'>+</div><div class='add'>+	fs = fsopen("tmpfs", 0);</div><div class='add'>+	ASSERT_GE(fs, 0);</div><div class='add'>+</div><div class='add'>+	ret = fsconfig(fs, FSCONFIG_CMD_CREATE, 0, 0, 0);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnt = fsmount(fs, 0, 0);</div><div class='add'>+	ASSERT_GE(mnt, 0);</div><div class='add'>+</div><div class='add'>+	close(fs);</div><div class='add'>+</div><div class='add'>+	ret = move_mount(mnt, "", AT_FDCWD, "/a", MOVE_MOUNT_F_EMPTY_PATH);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	close(mnt);</div><div class='add'>+</div><div class='add'>+	mnts[1] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+	ASSERT_NE(mnts[0], mnts[1]);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 2);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	uint64_t detach_id;</div><div class='add'>+	ret = umount("/a");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	detach_id = expect_notify_mask(_metadata, self, FAN_MNT_DETACH);</div><div class='add'>+	ASSERT_EQ(detach_id, mnts[1]);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, reparent)</div><div class='add'>+{</div><div class='add'>+	uint64_t mnts[6] = { self-&gt;root_id };</div><div class='add'>+	uint64_t dmnts[3];</div><div class='add'>+	uint64_t masks[3];</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	// Create setup with a[1] -&gt; b[2] propagation</div><div class='add'>+	ret = mount("/", "/a", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("", "/a", NULL, MS_SHARED, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("/a", "/b", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("", "/b", NULL, MS_SLAVE, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_ATTACH, 2, mnts + 1);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 3);</div><div class='add'>+</div><div class='add'>+	// Mount on a[3], which is propagated to b[4]</div><div class='add'>+	ret = mount("/", "/a", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_ATTACH, 2, mnts + 3);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 5);</div><div class='add'>+</div><div class='add'>+	// Mount on b[5], not propagated</div><div class='add'>+	ret = mount("/", "/b", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts[5] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 6);</div><div class='add'>+</div><div class='add'>+	// Umount a[3], which is propagated to b[4], but not b[5]</div><div class='add'>+	// This will result in b[5] "falling" on b[2]</div><div class='add'>+	ret = umount("/a");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_n(_metadata, self, 3, masks, dmnts);</div><div class='add'>+	verify_mount_ids(_metadata, mnts + 3, dmnts, 3);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		if (dmnts[i] == mnts[5]) {</div><div class='add'>+			ASSERT_EQ(masks[i], FAN_MNT_ATTACH | FAN_MNT_DETACH);</div><div class='add'>+		} else {</div><div class='add'>+			ASSERT_EQ(masks[i], FAN_MNT_DETACH);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mnts[3] = mnts[5];</div><div class='add'>+	check_mounted(_metadata, mnts, 4);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	ret = umount("/b");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = umount("/a");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = umount("/b");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_DETACH, 3, dmnts);</div><div class='add'>+	verify_mount_ids(_metadata, mnts + 1, dmnts, 3);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, rmdir)</div><div class='add'>+{</div><div class='add'>+	uint64_t mnts[3] = { self-&gt;root_id };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mount("/", "/a", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("/", "/a/b", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_ATTACH, 2, mnts + 1);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 3);</div><div class='add'>+</div><div class='add'>+	ret = chdir("/a");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = fork();</div><div class='add'>+	ASSERT_GE(ret, 0);</div><div class='add'>+</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		chdir("/");</div><div class='add'>+		unshare(CLONE_NEWNS);</div><div class='add'>+		mount("", "/", NULL, MS_REC|MS_PRIVATE, NULL);</div><div class='add'>+		umount2("/a", MNT_DETACH);</div><div class='add'>+		// This triggers a detach in the other namespace</div><div class='add'>+		rmdir("/a");</div><div class='add'>+		exit(0);</div><div class='add'>+	}</div><div class='add'>+	wait(NULL);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_DETACH, 2, mnts + 1);</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	ret = chdir("/");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fanotify, pivot_root)</div><div class='add'>+{</div><div class='add'>+	uint64_t mnts[3] = { self-&gt;root_id };</div><div class='add'>+	uint64_t mnts2[3];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mount("tmpfs", "/a", "tmpfs", 0, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts[2] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+</div><div class='add'>+	ret = mkdir("/a/new", 0700);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mkdir("/a/old", 0700);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = mount("/a", "/a/new", NULL, MS_BIND, NULL);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	mnts[1] = expect_notify_mask(_metadata, self, FAN_MNT_ATTACH);</div><div class='add'>+	check_mounted(_metadata, mnts, 3);</div><div class='add'>+</div><div class='add'>+	ret = syscall(SYS_pivot_root, "/a/new", "/a/new/old");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	expect_notify_mask_n(_metadata, self, FAN_MNT_ATTACH | FAN_MNT_DETACH, 2, mnts2);</div><div class='add'>+	verify_mount_ids(_metadata, mnts, mnts2, 2);</div><div class='add'>+	check_mounted(_metadata, mnts, 3);</div><div class='add'>+</div><div class='add'>+	// Cleanup</div><div class='add'>+	ret = syscall(SYS_pivot_root, "/old", "/old/a/new");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = umount("/a/new");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = umount("/a");</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	check_mounted(_metadata, mnts, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/nsfs/iterate_mntns.c b/tools/testing/selftests/filesystems/nsfs/iterate_mntns.c<br/>index 457cf76f3c5f..61e55dfbf121 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/nsfs/iterate_mntns.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/nsfs/iterate_mntns.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/nsfs/iterate_mntns.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/nsfs/iterate_mntns.c</a></div><div class='hunk'>@@ -3,6 +3,8 @@</div><div class='ctx'> </div><div class='ctx'> #define _GNU_SOURCE</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;linux/auto_dev-ioctl.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;sched.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='hunk'>@@ -10,7 +12,7 @@</div><div class='ctx'> #include &lt;sys/mount.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> #define MNT_NS_COUNT 11</div><div class='ctx'> #define MNT_NS_LAST_INDEX 10</div><div class='hunk'>@@ -146,4 +148,16 @@ TEST_F(iterate_mount_namespaces, iterate_backward)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+TEST_F(iterate_mount_namespaces, nfs_valid_ioctl)</div><div class='add'>+{</div><div class='add'>+	ASSERT_NE(ioctl(self-&gt;fd_mnt_ns[0], AUTOFS_DEV_IOCTL_OPENMOUNT, NULL), 0);</div><div class='add'>+	ASSERT_EQ(errno, ENOTTY);</div><div class='add'>+</div><div class='add'>+	ASSERT_NE(ioctl(self-&gt;fd_mnt_ns[0], AUTOFS_DEV_IOCTL_CLOSEMOUNT, NULL), 0);</div><div class='add'>+	ASSERT_EQ(errno, ENOTTY);</div><div class='add'>+</div><div class='add'>+	ASSERT_NE(ioctl(self-&gt;fd_mnt_ns[0], AUTOFS_DEV_IOCTL_READY, NULL), 0);</div><div class='add'>+	ASSERT_EQ(errno, ENOTTY);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/overlayfs/Makefile b/tools/testing/selftests/filesystems/overlayfs/Makefile<br/>index e8d1adb021af..d3ad4a77db9b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/overlayfs/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/overlayfs/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/overlayfs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/overlayfs/Makefile</a></div><div class='hunk'>@@ -1,7 +1,14 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='del'>-TEST_GEN_PROGS := dev_in_maps set_layers_via_fds</div><div class='add'>+CFLAGS += -Wall</div><div class='add'>+CFLAGS += $(KHDR_INCLUDES)</div><div class='add'>+LDLIBS += -lcap</div><div class='ctx'> </div><div class='del'>-CFLAGS := -Wall -Werror</div><div class='add'>+LOCAL_HDRS += ../wrappers.h log.h</div><div class='add'>+</div><div class='add'>+TEST_GEN_PROGS := dev_in_maps</div><div class='add'>+TEST_GEN_PROGS += set_layers_via_fds</div><div class='ctx'> </div><div class='ctx'> include ../../lib.mk</div><div class='add'>+</div><div class='add'>+$(OUTPUT)/set_layers_via_fds: ../utils.c</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c b/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c<br/>index 3b796264223f..8924cea6aa4b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c</a></div><div class='hunk'>@@ -15,9 +15,9 @@</div><div class='ctx'> #include &lt;sched.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "log.h"</div><div class='del'>-#include "wrappers.h"</div><div class='add'>+#include "../wrappers.h"</div><div class='ctx'> </div><div class='ctx'> static long get_file_dev_and_inode(void *addr, struct statx *stx)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c b/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c<br/>index 1d0ae785a667..3c0b93183348 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c</a></div><div class='hunk'>@@ -6,26 +6,40 @@</div><div class='ctx'> #include &lt;sched.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='ctx'> #include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/sysmacros.h&gt;</div><div class='ctx'> #include &lt;sys/mount.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+#include "../../pidfd/pidfd.h"</div><div class='ctx'> #include "log.h"</div><div class='del'>-#include "wrappers.h"</div><div class='add'>+#include "../utils.h"</div><div class='add'>+#include "../wrappers.h"</div><div class='ctx'> </div><div class='ctx'> FIXTURE(set_layers_via_fds) {</div><div class='add'>+	int pidfd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> FIXTURE_SETUP(set_layers_via_fds)</div><div class='ctx'> {</div><div class='del'>-	ASSERT_EQ(mkdir("/set_layers_via_fds", 0755), 0);</div><div class='add'>+	self-&gt;pidfd = -EBADF;</div><div class='add'>+	EXPECT_EQ(mkdir("/set_layers_via_fds", 0755), 0);</div><div class='add'>+	EXPECT_EQ(mkdir("/set_layers_via_fds_tmpfs", 0755), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> FIXTURE_TEARDOWN(set_layers_via_fds)</div><div class='ctx'> {</div><div class='add'>+	if (self-&gt;pidfd &gt;= 0) {</div><div class='add'>+		EXPECT_EQ(sys_pidfd_send_signal(self-&gt;pidfd, SIGKILL, NULL, 0), 0);</div><div class='add'>+		EXPECT_EQ(close(self-&gt;pidfd), 0);</div><div class='add'>+	}</div><div class='ctx'> 	umount2("/set_layers_via_fds", 0);</div><div class='del'>-	ASSERT_EQ(rmdir("/set_layers_via_fds"), 0);</div><div class='add'>+	EXPECT_EQ(rmdir("/set_layers_via_fds"), 0);</div><div class='add'>+</div><div class='add'>+	umount2("/set_layers_via_fds_tmpfs", 0);</div><div class='add'>+	EXPECT_EQ(rmdir("/set_layers_via_fds_tmpfs"), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> TEST_F(set_layers_via_fds, set_layers_via_fds)</div><div class='hunk'>@@ -214,4 +228,493 @@ TEST_F(set_layers_via_fds, set_500_layers_via_fds)</div><div class='ctx'> 	ASSERT_EQ(close(fd_overlay), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+TEST_F(set_layers_via_fds, set_override_creds)</div><div class='add'>+{</div><div class='add'>+	int fd_context, fd_tmpfs, fd_overlay;</div><div class='add'>+	int layer_fds[] = { [0 ... 3] = -EBADF };</div><div class='add'>+	pid_t pid;</div><div class='add'>+	int pidfd;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(unshare(CLONE_NEWNS), 0);</div><div class='add'>+	ASSERT_EQ(sys_mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL), 0);</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("tmpfs", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);</div><div class='add'>+	fd_tmpfs = sys_fsmount(fd_context, 0, 0);</div><div class='add'>+	ASSERT_GE(fd_tmpfs, 0);</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "w", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "u", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "l1", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "l2", 0755), 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[0] = openat(fd_tmpfs, "w", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[0], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[1] = openat(fd_tmpfs, "u", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[1], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[2] = openat(fd_tmpfs, "l1", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[2], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[3] = openat(fd_tmpfs, "l2", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[3], 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_move_mount(fd_tmpfs, "", -EBADF, "/tmp", MOVE_MOUNT_F_EMPTY_PATH), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_tmpfs), 0);</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("overlay", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_NE(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir", NULL, layer_fds[2]), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "workdir",   NULL, layer_fds[0]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "upperdir",  NULL, layer_fds[1]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[2]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[3]), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_STRING, "metacopy", "on", 0), 0);</div><div class='add'>+</div><div class='add'>+	pid = create_child(&amp;pidfd, 0);</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0) {</div><div class='add'>+		if (sys_fsconfig(fd_context, FSCONFIG_SET_FLAG, "override_creds", NULL, 0)) {</div><div class='add'>+			TH_LOG("sys_fsconfig should have succeeded");</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		_exit(EXIT_SUCCESS);</div><div class='add'>+	}</div><div class='add'>+	ASSERT_GE(sys_waitid(P_PID, pid, NULL, WEXITED), 0);</div><div class='add'>+	ASSERT_GE(close(pidfd), 0);</div><div class='add'>+</div><div class='add'>+	pid = create_child(&amp;pidfd, 0);</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0) {</div><div class='add'>+		if (sys_fsconfig(fd_context, FSCONFIG_SET_FLAG, "nooverride_creds", NULL, 0)) {</div><div class='add'>+			TH_LOG("sys_fsconfig should have succeeded");</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		_exit(EXIT_SUCCESS);</div><div class='add'>+	}</div><div class='add'>+	ASSERT_GE(sys_waitid(P_PID, pid, NULL, WEXITED), 0);</div><div class='add'>+	ASSERT_GE(close(pidfd), 0);</div><div class='add'>+</div><div class='add'>+	pid = create_child(&amp;pidfd, 0);</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0) {</div><div class='add'>+		if (sys_fsconfig(fd_context, FSCONFIG_SET_FLAG, "override_creds", NULL, 0)) {</div><div class='add'>+			TH_LOG("sys_fsconfig should have succeeded");</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		_exit(EXIT_SUCCESS);</div><div class='add'>+	}</div><div class='add'>+	ASSERT_GE(sys_waitid(P_PID, pid, NULL, WEXITED), 0);</div><div class='add'>+	ASSERT_GE(close(pidfd), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);</div><div class='add'>+</div><div class='add'>+	fd_overlay = sys_fsmount(fd_context, 0, 0);</div><div class='add'>+	ASSERT_GE(fd_overlay, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_move_mount(fd_overlay, "", -EBADF, "/set_layers_via_fds", MOVE_MOUNT_F_EMPTY_PATH), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_overlay), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(set_layers_via_fds, set_override_creds_invalid)</div><div class='add'>+{</div><div class='add'>+	int fd_context, fd_tmpfs, fd_overlay, ret;</div><div class='add'>+	int layer_fds[] = { [0 ... 3] = -EBADF };</div><div class='add'>+	pid_t pid;</div><div class='add'>+	int fd_userns1, fd_userns2;</div><div class='add'>+	int ipc_sockets[2];</div><div class='add'>+	char c;</div><div class='add'>+	const unsigned int predictable_fd_context_nr = 123;</div><div class='add'>+</div><div class='add'>+	fd_userns1 = get_userns_fd(0, 0, 10000);</div><div class='add'>+	ASSERT_GE(fd_userns1, 0);</div><div class='add'>+</div><div class='add'>+	fd_userns2 = get_userns_fd(0, 1234, 10000);</div><div class='add'>+	ASSERT_GE(fd_userns2, 0);</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, ipc_sockets);</div><div class='add'>+	ASSERT_GE(ret, 0);</div><div class='add'>+</div><div class='add'>+	pid = create_child(&amp;self-&gt;pidfd, 0);</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0) {</div><div class='add'>+		if (close(ipc_sockets[0])) {</div><div class='add'>+			TH_LOG("close should have succeeded");</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!switch_userns(fd_userns2, 0, 0, false)) {</div><div class='add'>+			TH_LOG("switch_userns should have succeeded");</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (read_nointr(ipc_sockets[1], &amp;c, 1) != 1) {</div><div class='add'>+			TH_LOG("read_nointr should have succeeded");</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (close(ipc_sockets[1])) {</div><div class='add'>+			TH_LOG("close should have succeeded");</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!sys_fsconfig(predictable_fd_context_nr, FSCONFIG_SET_FLAG, "override_creds", NULL, 0)) {</div><div class='add'>+			TH_LOG("sys_fsconfig should have failed");</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		_exit(EXIT_SUCCESS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(ipc_sockets[1]), 0);</div><div class='add'>+	ASSERT_EQ(switch_userns(fd_userns1, 0, 0, false), true);</div><div class='add'>+	ASSERT_EQ(unshare(CLONE_NEWNS), 0);</div><div class='add'>+	ASSERT_EQ(sys_mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL), 0);</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("tmpfs", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);</div><div class='add'>+	fd_tmpfs = sys_fsmount(fd_context, 0, 0);</div><div class='add'>+	ASSERT_GE(fd_tmpfs, 0);</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "w", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "u", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "l1", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "l2", 0755), 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[0] = openat(fd_tmpfs, "w", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[0], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[1] = openat(fd_tmpfs, "u", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[1], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[2] = openat(fd_tmpfs, "l1", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[2], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[3] = openat(fd_tmpfs, "l2", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[3], 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_move_mount(fd_tmpfs, "", -EBADF, "/tmp", MOVE_MOUNT_F_EMPTY_PATH), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_tmpfs), 0);</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("overlay", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+	ASSERT_EQ(dup3(fd_context, predictable_fd_context_nr, 0), predictable_fd_context_nr);</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+	fd_context = predictable_fd_context_nr;</div><div class='add'>+	ASSERT_EQ(write_nointr(ipc_sockets[0], "1", 1), 1);</div><div class='add'>+	ASSERT_EQ(close(ipc_sockets[0]), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(wait_for_pid(pid), 0);</div><div class='add'>+	ASSERT_EQ(close(self-&gt;pidfd), 0);</div><div class='add'>+	self-&gt;pidfd = -EBADF;</div><div class='add'>+</div><div class='add'>+	ASSERT_NE(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir", NULL, layer_fds[2]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "workdir",   NULL, layer_fds[0]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "upperdir",  NULL, layer_fds[1]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[2]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[3]), 0);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(layer_fds); i++)</div><div class='add'>+		ASSERT_EQ(close(layer_fds[i]), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FLAG, "userxattr", NULL, 0), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);</div><div class='add'>+</div><div class='add'>+	fd_overlay = sys_fsmount(fd_context, 0, 0);</div><div class='add'>+	ASSERT_GE(fd_overlay, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_move_mount(fd_overlay, "", -EBADF, "/set_layers_via_fds", MOVE_MOUNT_F_EMPTY_PATH), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_overlay), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_userns1), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_userns2), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(set_layers_via_fds, set_override_creds_nomknod)</div><div class='add'>+{</div><div class='add'>+	int fd_context, fd_tmpfs, fd_overlay;</div><div class='add'>+	int layer_fds[] = { [0 ... 3] = -EBADF };</div><div class='add'>+	pid_t pid;</div><div class='add'>+	int pidfd;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(unshare(CLONE_NEWNS), 0);</div><div class='add'>+	ASSERT_EQ(sys_mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL), 0);</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("tmpfs", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);</div><div class='add'>+	fd_tmpfs = sys_fsmount(fd_context, 0, 0);</div><div class='add'>+	ASSERT_GE(fd_tmpfs, 0);</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "w", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "u", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "l1", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "l2", 0755), 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[0] = openat(fd_tmpfs, "w", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[0], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[1] = openat(fd_tmpfs, "u", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[1], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[2] = openat(fd_tmpfs, "l1", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[2], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[3] = openat(fd_tmpfs, "l2", O_DIRECTORY);</div><div class='add'>+	ASSERT_GE(layer_fds[3], 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_move_mount(fd_tmpfs, "", -EBADF, "/tmp", MOVE_MOUNT_F_EMPTY_PATH), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_tmpfs), 0);</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("overlay", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_NE(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir", NULL, layer_fds[2]), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "workdir",   NULL, layer_fds[0]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "upperdir",  NULL, layer_fds[1]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[2]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[3]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FLAG, "userxattr", NULL, 0), 0);</div><div class='add'>+</div><div class='add'>+	pid = create_child(&amp;pidfd, 0);</div><div class='add'>+	ASSERT_GE(pid, 0);</div><div class='add'>+	if (pid == 0) {</div><div class='add'>+		if (!cap_down(CAP_MKNOD))</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+</div><div class='add'>+		if (!cap_down(CAP_SYS_ADMIN))</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+</div><div class='add'>+		if (sys_fsconfig(fd_context, FSCONFIG_SET_FLAG, "override_creds", NULL, 0))</div><div class='add'>+			_exit(EXIT_FAILURE);</div><div class='add'>+</div><div class='add'>+		_exit(EXIT_SUCCESS);</div><div class='add'>+	}</div><div class='add'>+	ASSERT_EQ(sys_waitid(P_PID, pid, NULL, WEXITED), 0);</div><div class='add'>+	ASSERT_GE(close(pidfd), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);</div><div class='add'>+</div><div class='add'>+	fd_overlay = sys_fsmount(fd_context, 0, 0);</div><div class='add'>+	ASSERT_GE(fd_overlay, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_move_mount(fd_overlay, "", -EBADF, "/set_layers_via_fds", MOVE_MOUNT_F_EMPTY_PATH), 0);</div><div class='add'>+	ASSERT_EQ(mknodat(fd_overlay, "dev-zero", S_IFCHR | 0644, makedev(1, 5)), -1);</div><div class='add'>+	ASSERT_EQ(errno, EPERM);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_overlay), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(set_layers_via_fds, set_500_layers_via_opath_fds)</div><div class='add'>+{</div><div class='add'>+	int fd_context, fd_tmpfs, fd_overlay, fd_work, fd_upper, fd_lower;</div><div class='add'>+	int layer_fds[500] = { [0 ... 499] = -EBADF };</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(unshare(CLONE_NEWNS), 0);</div><div class='add'>+	ASSERT_EQ(sys_mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL), 0);</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("tmpfs", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);</div><div class='add'>+	fd_tmpfs = sys_fsmount(fd_context, 0, 0);</div><div class='add'>+	ASSERT_GE(fd_tmpfs, 0);</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(layer_fds); i++) {</div><div class='add'>+		char path[100];</div><div class='add'>+</div><div class='add'>+		sprintf(path, "l%d", i);</div><div class='add'>+		ASSERT_EQ(mkdirat(fd_tmpfs, path, 0755), 0);</div><div class='add'>+		layer_fds[i] = openat(fd_tmpfs, path, O_DIRECTORY | O_PATH);</div><div class='add'>+		ASSERT_GE(layer_fds[i], 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "w", 0755), 0);</div><div class='add'>+	fd_work = openat(fd_tmpfs, "w", O_DIRECTORY | O_PATH);</div><div class='add'>+	ASSERT_GE(fd_work, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "u", 0755), 0);</div><div class='add'>+	fd_upper = openat(fd_tmpfs, "u", O_DIRECTORY | O_PATH);</div><div class='add'>+	ASSERT_GE(fd_upper, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "l501", 0755), 0);</div><div class='add'>+	fd_lower = openat(fd_tmpfs, "l501", O_DIRECTORY | O_PATH);</div><div class='add'>+	ASSERT_GE(fd_lower, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_move_mount(fd_tmpfs, "", -EBADF, "/tmp", MOVE_MOUNT_F_EMPTY_PATH), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_tmpfs), 0);</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("overlay", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "workdir",   NULL, fd_work), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_work), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "upperdir",  NULL, fd_upper), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_upper), 0);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(layer_fds); i++) {</div><div class='add'>+		ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[i]), 0);</div><div class='add'>+		ASSERT_EQ(close(layer_fds[i]), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_NE(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, fd_lower), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_lower), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);</div><div class='add'>+</div><div class='add'>+	fd_overlay = sys_fsmount(fd_context, 0, 0);</div><div class='add'>+	ASSERT_GE(fd_overlay, 0);</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_overlay), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(set_layers_via_fds, set_layers_via_detached_mount_fds)</div><div class='add'>+{</div><div class='add'>+	int fd_context, fd_tmpfs, fd_overlay, fd_tmp;</div><div class='add'>+	int layer_fds[] = { [0 ... 8] = -EBADF };</div><div class='add'>+	bool layers_found[] = { [0 ... 8] =  false };</div><div class='add'>+	size_t len = 0;</div><div class='add'>+	char *line = NULL;</div><div class='add'>+	FILE *f_mountinfo;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(unshare(CLONE_NEWNS), 0);</div><div class='add'>+	ASSERT_EQ(sys_mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL), 0);</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("tmpfs", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);</div><div class='add'>+	fd_tmpfs = sys_fsmount(fd_context, 0, 0);</div><div class='add'>+	ASSERT_GE(fd_tmpfs, 0);</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "u", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "u/upper", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "u/work", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "l1", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "l2", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "l3", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "l4", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "d1", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "d2", 0755), 0);</div><div class='add'>+	ASSERT_EQ(mkdirat(fd_tmpfs, "d3", 0755), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_move_mount(fd_tmpfs, "", -EBADF, "/set_layers_via_fds_tmpfs", MOVE_MOUNT_F_EMPTY_PATH), 0);</div><div class='add'>+</div><div class='add'>+	fd_tmp = open_tree(fd_tmpfs, "u", OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC);</div><div class='add'>+	ASSERT_GE(fd_tmp, 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[0] = openat(fd_tmp, "upper", O_CLOEXEC | O_DIRECTORY | O_PATH);</div><div class='add'>+	ASSERT_GE(layer_fds[0], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[1] = openat(fd_tmp, "work", O_CLOEXEC | O_DIRECTORY | O_PATH);</div><div class='add'>+	ASSERT_GE(layer_fds[1], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[2] = open_tree(fd_tmpfs, "l1", OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC);</div><div class='add'>+	ASSERT_GE(layer_fds[2], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[3] = open_tree(fd_tmpfs, "l2", OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC);</div><div class='add'>+	ASSERT_GE(layer_fds[3], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[4] = open_tree(fd_tmpfs, "l3", OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC);</div><div class='add'>+	ASSERT_GE(layer_fds[4], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[5] = open_tree(fd_tmpfs, "l4", OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC);</div><div class='add'>+	ASSERT_GE(layer_fds[5], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[6] = open_tree(fd_tmpfs, "d1", OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC);</div><div class='add'>+	ASSERT_GE(layer_fds[6], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[7] = open_tree(fd_tmpfs, "d2", OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC);</div><div class='add'>+	ASSERT_GE(layer_fds[7], 0);</div><div class='add'>+</div><div class='add'>+	layer_fds[8] = open_tree(fd_tmpfs, "d3", OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC);</div><div class='add'>+	ASSERT_GE(layer_fds[8], 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(fd_tmpfs), 0);</div><div class='add'>+</div><div class='add'>+	fd_context = sys_fsopen("overlay", 0);</div><div class='add'>+	ASSERT_GE(fd_context, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_NE(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir", NULL, layer_fds[2]), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "upperdir",  NULL, layer_fds[0]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "workdir",   NULL, layer_fds[1]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[2]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[3]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[4]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[5]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "datadir+",  NULL, layer_fds[6]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "datadir+",  NULL, layer_fds[7]), 0);</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "datadir+",  NULL, layer_fds[8]), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_STRING, "metacopy", "on", 0), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);</div><div class='add'>+</div><div class='add'>+	fd_overlay = sys_fsmount(fd_context, 0, 0);</div><div class='add'>+	ASSERT_GE(fd_overlay, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(sys_move_mount(fd_overlay, "", -EBADF, "/set_layers_via_fds", MOVE_MOUNT_F_EMPTY_PATH), 0);</div><div class='add'>+</div><div class='add'>+	f_mountinfo = fopen("/proc/self/mountinfo", "r");</div><div class='add'>+	ASSERT_NE(f_mountinfo, NULL);</div><div class='add'>+</div><div class='add'>+	while (getline(&amp;line, &amp;len, f_mountinfo) != -1) {</div><div class='add'>+		char *haystack = line;</div><div class='add'>+</div><div class='add'>+		if (strstr(haystack, "workdir=/tmp/w"))</div><div class='add'>+			layers_found[0] = true;</div><div class='add'>+		if (strstr(haystack, "upperdir=/tmp/u"))</div><div class='add'>+			layers_found[1] = true;</div><div class='add'>+		if (strstr(haystack, "lowerdir+=/tmp/l1"))</div><div class='add'>+			layers_found[2] = true;</div><div class='add'>+		if (strstr(haystack, "lowerdir+=/tmp/l2"))</div><div class='add'>+			layers_found[3] = true;</div><div class='add'>+		if (strstr(haystack, "lowerdir+=/tmp/l3"))</div><div class='add'>+			layers_found[4] = true;</div><div class='add'>+		if (strstr(haystack, "lowerdir+=/tmp/l4"))</div><div class='add'>+			layers_found[5] = true;</div><div class='add'>+		if (strstr(haystack, "datadir+=/tmp/d1"))</div><div class='add'>+			layers_found[6] = true;</div><div class='add'>+		if (strstr(haystack, "datadir+=/tmp/d2"))</div><div class='add'>+			layers_found[7] = true;</div><div class='add'>+		if (strstr(haystack, "datadir+=/tmp/d3"))</div><div class='add'>+			layers_found[8] = true;</div><div class='add'>+	}</div><div class='add'>+	free(line);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; ARRAY_SIZE(layer_fds); i++) {</div><div class='add'>+		ASSERT_EQ(layers_found[i], true);</div><div class='add'>+		ASSERT_EQ(close(layer_fds[i]), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(fd_context), 0);</div><div class='add'>+	ASSERT_EQ(close(fd_overlay), 0);</div><div class='add'>+	ASSERT_EQ(fclose(f_mountinfo), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/overlayfs/wrappers.h b/tools/testing/selftests/filesystems/overlayfs/wrappers.h<br/>deleted file mode 100644<br/>index 071b95fd2ac0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/overlayfs/wrappers.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/overlayfs/wrappers.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-//</div><div class='del'>-#ifndef __SELFTEST_OVERLAYFS_WRAPPERS_H__</div><div class='del'>-#define __SELFTEST_OVERLAYFS_WRAPPERS_H__</div><div class='del'>-</div><div class='del'>-#define _GNU_SOURCE</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='del'>-#include &lt;sys/syscall.h&gt;</div><div class='del'>-</div><div class='del'>-static inline int sys_fsopen(const char *fsname, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	return syscall(__NR_fsopen, fsname, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sys_fsconfig(int fd, unsigned int cmd, const char *key,</div><div class='del'>-			       const char *value, int aux)</div><div class='del'>-{</div><div class='del'>-	return syscall(__NR_fsconfig, fd, cmd, key, value, aux);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sys_fsmount(int fd, unsigned int flags,</div><div class='del'>-			      unsigned int attr_flags)</div><div class='del'>-{</div><div class='del'>-	return syscall(__NR_fsmount, fd, flags, attr_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int sys_mount(const char *src, const char *tgt, const char *fst,</div><div class='del'>-			    unsigned long flags, const void *data)</div><div class='del'>-{</div><div class='del'>-	return syscall(__NR_mount, src, tgt, fst, flags, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef MOVE_MOUNT_F_EMPTY_PATH</div><div class='del'>-#define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline int sys_move_mount(int from_dfd, const char *from_pathname,</div><div class='del'>-				 int to_dfd, const char *to_pathname,</div><div class='del'>-				 unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd,</div><div class='del'>-		       to_pathname, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/statmount/Makefile b/tools/testing/selftests/filesystems/statmount/Makefile<br/>index 14ee91a41650..8e354fe99b44 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/statmount/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/statmount/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/statmount/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/statmount/Makefile</a></div><div class='hunk'>@@ -1,6 +1,10 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> </div><div class='del'>-CFLAGS += -Wall -O2 -g $(KHDR_INCLUDES)</div><div class='add'>+CFLAGS += -Wall -O2 -g $(KHDR_INCLUDES) $(TOOLS_INCLUDES)</div><div class='add'>+LDLIBS += -lcap</div><div class='add'>+</div><div class='ctx'> TEST_GEN_PROGS := statmount_test statmount_test_ns listmount_test</div><div class='ctx'> </div><div class='ctx'> include ../../lib.mk</div><div class='add'>+</div><div class='add'>+$(OUTPUT)/statmount_test_ns: ../utils.c</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/statmount/listmount_test.c b/tools/testing/selftests/filesystems/statmount/listmount_test.c<br/>index 15f0834f7557..8bc82f38c42f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/statmount/listmount_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/statmount/listmount_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/statmount/listmount_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/statmount/listmount_test.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "statmount.h"</div><div class='del'>-#include "../../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef LISTMOUNT_REVERSE</div><div class='ctx'> #define LISTMOUNT_REVERSE    (1 &lt;&lt; 0) /* List later mounts first */</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/statmount/statmount.h b/tools/testing/selftests/filesystems/statmount/statmount.h<br/>index f4294bab9d73..99e5ad082fb1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/statmount/statmount.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/statmount/statmount.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/statmount/statmount.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/statmount/statmount.h</a></div><div class='hunk'>@@ -7,6 +7,42 @@</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifndef __NR_statmount</div><div class='add'>+	#if defined __alpha__</div><div class='add'>+		#define __NR_statmount 567</div><div class='add'>+	#elif defined _MIPS_SIM</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */</div><div class='add'>+			#define __NR_statmount 4457</div><div class='add'>+		#endif</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */</div><div class='add'>+			#define __NR_statmount 6457</div><div class='add'>+		#endif</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */</div><div class='add'>+			#define __NR_statmount 5457</div><div class='add'>+		#endif</div><div class='add'>+	#else</div><div class='add'>+		#define __NR_statmount 457</div><div class='add'>+	#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __NR_listmount</div><div class='add'>+	#if defined __alpha__</div><div class='add'>+		#define __NR_listmount 568</div><div class='add'>+	#elif defined _MIPS_SIM</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */</div><div class='add'>+			#define __NR_listmount 4458</div><div class='add'>+		#endif</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */</div><div class='add'>+			#define __NR_listmount 6458</div><div class='add'>+		#endif</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */</div><div class='add'>+			#define __NR_listmount 5458</div><div class='add'>+		#endif</div><div class='add'>+	#else</div><div class='add'>+		#define __NR_listmount 458</div><div class='add'>+	#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static inline int statmount(uint64_t mnt_id, uint64_t mnt_ns_id, uint64_t mask,</div><div class='ctx'> 			    struct statmount *buf, size_t bufsize,</div><div class='ctx'> 			    unsigned int flags)</div><div class='hunk'>@@ -25,7 +61,7 @@ static inline int statmount(uint64_t mnt_id, uint64_t mnt_ns_id, uint64_t mask,</div><div class='ctx'> 	return syscall(__NR_statmount, &amp;req, buf, bufsize, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t listmount(uint64_t mnt_id, uint64_t mnt_ns_id,</div><div class='add'>+static inline ssize_t listmount(uint64_t mnt_id, uint64_t mnt_ns_id,</div><div class='ctx'> 			 uint64_t last_mnt_id, uint64_t list[], size_t num,</div><div class='ctx'> 			 unsigned int flags)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/statmount/statmount_test.c b/tools/testing/selftests/filesystems/statmount/statmount_test.c<br/>index 46d289611ce8..6e53430423d2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/statmount/statmount_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/statmount/statmount_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/statmount/statmount_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/statmount/statmount_test.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "statmount.h"</div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> static const char *const known_fs[] = {</div><div class='ctx'> 	"9p", "adfs", "affs", "afs", "aio", "anon_inodefs", "apparmorfs",</div><div class='hunk'>@@ -26,13 +26,12 @@ static const char *const known_fs[] = {</div><div class='ctx'> 	"hfsplus", "hostfs", "hpfs", "hugetlbfs", "ibmasmfs", "iomem",</div><div class='ctx'> 	"ipathfs", "iso9660", "jffs2", "jfs", "minix", "mqueue", "msdos",</div><div class='ctx'> 	"nfs", "nfs4", "nfsd", "nilfs2", "nsfs", "ntfs", "ntfs3", "ocfs2",</div><div class='del'>-	"ocfs2_dlmfs", "ocxlflash", "omfs", "openpromfs", "overlay", "pipefs",</div><div class='del'>-	"proc", "pstore", "pvfs2", "qnx4", "qnx6", "ramfs",</div><div class='del'>-	"resctrl", "romfs", "rootfs", "rpc_pipefs", "s390_hypfs", "secretmem",</div><div class='del'>-	"securityfs", "selinuxfs", "smackfs", "smb3", "sockfs", "spufs",</div><div class='del'>-	"squashfs", "sysfs", "sysv", "tmpfs", "tracefs", "ubifs", "udf",</div><div class='del'>-	"ufs", "v7", "vboxsf", "vfat", "virtiofs", "vxfs", "xenfs", "xfs",</div><div class='del'>-	"zonefs", NULL };</div><div class='add'>+	"ocfs2_dlmfs", "omfs", "openpromfs", "overlay", "pipefs", "proc",</div><div class='add'>+	"pstore", "pvfs2", "qnx4", "qnx6", "ramfs", "resctrl", "romfs",</div><div class='add'>+	"rootfs", "rpc_pipefs", "s390_hypfs", "secretmem", "securityfs",</div><div class='add'>+	"selinuxfs", "smackfs", "smb3", "sockfs", "spufs", "squashfs", "sysfs",</div><div class='add'>+	"sysv", "tmpfs", "tracefs", "ubifs", "udf", "ufs", "v7", "vboxsf",</div><div class='add'>+	"vfat", "virtiofs", "vxfs", "xenfs", "xfs", "zonefs", NULL };</div><div class='ctx'> </div><div class='ctx'> static struct statmount *statmount_alloc(uint64_t mnt_id, uint64_t mask, unsigned int flags)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c b/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c<br/>index 70cb0c8b21cf..d56d4103182f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/filesystems/statmount/statmount_test_ns.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/statmount/statmount_test_ns.c</a></div><div class='hunk'>@@ -14,7 +14,8 @@</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "statmount.h"</div><div class='del'>-#include "../../kselftest.h"</div><div class='add'>+#include "../utils.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define NSID_PASS 0</div><div class='ctx'> #define NSID_FAIL 1</div><div class='hunk'>@@ -78,87 +79,10 @@ static int get_mnt_ns_id(const char *mnt_ns, uint64_t *mnt_ns_id)</div><div class='ctx'> 	return NSID_PASS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_mnt_id(const char *path, uint64_t *mnt_id)</div><div class='del'>-{</div><div class='del'>-	struct statx sx;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = statx(AT_FDCWD, path, 0, STATX_MNT_ID_UNIQUE, &amp;sx);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		ksft_print_msg("retrieving unique mount ID for %s: %s\n", path,</div><div class='del'>-			       strerror(errno));</div><div class='del'>-		return NSID_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(sx.stx_mask &amp; STATX_MNT_ID_UNIQUE)) {</div><div class='del'>-		ksft_print_msg("no unique mount ID available for %s\n", path);</div><div class='del'>-		return NSID_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*mnt_id = sx.stx_mnt_id;</div><div class='del'>-	return NSID_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int write_file(const char *path, const char *val)</div><div class='del'>-{</div><div class='del'>-	int fd = open(path, O_WRONLY);</div><div class='del'>-	size_t len = strlen(val);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		ksft_print_msg("opening %s for write: %s\n", path, strerror(errno));</div><div class='del'>-		return NSID_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = write(fd, val, len);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		ksft_print_msg("writing to %s: %s\n", path, strerror(errno));</div><div class='del'>-		return NSID_ERROR;</div><div class='del'>-	}</div><div class='del'>-	if (ret != len) {</div><div class='del'>-		ksft_print_msg("short write to %s\n", path);</div><div class='del'>-		return NSID_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = close(fd);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		ksft_print_msg("closing %s\n", path);</div><div class='del'>-		return NSID_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NSID_PASS;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int setup_namespace(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	char buf[32];</div><div class='del'>-	uid_t uid = getuid();</div><div class='del'>-	gid_t gid = getgid();</div><div class='del'>-</div><div class='del'>-	ret = unshare(CLONE_NEWNS|CLONE_NEWUSER|CLONE_NEWPID);</div><div class='del'>-	if (ret == -1)</div><div class='del'>-		ksft_exit_fail_msg("unsharing mountns and userns: %s\n",</div><div class='del'>-				   strerror(errno));</div><div class='del'>-</div><div class='del'>-	sprintf(buf, "0 %d 1", uid);</div><div class='del'>-	ret = write_file("/proc/self/uid_map", buf);</div><div class='del'>-	if (ret != NSID_PASS)</div><div class='del'>-		return ret;</div><div class='del'>-	ret = write_file("/proc/self/setgroups", "deny");</div><div class='del'>-	if (ret != NSID_PASS)</div><div class='del'>-		return ret;</div><div class='del'>-	sprintf(buf, "0 %d 1", gid);</div><div class='del'>-	ret = write_file("/proc/self/gid_map", buf);</div><div class='del'>-	if (ret != NSID_PASS)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = mount("", "/", NULL, MS_REC|MS_PRIVATE, NULL);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		ksft_print_msg("making mount tree private: %s\n",</div><div class='del'>-			       strerror(errno));</div><div class='add'>+	if (setup_userns() != 0)</div><div class='ctx'> 		return NSID_ERROR;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return NSID_PASS;</div><div class='ctx'> }</div><div class='hunk'>@@ -174,9 +98,9 @@ static int _test_statmount_mnt_ns_id(void)</div><div class='ctx'> 	if (ret != NSID_PASS)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = get_mnt_id("/", &amp;root_id);</div><div class='del'>-	if (ret != NSID_PASS)</div><div class='del'>-		return ret;</div><div class='add'>+	root_id = get_unique_mnt_id("/");</div><div class='add'>+	if (!root_id)</div><div class='add'>+		return NSID_ERROR;</div><div class='ctx'> </div><div class='ctx'> 	ret = statmount(root_id, 0, STATMOUNT_MNT_NS_ID, &amp;sm, sizeof(sm), 0);</div><div class='ctx'> 	if (ret == -1) {</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/utils.c b/tools/testing/selftests/filesystems/utils.c<br/>new file mode 100644<br/>index 000000000000..c9dd5412b37b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/utils.c</a></div><div class='hunk'>@@ -0,0 +1,589 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#ifndef _GNU_SOURCE</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#endif</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;dirent.h&gt;</div><div class='add'>+#include &lt;grp.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+#include &lt;sched.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;sys/eventfd.h&gt;</div><div class='add'>+#include &lt;sys/fsuid.h&gt;</div><div class='add'>+#include &lt;sys/prctl.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;sys/xattr.h&gt;</div><div class='add'>+#include &lt;sys/mount.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kselftest.h"</div><div class='add'>+#include "wrappers.h"</div><div class='add'>+#include "utils.h"</div><div class='add'>+</div><div class='add'>+#define MAX_USERNS_LEVEL 32</div><div class='add'>+</div><div class='add'>+#define syserror(format, ...)                           \</div><div class='add'>+	({                                              \</div><div class='add'>+		fprintf(stderr, "%m - " format "\n", ##__VA_ARGS__); \</div><div class='add'>+		(-errno);                               \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define syserror_set(__ret__, format, ...)                    \</div><div class='add'>+	({                                                    \</div><div class='add'>+		typeof(__ret__) __internal_ret__ = (__ret__); \</div><div class='add'>+		errno = labs(__ret__);                        \</div><div class='add'>+		fprintf(stderr, "%m - " format "\n", ##__VA_ARGS__);       \</div><div class='add'>+		__internal_ret__;                             \</div><div class='add'>+	})</div><div class='add'>+</div><div class='add'>+#define STRLITERALLEN(x) (sizeof(""x"") - 1)</div><div class='add'>+</div><div class='add'>+#define INTTYPE_TO_STRLEN(type)             \</div><div class='add'>+	(2 + (sizeof(type) &lt;= 1             \</div><div class='add'>+		  ? 3                       \</div><div class='add'>+		  : sizeof(type) &lt;= 2       \</div><div class='add'>+			? 5                 \</div><div class='add'>+			: sizeof(type) &lt;= 4 \</div><div class='add'>+			      ? 10          \</div><div class='add'>+			      : sizeof(type) &lt;= 8 ? 20 : sizeof(int[-2 * (sizeof(type) &gt; 8)])))</div><div class='add'>+</div><div class='add'>+#define list_for_each(__iterator, __list) \</div><div class='add'>+	for (__iterator = (__list)-&gt;next; __iterator != __list; __iterator = __iterator-&gt;next)</div><div class='add'>+</div><div class='add'>+typedef enum idmap_type_t {</div><div class='add'>+	ID_TYPE_UID,</div><div class='add'>+	ID_TYPE_GID</div><div class='add'>+} idmap_type_t;</div><div class='add'>+</div><div class='add'>+struct id_map {</div><div class='add'>+	idmap_type_t map_type;</div><div class='add'>+	__u32 nsid;</div><div class='add'>+	__u32 hostid;</div><div class='add'>+	__u32 range;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct list {</div><div class='add'>+	void *elem;</div><div class='add'>+	struct list *next;</div><div class='add'>+	struct list *prev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct userns_hierarchy {</div><div class='add'>+	int fd_userns;</div><div class='add'>+	int fd_event;</div><div class='add'>+	unsigned int level;</div><div class='add'>+	struct list id_map;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void list_init(struct list *list)</div><div class='add'>+{</div><div class='add'>+	list-&gt;elem = NULL;</div><div class='add'>+	list-&gt;next = list-&gt;prev = list;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int list_empty(const struct list *list)</div><div class='add'>+{</div><div class='add'>+	return list == list-&gt;next;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __list_add(struct list *new, struct list *prev, struct list *next)</div><div class='add'>+{</div><div class='add'>+	next-&gt;prev = new;</div><div class='add'>+	new-&gt;next = next;</div><div class='add'>+	new-&gt;prev = prev;</div><div class='add'>+	prev-&gt;next = new;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void list_add_tail(struct list *head, struct list *list)</div><div class='add'>+{</div><div class='add'>+	__list_add(list, head-&gt;prev, head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void list_del(struct list *list)</div><div class='add'>+{</div><div class='add'>+	struct list *next, *prev;</div><div class='add'>+</div><div class='add'>+	next = list-&gt;next;</div><div class='add'>+	prev = list-&gt;prev;</div><div class='add'>+	next-&gt;prev = prev;</div><div class='add'>+	prev-&gt;next = next;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t read_nointr(int fd, void *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = read(fd, buf, count);</div><div class='add'>+	} while (ret &lt; 0 &amp;&amp; errno == EINTR);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t write_nointr(int fd, const void *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = write(fd, buf, count);</div><div class='add'>+	} while (ret &lt; 0 &amp;&amp; errno == EINTR);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __STACK_SIZE (8 * 1024 * 1024)</div><div class='add'>+static pid_t do_clone(int (*fn)(void *), void *arg, int flags)</div><div class='add'>+{</div><div class='add'>+	void *stack;</div><div class='add'>+</div><div class='add'>+	stack = malloc(__STACK_SIZE);</div><div class='add'>+	if (!stack)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+#ifdef __ia64__</div><div class='add'>+	return __clone2(fn, stack, __STACK_SIZE, flags | SIGCHLD, arg, NULL);</div><div class='add'>+#else</div><div class='add'>+	return clone(fn, stack + __STACK_SIZE, flags | SIGCHLD, arg, NULL);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_userns_fd_cb(void *data)</div><div class='add'>+{</div><div class='add'>+	for (;;)</div><div class='add'>+		pause();</div><div class='add'>+	_exit(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wait_for_pid(pid_t pid)</div><div class='add'>+{</div><div class='add'>+	int status, ret;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	ret = waitpid(pid, &amp;status, 0);</div><div class='add'>+	if (ret == -1) {</div><div class='add'>+		if (errno == EINTR)</div><div class='add'>+			goto again;</div><div class='add'>+</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!WIFEXITED(status))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return WEXITSTATUS(status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_id_mapping(idmap_type_t map_type, pid_t pid, const char *buf, size_t buf_size)</div><div class='add'>+{</div><div class='add'>+	int fd = -EBADF, setgroups_fd = -EBADF;</div><div class='add'>+	int fret = -1;</div><div class='add'>+	int ret;</div><div class='add'>+	char path[STRLITERALLEN("/proc/") + INTTYPE_TO_STRLEN(pid_t) +</div><div class='add'>+		  STRLITERALLEN("/setgroups") + 1];</div><div class='add'>+</div><div class='add'>+	if (geteuid() != 0 &amp;&amp; map_type == ID_TYPE_GID) {</div><div class='add'>+		ret = snprintf(path, sizeof(path), "/proc/%d/setgroups", pid);</div><div class='add'>+		if (ret &lt; 0 || ret &gt;= sizeof(path))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		setgroups_fd = open(path, O_WRONLY | O_CLOEXEC);</div><div class='add'>+		if (setgroups_fd &lt; 0 &amp;&amp; errno != ENOENT) {</div><div class='add'>+			syserror("Failed to open \"%s\"", path);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (setgroups_fd &gt;= 0) {</div><div class='add'>+			ret = write_nointr(setgroups_fd, "deny\n", STRLITERALLEN("deny\n"));</div><div class='add'>+			if (ret != STRLITERALLEN("deny\n")) {</div><div class='add'>+				syserror("Failed to write \"deny\" to \"/proc/%d/setgroups\"", pid);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = snprintf(path, sizeof(path), "/proc/%d/%cid_map", pid, map_type == ID_TYPE_UID ? 'u' : 'g');</div><div class='add'>+	if (ret &lt; 0 || ret &gt;= sizeof(path))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	fd = open(path, O_WRONLY | O_CLOEXEC);</div><div class='add'>+	if (fd &lt; 0) {</div><div class='add'>+		syserror("Failed to open \"%s\"", path);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = write_nointr(fd, buf, buf_size);</div><div class='add'>+	if (ret != buf_size) {</div><div class='add'>+		syserror("Failed to write %cid mapping to \"%s\"",</div><div class='add'>+			 map_type == ID_TYPE_UID ? 'u' : 'g', path);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fret = 0;</div><div class='add'>+out:</div><div class='add'>+	close(fd);</div><div class='add'>+	close(setgroups_fd);</div><div class='add'>+</div><div class='add'>+	return fret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int map_ids_from_idmap(struct list *idmap, pid_t pid)</div><div class='add'>+{</div><div class='add'>+	int fill, left;</div><div class='add'>+	char mapbuf[4096] = {};</div><div class='add'>+	bool had_entry = false;</div><div class='add'>+	idmap_type_t map_type, u_or_g;</div><div class='add'>+</div><div class='add'>+	if (list_empty(idmap))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (map_type = ID_TYPE_UID, u_or_g = 'u';</div><div class='add'>+	     map_type &lt;= ID_TYPE_GID; map_type++, u_or_g = 'g') {</div><div class='add'>+		char *pos = mapbuf;</div><div class='add'>+		int ret;</div><div class='add'>+		struct list *iterator;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		list_for_each(iterator, idmap) {</div><div class='add'>+			struct id_map *map = iterator-&gt;elem;</div><div class='add'>+			if (map-&gt;map_type != map_type)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			had_entry = true;</div><div class='add'>+</div><div class='add'>+			left = 4096 - (pos - mapbuf);</div><div class='add'>+			fill = snprintf(pos, left, "%u %u %u\n", map-&gt;nsid, map-&gt;hostid, map-&gt;range);</div><div class='add'>+			/*</div><div class='add'>+			 * The kernel only takes &lt;= 4k for writes to</div><div class='add'>+			 * /proc/&lt;pid&gt;/{g,u}id_map</div><div class='add'>+			 */</div><div class='add'>+			if (fill &lt;= 0 || fill &gt;= left)</div><div class='add'>+				return syserror_set(-E2BIG, "Too many %cid mappings defined", u_or_g);</div><div class='add'>+</div><div class='add'>+			pos += fill;</div><div class='add'>+		}</div><div class='add'>+		if (!had_entry)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = write_id_mapping(map_type, pid, mapbuf, pos - mapbuf);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return syserror("Failed to write mapping: %s", mapbuf);</div><div class='add'>+</div><div class='add'>+		memset(mapbuf, 0, sizeof(mapbuf));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_userns_fd_from_idmap(struct list *idmap)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	pid_t pid;</div><div class='add'>+	char path_ns[STRLITERALLEN("/proc/") + INTTYPE_TO_STRLEN(pid_t) +</div><div class='add'>+		     STRLITERALLEN("/ns/user") + 1];</div><div class='add'>+</div><div class='add'>+	pid = do_clone(get_userns_fd_cb, NULL, CLONE_NEWUSER | CLONE_NEWNS);</div><div class='add'>+	if (pid &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	ret = map_ids_from_idmap(idmap, pid);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = snprintf(path_ns, sizeof(path_ns), "/proc/%d/ns/user", pid);</div><div class='add'>+	if (ret &lt; 0 || (size_t)ret &gt;= sizeof(path_ns))</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	else</div><div class='add'>+		ret = open(path_ns, O_RDONLY | O_CLOEXEC | O_NOCTTY);</div><div class='add'>+</div><div class='add'>+	(void)kill(pid, SIGKILL);</div><div class='add'>+	(void)wait_for_pid(pid);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_userns_fd(unsigned long nsid, unsigned long hostid, unsigned long range)</div><div class='add'>+{</div><div class='add'>+	struct list head, uid_mapl, gid_mapl;</div><div class='add'>+	struct id_map uid_map = {</div><div class='add'>+		.map_type	= ID_TYPE_UID,</div><div class='add'>+		.nsid		= nsid,</div><div class='add'>+		.hostid		= hostid,</div><div class='add'>+		.range		= range,</div><div class='add'>+	};</div><div class='add'>+	struct id_map gid_map = {</div><div class='add'>+		.map_type	= ID_TYPE_GID,</div><div class='add'>+		.nsid		= nsid,</div><div class='add'>+		.hostid		= hostid,</div><div class='add'>+		.range		= range,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	list_init(&amp;head);</div><div class='add'>+	uid_mapl.elem = &amp;uid_map;</div><div class='add'>+	gid_mapl.elem = &amp;gid_map;</div><div class='add'>+	list_add_tail(&amp;head, &amp;uid_mapl);</div><div class='add'>+	list_add_tail(&amp;head, &amp;gid_mapl);</div><div class='add'>+</div><div class='add'>+	return get_userns_fd_from_idmap(&amp;head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool switch_ids(uid_t uid, gid_t gid)</div><div class='add'>+{</div><div class='add'>+	if (setgroups(0, NULL))</div><div class='add'>+		return syserror("failure: setgroups");</div><div class='add'>+</div><div class='add'>+	if (setresgid(gid, gid, gid))</div><div class='add'>+		return syserror("failure: setresgid");</div><div class='add'>+</div><div class='add'>+	if (setresuid(uid, uid, uid))</div><div class='add'>+		return syserror("failure: setresuid");</div><div class='add'>+</div><div class='add'>+	/* Ensure we can access proc files from processes we can ptrace. */</div><div class='add'>+	if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0))</div><div class='add'>+		return syserror("failure: make dumpable");</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_userns_hierarchy(struct userns_hierarchy *h);</div><div class='add'>+</div><div class='add'>+static int userns_fd_cb(void *data)</div><div class='add'>+{</div><div class='add'>+	struct userns_hierarchy *h = data;</div><div class='add'>+	char c;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = read_nointr(h-&gt;fd_event, &amp;c, 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return syserror("failure: read from socketpair");</div><div class='add'>+</div><div class='add'>+	/* Only switch ids if someone actually wrote a mapping for us. */</div><div class='add'>+	if (c == '1') {</div><div class='add'>+		if (!switch_ids(0, 0))</div><div class='add'>+			return syserror("failure: switch ids to 0");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = write_nointr(h-&gt;fd_event, "1", 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return syserror("failure: write to socketpair");</div><div class='add'>+</div><div class='add'>+	ret = create_userns_hierarchy(++h);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return syserror("failure: userns level %d", h-&gt;level);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_userns_hierarchy(struct userns_hierarchy *h)</div><div class='add'>+{</div><div class='add'>+	int fret = -1;</div><div class='add'>+	char c;</div><div class='add'>+	int fd_socket[2];</div><div class='add'>+	int fd_userns = -EBADF, ret = -1;</div><div class='add'>+	ssize_t bytes;</div><div class='add'>+	pid_t pid;</div><div class='add'>+	char path[256];</div><div class='add'>+</div><div class='add'>+	if (h-&gt;level == MAX_USERNS_LEVEL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = socketpair(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0, fd_socket);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return syserror("failure: create socketpair");</div><div class='add'>+</div><div class='add'>+	/* Note the CLONE_FILES | CLONE_VM when mucking with fds and memory. */</div><div class='add'>+	h-&gt;fd_event = fd_socket[1];</div><div class='add'>+	pid = do_clone(userns_fd_cb, h, CLONE_NEWUSER | CLONE_FILES | CLONE_VM);</div><div class='add'>+	if (pid &lt; 0) {</div><div class='add'>+		syserror("failure: userns level %d", h-&gt;level);</div><div class='add'>+		goto out_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = map_ids_from_idmap(&amp;h-&gt;id_map, pid);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		kill(pid, SIGKILL);</div><div class='add'>+		syserror("failure: writing id mapping for userns level %d for %d", h-&gt;level, pid);</div><div class='add'>+		goto out_wait;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;h-&gt;id_map))</div><div class='add'>+		bytes = write_nointr(fd_socket[0], "1", 1); /* Inform the child we wrote a mapping. */</div><div class='add'>+	else</div><div class='add'>+		bytes = write_nointr(fd_socket[0], "0", 1); /* Inform the child we didn't write a mapping. */</div><div class='add'>+	if (bytes &lt; 0) {</div><div class='add'>+		kill(pid, SIGKILL);</div><div class='add'>+		syserror("failure: write to socketpair");</div><div class='add'>+		goto out_wait;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for child to set*id() and become dumpable. */</div><div class='add'>+	bytes = read_nointr(fd_socket[0], &amp;c, 1);</div><div class='add'>+	if (bytes &lt; 0) {</div><div class='add'>+		kill(pid, SIGKILL);</div><div class='add'>+		syserror("failure: read from socketpair");</div><div class='add'>+		goto out_wait;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(path, sizeof(path), "/proc/%d/ns/user", pid);</div><div class='add'>+	fd_userns = open(path, O_RDONLY | O_CLOEXEC);</div><div class='add'>+	if (fd_userns &lt; 0) {</div><div class='add'>+		kill(pid, SIGKILL);</div><div class='add'>+		syserror("failure: open userns level %d for %d", h-&gt;level, pid);</div><div class='add'>+		goto out_wait;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fret = 0;</div><div class='add'>+</div><div class='add'>+out_wait:</div><div class='add'>+	if (!wait_for_pid(pid) &amp;&amp; !fret) {</div><div class='add'>+		h-&gt;fd_userns = fd_userns;</div><div class='add'>+		fd_userns = -EBADF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_close:</div><div class='add'>+	if (fd_userns &gt;= 0)</div><div class='add'>+		close(fd_userns);</div><div class='add'>+	close(fd_socket[0]);</div><div class='add'>+	close(fd_socket[1]);</div><div class='add'>+	return fret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_file(const char *path, const char *val)</div><div class='add'>+{</div><div class='add'>+	int fd = open(path, O_WRONLY);</div><div class='add'>+	size_t len = strlen(val);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fd == -1) {</div><div class='add'>+		ksft_print_msg("opening %s for write: %s\n", path, strerror(errno));</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = write(fd, val, len);</div><div class='add'>+	if (ret == -1) {</div><div class='add'>+		ksft_print_msg("writing to %s: %s\n", path, strerror(errno));</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	if (ret != len) {</div><div class='add'>+		ksft_print_msg("short write to %s\n", path);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = close(fd);</div><div class='add'>+	if (ret == -1) {</div><div class='add'>+		ksft_print_msg("closing %s\n", path);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int setup_userns(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	char buf[32];</div><div class='add'>+	uid_t uid = getuid();</div><div class='add'>+	gid_t gid = getgid();</div><div class='add'>+</div><div class='add'>+	ret = unshare(CLONE_NEWNS|CLONE_NEWUSER);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ksft_exit_fail_msg("unsharing mountns and userns: %s\n",</div><div class='add'>+				   strerror(errno));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sprintf(buf, "0 %d 1", uid);</div><div class='add'>+	ret = write_file("/proc/self/uid_map", buf);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = write_file("/proc/self/setgroups", "deny");</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	sprintf(buf, "0 %d 1", gid);</div><div class='add'>+	ret = write_file("/proc/self/gid_map", buf);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mount("", "/", NULL, MS_REC|MS_PRIVATE, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ksft_print_msg("making mount tree private: %s\n", strerror(errno));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* caps_down - lower all effective caps */</div><div class='add'>+int caps_down(void)</div><div class='add'>+{</div><div class='add'>+	bool fret = false;</div><div class='add'>+	cap_t caps = NULL;</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	caps = cap_get_proc();</div><div class='add'>+	if (!caps)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = cap_clear_flag(caps, CAP_EFFECTIVE);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = cap_set_proc(caps);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	fret = true;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	cap_free(caps);</div><div class='add'>+	return fret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* cap_down - lower an effective cap */</div><div class='add'>+int cap_down(cap_value_t down)</div><div class='add'>+{</div><div class='add'>+	bool fret = false;</div><div class='add'>+	cap_t caps = NULL;</div><div class='add'>+	cap_value_t cap = down;</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	caps = cap_get_proc();</div><div class='add'>+	if (!caps)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = cap_set_flag(caps, CAP_EFFECTIVE, 1, &amp;cap, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = cap_set_proc(caps);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	fret = true;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	cap_free(caps);</div><div class='add'>+	return fret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+uint64_t get_unique_mnt_id(const char *path)</div><div class='add'>+{</div><div class='add'>+	struct statx sx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = statx(AT_FDCWD, path, 0, STATX_MNT_ID_UNIQUE, &amp;sx);</div><div class='add'>+	if (ret == -1) {</div><div class='add'>+		ksft_print_msg("retrieving unique mount ID for %s: %s\n", path,</div><div class='add'>+			 strerror(errno));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(sx.stx_mask &amp; STATX_MNT_ID_UNIQUE)) {</div><div class='add'>+		ksft_print_msg("no unique mount ID available for %s\n", path);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sx.stx_mnt_id;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/utils.h b/tools/testing/selftests/filesystems/utils.h<br/>new file mode 100644<br/>index 000000000000..70f7ccc607f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/utils.h</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#ifndef __IDMAP_UTILS_H</div><div class='add'>+#define __IDMAP_UTILS_H</div><div class='add'>+</div><div class='add'>+#ifndef _GNU_SOURCE</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#endif</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;sched.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;syscall.h&gt;</div><div class='add'>+#include &lt;sys/capability.h&gt;</div><div class='add'>+#include &lt;sys/fsuid.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+extern int get_userns_fd(unsigned long nsid, unsigned long hostid,</div><div class='add'>+			 unsigned long range);</div><div class='add'>+</div><div class='add'>+extern int caps_down(void);</div><div class='add'>+extern int cap_down(cap_value_t down);</div><div class='add'>+</div><div class='add'>+extern bool switch_ids(uid_t uid, gid_t gid);</div><div class='add'>+extern int setup_userns(void);</div><div class='add'>+</div><div class='add'>+static inline bool switch_userns(int fd, uid_t uid, gid_t gid, bool drop_caps)</div><div class='add'>+{</div><div class='add'>+	if (setns(fd, CLONE_NEWUSER))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!switch_ids(uid, gid))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (drop_caps &amp;&amp; !caps_down())</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern uint64_t get_unique_mnt_id(const char *path);</div><div class='add'>+</div><div class='add'>+#endif /* __IDMAP_UTILS_H */</div><div class='head'>diff --git a/tools/testing/selftests/filesystems/wrappers.h b/tools/testing/selftests/filesystems/wrappers.h<br/>new file mode 100644<br/>index 000000000000..420ae4f908cf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/filesystems/wrappers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/filesystems/wrappers.h</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+#ifndef __SELFTEST_OVERLAYFS_WRAPPERS_H__</div><div class='add'>+#define __SELFTEST_OVERLAYFS_WRAPPERS_H__</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef STATX_MNT_ID_UNIQUE</div><div class='add'>+#define STATX_MNT_ID_UNIQUE 0x00004000U /* Want/got extended stx_mount_id */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline int sys_fsopen(const char *fsname, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	return syscall(__NR_fsopen, fsname, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int sys_fsconfig(int fd, unsigned int cmd, const char *key,</div><div class='add'>+			       const char *value, int aux)</div><div class='add'>+{</div><div class='add'>+	return syscall(__NR_fsconfig, fd, cmd, key, value, aux);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int sys_fsmount(int fd, unsigned int flags,</div><div class='add'>+			      unsigned int attr_flags)</div><div class='add'>+{</div><div class='add'>+	return syscall(__NR_fsmount, fd, flags, attr_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int sys_mount(const char *src, const char *tgt, const char *fst,</div><div class='add'>+			    unsigned long flags, const void *data)</div><div class='add'>+{</div><div class='add'>+	return syscall(__NR_mount, src, tgt, fst, flags, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef MOVE_MOUNT_F_EMPTY_PATH</div><div class='add'>+#define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef MOVE_MOUNT_T_EMPTY_PATH</div><div class='add'>+#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __NR_move_mount</div><div class='add'>+	#if defined __alpha__</div><div class='add'>+		#define __NR_move_mount 539</div><div class='add'>+	#elif defined _MIPS_SIM</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */</div><div class='add'>+			#define __NR_move_mount 4429</div><div class='add'>+		#endif</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */</div><div class='add'>+			#define __NR_move_mount 6429</div><div class='add'>+		#endif</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */</div><div class='add'>+			#define __NR_move_mount 5429</div><div class='add'>+		#endif</div><div class='add'>+	#else</div><div class='add'>+		#define __NR_move_mount 429</div><div class='add'>+	#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline int sys_move_mount(int from_dfd, const char *from_pathname,</div><div class='add'>+				 int to_dfd, const char *to_pathname,</div><div class='add'>+				 unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd,</div><div class='add'>+		       to_pathname, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef OPEN_TREE_CLONE</div><div class='add'>+#define OPEN_TREE_CLONE 1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef OPEN_TREE_CLOEXEC</div><div class='add'>+#define OPEN_TREE_CLOEXEC O_CLOEXEC</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef AT_RECURSIVE</div><div class='add'>+#define AT_RECURSIVE 0x8000 /* Apply to the entire subtree */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __NR_open_tree</div><div class='add'>+	#if defined __alpha__</div><div class='add'>+		#define __NR_open_tree 538</div><div class='add'>+	#elif defined _MIPS_SIM</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_ABI32	/* o32 */</div><div class='add'>+			#define __NR_open_tree 4428</div><div class='add'>+		#endif</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_NABI32	/* n32 */</div><div class='add'>+			#define __NR_open_tree 6428</div><div class='add'>+		#endif</div><div class='add'>+		#if _MIPS_SIM == _MIPS_SIM_ABI64	/* n64 */</div><div class='add'>+			#define __NR_open_tree 5428</div><div class='add'>+		#endif</div><div class='add'>+	#else</div><div class='add'>+		#define __NR_open_tree 428</div><div class='add'>+	#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline int sys_open_tree(int dfd, const char *filename, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	return syscall(__NR_open_tree, dfd, filename, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/.gitignore b/tools/testing/selftests/ftrace/.gitignore<br/>index 2659417cb2c7..4d7fcb828850 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/.gitignore?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/.gitignore</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/.gitignore</a></div><div class='hunk'>@@ -1,2 +1,3 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> logs</div><div class='add'>+poll</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/Makefile b/tools/testing/selftests/ftrace/Makefile<br/>index 49d96bb16355..7c12263f8260 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/Makefile</a></div><div class='hunk'>@@ -6,6 +6,6 @@ TEST_PROGS := ftracetest-ktap</div><div class='ctx'> TEST_FILES := test.d settings</div><div class='ctx'> EXTRA_CLEAN := $(OUTPUT)/logs/*</div><div class='ctx'> </div><div class='del'>-TEST_GEN_PROGS = poll</div><div class='add'>+TEST_GEN_FILES := poll</div><div class='ctx'> </div><div class='ctx'> include ../lib.mk</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest<br/>index cce72f8b03dc..3230bd54dba8 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/ftracetest?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/ftracetest</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/ftracetest?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/ftracetest</a></div><div class='hunk'>@@ -22,6 +22,7 @@ echo "		--fail-unresolved Treat UNRESOLVED as a failure"</div><div class='ctx'> echo "		-d|--debug Debug mode (trace all shell commands)"</div><div class='ctx'> echo "		-l|--logdir &lt;dir&gt; Save logs on the &lt;dir&gt;"</div><div class='ctx'> echo "		            If &lt;dir&gt; is -, all logs output in console only"</div><div class='add'>+echo "		--rv       Run RV selftests instead of ftrace ones"</div><div class='ctx'> exit $1</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -133,6 +134,10 @@ parse_opts() { # opts</div><div class='ctx'>       LINK_PTR=</div><div class='ctx'>       shift 2</div><div class='ctx'>     ;;</div><div class='add'>+    --rv)</div><div class='add'>+      RV_TEST=1</div><div class='add'>+      shift 1</div><div class='add'>+    ;;</div><div class='ctx'>     *.tc)</div><div class='ctx'>       if [ -f "$1" ]; then</div><div class='ctx'>         OPT_TEST_CASES="$OPT_TEST_CASES `abspath $1`"</div><div class='hunk'>@@ -152,9 +157,13 @@ parse_opts() { # opts</div><div class='ctx'>     ;;</div><div class='ctx'>     esac</div><div class='ctx'>   done</div><div class='del'>-  if [ ! -z "$OPT_TEST_CASES" ]; then</div><div class='add'>+  if [ -n "$OPT_TEST_CASES" ]; then</div><div class='ctx'>     TEST_CASES=$OPT_TEST_CASES</div><div class='ctx'>   fi</div><div class='add'>+  if [ -n "$OPT_TEST_DIR" -a -f "$OPT_TEST_DIR"/test.d/functions ]; then</div><div class='add'>+    TOP_DIR=$OPT_TEST_DIR</div><div class='add'>+    TEST_DIR=$TOP_DIR/test.d</div><div class='add'>+  fi</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> # Parameters</div><div class='hunk'>@@ -190,10 +199,6 @@ fi</div><div class='ctx'> TOP_DIR=`absdir $0`</div><div class='ctx'> TEST_DIR=$TOP_DIR/test.d</div><div class='ctx'> TEST_CASES=`find_testcases $TEST_DIR`</div><div class='del'>-LOG_TOP_DIR=$TOP_DIR/logs</div><div class='del'>-LOG_DATE=`date +%Y%m%d-%H%M%S`</div><div class='del'>-LOG_DIR=$LOG_TOP_DIR/$LOG_DATE/</div><div class='del'>-LINK_PTR=$LOG_TOP_DIR/latest</div><div class='ctx'> KEEP_LOG=0</div><div class='ctx'> KTAP=0</div><div class='ctx'> DEBUG=0</div><div class='hunk'>@@ -201,14 +206,23 @@ VERBOSE=0</div><div class='ctx'> UNSUPPORTED_RESULT=0</div><div class='ctx'> UNRESOLVED_RESULT=0</div><div class='ctx'> STOP_FAILURE=0</div><div class='add'>+RV_TEST=0</div><div class='ctx'> # Parse command-line options</div><div class='ctx'> parse_opts $*</div><div class='ctx'> </div><div class='add'>+LOG_TOP_DIR=$TOP_DIR/logs</div><div class='add'>+LOG_DATE=`date +%Y%m%d-%H%M%S`</div><div class='add'>+LOG_DIR=$LOG_TOP_DIR/$LOG_DATE/</div><div class='add'>+LINK_PTR=$LOG_TOP_DIR/latest</div><div class='add'>+</div><div class='ctx'> [ $DEBUG -ne 0 ] &amp;&amp; set -x</div><div class='ctx'> </div><div class='del'>-# Verify parameters</div><div class='del'>-if [ -z "$TRACING_DIR" -o ! -d "$TRACING_DIR" ]; then</div><div class='del'>-  errexit "No ftrace directory found"</div><div class='add'>+if [ $RV_TEST -ne 0 ]; then</div><div class='add'>+	TRACING_DIR=$TRACING_DIR/rv</div><div class='add'>+	if [ ! -d "$TRACING_DIR" ]; then</div><div class='add'>+		err_ret=$err_skip</div><div class='add'>+		errexit "rv is not configured in this kernel"</div><div class='add'>+	fi</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='ctx'> # Preparing logs</div><div class='hunk'>@@ -419,7 +433,7 @@ trap 'SIG_RESULT=$XFAIL' $SIG_XFAIL</div><div class='ctx'> __run_test() { # testfile</div><div class='ctx'>   # setup PID and PPID, $$ is not updated.</div><div class='ctx'>   (cd $TRACING_DIR; read PID _ &lt; /proc/self/stat; set -e; set -x;</div><div class='del'>-   checkreq $1; initialize_ftrace; . $1)</div><div class='add'>+   checkreq $1; initialize_system; . $1)</div><div class='ctx'>   [ $? -ne 0 ] &amp;&amp; kill -s $SIG_FAIL $SIG_PID</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -496,7 +510,7 @@ for t in $TEST_CASES; do</div><div class='ctx'>     exit 1</div><div class='ctx'>   fi</div><div class='ctx'> done</div><div class='del'>-(cd $TRACING_DIR; finish_ftrace) # for cleanup</div><div class='add'>+(cd $TRACING_DIR; finish_system) # for cleanup</div><div class='ctx'> </div><div class='ctx'> prlog ""</div><div class='ctx'> prlog "# of passed: " `echo $PASSED_CASES | wc -w`</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/00basic/mount_options.tc b/tools/testing/selftests/ftrace/test.d/00basic/mount_options.tc<br/>index 8a7ce647a60d..318939451caf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/00basic/mount_options.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/00basic/mount_options.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/00basic/mount_options.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/00basic/mount_options.tc</a></div><div class='hunk'>@@ -28,7 +28,7 @@ unmount_tracefs() {</div><div class='ctx'> 	local mount_point="$1"</div><div class='ctx'> </div><div class='ctx'> 	# Need to make sure the mount isn't busy so that we can umount it</div><div class='del'>-	(cd $mount_point; finish_ftrace;)</div><div class='add'>+	(cd $mount_point; finish_system;)</div><div class='ctx'> </div><div class='ctx'> 	cleanup</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc b/tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc<br/>new file mode 100644<br/>index 000000000000..7daf7292209e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+# description: Basic tests on writing to trace_marker_raw</div><div class='add'>+# requires: trace_marker_raw</div><div class='add'>+# flags: instance</div><div class='add'>+</div><div class='add'>+is_little_endian() {</div><div class='add'>+	if lscpu | grep -q 'Little Endian'; then</div><div class='add'>+		echo 1;</div><div class='add'>+	else</div><div class='add'>+		echo 0;</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+little=`is_little_endian`</div><div class='add'>+</div><div class='add'>+make_str() {</div><div class='add'>+	id=$1</div><div class='add'>+	cnt=$2</div><div class='add'>+</div><div class='add'>+	if [ $little -eq 1 ]; then</div><div class='add'>+		val=`printf "\\%03o\\%03o\\%03o\\%03o" \</div><div class='add'>+			$(($id &amp; 0xff)) \</div><div class='add'>+			$((($id &gt;&gt; 8) &amp; 0xff)) \</div><div class='add'>+			$((($id &gt;&gt; 16) &amp; 0xff)) \</div><div class='add'>+			$((($id &gt;&gt; 24) &amp; 0xff))`</div><div class='add'>+	else</div><div class='add'>+		val=`printf "\\%03o\\%03o\\%03o\\%03o" \</div><div class='add'>+			$((($id &gt;&gt; 24) &amp; 0xff)) \</div><div class='add'>+			$((($id &gt;&gt; 16) &amp; 0xff)) \</div><div class='add'>+			$((($id &gt;&gt; 8) &amp; 0xff)) \</div><div class='add'>+			$(($id &amp; 0xff))`</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	data=`printf -- 'X%.0s' $(seq $cnt)`</div><div class='add'>+</div><div class='add'>+	printf "${val}${data}"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+write_buffer() {</div><div class='add'>+	id=$1</div><div class='add'>+	size=$2</div><div class='add'>+</div><div class='add'>+	# write the string into the raw marker</div><div class='add'>+	make_str $id $size &gt; trace_marker_raw</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+test_multiple_writes() {</div><div class='add'>+</div><div class='add'>+	# Write a bunch of data where the id is the count of</div><div class='add'>+	# data to write</div><div class='add'>+	for i in `seq 1 10` `seq 101 110` `seq 1001 1010`; do</div><div class='add'>+		write_buffer $i $i</div><div class='add'>+	done</div><div class='add'>+</div><div class='add'>+	# add a little buffer</div><div class='add'>+	echo stop &gt; trace_marker</div><div class='add'>+</div><div class='add'>+	# Check to make sure the number of entries is the id (rounded up by 4)</div><div class='add'>+	awk '/.*: # [0-9a-f]* / {</div><div class='add'>+			print;</div><div class='add'>+			cnt = -1;</div><div class='add'>+			for (i = 0; i &lt; NF; i++) {</div><div class='add'>+				# The counter is after the "#" marker</div><div class='add'>+				if ( $i == "#" ) {</div><div class='add'>+					i++;</div><div class='add'>+					cnt = strtonum("0x" $i);</div><div class='add'>+					num = NF - (i + 1);</div><div class='add'>+					# The number of items is always rounded up by 4</div><div class='add'>+					cnt2 = int((cnt + 3) / 4) * 4;</div><div class='add'>+					if (cnt2 != num) {</div><div class='add'>+						exit 1;</div><div class='add'>+					}</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	// { if (NR &gt; 30) { exit 0; } } ' trace_pipe;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+get_buffer_data_size() {</div><div class='add'>+	sed -ne 's/^.*data.*size:\([0-9][0-9]*\).*/\1/p' events/header_page</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+test_buffer() {</div><div class='add'>+</div><div class='add'>+	# The id must be four bytes, test that 3 bytes fails a write</div><div class='add'>+	if echo -n abc &gt; ./trace_marker_raw ; then</div><div class='add'>+		echo "Too small of write expected to fail but did not"</div><div class='add'>+		exit_fail</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	size=`get_buffer_data_size`</div><div class='add'>+	echo size = $size</div><div class='add'>+</div><div class='add'>+	# Now add a little more than what it can handle</div><div class='add'>+</div><div class='add'>+	if write_buffer 0xdeadbeef $size ; then</div><div class='add'>+		echo "Too big of write expected to fail but did not"</div><div class='add'>+		exit_fail</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+test_buffer</div><div class='add'>+test_multiple_writes</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_fprobe.tc b/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_fprobe.tc<br/>index dc25bcf4f9e2..47067a5e3cb0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_fprobe.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/dynevent/add_remove_fprobe.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_fprobe.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/dynevent/add_remove_fprobe.tc</a></div><div class='hunk'>@@ -7,20 +7,76 @@ echo 0 &gt; events/enable</div><div class='ctx'> echo &gt; dynamic_events</div><div class='ctx'> </div><div class='ctx'> PLACE=$FUNCTION_FORK</div><div class='add'>+PLACE2="kmem_cache_free"</div><div class='add'>+PLACE3="schedule_timeout"</div><div class='add'>+</div><div class='add'>+# Some functions may have BPF programs attached, therefore</div><div class='add'>+# count already enabled_functions before tests start</div><div class='add'>+ocnt=`cat enabled_functions | wc -l`</div><div class='ctx'> </div><div class='ctx'> echo "f:myevent1 $PLACE" &gt;&gt; dynamic_events</div><div class='add'>+</div><div class='ctx'> echo "f:myevent2 $PLACE%return" &gt;&gt; dynamic_events</div><div class='ctx'> </div><div class='add'>+# add another event</div><div class='add'>+echo "f:myevent3 $PLACE2" &gt;&gt; dynamic_events</div><div class='add'>+</div><div class='ctx'> grep -q myevent1 dynamic_events</div><div class='ctx'> grep -q myevent2 dynamic_events</div><div class='add'>+grep -q myevent3 dynamic_events</div><div class='ctx'> test -d events/fprobes/myevent1</div><div class='ctx'> test -d events/fprobes/myevent2</div><div class='ctx'> </div><div class='add'>+echo 1 &gt; events/fprobes/myevent1/enable</div><div class='add'>+# Make sure the event is attached.</div><div class='add'>+grep -q $PLACE enabled_functions</div><div class='add'>+cnt=`cat enabled_functions | wc -l`</div><div class='add'>+if [ $cnt -eq $ocnt ]; then</div><div class='add'>+	exit_fail</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+echo 1 &gt; events/fprobes/myevent2/enable</div><div class='add'>+cnt2=`cat enabled_functions | wc -l`</div><div class='add'>+</div><div class='add'>+echo 1 &gt; events/fprobes/myevent3/enable</div><div class='add'>+# If the function is different, the attached function should be increased</div><div class='add'>+grep -q $PLACE2 enabled_functions</div><div class='add'>+cnt=`cat enabled_functions | wc -l`</div><div class='add'>+if [ $cnt -eq $cnt2 ]; then</div><div class='add'>+	exit_fail</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+echo 0 &gt; events/fprobes/myevent2/enable</div><div class='ctx'> echo "-:myevent2" &gt;&gt; dynamic_events</div><div class='ctx'> </div><div class='ctx'> grep -q myevent1 dynamic_events</div><div class='ctx'> ! grep -q myevent2 dynamic_events</div><div class='ctx'> </div><div class='add'>+echo 0 &gt; events/fprobes/enable</div><div class='ctx'> echo &gt; dynamic_events</div><div class='ctx'> </div><div class='add'>+# Should have none left</div><div class='add'>+cnt=`cat enabled_functions | wc -l`</div><div class='add'>+if [ $cnt -ne $ocnt ]; then</div><div class='add'>+	exit_fail</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+echo "f:myevent4 $PLACE" &gt;&gt; dynamic_events</div><div class='add'>+</div><div class='add'>+echo 1 &gt; events/fprobes/myevent4/enable</div><div class='add'>+# Should only have one enabled</div><div class='add'>+cnt=`cat enabled_functions | wc -l`</div><div class='add'>+if [ $cnt -ne $((ocnt + 1)) ]; then</div><div class='add'>+	exit_fail</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+echo 0 &gt; events/fprobes/enable</div><div class='add'>+echo &gt; dynamic_events</div><div class='add'>+</div><div class='add'>+# Should have none left</div><div class='add'>+cnt=`cat enabled_functions | wc -l`</div><div class='add'>+if [ $cnt -ne $ocnt ]; then</div><div class='add'>+	exit_fail</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> clear_trace</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_tprobe.tc b/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_tprobe.tc<br/>index 155792eaeee5..f271c4238b72 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_tprobe.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/dynevent/add_remove_tprobe.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_tprobe.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/dynevent/add_remove_tprobe.tc</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> echo 0 &gt; events/enable</div><div class='ctx'> echo &gt; dynamic_events</div><div class='ctx'> </div><div class='add'>+SUBSYSTEM=kmem</div><div class='ctx'> TRACEPOINT1=kmem_cache_alloc</div><div class='ctx'> TRACEPOINT2=kmem_cache_free</div><div class='ctx'> </div><div class='hunk'>@@ -24,4 +25,17 @@ grep -q myevent1 dynamic_events</div><div class='ctx'> </div><div class='ctx'> echo &gt; dynamic_events</div><div class='ctx'> </div><div class='add'>+# auto naming check</div><div class='add'>+echo "t $TRACEPOINT1" &gt;&gt; dynamic_events</div><div class='add'>+</div><div class='add'>+test -d events/tracepoints/$TRACEPOINT1</div><div class='add'>+</div><div class='add'>+echo &gt; dynamic_events</div><div class='add'>+</div><div class='add'>+# SUBSYSTEM is not supported</div><div class='add'>+echo "t $SUBSYSTEM/$TRACEPOINT1" &gt;&gt; dynamic_events &amp;&amp; exit_fail ||:</div><div class='add'>+echo "t $SUBSYSTEM:$TRACEPOINT1" &gt;&gt; dynamic_events &amp;&amp; exit_fail ||:</div><div class='add'>+echo "t:myevent3 $SUBSYSTEM/$TRACEPOINT1" &gt;&gt; dynamic_events &amp;&amp; exit_fail ||:</div><div class='add'>+echo "t:myevent3 $SUBSYSTEM:$TRACEPOINT1" &gt;&gt; dynamic_events &amp;&amp; exit_fail ||:</div><div class='add'>+</div><div class='ctx'> clear_trace</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc b/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc<br/>index 86c76679c56e..f2048c244526 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc</a></div><div class='hunk'>@@ -3,14 +3,18 @@</div><div class='ctx'> # description: Generic dynamic event - add/remove/test uprobe events</div><div class='ctx'> # requires: uprobe_events</div><div class='ctx'> </div><div class='add'>+if ! which readelf &gt; /dev/null 2&gt;&amp;1 ; then</div><div class='add'>+  echo "No readelf found. skipped."</div><div class='add'>+  exit_unresolved</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> echo 0 &gt; events/enable</div><div class='ctx'> echo &gt; dynamic_events</div><div class='ctx'> </div><div class='ctx'> REALBIN=`readlink -f /bin/sh`</div><div class='add'>+ENTRYPOINT=`readelf -h ${REALBIN} | grep Entry | sed -e 's/[^0]*//'`</div><div class='ctx'> </div><div class='del'>-echo 'cat /proc/$$/maps' | /bin/sh | \</div><div class='del'>-	grep "r-xp .*${REALBIN}$" | \</div><div class='del'>-	awk '{printf "p:myevent %s:0x%s\n", $6,$3 }' &gt;&gt; uprobe_events</div><div class='add'>+echo "p:myevent ${REALBIN}:${ENTRYPOINT}" &gt;&gt; uprobe_events</div><div class='ctx'> </div><div class='ctx'> grep -q myevent uprobe_events</div><div class='ctx'> test -d events/uprobes/myevent</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc b/tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc<br/>new file mode 100644<br/>index 000000000000..f656bccb1a14<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+# description: Checking dynamic events limitations</div><div class='add'>+# requires: dynamic_events "imm-value":README</div><div class='add'>+</div><div class='add'>+# Max arguments limitation</div><div class='add'>+MAX_ARGS=128</div><div class='add'>+EXCEED_ARGS=$((MAX_ARGS + 1))</div><div class='add'>+</div><div class='add'>+# bash and dash evaluate variables differently.</div><div class='add'>+# dash will evaluate '\\' every time it is read whereas bash does not.</div><div class='add'>+#</div><div class='add'>+#   TEST_STRING="$TEST_STRING \\$i"</div><div class='add'>+#   echo $TEST_STRING</div><div class='add'>+#</div><div class='add'>+# With i=123</div><div class='add'>+# On bash, that will print "\123"</div><div class='add'>+# but on dash, that will print the escape sequence of \123 as the \ will</div><div class='add'>+# be interpreted again in the echo.</div><div class='add'>+#</div><div class='add'>+# Set a variable "bs" to save a double backslash, then echo that</div><div class='add'>+# to "ts" to see if $ts changed or not. If it changed, it's dash,</div><div class='add'>+# if not, it's bash, and then bs can equal a single backslash.</div><div class='add'>+bs='\\'</div><div class='add'>+ts=`echo $bs`</div><div class='add'>+if [ "$ts" = '\\' ]; then</div><div class='add'>+  # this is bash</div><div class='add'>+  bs='\'</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+check_max_args() { # event_header</div><div class='add'>+  TEST_STRING=$1</div><div class='add'>+  # Acceptable</div><div class='add'>+  for i in `seq 1 $MAX_ARGS`; do</div><div class='add'>+    TEST_STRING="$TEST_STRING $bs$i"</div><div class='add'>+  done</div><div class='add'>+  echo "$TEST_STRING" &gt;&gt; dynamic_events</div><div class='add'>+  echo &gt; dynamic_events</div><div class='add'>+  # Error</div><div class='add'>+  TEST_STRING="$TEST_STRING \\$EXCEED_ARGS"</div><div class='add'>+  ! echo "$TEST_STRING" &gt;&gt; dynamic_events</div><div class='add'>+  return 0</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# Kprobe max args limitation</div><div class='add'>+if grep -q "kprobe_events" README; then</div><div class='add'>+  check_max_args "p vfs_read"</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# Fprobe max args limitation</div><div class='add'>+if grep -q "f[:[&lt;group&gt;/][&lt;event&gt;]] &lt;func-name&gt;[%return] [&lt;args&gt;]" README; then</div><div class='add'>+  check_max_args "f vfs_read"</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# Tprobe max args limitation</div><div class='add'>+if grep -q "t[:[&lt;group&gt;/][&lt;event&gt;]] &lt;tracepoint&gt; [&lt;args&gt;]" README; then</div><div class='add'>+  check_max_args "t kfree"</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# Uprobe max args limitation</div><div class='add'>+if grep -q "uprobe_events" README; then</div><div class='add'>+  check_max_args "p /bin/sh:10"</div><div class='add'>+fi</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/enable_disable_tprobe.tc b/tools/testing/selftests/ftrace/test.d/dynevent/enable_disable_tprobe.tc<br/>new file mode 100644<br/>index 000000000000..c1f1cafa30f3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/dynevent/enable_disable_tprobe.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/dynevent/enable_disable_tprobe.tc</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+# description: Generic dynamic event - enable/disable tracepoint probe events</div><div class='add'>+# requires: dynamic_events "t[:[&lt;group&gt;/][&lt;event&gt;]] &lt;tracepoint&gt; [&lt;args&gt;]":README</div><div class='add'>+</div><div class='add'>+echo 0 &gt; events/enable</div><div class='add'>+echo &gt; dynamic_events</div><div class='add'>+</div><div class='add'>+TRACEPOINT=sched_switch</div><div class='add'>+ENABLEFILE=events/tracepoints/myprobe/enable</div><div class='add'>+</div><div class='add'>+:;: "Add tracepoint event on $TRACEPOINT" ;:</div><div class='add'>+</div><div class='add'>+echo "t:myprobe ${TRACEPOINT}" &gt;&gt; dynamic_events</div><div class='add'>+</div><div class='add'>+:;: "Check enable/disable to ensure it works" ;:</div><div class='add'>+</div><div class='add'>+echo 1 &gt; $ENABLEFILE</div><div class='add'>+</div><div class='add'>+grep -q $TRACEPOINT trace</div><div class='add'>+</div><div class='add'>+echo 0 &gt; $ENABLEFILE</div><div class='add'>+</div><div class='add'>+echo &gt; trace</div><div class='add'>+</div><div class='add'>+! grep -q $TRACEPOINT trace</div><div class='add'>+</div><div class='add'>+:;: "Repeat enable/disable to ensure it works" ;:</div><div class='add'>+</div><div class='add'>+echo 1 &gt; $ENABLEFILE</div><div class='add'>+</div><div class='add'>+grep -q $TRACEPOINT trace</div><div class='add'>+</div><div class='add'>+echo 0 &gt; $ENABLEFILE</div><div class='add'>+</div><div class='add'>+echo &gt; trace</div><div class='add'>+</div><div class='add'>+! grep -q $TRACEPOINT trace</div><div class='add'>+</div><div class='add'>+exit 0</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc<br/>index c9425a34fae3..fee479295e2f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc</a></div><div class='hunk'>@@ -27,6 +27,7 @@ check_error 'f:^foo.1/bar vfs_read'	# BAD_GROUP_NAME</div><div class='ctx'> check_error 'f:^ vfs_read'		# NO_EVENT_NAME</div><div class='ctx'> check_error 'f:foo/^12345678901234567890123456789012345678901234567890123456789012345 vfs_read'	# EVENT_TOO_LONG</div><div class='ctx'> check_error 'f:foo/^bar.1 vfs_read'	# BAD_EVENT_NAME</div><div class='add'>+check_error 't kmem^/kfree'       # BAD_TP_NAME</div><div class='ctx'> </div><div class='ctx'> check_error 'f vfs_read ^$stack10000'	# BAD_STACK_NUM</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc<br/>index b7c8f29c09a9..65916bb55dfb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc</a></div><div class='hunk'>@@ -14,11 +14,35 @@ fail() { #msg</div><div class='ctx'>     exit_fail</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+# As reading trace can last forever, simply look for 3 different</div><div class='add'>+# events then exit out of reading the file. If there's not 3 different</div><div class='add'>+# events, then the test has failed.</div><div class='add'>+check_unique() {</div><div class='add'>+    cat trace | grep -v '^#' | awk '</div><div class='add'>+	BEGIN { cnt = 0; }</div><div class='add'>+	{</div><div class='add'>+	    for (i = 0; i &lt; cnt; i++) {</div><div class='add'>+		if (event[i] == $5) {</div><div class='add'>+		    break;</div><div class='add'>+		}</div><div class='add'>+	    }</div><div class='add'>+	    if (i == cnt) {</div><div class='add'>+		event[cnt++] = $5;</div><div class='add'>+		if (cnt &gt; 2) {</div><div class='add'>+		    exit;</div><div class='add'>+		}</div><div class='add'>+	    }</div><div class='add'>+	}</div><div class='add'>+	END {</div><div class='add'>+	    printf "%d", cnt;</div><div class='add'>+	}'</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> echo 'sched:*' &gt; set_event</div><div class='ctx'> </div><div class='ctx'> yield</div><div class='ctx'> </div><div class='del'>-count=`head -n 100 trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`</div><div class='add'>+count=`check_unique`</div><div class='ctx'> if [ $count -lt 3 ]; then</div><div class='ctx'>     fail "at least fork, exec and exit events should be recorded"</div><div class='ctx'> fi</div><div class='hunk'>@@ -29,7 +53,7 @@ echo 1 &gt; events/sched/enable</div><div class='ctx'> </div><div class='ctx'> yield</div><div class='ctx'> </div><div class='del'>-count=`head -n 100 trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`</div><div class='add'>+count=`check_unique`</div><div class='ctx'> if [ $count -lt 3 ]; then</div><div class='ctx'>     fail "at least fork, exec and exit events should be recorded"</div><div class='ctx'> fi</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc b/tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc<br/>index 118247b8dd84..cfa16aa1f39a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc</a></div><div class='hunk'>@@ -20,6 +20,10 @@ sample_events() {</div><div class='ctx'> echo 0 &gt; tracing_on</div><div class='ctx'> echo 0 &gt; events/enable</div><div class='ctx'> </div><div class='add'>+# Clear functions caused by page cache; run sample_events twice</div><div class='add'>+sample_events</div><div class='add'>+sample_events</div><div class='add'>+</div><div class='ctx'> echo "Get the most frequently calling function"</div><div class='ctx'> echo &gt; trace</div><div class='ctx'> sample_events</div><div class='hunk'>@@ -80,6 +84,26 @@ if [ $misscnt -gt 0 ]; then</div><div class='ctx'> 	exit_fail</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+# Check strings too</div><div class='add'>+if [ -f events/syscalls/sys_enter_openat/filter ]; then</div><div class='add'>+	DIRNAME=`basename $TMPDIR`</div><div class='add'>+	echo "filename.ustring ~ \"*$DIRNAME*\"" &gt; events/syscalls/sys_enter_openat/filter</div><div class='add'>+	echo 1 &gt; events/syscalls/sys_enter_openat/enable</div><div class='add'>+	echo 1 &gt; tracing_on</div><div class='add'>+	ls /bin/sh</div><div class='add'>+	nocnt=`grep openat trace | wc -l`</div><div class='add'>+	ls $TMPDIR</div><div class='add'>+	echo 0 &gt; tracing_on</div><div class='add'>+	hitcnt=`grep openat trace | wc -l`;</div><div class='add'>+	echo 0 &gt; events/syscalls/sys_enter_openat/enable</div><div class='add'>+	if [ $nocnt -gt 0 ]; then</div><div class='add'>+		exit_fail</div><div class='add'>+	fi</div><div class='add'>+	if [ $hitcnt -eq 0 ]; then</div><div class='add'>+		exit_fail</div><div class='add'>+	fi</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> reset_events_filter</div><div class='ctx'> </div><div class='ctx'> exit 0</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-multi-filter.tc b/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-multi-filter.tc<br/>new file mode 100644<br/>index 000000000000..b6d6a312ead5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-multi-filter.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/ftrace/fgraph-multi-filter.tc</a></div><div class='hunk'>@@ -0,0 +1,177 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+# description: ftrace - function graph filters</div><div class='add'>+# requires: set_ftrace_filter function_graph:tracer</div><div class='add'>+</div><div class='add'>+# Make sure that function graph filtering works</div><div class='add'>+</div><div class='add'>+INSTANCE1="instances/test1_$$"</div><div class='add'>+INSTANCE2="instances/test2_$$"</div><div class='add'>+</div><div class='add'>+WD=`pwd`</div><div class='add'>+</div><div class='add'>+do_reset() {</div><div class='add'>+    cd $WD</div><div class='add'>+    if [ -d $INSTANCE1 ]; then</div><div class='add'>+	echo nop &gt; $INSTANCE1/current_tracer</div><div class='add'>+	rmdir $INSTANCE1</div><div class='add'>+    fi</div><div class='add'>+    if [ -d $INSTANCE2 ]; then</div><div class='add'>+	echo nop &gt; $INSTANCE2/current_tracer</div><div class='add'>+	rmdir $INSTANCE2</div><div class='add'>+    fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+mkdir $INSTANCE1</div><div class='add'>+if ! grep -q function_graph $INSTANCE1/available_tracers; then</div><div class='add'>+    echo "function_graph not allowed with instances"</div><div class='add'>+    rmdir $INSTANCE1</div><div class='add'>+    exit_unsupported</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+mkdir $INSTANCE2</div><div class='add'>+</div><div class='add'>+fail() { # msg</div><div class='add'>+    do_reset</div><div class='add'>+    echo $1</div><div class='add'>+    exit_fail</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+disable_tracing</div><div class='add'>+clear_trace</div><div class='add'>+</div><div class='add'>+function_count() {</div><div class='add'>+    search=$1</div><div class='add'>+    vsearch=$2</div><div class='add'>+</div><div class='add'>+    if [ -z "$search" ]; then</div><div class='add'>+	cat enabled_functions | wc -l</div><div class='add'>+    elif [ -z "$vsearch" ]; then</div><div class='add'>+	grep $search enabled_functions | wc -l</div><div class='add'>+    else</div><div class='add'>+	grep $search enabled_functions | grep $vsearch| wc -l</div><div class='add'>+    fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+set_fgraph() {</div><div class='add'>+    instance=$1</div><div class='add'>+    filter="$2"</div><div class='add'>+    notrace="$3"</div><div class='add'>+</div><div class='add'>+    echo "$filter" &gt; $instance/set_ftrace_filter</div><div class='add'>+    echo "$notrace" &gt; $instance/set_ftrace_notrace</div><div class='add'>+    echo function_graph &gt; $instance/current_tracer</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+check_functions() {</div><div class='add'>+    orig_cnt=$1</div><div class='add'>+    test=$2</div><div class='add'>+</div><div class='add'>+    cnt=`function_count $test`</div><div class='add'>+    if [ $cnt -gt $orig_cnt ]; then</div><div class='add'>+	fail</div><div class='add'>+    fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+check_cnt() {</div><div class='add'>+    orig_cnt=$1</div><div class='add'>+    search=$2</div><div class='add'>+    vsearch=$3</div><div class='add'>+</div><div class='add'>+    cnt=`function_count $search $vsearch`</div><div class='add'>+    if [ $cnt -gt $orig_cnt ]; then</div><div class='add'>+	fail</div><div class='add'>+    fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+reset_graph() {</div><div class='add'>+    instance=$1</div><div class='add'>+    echo nop &gt; $instance/current_tracer</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# get any functions that were enabled before the test</div><div class='add'>+total_cnt=`function_count`</div><div class='add'>+sched_cnt=`function_count sched`</div><div class='add'>+lock_cnt=`function_count lock`</div><div class='add'>+time_cnt=`function_count time`</div><div class='add'>+clock_cnt=`function_count clock`</div><div class='add'>+locks_clock_cnt=`function_count locks clock`</div><div class='add'>+clock_locks_cnt=`function_count clock locks`</div><div class='add'>+</div><div class='add'>+# Trace functions with "sched" but not "time"</div><div class='add'>+set_fgraph $INSTANCE1 '*sched*' '*time*'</div><div class='add'>+</div><div class='add'>+# Make sure "time" isn't listed</div><div class='add'>+check_functions $time_cnt 'time'</div><div class='add'>+instance1_cnt=`function_count`</div><div class='add'>+</div><div class='add'>+# Trace functions with "lock" but not "clock"</div><div class='add'>+set_fgraph $INSTANCE2 '*lock*' '*clock*'</div><div class='add'>+instance1_2_cnt=`function_count`</div><div class='add'>+</div><div class='add'>+# Turn off the first instance</div><div class='add'>+reset_graph $INSTANCE1</div><div class='add'>+</div><div class='add'>+# The second instance doesn't trace "clock" functions</div><div class='add'>+check_functions $clock_cnt 'clock'</div><div class='add'>+instance2_cnt=`function_count`</div><div class='add'>+</div><div class='add'>+# Start from a clean slate</div><div class='add'>+reset_graph $INSTANCE2</div><div class='add'>+check_functions $total_cnt</div><div class='add'>+</div><div class='add'>+# Trace functions with "lock" but not "clock"</div><div class='add'>+set_fgraph $INSTANCE2 '*lock*' '*clock*'</div><div class='add'>+</div><div class='add'>+# This should match the last time instance 2 was by itself</div><div class='add'>+cnt=`function_count`</div><div class='add'>+if [ $instance2_cnt -ne $cnt ]; then</div><div class='add'>+    fail</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# And it should not be tracing "clock" functions</div><div class='add'>+check_functions $clock_cnt 'clock'</div><div class='add'>+</div><div class='add'>+# Trace functions with "sched" but not "time"</div><div class='add'>+set_fgraph $INSTANCE1 '*sched*' '*time*'</div><div class='add'>+</div><div class='add'>+# This should match the last time both instances were enabled</div><div class='add'>+cnt=`function_count`</div><div class='add'>+if [ $instance1_2_cnt -ne $cnt ]; then</div><div class='add'>+    fail</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# Turn off the second instance</div><div class='add'>+reset_graph $INSTANCE2</div><div class='add'>+</div><div class='add'>+# This should match the last time instance 1 was by itself</div><div class='add'>+cnt=`function_count`</div><div class='add'>+if [ $instance1_cnt -ne $cnt ]; then</div><div class='add'>+    fail</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# And it should not be tracing "time" functions</div><div class='add'>+check_functions $time_cnt 'time'</div><div class='add'>+</div><div class='add'>+# Start from a clean slate</div><div class='add'>+reset_graph $INSTANCE1</div><div class='add'>+check_functions $total_cnt</div><div class='add'>+</div><div class='add'>+# Enable all functions but those that have "locks"</div><div class='add'>+set_fgraph $INSTANCE1 '' '*locks*'</div><div class='add'>+</div><div class='add'>+# Enable all functions but those that have "clock"</div><div class='add'>+set_fgraph $INSTANCE2 '' '*clock*'</div><div class='add'>+</div><div class='add'>+# If a function has "locks" it should not have "clock"</div><div class='add'>+check_cnt $locks_clock_cnt locks clock</div><div class='add'>+</div><div class='add'>+# If a function has "clock" it should not have "locks"</div><div class='add'>+check_cnt $clock_locks_cnt clock locks</div><div class='add'>+</div><div class='add'>+reset_graph $INSTANCE1</div><div class='add'>+reset_graph $INSTANCE2</div><div class='add'>+</div><div class='add'>+do_reset</div><div class='add'>+</div><div class='add'>+exit 0</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc<br/>index 4b994b6df5ac..ed81eaf2afd6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc</a></div><div class='hunk'>@@ -29,7 +29,7 @@ ftrace_filter_check 'schedule*' '^schedule.*$'</div><div class='ctx'> ftrace_filter_check '*pin*lock' '.*pin.*lock$'</div><div class='ctx'> </div><div class='ctx'> # filter by start*mid*</div><div class='del'>-ftrace_filter_check 'mutex*try*' '^mutex.*try.*'</div><div class='add'>+ftrace_filter_check 'mutex*unl*' '^mutex.*unl.*'</div><div class='ctx'> </div><div class='ctx'> # Advanced full-glob matching feature is recently supported.</div><div class='ctx'> # Skip the tests if we are sure the kernel does not support it.</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions<br/>index 84d6a9c7ad67..e8e718139294 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/functions?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/functions</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/functions?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/functions</a></div><div class='hunk'>@@ -104,7 +104,7 @@ clear_dynamic_events() { # reset all current dynamic events</div><div class='ctx'>     done</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-initialize_ftrace() { # Reset ftrace to initial-state</div><div class='add'>+initialize_system() { # Reset ftrace to initial-state</div><div class='ctx'> # As the initial state, ftrace will be set to nop tracer,</div><div class='ctx'> # no events, no triggers, no filters, no function filters,</div><div class='ctx'> # no probes, and tracing on.</div><div class='hunk'>@@ -134,8 +134,8 @@ initialize_ftrace() { # Reset ftrace to initial-state</div><div class='ctx'>     enable_tracing</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-finish_ftrace() {</div><div class='del'>-    initialize_ftrace</div><div class='add'>+finish_system() {</div><div class='add'>+    initialize_system</div><div class='ctx'> # And recover it to default.</div><div class='ctx'>     [ -f options/pause-on-trace ] &amp;&amp; echo 0 &gt; options/pause-on-trace</div><div class='ctx'> }</div><div class='hunk'>@@ -156,7 +156,13 @@ check_requires() { # Check required files and tracers</div><div class='ctx'>                 exit_unsupported</div><div class='ctx'>             fi</div><div class='ctx'>         elif [ "$r" != "$i" ]; then</div><div class='del'>-            if ! grep -Fq "$r" README ; then</div><div class='add'>+	    # If this is an instance, check the top directory</div><div class='add'>+	    if echo $TRACING_DIR | grep -q "/instances/"; then</div><div class='add'>+		test="$TRACING_DIR/../.."</div><div class='add'>+	    else</div><div class='add'>+		test=$TRACING_DIR</div><div class='add'>+	    fi</div><div class='add'>+            if ! grep -Fq "$r" $test/README ; then</div><div class='ctx'>                 echo "Required feature pattern \"$r\" is not in README."</div><div class='ctx'>                 exit_unsupported</div><div class='ctx'>             fi</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc<br/>index 1590d6bfb857..20a35fea13f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> # description: event trigger - test inter-event histogram trigger expected fail actions</div><div class='ctx'> # requires: set_event snapshot "snapshot()":README</div><div class='add'>+# flags: instance</div><div class='ctx'> </div><div class='ctx'> fail() { #msg</div><div class='ctx'>     echo $1</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc<br/>index 91339c130832..55ab0270e5f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> # description: event trigger - test inter-event histogram trigger onchange action</div><div class='ctx'> # requires: set_event "onchange(var)":README ping:program</div><div class='add'>+# flags: instance</div><div class='ctx'> </div><div class='ctx'> fail() { #msg</div><div class='ctx'>     echo $1</div><div class='hunk'>@@ -19,4 +20,6 @@ if ! grep -q "changed:" events/sched/sched_waking/hist; then</div><div class='ctx'>     fail "Failed to create onchange action inter-event histogram"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+echo '!hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio) if comm=="ping"' &gt;&gt; events/sched/sched_waking/trigger</div><div class='add'>+</div><div class='ctx'> exit 0</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc<br/>index 147967e86584..9eb37c2fa417 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> # description: event trigger - test inter-event histogram trigger snapshot action</div><div class='ctx'> # requires: set_event snapshot events/sched/sched_process_fork/hist "onchange(var)":README "snapshot()":README ping:program</div><div class='add'>+# flags: instance</div><div class='ctx'> </div><div class='ctx'> fail() { #msg</div><div class='ctx'>     echo $1</div><div class='hunk'>@@ -27,4 +28,6 @@ if ! grep -q "comm=ping" snapshot; then</div><div class='ctx'>     fail "Failed to create snapshot action inter-event histogram"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+echo '!hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio):onchange($newprio).snapshot() if comm=="ping"' &gt;&gt; events/sched/sched_waking/trigger</div><div class='add'>+</div><div class='ctx'> exit 0</div><div class='head'>diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc<br/>index 05ffba299dbf..0ebda2068a00 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> # description: event trigger - test histogram expression parsing</div><div class='ctx'> # requires: set_event events/sched/sched_process_fork/trigger events/sched/sched_process_fork/hist error_log "&lt;var1&gt;=&lt;field|var_ref|numeric_literal&gt;":README</div><div class='add'>+# flags: instance</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> fail() { #msg</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/.gitignore b/tools/testing/selftests/futex/functional/.gitignore<br/>index fbcbdb6963b3..776ad658f75e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/.gitignore?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/.gitignore</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/.gitignore</a></div><div class='hunk'>@@ -1,11 +1,14 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+futex_numa_mpol</div><div class='add'>+futex_priv_hash</div><div class='add'>+futex_requeue</div><div class='ctx'> futex_requeue_pi</div><div class='ctx'> futex_requeue_pi_mismatched_ops</div><div class='ctx'> futex_requeue_pi_signal_restart</div><div class='add'>+futex_wait</div><div class='ctx'> futex_wait_private_mapped_file</div><div class='ctx'> futex_wait_timeout</div><div class='ctx'> futex_wait_uninitialized_heap</div><div class='ctx'> futex_wait_wouldblock</div><div class='del'>-futex_wait</div><div class='del'>-futex_requeue</div><div class='ctx'> futex_waitv</div><div class='add'>+futex_numa</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile<br/>index f79f9bac7918..490ace1f017e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/Makefile</a></div><div class='hunk'>@@ -1,12 +1,14 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='add'>+PKG_CONFIG ?= pkg-config</div><div class='add'>+LIBNUMA_TEST = $(shell sh -c "$(PKG_CONFIG) numa --atleast-version 2.0.16 &gt; /dev/null 2&gt;&amp;1 &amp;&amp; echo SUFFICIENT || echo NO")</div><div class='add'>+</div><div class='ctx'> INCLUDES := -I../include -I../../ $(KHDR_INCLUDES)</div><div class='del'>-CFLAGS := $(CFLAGS) -g -O2 -Wall -pthread $(INCLUDES) $(KHDR_INCLUDES)</div><div class='del'>-LDLIBS := -lpthread -lrt</div><div class='add'>+CFLAGS := $(CFLAGS) -g -O2 -Wall -pthread -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 $(INCLUDES) $(KHDR_INCLUDES) -DLIBNUMA_VER_$(LIBNUMA_TEST)=1</div><div class='add'>+LDLIBS := -lpthread -lrt -lnuma</div><div class='ctx'> </div><div class='ctx'> LOCAL_HDRS := \</div><div class='ctx'> 	../include/futextest.h \</div><div class='del'>-	../include/atomic.h \</div><div class='del'>-	../include/logging.h</div><div class='add'>+	../include/atomic.h</div><div class='ctx'> TEST_GEN_PROGS := \</div><div class='ctx'> 	futex_wait_timeout \</div><div class='ctx'> 	futex_wait_wouldblock \</div><div class='hunk'>@@ -17,7 +19,10 @@ TEST_GEN_PROGS := \</div><div class='ctx'> 	futex_wait_private_mapped_file \</div><div class='ctx'> 	futex_wait \</div><div class='ctx'> 	futex_requeue \</div><div class='del'>-	futex_waitv</div><div class='add'>+	futex_priv_hash \</div><div class='add'>+	futex_numa_mpol \</div><div class='add'>+	futex_waitv \</div><div class='add'>+	futex_numa</div><div class='ctx'> </div><div class='ctx'> TEST_PROGS := run.sh</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_numa.c b/tools/testing/selftests/futex/functional/futex_numa.c<br/>new file mode 100644<br/>index 000000000000..e0a33510ccb6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_numa.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_numa.c</a></div><div class='hunk'>@@ -0,0 +1,263 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;sys/shm.h&gt;</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;time.h&gt;</div><div class='add'>+#include &lt;assert.h&gt;</div><div class='add'>+#include "futextest.h"</div><div class='add'>+#include "futex2test.h"</div><div class='add'>+</div><div class='add'>+typedef u_int32_t u32;</div><div class='add'>+typedef int32_t   s32;</div><div class='add'>+typedef u_int64_t u64;</div><div class='add'>+</div><div class='add'>+static unsigned int fflags = (FUTEX2_SIZE_U32 | FUTEX2_PRIVATE);</div><div class='add'>+static int fnode = FUTEX_NO_NODE;</div><div class='add'>+</div><div class='add'>+/* fairly stupid test-and-set lock with a waiter flag */</div><div class='add'>+</div><div class='add'>+#define N_LOCK		0x0000001</div><div class='add'>+#define N_WAITERS	0x0001000</div><div class='add'>+</div><div class='add'>+struct futex_numa_32 {</div><div class='add'>+	union {</div><div class='add'>+		u64 full;</div><div class='add'>+		struct {</div><div class='add'>+			u32 val;</div><div class='add'>+			u32 node;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void futex_numa_32_lock(struct futex_numa_32 *lock)</div><div class='add'>+{</div><div class='add'>+	for (;;) {</div><div class='add'>+		struct futex_numa_32 new, old = {</div><div class='add'>+			.full = __atomic_load_n(&amp;lock-&gt;full, __ATOMIC_RELAXED),</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		for (;;) {</div><div class='add'>+			new = old;</div><div class='add'>+			if (old.val == 0) {</div><div class='add'>+				/* no waiter, no lock -&gt; first lock, set no-node */</div><div class='add'>+				new.node = fnode;</div><div class='add'>+			}</div><div class='add'>+			if (old.val &amp; N_LOCK) {</div><div class='add'>+				/* contention, set waiter */</div><div class='add'>+				new.val |= N_WAITERS;</div><div class='add'>+			}</div><div class='add'>+			new.val |= N_LOCK;</div><div class='add'>+</div><div class='add'>+			/* nothing changed, ready to block */</div><div class='add'>+			if (old.full == new.full)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Use u64 cmpxchg to set the futex value and node in a</div><div class='add'>+			 * consistent manner.</div><div class='add'>+			 */</div><div class='add'>+			if (__atomic_compare_exchange_n(&amp;lock-&gt;full,</div><div class='add'>+							&amp;old.full, new.full,</div><div class='add'>+							/* .weak */ false,</div><div class='add'>+							__ATOMIC_ACQUIRE,</div><div class='add'>+							__ATOMIC_RELAXED)) {</div><div class='add'>+</div><div class='add'>+				/* if we just set N_LOCK, we own it */</div><div class='add'>+				if (!(old.val &amp; N_LOCK))</div><div class='add'>+					return;</div><div class='add'>+</div><div class='add'>+				/* go block */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		futex2_wait(lock, new.val, fflags, NULL, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void futex_numa_32_unlock(struct futex_numa_32 *lock)</div><div class='add'>+{</div><div class='add'>+	u32 val = __atomic_sub_fetch(&amp;lock-&gt;val, N_LOCK, __ATOMIC_RELEASE);</div><div class='add'>+	assert((s32)val &gt;= 0);</div><div class='add'>+	if (val &amp; N_WAITERS) {</div><div class='add'>+		int woken = futex2_wake(lock, 1, fflags);</div><div class='add'>+		assert(val == N_WAITERS);</div><div class='add'>+		if (!woken) {</div><div class='add'>+			__atomic_compare_exchange_n(&amp;lock-&gt;val, &amp;val, 0U,</div><div class='add'>+						    false, __ATOMIC_RELAXED,</div><div class='add'>+						    __ATOMIC_RELAXED);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long nanos = 50000;</div><div class='add'>+</div><div class='add'>+struct thread_args {</div><div class='add'>+	pthread_t tid;</div><div class='add'>+	volatile int * done;</div><div class='add'>+	struct futex_numa_32 *lock;</div><div class='add'>+	int val;</div><div class='add'>+	int *val1, *val2;</div><div class='add'>+	int node;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void *threadfn(void *_arg)</div><div class='add'>+{</div><div class='add'>+	struct thread_args *args = _arg;</div><div class='add'>+	struct timespec ts = {</div><div class='add'>+		.tv_nsec = nanos,</div><div class='add'>+	};</div><div class='add'>+	int node;</div><div class='add'>+</div><div class='add'>+	while (!*args-&gt;done) {</div><div class='add'>+</div><div class='add'>+		futex_numa_32_lock(args-&gt;lock);</div><div class='add'>+		args-&gt;val++;</div><div class='add'>+</div><div class='add'>+		assert(*args-&gt;val1 == *args-&gt;val2);</div><div class='add'>+		(*args-&gt;val1)++;</div><div class='add'>+		nanosleep(&amp;ts, NULL);</div><div class='add'>+		(*args-&gt;val2)++;</div><div class='add'>+</div><div class='add'>+		node = args-&gt;lock-&gt;node;</div><div class='add'>+		futex_numa_32_unlock(args-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (node != args-&gt;node) {</div><div class='add'>+			args-&gt;node = node;</div><div class='add'>+			printf("node: %d\n", node);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nanosleep(&amp;ts, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *contendfn(void *_arg)</div><div class='add'>+{</div><div class='add'>+	struct thread_args *args = _arg;</div><div class='add'>+</div><div class='add'>+	while (!*args-&gt;done) {</div><div class='add'>+		/*</div><div class='add'>+		 * futex2_wait() will take hb-lock, verify *var == val and</div><div class='add'>+		 * queue/abort.  By knowingly setting val 'wrong' this will</div><div class='add'>+		 * abort and thereby generate hb-lock contention.</div><div class='add'>+		 */</div><div class='add'>+		futex2_wait(&amp;args-&gt;lock-&gt;val, ~0U, fflags, NULL, 0);</div><div class='add'>+		args-&gt;val++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static volatile int done = 0;</div><div class='add'>+static struct futex_numa_32 lock = { .val = 0, };</div><div class='add'>+static int val1, val2;</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	struct thread_args *tas[512], *cas[512];</div><div class='add'>+	int c, t, threads = 2, contenders = 0;</div><div class='add'>+	int sleeps = 10;</div><div class='add'>+	int total = 0;</div><div class='add'>+</div><div class='add'>+	while ((c = getopt(argc, argv, "c:t:s:n:N::")) != -1) {</div><div class='add'>+		switch (c) {</div><div class='add'>+		case 'c':</div><div class='add'>+			contenders = atoi(optarg);</div><div class='add'>+			break;</div><div class='add'>+		case 't':</div><div class='add'>+			threads = atoi(optarg);</div><div class='add'>+			break;</div><div class='add'>+		case 's':</div><div class='add'>+			sleeps = atoi(optarg);</div><div class='add'>+			break;</div><div class='add'>+		case 'n':</div><div class='add'>+			nanos = atoi(optarg);</div><div class='add'>+			break;</div><div class='add'>+		case 'N':</div><div class='add'>+			fflags |= FUTEX2_NUMA;</div><div class='add'>+			if (optarg)</div><div class='add'>+				fnode = atoi(optarg);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			exit(1);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (t = 0; t &lt; contenders; t++) {</div><div class='add'>+		struct thread_args *args = calloc(1, sizeof(*args));</div><div class='add'>+		if (!args) {</div><div class='add'>+			perror("thread_args");</div><div class='add'>+			exit(-1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		args-&gt;done = &amp;done;</div><div class='add'>+		args-&gt;lock = &amp;lock;</div><div class='add'>+		args-&gt;val1 = &amp;val1;</div><div class='add'>+		args-&gt;val2 = &amp;val2;</div><div class='add'>+		args-&gt;node = -1;</div><div class='add'>+</div><div class='add'>+		if (pthread_create(&amp;args-&gt;tid, NULL, contendfn, args)) {</div><div class='add'>+			perror("pthread_create");</div><div class='add'>+			exit(-1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cas[t] = args;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (t = 0; t &lt; threads; t++) {</div><div class='add'>+		struct thread_args *args = calloc(1, sizeof(*args));</div><div class='add'>+		if (!args) {</div><div class='add'>+			perror("thread_args");</div><div class='add'>+			exit(-1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		args-&gt;done = &amp;done;</div><div class='add'>+		args-&gt;lock = &amp;lock;</div><div class='add'>+		args-&gt;val1 = &amp;val1;</div><div class='add'>+		args-&gt;val2 = &amp;val2;</div><div class='add'>+		args-&gt;node = -1;</div><div class='add'>+</div><div class='add'>+		if (pthread_create(&amp;args-&gt;tid, NULL, threadfn, args)) {</div><div class='add'>+			perror("pthread_create");</div><div class='add'>+			exit(-1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tas[t] = args;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sleep(sleeps);</div><div class='add'>+</div><div class='add'>+	done = true;</div><div class='add'>+</div><div class='add'>+	for (t = 0; t &lt; threads; t++) {</div><div class='add'>+		struct thread_args *args = tas[t];</div><div class='add'>+</div><div class='add'>+		pthread_join(args-&gt;tid, NULL);</div><div class='add'>+		total += args-&gt;val;</div><div class='add'>+//		printf("tval: %d\n", args-&gt;val);</div><div class='add'>+	}</div><div class='add'>+	printf("total: %d\n", total);</div><div class='add'>+</div><div class='add'>+	if (contenders) {</div><div class='add'>+		total = 0;</div><div class='add'>+		for (t = 0; t &lt; contenders; t++) {</div><div class='add'>+			struct thread_args *args = cas[t];</div><div class='add'>+</div><div class='add'>+			pthread_join(args-&gt;tid, NULL);</div><div class='add'>+			total += args-&gt;val;</div><div class='add'>+			//		printf("tval: %d\n", args-&gt;val);</div><div class='add'>+		}</div><div class='add'>+		printf("contenders: %d\n", total);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_numa_mpol.c b/tools/testing/selftests/futex/functional/futex_numa_mpol.c<br/>new file mode 100644<br/>index 000000000000..ab8555752137<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_numa_mpol.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_numa_mpol.c</a></div><div class='hunk'>@@ -0,0 +1,219 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Sebastian Andrzej Siewior &lt;bigeasy@linutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;numa.h&gt;</div><div class='add'>+#include &lt;numaif.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/futex.h&gt;</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+</div><div class='add'>+#include "futextest.h"</div><div class='add'>+#include "futex2test.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+</div><div class='add'>+#define MAX_THREADS	64</div><div class='add'>+</div><div class='add'>+static pthread_barrier_t barrier_main;</div><div class='add'>+static pthread_t threads[MAX_THREADS];</div><div class='add'>+</div><div class='add'>+struct thread_args {</div><div class='add'>+	void *futex_ptr;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	int result;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct thread_args thread_args[MAX_THREADS];</div><div class='add'>+</div><div class='add'>+#ifndef FUTEX_NO_NODE</div><div class='add'>+#define FUTEX_NO_NODE (-1)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef FUTEX2_MPOL</div><div class='add'>+#define FUTEX2_MPOL	0x08</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void *thread_lock_fn(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct thread_args *args = arg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pthread_barrier_wait(&amp;barrier_main);</div><div class='add'>+	ret = futex2_wait(args-&gt;futex_ptr, 0, args-&gt;flags, NULL, 0);</div><div class='add'>+	args-&gt;result = ret;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void create_max_threads(void *futex_ptr)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_THREADS; i++) {</div><div class='add'>+		thread_args[i].futex_ptr = futex_ptr;</div><div class='add'>+		thread_args[i].flags = FUTEX2_SIZE_U32 | FUTEX_PRIVATE_FLAG | FUTEX2_NUMA;</div><div class='add'>+		thread_args[i].result = 0;</div><div class='add'>+		ret = pthread_create(&amp;threads[i], NULL, thread_lock_fn, &amp;thread_args[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			ksft_exit_fail_msg("pthread_create failed\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void join_max_threads(void)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_THREADS; i++) {</div><div class='add'>+		ret = pthread_join(threads[i], NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			ksft_exit_fail_msg("pthread_join failed for thread %d\n", i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __test_futex(void *futex_ptr, int err_value, unsigned int futex_flags)</div><div class='add'>+{</div><div class='add'>+	int to_wake, ret, i, need_exit = 0;</div><div class='add'>+</div><div class='add'>+	pthread_barrier_init(&amp;barrier_main, NULL, MAX_THREADS + 1);</div><div class='add'>+	create_max_threads(futex_ptr);</div><div class='add'>+	pthread_barrier_wait(&amp;barrier_main);</div><div class='add'>+	to_wake = MAX_THREADS;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = futex2_wake(futex_ptr, to_wake, futex_flags);</div><div class='add'>+</div><div class='add'>+		if (err_value) {</div><div class='add'>+			if (ret &gt;= 0)</div><div class='add'>+				ksft_exit_fail_msg("futex2_wake(%d, 0x%x) should fail, but didn't\n",</div><div class='add'>+						   to_wake, futex_flags);</div><div class='add'>+</div><div class='add'>+			if (errno != err_value)</div><div class='add'>+				ksft_exit_fail_msg("futex2_wake(%d, 0x%x) expected error was %d, but returned %d (%s)\n",</div><div class='add'>+						   to_wake, futex_flags, err_value, errno, strerror(errno));</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			ksft_exit_fail_msg("Failed futex2_wake(%d, 0x%x): %m\n",</div><div class='add'>+					   to_wake, futex_flags);</div><div class='add'>+		}</div><div class='add'>+		if (!ret)</div><div class='add'>+			usleep(50);</div><div class='add'>+		to_wake -= ret;</div><div class='add'>+</div><div class='add'>+	} while (to_wake);</div><div class='add'>+	join_max_threads();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_THREADS; i++) {</div><div class='add'>+		if (err_value &amp;&amp; thread_args[i].result != -1) {</div><div class='add'>+			ksft_print_msg("Thread %d should fail but succeeded (%d)\n",</div><div class='add'>+				       i, thread_args[i].result);</div><div class='add'>+			need_exit = 1;</div><div class='add'>+		}</div><div class='add'>+		if (!err_value &amp;&amp; thread_args[i].result != 0) {</div><div class='add'>+			ksft_print_msg("Thread %d failed (%d)\n", i, thread_args[i].result);</div><div class='add'>+			need_exit = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (need_exit)</div><div class='add'>+		ksft_exit_fail_msg("Aborting due to earlier errors.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_futex(void *futex_ptr, int err_value)</div><div class='add'>+{</div><div class='add'>+	__test_futex(futex_ptr, err_value, FUTEX2_SIZE_U32 | FUTEX_PRIVATE_FLAG | FUTEX2_NUMA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_futex_mpol(void *futex_ptr, int err_value)</div><div class='add'>+{</div><div class='add'>+	__test_futex(futex_ptr, err_value, FUTEX2_SIZE_U32 | FUTEX_PRIVATE_FLAG | FUTEX2_NUMA | FUTEX2_MPOL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(futex_numa_mpol)</div><div class='add'>+{</div><div class='add'>+	struct futex32_numa *futex_numa;</div><div class='add'>+	void *futex_ptr;</div><div class='add'>+	int mem_size;</div><div class='add'>+</div><div class='add'>+	mem_size = sysconf(_SC_PAGE_SIZE);</div><div class='add'>+	futex_ptr = mmap(NULL, mem_size * 2, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);</div><div class='add'>+	if (futex_ptr == MAP_FAILED)</div><div class='add'>+		ksft_exit_fail_msg("mmap() for %d bytes failed\n", mem_size);</div><div class='add'>+</div><div class='add'>+	/* Create an invalid memory region for the "Memory out of range" test */</div><div class='add'>+	mprotect(futex_ptr + mem_size, mem_size, PROT_NONE);</div><div class='add'>+</div><div class='add'>+	futex_numa = futex_ptr;</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("Regular test\n");</div><div class='add'>+	futex_numa-&gt;futex = 0;</div><div class='add'>+	futex_numa-&gt;numa = FUTEX_NO_NODE;</div><div class='add'>+	test_futex(futex_ptr, 0);</div><div class='add'>+</div><div class='add'>+	if (futex_numa-&gt;numa == FUTEX_NO_NODE)</div><div class='add'>+		ksft_exit_fail_msg("NUMA node is left uninitialized\n");</div><div class='add'>+</div><div class='add'>+	/* FUTEX2_NUMA futex must be 8-byte aligned */</div><div class='add'>+	ksft_print_msg("Mis-aligned futex\n");</div><div class='add'>+	test_futex(futex_ptr + mem_size - 4, EINVAL);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("Memory out of range\n");</div><div class='add'>+	test_futex(futex_ptr + mem_size, EFAULT);</div><div class='add'>+</div><div class='add'>+	futex_numa-&gt;numa = FUTEX_NO_NODE;</div><div class='add'>+	mprotect(futex_ptr, mem_size, PROT_READ);</div><div class='add'>+	ksft_print_msg("Memory, RO\n");</div><div class='add'>+	test_futex(futex_ptr, EFAULT);</div><div class='add'>+</div><div class='add'>+	mprotect(futex_ptr, mem_size, PROT_NONE);</div><div class='add'>+	ksft_print_msg("Memory, no access\n");</div><div class='add'>+	test_futex(futex_ptr, EFAULT);</div><div class='add'>+</div><div class='add'>+	mprotect(futex_ptr, mem_size, PROT_READ | PROT_WRITE);</div><div class='add'>+	ksft_print_msg("Memory back to RW\n");</div><div class='add'>+	test_futex(futex_ptr, 0);</div><div class='add'>+</div><div class='add'>+	ksft_test_result_pass("futex2 memory boundary tests passed\n");</div><div class='add'>+</div><div class='add'>+	/* MPOL test. Does not work as expected */</div><div class='add'>+#ifdef LIBNUMA_VER_SUFFICIENT</div><div class='add'>+	for (int i = 0; i &lt; 4; i++) {</div><div class='add'>+		unsigned long nodemask;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		nodemask = 1 &lt;&lt; i;</div><div class='add'>+		ret = mbind(futex_ptr, mem_size, MPOL_BIND, &amp;nodemask,</div><div class='add'>+			    sizeof(nodemask) * 8, 0);</div><div class='add'>+		if (ret == 0) {</div><div class='add'>+			ret = numa_set_mempolicy_home_node(futex_ptr, mem_size, i, 0);</div><div class='add'>+			if (ret != 0)</div><div class='add'>+				ksft_exit_fail_msg("Failed to set home node: %m, %d\n", errno);</div><div class='add'>+</div><div class='add'>+			ksft_print_msg("Node %d test\n", i);</div><div class='add'>+			futex_numa-&gt;futex = 0;</div><div class='add'>+			futex_numa-&gt;numa = FUTEX_NO_NODE;</div><div class='add'>+</div><div class='add'>+			ret = futex2_wake(futex_ptr, 0, FUTEX2_SIZE_U32 | FUTEX_PRIVATE_FLAG | FUTEX2_NUMA | FUTEX2_MPOL);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				ksft_test_result_fail("Failed to wake 0 with MPOL: %m\n");</div><div class='add'>+			if (futex_numa-&gt;numa != i) {</div><div class='add'>+				ksft_exit_fail_msg("Returned NUMA node is %d expected %d\n",</div><div class='add'>+						   futex_numa-&gt;numa, i);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	ksft_test_result_pass("futex2 MPOL hints test passed\n");</div><div class='add'>+#else</div><div class='add'>+	ksft_test_result_skip("futex2 MPOL hints test requires libnuma 2.0.16+\n");</div><div class='add'>+#endif</div><div class='add'>+	munmap(futex_ptr, mem_size * 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_priv_hash.c b/tools/testing/selftests/futex/functional/futex_priv_hash.c<br/>new file mode 100644<br/>index 000000000000..e8079d7c65e8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_priv_hash.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_priv_hash.c</a></div><div class='hunk'>@@ -0,0 +1,270 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025 Sebastian Andrzej Siewior &lt;bigeasy@linutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/prctl.h&gt;</div><div class='add'>+#include &lt;sys/prctl.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+</div><div class='add'>+#define MAX_THREADS	64</div><div class='add'>+</div><div class='add'>+static pthread_barrier_t barrier_main;</div><div class='add'>+static pthread_mutex_t global_lock;</div><div class='add'>+static pthread_t threads[MAX_THREADS];</div><div class='add'>+static int counter;</div><div class='add'>+</div><div class='add'>+#ifndef PR_FUTEX_HASH</div><div class='add'>+#define PR_FUTEX_HASH			78</div><div class='add'>+# define PR_FUTEX_HASH_SET_SLOTS	1</div><div class='add'>+# define PR_FUTEX_HASH_GET_SLOTS	2</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int futex_hash_slots_set(unsigned int slots)</div><div class='add'>+{</div><div class='add'>+	return prctl(PR_FUTEX_HASH, PR_FUTEX_HASH_SET_SLOTS, slots, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int futex_hash_slots_get(void)</div><div class='add'>+{</div><div class='add'>+	return prctl(PR_FUTEX_HASH, PR_FUTEX_HASH_GET_SLOTS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void futex_hash_slots_set_verify(int slots)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = futex_hash_slots_set(slots);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		ksft_test_result_fail("Failed to set slots to %d: %m\n", slots);</div><div class='add'>+		ksft_finished();</div><div class='add'>+	}</div><div class='add'>+	ret = futex_hash_slots_get();</div><div class='add'>+	if (ret != slots) {</div><div class='add'>+		ksft_test_result_fail("Set %d slots but PR_FUTEX_HASH_GET_SLOTS returns: %d, %m\n",</div><div class='add'>+		       slots, ret);</div><div class='add'>+		ksft_finished();</div><div class='add'>+	}</div><div class='add'>+	ksft_test_result_pass("SET and GET slots %d passed\n", slots);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void futex_hash_slots_set_must_fail(int slots)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = futex_hash_slots_set(slots);</div><div class='add'>+	ksft_test_result(ret &lt; 0, "futex_hash_slots_set(%d)\n",</div><div class='add'>+			 slots);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *thread_return_fn(void *arg)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *thread_lock_fn(void *arg)</div><div class='add'>+{</div><div class='add'>+	pthread_barrier_wait(&amp;barrier_main);</div><div class='add'>+</div><div class='add'>+	pthread_mutex_lock(&amp;global_lock);</div><div class='add'>+	counter++;</div><div class='add'>+	usleep(20);</div><div class='add'>+	pthread_mutex_unlock(&amp;global_lock);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void create_max_threads(void *(*thread_fn)(void *))</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_THREADS; i++) {</div><div class='add'>+		ret = pthread_create(&amp;threads[i], NULL, thread_fn, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			ksft_exit_fail_msg("pthread_create failed: %m\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void join_max_threads(void)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_THREADS; i++) {</div><div class='add'>+		ret = pthread_join(threads[i], NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			ksft_exit_fail_msg("pthread_join failed for thread %d\n", i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SEC_IN_NSEC	1000000000</div><div class='add'>+#define MSEC_IN_NSEC	1000000</div><div class='add'>+</div><div class='add'>+static void futex_dummy_op(void)</div><div class='add'>+{</div><div class='add'>+	pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='add'>+	struct timespec timeout;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pthread_mutex_lock(&amp;lock);</div><div class='add'>+	clock_gettime(CLOCK_REALTIME, &amp;timeout);</div><div class='add'>+	timeout.tv_nsec += 100 * MSEC_IN_NSEC;</div><div class='add'>+	if (timeout.tv_nsec &gt;=  SEC_IN_NSEC) {</div><div class='add'>+		timeout.tv_nsec -= SEC_IN_NSEC;</div><div class='add'>+		timeout.tv_sec++;</div><div class='add'>+	}</div><div class='add'>+	ret = pthread_mutex_timedlock(&amp;lock, &amp;timeout);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		ksft_exit_fail_msg("Successfully locked an already locked mutex.\n");</div><div class='add'>+</div><div class='add'>+	if (ret != ETIMEDOUT)</div><div class='add'>+		ksft_exit_fail_msg("pthread_mutex_timedlock() did not timeout: %d.\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *test_msg_auto_create = "Automatic hash bucket init on thread creation.\n";</div><div class='add'>+static const char *test_msg_auto_inc = "Automatic increase with more than 16 CPUs\n";</div><div class='add'>+</div><div class='add'>+TEST(priv_hash)</div><div class='add'>+{</div><div class='add'>+	int futex_slots1, futex_slotsn, online_cpus;</div><div class='add'>+	pthread_mutexattr_t mutex_attr_pi;</div><div class='add'>+	int ret, retry = 20;</div><div class='add'>+</div><div class='add'>+	ret = pthread_mutexattr_init(&amp;mutex_attr_pi);</div><div class='add'>+	ret |= pthread_mutexattr_setprotocol(&amp;mutex_attr_pi, PTHREAD_PRIO_INHERIT);</div><div class='add'>+	ret |= pthread_mutex_init(&amp;global_lock, &amp;mutex_attr_pi);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		ksft_exit_fail_msg("Failed to initialize pthread mutex.\n");</div><div class='add'>+	}</div><div class='add'>+	/* First thread, expect to be 0, not yet initialized */</div><div class='add'>+	ret = futex_hash_slots_get();</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		ksft_exit_fail_msg("futex_hash_slots_get() failed: %d, %m\n", ret);</div><div class='add'>+</div><div class='add'>+	ksft_test_result_pass("Basic get slots and immutable status.\n");</div><div class='add'>+	ret = pthread_create(&amp;threads[0], NULL, thread_return_fn, NULL);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		ksft_exit_fail_msg("pthread_create() failed: %d, %m\n", ret);</div><div class='add'>+</div><div class='add'>+	ret = pthread_join(threads[0], NULL);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		ksft_exit_fail_msg("pthread_join() failed: %d, %m\n", ret);</div><div class='add'>+</div><div class='add'>+	/* First thread, has to initialize private hash */</div><div class='add'>+	futex_slots1 = futex_hash_slots_get();</div><div class='add'>+	if (futex_slots1 &lt;= 0) {</div><div class='add'>+		ksft_print_msg("Current hash buckets: %d\n", futex_slots1);</div><div class='add'>+		ksft_exit_fail_msg("%s", test_msg_auto_create);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksft_test_result_pass("%s", test_msg_auto_create);</div><div class='add'>+</div><div class='add'>+	online_cpus = sysconf(_SC_NPROCESSORS_ONLN);</div><div class='add'>+	ret = pthread_barrier_init(&amp;barrier_main, NULL, MAX_THREADS + 1);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		ksft_exit_fail_msg("pthread_barrier_init failed: %m.\n");</div><div class='add'>+</div><div class='add'>+	ret = pthread_mutex_lock(&amp;global_lock);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		ksft_exit_fail_msg("pthread_mutex_lock failed: %m.\n");</div><div class='add'>+</div><div class='add'>+	counter = 0;</div><div class='add'>+	create_max_threads(thread_lock_fn);</div><div class='add'>+	pthread_barrier_wait(&amp;barrier_main);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The current default size of hash buckets is 16. The auto increase</div><div class='add'>+	 * works only if more than 16 CPUs are available.</div><div class='add'>+	 */</div><div class='add'>+	ksft_print_msg("Online CPUs: %d\n", online_cpus);</div><div class='add'>+	if (online_cpus &gt; 16) {</div><div class='add'>+retry_getslots:</div><div class='add'>+		futex_slotsn = futex_hash_slots_get();</div><div class='add'>+		if (futex_slotsn &lt; 0 || futex_slots1 == futex_slotsn) {</div><div class='add'>+			retry--;</div><div class='add'>+			/*</div><div class='add'>+			 * Auto scaling on thread creation can be slightly delayed</div><div class='add'>+			 * because it waits for a RCU grace period twice. The new</div><div class='add'>+			 * private hash is assigned upon the first futex operation</div><div class='add'>+			 * after grace period.</div><div class='add'>+			 * To cover all this for testing purposes the function</div><div class='add'>+			 * below will acquire a lock and acquire it again with a</div><div class='add'>+			 * 100ms timeout which must timeout. This ensures we</div><div class='add'>+			 * sleep for 100ms and issue a futex operation.</div><div class='add'>+			 */</div><div class='add'>+			if (retry &gt; 0) {</div><div class='add'>+				futex_dummy_op();</div><div class='add'>+				goto retry_getslots;</div><div class='add'>+			}</div><div class='add'>+			ksft_print_msg("Expected increase of hash buckets but got: %d -&gt; %d\n",</div><div class='add'>+				       futex_slots1, futex_slotsn);</div><div class='add'>+			ksft_exit_fail_msg("%s", test_msg_auto_inc);</div><div class='add'>+		}</div><div class='add'>+		ksft_test_result_pass("%s", test_msg_auto_inc);</div><div class='add'>+	} else {</div><div class='add'>+		ksft_test_result_skip("%s", test_msg_auto_inc);</div><div class='add'>+	}</div><div class='add'>+	ret = pthread_mutex_unlock(&amp;global_lock);</div><div class='add'>+</div><div class='add'>+	/* Once the user changes it, it has to be what is set */</div><div class='add'>+	futex_hash_slots_set_verify(2);</div><div class='add'>+	futex_hash_slots_set_verify(4);</div><div class='add'>+	futex_hash_slots_set_verify(8);</div><div class='add'>+	futex_hash_slots_set_verify(32);</div><div class='add'>+	futex_hash_slots_set_verify(16);</div><div class='add'>+</div><div class='add'>+	ret = futex_hash_slots_set(15);</div><div class='add'>+	ksft_test_result(ret &lt; 0, "Use 15 slots\n");</div><div class='add'>+</div><div class='add'>+	futex_hash_slots_set_verify(2);</div><div class='add'>+	join_max_threads();</div><div class='add'>+	ksft_test_result(counter == MAX_THREADS, "Created and waited for %d of %d threads\n",</div><div class='add'>+			 counter, MAX_THREADS);</div><div class='add'>+	counter = 0;</div><div class='add'>+	/* Once the user set something, auto resize must be disabled */</div><div class='add'>+	ret = pthread_barrier_init(&amp;barrier_main, NULL, MAX_THREADS);</div><div class='add'>+</div><div class='add'>+	create_max_threads(thread_lock_fn);</div><div class='add'>+	join_max_threads();</div><div class='add'>+</div><div class='add'>+	ret = futex_hash_slots_get();</div><div class='add'>+	ksft_test_result(ret == 2, "No more auto-resize after manual setting, got %d\n",</div><div class='add'>+			 ret);</div><div class='add'>+</div><div class='add'>+	futex_hash_slots_set_must_fail(1 &lt;&lt; 29);</div><div class='add'>+	futex_hash_slots_set_verify(4);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Once the global hash has been requested, then this requested can not</div><div class='add'>+	 * be undone.</div><div class='add'>+	 */</div><div class='add'>+	ret = futex_hash_slots_set(0);</div><div class='add'>+	ksft_test_result(ret == 0, "Global hash request\n");</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	futex_hash_slots_set_must_fail(4);</div><div class='add'>+	futex_hash_slots_set_must_fail(8);</div><div class='add'>+	futex_hash_slots_set_must_fail(8);</div><div class='add'>+	futex_hash_slots_set_must_fail(0);</div><div class='add'>+	futex_hash_slots_set_must_fail(6);</div><div class='add'>+</div><div class='add'>+	ret = pthread_barrier_init(&amp;barrier_main, NULL, MAX_THREADS);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		ksft_exit_fail_msg("pthread_barrier_init failed: %m\n");</div><div class='add'>+</div><div class='add'>+	create_max_threads(thread_lock_fn);</div><div class='add'>+	join_max_threads();</div><div class='add'>+</div><div class='add'>+	ret = futex_hash_slots_get();</div><div class='add'>+	ksft_test_result(ret == 0, "Continue to use global hash\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_requeue.c b/tools/testing/selftests/futex/functional/futex_requeue.c<br/>index 51485be6eb2f..35d4be23db5d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_requeue.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_requeue.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_requeue.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_requeue.c</a></div><div class='hunk'>@@ -7,24 +7,15 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;pthread.h&gt;</div><div class='ctx'> #include &lt;limits.h&gt;</div><div class='del'>-#include "logging.h"</div><div class='add'>+</div><div class='ctx'> #include "futextest.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='del'>-#define TEST_NAME "futex-requeue"</div><div class='ctx'> #define timeout_ns  30000000</div><div class='ctx'> #define WAKE_WAIT_US 10000</div><div class='ctx'> </div><div class='ctx'> volatile futex_t *f1;</div><div class='ctx'> </div><div class='del'>-void usage(char *prog)</div><div class='del'>-{</div><div class='del'>-	printf("Usage: %s\n", prog);</div><div class='del'>-	printf("  -c	Use color\n");</div><div class='del'>-	printf("  -h	Display this help message\n");</div><div class='del'>-	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",</div><div class='del'>-	       VQUIET, VCRITICAL, VINFO);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void *waiterfn(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct timespec to;</div><div class='hunk'>@@ -38,67 +29,49 @@ void *waiterfn(void *arg)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int main(int argc, char *argv[])</div><div class='add'>+TEST(requeue_single)</div><div class='ctx'> {</div><div class='del'>-	pthread_t waiter[10];</div><div class='del'>-	int res, ret = RET_PASS;</div><div class='del'>-	int c, i;</div><div class='ctx'> 	volatile futex_t _f1 = 0;</div><div class='ctx'> 	volatile futex_t f2 = 0;</div><div class='add'>+	pthread_t waiter[10];</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	f1 = &amp;_f1;</div><div class='ctx'> </div><div class='del'>-	while ((c = getopt(argc, argv, "cht:v:")) != -1) {</div><div class='del'>-		switch (c) {</div><div class='del'>-		case 'c':</div><div class='del'>-			log_color(1);</div><div class='del'>-			break;</div><div class='del'>-		case 'h':</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(0);</div><div class='del'>-		case 'v':</div><div class='del'>-			log_verbosity(atoi(optarg));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ksft_print_header();</div><div class='del'>-	ksft_set_plan(2);</div><div class='del'>-	ksft_print_msg("%s: Test futex_requeue\n",</div><div class='del'>-		       basename(argv[0]));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Requeue a waiter from f1 to f2, and wake f2.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pthread_create(&amp;waiter[0], NULL, waiterfn, NULL))</div><div class='del'>-		error("pthread_create failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("pthread_create failed\n");</div><div class='ctx'> </div><div class='ctx'> 	usleep(WAKE_WAIT_US);</div><div class='ctx'> </div><div class='del'>-	info("Requeuing 1 futex from f1 to f2\n");</div><div class='add'>+	ksft_print_dbg_msg("Requeuing 1 futex from f1 to f2\n");</div><div class='ctx'> 	res = futex_cmp_requeue(f1, 0, &amp;f2, 0, 1, 0);</div><div class='del'>-	if (res != 1) {</div><div class='add'>+	if (res != 1)</div><div class='ctx'> 		ksft_test_result_fail("futex_requeue simple returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	info("Waking 1 futex at f2\n");</div><div class='add'>+	ksft_print_dbg_msg("Waking 1 futex at f2\n");</div><div class='ctx'> 	res = futex_wake(&amp;f2, 1, 0);</div><div class='ctx'> 	if (res != 1) {</div><div class='ctx'> 		ksft_test_result_fail("futex_requeue simple returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_requeue simple succeeds\n");</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(requeue_multiple)</div><div class='add'>+{</div><div class='add'>+	volatile futex_t _f1 = 0;</div><div class='add'>+	volatile futex_t f2 = 0;</div><div class='add'>+	pthread_t waiter[10];</div><div class='add'>+	int res, i;</div><div class='ctx'> </div><div class='add'>+	f1 = &amp;_f1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create 10 waiters at f1. At futex_requeue, wake 3 and requeue 7.</div><div class='hunk'>@@ -106,31 +79,28 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; 10; i++) {</div><div class='ctx'> 		if (pthread_create(&amp;waiter[i], NULL, waiterfn, NULL))</div><div class='del'>-			error("pthread_create failed\n", errno);</div><div class='add'>+			ksft_exit_fail_msg("pthread_create failed\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	usleep(WAKE_WAIT_US);</div><div class='ctx'> </div><div class='del'>-	info("Waking 3 futexes at f1 and requeuing 7 futexes from f1 to f2\n");</div><div class='add'>+	ksft_print_dbg_msg("Waking 3 futexes at f1 and requeuing 7 futexes from f1 to f2\n");</div><div class='ctx'> 	res = futex_cmp_requeue(f1, 0, &amp;f2, 3, 7, 0);</div><div class='ctx'> 	if (res != 10) {</div><div class='ctx'> 		ksft_test_result_fail("futex_requeue many returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("Waking INT_MAX futexes at f2\n");</div><div class='add'>+	ksft_print_dbg_msg("Waking INT_MAX futexes at f2\n");</div><div class='ctx'> 	res = futex_wake(&amp;f2, INT_MAX, 0);</div><div class='ctx'> 	if (res != 7) {</div><div class='ctx'> 		ksft_test_result_fail("futex_requeue many returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_requeue many succeeds\n");</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ksft_print_cnts();</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi.c b/tools/testing/selftests/futex/functional/futex_requeue_pi.c<br/>index 215c6cb539b4..46d2858e15a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_requeue_pi.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_requeue_pi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_requeue_pi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_requeue_pi.c</a></div><div class='hunk'>@@ -26,11 +26,11 @@</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;signal.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "atomic.h"</div><div class='ctx'> #include "futextest.h"</div><div class='del'>-#include "logging.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='del'>-#define TEST_NAME "futex-requeue-pi"</div><div class='ctx'> #define MAX_WAKE_ITERS 1000</div><div class='ctx'> #define THREAD_MAX 10</div><div class='ctx'> #define SIGNAL_PERIOD_US 100</div><div class='hunk'>@@ -42,12 +42,6 @@ futex_t f1 = FUTEX_INITIALIZER;</div><div class='ctx'> futex_t f2 = FUTEX_INITIALIZER;</div><div class='ctx'> futex_t wake_complete = FUTEX_INITIALIZER;</div><div class='ctx'> </div><div class='del'>-/* Test option defaults */</div><div class='del'>-static long timeout_ns;</div><div class='del'>-static int broadcast;</div><div class='del'>-static int owner;</div><div class='del'>-static int locked;</div><div class='del'>-</div><div class='ctx'> struct thread_arg {</div><div class='ctx'> 	long id;</div><div class='ctx'> 	struct timespec *timeout;</div><div class='hunk'>@@ -56,18 +50,73 @@ struct thread_arg {</div><div class='ctx'> };</div><div class='ctx'> #define THREAD_ARG_INITIALIZER { 0, NULL, 0, 0 }</div><div class='ctx'> </div><div class='del'>-void usage(char *prog)</div><div class='add'>+FIXTURE(args)</div><div class='ctx'> {</div><div class='del'>-	printf("Usage: %s\n", prog);</div><div class='del'>-	printf("  -b	Broadcast wakeup (all waiters)\n");</div><div class='del'>-	printf("  -c	Use color\n");</div><div class='del'>-	printf("  -h	Display this help message\n");</div><div class='del'>-	printf("  -l	Lock the pi futex across requeue\n");</div><div class='del'>-	printf("  -o	Use a third party pi futex owner during requeue (cancels -l)\n");</div><div class='del'>-	printf("  -t N	Timeout in nanoseconds (default: 0)\n");</div><div class='del'>-	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",</div><div class='del'>-	       VQUIET, VCRITICAL, VINFO);</div><div class='del'>-}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(args)</div><div class='add'>+{</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(args)</div><div class='add'>+{</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT(args)</div><div class='add'>+{</div><div class='add'>+	long timeout_ns;</div><div class='add'>+	bool broadcast;</div><div class='add'>+	bool owner;</div><div class='add'>+	bool locked;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For a given timeout value, this macro creates a test input with all the</div><div class='add'>+ * possible combinations of valid arguments</div><div class='add'>+ */</div><div class='add'>+#define FIXTURE_VARIANT_ADD_TIMEOUT(timeout)		\</div><div class='add'>+							\</div><div class='add'>+FIXTURE_VARIANT_ADD(args, t_##timeout)			\</div><div class='add'>+{							\</div><div class='add'>+	.timeout_ns = timeout,				\</div><div class='add'>+};							\</div><div class='add'>+							\</div><div class='add'>+FIXTURE_VARIANT_ADD(args, t_##timeout##_broadcast)	\</div><div class='add'>+{							\</div><div class='add'>+	.timeout_ns = timeout,				\</div><div class='add'>+	.broadcast = true,				\</div><div class='add'>+};							\</div><div class='add'>+							\</div><div class='add'>+FIXTURE_VARIANT_ADD(args, t_##timeout##_broadcast_locked) \</div><div class='add'>+{							\</div><div class='add'>+	.timeout_ns = timeout,				\</div><div class='add'>+	.broadcast = true,				\</div><div class='add'>+	.locked = true,					\</div><div class='add'>+};							\</div><div class='add'>+							\</div><div class='add'>+FIXTURE_VARIANT_ADD(args, t_##timeout##_broadcast_owner) \</div><div class='add'>+{							\</div><div class='add'>+	.timeout_ns = timeout,				\</div><div class='add'>+	.broadcast = true,				\</div><div class='add'>+	.owner = true,					\</div><div class='add'>+};							\</div><div class='add'>+							\</div><div class='add'>+FIXTURE_VARIANT_ADD(args, t_##timeout##_locked)		\</div><div class='add'>+{							\</div><div class='add'>+	.timeout_ns = timeout,				\</div><div class='add'>+	.locked = true,					\</div><div class='add'>+};							\</div><div class='add'>+							\</div><div class='add'>+FIXTURE_VARIANT_ADD(args, t_##timeout##_owner)		\</div><div class='add'>+{							\</div><div class='add'>+	.timeout_ns = timeout,				\</div><div class='add'>+	.owner = true,					\</div><div class='add'>+};							\</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT_ADD_TIMEOUT(0);</div><div class='add'>+FIXTURE_VARIANT_ADD_TIMEOUT(5000);</div><div class='add'>+FIXTURE_VARIANT_ADD_TIMEOUT(500000);</div><div class='add'>+FIXTURE_VARIANT_ADD_TIMEOUT(2000000000);</div><div class='ctx'> </div><div class='ctx'> int create_rt_thread(pthread_t *pth, void*(*func)(void *), void *arg,</div><div class='ctx'> 		     int policy, int prio)</div><div class='hunk'>@@ -81,26 +130,26 @@ int create_rt_thread(pthread_t *pth, void*(*func)(void *), void *arg,</div><div class='ctx'> </div><div class='ctx'> 	ret = pthread_attr_setinheritsched(&amp;attr, PTHREAD_EXPLICIT_SCHED);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		error("pthread_attr_setinheritsched\n", ret);</div><div class='add'>+		ksft_exit_fail_msg("pthread_attr_setinheritsched\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = pthread_attr_setschedpolicy(&amp;attr, policy);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		error("pthread_attr_setschedpolicy\n", ret);</div><div class='add'>+		ksft_exit_fail_msg("pthread_attr_setschedpolicy\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	schedp.sched_priority = prio;</div><div class='ctx'> 	ret = pthread_attr_setschedparam(&amp;attr, &amp;schedp);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		error("pthread_attr_setschedparam\n", ret);</div><div class='add'>+		ksft_exit_fail_msg("pthread_attr_setschedparam\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = pthread_create(pth, &amp;attr, func, arg);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		error("pthread_create\n", ret);</div><div class='add'>+		ksft_exit_fail_msg("pthread_create\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -112,7 +161,7 @@ void *waiterfn(void *arg)</div><div class='ctx'> 	struct thread_arg *args = (struct thread_arg *)arg;</div><div class='ctx'> 	futex_t old_val;</div><div class='ctx'> </div><div class='del'>-	info("Waiter %ld: running\n", args-&gt;id);</div><div class='add'>+	ksft_print_dbg_msg("Waiter %ld: running\n", args-&gt;id);</div><div class='ctx'> 	/* Each thread sleeps for a different amount of time</div><div class='ctx'> 	 * This is to avoid races, because we don't lock the</div><div class='ctx'> 	 * external mutex here */</div><div class='hunk'>@@ -120,26 +169,25 @@ void *waiterfn(void *arg)</div><div class='ctx'> </div><div class='ctx'> 	old_val = f1;</div><div class='ctx'> 	atomic_inc(&amp;waiters_blocked);</div><div class='del'>-	info("Calling futex_wait_requeue_pi: %p (%u) -&gt; %p\n",</div><div class='add'>+	ksft_print_dbg_msg("Calling futex_wait_requeue_pi: %p (%u) -&gt; %p\n",</div><div class='ctx'> 	     &amp;f1, f1, &amp;f2);</div><div class='ctx'> 	args-&gt;ret = futex_wait_requeue_pi(&amp;f1, old_val, &amp;f2, args-&gt;timeout,</div><div class='ctx'> 					  FUTEX_PRIVATE_FLAG);</div><div class='ctx'> </div><div class='del'>-	info("waiter %ld woke with %d %s\n", args-&gt;id, args-&gt;ret,</div><div class='add'>+	ksft_print_dbg_msg("waiter %ld woke with %d %s\n", args-&gt;id, args-&gt;ret,</div><div class='ctx'> 	     args-&gt;ret &lt; 0 ? strerror(errno) : "");</div><div class='ctx'> 	atomic_inc(&amp;waiters_woken);</div><div class='ctx'> 	if (args-&gt;ret &lt; 0) {</div><div class='ctx'> 		if (args-&gt;timeout &amp;&amp; errno == ETIMEDOUT)</div><div class='ctx'> 			args-&gt;ret = 0;</div><div class='ctx'> 		else {</div><div class='del'>-			args-&gt;ret = RET_ERROR;</div><div class='del'>-			error("futex_wait_requeue_pi\n", errno);</div><div class='add'>+			ksft_exit_fail_msg("futex_wait_requeue_pi\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		futex_lock_pi(&amp;f2, NULL, 0, FUTEX_PRIVATE_FLAG);</div><div class='ctx'> 	}</div><div class='ctx'> 	futex_unlock_pi(&amp;f2, FUTEX_PRIVATE_FLAG);</div><div class='ctx'> </div><div class='del'>-	info("Waiter %ld: exiting with %d\n", args-&gt;id, args-&gt;ret);</div><div class='add'>+	ksft_print_dbg_msg("Waiter %ld: exiting with %d\n", args-&gt;id, args-&gt;ret);</div><div class='ctx'> 	pthread_exit((void *)&amp;args-&gt;ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -152,14 +200,14 @@ void *broadcast_wakerfn(void *arg)</div><div class='ctx'> 	int nr_wake = 1;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	info("Waker: waiting for waiters to block\n");</div><div class='add'>+	ksft_print_dbg_msg("Waker: waiting for waiters to block\n");</div><div class='ctx'> 	while (waiters_blocked.val &lt; THREAD_MAX)</div><div class='ctx'> 		usleep(1000);</div><div class='ctx'> 	usleep(1000);</div><div class='ctx'> </div><div class='del'>-	info("Waker: Calling broadcast\n");</div><div class='add'>+	ksft_print_dbg_msg("Waker: Calling broadcast\n");</div><div class='ctx'> 	if (args-&gt;lock) {</div><div class='del'>-		info("Calling FUTEX_LOCK_PI on mutex=%x @ %p\n", f2, &amp;f2);</div><div class='add'>+		ksft_print_dbg_msg("Calling FUTEX_LOCK_PI on mutex=%x @ %p\n", f2, &amp;f2);</div><div class='ctx'> 		futex_lock_pi(&amp;f2, NULL, 0, FUTEX_PRIVATE_FLAG);</div><div class='ctx'> 	}</div><div class='ctx'>  continue_requeue:</div><div class='hunk'>@@ -167,16 +215,14 @@ void *broadcast_wakerfn(void *arg)</div><div class='ctx'> 	args-&gt;ret = futex_cmp_requeue_pi(&amp;f1, old_val, &amp;f2, nr_wake, nr_requeue,</div><div class='ctx'> 				   FUTEX_PRIVATE_FLAG);</div><div class='ctx'> 	if (args-&gt;ret &lt; 0) {</div><div class='del'>-		args-&gt;ret = RET_ERROR;</div><div class='del'>-		error("FUTEX_CMP_REQUEUE_PI failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("FUTEX_CMP_REQUEUE_PI failed\n");</div><div class='ctx'> 	} else if (++i &lt; MAX_WAKE_ITERS) {</div><div class='ctx'> 		task_count += args-&gt;ret;</div><div class='ctx'> 		if (task_count &lt; THREAD_MAX - waiters_woken.val)</div><div class='ctx'> 			goto continue_requeue;</div><div class='ctx'> 	} else {</div><div class='del'>-		error("max broadcast iterations (%d) reached with %d/%d tasks woken or requeued\n",</div><div class='del'>-		       0, MAX_WAKE_ITERS, task_count, THREAD_MAX);</div><div class='del'>-		args-&gt;ret = RET_ERROR;</div><div class='add'>+		ksft_exit_fail_msg("max broadcast iterations (%d) reached with %d/%d tasks woken or requeued\n",</div><div class='add'>+		       MAX_WAKE_ITERS, task_count, THREAD_MAX);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	futex_wake(&amp;wake_complete, 1, FUTEX_PRIVATE_FLAG);</div><div class='hunk'>@@ -187,7 +233,7 @@ void *broadcast_wakerfn(void *arg)</div><div class='ctx'> 	if (args-&gt;ret &gt; 0)</div><div class='ctx'> 		args-&gt;ret = task_count;</div><div class='ctx'> </div><div class='del'>-	info("Waker: exiting with %d\n", args-&gt;ret);</div><div class='add'>+	ksft_print_dbg_msg("Waker: exiting with %d\n", args-&gt;ret);</div><div class='ctx'> 	pthread_exit((void *)&amp;args-&gt;ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -200,20 +246,20 @@ void *signal_wakerfn(void *arg)</div><div class='ctx'> 	int nr_wake = 1;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	info("Waker: waiting for waiters to block\n");</div><div class='add'>+	ksft_print_dbg_msg("Waker: waiting for waiters to block\n");</div><div class='ctx'> 	while (waiters_blocked.val &lt; THREAD_MAX)</div><div class='ctx'> 		usleep(1000);</div><div class='ctx'> 	usleep(1000);</div><div class='ctx'> </div><div class='ctx'> 	while (task_count &lt; THREAD_MAX &amp;&amp; waiters_woken.val &lt; THREAD_MAX) {</div><div class='del'>-		info("task_count: %d, waiters_woken: %d\n",</div><div class='add'>+		ksft_print_dbg_msg("task_count: %d, waiters_woken: %d\n",</div><div class='ctx'> 		     task_count, waiters_woken.val);</div><div class='ctx'> 		if (args-&gt;lock) {</div><div class='del'>-			info("Calling FUTEX_LOCK_PI on mutex=%x @ %p\n",</div><div class='del'>-			     f2, &amp;f2);</div><div class='add'>+			ksft_print_dbg_msg("Calling FUTEX_LOCK_PI on mutex=%x @ %p\n",</div><div class='add'>+			    f2, &amp;f2);</div><div class='ctx'> 			futex_lock_pi(&amp;f2, NULL, 0, FUTEX_PRIVATE_FLAG);</div><div class='ctx'> 		}</div><div class='del'>-		info("Waker: Calling signal\n");</div><div class='add'>+		ksft_print_dbg_msg("Waker: Calling signal\n");</div><div class='ctx'> 		/* cond_signal */</div><div class='ctx'> 		old_val = f1;</div><div class='ctx'> 		args-&gt;ret = futex_cmp_requeue_pi(&amp;f1, old_val, &amp;f2,</div><div class='hunk'>@@ -221,28 +267,23 @@ void *signal_wakerfn(void *arg)</div><div class='ctx'> 						 FUTEX_PRIVATE_FLAG);</div><div class='ctx'> 		if (args-&gt;ret &lt; 0)</div><div class='ctx'> 			args-&gt;ret = -errno;</div><div class='del'>-		info("futex: %x\n", f2);</div><div class='add'>+		ksft_print_dbg_msg("futex: %x\n", f2);</div><div class='ctx'> 		if (args-&gt;lock) {</div><div class='del'>-			info("Calling FUTEX_UNLOCK_PI on mutex=%x @ %p\n",</div><div class='del'>-			     f2, &amp;f2);</div><div class='add'>+			ksft_print_dbg_msg("Calling FUTEX_UNLOCK_PI on mutex=%x @ %p\n",</div><div class='add'>+			    f2, &amp;f2);</div><div class='ctx'> 			futex_unlock_pi(&amp;f2, FUTEX_PRIVATE_FLAG);</div><div class='ctx'> 		}</div><div class='del'>-		info("futex: %x\n", f2);</div><div class='del'>-		if (args-&gt;ret &lt; 0) {</div><div class='del'>-			error("FUTEX_CMP_REQUEUE_PI failed\n", errno);</div><div class='del'>-			args-&gt;ret = RET_ERROR;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		ksft_print_dbg_msg("futex: %x\n", f2);</div><div class='add'>+		if (args-&gt;ret &lt; 0)</div><div class='add'>+			ksft_exit_fail_msg("FUTEX_CMP_REQUEUE_PI failed\n");</div><div class='ctx'> </div><div class='ctx'> 		task_count += args-&gt;ret;</div><div class='ctx'> 		usleep(SIGNAL_PERIOD_US);</div><div class='ctx'> 		i++;</div><div class='ctx'> 		/* we have to loop at least THREAD_MAX times */</div><div class='ctx'> 		if (i &gt; MAX_WAKE_ITERS + THREAD_MAX) {</div><div class='del'>-			error("max signaling iterations (%d) reached, giving up on pending waiters.\n",</div><div class='del'>-			      0, MAX_WAKE_ITERS + THREAD_MAX);</div><div class='del'>-			args-&gt;ret = RET_ERROR;</div><div class='del'>-			break;</div><div class='add'>+			ksft_exit_fail_msg("max signaling iterations (%d) reached, giving up on pending waiters.\n",</div><div class='add'>+			      MAX_WAKE_ITERS + THREAD_MAX);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -251,8 +292,8 @@ void *signal_wakerfn(void *arg)</div><div class='ctx'> 	if (args-&gt;ret &gt;= 0)</div><div class='ctx'> 		args-&gt;ret = task_count;</div><div class='ctx'> </div><div class='del'>-	info("Waker: exiting with %d\n", args-&gt;ret);</div><div class='del'>-	info("Waker: waiters_woken: %d\n", waiters_woken.val);</div><div class='add'>+	ksft_print_dbg_msg("Waker: exiting with %d\n", args-&gt;ret);</div><div class='add'>+	ksft_print_dbg_msg("Waker: waiters_woken: %d\n", waiters_woken.val);</div><div class='ctx'> 	pthread_exit((void *)&amp;args-&gt;ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -269,35 +310,40 @@ void *third_party_blocker(void *arg)</div><div class='ctx'> 	ret2 = futex_unlock_pi(&amp;f2, FUTEX_PRIVATE_FLAG);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	if (args-&gt;ret || ret2) {</div><div class='del'>-		error("third_party_blocker() futex error", 0);</div><div class='del'>-		args-&gt;ret = RET_ERROR;</div><div class='del'>-	}</div><div class='add'>+	if (args-&gt;ret || ret2)</div><div class='add'>+		ksft_exit_fail_msg("third_party_blocker() futex error");</div><div class='ctx'> </div><div class='ctx'> 	pthread_exit((void *)&amp;args-&gt;ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int unit_test(int broadcast, long lock, int third_party_owner, long timeout_ns)</div><div class='add'>+TEST_F(args, futex_requeue_pi)</div><div class='ctx'> {</div><div class='del'>-	void *(*wakerfn)(void *) = signal_wakerfn;</div><div class='ctx'> 	struct thread_arg blocker_arg = THREAD_ARG_INITIALIZER;</div><div class='ctx'> 	struct thread_arg waker_arg = THREAD_ARG_INITIALIZER;</div><div class='ctx'> 	pthread_t waiter[THREAD_MAX], waker, blocker;</div><div class='del'>-	struct timespec ts, *tsp = NULL;</div><div class='add'>+	void *(*wakerfn)(void *) = signal_wakerfn;</div><div class='add'>+	bool third_party_owner = variant-&gt;owner;</div><div class='add'>+	long timeout_ns = variant-&gt;timeout_ns;</div><div class='add'>+	bool broadcast = variant-&gt;broadcast;</div><div class='ctx'> 	struct thread_arg args[THREAD_MAX];</div><div class='del'>-	int *waiter_ret;</div><div class='del'>-	int i, ret = RET_PASS;</div><div class='add'>+	struct timespec ts, *tsp = NULL;</div><div class='add'>+	bool lock = variant-&gt;locked;</div><div class='add'>+	int *waiter_ret, i, ret = 0;</div><div class='add'>+</div><div class='add'>+	ksft_print_msg(</div><div class='add'>+		"\tArguments: broadcast=%d locked=%d owner=%d timeout=%ldns\n",</div><div class='add'>+		broadcast, lock, third_party_owner, timeout_ns);</div><div class='ctx'> </div><div class='ctx'> 	if (timeout_ns) {</div><div class='ctx'> 		time_t secs;</div><div class='ctx'> </div><div class='del'>-		info("timeout_ns = %ld\n", timeout_ns);</div><div class='add'>+		ksft_print_dbg_msg("timeout_ns = %ld\n", timeout_ns);</div><div class='ctx'> 		ret = clock_gettime(CLOCK_MONOTONIC, &amp;ts);</div><div class='ctx'> 		secs = (ts.tv_nsec + timeout_ns) / 1000000000;</div><div class='ctx'> 		ts.tv_nsec = ((int64_t)ts.tv_nsec + timeout_ns) % 1000000000;</div><div class='ctx'> 		ts.tv_sec += secs;</div><div class='del'>-		info("ts.tv_sec  = %ld\n", ts.tv_sec);</div><div class='del'>-		info("ts.tv_nsec = %ld\n", ts.tv_nsec);</div><div class='add'>+		ksft_print_dbg_msg("ts.tv_sec  = %ld\n", ts.tv_sec);</div><div class='add'>+		ksft_print_dbg_msg("ts.tv_nsec = %ld\n", ts.tv_nsec);</div><div class='ctx'> 		tsp = &amp;ts;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -307,10 +353,7 @@ int unit_test(int broadcast, long lock, int third_party_owner, long timeout_ns)</div><div class='ctx'> 	if (third_party_owner) {</div><div class='ctx'> 		if (create_rt_thread(&amp;blocker, third_party_blocker,</div><div class='ctx'> 				     (void *)&amp;blocker_arg, SCHED_FIFO, 1)) {</div><div class='del'>-			error("Creating third party blocker thread failed\n",</div><div class='del'>-			      errno);</div><div class='del'>-			ret = RET_ERROR;</div><div class='del'>-			goto out;</div><div class='add'>+			ksft_exit_fail_msg("Creating third party blocker thread failed\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -318,20 +361,16 @@ int unit_test(int broadcast, long lock, int third_party_owner, long timeout_ns)</div><div class='ctx'> 	for (i = 0; i &lt; THREAD_MAX; i++) {</div><div class='ctx'> 		args[i].id = i;</div><div class='ctx'> 		args[i].timeout = tsp;</div><div class='del'>-		info("Starting thread %d\n", i);</div><div class='add'>+		ksft_print_dbg_msg("Starting thread %d\n", i);</div><div class='ctx'> 		if (create_rt_thread(&amp;waiter[i], waiterfn, (void *)&amp;args[i],</div><div class='ctx'> 				     SCHED_FIFO, 1)) {</div><div class='del'>-			error("Creating waiting thread failed\n", errno);</div><div class='del'>-			ret = RET_ERROR;</div><div class='del'>-			goto out;</div><div class='add'>+			ksft_exit_fail_msg("Creating waiting thread failed\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	waker_arg.lock = lock;</div><div class='ctx'> 	if (create_rt_thread(&amp;waker, wakerfn, (void *)&amp;waker_arg,</div><div class='ctx'> 			     SCHED_FIFO, 1)) {</div><div class='del'>-		error("Creating waker thread failed\n", errno);</div><div class='del'>-		ret = RET_ERROR;</div><div class='del'>-		goto out;</div><div class='add'>+		ksft_exit_fail_msg("Creating waker thread failed\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for threads to finish */</div><div class='hunk'>@@ -345,7 +384,6 @@ int unit_test(int broadcast, long lock, int third_party_owner, long timeout_ns)</div><div class='ctx'> 		pthread_join(blocker, NULL);</div><div class='ctx'> 	pthread_join(waker, NULL);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		if (*waiter_ret)</div><div class='ctx'> 			ret = *waiter_ret;</div><div class='hunk'>@@ -355,66 +393,8 @@ out:</div><div class='ctx'> 			ret = blocker_arg.ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	if (ret)</div><div class='add'>+		ksft_test_result_fail("fail");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int main(int argc, char *argv[])</div><div class='del'>-{</div><div class='del'>-	char *test_name;</div><div class='del'>-	int c, ret;</div><div class='del'>-</div><div class='del'>-	while ((c = getopt(argc, argv, "bchlot:v:")) != -1) {</div><div class='del'>-		switch (c) {</div><div class='del'>-		case 'b':</div><div class='del'>-			broadcast = 1;</div><div class='del'>-			break;</div><div class='del'>-		case 'c':</div><div class='del'>-			log_color(1);</div><div class='del'>-			break;</div><div class='del'>-		case 'h':</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(0);</div><div class='del'>-		case 'l':</div><div class='del'>-			locked = 1;</div><div class='del'>-			break;</div><div class='del'>-		case 'o':</div><div class='del'>-			owner = 1;</div><div class='del'>-			locked = 0;</div><div class='del'>-			break;</div><div class='del'>-		case 't':</div><div class='del'>-			timeout_ns = atoi(optarg);</div><div class='del'>-			break;</div><div class='del'>-		case 'v':</div><div class='del'>-			log_verbosity(atoi(optarg));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ksft_print_header();</div><div class='del'>-	ksft_set_plan(1);</div><div class='del'>-	ksft_print_msg("%s: Test requeue functionality\n", basename(argv[0]));</div><div class='del'>-	ksft_print_msg(</div><div class='del'>-		"\tArguments: broadcast=%d locked=%d owner=%d timeout=%ldns\n",</div><div class='del'>-		broadcast, locked, owner, timeout_ns);</div><div class='del'>-</div><div class='del'>-	ret = asprintf(&amp;test_name,</div><div class='del'>-		       "%s broadcast=%d locked=%d owner=%d timeout=%ldns",</div><div class='del'>-		       TEST_NAME, broadcast, locked, owner, timeout_ns);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		ksft_print_msg("Failed to generate test name\n");</div><div class='del'>-		test_name = TEST_NAME;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: unit_test is obsolete now that we parse options and the</div><div class='del'>-	 * various style of runs are done by run.sh - simplify the code and move</div><div class='del'>-	 * unit_test into main()</div><div class='del'>-	 */</div><div class='del'>-	ret = unit_test(broadcast, locked, owner, timeout_ns);</div><div class='del'>-</div><div class='del'>-	print_result(test_name, ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c b/tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c<br/>index d0a4d332ea44..f686e605359c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c</a></div><div class='hunk'>@@ -23,67 +23,32 @@</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;time.h&gt;</div><div class='del'>-#include "futextest.h"</div><div class='del'>-#include "logging.h"</div><div class='ctx'> </div><div class='del'>-#define TEST_NAME "futex-requeue-pi-mismatched-ops"</div><div class='add'>+#include "futextest.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> futex_t f1 = FUTEX_INITIALIZER;</div><div class='ctx'> futex_t f2 = FUTEX_INITIALIZER;</div><div class='ctx'> int child_ret = 0;</div><div class='ctx'> </div><div class='del'>-void usage(char *prog)</div><div class='del'>-{</div><div class='del'>-	printf("Usage: %s\n", prog);</div><div class='del'>-	printf("  -c	Use color\n");</div><div class='del'>-	printf("  -h	Display this help message\n");</div><div class='del'>-	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",</div><div class='del'>-	       VQUIET, VCRITICAL, VINFO);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void *blocking_child(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	child_ret = futex_wait(&amp;f1, f1, NULL, FUTEX_PRIVATE_FLAG);</div><div class='ctx'> 	if (child_ret &lt; 0) {</div><div class='ctx'> 		child_ret = -errno;</div><div class='del'>-		error("futex_wait\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("futex_wait\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	return (void *)&amp;child_ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int main(int argc, char *argv[])</div><div class='add'>+TEST(requeue_pi_mismatched_ops)</div><div class='ctx'> {</div><div class='del'>-	int ret = RET_PASS;</div><div class='ctx'> 	pthread_t child;</div><div class='del'>-	int c;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	while ((c = getopt(argc, argv, "chv:")) != -1) {</div><div class='del'>-		switch (c) {</div><div class='del'>-		case 'c':</div><div class='del'>-			log_color(1);</div><div class='del'>-			break;</div><div class='del'>-		case 'h':</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(0);</div><div class='del'>-		case 'v':</div><div class='del'>-			log_verbosity(atoi(optarg));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ksft_print_header();</div><div class='del'>-	ksft_set_plan(1);</div><div class='del'>-	ksft_print_msg("%s: Detect mismatched requeue_pi operations\n",</div><div class='del'>-	       basename(argv[0]));</div><div class='add'>+	if (pthread_create(&amp;child, NULL, blocking_child, NULL))</div><div class='add'>+		ksft_exit_fail_msg("pthread_create\n");</div><div class='ctx'> </div><div class='del'>-	if (pthread_create(&amp;child, NULL, blocking_child, NULL)) {</div><div class='del'>-		error("pthread_create\n", errno);</div><div class='del'>-		ret = RET_ERROR;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> 	/* Allow the child to block in the kernel. */</div><div class='ctx'> 	sleep(1);</div><div class='ctx'> </div><div class='hunk'>@@ -102,34 +67,27 @@ int main(int argc, char *argv[])</div><div class='ctx'> 			 * FUTEX_WAKE.</div><div class='ctx'> 			 */</div><div class='ctx'> 			ret = futex_wake(&amp;f1, 1, FUTEX_PRIVATE_FLAG);</div><div class='del'>-			if (ret == 1) {</div><div class='del'>-				ret = RET_PASS;</div><div class='del'>-			} else if (ret &lt; 0) {</div><div class='del'>-				error("futex_wake\n", errno);</div><div class='del'>-				ret = RET_ERROR;</div><div class='del'>-			} else {</div><div class='del'>-				error("futex_wake did not wake the child\n", 0);</div><div class='del'>-				ret = RET_ERROR;</div><div class='del'>-			}</div><div class='add'>+			if (ret == 1)</div><div class='add'>+				ret = 0;</div><div class='add'>+			else if (ret &lt; 0)</div><div class='add'>+				ksft_exit_fail_msg("futex_wake\n");</div><div class='add'>+			else</div><div class='add'>+				ksft_exit_fail_msg("futex_wake did not wake the child\n");</div><div class='ctx'> 		} else {</div><div class='del'>-			error("futex_cmp_requeue_pi\n", errno);</div><div class='del'>-			ret = RET_ERROR;</div><div class='add'>+			ksft_exit_fail_msg("futex_cmp_requeue_pi\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (ret &gt; 0) {</div><div class='del'>-		fail("futex_cmp_requeue_pi failed to detect the mismatch\n");</div><div class='del'>-		ret = RET_FAIL;</div><div class='add'>+		ksft_test_result_fail("futex_cmp_requeue_pi failed to detect the mismatch\n");</div><div class='ctx'> 	} else {</div><div class='del'>-		error("futex_cmp_requeue_pi found no waiters\n", 0);</div><div class='del'>-		ret = RET_ERROR;</div><div class='add'>+		ksft_exit_fail_msg("futex_cmp_requeue_pi found no waiters\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pthread_join(child, NULL);</div><div class='ctx'> </div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = child_ret;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	/* If the kernel crashes, we shouldn't return at all. */</div><div class='del'>-	print_result(TEST_NAME, ret);</div><div class='del'>-	return ret;</div><div class='add'>+	if (!ret &amp;&amp; !child_ret)</div><div class='add'>+		ksft_test_result_pass("futex_requeue_pi_mismatched_ops passed\n");</div><div class='add'>+	else</div><div class='add'>+		ksft_test_result_pass("futex_requeue_pi_mismatched_ops failed\n");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c b/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c<br/>index c6b8f32990c8..a18ccae73eb1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c</a></div><div class='hunk'>@@ -24,11 +24,11 @@</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "atomic.h"</div><div class='ctx'> #include "futextest.h"</div><div class='del'>-#include "logging.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='del'>-#define TEST_NAME "futex-requeue-pi-signal-restart"</div><div class='ctx'> #define DELAY_US 100</div><div class='ctx'> </div><div class='ctx'> futex_t f1 = FUTEX_INITIALIZER;</div><div class='hunk'>@@ -37,15 +37,6 @@ atomic_t requeued = ATOMIC_INITIALIZER;</div><div class='ctx'> </div><div class='ctx'> int waiter_ret = 0;</div><div class='ctx'> </div><div class='del'>-void usage(char *prog)</div><div class='del'>-{</div><div class='del'>-	printf("Usage: %s\n", prog);</div><div class='del'>-	printf("  -c	Use color\n");</div><div class='del'>-	printf("  -h	Display this help message\n");</div><div class='del'>-	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",</div><div class='del'>-	       VQUIET, VCRITICAL, VINFO);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int create_rt_thread(pthread_t *pth, void*(*func)(void *), void *arg,</div><div class='ctx'> 		     int policy, int prio)</div><div class='ctx'> {</div><div class='hunk'>@@ -57,35 +48,28 @@ int create_rt_thread(pthread_t *pth, void*(*func)(void *), void *arg,</div><div class='ctx'> 	memset(&amp;schedp, 0, sizeof(schedp));</div><div class='ctx'> </div><div class='ctx'> 	ret = pthread_attr_setinheritsched(&amp;attr, PTHREAD_EXPLICIT_SCHED);</div><div class='del'>-	if (ret) {</div><div class='del'>-		error("pthread_attr_setinheritsched\n", ret);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		ksft_exit_fail_msg("pthread_attr_setinheritsched\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = pthread_attr_setschedpolicy(&amp;attr, policy);</div><div class='del'>-	if (ret) {</div><div class='del'>-		error("pthread_attr_setschedpolicy\n", ret);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		ksft_exit_fail_msg("pthread_attr_setschedpolicy\n");</div><div class='ctx'> </div><div class='ctx'> 	schedp.sched_priority = prio;</div><div class='ctx'> 	ret = pthread_attr_setschedparam(&amp;attr, &amp;schedp);</div><div class='del'>-	if (ret) {</div><div class='del'>-		error("pthread_attr_setschedparam\n", ret);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		ksft_exit_fail_msg("pthread_attr_setschedparam\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = pthread_create(pth, &amp;attr, func, arg);</div><div class='del'>-	if (ret) {</div><div class='del'>-		error("pthread_create\n", ret);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		ksft_exit_fail_msg("pthread_create\n");</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void handle_signal(int signo)</div><div class='ctx'> {</div><div class='del'>-	info("signal received %s requeue\n",</div><div class='add'>+	ksft_print_dbg_msg("signal received %s requeue\n",</div><div class='ctx'> 	     requeued.val ? "after" : "prior to");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -94,78 +78,46 @@ void *waiterfn(void *arg)</div><div class='ctx'> 	unsigned int old_val;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	waiter_ret = RET_PASS;</div><div class='del'>-</div><div class='del'>-	info("Waiter running\n");</div><div class='del'>-	info("Calling FUTEX_LOCK_PI on f2=%x @ %p\n", f2, &amp;f2);</div><div class='add'>+	ksft_print_dbg_msg("Waiter running\n");</div><div class='add'>+	ksft_print_dbg_msg("Calling FUTEX_LOCK_PI on f2=%x @ %p\n", f2, &amp;f2);</div><div class='ctx'> 	old_val = f1;</div><div class='ctx'> 	res = futex_wait_requeue_pi(&amp;f1, old_val, &amp;(f2), NULL,</div><div class='ctx'> 				    FUTEX_PRIVATE_FLAG);</div><div class='ctx'> 	if (!requeued.val || errno != EWOULDBLOCK) {</div><div class='del'>-		fail("unexpected return from futex_wait_requeue_pi: %d (%s)\n",</div><div class='add'>+		ksft_test_result_fail("unexpected return from futex_wait_requeue_pi: %d (%s)\n",</div><div class='ctx'> 		     res, strerror(errno));</div><div class='del'>-		info("w2:futex: %x\n", f2);</div><div class='add'>+		ksft_print_dbg_msg("w2:futex: %x\n", f2);</div><div class='ctx'> 		if (!res)</div><div class='ctx'> 			futex_unlock_pi(&amp;f2, FUTEX_PRIVATE_FLAG);</div><div class='del'>-		waiter_ret = RET_FAIL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("Waiter exiting with %d\n", waiter_ret);</div><div class='ctx'> 	pthread_exit(NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int main(int argc, char *argv[])</div><div class='add'>+TEST(futex_requeue_pi_signal_restart)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int old_val;</div><div class='ctx'> 	struct sigaction sa;</div><div class='ctx'> 	pthread_t waiter;</div><div class='del'>-	int c, res, ret = RET_PASS;</div><div class='del'>-</div><div class='del'>-	while ((c = getopt(argc, argv, "chv:")) != -1) {</div><div class='del'>-		switch (c) {</div><div class='del'>-		case 'c':</div><div class='del'>-			log_color(1);</div><div class='del'>-			break;</div><div class='del'>-		case 'h':</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(0);</div><div class='del'>-		case 'v':</div><div class='del'>-			log_verbosity(atoi(optarg));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ksft_print_header();</div><div class='del'>-	ksft_set_plan(1);</div><div class='del'>-	ksft_print_msg("%s: Test signal handling during requeue_pi\n",</div><div class='del'>-	       basename(argv[0]));</div><div class='del'>-	ksft_print_msg("\tArguments: &lt;none&gt;\n");</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	sa.sa_handler = handle_signal;</div><div class='ctx'> 	sigemptyset(&amp;sa.sa_mask);</div><div class='ctx'> 	sa.sa_flags = 0;</div><div class='del'>-	if (sigaction(SIGUSR1, &amp;sa, NULL)) {</div><div class='del'>-		error("sigaction\n", errno);</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='add'>+	if (sigaction(SIGUSR1, &amp;sa, NULL))</div><div class='add'>+		ksft_exit_fail_msg("sigaction\n");</div><div class='ctx'> </div><div class='del'>-	info("m1:f2: %x\n", f2);</div><div class='del'>-	info("Creating waiter\n");</div><div class='add'>+	ksft_print_dbg_msg("m1:f2: %x\n", f2);</div><div class='add'>+	ksft_print_dbg_msg("Creating waiter\n");</div><div class='ctx'> 	res = create_rt_thread(&amp;waiter, waiterfn, NULL, SCHED_FIFO, 1);</div><div class='del'>-	if (res) {</div><div class='del'>-		error("Creating waiting thread failed", res);</div><div class='del'>-		ret = RET_ERROR;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (res)</div><div class='add'>+		ksft_exit_fail_msg("Creating waiting thread failed");</div><div class='ctx'> </div><div class='del'>-	info("Calling FUTEX_LOCK_PI on f2=%x @ %p\n", f2, &amp;f2);</div><div class='del'>-	info("m2:f2: %x\n", f2);</div><div class='add'>+	ksft_print_dbg_msg("Calling FUTEX_LOCK_PI on f2=%x @ %p\n", f2, &amp;f2);</div><div class='add'>+	ksft_print_dbg_msg("m2:f2: %x\n", f2);</div><div class='ctx'> 	futex_lock_pi(&amp;f2, 0, 0, FUTEX_PRIVATE_FLAG);</div><div class='del'>-	info("m3:f2: %x\n", f2);</div><div class='add'>+	ksft_print_dbg_msg("m3:f2: %x\n", f2);</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -173,11 +125,11 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		 * restart futex_wait_requeue_pi() in the kernel. Wait for the</div><div class='ctx'> 		 * waiter to block on f1 again.</div><div class='ctx'> 		 */</div><div class='del'>-		info("Issuing SIGUSR1 to waiter\n");</div><div class='add'>+		ksft_print_dbg_msg("Issuing SIGUSR1 to waiter\n");</div><div class='ctx'> 		pthread_kill(waiter, SIGUSR1);</div><div class='ctx'> 		usleep(DELAY_US);</div><div class='ctx'> </div><div class='del'>-		info("Requeueing waiter via FUTEX_CMP_REQUEUE_PI\n");</div><div class='add'>+		ksft_print_dbg_msg("Requeueing waiter via FUTEX_CMP_REQUEUE_PI\n");</div><div class='ctx'> 		old_val = f1;</div><div class='ctx'> 		res = futex_cmp_requeue_pi(&amp;f1, old_val, &amp;(f2), 1, 0,</div><div class='ctx'> 					   FUTEX_PRIVATE_FLAG);</div><div class='hunk'>@@ -191,12 +143,10 @@ int main(int argc, char *argv[])</div><div class='ctx'> 			atomic_set(&amp;requeued, 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else if (res &lt; 0) {</div><div class='del'>-			error("FUTEX_CMP_REQUEUE_PI failed\n", errno);</div><div class='del'>-			ret = RET_ERROR;</div><div class='del'>-			break;</div><div class='add'>+			ksft_exit_fail_msg("FUTEX_CMP_REQUEUE_PI failed\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	info("m4:f2: %x\n", f2);</div><div class='add'>+	ksft_print_dbg_msg("m4:f2: %x\n", f2);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Signal the waiter after requeue, waiter should return from</div><div class='hunk'>@@ -204,19 +154,14 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	 * futex_unlock_pi() can't happen before the signal wakeup is detected</div><div class='ctx'> 	 * in the kernel.</div><div class='ctx'> 	 */</div><div class='del'>-	info("Issuing SIGUSR1 to waiter\n");</div><div class='add'>+	ksft_print_dbg_msg("Issuing SIGUSR1 to waiter\n");</div><div class='ctx'> 	pthread_kill(waiter, SIGUSR1);</div><div class='del'>-	info("Waiting for waiter to return\n");</div><div class='add'>+	ksft_print_dbg_msg("Waiting for waiter to return\n");</div><div class='ctx'> 	pthread_join(waiter, NULL);</div><div class='ctx'> </div><div class='del'>-	info("Calling FUTEX_UNLOCK_PI on mutex=%x @ %p\n", f2, &amp;f2);</div><div class='add'>+	ksft_print_dbg_msg("Calling FUTEX_UNLOCK_PI on mutex=%x @ %p\n", f2, &amp;f2);</div><div class='ctx'> 	futex_unlock_pi(&amp;f2, FUTEX_PRIVATE_FLAG);</div><div class='del'>-	info("m5:f2: %x\n", f2);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	if (ret == RET_PASS &amp;&amp; waiter_ret)</div><div class='del'>-		ret = waiter_ret;</div><div class='del'>-</div><div class='del'>-	print_result(TEST_NAME, ret);</div><div class='del'>-	return ret;</div><div class='add'>+	ksft_print_dbg_msg("m5:f2: %x\n", f2);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_wait.c b/tools/testing/selftests/futex/functional/futex_wait.c<br/>index 685140d9b93d..0e69c53524c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_wait.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_wait.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_wait.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_wait.c</a></div><div class='hunk'>@@ -9,25 +9,16 @@</div><div class='ctx'> #include &lt;sys/shm.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='del'>-#include "logging.h"</div><div class='add'>+</div><div class='ctx'> #include "futextest.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='del'>-#define TEST_NAME "futex-wait"</div><div class='ctx'> #define timeout_ns  30000000</div><div class='ctx'> #define WAKE_WAIT_US 10000</div><div class='ctx'> #define SHM_PATH "futex_shm_file"</div><div class='ctx'> </div><div class='ctx'> void *futex;</div><div class='ctx'> </div><div class='del'>-void usage(char *prog)</div><div class='del'>-{</div><div class='del'>-	printf("Usage: %s\n", prog);</div><div class='del'>-	printf("  -c	Use color\n");</div><div class='del'>-	printf("  -h	Display this help message\n");</div><div class='del'>-	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",</div><div class='del'>-	       VQUIET, VCRITICAL, VINFO);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void *waiterfn(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct timespec to;</div><div class='hunk'>@@ -45,53 +36,37 @@ static void *waiterfn(void *arg)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int main(int argc, char *argv[])</div><div class='add'>+TEST(private_futex)</div><div class='ctx'> {</div><div class='del'>-	int res, ret = RET_PASS, fd, c, shm_id;</div><div class='del'>-	u_int32_t f_private = 0, *shared_data;</div><div class='ctx'> 	unsigned int flags = FUTEX_PRIVATE_FLAG;</div><div class='add'>+	u_int32_t f_private = 0;</div><div class='ctx'> 	pthread_t waiter;</div><div class='del'>-	void *shm;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	futex = &amp;f_private;</div><div class='ctx'> </div><div class='del'>-	while ((c = getopt(argc, argv, "cht:v:")) != -1) {</div><div class='del'>-		switch (c) {</div><div class='del'>-		case 'c':</div><div class='del'>-			log_color(1);</div><div class='del'>-			break;</div><div class='del'>-		case 'h':</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(0);</div><div class='del'>-		case 'v':</div><div class='del'>-			log_verbosity(atoi(optarg));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ksft_print_header();</div><div class='del'>-	ksft_set_plan(3);</div><div class='del'>-	ksft_print_msg("%s: Test futex_wait\n", basename(argv[0]));</div><div class='del'>-</div><div class='ctx'> 	/* Testing a private futex */</div><div class='del'>-	info("Calling private futex_wait on futex: %p\n", futex);</div><div class='add'>+	ksft_print_dbg_msg("Calling private futex_wait on futex: %p\n", futex);</div><div class='ctx'> 	if (pthread_create(&amp;waiter, NULL, waiterfn, (void *) &amp;flags))</div><div class='del'>-		error("pthread_create failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("pthread_create failed\n");</div><div class='ctx'> </div><div class='ctx'> 	usleep(WAKE_WAIT_US);</div><div class='ctx'> </div><div class='del'>-	info("Calling private futex_wake on futex: %p\n", futex);</div><div class='add'>+	ksft_print_dbg_msg("Calling private futex_wake on futex: %p\n", futex);</div><div class='ctx'> 	res = futex_wake(futex, 1, FUTEX_PRIVATE_FLAG);</div><div class='ctx'> 	if (res != 1) {</div><div class='ctx'> 		ksft_test_result_fail("futex_wake private returned: %d %s\n",</div><div class='ctx'> 				      errno, strerror(errno));</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_wake private succeeds\n");</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(anon_page)</div><div class='add'>+{</div><div class='add'>+	u_int32_t *shared_data;</div><div class='add'>+	pthread_t waiter;</div><div class='add'>+	int res, shm_id;</div><div class='ctx'> </div><div class='ctx'> 	/* Testing an anon page shared memory */</div><div class='ctx'> 	shm_id = shmget(IPC_PRIVATE, 4096, IPC_CREAT | 0666);</div><div class='hunk'>@@ -105,67 +80,65 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	*shared_data = 0;</div><div class='ctx'> 	futex = shared_data;</div><div class='ctx'> </div><div class='del'>-	info("Calling shared (page anon) futex_wait on futex: %p\n", futex);</div><div class='add'>+	ksft_print_dbg_msg("Calling shared (page anon) futex_wait on futex: %p\n", futex);</div><div class='ctx'> 	if (pthread_create(&amp;waiter, NULL, waiterfn, NULL))</div><div class='del'>-		error("pthread_create failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("pthread_create failed\n");</div><div class='ctx'> </div><div class='ctx'> 	usleep(WAKE_WAIT_US);</div><div class='ctx'> </div><div class='del'>-	info("Calling shared (page anon) futex_wake on futex: %p\n", futex);</div><div class='add'>+	ksft_print_dbg_msg("Calling shared (page anon) futex_wake on futex: %p\n", futex);</div><div class='ctx'> 	res = futex_wake(futex, 1, 0);</div><div class='ctx'> 	if (res != 1) {</div><div class='ctx'> 		ksft_test_result_fail("futex_wake shared (page anon) returned: %d %s\n",</div><div class='ctx'> 				      errno, strerror(errno));</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_wake shared (page anon) succeeds\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	shmdt(shared_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(file_backed)</div><div class='add'>+{</div><div class='add'>+	u_int32_t f_private = 0;</div><div class='add'>+	pthread_t waiter;</div><div class='add'>+	int res, fd;</div><div class='add'>+	void *shm;</div><div class='ctx'> </div><div class='ctx'> 	/* Testing a file backed shared memory */</div><div class='ctx'> 	fd = open(SHM_PATH, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);</div><div class='del'>-	if (fd &lt; 0) {</div><div class='del'>-		perror("open");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		ksft_exit_fail_msg("open");</div><div class='ctx'> </div><div class='del'>-	if (ftruncate(fd, sizeof(f_private))) {</div><div class='del'>-		perror("ftruncate");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='add'>+	if (ftruncate(fd, sizeof(f_private)))</div><div class='add'>+		ksft_exit_fail_msg("ftruncate");</div><div class='ctx'> </div><div class='ctx'> 	shm = mmap(NULL, sizeof(f_private), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);</div><div class='del'>-	if (shm == MAP_FAILED) {</div><div class='del'>-		perror("mmap");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='add'>+	if (shm == MAP_FAILED)</div><div class='add'>+		ksft_exit_fail_msg("mmap");</div><div class='ctx'> </div><div class='ctx'> 	memcpy(shm, &amp;f_private, sizeof(f_private));</div><div class='ctx'> </div><div class='ctx'> 	futex = shm;</div><div class='ctx'> </div><div class='del'>-	info("Calling shared (file backed) futex_wait on futex: %p\n", futex);</div><div class='add'>+	ksft_print_dbg_msg("Calling shared (file backed) futex_wait on futex: %p\n", futex);</div><div class='ctx'> 	if (pthread_create(&amp;waiter, NULL, waiterfn, NULL))</div><div class='del'>-		error("pthread_create failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("pthread_create failed\n");</div><div class='ctx'> </div><div class='ctx'> 	usleep(WAKE_WAIT_US);</div><div class='ctx'> </div><div class='del'>-	info("Calling shared (file backed) futex_wake on futex: %p\n", futex);</div><div class='add'>+	ksft_print_dbg_msg("Calling shared (file backed) futex_wake on futex: %p\n", futex);</div><div class='ctx'> 	res = futex_wake(shm, 1, 0);</div><div class='ctx'> 	if (res != 1) {</div><div class='ctx'> 		ksft_test_result_fail("futex_wake shared (file backed) returned: %d %s\n",</div><div class='ctx'> 				      errno, strerror(errno));</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_wake shared (file backed) succeeds\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Freeing resources */</div><div class='del'>-	shmdt(shared_data);</div><div class='ctx'> 	munmap(shm, sizeof(f_private));</div><div class='ctx'> 	remove(SHM_PATH);</div><div class='ctx'> 	close(fd);</div><div class='del'>-</div><div class='del'>-	ksft_print_cnts();</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c b/tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c<br/>index fb4148f23fa3..2a749f9b14eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c</a></div><div class='hunk'>@@ -27,10 +27,9 @@</div><div class='ctx'> #include &lt;libgen.h&gt;</div><div class='ctx'> #include &lt;signal.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "logging.h"</div><div class='ctx'> #include "futextest.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='del'>-#define TEST_NAME "futex-wait-private-mapped-file"</div><div class='ctx'> #define PAGE_SZ 4096</div><div class='ctx'> </div><div class='ctx'> char pad[PAGE_SZ] = {1};</div><div class='hunk'>@@ -40,86 +39,44 @@ char pad2[PAGE_SZ] = {1};</div><div class='ctx'> #define WAKE_WAIT_US 3000000</div><div class='ctx'> struct timespec wait_timeout = { .tv_sec = 5, .tv_nsec = 0};</div><div class='ctx'> </div><div class='del'>-void usage(char *prog)</div><div class='del'>-{</div><div class='del'>-	printf("Usage: %s\n", prog);</div><div class='del'>-	printf("  -c	Use color\n");</div><div class='del'>-	printf("  -h	Display this help message\n");</div><div class='del'>-	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",</div><div class='del'>-	       VQUIET, VCRITICAL, VINFO);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void *thr_futex_wait(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	info("futex wait\n");</div><div class='add'>+	ksft_print_dbg_msg("futex wait\n");</div><div class='ctx'> 	ret = futex_wait(&amp;val, 1, &amp;wait_timeout, 0);</div><div class='del'>-	if (ret &amp;&amp; errno != EWOULDBLOCK &amp;&amp; errno != ETIMEDOUT) {</div><div class='del'>-		error("futex error.\n", errno);</div><div class='del'>-		print_result(TEST_NAME, RET_ERROR);</div><div class='del'>-		exit(RET_ERROR);</div><div class='del'>-	}</div><div class='add'>+	if (ret &amp;&amp; errno != EWOULDBLOCK &amp;&amp; errno != ETIMEDOUT)</div><div class='add'>+		ksft_exit_fail_msg("futex error.\n");</div><div class='ctx'> </div><div class='ctx'> 	if (ret &amp;&amp; errno == ETIMEDOUT)</div><div class='del'>-		fail("waiter timedout\n");</div><div class='add'>+		ksft_exit_fail_msg("waiter timedout\n");</div><div class='ctx'> </div><div class='del'>-	info("futex_wait: ret = %d, errno = %d\n", ret, errno);</div><div class='add'>+	ksft_print_dbg_msg("futex_wait: ret = %d, errno = %d\n", ret, errno);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int main(int argc, char **argv)</div><div class='add'>+TEST(wait_private_mapped_file)</div><div class='ctx'> {</div><div class='ctx'> 	pthread_t thr;</div><div class='del'>-	int ret = RET_PASS;</div><div class='ctx'> 	int res;</div><div class='del'>-	int c;</div><div class='del'>-</div><div class='del'>-	while ((c = getopt(argc, argv, "chv:")) != -1) {</div><div class='del'>-		switch (c) {</div><div class='del'>-		case 'c':</div><div class='del'>-			log_color(1);</div><div class='del'>-			break;</div><div class='del'>-		case 'h':</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(0);</div><div class='del'>-		case 'v':</div><div class='del'>-			log_verbosity(atoi(optarg));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ksft_print_header();</div><div class='del'>-	ksft_set_plan(1);</div><div class='del'>-	ksft_print_msg(</div><div class='del'>-		"%s: Test the futex value of private file mappings in FUTEX_WAIT\n",</div><div class='del'>-		basename(argv[0]));</div><div class='del'>-</div><div class='del'>-	ret = pthread_create(&amp;thr, NULL, thr_futex_wait, NULL);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		fprintf(stderr, "pthread_create error\n");</div><div class='del'>-		ret = RET_ERROR;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info("wait a while\n");</div><div class='add'>+</div><div class='add'>+	res = pthread_create(&amp;thr, NULL, thr_futex_wait, NULL);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		ksft_exit_fail_msg("pthread_create error\n");</div><div class='add'>+</div><div class='add'>+	ksft_print_dbg_msg("wait a while\n");</div><div class='ctx'> 	usleep(WAKE_WAIT_US);</div><div class='ctx'> 	val = 2;</div><div class='ctx'> 	res = futex_wake(&amp;val, 1, 0);</div><div class='del'>-	info("futex_wake %d\n", res);</div><div class='del'>-	if (res != 1) {</div><div class='del'>-		fail("FUTEX_WAKE didn't find the waiting thread.\n");</div><div class='del'>-		ret = RET_FAIL;</div><div class='del'>-	}</div><div class='add'>+	ksft_print_dbg_msg("futex_wake %d\n", res);</div><div class='add'>+	if (res != 1)</div><div class='add'>+		ksft_exit_fail_msg("FUTEX_WAKE didn't find the waiting thread.\n");</div><div class='ctx'> </div><div class='del'>-	info("join\n");</div><div class='add'>+	ksft_print_dbg_msg("join\n");</div><div class='ctx'> 	pthread_join(thr, NULL);</div><div class='ctx'> </div><div class='del'>- out:</div><div class='del'>-	print_result(TEST_NAME, ret);</div><div class='del'>-	return ret;</div><div class='add'>+	ksft_test_result_pass("wait_private_mapped_file");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_wait_timeout.c b/tools/testing/selftests/futex/functional/futex_wait_timeout.c<br/>index d183f878360b..674dd13af421 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_wait_timeout.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_wait_timeout.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_wait_timeout.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_wait_timeout.c</a></div><div class='hunk'>@@ -16,26 +16,15 @@</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;pthread.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "futextest.h"</div><div class='ctx'> #include "futex2test.h"</div><div class='del'>-#include "logging.h"</div><div class='del'>-</div><div class='del'>-#define TEST_NAME "futex-wait-timeout"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> static long timeout_ns = 100000;	/* 100us default timeout */</div><div class='ctx'> static futex_t futex_pi;</div><div class='ctx'> static pthread_barrier_t barrier;</div><div class='ctx'> </div><div class='del'>-void usage(char *prog)</div><div class='del'>-{</div><div class='del'>-	printf("Usage: %s\n", prog);</div><div class='del'>-	printf("  -c	Use color\n");</div><div class='del'>-	printf("  -h	Display this help message\n");</div><div class='del'>-	printf("  -t N	Timeout in nanoseconds (default: 100,000)\n");</div><div class='del'>-	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",</div><div class='del'>-	       VQUIET, VCRITICAL, VINFO);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Get a PI lock and hold it forever, so the main thread lock_pi will block</div><div class='ctx'>  * and we can test the timeout</div><div class='hunk'>@@ -47,13 +36,13 @@ void *get_pi_lock(void *arg)</div><div class='ctx'> </div><div class='ctx'> 	ret = futex_lock_pi(&amp;futex_pi, NULL, 0, 0);</div><div class='ctx'> 	if (ret != 0)</div><div class='del'>-		error("futex_lock_pi failed\n", ret);</div><div class='add'>+		ksft_exit_fail_msg("futex_lock_pi failed\n");</div><div class='ctx'> </div><div class='ctx'> 	pthread_barrier_wait(&amp;barrier);</div><div class='ctx'> </div><div class='ctx'> 	/* Blocks forever */</div><div class='ctx'> 	ret = futex_wait(&amp;lock, 0, NULL, 0);</div><div class='del'>-	error("futex_wait failed\n", ret);</div><div class='add'>+	ksft_exit_fail_msg("futex_wait failed\n");</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -61,12 +50,11 @@ void *get_pi_lock(void *arg)</div><div class='ctx'> /*</div><div class='ctx'>  * Check if the function returned the expected error</div><div class='ctx'>  */</div><div class='del'>-static void test_timeout(int res, int *ret, char *test_name, int err)</div><div class='add'>+static void test_timeout(int res, char *test_name, int err)</div><div class='ctx'> {</div><div class='ctx'> 	if (!res || errno != err) {</div><div class='ctx'> 		ksft_test_result_fail("%s returned %d\n", test_name,</div><div class='ctx'> 				      res &lt; 0 ? errno : res);</div><div class='del'>-		*ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("%s succeeds\n", test_name);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -78,10 +66,8 @@ static void test_timeout(int res, int *ret, char *test_name, int err)</div><div class='ctx'> static int futex_get_abs_timeout(clockid_t clockid, struct timespec *to,</div><div class='ctx'> 				 long timeout_ns)</div><div class='ctx'> {</div><div class='del'>-	if (clock_gettime(clockid, to)) {</div><div class='del'>-		error("clock_gettime failed\n", errno);</div><div class='del'>-		return errno;</div><div class='del'>-	}</div><div class='add'>+	if (clock_gettime(clockid, to))</div><div class='add'>+		ksft_exit_fail_msg("clock_gettime failed\n");</div><div class='ctx'> </div><div class='ctx'> 	to-&gt;tv_nsec += timeout_ns;</div><div class='ctx'> </div><div class='hunk'>@@ -93,83 +79,66 @@ static int futex_get_abs_timeout(clockid_t clockid, struct timespec *to,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int main(int argc, char *argv[])</div><div class='add'>+TEST(wait_bitset)</div><div class='ctx'> {</div><div class='ctx'> 	futex_t f1 = FUTEX_INITIALIZER;</div><div class='del'>-	int res, ret = RET_PASS;</div><div class='ctx'> 	struct timespec to;</div><div class='del'>-	pthread_t thread;</div><div class='del'>-	int c;</div><div class='del'>-	struct futex_waitv waitv = {</div><div class='del'>-			.uaddr = (uintptr_t)&amp;f1,</div><div class='del'>-			.val = f1,</div><div class='del'>-			.flags = FUTEX_32,</div><div class='del'>-			.__reserved = 0</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-	while ((c = getopt(argc, argv, "cht:v:")) != -1) {</div><div class='del'>-		switch (c) {</div><div class='del'>-		case 'c':</div><div class='del'>-			log_color(1);</div><div class='del'>-			break;</div><div class='del'>-		case 'h':</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(0);</div><div class='del'>-		case 't':</div><div class='del'>-			timeout_ns = atoi(optarg);</div><div class='del'>-			break;</div><div class='del'>-		case 'v':</div><div class='del'>-			log_verbosity(atoi(optarg));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ksft_print_header();</div><div class='del'>-	ksft_set_plan(9);</div><div class='del'>-	ksft_print_msg("%s: Block on a futex and wait for timeout\n",</div><div class='del'>-	       basename(argv[0]));</div><div class='del'>-	ksft_print_msg("\tArguments: timeout=%ldns\n", timeout_ns);</div><div class='del'>-</div><div class='del'>-	pthread_barrier_init(&amp;barrier, NULL, 2);</div><div class='del'>-	pthread_create(&amp;thread, NULL, get_pi_lock, NULL);</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	/* initialize relative timeout */</div><div class='ctx'> 	to.tv_sec = 0;</div><div class='ctx'> 	to.tv_nsec = timeout_ns;</div><div class='ctx'> </div><div class='ctx'> 	res = futex_wait(&amp;f1, f1, &amp;to, 0);</div><div class='del'>-	test_timeout(res, &amp;ret, "futex_wait relative", ETIMEDOUT);</div><div class='add'>+	test_timeout(res, "futex_wait relative", ETIMEDOUT);</div><div class='ctx'> </div><div class='ctx'> 	/* FUTEX_WAIT_BITSET with CLOCK_REALTIME */</div><div class='ctx'> 	if (futex_get_abs_timeout(CLOCK_REALTIME, &amp;to, timeout_ns))</div><div class='del'>-		return RET_FAIL;</div><div class='add'>+		ksft_test_result_error("get_time error");</div><div class='ctx'> 	res = futex_wait_bitset(&amp;f1, f1, &amp;to, 1, FUTEX_CLOCK_REALTIME);</div><div class='del'>-	test_timeout(res, &amp;ret, "futex_wait_bitset realtime", ETIMEDOUT);</div><div class='add'>+	test_timeout(res, "futex_wait_bitset realtime", ETIMEDOUT);</div><div class='ctx'> </div><div class='ctx'> 	/* FUTEX_WAIT_BITSET with CLOCK_MONOTONIC */</div><div class='ctx'> 	if (futex_get_abs_timeout(CLOCK_MONOTONIC, &amp;to, timeout_ns))</div><div class='del'>-		return RET_FAIL;</div><div class='add'>+		ksft_test_result_error("get_time error");</div><div class='ctx'> 	res = futex_wait_bitset(&amp;f1, f1, &amp;to, 1, 0);</div><div class='del'>-	test_timeout(res, &amp;ret, "futex_wait_bitset monotonic", ETIMEDOUT);</div><div class='add'>+	test_timeout(res, "futex_wait_bitset monotonic", ETIMEDOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(requeue_pi)</div><div class='add'>+{</div><div class='add'>+	futex_t f1 = FUTEX_INITIALIZER;</div><div class='add'>+	struct timespec to;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	/* FUTEX_WAIT_REQUEUE_PI with CLOCK_REALTIME */</div><div class='ctx'> 	if (futex_get_abs_timeout(CLOCK_REALTIME, &amp;to, timeout_ns))</div><div class='del'>-		return RET_FAIL;</div><div class='add'>+		ksft_test_result_error("get_time error");</div><div class='ctx'> 	res = futex_wait_requeue_pi(&amp;f1, f1, &amp;futex_pi, &amp;to, FUTEX_CLOCK_REALTIME);</div><div class='del'>-	test_timeout(res, &amp;ret, "futex_wait_requeue_pi realtime", ETIMEDOUT);</div><div class='add'>+	test_timeout(res, "futex_wait_requeue_pi realtime", ETIMEDOUT);</div><div class='ctx'> </div><div class='ctx'> 	/* FUTEX_WAIT_REQUEUE_PI with CLOCK_MONOTONIC */</div><div class='ctx'> 	if (futex_get_abs_timeout(CLOCK_MONOTONIC, &amp;to, timeout_ns))</div><div class='del'>-		return RET_FAIL;</div><div class='add'>+		ksft_test_result_error("get_time error");</div><div class='ctx'> 	res = futex_wait_requeue_pi(&amp;f1, f1, &amp;futex_pi, &amp;to, 0);</div><div class='del'>-	test_timeout(res, &amp;ret, "futex_wait_requeue_pi monotonic", ETIMEDOUT);</div><div class='add'>+	test_timeout(res, "futex_wait_requeue_pi monotonic", ETIMEDOUT);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(lock_pi)</div><div class='add'>+{</div><div class='add'>+	struct timespec to;</div><div class='add'>+	pthread_t thread;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* Create a thread that will lock forever so any waiter will timeout */</div><div class='add'>+	pthread_barrier_init(&amp;barrier, NULL, 2);</div><div class='add'>+	pthread_create(&amp;thread, NULL, get_pi_lock, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait until the other thread calls futex_lock_pi() */</div><div class='ctx'> 	pthread_barrier_wait(&amp;barrier);</div><div class='ctx'> 	pthread_barrier_destroy(&amp;barrier);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FUTEX_LOCK_PI with CLOCK_REALTIME</div><div class='ctx'> 	 * Due to historical reasons, FUTEX_LOCK_PI supports only realtime</div><div class='hunk'>@@ -181,26 +150,38 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	 * smaller than realtime and the syscall will timeout immediately.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (futex_get_abs_timeout(CLOCK_REALTIME, &amp;to, timeout_ns))</div><div class='del'>-		return RET_FAIL;</div><div class='add'>+		ksft_test_result_error("get_time error");</div><div class='ctx'> 	res = futex_lock_pi(&amp;futex_pi, &amp;to, 0, 0);</div><div class='del'>-	test_timeout(res, &amp;ret, "futex_lock_pi realtime", ETIMEDOUT);</div><div class='add'>+	test_timeout(res, "futex_lock_pi realtime", ETIMEDOUT);</div><div class='ctx'> </div><div class='ctx'> 	/* Test operations that don't support FUTEX_CLOCK_REALTIME */</div><div class='ctx'> 	res = futex_lock_pi(&amp;futex_pi, NULL, 0, FUTEX_CLOCK_REALTIME);</div><div class='del'>-	test_timeout(res, &amp;ret, "futex_lock_pi invalid timeout flag", ENOSYS);</div><div class='add'>+	test_timeout(res, "futex_lock_pi invalid timeout flag", ENOSYS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(waitv)</div><div class='add'>+{</div><div class='add'>+	futex_t f1 = FUTEX_INITIALIZER;</div><div class='add'>+	struct futex_waitv waitv = {</div><div class='add'>+		.uaddr		= (uintptr_t)&amp;f1,</div><div class='add'>+		.val		= f1,</div><div class='add'>+		.flags		= FUTEX_32,</div><div class='add'>+		.__reserved	= 0,</div><div class='add'>+	};</div><div class='add'>+	struct timespec to;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	/* futex_waitv with CLOCK_MONOTONIC */</div><div class='ctx'> 	if (futex_get_abs_timeout(CLOCK_MONOTONIC, &amp;to, timeout_ns))</div><div class='del'>-		return RET_FAIL;</div><div class='add'>+		ksft_test_result_error("get_time error");</div><div class='ctx'> 	res = futex_waitv(&amp;waitv, 1, 0, &amp;to, CLOCK_MONOTONIC);</div><div class='del'>-	test_timeout(res, &amp;ret, "futex_waitv monotonic", ETIMEDOUT);</div><div class='add'>+	test_timeout(res, "futex_waitv monotonic", ETIMEDOUT);</div><div class='ctx'> </div><div class='ctx'> 	/* futex_waitv with CLOCK_REALTIME */</div><div class='ctx'> 	if (futex_get_abs_timeout(CLOCK_REALTIME, &amp;to, timeout_ns))</div><div class='del'>-		return RET_FAIL;</div><div class='add'>+		ksft_test_result_error("get_time error");</div><div class='ctx'> 	res = futex_waitv(&amp;waitv, 1, 0, &amp;to, CLOCK_REALTIME);</div><div class='del'>-	test_timeout(res, &amp;ret, "futex_waitv realtime", ETIMEDOUT);</div><div class='del'>-</div><div class='del'>-	ksft_print_cnts();</div><div class='del'>-	return ret;</div><div class='add'>+	test_timeout(res, "futex_waitv realtime", ETIMEDOUT);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c b/tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c<br/>index ed9cd07e31c1..b07d68a67f31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c</a></div><div class='hunk'>@@ -29,95 +29,55 @@</div><div class='ctx'> #include &lt;linux/futex.h&gt;</div><div class='ctx'> #include &lt;libgen.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "logging.h"</div><div class='ctx'> #include "futextest.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='del'>-#define TEST_NAME "futex-wait-uninitialized-heap"</div><div class='ctx'> #define WAIT_US 5000000</div><div class='ctx'> </div><div class='ctx'> static int child_blocked = 1;</div><div class='del'>-static int child_ret;</div><div class='add'>+static bool child_ret;</div><div class='ctx'> void *buf;</div><div class='ctx'> </div><div class='del'>-void usage(char *prog)</div><div class='del'>-{</div><div class='del'>-	printf("Usage: %s\n", prog);</div><div class='del'>-	printf("  -c	Use color\n");</div><div class='del'>-	printf("  -h	Display this help message\n");</div><div class='del'>-	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",</div><div class='del'>-	       VQUIET, VCRITICAL, VINFO);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void *wait_thread(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	child_ret = RET_PASS;</div><div class='add'>+	child_ret = true;</div><div class='ctx'> 	res = futex_wait(buf, 1, NULL, 0);</div><div class='ctx'> 	child_blocked = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (res != 0 &amp;&amp; errno != EWOULDBLOCK) {</div><div class='del'>-		error("futex failure\n", errno);</div><div class='del'>-		child_ret = RET_ERROR;</div><div class='add'>+		ksft_exit_fail_msg("futex failure\n");</div><div class='add'>+		child_ret = false;</div><div class='ctx'> 	}</div><div class='ctx'> 	pthread_exit(NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int main(int argc, char **argv)</div><div class='add'>+TEST(futex_wait_uninitialized_heap)</div><div class='ctx'> {</div><div class='del'>-	int c, ret = RET_PASS;</div><div class='ctx'> 	long page_size;</div><div class='ctx'> 	pthread_t thr;</div><div class='del'>-</div><div class='del'>-	while ((c = getopt(argc, argv, "chv:")) != -1) {</div><div class='del'>-		switch (c) {</div><div class='del'>-		case 'c':</div><div class='del'>-			log_color(1);</div><div class='del'>-			break;</div><div class='del'>-		case 'h':</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(0);</div><div class='del'>-		case 'v':</div><div class='del'>-			log_verbosity(atoi(optarg));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	page_size = sysconf(_SC_PAGESIZE);</div><div class='ctx'> </div><div class='ctx'> 	buf = mmap(NULL, page_size, PROT_READ|PROT_WRITE,</div><div class='ctx'> 		   MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);</div><div class='del'>-	if (buf == (void *)-1) {</div><div class='del'>-		error("mmap\n", errno);</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ksft_print_header();</div><div class='del'>-	ksft_set_plan(1);</div><div class='del'>-	ksft_print_msg("%s: Test the uninitialized futex value in FUTEX_WAIT\n",</div><div class='del'>-	       basename(argv[0]));</div><div class='del'>-</div><div class='add'>+	if (buf == (void *)-1)</div><div class='add'>+		ksft_exit_fail_msg("mmap\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = pthread_create(&amp;thr, NULL, wait_thread, NULL);</div><div class='del'>-	if (ret) {</div><div class='del'>-		error("pthread_create\n", errno);</div><div class='del'>-		ret = RET_ERROR;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		ksft_exit_fail_msg("pthread_create\n");</div><div class='ctx'> </div><div class='del'>-	info("waiting %dus for child to return\n", WAIT_US);</div><div class='add'>+	ksft_print_dbg_msg("waiting %dus for child to return\n", WAIT_US);</div><div class='ctx'> 	usleep(WAIT_US);</div><div class='ctx'> </div><div class='del'>-	ret = child_ret;</div><div class='del'>-	if (child_blocked) {</div><div class='del'>-		fail("child blocked in kernel\n");</div><div class='del'>-		ret = RET_FAIL;</div><div class='del'>-	}</div><div class='add'>+	if (child_blocked)</div><div class='add'>+		ksft_test_result_fail("child blocked in kernel\n");</div><div class='ctx'> </div><div class='del'>- out:</div><div class='del'>-	print_result(TEST_NAME, ret);</div><div class='del'>-	return ret;</div><div class='add'>+	if (!child_ret)</div><div class='add'>+		ksft_test_result_fail("child error\n");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c<br/>index 7d7a6a06cdb7..9ff936ecf164 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_wait_wouldblock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_wait_wouldblock.c</a></div><div class='hunk'>@@ -21,72 +21,44 @@</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;time.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "futextest.h"</div><div class='ctx'> #include "futex2test.h"</div><div class='del'>-#include "logging.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='del'>-#define TEST_NAME "futex-wait-wouldblock"</div><div class='ctx'> #define timeout_ns 100000</div><div class='ctx'> </div><div class='del'>-void usage(char *prog)</div><div class='del'>-{</div><div class='del'>-	printf("Usage: %s\n", prog);</div><div class='del'>-	printf("  -c	Use color\n");</div><div class='del'>-	printf("  -h	Display this help message\n");</div><div class='del'>-	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",</div><div class='del'>-	       VQUIET, VCRITICAL, VINFO);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(int argc, char *argv[])</div><div class='add'>+TEST(futex_wait_wouldblock)</div><div class='ctx'> {</div><div class='ctx'> 	struct timespec to = {.tv_sec = 0, .tv_nsec = timeout_ns};</div><div class='ctx'> 	futex_t f1 = FUTEX_INITIALIZER;</div><div class='del'>-	int res, ret = RET_PASS;</div><div class='del'>-	int c;</div><div class='del'>-	struct futex_waitv waitv = {</div><div class='del'>-			.uaddr = (uintptr_t)&amp;f1,</div><div class='del'>-			.val = f1+1,</div><div class='del'>-			.flags = FUTEX_32,</div><div class='del'>-			.__reserved = 0</div><div class='del'>-		};</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='del'>-	while ((c = getopt(argc, argv, "cht:v:")) != -1) {</div><div class='del'>-		switch (c) {</div><div class='del'>-		case 'c':</div><div class='del'>-			log_color(1);</div><div class='del'>-			break;</div><div class='del'>-		case 'h':</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(0);</div><div class='del'>-		case 'v':</div><div class='del'>-			log_verbosity(atoi(optarg));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ksft_print_header();</div><div class='del'>-	ksft_set_plan(2);</div><div class='del'>-	ksft_print_msg("%s: Test the unexpected futex value in FUTEX_WAIT\n",</div><div class='del'>-	       basename(argv[0]));</div><div class='del'>-</div><div class='del'>-	info("Calling futex_wait on f1: %u @ %p with val=%u\n", f1, &amp;f1, f1+1);</div><div class='add'>+	ksft_print_dbg_msg("Calling futex_wait on f1: %u @ %p with val=%u\n", f1, &amp;f1, f1+1);</div><div class='ctx'> 	res = futex_wait(&amp;f1, f1+1, &amp;to, FUTEX_PRIVATE_FLAG);</div><div class='ctx'> 	if (!res || errno != EWOULDBLOCK) {</div><div class='ctx'> 		ksft_test_result_fail("futex_wait returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_wait\n");</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (clock_gettime(CLOCK_MONOTONIC, &amp;to)) {</div><div class='del'>-		error("clock_gettime failed\n", errno);</div><div class='del'>-		return errno;</div><div class='del'>-	}</div><div class='add'>+TEST(futex_waitv_wouldblock)</div><div class='add'>+{</div><div class='add'>+	struct timespec to = {.tv_sec = 0, .tv_nsec = timeout_ns};</div><div class='add'>+	futex_t f1 = FUTEX_INITIALIZER;</div><div class='add'>+	struct futex_waitv waitv = {</div><div class='add'>+		.uaddr		= (uintptr_t)&amp;f1,</div><div class='add'>+		.val		= f1 + 1,</div><div class='add'>+		.flags		= FUTEX_32,</div><div class='add'>+		.__reserved	= 0,</div><div class='add'>+	};</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (clock_gettime(CLOCK_MONOTONIC, &amp;to))</div><div class='add'>+		ksft_exit_fail_msg("clock_gettime failed %d\n", errno);</div><div class='ctx'> </div><div class='ctx'> 	to.tv_nsec += timeout_ns;</div><div class='ctx'> </div><div class='hunk'>@@ -95,17 +67,15 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		to.tv_nsec -= 1000000000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info("Calling futex_waitv on f1: %u @ %p with val=%u\n", f1, &amp;f1, f1+1);</div><div class='add'>+	ksft_print_dbg_msg("Calling futex_waitv on f1: %u @ %p with val=%u\n", f1, &amp;f1, f1+1);</div><div class='ctx'> 	res = futex_waitv(&amp;waitv, 1, 0, &amp;to, CLOCK_MONOTONIC);</div><div class='ctx'> 	if (!res || errno != EWOULDBLOCK) {</div><div class='del'>-		ksft_test_result_pass("futex_waitv returned: %d %s\n",</div><div class='add'>+		ksft_test_result_fail("futex_waitv returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_waitv\n");</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ksft_print_cnts();</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/futex_waitv.c b/tools/testing/selftests/futex/functional/futex_waitv.c<br/>index a94337f677e1..d60876164d4b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_waitv.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/futex_waitv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/futex_waitv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/futex_waitv.c</a></div><div class='hunk'>@@ -15,25 +15,16 @@</div><div class='ctx'> #include &lt;pthread.h&gt;</div><div class='ctx'> #include &lt;stdint.h&gt;</div><div class='ctx'> #include &lt;sys/shm.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "futextest.h"</div><div class='ctx'> #include "futex2test.h"</div><div class='del'>-#include "logging.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='del'>-#define TEST_NAME "futex-wait"</div><div class='ctx'> #define WAKE_WAIT_US 10000</div><div class='ctx'> #define NR_FUTEXES 30</div><div class='ctx'> static struct futex_waitv waitv[NR_FUTEXES];</div><div class='ctx'> u_int32_t futexes[NR_FUTEXES] = {0};</div><div class='ctx'> </div><div class='del'>-void usage(char *prog)</div><div class='del'>-{</div><div class='del'>-	printf("Usage: %s\n", prog);</div><div class='del'>-	printf("  -c	Use color\n");</div><div class='del'>-	printf("  -h	Display this help message\n");</div><div class='del'>-	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",</div><div class='del'>-	       VQUIET, VCRITICAL, VINFO);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void *waiterfn(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct timespec to;</div><div class='hunk'>@@ -41,7 +32,7 @@ void *waiterfn(void *arg)</div><div class='ctx'> </div><div class='ctx'> 	/* setting absolute timeout for futex2 */</div><div class='ctx'> 	if (clock_gettime(CLOCK_MONOTONIC, &amp;to))</div><div class='del'>-		error("gettime64 failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("gettime64 failed\n");</div><div class='ctx'> </div><div class='ctx'> 	to.tv_sec++;</div><div class='ctx'> </div><div class='hunk'>@@ -57,34 +48,10 @@ void *waiterfn(void *arg)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int main(int argc, char *argv[])</div><div class='add'>+TEST(private_waitv)</div><div class='ctx'> {</div><div class='ctx'> 	pthread_t waiter;</div><div class='del'>-	int res, ret = RET_PASS;</div><div class='del'>-	struct timespec to;</div><div class='del'>-	int c, i;</div><div class='del'>-</div><div class='del'>-	while ((c = getopt(argc, argv, "cht:v:")) != -1) {</div><div class='del'>-		switch (c) {</div><div class='del'>-		case 'c':</div><div class='del'>-			log_color(1);</div><div class='del'>-			break;</div><div class='del'>-		case 'h':</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(0);</div><div class='del'>-		case 'v':</div><div class='del'>-			log_verbosity(atoi(optarg));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			usage(basename(argv[0]));</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ksft_print_header();</div><div class='del'>-	ksft_set_plan(7);</div><div class='del'>-	ksft_print_msg("%s: Test FUTEX_WAITV\n",</div><div class='del'>-		       basename(argv[0]));</div><div class='add'>+	int res, i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_FUTEXES; i++) {</div><div class='ctx'> 		waitv[i].uaddr = (uintptr_t)&amp;futexes[i];</div><div class='hunk'>@@ -95,7 +62,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> </div><div class='ctx'> 	/* Private waitv */</div><div class='ctx'> 	if (pthread_create(&amp;waiter, NULL, waiterfn, NULL))</div><div class='del'>-		error("pthread_create failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("pthread_create failed\n");</div><div class='ctx'> </div><div class='ctx'> 	usleep(WAKE_WAIT_US);</div><div class='ctx'> </div><div class='hunk'>@@ -104,10 +71,15 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		ksft_test_result_fail("futex_wake private returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_waitv private\n");</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(shared_waitv)</div><div class='add'>+{</div><div class='add'>+	pthread_t waiter;</div><div class='add'>+	int res, i;</div><div class='ctx'> </div><div class='ctx'> 	/* Shared waitv */</div><div class='ctx'> 	for (i = 0; i &lt; NR_FUTEXES; i++) {</div><div class='hunk'>@@ -128,7 +100,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pthread_create(&amp;waiter, NULL, waiterfn, NULL))</div><div class='del'>-		error("pthread_create failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("pthread_create failed\n");</div><div class='ctx'> </div><div class='ctx'> 	usleep(WAKE_WAIT_US);</div><div class='ctx'> </div><div class='hunk'>@@ -137,19 +109,24 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		ksft_test_result_fail("futex_wake shared returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_waitv shared\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_FUTEXES; i++)</div><div class='ctx'> 		shmdt(u64_to_ptr(waitv[i].uaddr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(invalid_flag)</div><div class='add'>+{</div><div class='add'>+	struct timespec to;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	/* Testing a waiter without FUTEX_32 flag */</div><div class='ctx'> 	waitv[0].flags = FUTEX_PRIVATE_FLAG;</div><div class='ctx'> </div><div class='ctx'> 	if (clock_gettime(CLOCK_MONOTONIC, &amp;to))</div><div class='del'>-		error("gettime64 failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("gettime64 failed\n");</div><div class='ctx'> </div><div class='ctx'> 	to.tv_sec++;</div><div class='ctx'> </div><div class='hunk'>@@ -158,17 +135,22 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		ksft_test_result_fail("futex_waitv private returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_waitv without FUTEX_32\n");</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(unaligned_address)</div><div class='add'>+{</div><div class='add'>+	struct timespec to;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	/* Testing a waiter with an unaligned address */</div><div class='ctx'> 	waitv[0].flags = FUTEX_PRIVATE_FLAG | FUTEX_32;</div><div class='ctx'> 	waitv[0].uaddr = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (clock_gettime(CLOCK_MONOTONIC, &amp;to))</div><div class='del'>-		error("gettime64 failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("gettime64 failed\n");</div><div class='ctx'> </div><div class='ctx'> 	to.tv_sec++;</div><div class='ctx'> </div><div class='hunk'>@@ -177,16 +159,21 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		ksft_test_result_fail("futex_wake private returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_waitv with an unaligned address\n");</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(null_address)</div><div class='add'>+{</div><div class='add'>+	struct timespec to;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	/* Testing a NULL address for waiters.uaddr */</div><div class='ctx'> 	waitv[0].uaddr = 0x00000000;</div><div class='ctx'> </div><div class='ctx'> 	if (clock_gettime(CLOCK_MONOTONIC, &amp;to))</div><div class='del'>-		error("gettime64 failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("gettime64 failed\n");</div><div class='ctx'> </div><div class='ctx'> 	to.tv_sec++;</div><div class='ctx'> </div><div class='hunk'>@@ -195,14 +182,13 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		ksft_test_result_fail("futex_waitv private returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_waitv NULL address in waitv.uaddr\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Testing a NULL address for *waiters */</div><div class='ctx'> 	if (clock_gettime(CLOCK_MONOTONIC, &amp;to))</div><div class='del'>-		error("gettime64 failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("gettime64 failed\n");</div><div class='ctx'> </div><div class='ctx'> 	to.tv_sec++;</div><div class='ctx'> </div><div class='hunk'>@@ -211,14 +197,19 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		ksft_test_result_fail("futex_waitv private returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_waitv NULL address in *waiters\n");</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(invalid_clockid)</div><div class='add'>+{</div><div class='add'>+	struct timespec to;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	/* Testing an invalid clockid */</div><div class='ctx'> 	if (clock_gettime(CLOCK_MONOTONIC, &amp;to))</div><div class='del'>-		error("gettime64 failed\n", errno);</div><div class='add'>+		ksft_exit_fail_msg("gettime64 failed\n");</div><div class='ctx'> </div><div class='ctx'> 	to.tv_sec++;</div><div class='ctx'> </div><div class='hunk'>@@ -227,11 +218,9 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		ksft_test_result_fail("futex_waitv private returned: %d %s\n",</div><div class='ctx'> 				      res ? errno : res,</div><div class='ctx'> 				      res ? strerror(errno) : "");</div><div class='del'>-		ret = RET_FAIL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ksft_test_result_pass("futex_waitv invalid clockid\n");</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ksft_print_cnts();</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/futex/functional/run.sh b/tools/testing/selftests/futex/functional/run.sh<br/>index 5ccd599da6c3..e88545c06d57 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/run.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/functional/run.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/functional/run.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/functional/run.sh</a></div><div class='hunk'>@@ -18,67 +18,36 @@</div><div class='ctx'> #</div><div class='ctx'> ###############################################################################</div><div class='ctx'> </div><div class='del'>-# Test for a color capable console</div><div class='del'>-if [ -z "$USE_COLOR" ]; then</div><div class='del'>-    tput setf 7 || tput setaf 7</div><div class='del'>-    if [ $? -eq 0 ]; then</div><div class='del'>-        USE_COLOR=1</div><div class='del'>-        tput sgr0</div><div class='del'>-    fi</div><div class='del'>-fi</div><div class='del'>-if [ "$USE_COLOR" -eq 1 ]; then</div><div class='del'>-    COLOR="-c"</div><div class='del'>-fi</div><div class='del'>-</div><div class='add'>+echo</div><div class='add'>+./futex_requeue_pi</div><div class='ctx'> </div><div class='ctx'> echo</div><div class='del'>-# requeue pi testing</div><div class='del'>-# without timeouts</div><div class='del'>-./futex_requeue_pi $COLOR</div><div class='del'>-./futex_requeue_pi $COLOR -b</div><div class='del'>-./futex_requeue_pi $COLOR -b -l</div><div class='del'>-./futex_requeue_pi $COLOR -b -o</div><div class='del'>-./futex_requeue_pi $COLOR -l</div><div class='del'>-./futex_requeue_pi $COLOR -o</div><div class='del'>-# with timeouts</div><div class='del'>-./futex_requeue_pi $COLOR -b -l -t 5000</div><div class='del'>-./futex_requeue_pi $COLOR -l -t 5000</div><div class='del'>-./futex_requeue_pi $COLOR -b -l -t 500000</div><div class='del'>-./futex_requeue_pi $COLOR -l -t 500000</div><div class='del'>-./futex_requeue_pi $COLOR -b -t 5000</div><div class='del'>-./futex_requeue_pi $COLOR -t 5000</div><div class='del'>-./futex_requeue_pi $COLOR -b -t 500000</div><div class='del'>-./futex_requeue_pi $COLOR -t 500000</div><div class='del'>-./futex_requeue_pi $COLOR -b -o -t 5000</div><div class='del'>-./futex_requeue_pi $COLOR -l -t 5000</div><div class='del'>-./futex_requeue_pi $COLOR -b -o -t 500000</div><div class='del'>-./futex_requeue_pi $COLOR -l -t 500000</div><div class='del'>-# with long timeout</div><div class='del'>-./futex_requeue_pi $COLOR -b -l -t 2000000000</div><div class='del'>-./futex_requeue_pi $COLOR -l -t 2000000000</div><div class='add'>+./futex_requeue_pi_mismatched_ops</div><div class='ctx'> </div><div class='add'>+echo</div><div class='add'>+./futex_requeue_pi_signal_restart</div><div class='ctx'> </div><div class='ctx'> echo</div><div class='del'>-./futex_requeue_pi_mismatched_ops $COLOR</div><div class='add'>+./futex_wait_timeout</div><div class='ctx'> </div><div class='ctx'> echo</div><div class='del'>-./futex_requeue_pi_signal_restart $COLOR</div><div class='add'>+./futex_wait_wouldblock</div><div class='ctx'> </div><div class='ctx'> echo</div><div class='del'>-./futex_wait_timeout $COLOR</div><div class='add'>+./futex_wait_uninitialized_heap</div><div class='add'>+./futex_wait_private_mapped_file</div><div class='ctx'> </div><div class='ctx'> echo</div><div class='del'>-./futex_wait_wouldblock $COLOR</div><div class='add'>+./futex_wait</div><div class='ctx'> </div><div class='ctx'> echo</div><div class='del'>-./futex_wait_uninitialized_heap $COLOR</div><div class='del'>-./futex_wait_private_mapped_file $COLOR</div><div class='add'>+./futex_requeue</div><div class='ctx'> </div><div class='ctx'> echo</div><div class='del'>-./futex_wait $COLOR</div><div class='add'>+./futex_waitv</div><div class='ctx'> </div><div class='ctx'> echo</div><div class='del'>-./futex_requeue $COLOR</div><div class='add'>+./futex_priv_hash</div><div class='ctx'> </div><div class='ctx'> echo</div><div class='del'>-./futex_waitv $COLOR</div><div class='add'>+./futex_numa_mpol</div><div class='head'>diff --git a/tools/testing/selftests/futex/include/futex2test.h b/tools/testing/selftests/futex/include/futex2test.h<br/>index 9d305520e849..1f625b39948a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/include/futex2test.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/include/futex2test.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/include/futex2test.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/include/futex2test.h</a></div><div class='hunk'>@@ -4,10 +4,58 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2021 Collabora Ltd.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/time_types.h&gt;</div><div class='ctx'> #include &lt;stdint.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define u64_to_ptr(x) ((void *)(uintptr_t)(x))</div><div class='ctx'> </div><div class='add'>+#ifndef __NR_futex_waitv</div><div class='add'>+#define __NR_futex_waitv 449</div><div class='add'>+struct futex_waitv {</div><div class='add'>+	__u64 val;</div><div class='add'>+	__u64 uaddr;</div><div class='add'>+	__u32 flags;</div><div class='add'>+	__u32 __reserved;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __NR_futex_wake</div><div class='add'>+#define __NR_futex_wake 454</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __NR_futex_wait</div><div class='add'>+#define __NR_futex_wait 455</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef FUTEX2_SIZE_U32</div><div class='add'>+#define FUTEX2_SIZE_U32 0x02</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef FUTEX2_NUMA</div><div class='add'>+#define FUTEX2_NUMA 0x04</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef FUTEX2_MPOL</div><div class='add'>+#define FUTEX2_MPOL 0x08</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef FUTEX2_PRIVATE</div><div class='add'>+#define FUTEX2_PRIVATE FUTEX_PRIVATE_FLAG</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef FUTEX2_NO_NODE</div><div class='add'>+#define FUTEX_NO_NODE (-1)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef FUTEX_32</div><div class='add'>+#define FUTEX_32 FUTEX2_SIZE_U32</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct futex32_numa {</div><div class='add'>+	futex_t futex;</div><div class='add'>+	futex_t numa;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * futex_waitv - Wait at multiple futexes, wake on any</div><div class='ctx'>  * @waiters:    Array of waiters</div><div class='hunk'>@@ -18,5 +66,33 @@</div><div class='ctx'> static inline int futex_waitv(volatile struct futex_waitv *waiters, unsigned long nr_waiters,</div><div class='ctx'> 			      unsigned long flags, struct timespec *timo, clockid_t clockid)</div><div class='ctx'> {</div><div class='del'>-	return syscall(__NR_futex_waitv, waiters, nr_waiters, flags, timo, clockid);</div><div class='add'>+		struct __kernel_timespec ts = {</div><div class='add'>+			.tv_sec = timo-&gt;tv_sec,</div><div class='add'>+			.tv_nsec = timo-&gt;tv_nsec,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		return syscall(__NR_futex_waitv, waiters, nr_waiters, flags, &amp;ts, clockid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * futex_wait() - block on uaddr with optional timeout</div><div class='add'>+ * @val:	Expected value</div><div class='add'>+ * @flags:	FUTEX2 flags</div><div class='add'>+ * @timeout:	Relative timeout</div><div class='add'>+ * @clockid:	Clock id for the timeout</div><div class='add'>+ */</div><div class='add'>+static inline int futex2_wait(void *uaddr, long val, unsigned int flags,</div><div class='add'>+			      struct timespec *timeout, clockid_t clockid)</div><div class='add'>+{</div><div class='add'>+	return syscall(__NR_futex_wait, uaddr, val, ~0U, flags, timeout, clockid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * futex2_wake() - Wake a number of futexes</div><div class='add'>+ * @nr:		Number of threads to wake at most</div><div class='add'>+ * @flags:	FUTEX2 flags</div><div class='add'>+ */</div><div class='add'>+static inline int futex2_wake(void *uaddr, int nr, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	return syscall(__NR_futex_wake, uaddr, ~0U, nr, flags);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/testing/selftests/futex/include/futextest.h<br/>index ddbcfc9b7bac..3d48e9789d9f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/include/futextest.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/include/futextest.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/include/futextest.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/futex/include/futextest.h</a></div><div class='hunk'>@@ -47,6 +47,28 @@ typedef volatile u_int32_t futex_t;</div><div class='ctx'> 					 FUTEX_PRIVATE_FLAG)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * SYS_futex is expected from system C library, in glibc some 32-bit</div><div class='add'>+ * architectures (e.g. RV32) are using 64-bit time_t, therefore it doesn't have</div><div class='add'>+ * SYS_futex defined but just SYS_futex_time64. Define SYS_futex as</div><div class='add'>+ * SYS_futex_time64 in this situation to ensure the compilation and the</div><div class='add'>+ * compatibility.</div><div class='add'>+ */</div><div class='add'>+#if !defined(SYS_futex) &amp;&amp; defined(SYS_futex_time64)</div><div class='add'>+#define SYS_futex SYS_futex_time64</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On 32bit systems if we use "-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64" or if</div><div class='add'>+ * we are using a newer compiler then the size of the timestamps will be 64bit,</div><div class='add'>+ * however, the SYS_futex will still point to the 32bit futex system call.</div><div class='add'>+ */</div><div class='add'>+#if __SIZEOF_POINTER__ == 4 &amp;&amp; defined(SYS_futex_time64) &amp;&amp; \</div><div class='add'>+	defined(_TIME_BITS) &amp;&amp; _TIME_BITS == 64</div><div class='add'>+# undef SYS_futex</div><div class='add'>+# define SYS_futex SYS_futex_time64</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * futex() - SYS_futex syscall wrapper</div><div class='ctx'>  * @uaddr:	address of first futex</div><div class='head'>diff --git a/tools/testing/selftests/futex/include/logging.h b/tools/testing/selftests/futex/include/logging.h<br/>deleted file mode 100644<br/>index 874c69ce5cce..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/futex/include/logging.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/futex/include/logging.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,148 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/******************************************************************************</div><div class='del'>- *</div><div class='del'>- *   Copyright © International Business Machines  Corp., 2009</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION</div><div class='del'>- *      Glibc independent futex library for testing kernel functionality.</div><div class='del'>- *</div><div class='del'>- * AUTHOR</div><div class='del'>- *      Darren Hart &lt;dvhart@linux.intel.com&gt;</div><div class='del'>- *</div><div class='del'>- * HISTORY</div><div class='del'>- *      2009-Nov-6: Initial version by Darren Hart &lt;dvhart@linux.intel.com&gt;</div><div class='del'>- *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifndef _LOGGING_H</div><div class='del'>-#define _LOGGING_H</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;linux/futex.h&gt;</div><div class='del'>-#include "kselftest.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Define PASS, ERROR, and FAIL strings with and without color escape</div><div class='del'>- * sequences, default to no color.</div><div class='del'>- */</div><div class='del'>-#define ESC 0x1B, '['</div><div class='del'>-#define BRIGHT '1'</div><div class='del'>-#define GREEN '3', '2'</div><div class='del'>-#define YELLOW '3', '3'</div><div class='del'>-#define RED '3', '1'</div><div class='del'>-#define ESCEND 'm'</div><div class='del'>-#define BRIGHT_GREEN ESC, BRIGHT, ';', GREEN, ESCEND</div><div class='del'>-#define BRIGHT_YELLOW ESC, BRIGHT, ';', YELLOW, ESCEND</div><div class='del'>-#define BRIGHT_RED ESC, BRIGHT, ';', RED, ESCEND</div><div class='del'>-#define RESET_COLOR ESC, '0', 'm'</div><div class='del'>-static const char PASS_COLOR[] = {BRIGHT_GREEN, ' ', 'P', 'A', 'S', 'S',</div><div class='del'>-				  RESET_COLOR, 0};</div><div class='del'>-static const char ERROR_COLOR[] = {BRIGHT_YELLOW, 'E', 'R', 'R', 'O', 'R',</div><div class='del'>-				   RESET_COLOR, 0};</div><div class='del'>-static const char FAIL_COLOR[] = {BRIGHT_RED, ' ', 'F', 'A', 'I', 'L',</div><div class='del'>-				  RESET_COLOR, 0};</div><div class='del'>-static const char INFO_NORMAL[] = " INFO";</div><div class='del'>-static const char PASS_NORMAL[] = " PASS";</div><div class='del'>-static const char ERROR_NORMAL[] = "ERROR";</div><div class='del'>-static const char FAIL_NORMAL[] = " FAIL";</div><div class='del'>-const char *INFO = INFO_NORMAL;</div><div class='del'>-const char *PASS = PASS_NORMAL;</div><div class='del'>-const char *ERROR = ERROR_NORMAL;</div><div class='del'>-const char *FAIL = FAIL_NORMAL;</div><div class='del'>-</div><div class='del'>-/* Verbosity setting for INFO messages */</div><div class='del'>-#define VQUIET    0</div><div class='del'>-#define VCRITICAL 1</div><div class='del'>-#define VINFO     2</div><div class='del'>-#define VMAX      VINFO</div><div class='del'>-int _verbose = VCRITICAL;</div><div class='del'>-</div><div class='del'>-/* Functional test return codes */</div><div class='del'>-#define RET_PASS   0</div><div class='del'>-#define RET_ERROR -1</div><div class='del'>-#define RET_FAIL  -2</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * log_color() - Use colored output for PASS, ERROR, and FAIL strings</div><div class='del'>- * @use_color:	use color (1) or not (0)</div><div class='del'>- */</div><div class='del'>-void log_color(int use_color)</div><div class='del'>-{</div><div class='del'>-	if (use_color) {</div><div class='del'>-		PASS = PASS_COLOR;</div><div class='del'>-		ERROR = ERROR_COLOR;</div><div class='del'>-		FAIL = FAIL_COLOR;</div><div class='del'>-	} else {</div><div class='del'>-		PASS = PASS_NORMAL;</div><div class='del'>-		ERROR = ERROR_NORMAL;</div><div class='del'>-		FAIL = FAIL_NORMAL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * log_verbosity() - Set verbosity of test output</div><div class='del'>- * @verbose:	Enable (1) verbose output or not (0)</div><div class='del'>- *</div><div class='del'>- * Currently setting verbose=1 will enable INFO messages and 0 will disable</div><div class='del'>- * them. FAIL and ERROR messages are always displayed.</div><div class='del'>- */</div><div class='del'>-void log_verbosity(int level)</div><div class='del'>-{</div><div class='del'>-	if (level &gt; VMAX)</div><div class='del'>-		level = VMAX;</div><div class='del'>-	else if (level &lt; 0)</div><div class='del'>-		level = 0;</div><div class='del'>-	_verbose = level;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * print_result() - Print standard PASS | ERROR | FAIL results</div><div class='del'>- * @ret:	the return value to be considered: 0 | RET_ERROR | RET_FAIL</div><div class='del'>- *</div><div class='del'>- * print_result() is primarily intended for functional tests.</div><div class='del'>- */</div><div class='del'>-void print_result(const char *test_name, int ret)</div><div class='del'>-{</div><div class='del'>-	switch (ret) {</div><div class='del'>-	case RET_PASS:</div><div class='del'>-		ksft_test_result_pass("%s\n", test_name);</div><div class='del'>-		ksft_print_cnts();</div><div class='del'>-		return;</div><div class='del'>-	case RET_ERROR:</div><div class='del'>-		ksft_test_result_error("%s\n", test_name);</div><div class='del'>-		ksft_print_cnts();</div><div class='del'>-		return;</div><div class='del'>-	case RET_FAIL:</div><div class='del'>-		ksft_test_result_fail("%s\n", test_name);</div><div class='del'>-		ksft_print_cnts();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* log level macros */</div><div class='del'>-#define info(message, vargs...) \</div><div class='del'>-do { \</div><div class='del'>-	if (_verbose &gt;= VINFO) \</div><div class='del'>-		fprintf(stderr, "\t%s: "message, INFO, ##vargs); \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define error(message, err, args...) \</div><div class='del'>-do { \</div><div class='del'>-	if (_verbose &gt;= VCRITICAL) {\</div><div class='del'>-		if (err) \</div><div class='del'>-			fprintf(stderr, "\t%s: %s: "message, \</div><div class='del'>-				ERROR, strerror(err), ##args); \</div><div class='del'>-		else \</div><div class='del'>-			fprintf(stderr, "\t%s: "message, ERROR, ##args); \</div><div class='del'>-	} \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define fail(message, args...) \</div><div class='del'>-do { \</div><div class='del'>-	if (_verbose &gt;= VCRITICAL) \</div><div class='del'>-		fprintf(stderr, "\t%s: "message, FAIL, ##args); \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/tools/testing/selftests/gpio/Makefile b/tools/testing/selftests/gpio/Makefile<br/>index e0884390447d..7bfe315f7001 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/gpio/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/gpio/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/gpio/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/gpio/Makefile</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='del'>-TEST_PROGS := gpio-mockup.sh gpio-sim.sh</div><div class='add'>+TEST_PROGS := gpio-mockup.sh gpio-sim.sh gpio-aggregator.sh</div><div class='ctx'> TEST_FILES := gpio-mockup-sysfs.sh</div><div class='ctx'> TEST_GEN_PROGS_EXTENDED := gpio-mockup-cdev gpio-chip-info gpio-line-name</div><div class='ctx'> CFLAGS += -O2 -g -Wall $(KHDR_INCLUDES)</div><div class='head'>diff --git a/tools/testing/selftests/gpio/config b/tools/testing/selftests/gpio/config<br/>index 409a8532facc..1287abeaac7e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/gpio/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/gpio/config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/gpio/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/gpio/config</a></div><div class='hunk'>@@ -2,3 +2,4 @@ CONFIG_GPIOLIB=y</div><div class='ctx'> CONFIG_GPIO_CDEV=y</div><div class='ctx'> CONFIG_GPIO_MOCKUP=m</div><div class='ctx'> CONFIG_GPIO_SIM=m</div><div class='add'>+CONFIG_GPIO_AGGREGATOR=m</div><div class='head'>diff --git a/tools/testing/selftests/gpio/gpio-aggregator.sh b/tools/testing/selftests/gpio/gpio-aggregator.sh<br/>new file mode 100755<br/>index 000000000000..9b6f80ad9f8a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/gpio/gpio-aggregator.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/gpio/gpio-aggregator.sh</a></div><div class='hunk'>@@ -0,0 +1,727 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+# Copyright (C) 2025 Bartosz Golaszewski &lt;brgl@bgdev.pl&gt;</div><div class='add'>+# Copyright (C) 2025 Koichiro Den &lt;koichiro.den@canonical.com&gt;</div><div class='add'>+</div><div class='add'>+BASE_DIR=$(dirname "$0")</div><div class='add'>+CONFIGFS_SIM_DIR="/sys/kernel/config/gpio-sim"</div><div class='add'>+CONFIGFS_AGG_DIR="/sys/kernel/config/gpio-aggregator"</div><div class='add'>+SYSFS_AGG_DIR="/sys/bus/platform/drivers/gpio-aggregator"</div><div class='add'>+MODULE="gpio-aggregator"</div><div class='add'>+</div><div class='add'>+fail() {</div><div class='add'>+	echo "$*" &gt;&amp;2</div><div class='add'>+	echo "GPIO $MODULE test FAIL"</div><div class='add'>+	exit 1</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+skip() {</div><div class='add'>+	echo "$*" &gt;&amp;2</div><div class='add'>+	echo "GPIO $MODULE test SKIP"</div><div class='add'>+	exit 4</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# gpio-sim</div><div class='add'>+sim_enable_chip() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+</div><div class='add'>+	echo 1 &gt; "$CONFIGFS_SIM_DIR/$CHIP/live" || fail "Unable to enable the chip"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+sim_disable_chip() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+</div><div class='add'>+	echo 0 &gt; "$CONFIGFS_SIM_DIR/$CHIP/live" || fail "Unable to disable the chip"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+sim_configfs_cleanup() {</div><div class='add'>+	local NOCHECK=${1:-0}</div><div class='add'>+</div><div class='add'>+	for CHIP_DIR in "$CONFIGFS_SIM_DIR"/*; do</div><div class='add'>+		[ -d "$CHIP_DIR" ] || continue</div><div class='add'>+		echo 0 &gt; "$CHIP_DIR/live"</div><div class='add'>+		find "$CHIP_DIR" -depth -type d -exec rmdir {} \;</div><div class='add'>+	done</div><div class='add'>+	[ "$NOCHECK" -eq 1 ] &amp;&amp; return;</div><div class='add'>+	remaining=$(find "$CONFIGFS_SIM_DIR" -mindepth 1 -type d 2&gt; /dev/null)</div><div class='add'>+	if [ -n "$remaining" ]; then</div><div class='add'>+		fail "Directories remain in $CONFIGFS_SIM_DIR: $remaining"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+sim_get_chip_label() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+	local BANK=$2</div><div class='add'>+	local CHIP_NAME=$(cat "$CONFIGFS_SIM_DIR/$CHIP/$BANK/chip_name" 2&gt; /dev/null) || \</div><div class='add'>+		fail "Unable to read the chip name from configfs"</div><div class='add'>+</div><div class='add'>+	$BASE_DIR/gpio-chip-info "/dev/$CHIP_NAME" label || \</div><div class='add'>+		fail "Unable to read the chip label from the character device"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# gpio-aggregator</div><div class='add'>+agg_create_chip() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+</div><div class='add'>+	mkdir "$CONFIGFS_AGG_DIR/$CHIP"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_remove_chip() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+</div><div class='add'>+	find "$CONFIGFS_AGG_DIR/$CHIP/" -depth -type d -exec rmdir {} \; || \</div><div class='add'>+		fail "Unable to remove $CONFIGFS_AGG_DIR/$CHIP"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_create_line() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+	local LINE=$2</div><div class='add'>+</div><div class='add'>+	mkdir "$CONFIGFS_AGG_DIR/$CHIP/$LINE"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_remove_line() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+	local LINE=$2</div><div class='add'>+</div><div class='add'>+	rmdir "$CONFIGFS_AGG_DIR/$CHIP/$LINE"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_set_key() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+	local LINE=$2</div><div class='add'>+	local KEY=$3</div><div class='add'>+</div><div class='add'>+	echo "$KEY" &gt; "$CONFIGFS_AGG_DIR/$CHIP/$LINE/key" || fail "Unable to set the lookup key"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_set_offset() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+	local LINE=$2</div><div class='add'>+	local OFFSET=$3</div><div class='add'>+</div><div class='add'>+	echo "$OFFSET" &gt; "$CONFIGFS_AGG_DIR/$CHIP/$LINE/offset" || \</div><div class='add'>+		fail "Unable to set the lookup offset"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_set_line_name() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+	local LINE=$2</div><div class='add'>+	local NAME=$3</div><div class='add'>+</div><div class='add'>+	echo "$NAME" &gt; "$CONFIGFS_AGG_DIR/$CHIP/$LINE/name" || fail "Unable to set the line name"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_enable_chip() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+</div><div class='add'>+	echo 1 &gt; "$CONFIGFS_AGG_DIR/$CHIP/live" || fail "Unable to enable the chip"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_disable_chip() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+</div><div class='add'>+	echo 0 &gt; "$CONFIGFS_AGG_DIR/$CHIP/live" || fail "Unable to disable the chip"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_configfs_cleanup() {</div><div class='add'>+	local NOCHECK=${1:-0}</div><div class='add'>+</div><div class='add'>+	for CHIP_DIR in "$CONFIGFS_AGG_DIR"/*; do</div><div class='add'>+		[ -d "$CHIP_DIR" ] || continue</div><div class='add'>+		echo 0 &gt; "$CHIP_DIR/live" 2&gt; /dev/null</div><div class='add'>+		find "$CHIP_DIR" -depth -type d -exec rmdir {} \;</div><div class='add'>+	done</div><div class='add'>+	[ "$NOCHECK" -eq 1 ] &amp;&amp; return;</div><div class='add'>+	remaining=$(find "$CONFIGFS_AGG_DIR" -mindepth 1 -type d 2&gt; /dev/null)</div><div class='add'>+	if [ -n "$remaining" ]; then</div><div class='add'>+		fail "Directories remain in $CONFIGFS_AGG_DIR: $remaining"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_configfs_dev_name() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+</div><div class='add'>+	cat "$CONFIGFS_AGG_DIR/$CHIP/dev_name" 2&gt; /dev/null || \</div><div class='add'>+		fail "Unable to read the device name from configfs"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_configfs_chip_name() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+	local DEV_NAME=$(agg_configfs_dev_name "$CHIP")</div><div class='add'>+	local CHIP_LIST=$(find "/sys/devices/platform/$DEV_NAME" \</div><div class='add'>+		-maxdepth 1 -type d -name "gpiochip[0-9]*" 2&gt; /dev/null)</div><div class='add'>+	local CHIP_COUNT=$(echo "$CHIP_LIST" | wc -l)</div><div class='add'>+</div><div class='add'>+	if [ -z "$CHIP_LIST" ]; then</div><div class='add'>+		fail "No gpiochip in /sys/devices/platform/$DEV_NAME/"</div><div class='add'>+	elif [ "$CHIP_COUNT" -ne 1 ]; then</div><div class='add'>+		fail "Multiple gpiochips unexpectedly found: $CHIP_LIST"</div><div class='add'>+	fi</div><div class='add'>+	basename "$CHIP_LIST"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_get_chip_num_lines() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+	local N_DIR=$(ls -d $CONFIGFS_AGG_DIR/$CHIP/line[0-9]* 2&gt; /dev/null | wc -l)</div><div class='add'>+	local N_LINES</div><div class='add'>+</div><div class='add'>+	if [ "$(cat $CONFIGFS_AGG_DIR/$CHIP/live)" = 0 ]; then</div><div class='add'>+		echo "$N_DIR"</div><div class='add'>+	else</div><div class='add'>+		N_LINES=$(</div><div class='add'>+			$BASE_DIR/gpio-chip-info \</div><div class='add'>+				"/dev/$(agg_configfs_chip_name "$CHIP")" num-lines</div><div class='add'>+		) || fail "Unable to read the number of lines from the character device"</div><div class='add'>+		if [ $N_DIR != $N_LINES ]; then</div><div class='add'>+			fail "Discrepancy between two sources for the number of lines"</div><div class='add'>+		fi</div><div class='add'>+		echo "$N_LINES"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_get_chip_label() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+</div><div class='add'>+	$BASE_DIR/gpio-chip-info "/dev/$(agg_configfs_chip_name "$CHIP")" label || \</div><div class='add'>+		fail "Unable to read the chip label from the character device"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+agg_get_line_name() {</div><div class='add'>+	local CHIP=$1</div><div class='add'>+	local OFFSET=$2</div><div class='add'>+	local NAME_CONFIGFS=$(cat "$CONFIGFS_AGG_DIR/$CHIP/line${OFFSET}/name")</div><div class='add'>+	local NAME_CDEV</div><div class='add'>+</div><div class='add'>+	if [ "$(cat "$CONFIGFS_AGG_DIR/$CHIP/live")" = 0 ]; then</div><div class='add'>+		echo "$NAME_CONFIGFS"</div><div class='add'>+	else</div><div class='add'>+		NAME_CDEV=$(</div><div class='add'>+			$BASE_DIR/gpio-line-name \</div><div class='add'>+				"/dev/$(agg_configfs_chip_name "$CHIP")" "$OFFSET"</div><div class='add'>+		) || fail "Unable to read the line name from the character device"</div><div class='add'>+		if [ "$NAME_CONFIGFS" != "$NAME_CDEV" ]; then</div><div class='add'>+			fail "Discrepancy between two sources for the name of line"</div><div class='add'>+		fi</div><div class='add'>+		echo "$NAME_CDEV"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+# Load the modules. This will pull in configfs if needed too.</div><div class='add'>+modprobe gpio-sim || skip "unable to load the gpio-sim module"</div><div class='add'>+modprobe gpio-aggregator || skip "unable to load the gpio-aggregator module"</div><div class='add'>+</div><div class='add'>+# Make sure configfs is mounted at /sys/kernel/config. Wait a bit if needed.</div><div class='add'>+for IDX in $(seq 5); do</div><div class='add'>+	if [ "$IDX" -eq "5" ]; then</div><div class='add'>+		skip "configfs not mounted at /sys/kernel/config"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	mountpoint -q /sys/kernel/config &amp;&amp; break</div><div class='add'>+	sleep 0.1</div><div class='add'>+done</div><div class='add'>+</div><div class='add'>+# If the module was already loaded: remove all previous chips</div><div class='add'>+agg_configfs_cleanup</div><div class='add'>+sim_configfs_cleanup</div><div class='add'>+</div><div class='add'>+trap "exit 1" SIGTERM SIGINT</div><div class='add'>+trap "agg_configfs_cleanup 1; sim_configfs_cleanup 1" EXIT</div><div class='add'>+</div><div class='add'>+# Use gpio-sim chips as the test backend</div><div class='add'>+for CHIP in $(seq -f "chip%g" 0 1); do</div><div class='add'>+	mkdir $CONFIGFS_SIM_DIR/$CHIP</div><div class='add'>+	for BANK in $(seq -f "bank%g" 0 1); do</div><div class='add'>+		mkdir -p "$CONFIGFS_SIM_DIR/$CHIP/$BANK"</div><div class='add'>+		echo "${CHIP}_${BANK}" &gt; "$CONFIGFS_SIM_DIR/$CHIP/$BANK/label" || \</div><div class='add'>+			fail "unable to set the chip label"</div><div class='add'>+		echo 16 &gt; "$CONFIGFS_SIM_DIR/$CHIP/$BANK/num_lines" || \</div><div class='add'>+			fail "unable to set the number of lines"</div><div class='add'>+		for IDX in $(seq 0 15); do</div><div class='add'>+			LINE_NAME="${CHIP}${BANK}_${IDX}"</div><div class='add'>+			LINE_DIR="$CONFIGFS_SIM_DIR/$CHIP/$BANK/line$IDX"</div><div class='add'>+			mkdir -p $LINE_DIR</div><div class='add'>+			echo "$LINE_NAME" &gt; "$LINE_DIR/name" || fail "unable to set the line name"</div><div class='add'>+		done</div><div class='add'>+	done</div><div class='add'>+	sim_enable_chip "$CHIP"</div><div class='add'>+done</div><div class='add'>+</div><div class='add'>+echo "1. GPIO aggregator creation/deletion"</div><div class='add'>+</div><div class='add'>+echo "1.1. Creation/deletion via configfs"</div><div class='add'>+</div><div class='add'>+echo "1.1.1. Minimum creation/deletion"</div><div class='add'>+agg_create_chip   agg0</div><div class='add'>+agg_create_line   agg0 line0</div><div class='add'>+agg_set_key       agg0 line0 "$(sim_get_chip_label chip0 bank0)"</div><div class='add'>+agg_set_offset    agg0 line0 5</div><div class='add'>+agg_set_line_name agg0 line0 test0</div><div class='add'>+agg_enable_chip   agg0</div><div class='add'>+test "$(cat "$CONFIGFS_AGG_DIR/agg0/live")" = 1 || fail "chip unexpectedly dead"</div><div class='add'>+test "$(agg_get_chip_label agg0)" = "$(agg_configfs_dev_name agg0)" || \</div><div class='add'>+	fail "label is inconsistent"</div><div class='add'>+test "$(agg_get_chip_num_lines agg0)" = "1" || fail "number of lines is not 1"</div><div class='add'>+test "$(agg_get_line_name agg0 0)" = "test0" || fail "line name is unset"</div><div class='add'>+agg_disable_chip  agg0</div><div class='add'>+agg_remove_line   agg0 line0</div><div class='add'>+agg_remove_chip   agg0</div><div class='add'>+</div><div class='add'>+echo "1.1.2. Complex creation/deletion"</div><div class='add'>+agg_create_chip   agg0</div><div class='add'>+agg_create_line   agg0 line0</div><div class='add'>+agg_create_line   agg0 line1</div><div class='add'>+agg_create_line   agg0 line2</div><div class='add'>+agg_create_line   agg0 line3</div><div class='add'>+agg_set_key       agg0 line0 "$(sim_get_chip_label chip0 bank0)"</div><div class='add'>+agg_set_key       agg0 line1 "$(sim_get_chip_label chip0 bank1)"</div><div class='add'>+agg_set_key       agg0 line2 "$(sim_get_chip_label chip1 bank0)"</div><div class='add'>+agg_set_key       agg0 line3 "$(sim_get_chip_label chip1 bank1)"</div><div class='add'>+agg_set_offset    agg0 line0 1</div><div class='add'>+agg_set_offset    agg0 line1 3</div><div class='add'>+agg_set_offset    agg0 line2 5</div><div class='add'>+agg_set_offset    agg0 line3 7</div><div class='add'>+agg_set_line_name agg0 line0 test0</div><div class='add'>+agg_set_line_name agg0 line1 test1</div><div class='add'>+agg_set_line_name agg0 line2 test2</div><div class='add'>+agg_set_line_name agg0 line3 test3</div><div class='add'>+agg_enable_chip   agg0</div><div class='add'>+test "$(cat "$CONFIGFS_AGG_DIR/agg0/live")" = 1 || fail "chip unexpectedly dead"</div><div class='add'>+test "$(agg_get_chip_label agg0)" = "$(agg_configfs_dev_name agg0)" || \</div><div class='add'>+	fail "label is inconsistent"</div><div class='add'>+test "$(agg_get_chip_num_lines agg0)" = "4" || fail "number of lines is not 1"</div><div class='add'>+test "$(agg_get_line_name agg0 0)" = "test0" || fail "line name is unset"</div><div class='add'>+test "$(agg_get_line_name agg0 1)" = "test1" || fail "line name is unset"</div><div class='add'>+test "$(agg_get_line_name agg0 2)" = "test2" || fail "line name is unset"</div><div class='add'>+test "$(agg_get_line_name agg0 3)" = "test3" || fail "line name is unset"</div><div class='add'>+agg_disable_chip  agg0</div><div class='add'>+agg_remove_line   agg0 line0</div><div class='add'>+agg_remove_line   agg0 line1</div><div class='add'>+agg_remove_line   agg0 line2</div><div class='add'>+agg_remove_line   agg0 line3</div><div class='add'>+agg_remove_chip   agg0</div><div class='add'>+</div><div class='add'>+echo "1.1.3. Can't instantiate a chip without any line"</div><div class='add'>+agg_create_chip   agg0</div><div class='add'>+echo 1 &gt; "$CONFIGFS_AGG_DIR/agg0/live" 2&gt; /dev/null &amp;&amp; fail "chip unexpectedly enabled"</div><div class='add'>+test "$(cat "$CONFIGFS_AGG_DIR/agg0/live")" = 0 || fail "chip unexpectedly alive"</div><div class='add'>+agg_remove_chip   agg0</div><div class='add'>+</div><div class='add'>+echo "1.1.4. Can't instantiate a chip with invalid configuration"</div><div class='add'>+agg_create_chip   agg0</div><div class='add'>+agg_create_line   agg0 line0</div><div class='add'>+agg_set_key       agg0 line0 "chipX_bankX"</div><div class='add'>+agg_set_offset    agg0 line0 99</div><div class='add'>+agg_set_line_name agg0 line0 test0</div><div class='add'>+echo 1 &gt; "$CONFIGFS_AGG_DIR/agg0/live" 2&gt; /dev/null &amp;&amp; fail "chip unexpectedly enabled"</div><div class='add'>+test "$(cat "$CONFIGFS_AGG_DIR/agg0/live")" = 0 || fail "chip unexpectedly alive"</div><div class='add'>+agg_remove_line   agg0 line0</div><div class='add'>+agg_remove_chip   agg0</div><div class='add'>+</div><div class='add'>+echo "1.1.5. Can't instantiate a chip asynchronously via deferred probe"</div><div class='add'>+agg_create_chip   agg0</div><div class='add'>+agg_create_line   agg0 line0</div><div class='add'>+agg_set_key       agg0 line0 "chip0_bank0"</div><div class='add'>+agg_set_offset    agg0 line0 5</div><div class='add'>+agg_set_line_name agg0 line0 test0</div><div class='add'>+sim_disable_chip  chip0</div><div class='add'>+echo 1 &gt; "$CONFIGFS_AGG_DIR/agg0/live" 2&gt; /dev/null &amp;&amp; fail "chip unexpectedly enabled"</div><div class='add'>+test "$(cat "$CONFIGFS_AGG_DIR/agg0/live")" = 0 || fail "chip unexpectedly alive"</div><div class='add'>+sim_enable_chip   chip0</div><div class='add'>+sleep 1</div><div class='add'>+test "$(cat "$CONFIGFS_AGG_DIR/agg0/live")" = 0 || \</div><div class='add'>+	fail "chip unexpectedly transitioned to 'live' state"</div><div class='add'>+agg_remove_line   agg0 line0</div><div class='add'>+agg_remove_chip   agg0</div><div class='add'>+</div><div class='add'>+echo "1.1.6. Can't instantiate a chip with _sysfs prefix"</div><div class='add'>+mkdir "$CONFIGFS_AGG_DIR/_sysfs" 2&gt; /dev/null &amp;&amp; fail "chip _sysfs unexpectedly created"</div><div class='add'>+mkdir "$CONFIGFS_AGG_DIR/_sysfs.foo" 2&gt; /dev/null &amp;&amp; fail "chip _sysfs.foo unexpectedly created"</div><div class='add'>+</div><div class='add'>+echo "1.2. Creation/deletion via sysfs"</div><div class='add'>+</div><div class='add'>+echo "1.2.1. Minimum creation/deletion"</div><div class='add'>+echo "chip0_bank0 0" &gt; "$SYSFS_AGG_DIR/new_device"</div><div class='add'>+CHIPNAME=$(agg_configfs_chip_name _sysfs.0)</div><div class='add'>+test "$(cat "$CONFIGFS_AGG_DIR/_sysfs.0/live")" = 1 || fail "chip unexpectedly dead"</div><div class='add'>+test "$(agg_get_chip_label _sysfs.0)" = "$(agg_configfs_dev_name _sysfs.0)" || \</div><div class='add'>+	fail "label is inconsistent"</div><div class='add'>+test "$(agg_get_chip_num_lines _sysfs.0)" = "1" || fail "number of lines is not 1"</div><div class='add'>+test "$(agg_get_line_name _sysfs.0 0)" = "" || fail "line name is unset"</div><div class='add'>+echo "$(agg_configfs_dev_name _sysfs.0)" &gt; "$SYSFS_AGG_DIR/delete_device"</div><div class='add'>+test -d $CONFIGFS_AGG_DIR/_sysfs.0 &amp;&amp; fail "_sysfs.0 unexpectedly remains"</div><div class='add'>+test -d /dev/${CHIPNAME} &amp;&amp; fail "/dev/${CHIPNAME} unexpectedly remains"</div><div class='add'>+</div><div class='add'>+echo "1.2.2. Complex creation/deletion"</div><div class='add'>+echo "chip0bank0_0 chip1_bank1 10-11" &gt; "$SYSFS_AGG_DIR/new_device"</div><div class='add'>+CHIPNAME=$(agg_configfs_chip_name _sysfs.0)</div><div class='add'>+test "$(cat "$CONFIGFS_AGG_DIR/_sysfs.0/live")" = 1 || fail "chip unexpectedly dead"</div><div class='add'>+test "$(agg_get_chip_label _sysfs.0)" = "$(agg_configfs_dev_name _sysfs.0)" || \</div><div class='add'>+	fail "label is inconsistent"</div><div class='add'>+test "$(agg_get_chip_num_lines _sysfs.0)" = "3" || fail "number of lines is not 3"</div><div class='add'>+test "$(agg_get_line_name _sysfs.0 0)" = "" || fail "line name is unset"</div><div class='add'>+test "$(agg_get_line_name _sysfs.0 1)" = "" || fail "line name is unset"</div><div class='add'>+test "$(agg_get_line_name _sysfs.0 2)" = "" || fail "line name is unset"</div><div class='add'>+echo "$(agg_configfs_dev_name _sysfs.0)" &gt; "$SYSFS_AGG_DIR/delete_device"</div><div class='add'>+test -d $CONFIGFS_AGG_DIR/_sysfs.0 &amp;&amp; fail "_sysfs.0 unexpectedly remains"</div><div class='add'>+test -d /dev/${CHIPNAME} &amp;&amp; fail "/dev/${CHIPNAME} unexpectedly remains"</div><div class='add'>+</div><div class='add'>+echo "1.2.3. Asynchronous creation with deferred probe"</div><div class='add'>+sim_disable_chip  chip0</div><div class='add'>+echo 'chip0_bank0 0' &gt; $SYSFS_AGG_DIR/new_device</div><div class='add'>+sleep 1</div><div class='add'>+test "$(cat "$CONFIGFS_AGG_DIR/_sysfs.0/live")" = 0 || fail "chip unexpectedly alive"</div><div class='add'>+sim_enable_chip  chip0</div><div class='add'>+sleep 1</div><div class='add'>+CHIPNAME=$(agg_configfs_chip_name _sysfs.0)</div><div class='add'>+test "$(cat "$CONFIGFS_AGG_DIR/_sysfs.0/live")" = 1 || fail "chip unexpectedly remains dead"</div><div class='add'>+test "$(agg_get_chip_label _sysfs.0)" = "$(agg_configfs_dev_name _sysfs.0)" || \</div><div class='add'>+	fail "label is inconsistent"</div><div class='add'>+test "$(agg_get_chip_num_lines _sysfs.0)" = "1" || fail "number of lines is not 1"</div><div class='add'>+test "$(agg_get_line_name _sysfs.0 0)" = "" || fail "line name unexpectedly set"</div><div class='add'>+echo "$(agg_configfs_dev_name _sysfs.0)" &gt; "$SYSFS_AGG_DIR/delete_device"</div><div class='add'>+test -d $CONFIGFS_AGG_DIR/_sysfs.0 &amp;&amp; fail "_sysfs.0 unexpectedly remains"</div><div class='add'>+test -d /dev/${CHIPNAME} &amp;&amp; fail "/dev/${CHIPNAME} unexpectedly remains"</div><div class='add'>+</div><div class='add'>+echo "1.2.4. Can't instantiate a chip with invalid configuration"</div><div class='add'>+echo "xyz 0" &gt; "$SYSFS_AGG_DIR/new_device"</div><div class='add'>+test "$(cat $CONFIGFS_AGG_DIR/_sysfs.0/live)" = 0 || fail "chip unexpectedly alive"</div><div class='add'>+echo "$(agg_configfs_dev_name _sysfs.0)" &gt; "$SYSFS_AGG_DIR/delete_device"</div><div class='add'>+</div><div class='add'>+echo "2. GPIO aggregator configuration"</div><div class='add'>+</div><div class='add'>+echo "2.1. Configuring aggregators instantiated via configfs"</div><div class='add'>+setup_2_1() {</div><div class='add'>+	agg_create_chip   agg0</div><div class='add'>+	agg_create_line   agg0 line0</div><div class='add'>+	agg_create_line   agg0 line1</div><div class='add'>+	agg_set_key       agg0 line0 "$(sim_get_chip_label chip0 bank0)"</div><div class='add'>+	agg_set_key       agg0 line1 "$(sim_get_chip_label chip1 bank0)"</div><div class='add'>+	agg_set_offset    agg0 line0 1</div><div class='add'>+	agg_set_offset    agg0 line1 3</div><div class='add'>+	agg_set_line_name agg0 line0 test0</div><div class='add'>+	agg_set_line_name agg0 line1 test1</div><div class='add'>+	agg_enable_chip   agg0</div><div class='add'>+}</div><div class='add'>+teardown_2_1() {</div><div class='add'>+	agg_configfs_cleanup</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+echo "2.1.1. While offline"</div><div class='add'>+</div><div class='add'>+echo "2.1.1.1. Line can be added/removed"</div><div class='add'>+setup_2_1</div><div class='add'>+agg_disable_chip  agg0</div><div class='add'>+agg_create_line   agg0 line2</div><div class='add'>+agg_set_key       agg0 line2 "$(sim_get_chip_label chip0 bank1)"</div><div class='add'>+agg_set_offset    agg0 line2 5</div><div class='add'>+agg_enable_chip   agg0</div><div class='add'>+test "$(agg_get_chip_num_lines agg0)" = "3" || fail "number of lines is not 1"</div><div class='add'>+teardown_2_1</div><div class='add'>+</div><div class='add'>+echo "2.1.1.2. Line key can be modified"</div><div class='add'>+setup_2_1</div><div class='add'>+agg_disable_chip  agg0</div><div class='add'>+agg_set_key       agg0 line0 "$(sim_get_chip_label chip0 bank1)"</div><div class='add'>+agg_set_key       agg0 line1 "$(sim_get_chip_label chip1 bank1)"</div><div class='add'>+agg_enable_chip   agg0</div><div class='add'>+teardown_2_1</div><div class='add'>+</div><div class='add'>+echo "2.1.1.3. Line name can be modified"</div><div class='add'>+setup_2_1</div><div class='add'>+agg_disable_chip  agg0</div><div class='add'>+agg_set_line_name agg0 line0 new0</div><div class='add'>+agg_set_line_name agg0 line1 new1</div><div class='add'>+agg_enable_chip   agg0</div><div class='add'>+test "$(agg_get_line_name agg0 0)" = "new0" || fail "line name is unset"</div><div class='add'>+test "$(agg_get_line_name agg0 1)" = "new1" || fail "line name is unset"</div><div class='add'>+teardown_2_1</div><div class='add'>+</div><div class='add'>+echo "2.1.1.4. Line offset can be modified"</div><div class='add'>+setup_2_1</div><div class='add'>+agg_disable_chip  agg0</div><div class='add'>+agg_set_offset    agg0 line0 5</div><div class='add'>+agg_set_offset    agg0 line1 7</div><div class='add'>+agg_enable_chip   agg0</div><div class='add'>+teardown_2_1</div><div class='add'>+</div><div class='add'>+echo "2.1.1.5. Can re-enable a chip after valid reconfiguration"</div><div class='add'>+setup_2_1</div><div class='add'>+agg_disable_chip  agg0</div><div class='add'>+agg_set_key       agg0 line0 "$(sim_get_chip_label chip1 bank1)"</div><div class='add'>+agg_set_offset    agg0 line0 15</div><div class='add'>+agg_set_key       agg0 line1 "$(sim_get_chip_label chip0 bank1)"</div><div class='add'>+agg_set_offset    agg0 line0 14</div><div class='add'>+agg_create_line   agg0 line2</div><div class='add'>+agg_set_key       agg0 line2 "$(sim_get_chip_label chip0 bank1)"</div><div class='add'>+agg_set_offset    agg0 line2 13</div><div class='add'>+agg_enable_chip   agg0</div><div class='add'>+test "$(agg_get_chip_num_lines agg0)" = "3" || fail "number of lines is not 1"</div><div class='add'>+teardown_2_1</div><div class='add'>+</div><div class='add'>+echo "2.1.1.7. Can't re-enable a chip with invalid reconfiguration"</div><div class='add'>+setup_2_1</div><div class='add'>+agg_disable_chip  agg0</div><div class='add'>+agg_set_key       agg0 line0 invalidkey</div><div class='add'>+echo 1 &gt; "$CONFIGFS_AGG_DIR/agg0/live" 2&gt; /dev/null &amp;&amp; fail "chip unexpectedly enabled"</div><div class='add'>+teardown_2_1</div><div class='add'>+setup_2_1</div><div class='add'>+agg_disable_chip  agg0</div><div class='add'>+agg_set_offset    agg0 line0 99</div><div class='add'>+echo 1 &gt; "$CONFIGFS_AGG_DIR/agg0/live" 2&gt; /dev/null &amp;&amp; fail "chip unexpectedly enabled"</div><div class='add'>+teardown_2_1</div><div class='add'>+</div><div class='add'>+echo "2.1.2. While online"</div><div class='add'>+</div><div class='add'>+echo "2.1.2.1. Can't add/remove line"</div><div class='add'>+setup_2_1</div><div class='add'>+mkdir "$CONFIGFS_AGG_DIR/agg0/line2" 2&gt; /dev/null &amp;&amp; fail "line unexpectedly added"</div><div class='add'>+rmdir "$CONFIGFS_AGG_DIR/agg0/line1" 2&gt; /dev/null &amp;&amp; fail "line unexpectedly removed"</div><div class='add'>+teardown_2_1</div><div class='add'>+</div><div class='add'>+echo "2.1.2.2. Can't modify line key"</div><div class='add'>+setup_2_1</div><div class='add'>+echo "chip1_bank1" &gt; "$CONFIGFS_AGG_DIR/agg0/line0/key" 2&gt; /dev/null &amp;&amp; \</div><div class='add'>+	fail "lookup key unexpectedly updated"</div><div class='add'>+teardown_2_1</div><div class='add'>+</div><div class='add'>+echo "2.1.2.3. Can't modify line name"</div><div class='add'>+setup_2_1</div><div class='add'>+echo "new0" &gt; "$CONFIGFS_AGG_DIR/agg0/line0/name" 2&gt; /dev/null &amp;&amp; \</div><div class='add'>+	fail "name unexpectedly updated"</div><div class='add'>+teardown_2_1</div><div class='add'>+</div><div class='add'>+echo "2.1.2.4. Can't modify line offset"</div><div class='add'>+setup_2_1</div><div class='add'>+echo "5" &gt; "$CONFIGFS_AGG_DIR/agg0/line0/offset" 2&gt; /dev/null &amp;&amp; \</div><div class='add'>+	fail "offset unexpectedly updated"</div><div class='add'>+teardown_2_1</div><div class='add'>+</div><div class='add'>+echo "2.2. Configuring aggregators instantiated via sysfs"</div><div class='add'>+setup_2_2() {</div><div class='add'>+	echo "chip0_bank0 1 chip1_bank0 3" &gt; "$SYSFS_AGG_DIR/new_device"</div><div class='add'>+}</div><div class='add'>+teardown_2_2() {</div><div class='add'>+	echo "$(agg_configfs_dev_name _sysfs.0)" &gt; "$SYSFS_AGG_DIR/delete_device"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+echo "2.2.1. While online"</div><div class='add'>+</div><div class='add'>+echo "2.2.1.1. Can toggle live"</div><div class='add'>+setup_2_2</div><div class='add'>+agg_disable_chip  _sysfs.0</div><div class='add'>+agg_enable_chip   _sysfs.0</div><div class='add'>+teardown_2_2</div><div class='add'>+</div><div class='add'>+echo "2.2.1.2. Can't add/remove line"</div><div class='add'>+setup_2_2</div><div class='add'>+mkdir "$CONFIGFS_AGG_DIR/_sysfs.0/line2" 2&gt; /dev/null &amp;&amp; fail "line unexpectedly added"</div><div class='add'>+rmdir "$CONFIGFS_AGG_DIR/_sysfs.0/line1" 2&gt; /dev/null &amp;&amp; fail "line unexpectedly removed"</div><div class='add'>+teardown_2_2</div><div class='add'>+</div><div class='add'>+echo "2.2.1.3. Can't modify line key"</div><div class='add'>+setup_2_2</div><div class='add'>+echo "chip1_bank1" &gt; "$CONFIGFS_AGG_DIR/_sysfs.0/line0/key" 2&gt; /dev/null &amp;&amp; \</div><div class='add'>+	fail "lookup key unexpectedly updated"</div><div class='add'>+teardown_2_2</div><div class='add'>+</div><div class='add'>+echo "2.2.1.4. Can't modify line name"</div><div class='add'>+setup_2_2</div><div class='add'>+echo "new0" &gt; "$CONFIGFS_AGG_DIR/_sysfs.0/line0/name" 2&gt; /dev/null &amp;&amp; \</div><div class='add'>+	fail "name unexpectedly updated"</div><div class='add'>+teardown_2_2</div><div class='add'>+</div><div class='add'>+echo "2.2.1.5. Can't modify line offset"</div><div class='add'>+setup_2_2</div><div class='add'>+echo "5" &gt; "$CONFIGFS_AGG_DIR/_sysfs.0/line0/offset" 2&gt; /dev/null &amp;&amp; \</div><div class='add'>+	fail "offset unexpectedly updated"</div><div class='add'>+teardown_2_2</div><div class='add'>+</div><div class='add'>+echo "2.2.2. While waiting for deferred probe"</div><div class='add'>+</div><div class='add'>+echo "2.2.2.1. Can't add/remove line despite live = 0"</div><div class='add'>+sim_disable_chip chip0</div><div class='add'>+setup_2_2</div><div class='add'>+mkdir "$CONFIGFS_AGG_DIR/_sysfs.0/line2" 2&gt; /dev/null &amp;&amp; fail "line unexpectedly added"</div><div class='add'>+rmdir "$CONFIGFS_AGG_DIR/_sysfs.0/line1" 2&gt; /dev/null &amp;&amp; fail "line unexpectedly removed"</div><div class='add'>+teardown_2_2</div><div class='add'>+sim_enable_chip chip0</div><div class='add'>+</div><div class='add'>+echo "2.2.2.2. Can't modify line key"</div><div class='add'>+sim_disable_chip chip0</div><div class='add'>+setup_2_2</div><div class='add'>+echo "chip1_bank1" &gt; "$CONFIGFS_AGG_DIR/_sysfs.0/line0/key" 2&gt; /dev/null &amp;&amp; \</div><div class='add'>+	fail "lookup key unexpectedly updated"</div><div class='add'>+teardown_2_2</div><div class='add'>+sim_enable_chip chip0</div><div class='add'>+</div><div class='add'>+echo "2.2.2.3. Can't modify line name"</div><div class='add'>+sim_disable_chip chip0</div><div class='add'>+setup_2_2</div><div class='add'>+echo "new0" &gt; "$CONFIGFS_AGG_DIR/_sysfs.0/line0/name" 2&gt; /dev/null &amp;&amp; \</div><div class='add'>+	fail "name unexpectedly updated"</div><div class='add'>+teardown_2_2</div><div class='add'>+sim_enable_chip chip0</div><div class='add'>+</div><div class='add'>+echo "2.2.2.4. Can't modify line offset"</div><div class='add'>+sim_disable_chip chip0</div><div class='add'>+setup_2_2</div><div class='add'>+echo 5 &gt; "$CONFIGFS_AGG_DIR/_sysfs.0/line0/offset" 2&gt; /dev/null &amp;&amp; \</div><div class='add'>+	fail "offset unexpectedly updated"</div><div class='add'>+teardown_2_2</div><div class='add'>+sim_enable_chip chip0</div><div class='add'>+</div><div class='add'>+echo "2.2.2.5. Can't toggle live"</div><div class='add'>+sim_disable_chip chip0</div><div class='add'>+setup_2_2</div><div class='add'>+test "$(cat "$CONFIGFS_AGG_DIR/_sysfs.0/live")" = 0 || fail "chip unexpectedly alive"</div><div class='add'>+echo 1 &gt; "$CONFIGFS_AGG_DIR/_sysfs.0/live" 2&gt; /dev/null &amp;&amp; fail "chip unexpectedly enabled"</div><div class='add'>+teardown_2_2</div><div class='add'>+sim_enable_chip chip0</div><div class='add'>+</div><div class='add'>+echo "2.2.3. While offline"</div><div class='add'>+</div><div class='add'>+echo "2.2.3.1. Can't add/remove line despite live = 0"</div><div class='add'>+setup_2_2</div><div class='add'>+agg_disable_chip _sysfs.0</div><div class='add'>+mkdir "$CONFIGFS_AGG_DIR/_sysfs.0/line2" 2&gt; /dev/null &amp;&amp; fail "line unexpectedly added"</div><div class='add'>+rmdir "$CONFIGFS_AGG_DIR/_sysfs.0/line1" 2&gt; /dev/null &amp;&amp; fail "line unexpectedly removed"</div><div class='add'>+teardown_2_2</div><div class='add'>+</div><div class='add'>+echo "2.2.3.2. Line key can be modified"</div><div class='add'>+setup_2_2</div><div class='add'>+agg_disable_chip  _sysfs.0</div><div class='add'>+agg_set_key       _sysfs.0 line0 "$(sim_get_chip_label chip0 bank1)"</div><div class='add'>+agg_set_key       _sysfs.0 line1 "$(sim_get_chip_label chip1 bank1)"</div><div class='add'>+agg_enable_chip   _sysfs.0</div><div class='add'>+teardown_2_2</div><div class='add'>+</div><div class='add'>+echo "2.2.3.3. Line name can be modified"</div><div class='add'>+setup_2_2</div><div class='add'>+agg_disable_chip  _sysfs.0</div><div class='add'>+agg_set_line_name _sysfs.0 line0 new0</div><div class='add'>+agg_set_line_name _sysfs.0 line1 new1</div><div class='add'>+agg_enable_chip   _sysfs.0</div><div class='add'>+test "$(agg_get_line_name _sysfs.0 0)" = "new0" || fail "line name is unset"</div><div class='add'>+test "$(agg_get_line_name _sysfs.0 1)" = "new1" || fail "line name is unset"</div><div class='add'>+teardown_2_2</div><div class='add'>+</div><div class='add'>+echo "2.2.3.4. Line offset can be modified"</div><div class='add'>+setup_2_2</div><div class='add'>+agg_disable_chip  _sysfs.0</div><div class='add'>+agg_set_offset    _sysfs.0 line0 5</div><div class='add'>+agg_set_offset    _sysfs.0 line1 7</div><div class='add'>+agg_enable_chip   _sysfs.0</div><div class='add'>+teardown_2_2</div><div class='add'>+</div><div class='add'>+echo "2.2.3.5. Can re-enable a chip with valid reconfiguration"</div><div class='add'>+setup_2_2</div><div class='add'>+agg_disable_chip  _sysfs.0</div><div class='add'>+agg_set_key       _sysfs.0 line0 "$(sim_get_chip_label chip1 bank1)"</div><div class='add'>+agg_set_offset    _sysfs.0 line0 15</div><div class='add'>+agg_set_key       _sysfs.0 line1 "$(sim_get_chip_label chip0 bank1)"</div><div class='add'>+agg_set_offset    _sysfs.0 line0 14</div><div class='add'>+agg_enable_chip   _sysfs.0</div><div class='add'>+teardown_2_2</div><div class='add'>+</div><div class='add'>+echo "2.2.3.6. Can't re-enable a chip with invalid reconfiguration"</div><div class='add'>+setup_2_2</div><div class='add'>+agg_disable_chip  _sysfs.0</div><div class='add'>+agg_set_key       _sysfs.0 line0 invalidkey</div><div class='add'>+echo 1 &gt; "$CONFIGFS_AGG_DIR/_sysfs.0/live" 2&gt; /dev/null &amp;&amp; fail "chip unexpectedly enabled"</div><div class='add'>+teardown_2_2</div><div class='add'>+setup_2_2</div><div class='add'>+agg_disable_chip  _sysfs.0</div><div class='add'>+agg_set_offset    _sysfs.0 line0 99</div><div class='add'>+echo 1 &gt; "$CONFIGFS_AGG_DIR/_sysfs.0/live" 2&gt; /dev/null &amp;&amp; fail "chip unexpectedly enabled"</div><div class='add'>+teardown_2_2</div><div class='add'>+</div><div class='add'>+echo "3. Module unload"</div><div class='add'>+</div><div class='add'>+echo "3.1. Can't unload module if there is at least one device created via configfs"</div><div class='add'>+agg_create_chip agg0</div><div class='add'>+modprobe -r gpio-aggregator 2&gt; /dev/null</div><div class='add'>+test -d /sys/module/gpio_aggregator || fail "module unexpectedly unloaded"</div><div class='add'>+agg_remove_chip agg0</div><div class='add'>+</div><div class='add'>+echo "3.2. Can unload module if there is no device created via configfs"</div><div class='add'>+echo "chip0_bank0 1 chip1_bank0 3" &gt; "$SYSFS_AGG_DIR/new_device"</div><div class='add'>+modprobe -r gpio-aggregator 2&gt; /dev/null</div><div class='add'>+test -d /sys/module/gpio_aggregator &amp;&amp; fail "module unexpectedly remains to be loaded"</div><div class='add'>+modprobe gpio-aggregator 2&gt; /dev/null</div><div class='add'>+</div><div class='add'>+echo "4. GPIO forwarder functional"</div><div class='add'>+SETTINGS="chip0:bank0:2 chip0:bank1:4 chip1:bank0:6 chip1:bank1:8"</div><div class='add'>+setup_4() {</div><div class='add'>+	local OFFSET=0</div><div class='add'>+	agg_create_chip agg0</div><div class='add'>+	for SETTING in $SETTINGS; do</div><div class='add'>+		CHIP=$(echo "$SETTING" | cut -d: -f1)</div><div class='add'>+		BANK=$(echo "$SETTING" | cut -d: -f2)</div><div class='add'>+		LINE=$(echo "$SETTING" | cut -d: -f3)</div><div class='add'>+		agg_create_line agg0 "line${OFFSET}"</div><div class='add'>+		agg_set_key     agg0 "line${OFFSET}" "$(sim_get_chip_label "$CHIP" "$BANK")"</div><div class='add'>+		agg_set_offset  agg0 "line${OFFSET}" "$LINE"</div><div class='add'>+		OFFSET=$(expr $OFFSET + 1)</div><div class='add'>+	done</div><div class='add'>+	agg_enable_chip agg0</div><div class='add'>+}</div><div class='add'>+teardown_4() {</div><div class='add'>+	agg_configfs_cleanup</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+echo "4.1. Forwarding set values"</div><div class='add'>+setup_4</div><div class='add'>+OFFSET=0</div><div class='add'>+for SETTING in $SETTINGS; do</div><div class='add'>+	CHIP=$(echo "$SETTING" | cut -d: -f1)</div><div class='add'>+	BANK=$(echo "$SETTING" | cut -d: -f2)</div><div class='add'>+	LINE=$(echo "$SETTING" | cut -d: -f3)</div><div class='add'>+	DEVNAME=$(cat "$CONFIGFS_SIM_DIR/$CHIP/dev_name")</div><div class='add'>+	CHIPNAME=$(cat "$CONFIGFS_SIM_DIR/$CHIP/$BANK/chip_name")</div><div class='add'>+	VAL_PATH="/sys/devices/platform/$DEVNAME/$CHIPNAME/sim_gpio${LINE}/value"</div><div class='add'>+	test $(cat $VAL_PATH) = "0" || fail "incorrect value read from sysfs"</div><div class='add'>+	$BASE_DIR/gpio-mockup-cdev -s 1 "/dev/$(agg_configfs_chip_name agg0)" "$OFFSET" &amp;</div><div class='add'>+	mock_pid=$!</div><div class='add'>+	sleep 0.1 # FIXME Any better way?</div><div class='add'>+	test "$(cat $VAL_PATH)" = "1" || fail "incorrect value read from sysfs"</div><div class='add'>+	kill "$mock_pid"</div><div class='add'>+	OFFSET=$(expr $OFFSET + 1)</div><div class='add'>+done</div><div class='add'>+teardown_4</div><div class='add'>+</div><div class='add'>+echo "4.2. Forwarding set config"</div><div class='add'>+setup_4</div><div class='add'>+OFFSET=0</div><div class='add'>+for SETTING in $SETTINGS; do</div><div class='add'>+	CHIP=$(echo "$SETTING" | cut -d: -f1)</div><div class='add'>+	BANK=$(echo "$SETTING" | cut -d: -f2)</div><div class='add'>+	LINE=$(echo "$SETTING" | cut -d: -f3)</div><div class='add'>+	DEVNAME=$(cat "$CONFIGFS_SIM_DIR/$CHIP/dev_name")</div><div class='add'>+	CHIPNAME=$(cat "$CONFIGFS_SIM_DIR/$CHIP/$BANK/chip_name")</div><div class='add'>+	VAL_PATH="/sys/devices/platform/$DEVNAME/$CHIPNAME/sim_gpio${LINE}/value"</div><div class='add'>+	$BASE_DIR/gpio-mockup-cdev -b pull-up "/dev/$(agg_configfs_chip_name agg0)" "$OFFSET"</div><div class='add'>+	test $(cat "$VAL_PATH") = "1" || fail "incorrect value read from sysfs"</div><div class='add'>+	OFFSET=$(expr $OFFSET + 1)</div><div class='add'>+done</div><div class='add'>+teardown_4</div><div class='add'>+</div><div class='add'>+echo "5. Race condition verification"</div><div class='add'>+</div><div class='add'>+echo "5.1. Stress test of new_device/delete_device and module load/unload"</div><div class='add'>+for _ in $(seq 1000); do</div><div class='add'>+	{</div><div class='add'>+		echo "dummy 0" &gt; "$SYSFS_AGG_DIR/new_device"</div><div class='add'>+		cat "$CONFIGFS_AGG_DIR/_sysfs.0/dev_name" &gt; "$SYSFS_AGG_DIR/delete_device"</div><div class='add'>+	} 2&gt; /dev/null</div><div class='add'>+done &amp;</div><div class='add'>+writer_pid=$!</div><div class='add'>+while kill -0 "$writer_pid" 2&gt; /dev/null; do</div><div class='add'>+	{</div><div class='add'>+		modprobe gpio-aggregator</div><div class='add'>+		modprobe -r gpio-aggregator</div><div class='add'>+	} 2&gt; /dev/null</div><div class='add'>+done</div><div class='add'>+</div><div class='add'>+echo "GPIO $MODULE test PASS"</div><div class='head'>diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile<br/>index 0336353bd15f..2839d2612ce3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/Makefile</a></div><div class='hunk'>@@ -43,10 +43,8 @@ TEST_GEN_PROGS = hid_bpf hidraw</div><div class='ctx'> # $3 - target (assumed to be file); only file name will be emitted;</div><div class='ctx'> # $4 - optional extra arg, emitted as-is, if provided.</div><div class='ctx'> ifeq ($(V),1)</div><div class='del'>-Q =</div><div class='ctx'> msg =</div><div class='ctx'> else</div><div class='del'>-Q = @</div><div class='ctx'> msg = @printf '  %-8s%s %s%s\n' "$(1)" "$(if $(2), [$(2)])" "$(notdir $(3))" "$(if $(4), $(4))";</div><div class='ctx'> MAKEFLAGS += --no-print-directory</div><div class='ctx'> submake_extras := feature_display=0</div><div class='head'>diff --git a/tools/testing/selftests/hid/config.common b/tools/testing/selftests/hid/config.common<br/>index 45b5570441ce..38c51158adf8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/config.common?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/config.common</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/config.common?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/config.common</a></div><div class='hunk'>@@ -39,7 +39,6 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y</div><div class='ctx'> CONFIG_CPU_FREQ_STAT=y</div><div class='ctx'> CONFIG_CPU_IDLE_GOV_LADDER=y</div><div class='ctx'> CONFIG_CPUSETS=y</div><div class='del'>-CONFIG_CRC_T10DIF=y</div><div class='ctx'> CONFIG_CRYPTO_BLAKE2B=y</div><div class='ctx'> CONFIG_CRYPTO_DEV_VIRTIO=y</div><div class='ctx'> CONFIG_CRYPTO_SEQIV=y</div><div class='hunk'>@@ -136,6 +135,7 @@ CONFIG_NET_EMATCH=y</div><div class='ctx'> CONFIG_NETFILTER_NETLINK_LOG=y</div><div class='ctx'> CONFIG_NETFILTER_NETLINK_QUEUE=y</div><div class='ctx'> CONFIG_NETFILTER_XTABLES=y</div><div class='add'>+CONFIG_NETFILTER_XTABLES_LEGACY=y</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_BPF=y</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=y</div><div class='head'>diff --git a/tools/testing/selftests/hid/hid_common.h b/tools/testing/selftests/hid/hid_common.h<br/>index f77f69c6657d..e3b267446fa0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/hid_common.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/hid_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/hid_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/hid_common.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Copyright (c) 2022-2024 Red Hat */</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> #include &lt;fnmatch.h&gt;</div><div class='hunk'>@@ -230,6 +230,12 @@ static int uhid_event(struct __test_metadata *_metadata, int fd)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case UHID_SET_REPORT:</div><div class='ctx'> 		UHID_LOG("UHID_SET_REPORT from uhid-dev");</div><div class='add'>+</div><div class='add'>+		answer.type = UHID_SET_REPORT_REPLY;</div><div class='add'>+		answer.u.set_report_reply.id = ev.u.set_report.id;</div><div class='add'>+		answer.u.set_report_reply.err = 0; /* success */</div><div class='add'>+</div><div class='add'>+		uhid_write(_metadata, fd, &amp;answer);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		TH_LOG("Invalid event from uhid-dev: %u", ev.type);</div><div class='head'>diff --git a/tools/testing/selftests/hid/hidraw.c b/tools/testing/selftests/hid/hidraw.c<br/>index 821db37ba4bb..d625772f8b7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/hidraw.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/hidraw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/hidraw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/hidraw.c</a></div><div class='hunk'>@@ -2,6 +2,9 @@</div><div class='ctx'> /* Copyright (c) 2022-2024 Red Hat */</div><div class='ctx'> </div><div class='ctx'> #include "hid_common.h"</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* for older kernels */</div><div class='ctx'> #ifndef HIDIOCREVOKE</div><div class='hunk'>@@ -215,6 +218,476 @@ TEST_F(hidraw, write_event_revoked)</div><div class='ctx'> 	pthread_mutex_unlock(&amp;uhid_output_mtx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGRDESCSIZE ioctl to get report descriptor size</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_rdescsize)</div><div class='add'>+{</div><div class='add'>+	int desc_size = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* call HIDIOCGRDESCSIZE ioctl */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGRDESCSIZE, &amp;desc_size);</div><div class='add'>+	ASSERT_EQ(err, 0) TH_LOG("HIDIOCGRDESCSIZE ioctl failed");</div><div class='add'>+</div><div class='add'>+	/* verify the size matches our test report descriptor */</div><div class='add'>+	ASSERT_EQ(desc_size, sizeof(rdesc))</div><div class='add'>+		TH_LOG("expected size %zu, got %d", sizeof(rdesc), desc_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGRDESC ioctl to get report descriptor data</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_rdesc)</div><div class='add'>+{</div><div class='add'>+	struct hidraw_report_descriptor desc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* get the full report descriptor */</div><div class='add'>+	desc.size = sizeof(rdesc);</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGRDESC, &amp;desc);</div><div class='add'>+	ASSERT_EQ(err, 0) TH_LOG("HIDIOCGRDESC ioctl failed");</div><div class='add'>+</div><div class='add'>+	/* verify the descriptor data matches our test descriptor */</div><div class='add'>+	ASSERT_EQ(memcmp(desc.value, rdesc, sizeof(rdesc)), 0)</div><div class='add'>+		TH_LOG("report descriptor data mismatch");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGRDESC ioctl with smaller buffer size</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_rdesc_small_buffer)</div><div class='add'>+{</div><div class='add'>+	struct hidraw_report_descriptor desc;</div><div class='add'>+	int err;</div><div class='add'>+	size_t small_size = sizeof(rdesc) / 2; /* request half the descriptor size */</div><div class='add'>+</div><div class='add'>+	/* get partial report descriptor */</div><div class='add'>+	desc.size = small_size;</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGRDESC, &amp;desc);</div><div class='add'>+	ASSERT_EQ(err, 0) TH_LOG("HIDIOCGRDESC ioctl failed with small buffer");</div><div class='add'>+</div><div class='add'>+	/* verify we got the first part of the descriptor */</div><div class='add'>+	ASSERT_EQ(memcmp(desc.value, rdesc, small_size), 0)</div><div class='add'>+		TH_LOG("partial report descriptor data mismatch");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGRAWINFO ioctl to get device information</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_rawinfo)</div><div class='add'>+{</div><div class='add'>+	struct hidraw_devinfo devinfo;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* get device info */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGRAWINFO, &amp;devinfo);</div><div class='add'>+	ASSERT_EQ(err, 0) TH_LOG("HIDIOCGRAWINFO ioctl failed");</div><div class='add'>+</div><div class='add'>+	/* verify device info matches our test setup */</div><div class='add'>+	ASSERT_EQ(devinfo.bustype, BUS_USB)</div><div class='add'>+		TH_LOG("expected bustype 0x03, got 0x%x", devinfo.bustype);</div><div class='add'>+	ASSERT_EQ(devinfo.vendor, 0x0001)</div><div class='add'>+		TH_LOG("expected vendor 0x0001, got 0x%x", devinfo.vendor);</div><div class='add'>+	ASSERT_EQ(devinfo.product, 0x0a37)</div><div class='add'>+		TH_LOG("expected product 0x0a37, got 0x%x", devinfo.product);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGFEATURE ioctl to get feature report</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_gfeature)</div><div class='add'>+{</div><div class='add'>+	__u8 buf[10] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* set report ID 1 in first byte */</div><div class='add'>+	buf[0] = 1;</div><div class='add'>+</div><div class='add'>+	/* get feature report */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGFEATURE(sizeof(buf)), buf);</div><div class='add'>+	ASSERT_EQ(err, sizeof(feature_data)) TH_LOG("HIDIOCGFEATURE ioctl failed, got %d", err);</div><div class='add'>+</div><div class='add'>+	/* verify we got the expected feature data */</div><div class='add'>+	ASSERT_EQ(buf[0], feature_data[0])</div><div class='add'>+		TH_LOG("expected feature_data[0] = %d, got %d", feature_data[0], buf[0]);</div><div class='add'>+	ASSERT_EQ(buf[1], feature_data[1])</div><div class='add'>+		TH_LOG("expected feature_data[1] = %d, got %d", feature_data[1], buf[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGFEATURE ioctl with invalid report ID</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_gfeature_invalid)</div><div class='add'>+{</div><div class='add'>+	__u8 buf[10] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* set invalid report ID (not 1) */</div><div class='add'>+	buf[0] = 2;</div><div class='add'>+</div><div class='add'>+	/* try to get feature report */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGFEATURE(sizeof(buf)), buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("HIDIOCGFEATURE should have failed with invalid report ID");</div><div class='add'>+	ASSERT_EQ(errno, EIO) TH_LOG("expected EIO, got errno %d", errno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test ioctl with incorrect nr bits</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_invalid_nr)</div><div class='add'>+{</div><div class='add'>+	char buf[256] = {0};</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int bad_cmd;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * craft an ioctl command with wrong _IOC_NR bits</div><div class='add'>+	 */</div><div class='add'>+	bad_cmd = _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x00, sizeof(buf)); /* 0 is not valid */</div><div class='add'>+</div><div class='add'>+	/* test the ioctl */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, bad_cmd, buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("ioctl read-write with wrong _IOC_NR (0) should have failed");</div><div class='add'>+	ASSERT_EQ(errno, ENOTTY)</div><div class='add'>+		TH_LOG("expected ENOTTY for wrong read-write _IOC_NR (0), got errno %d", errno);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * craft an ioctl command with wrong _IOC_NR bits</div><div class='add'>+	 */</div><div class='add'>+	bad_cmd = _IOC(_IOC_READ, 'H', 0x00, sizeof(buf)); /* 0 is not valid */</div><div class='add'>+</div><div class='add'>+	/* test the ioctl */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, bad_cmd, buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("ioctl read-only with wrong _IOC_NR (0) should have failed");</div><div class='add'>+	ASSERT_EQ(errno, ENOTTY)</div><div class='add'>+		TH_LOG("expected ENOTTY for wrong read-only _IOC_NR (0), got errno %d", errno);</div><div class='add'>+</div><div class='add'>+	/* also test with bigger number */</div><div class='add'>+	bad_cmd = _IOC(_IOC_READ, 'H', 0x42, sizeof(buf)); /* 0x42 is not valid as well */</div><div class='add'>+</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, bad_cmd, buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("ioctl read-only with wrong _IOC_NR (0x42) should have failed");</div><div class='add'>+	ASSERT_EQ(errno, ENOTTY)</div><div class='add'>+		TH_LOG("expected ENOTTY for wrong read-only _IOC_NR (0x42), got errno %d", errno);</div><div class='add'>+</div><div class='add'>+	/* also test with bigger number: 0x42 is not valid as well */</div><div class='add'>+	bad_cmd = _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x42, sizeof(buf));</div><div class='add'>+</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, bad_cmd, buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("ioctl read-write with wrong _IOC_NR (0x42) should have failed");</div><div class='add'>+	ASSERT_EQ(errno, ENOTTY)</div><div class='add'>+		TH_LOG("expected ENOTTY for wrong read-write _IOC_NR (0x42), got errno %d", errno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test ioctl with incorrect type bits</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_invalid_type)</div><div class='add'>+{</div><div class='add'>+	char buf[256] = {0};</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int bad_cmd;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * craft an ioctl command with wrong _IOC_TYPE bits</div><div class='add'>+	 */</div><div class='add'>+	bad_cmd = _IOC(_IOC_WRITE|_IOC_READ, 'I', 0x01, sizeof(buf)); /* 'I' should be 'H' */</div><div class='add'>+</div><div class='add'>+	/* test the ioctl */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, bad_cmd, buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("ioctl with wrong _IOC_TYPE (I) should have failed");</div><div class='add'>+	ASSERT_EQ(errno, EINVAL) TH_LOG("expected EINVAL for wrong _IOC_NR, got errno %d", errno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGFEATURE ioctl with incorrect _IOC_DIR bits</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_gfeature_invalid_dir)</div><div class='add'>+{</div><div class='add'>+	__u8 buf[10] = {0};</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int bad_cmd;</div><div class='add'>+</div><div class='add'>+	/* set report ID 1 in first byte */</div><div class='add'>+	buf[0] = 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * craft an ioctl command with wrong _IOC_DIR bits</div><div class='add'>+	 * HIDIOCGFEATURE should have _IOC_WRITE|_IOC_READ, let's use only _IOC_WRITE</div><div class='add'>+	 */</div><div class='add'>+	bad_cmd = _IOC(_IOC_WRITE, 'H', 0x07, sizeof(buf)); /* should be _IOC_WRITE|_IOC_READ */</div><div class='add'>+</div><div class='add'>+	/* try to get feature report with wrong direction bits */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, bad_cmd, buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("HIDIOCGFEATURE with wrong _IOC_DIR should have failed");</div><div class='add'>+	ASSERT_EQ(errno, EINVAL) TH_LOG("expected EINVAL for wrong _IOC_DIR, got errno %d", errno);</div><div class='add'>+</div><div class='add'>+	/* also test with only _IOC_READ */</div><div class='add'>+	bad_cmd = _IOC(_IOC_READ, 'H', 0x07, sizeof(buf)); /* should be _IOC_WRITE|_IOC_READ */</div><div class='add'>+</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, bad_cmd, buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("HIDIOCGFEATURE with wrong _IOC_DIR should have failed");</div><div class='add'>+	ASSERT_EQ(errno, EINVAL) TH_LOG("expected EINVAL for wrong _IOC_DIR, got errno %d", errno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test read-only ioctl with incorrect _IOC_DIR bits</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_readonly_invalid_dir)</div><div class='add'>+{</div><div class='add'>+	char buf[256] = {0};</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int bad_cmd;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * craft an ioctl command with wrong _IOC_DIR bits</div><div class='add'>+	 * HIDIOCGRAWNAME should have _IOC_READ, let's use _IOC_WRITE</div><div class='add'>+	 */</div><div class='add'>+	bad_cmd = _IOC(_IOC_WRITE, 'H', 0x04, sizeof(buf)); /* should be _IOC_READ */</div><div class='add'>+</div><div class='add'>+	/* try to get device name with wrong direction bits */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, bad_cmd, buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("HIDIOCGRAWNAME with wrong _IOC_DIR should have failed");</div><div class='add'>+	ASSERT_EQ(errno, EINVAL) TH_LOG("expected EINVAL for wrong _IOC_DIR, got errno %d", errno);</div><div class='add'>+</div><div class='add'>+	/* also test with _IOC_WRITE|_IOC_READ */</div><div class='add'>+	bad_cmd = _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x04, sizeof(buf)); /* should be only _IOC_READ */</div><div class='add'>+</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, bad_cmd, buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("HIDIOCGRAWNAME with wrong _IOC_DIR should have failed");</div><div class='add'>+	ASSERT_EQ(errno, EINVAL) TH_LOG("expected EINVAL for wrong _IOC_DIR, got errno %d", errno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCSFEATURE ioctl to set feature report</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_sfeature)</div><div class='add'>+{</div><div class='add'>+	__u8 buf[10] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* prepare feature report data */</div><div class='add'>+	buf[0] = 1; /* report ID */</div><div class='add'>+	buf[1] = 0x42;</div><div class='add'>+	buf[2] = 0x24;</div><div class='add'>+</div><div class='add'>+	/* set feature report */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCSFEATURE(3), buf);</div><div class='add'>+	ASSERT_EQ(err, 3) TH_LOG("HIDIOCSFEATURE ioctl failed, got %d", err);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Note: The uhid mock doesn't validate the set report data,</div><div class='add'>+	 * so we just verify the ioctl succeeds</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGINPUT ioctl to get input report</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_ginput)</div><div class='add'>+{</div><div class='add'>+	__u8 buf[10] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* set report ID 1 in first byte */</div><div class='add'>+	buf[0] = 1;</div><div class='add'>+</div><div class='add'>+	/* get input report */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGINPUT(sizeof(buf)), buf);</div><div class='add'>+	ASSERT_EQ(err, sizeof(feature_data)) TH_LOG("HIDIOCGINPUT ioctl failed, got %d", err);</div><div class='add'>+</div><div class='add'>+	/* verify we got the expected input data */</div><div class='add'>+	ASSERT_EQ(buf[0], feature_data[0])</div><div class='add'>+		TH_LOG("expected feature_data[0] = %d, got %d", feature_data[0], buf[0]);</div><div class='add'>+	ASSERT_EQ(buf[1], feature_data[1])</div><div class='add'>+		TH_LOG("expected feature_data[1] = %d, got %d", feature_data[1], buf[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGINPUT ioctl with invalid report ID</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_ginput_invalid)</div><div class='add'>+{</div><div class='add'>+	__u8 buf[10] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* set invalid report ID (not 1) */</div><div class='add'>+	buf[0] = 2;</div><div class='add'>+</div><div class='add'>+	/* try to get input report */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGINPUT(sizeof(buf)), buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("HIDIOCGINPUT should have failed with invalid report ID");</div><div class='add'>+	ASSERT_EQ(errno, EIO) TH_LOG("expected EIO, got errno %d", errno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCSINPUT ioctl to set input report</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_sinput)</div><div class='add'>+{</div><div class='add'>+	__u8 buf[10] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* prepare input report data */</div><div class='add'>+	buf[0] = 1; /* report ID */</div><div class='add'>+	buf[1] = 0x55;</div><div class='add'>+	buf[2] = 0xAA;</div><div class='add'>+</div><div class='add'>+	/* set input report */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCSINPUT(3), buf);</div><div class='add'>+	ASSERT_EQ(err, 3) TH_LOG("HIDIOCSINPUT ioctl failed, got %d", err);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Note: The uhid mock doesn't validate the set report data,</div><div class='add'>+	 * so we just verify the ioctl succeeds</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGOUTPUT ioctl to get output report</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_goutput)</div><div class='add'>+{</div><div class='add'>+	__u8 buf[10] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* set report ID 1 in first byte */</div><div class='add'>+	buf[0] = 1;</div><div class='add'>+</div><div class='add'>+	/* get output report */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGOUTPUT(sizeof(buf)), buf);</div><div class='add'>+	ASSERT_EQ(err, sizeof(feature_data)) TH_LOG("HIDIOCGOUTPUT ioctl failed, got %d", err);</div><div class='add'>+</div><div class='add'>+	/* verify we got the expected output data */</div><div class='add'>+	ASSERT_EQ(buf[0], feature_data[0])</div><div class='add'>+		TH_LOG("expected feature_data[0] = %d, got %d", feature_data[0], buf[0]);</div><div class='add'>+	ASSERT_EQ(buf[1], feature_data[1])</div><div class='add'>+		TH_LOG("expected feature_data[1] = %d, got %d", feature_data[1], buf[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGOUTPUT ioctl with invalid report ID</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_goutput_invalid)</div><div class='add'>+{</div><div class='add'>+	__u8 buf[10] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* set invalid report ID (not 1) */</div><div class='add'>+	buf[0] = 2;</div><div class='add'>+</div><div class='add'>+	/* try to get output report */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGOUTPUT(sizeof(buf)), buf);</div><div class='add'>+	ASSERT_LT(err, 0) TH_LOG("HIDIOCGOUTPUT should have failed with invalid report ID");</div><div class='add'>+	ASSERT_EQ(errno, EIO) TH_LOG("expected EIO, got errno %d", errno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCSOUTPUT ioctl to set output report</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_soutput)</div><div class='add'>+{</div><div class='add'>+	__u8 buf[10] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* prepare output report data */</div><div class='add'>+	buf[0] = 1; /* report ID */</div><div class='add'>+	buf[1] = 0x33;</div><div class='add'>+	buf[2] = 0xCC;</div><div class='add'>+</div><div class='add'>+	/* set output report */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCSOUTPUT(3), buf);</div><div class='add'>+	ASSERT_EQ(err, 3) TH_LOG("HIDIOCSOUTPUT ioctl failed, got %d", err);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Note: The uhid mock doesn't validate the set report data,</div><div class='add'>+	 * so we just verify the ioctl succeeds</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGRAWNAME ioctl to get device name string</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_rawname)</div><div class='add'>+{</div><div class='add'>+	char name[256] = {0};</div><div class='add'>+	char expected_name[64];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* get device name */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGRAWNAME(sizeof(name)), name);</div><div class='add'>+	ASSERT_GT(err, 0) TH_LOG("HIDIOCGRAWNAME ioctl failed, got %d", err);</div><div class='add'>+</div><div class='add'>+	/* construct expected name based on device id */</div><div class='add'>+	snprintf(expected_name, sizeof(expected_name), "test-uhid-device-%d", self-&gt;hid.dev_id);</div><div class='add'>+</div><div class='add'>+	/* verify the name matches expected pattern */</div><div class='add'>+	ASSERT_EQ(strcmp(name, expected_name), 0)</div><div class='add'>+		TH_LOG("expected name '%s', got '%s'", expected_name, name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGRAWPHYS ioctl to get device physical address string</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_rawphys)</div><div class='add'>+{</div><div class='add'>+	char phys[256] = {0};</div><div class='add'>+	char expected_phys[64];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* get device physical address */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGRAWPHYS(sizeof(phys)), phys);</div><div class='add'>+	ASSERT_GT(err, 0) TH_LOG("HIDIOCGRAWPHYS ioctl failed, got %d", err);</div><div class='add'>+</div><div class='add'>+	/* construct expected phys based on device id */</div><div class='add'>+	snprintf(expected_phys, sizeof(expected_phys), "%d", self-&gt;hid.dev_id);</div><div class='add'>+</div><div class='add'>+	/* verify the phys matches expected value */</div><div class='add'>+	ASSERT_EQ(strcmp(phys, expected_phys), 0)</div><div class='add'>+		TH_LOG("expected phys '%s', got '%s'", expected_phys, phys);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test HIDIOCGRAWUNIQ ioctl to get device unique identifier string</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_rawuniq)</div><div class='add'>+{</div><div class='add'>+	char uniq[256] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* get device unique identifier */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGRAWUNIQ(sizeof(uniq)), uniq);</div><div class='add'>+	ASSERT_GE(err, 0) TH_LOG("HIDIOCGRAWUNIQ ioctl failed, got %d", err);</div><div class='add'>+</div><div class='add'>+	/* uniq is typically empty in our test setup */</div><div class='add'>+	ASSERT_EQ(strlen(uniq), 0) TH_LOG("expected empty uniq, got '%s'", uniq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test device string ioctls with small buffer sizes</div><div class='add'>+ */</div><div class='add'>+TEST_F(hidraw, ioctl_strings_small_buffer)</div><div class='add'>+{</div><div class='add'>+	char small_buf[8] = {0};</div><div class='add'>+	char expected_name[64];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* test HIDIOCGRAWNAME with small buffer */</div><div class='add'>+	err = ioctl(self-&gt;hidraw_fd, HIDIOCGRAWNAME(sizeof(small_buf)), small_buf);</div><div class='add'>+	ASSERT_EQ(err, sizeof(small_buf))</div><div class='add'>+		TH_LOG("HIDIOCGRAWNAME with small buffer failed, got %d", err);</div><div class='add'>+</div><div class='add'>+	/* construct expected truncated name */</div><div class='add'>+	snprintf(expected_name, sizeof(expected_name), "test-uhid-device-%d", self-&gt;hid.dev_id);</div><div class='add'>+</div><div class='add'>+	/* verify we got truncated name (first 8 chars, no null terminator guaranteed) */</div><div class='add'>+	ASSERT_EQ(strncmp(small_buf, expected_name, sizeof(small_buf)), 0)</div><div class='add'>+		TH_LOG("expected truncated name to match first %zu chars", sizeof(small_buf));</div><div class='add'>+</div><div class='add'>+	/* Note: hidraw driver doesn't guarantee null termination when buffer is too small */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	return test_harness_run(argc, argv);</div><div class='head'>diff --git a/tools/testing/selftests/hid/tests/base.py b/tools/testing/selftests/hid/tests/base.py<br/>index 3a465768e507..5175cf235b2f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/base.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/base.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/base.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/tests/base.py</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> # Copyright (c) 2017 Benjamin Tissoires &lt;benjamin.tissoires@gmail.com&gt;</div><div class='ctx'> # Copyright (c) 2017 Red Hat, Inc.</div><div class='ctx'> </div><div class='add'>+import dataclasses</div><div class='ctx'> import libevdev</div><div class='ctx'> import os</div><div class='ctx'> import pytest</div><div class='hunk'>@@ -145,6 +146,18 @@ class UHIDTestDevice(BaseDevice):</div><div class='ctx'>         self.name = name</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+@dataclasses.dataclass</div><div class='add'>+class HidBpf:</div><div class='add'>+    object_name: str</div><div class='add'>+    has_rdesc_fixup: bool</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+@dataclasses.dataclass</div><div class='add'>+class KernelModule:</div><div class='add'>+    driver_name: str</div><div class='add'>+    module_name: str</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> class BaseTestCase:</div><div class='ctx'>     class TestUhid(object):</div><div class='ctx'>         syn_event = libevdev.InputEvent(libevdev.EV_SYN.SYN_REPORT)  # type: ignore</div><div class='hunk'>@@ -155,20 +168,20 @@ class BaseTestCase:</div><div class='ctx'> </div><div class='ctx'>         # List of kernel modules to load before starting the test</div><div class='ctx'>         # if any module is not available (not compiled), the test will skip.</div><div class='del'>-        # Each element is a tuple '(kernel driver name, kernel module)',</div><div class='del'>-        # for example ("playstation", "hid-playstation")</div><div class='del'>-        kernel_modules: List[Tuple[str, str]] = []</div><div class='add'>+        # Each element is a KernelModule object, for example</div><div class='add'>+        # KernelModule("playstation", "hid-playstation")</div><div class='add'>+        kernel_modules: List[KernelModule] = []</div><div class='ctx'> </div><div class='ctx'>         # List of in kernel HID-BPF object files to load</div><div class='ctx'>         # before starting the test</div><div class='ctx'>         # Any existing pre-loaded HID-BPF module will be removed</div><div class='ctx'>         # before the ones in this list will be manually loaded.</div><div class='del'>-        # Each Element is a tuple '(hid_bpf_object, rdesc_fixup_present)',</div><div class='del'>-        # for example '("xppen-ArtistPro16Gen2.bpf.o", True)'</div><div class='del'>-        # If 'rdesc_fixup_present' is True, the test needs to wait</div><div class='add'>+        # Each Element is a HidBpf object, for example</div><div class='add'>+        # 'HidBpf("xppen-ArtistPro16Gen2.bpf.o", True)'</div><div class='add'>+        # If 'has_rdesc_fixup' is True, the test needs to wait</div><div class='ctx'>         # for one unbind and rebind before it can be sure the kernel is</div><div class='ctx'>         # ready</div><div class='del'>-        hid_bpfs: List[Tuple[str, bool]] = []</div><div class='add'>+        hid_bpfs: List[HidBpf] = []</div><div class='ctx'> </div><div class='ctx'>         def assertInputEventsIn(self, expected_events, effective_events):</div><div class='ctx'>             effective_events = effective_events.copy()</div><div class='hunk'>@@ -232,25 +245,26 @@ class BaseTestCase:</div><div class='ctx'> </div><div class='ctx'>         @pytest.fixture()</div><div class='ctx'>         def load_kernel_module(self):</div><div class='del'>-            for kernel_driver, kernel_module in self.kernel_modules:</div><div class='del'>-                self._load_kernel_module(kernel_driver, kernel_module)</div><div class='add'>+            for k in self.kernel_modules:</div><div class='add'>+                self._load_kernel_module(k.driver_name, k.module_name)</div><div class='ctx'>             yield</div><div class='ctx'> </div><div class='ctx'>         def load_hid_bpfs(self):</div><div class='add'>+            # this function will only work when run in the kernel tree</div><div class='ctx'>             script_dir = Path(os.path.dirname(os.path.realpath(__file__)))</div><div class='ctx'>             root_dir = (script_dir / "../../../../..").resolve()</div><div class='ctx'>             bpf_dir = root_dir / "drivers/hid/bpf/progs"</div><div class='ctx'> </div><div class='add'>+            if not bpf_dir.exists():</div><div class='add'>+                pytest.skip("looks like we are not in the kernel tree, skipping")</div><div class='add'>+</div><div class='ctx'>             udev_hid_bpf = shutil.which("udev-hid-bpf")</div><div class='ctx'>             if not udev_hid_bpf:</div><div class='ctx'>                 pytest.skip("udev-hid-bpf not found in $PATH, skipping")</div><div class='ctx'> </div><div class='del'>-            wait = False</div><div class='del'>-            for _, rdesc_fixup in self.hid_bpfs:</div><div class='del'>-                if rdesc_fixup:</div><div class='del'>-                    wait = True</div><div class='add'>+            wait = any(b.has_rdesc_fixup for b in self.hid_bpfs)</div><div class='ctx'> </div><div class='del'>-            for hid_bpf, _ in self.hid_bpfs:</div><div class='add'>+            for hid_bpf in self.hid_bpfs:</div><div class='ctx'>                 # We need to start `udev-hid-bpf` in the background</div><div class='ctx'>                 # and dispatch uhid events in case the kernel needs</div><div class='ctx'>                 # to fetch features on the device</div><div class='hunk'>@@ -260,13 +274,13 @@ class BaseTestCase:</div><div class='ctx'>                         "--verbose",</div><div class='ctx'>                         "add",</div><div class='ctx'>                         str(self.uhdev.sys_path),</div><div class='del'>-                        str(bpf_dir / hid_bpf),</div><div class='add'>+                        str(bpf_dir / hid_bpf.object_name),</div><div class='ctx'>                     ],</div><div class='ctx'>                 )</div><div class='ctx'>                 while process.poll() is None:</div><div class='ctx'>                     self.uhdev.dispatch(1)</div><div class='ctx'> </div><div class='del'>-                if process.poll() != 0:</div><div class='add'>+                if process.returncode != 0:</div><div class='ctx'>                     pytest.fail(</div><div class='ctx'>                         f"Couldn't insert hid-bpf program '{hid_bpf}', marking the test as failed"</div><div class='ctx'>                     )</div><div class='head'>diff --git a/tools/testing/selftests/hid/tests/base_device.py b/tools/testing/selftests/hid/tests/base_device.py<br/>index e0515be97f83..59465c58d94d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/base_device.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/base_device.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/base_device.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/tests/base_device.py</a></div><div class='hunk'>@@ -18,10 +18,12 @@</div><div class='ctx'> # You should have received a copy of the GNU General Public License</div><div class='ctx'> # along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'> </div><div class='add'>+import dataclasses</div><div class='ctx'> import fcntl</div><div class='ctx'> import functools</div><div class='ctx'> import libevdev</div><div class='ctx'> import os</div><div class='add'>+import threading</div><div class='ctx'> </div><div class='ctx'> try:</div><div class='ctx'>     import pyudev</div><div class='hunk'>@@ -104,6 +106,12 @@ class PowerSupply(object):</div><div class='ctx'>         return self._type.str_value</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+@dataclasses.dataclass</div><div class='add'>+class HidReadiness:</div><div class='add'>+    is_ready: bool = False</div><div class='add'>+    count: int = 0</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> class HIDIsReady(object):</div><div class='ctx'>     """</div><div class='ctx'>     Companion class that binds to a kernel mechanism</div><div class='hunk'>@@ -115,18 +123,18 @@ class HIDIsReady(object):</div><div class='ctx'>     def __init__(self: "HIDIsReady", uhid: UHIDDevice) -&gt; None:</div><div class='ctx'>         self.uhid = uhid</div><div class='ctx'> </div><div class='del'>-    def is_ready(self: "HIDIsReady") -&gt; bool:</div><div class='add'>+    def is_ready(self: "HIDIsReady") -&gt; HidReadiness:</div><div class='ctx'>         """</div><div class='ctx'>         Overwrite in subclasses: should return True or False whether</div><div class='ctx'>         the attached uhid device is ready or not.</div><div class='ctx'>         """</div><div class='del'>-        return False</div><div class='add'>+        return HidReadiness()</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> class UdevHIDIsReady(HIDIsReady):</div><div class='ctx'>     _pyudev_context: ClassVar[Optional[pyudev.Context]] = None</div><div class='ctx'>     _pyudev_monitor: ClassVar[Optional[pyudev.Monitor]] = None</div><div class='del'>-    _uhid_devices: ClassVar[Dict[int, Tuple[bool, int]]] = {}</div><div class='add'>+    _uhid_devices: ClassVar[Dict[int, HidReadiness]] = {}</div><div class='ctx'> </div><div class='ctx'>     def __init__(self: "UdevHIDIsReady", uhid: UHIDDevice) -&gt; None:</div><div class='ctx'>         super().__init__(uhid)</div><div class='hunk'>@@ -157,18 +165,19 @@ class UdevHIDIsReady(HIDIsReady):</div><div class='ctx'> </div><div class='ctx'>             id = int(event.sys_path.strip().split(".")[-1], 16)</div><div class='ctx'> </div><div class='del'>-            device_ready, count = cls._uhid_devices.get(id, (False, 0))</div><div class='add'>+            readiness = cls._uhid_devices.setdefault(id, HidReadiness())</div><div class='ctx'> </div><div class='ctx'>             ready = event.action == "bind"</div><div class='del'>-            if not device_ready and ready:</div><div class='del'>-                count += 1</div><div class='del'>-            cls._uhid_devices[id] = (ready, count)</div><div class='add'>+            if not readiness.is_ready and ready:</div><div class='add'>+                readiness.count += 1</div><div class='add'>+</div><div class='add'>+            readiness.is_ready = ready</div><div class='ctx'> </div><div class='del'>-    def is_ready(self: "UdevHIDIsReady") -&gt; Tuple[bool, int]:</div><div class='add'>+    def is_ready(self: "UdevHIDIsReady") -&gt; HidReadiness:</div><div class='ctx'>         try:</div><div class='ctx'>             return self._uhid_devices[self.uhid.hid_id]</div><div class='ctx'>         except KeyError:</div><div class='del'>-            return (False, 0)</div><div class='add'>+            return HidReadiness()</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> class EvdevMatch(object):</div><div class='hunk'>@@ -322,11 +331,11 @@ class BaseDevice(UHIDDevice):</div><div class='ctx'> </div><div class='ctx'>     @property</div><div class='ctx'>     def kernel_is_ready(self: "BaseDevice") -&gt; bool:</div><div class='del'>-        return self._kernel_is_ready.is_ready()[0] and self.started</div><div class='add'>+        return self._kernel_is_ready.is_ready().is_ready and self.started</div><div class='ctx'> </div><div class='ctx'>     @property</div><div class='ctx'>     def kernel_ready_count(self: "BaseDevice") -&gt; int:</div><div class='del'>-        return self._kernel_is_ready.is_ready()[1]</div><div class='add'>+        return self._kernel_is_ready.is_ready().count</div><div class='ctx'> </div><div class='ctx'>     @property</div><div class='ctx'>     def input_nodes(self: "BaseDevice") -&gt; List[EvdevDevice]:</div><div class='hunk'>@@ -336,10 +345,28 @@ class BaseDevice(UHIDDevice):</div><div class='ctx'>         if not self.kernel_is_ready or not self.started:</div><div class='ctx'>             return []</div><div class='ctx'> </div><div class='add'>+        # Starting with kernel v6.16, an event is emitted when</div><div class='add'>+        # userspace opens a kernel device, and for some devices</div><div class='add'>+        # this translates into a SET_REPORT.</div><div class='add'>+        # Because EvdevDevice(path) opens every single evdev node</div><div class='add'>+        # we need to have a separate thread to process the incoming</div><div class='add'>+        # SET_REPORT or we end up having to wait for the kernel</div><div class='add'>+        # timeout of 5 seconds.</div><div class='add'>+        done = False</div><div class='add'>+</div><div class='add'>+        def dispatch():</div><div class='add'>+            while not done:</div><div class='add'>+                self.dispatch(1)</div><div class='add'>+</div><div class='add'>+        t = threading.Thread(target=dispatch)</div><div class='add'>+        t.start()</div><div class='add'>+</div><div class='ctx'>         self._input_nodes = [</div><div class='ctx'>             EvdevDevice(path)</div><div class='ctx'>             for path in self.walk_sysfs("input", "input/input*/event*")</div><div class='ctx'>         ]</div><div class='add'>+        done = True</div><div class='add'>+        t.join()</div><div class='ctx'>         return self._input_nodes</div><div class='ctx'> </div><div class='ctx'>     def match_evdev_rule(self, application, evdev):</div><div class='head'>diff --git a/tools/testing/selftests/hid/tests/test_apple_keyboard.py b/tools/testing/selftests/hid/tests/test_apple_keyboard.py<br/>index f81071d46166..0e17588b945c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_apple_keyboard.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_apple_keyboard.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_apple_keyboard.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/tests/test_apple_keyboard.py</a></div><div class='hunk'>@@ -8,13 +8,14 @@</div><div class='ctx'> </div><div class='ctx'> from .test_keyboard import ArrayKeyboard, TestArrayKeyboard</div><div class='ctx'> from hidtools.util import BusType</div><div class='add'>+from . import base</div><div class='ctx'> </div><div class='ctx'> import libevdev</div><div class='ctx'> import logging</div><div class='ctx'> </div><div class='ctx'> logger = logging.getLogger("hidtools.test.apple-keyboard")</div><div class='ctx'> </div><div class='del'>-KERNEL_MODULE = ("apple", "hid-apple")</div><div class='add'>+KERNEL_MODULE = base.KernelModule("apple", "hid-apple")</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> class KbdData(object):</div><div class='head'>diff --git a/tools/testing/selftests/hid/tests/test_gamepad.py b/tools/testing/selftests/hid/tests/test_gamepad.py<br/>index 8d5b5ffdae49..612197805931 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_gamepad.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_gamepad.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_gamepad.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/tests/test_gamepad.py</a></div><div class='hunk'>@@ -12,6 +12,7 @@ import pytest</div><div class='ctx'> </div><div class='ctx'> from .base_gamepad import BaseGamepad, JoystickGamepad, AxisMapping</div><div class='ctx'> from hidtools.util import BusType</div><div class='add'>+from .base import HidBpf</div><div class='ctx'> </div><div class='ctx'> import logging</div><div class='ctx'> </div><div class='hunk'>@@ -654,7 +655,7 @@ class TestAsusGamepad(BaseTest.TestGamepad):</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> class TestRaptorMach2Joystick(BaseTest.TestGamepad):</div><div class='del'>-    hid_bpfs = [("FR-TEC__Raptor-Mach-2.bpf.o", True)]</div><div class='add'>+    hid_bpfs = [HidBpf("FR-TEC__Raptor-Mach-2.bpf.o", True)]</div><div class='ctx'> </div><div class='ctx'>     def create_device(self):</div><div class='ctx'>         return RaptorMach2Joystick(</div><div class='head'>diff --git a/tools/testing/selftests/hid/tests/test_ite_keyboard.py b/tools/testing/selftests/hid/tests/test_ite_keyboard.py<br/>index 38550c167bae..f695eaad1648 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_ite_keyboard.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_ite_keyboard.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_ite_keyboard.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/tests/test_ite_keyboard.py</a></div><div class='hunk'>@@ -11,10 +11,11 @@ from hidtools.util import BusType</div><div class='ctx'> </div><div class='ctx'> import libevdev</div><div class='ctx'> import logging</div><div class='add'>+from . import base</div><div class='ctx'> </div><div class='ctx'> logger = logging.getLogger("hidtools.test.ite-keyboard")</div><div class='ctx'> </div><div class='del'>-KERNEL_MODULE = ("itetech", "hid_ite")</div><div class='add'>+KERNEL_MODULE = base.KernelModule("itetech", "hid_ite")</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> class KbdData(object):</div><div class='head'>diff --git a/tools/testing/selftests/hid/tests/test_mouse.py b/tools/testing/selftests/hid/tests/test_mouse.py<br/>index 66daf7e5975c..eb4e15a0e53b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_mouse.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_mouse.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_mouse.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/tests/test_mouse.py</a></div><div class='hunk'>@@ -439,6 +439,68 @@ class BadResolutionMultiplierMouse(ResolutionMultiplierMouse):</div><div class='ctx'>         return 32  # EPIPE</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+class BadReportDescriptorMouse(BaseMouse):</div><div class='add'>+    """</div><div class='add'>+    This "device" was one autogenerated by syzbot. There are a lot of issues in</div><div class='add'>+    it, and the most problematic is that it declares features that have no</div><div class='add'>+    size.</div><div class='add'>+</div><div class='add'>+    This leads to report-&gt;size being set to 0 and can mess up with usbhid</div><div class='add'>+    internals.  Fortunately, uhid merely passes the incoming buffer, without</div><div class='add'>+    touching it so a buffer of size 0 will be translated to [] without</div><div class='add'>+    triggering a kernel oops.</div><div class='add'>+</div><div class='add'>+    Because the report descriptor is wrong, no input are created, and we need</div><div class='add'>+    to tweak a little bit the parameters to make it look correct.</div><div class='add'>+    """</div><div class='add'>+</div><div class='add'>+    # fmt: off</div><div class='add'>+    report_descriptor = [</div><div class='add'>+        0x96, 0x01, 0x00,              # Report Count (1)                    0</div><div class='add'>+        0x06, 0x01, 0x00,              # Usage Page (Generic Desktop)        3</div><div class='add'>+        # 0x03, 0x00, 0x00, 0x00, 0x00,  # Ignored by the kernel somehow</div><div class='add'>+        0x2a, 0x90, 0xa0,              # Usage Maximum (41104)               6</div><div class='add'>+        0x27, 0x00, 0x00, 0x00, 0x00,  # Logical Maximum (0)                 9</div><div class='add'>+        0xb3, 0x81, 0x3e, 0x25, 0x03,  # Feature (Cnst,Arr,Abs,Vol)          14</div><div class='add'>+        0x1b, 0xdd, 0xe8, 0x40, 0x50,  # Usage Minimum (1346431197)          19</div><div class='add'>+        0x3b, 0x5d, 0x8c, 0x3d, 0xda,  # Designator Index                    24</div><div class='add'>+    ]</div><div class='add'>+    # fmt: on</div><div class='add'>+</div><div class='add'>+    def __init__(</div><div class='add'>+        self, rdesc=report_descriptor, name=None, input_info=(3, 0x045E, 0x07DA)</div><div class='add'>+    ):</div><div class='add'>+        super().__init__(rdesc, name, input_info)</div><div class='add'>+        self.high_resolution_report_called = False</div><div class='add'>+</div><div class='add'>+    def get_evdev(self, application=None):</div><div class='add'>+        assert self._input_nodes is None</div><div class='add'>+        return (</div><div class='add'>+            "Ok"  # should be a list or None, but both would fail, so abusing the system</div><div class='add'>+        )</div><div class='add'>+</div><div class='add'>+    def next_sync_events(self, application=None):</div><div class='add'>+        # there are no evdev nodes, so no events</div><div class='add'>+        return []</div><div class='add'>+</div><div class='add'>+    def is_ready(self):</div><div class='add'>+        # we wait for the SET_REPORT command to come</div><div class='add'>+        return self.high_resolution_report_called</div><div class='add'>+</div><div class='add'>+    def set_report(self, req, rnum, rtype, data):</div><div class='add'>+        if rtype != self.UHID_FEATURE_REPORT:</div><div class='add'>+            raise InvalidHIDCommunication(f"Unexpected report type: {rtype}")</div><div class='add'>+        if rnum != 0x0:</div><div class='add'>+            raise InvalidHIDCommunication(f"Unexpected report number: {rnum}")</div><div class='add'>+</div><div class='add'>+        if len(data) != 1:</div><div class='add'>+            raise InvalidHIDCommunication(f"Unexpected data: {data}, expected '[0]'")</div><div class='add'>+</div><div class='add'>+        self.high_resolution_report_called = True</div><div class='add'>+</div><div class='add'>+        return 0</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> class ResolutionMultiplierHWheelMouse(TwoWheelMouse):</div><div class='ctx'>     # fmt: off</div><div class='ctx'>     report_descriptor = [</div><div class='hunk'>@@ -975,3 +1037,11 @@ class TestMiMouse(TestWheelMouse):</div><div class='ctx'>             # assert below print out the real error</div><div class='ctx'>             pass</div><div class='ctx'>         assert remaining == []</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+class TestBadReportDescriptorMouse(base.BaseTestCase.TestUhid):</div><div class='add'>+    def create_device(self):</div><div class='add'>+        return BadReportDescriptorMouse()</div><div class='add'>+</div><div class='add'>+    def assertName(self, uhdev):</div><div class='add'>+        pass</div><div class='head'>diff --git a/tools/testing/selftests/hid/tests/test_multitouch.py b/tools/testing/selftests/hid/tests/test_multitouch.py<br/>index 4265012231c6..ece0ba8e7d34 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_multitouch.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_multitouch.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_multitouch.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/tests/test_multitouch.py</a></div><div class='hunk'>@@ -17,7 +17,7 @@ import time</div><div class='ctx'> </div><div class='ctx'> logger = logging.getLogger("hidtools.test.multitouch")</div><div class='ctx'> </div><div class='del'>-KERNEL_MODULE = ("hid-multitouch", "hid_multitouch")</div><div class='add'>+KERNEL_MODULE = base.KernelModule("hid-multitouch", "hid_multitouch")</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> def BIT(x):</div><div class='hunk'>@@ -1752,6 +1752,52 @@ class TestWin8TSConfidence(BaseTest.TestWin8Multitouch):</div><div class='ctx'>         assert evdev.slots[0][libevdev.EV_ABS.ABS_MT_TRACKING_ID] == -1</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+    @pytest.mark.skip_if_uhdev(</div><div class='add'>+        lambda uhdev: "Confidence" not in uhdev.fields,</div><div class='add'>+        "Device not compatible, missing Confidence usage",</div><div class='add'>+    )</div><div class='add'>+    def test_mt_confidence_bad_multi_release(self):</div><div class='add'>+        """Check for the sticky finger being properly detected.</div><div class='add'>+</div><div class='add'>+        We first inject 3 fingers, then release only the second.</div><div class='add'>+        After 100 ms, we should receive a generated event about the</div><div class='add'>+        2 missing fingers being released.</div><div class='add'>+        """</div><div class='add'>+        uhdev = self.uhdev</div><div class='add'>+        evdev = uhdev.get_evdev()</div><div class='add'>+</div><div class='add'>+        # send 3 touches</div><div class='add'>+        t0 = Touch(1, 50, 10)</div><div class='add'>+        t1 = Touch(2, 150, 100)</div><div class='add'>+        t2 = Touch(3, 250, 200)</div><div class='add'>+        r = uhdev.event([t0, t1, t2])</div><div class='add'>+        events = uhdev.next_sync_events()</div><div class='add'>+        self.debug_reports(r, uhdev, events)</div><div class='add'>+</div><div class='add'>+        # release the second</div><div class='add'>+        t1.tipswitch = False</div><div class='add'>+        r = uhdev.event([t1])</div><div class='add'>+        events = uhdev.next_sync_events()</div><div class='add'>+        self.debug_reports(r, uhdev, events)</div><div class='add'>+</div><div class='add'>+        # only the second is released</div><div class='add'>+        assert evdev.slots[0][libevdev.EV_ABS.ABS_MT_TRACKING_ID] != -1</div><div class='add'>+        assert evdev.slots[1][libevdev.EV_ABS.ABS_MT_TRACKING_ID] == -1</div><div class='add'>+        assert evdev.slots[2][libevdev.EV_ABS.ABS_MT_TRACKING_ID] != -1</div><div class='add'>+</div><div class='add'>+        # wait for the timer to kick in</div><div class='add'>+        time.sleep(0.2)</div><div class='add'>+</div><div class='add'>+        events = uhdev.next_sync_events()</div><div class='add'>+        self.debug_reports([], uhdev, events)</div><div class='add'>+</div><div class='add'>+        # now all 3 fingers are released</div><div class='add'>+        assert libevdev.InputEvent(libevdev.EV_KEY.BTN_TOUCH, 0) in events</div><div class='add'>+        assert evdev.slots[0][libevdev.EV_ABS.ABS_MT_TRACKING_ID] == -1</div><div class='add'>+        assert evdev.slots[1][libevdev.EV_ABS.ABS_MT_TRACKING_ID] == -1</div><div class='add'>+        assert evdev.slots[2][libevdev.EV_ABS.ABS_MT_TRACKING_ID] == -1</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> class TestElanXPS9360(BaseTest.TestWin8Multitouch):</div><div class='ctx'>     def create_device(self):</div><div class='ctx'>         return Digitizer(</div><div class='hunk'>@@ -2086,3 +2132,12 @@ class Testsynaptics_06cb_ce08(BaseTest.TestPTP):</div><div class='ctx'>             input_info=(BusType.I2C, 0x06CB, 0xCE08),</div><div class='ctx'>             rdesc="05 01 09 02 a1 01 85 02 09 01 a1 00 05 09 19 01 29 02 15 00 25 01 75 01 95 02 81 02 95 06 81 01 05 01 09 30 09 31 15 81 25 7f 75 08 95 02 81 06 c0 c0 05 01 09 02 a1 01 85 18 09 01 a1 00 05 09 19 01 29 03 46 00 00 15 00 25 01 75 01 95 03 81 02 95 05 81 01 05 01 09 30 09 31 15 81 25 7f 75 08 95 02 81 06 c0 c0 06 00 ff 09 02 a1 01 85 20 09 01 a1 00 09 03 15 00 26 ff 00 35 00 46 ff 00 75 08 95 05 81 02 c0 c0 05 0d 09 05 a1 01 85 03 05 0d 09 22 a1 02 15 00 25 01 09 47 09 42 95 02 75 01 81 02 95 01 75 03 25 05 09 51 81 02 75 01 95 03 81 03 05 01 15 00 26 f8 04 75 10 55 0e 65 11 09 30 35 00 46 24 04 95 01 81 02 46 30 02 26 a0 02 09 31 81 02 c0 05 0d 09 22 a1 02 15 00 25 01 09 47 09 42 95 02 75 01 81 02 95 01 75 03 25 05 09 51 81 02 75 01 95 03 81 03 05 01 15 00 26 f8 04 75 10 55 0e 65 11 09 30 35 00 46 24 04 95 01 81 02 46 30 02 26 a0 02 09 31 81 02 c0 05 0d 09 22 a1 02 15 00 25 01 09 47 09 42 95 02 75 01 81 02 95 01 75 03 25 05 09 51 81 02 75 01 95 03 81 03 05 01 15 00 26 f8 04 75 10 55 0e 65 11 09 30 35 00 46 24 04 95 01 81 02 46 30 02 26 a0 02 09 31 81 02 c0 05 0d 09 22 a1 02 15 00 25 01 09 47 09 42 95 02 75 01 81 02 95 01 75 03 25 05 09 51 81 02 75 01 95 03 81 03 05 01 15 00 26 f8 04 75 10 55 0e 65 11 09 30 35 00 46 24 04 95 01 81 02 46 30 02 26 a0 02 09 31 81 02 c0 05 0d 09 22 a1 02 15 00 25 01 09 47 09 42 95 02 75 01 81 02 95 01 75 03 25 05 09 51 81 02 75 01 95 03 81 03 05 01 15 00 26 f8 04 75 10 55 0e 65 11 09 30 35 00 46 24 04 95 01 81 02 46 30 02 26 a0 02 09 31 81 02 c0 05 0d 55 0c 66 01 10 47 ff ff 00 00 27 ff ff 00 00 75 10 95 01 09 56 81 02 09 54 25 7f 95 01 75 08 81 02 05 09 09 01 25 01 75 01 95 01 81 02 95 07 81 03 05 0d 85 08 09 55 09 59 75 04 95 02 25 0f b1 02 85 0d 09 60 75 01 95 01 15 00 25 01 b1 02 95 07 b1 03 85 07 06 00 ff 09 c5 15 00 26 ff 00 75 08 96 00 01 b1 02 c0 05 0d 09 0e a1 01 85 04 09 22 a1 02 09 52 15 00 25 0a 75 08 95 01 b1 02 c0 09 22 a1 00 85 06 09 57 09 58 75 01 95 02 25 01 b1 02 95 06 b1 03 c0 c0 06 00 ff 09 01 a1 01 85 09 09 02 15 00 26 ff 00 75 08 95 14 91 02 85 0a 09 03 15 00 26 ff 00 75 08 95 14 91 02 85 0b 09 04 15 00 26 ff 00 75 08 95 45 81 02 85 0c 09 05 15 00 26 ff 00 75 08 95 45 81 02 85 0f 09 06 15 00 26 ff 00 75 08 95 03 b1 02 85 0e 09 07 15 00 26 ff 00 75 08 95 01 b1 02 c0",</div><div class='ctx'>         )</div><div class='add'>+</div><div class='add'>+class Testsynaptics_06cb_ce26(TestWin8TSConfidence):</div><div class='add'>+    def create_device(self):</div><div class='add'>+        return PTP(</div><div class='add'>+            "uhid test synaptics_06cb_ce26",</div><div class='add'>+            max_contacts=5,</div><div class='add'>+            input_info=(BusType.I2C, 0x06CB, 0xCE26),</div><div class='add'>+            rdesc="05 01 09 02 a1 01 85 02 09 01 a1 00 05 09 19 01 29 02 15 00 25 01 75 01 95 02 81 02 95 06 81 01 05 01 09 30 09 31 15 81 25 7f 75 08 95 02 81 06 c0 c0 05 0d 09 05 a1 01 85 03 05 0d 09 22 a1 02 15 00 25 01 09 47 09 42 95 02 75 01 81 02 95 01 75 03 25 05 09 51 81 02 75 01 95 03 81 03 05 01 15 00 26 45 05 75 10 55 0e 65 11 09 30 35 00 46 64 04 95 01 81 02 46 a2 02 26 29 03 09 31 81 02 c0 05 0d 09 22 a1 02 15 00 25 01 09 47 09 42 95 02 75 01 81 02 95 01 75 03 25 05 09 51 81 02 75 01 95 03 81 03 05 01 15 00 26 45 05 75 10 55 0e 65 11 09 30 35 00 46 64 04 95 01 81 02 46 a2 02 26 29 03 09 31 81 02 c0 05 0d 09 22 a1 02 15 00 25 01 09 47 09 42 95 02 75 01 81 02 95 01 75 03 25 05 09 51 81 02 75 01 95 03 81 03 05 01 15 00 26 45 05 75 10 55 0e 65 11 09 30 35 00 46 64 04 95 01 81 02 46 a2 02 26 29 03 09 31 81 02 c0 05 0d 09 22 a1 02 15 00 25 01 09 47 09 42 95 02 75 01 81 02 95 01 75 03 25 05 09 51 81 02 75 01 95 03 81 03 05 01 15 00 26 45 05 75 10 55 0e 65 11 09 30 35 00 46 64 04 95 01 81 02 46 a2 02 26 29 03 09 31 81 02 c0 05 0d 09 22 a1 02 15 00 25 01 09 47 09 42 95 02 75 01 81 02 95 01 75 03 25 05 09 51 81 02 75 01 95 03 81 03 05 01 15 00 26 45 05 75 10 55 0e 65 11 09 30 35 00 46 64 04 95 01 81 02 46 a2 02 26 29 03 09 31 81 02 c0 05 0d 55 0c 66 01 10 47 ff ff 00 00 27 ff ff 00 00 75 10 95 01 09 56 81 02 09 54 25 7f 95 01 75 08 81 02 05 09 09 01 25 01 75 01 95 01 81 02 95 07 81 03 05 0d 85 08 09 55 09 59 75 04 95 02 25 0f b1 02 85 0d 09 60 75 01 95 01 15 00 25 01 b1 02 95 07 b1 03 85 07 06 00 ff 09 c5 15 00 26 ff 00 75 08 96 00 01 b1 02 c0 05 0d 09 0e a1 01 85 04 09 22 a1 02 09 52 15 00 25 0a 75 08 95 01 b1 02 c0 09 22 a1 00 85 06 09 57 09 58 75 01 95 02 25 01 b1 02 95 06 b1 03 c0 c0 06 00 ff 09 01 a1 01 85 09 09 02 15 00 26 ff 00 75 08 95 14 91 02 85 0a 09 03 15 00 26 ff 00 75 08 95 14 91 02 85 0b 09 04 15 00 26 ff 00 75 08 95 3d 81 02 85 0c 09 05 15 00 26 ff 00 75 08 95 3d 81 02 85 0f 09 06 15 00 26 ff 00 75 08 95 03 b1 02 85 0e 09 07 15 00 26 ff 00 75 08 95 01 b1 02 c0",</div><div class='add'>+        )</div><div class='head'>diff --git a/tools/testing/selftests/hid/tests/test_sony.py b/tools/testing/selftests/hid/tests/test_sony.py<br/>index 7e52c28e59c5..7fd3a8e6137d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_sony.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_sony.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_sony.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/tests/test_sony.py</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> from .base import application_matches</div><div class='add'>+from .base import KernelModule</div><div class='ctx'> from .test_gamepad import BaseTest</div><div class='ctx'> from hidtools.device.sony_gamepad import (</div><div class='ctx'>     PS3Controller,</div><div class='hunk'>@@ -24,9 +25,9 @@ import pytest</div><div class='ctx'> </div><div class='ctx'> logger = logging.getLogger("hidtools.test.sony")</div><div class='ctx'> </div><div class='del'>-PS3_MODULE = ("sony", "hid_sony")</div><div class='del'>-PS4_MODULE = ("playstation", "hid_playstation")</div><div class='del'>-PS5_MODULE = ("playstation", "hid_playstation")</div><div class='add'>+PS3_MODULE = KernelModule("sony", "hid_sony")</div><div class='add'>+PS4_MODULE = KernelModule("playstation", "hid_playstation")</div><div class='add'>+PS5_MODULE = KernelModule("playstation", "hid_playstation")</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> class SonyBaseTest:</div><div class='head'>diff --git a/tools/testing/selftests/hid/tests/test_tablet.py b/tools/testing/selftests/hid/tests/test_tablet.py<br/>index a9e2de1e8861..5b9abb616db4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_tablet.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_tablet.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_tablet.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/tests/test_tablet.py</a></div><div class='hunk'>@@ -10,6 +10,7 @@ from . import base</div><div class='ctx'> import copy</div><div class='ctx'> from enum import Enum</div><div class='ctx'> from hidtools.util import BusType</div><div class='add'>+from .base import HidBpf</div><div class='ctx'> import libevdev</div><div class='ctx'> import logging</div><div class='ctx'> import pytest</div><div class='hunk'>@@ -451,6 +452,7 @@ class Pen(object):</div><div class='ctx'>     def __init__(self, x, y):</div><div class='ctx'>         self.x = x</div><div class='ctx'>         self.y = y</div><div class='add'>+        self.distance = -10</div><div class='ctx'>         self.tipswitch = False</div><div class='ctx'>         self.tippressure = 15</div><div class='ctx'>         self.azimuth = 0</div><div class='hunk'>@@ -472,6 +474,7 @@ class Pen(object):</div><div class='ctx'>             for i in [</div><div class='ctx'>                 "x",</div><div class='ctx'>                 "y",</div><div class='add'>+                "distance",</div><div class='ctx'>                 "tippressure",</div><div class='ctx'>                 "azimuth",</div><div class='ctx'>                 "width",</div><div class='hunk'>@@ -553,6 +556,7 @@ class PenDigitizer(base.UHIDTestDevice):</div><div class='ctx'>             pen.tipswitch = False</div><div class='ctx'>             pen.tippressure = 0</div><div class='ctx'>             pen.azimuth = 0</div><div class='add'>+            pen.distance = 0</div><div class='ctx'>             pen.inrange = False</div><div class='ctx'>             pen.width = 0</div><div class='ctx'>             pen.height = 0</div><div class='hunk'>@@ -867,6 +871,29 @@ class BaseTest:</div><div class='ctx'>             state machine."""</div><div class='ctx'>             self._test_states(state_list, scribble, allow_intermediate_states=True)</div><div class='ctx'> </div><div class='add'>+        @pytest.mark.skip_if_uhdev(</div><div class='add'>+            lambda uhdev: "Z" not in uhdev.fields,</div><div class='add'>+            "Device not compatible, missing Z usage",</div><div class='add'>+        )</div><div class='add'>+        @pytest.mark.parametrize("scribble", [True, False], ids=["scribble", "static"])</div><div class='add'>+        @pytest.mark.parametrize(</div><div class='add'>+            "state_list",</div><div class='add'>+            [pytest.param(v, id=k) for k, v in PenState.legal_transitions().items()],</div><div class='add'>+        )</div><div class='add'>+        def test_z_reported_as_distance(self, state_list, scribble):</div><div class='add'>+            """Verify stylus Z values are reported as ABS_DISTANCE."""</div><div class='add'>+            self._test_states(state_list, scribble, allow_intermediate_states=False)</div><div class='add'>+</div><div class='add'>+            uhdev = self.uhdev</div><div class='add'>+            evdev = uhdev.get_evdev()</div><div class='add'>+            p = Pen(0, 0)</div><div class='add'>+            uhdev.move_to(p, PenState.PEN_IS_OUT_OF_RANGE, None)</div><div class='add'>+            p = Pen(100, 200)</div><div class='add'>+            uhdev.move_to(p, PenState.PEN_IS_IN_RANGE, None)</div><div class='add'>+            p.distance = -1</div><div class='add'>+            events = self.post(uhdev, p, None)</div><div class='add'>+            assert evdev.value[libevdev.EV_ABS.ABS_DISTANCE] == -1</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> class GXTP_pen(PenDigitizer):</div><div class='ctx'>     def event(self, pen, test_button):</div><div class='hunk'>@@ -1228,9 +1255,9 @@ class Huion_Kamvas_Pro_19_256c_006b(PenDigitizer):</div><div class='ctx'>         pen.current_state = state</div><div class='ctx'> </div><div class='ctx'>     def call_input_event(self, report):</div><div class='del'>-        if report[0] == 0x0a:</div><div class='add'>+        if report[0] == 0x0A:</div><div class='ctx'>             # ensures the original second Eraser usage is null</div><div class='del'>-            report[1] &amp;= 0xdf</div><div class='add'>+            report[1] &amp;= 0xDF</div><div class='ctx'> </div><div class='ctx'>             # ensures the original last bit is equal to bit 6 (In Range)</div><div class='ctx'>             if report[1] &amp; 0x40:</div><div class='hunk'>@@ -1291,6 +1318,35 @@ class Huion_Kamvas_Pro_19_256c_006b(PenDigitizer):</div><div class='ctx'>         return rs</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+class Wacom_2d1f_014b(PenDigitizer):</div><div class='add'>+    """</div><div class='add'>+    Pen that reports distance values with HID_GD_Z usage.</div><div class='add'>+    """</div><div class='add'>+    def __init__(</div><div class='add'>+        self,</div><div class='add'>+        name,</div><div class='add'>+        rdesc_str=None,</div><div class='add'>+        rdesc=None,</div><div class='add'>+        application="Pen",</div><div class='add'>+        physical="Stylus",</div><div class='add'>+        input_info=(BusType.USB, 0x2D1F, 0x014B),</div><div class='add'>+        evdev_name_suffix=None,</div><div class='add'>+    ):</div><div class='add'>+        super().__init__(</div><div class='add'>+            name, rdesc_str, rdesc, application, physical, input_info, evdev_name_suffix</div><div class='add'>+        )</div><div class='add'>+</div><div class='add'>+    def match_evdev_rule(self, application, evdev):</div><div class='add'>+        # there are 2 nodes created by the device, only one matters</div><div class='add'>+        return evdev.name.endswith("Stylus")</div><div class='add'>+</div><div class='add'>+    def event(self, pen, test_button):</div><div class='add'>+        # this device reports the distance through Z</div><div class='add'>+        pen.z = pen.distance</div><div class='add'>+</div><div class='add'>+        return super().event(pen, test_button)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> ################################################################################</div><div class='ctx'> #</div><div class='ctx'> # Windows 7 compatible devices</div><div class='hunk'>@@ -1472,7 +1528,7 @@ class TestGoodix_27c6_0e00(BaseTest.TestTablet):</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> class TestXPPen_ArtistPro16Gen2_28bd_095b(BaseTest.TestTablet):</div><div class='del'>-    hid_bpfs = [("XPPen__ArtistPro16Gen2.bpf.o", True)]</div><div class='add'>+    hid_bpfs = [HidBpf("XPPen__ArtistPro16Gen2.bpf.o", True)]</div><div class='ctx'> </div><div class='ctx'>     def create_device(self):</div><div class='ctx'>         dev = XPPen_ArtistPro16Gen2_28bd_095b(</div><div class='hunk'>@@ -1484,7 +1540,7 @@ class TestXPPen_ArtistPro16Gen2_28bd_095b(BaseTest.TestTablet):</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> class TestXPPen_Artist24_28bd_093a(BaseTest.TestTablet):</div><div class='del'>-    hid_bpfs = [("XPPen__Artist24.bpf.o", True)]</div><div class='add'>+    hid_bpfs = [HidBpf("XPPen__Artist24.bpf.o", True)]</div><div class='ctx'> </div><div class='ctx'>     def create_device(self):</div><div class='ctx'>         return XPPen_Artist24_28bd_093a(</div><div class='hunk'>@@ -1495,7 +1551,7 @@ class TestXPPen_Artist24_28bd_093a(BaseTest.TestTablet):</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> class TestHuion_Kamvas_Pro_19_256c_006b(BaseTest.TestTablet):</div><div class='del'>-    hid_bpfs = [("Huion__Kamvas-Pro-19.bpf.o", True)]</div><div class='add'>+    hid_bpfs = [HidBpf("Huion__Kamvas-Pro-19.bpf.o", True)]</div><div class='ctx'> </div><div class='ctx'>     def create_device(self):</div><div class='ctx'>         return Huion_Kamvas_Pro_19_256c_006b(</div><div class='hunk'>@@ -1503,3 +1559,19 @@ class TestHuion_Kamvas_Pro_19_256c_006b(BaseTest.TestTablet):</div><div class='ctx'>             rdesc="05 0d 09 02 a1 01 85 0a 09 20 a1 01 09 42 09 44 09 43 09 3c 09 45 15 00 25 01 75 01 95 06 81 02 09 32 75 01 95 01 81 02 81 03 05 01 09 30 09 31 55 0d 65 33 26 ff 7f 35 00 46 00 08 75 10 95 02 81 02 05 0d 09 30 26 ff 3f 75 10 95 01 81 02 09 3d 09 3e 15 a6 25 5a 75 08 95 02 81 02 c0 c0 05 0d 09 04 a1 01 85 04 09 22 a1 02 05 0d 95 01 75 06 09 51 15 00 25 3f 81 02 09 42 25 01 75 01 95 01 81 02 75 01 95 01 81 03 05 01 75 10 55 0e 65 11 09 30 26 ff 7f 35 00 46 15 0c 81 42 09 31 26 ff 7f 46 cb 06 81 42 05 0d 09 30 26 ff 1f 75 10 95 01 81 02 c0 05 0d 09 22 a1 02 05 0d 95 01 75 06 09 51 15 00 25 3f 81 02 09 42 25 01 75 01 95 01 81 02 75 01 95 01 81 03 05 01 75 10 55 0e 65 11 09 30 26 ff 7f 35 00 46 15 0c 81 42 09 31 26 ff 7f 46 cb 06 81 42 05 0d 09 30 26 ff 1f 75 10 95 01 81 02 c0 05 0d 09 56 55 00 65 00 27 ff ff ff 7f 95 01 75 20 81 02 09 54 25 7f 95 01 75 08 81 02 75 08 95 08 81 03 85 05 09 55 25 0a 75 08 95 01 b1 02 06 00 ff 09 c5 85 06 15 00 26 ff 00 75 08 96 00 01 b1 02 c0",</div><div class='ctx'>             input_info=(BusType.USB, 0x256C, 0x006B),</div><div class='ctx'>         )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+################################################################################</div><div class='add'>+#</div><div class='add'>+# Devices Reporting Distance</div><div class='add'>+#</div><div class='add'>+################################################################################</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+class TestWacom_2d1f_014b(BaseTest.TestTablet):</div><div class='add'>+    def create_device(self):</div><div class='add'>+        return Wacom_2d1f_014b(</div><div class='add'>+            "uhid test Wacom 2d1f_014b",</div><div class='add'>+            rdesc="05 0d 09 02 a1 01 85 02 09 20 a1 00 09 42 09 44 09 45 09 3c 09 5a 09 32 15 00 25 01 75 01 95 06 81 02 95 02 81 03 05 01 09 30 26 88 3e 46 88 3e 65 11 55 0d 75 10 95 01 81 02 09 31 26 60 53 46 60 53 81 02 05 0d 09 30 26 ff 0f 45 00 65 00 55 00 81 02 06 00 ff 09 04 75 08 26 ff 00 46 ff 00 65 11 55 0e 81 02 05 0d 09 3d 75 10 16 d8 dc 26 28 23 36 d8 dc 46 28 23 65 14 81 02 09 3e 81 02 05 01 09 32 16 01 ff 25 00 36 01 ff 45 00 65 11 81 02 05 0d 09 56 15 00 27 ff ff 00 00 35 00 47 ff ff 00 00 66 01 10 55 0c 81 02 45 00 65 00 55 00 c0 09 00 75 08 26 ff 00 b1 12 85 03 09 00 95 12 b1 12 85 05 09 00 95 04 b1 02 85 06 09 00 95 24 b1 02 85 16 09 00 15 00 26 ff 00 95 06 b1 02 85 17 09 00 95 0c b1 02 85 19 09 00 95 01 b1 02 85 0a 09 00 75 08 95 01 15 10 26 ff 00 b1 02 85 1e 09 00 95 10 b1 02 c0 06 00 ff 09 00 a1 01 85 09 05 0d 09 20 a1 00 09 00 15 00 26 ff 00 75 08 95 10 81 02 c0 09 00 95 03 b1 12 c0 06 00 ff 09 02 a1 01 85 07 09 00 96 09 01 b1 02 85 08 09 00 95 03 81 02 09 00 b1 02 85 0e 09 00 96 0a 01 b1 02 c0 05 0d 09 02 a1 01 85 1a 09 20 a1 00 09 42 09 44 09 45 09 3c 09 5a 09 32 15 00 25 01 75 01 95 06 81 02 09 38 25 03 75 02 95 01 81 02 05 01 09 30 26 88 3e 46 88 3e 65 11 55 0d 75 10 95 01 81 02 09 31 26 60 53 46 60 53 81 02 05 0d 09 30 26 ff 0f 46 b0 0f 66 11 e1 55 02 81 02 06 00 ff 09 04 75 08 26 ff 00 46 ff 00 65 11 55 0e 81 02 05 0d 09 3d 75 10 16 d8 dc 26 28 23 36 d8 dc 46 28 23 65 14 81 02 09 3e 81 02 05 01 09 32 16 01 ff 25 00 36 01 ff 45 00 65 11 81 02 05 0d 09 56 15 00 27 ff ff 00 00 35 00 47 ff ff 00 00 66 01 10 55 0c 81 02 45 00 65 00 55 00 c0 c0 06 00 ff 09 00 a1 01 85 1b 05 0d 09 20 a1 00 09 00 26 ff 00 75 08 95 10 81 02 c0 c0",</div><div class='add'>+            input_info=(BusType.USB, 0x2D1F, 0x014B),</div><div class='add'>+        )</div><div class='head'>diff --git a/tools/testing/selftests/hid/tests/test_wacom_generic.py b/tools/testing/selftests/hid/tests/test_wacom_generic.py<br/>index b62c7dba6777..2d6d04f0ff80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_wacom_generic.py?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/tests/test_wacom_generic.py</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/tests/test_wacom_generic.py?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/tests/test_wacom_generic.py</a></div><div class='hunk'>@@ -40,7 +40,7 @@ import logging</div><div class='ctx'> </div><div class='ctx'> logger = logging.getLogger("hidtools.test.wacom")</div><div class='ctx'> </div><div class='del'>-KERNEL_MODULE = ("wacom", "wacom")</div><div class='add'>+KERNEL_MODULE = base.KernelModule("wacom", "wacom")</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> class ProximityState(Enum):</div><div class='hunk'>@@ -892,9 +892,9 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest</div><div class='ctx'>         locations. The value of `t` may be incremented over time to move the</div><div class='ctx'>         points along a linear path.</div><div class='ctx'>         """</div><div class='del'>-        return [ self.make_contact(id, t) for id in range(0, n) ]</div><div class='add'>+        return [self.make_contact(id, t) for id in range(0, n)]</div><div class='ctx'> </div><div class='del'>-    def assert_contact(self, uhdev, evdev, contact_ids, t=0):</div><div class='add'>+    def assert_contact(self, evdev, contact_ids, t=0):</div><div class='ctx'>         """</div><div class='ctx'>         Assert properties of a contact generated by make_contact.</div><div class='ctx'>         """</div><div class='hunk'>@@ -916,12 +916,12 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest</div><div class='ctx'>             assert evdev.slots[slot_num][libevdev.EV_ABS.ABS_MT_POSITION_X] == x</div><div class='ctx'>             assert evdev.slots[slot_num][libevdev.EV_ABS.ABS_MT_POSITION_Y] == y</div><div class='ctx'> </div><div class='del'>-    def assert_contacts(self, uhdev, evdev, data, t=0):</div><div class='add'>+    def assert_contacts(self, evdev, data, t=0):</div><div class='ctx'>         """</div><div class='ctx'>         Assert properties of a list of contacts generated by make_contacts.</div><div class='ctx'>         """</div><div class='ctx'>         for contact_ids in data:</div><div class='del'>-            self.assert_contact(uhdev, evdev, contact_ids, t)</div><div class='add'>+            self.assert_contact(evdev, contact_ids, t)</div><div class='ctx'> </div><div class='ctx'>     def test_contact_id_0(self):</div><div class='ctx'>         """</div><div class='hunk'>@@ -997,12 +997,16 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest</div><div class='ctx'> </div><div class='ctx'>         assert libevdev.InputEvent(libevdev.EV_KEY.BTN_TOUCH, 1) in events</div><div class='ctx'> </div><div class='del'>-        self.assert_contacts(uhdev, evdev,</div><div class='del'>-            [ self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = None),</div><div class='del'>-              self.ContactIds(contact_id = 1, tracking_id = 0, slot_num = 0),</div><div class='del'>-              self.ContactIds(contact_id = 2, tracking_id = -1, slot_num = None),</div><div class='del'>-              self.ContactIds(contact_id = 3, tracking_id = 1, slot_num = 1),</div><div class='del'>-              self.ContactIds(contact_id = 4, tracking_id = -1, slot_num = None) ])</div><div class='add'>+        self.assert_contacts(</div><div class='add'>+            evdev,</div><div class='add'>+            [</div><div class='add'>+                self.ContactIds(contact_id=0, tracking_id=-1, slot_num=None),</div><div class='add'>+                self.ContactIds(contact_id=1, tracking_id=0, slot_num=0),</div><div class='add'>+                self.ContactIds(contact_id=2, tracking_id=-1, slot_num=None),</div><div class='add'>+                self.ContactIds(contact_id=3, tracking_id=1, slot_num=1),</div><div class='add'>+                self.ContactIds(contact_id=4, tracking_id=-1, slot_num=None),</div><div class='add'>+            ],</div><div class='add'>+        )</div><div class='ctx'> </div><div class='ctx'>     def confidence_change_assert_playback(self, uhdev, evdev, timeline):</div><div class='ctx'>         """</div><div class='hunk'>@@ -1026,8 +1030,8 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest</div><div class='ctx'>             events = uhdev.next_sync_events()</div><div class='ctx'>             self.debug_reports(r, uhdev, events)</div><div class='ctx'> </div><div class='del'>-            ids = [ x[0] for x in state ]</div><div class='del'>-            self.assert_contacts(uhdev, evdev, ids, t)</div><div class='add'>+            ids = [x[0] for x in state]</div><div class='add'>+            self.assert_contacts(evdev, ids, t)</div><div class='ctx'> </div><div class='ctx'>             t += 1</div><div class='ctx'> </div><div class='hunk'>@@ -1044,27 +1048,68 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest</div><div class='ctx'>         uhdev = self.uhdev</div><div class='ctx'>         evdev = uhdev.get_evdev()</div><div class='ctx'> </div><div class='del'>-        self.confidence_change_assert_playback(uhdev, evdev, [</div><div class='del'>-            # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='del'>-            # Both fingers confidently in contact</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = 0, slot_num = 0), True, True),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=1: Contact 0 == !Down + confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger looses confidence and clears only the tipswitch flag</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, True),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=2: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger has lost confidence and has both flags cleared</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=3: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger has lost confidence and has both flags cleared</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)]</div><div class='del'>-        ])</div><div class='add'>+        self.confidence_change_assert_playback(</div><div class='add'>+            uhdev,</div><div class='add'>+            evdev,</div><div class='add'>+            [</div><div class='add'>+                # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='add'>+                # Both fingers confidently in contact</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=0, slot_num=0),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=1: Contact 0 == !Down + confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger looses confidence and clears only the tipswitch flag</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),</div><div class='add'>+                        False,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=2: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger has lost confidence and has both flags cleared</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),</div><div class='add'>+                        False,</div><div class='add'>+                        False,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=3: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger has lost confidence and has both flags cleared</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),</div><div class='add'>+                        False,</div><div class='add'>+                        False,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+            ],</div><div class='add'>+        )</div><div class='ctx'> </div><div class='ctx'>     def test_confidence_loss_b(self):</div><div class='ctx'>         """</div><div class='hunk'>@@ -1079,27 +1124,68 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest</div><div class='ctx'>         uhdev = self.uhdev</div><div class='ctx'>         evdev = uhdev.get_evdev()</div><div class='ctx'> </div><div class='del'>-        self.confidence_change_assert_playback(uhdev, evdev, [</div><div class='del'>-            # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='del'>-            # Both fingers confidently in contact</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = 0, slot_num = 0), True, True),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=1: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger looses confidence and has both flags cleared simultaneously</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=2: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger has lost confidence and has both flags cleared</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=3: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger has lost confidence and has both flags cleared</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)]</div><div class='del'>-        ])</div><div class='add'>+        self.confidence_change_assert_playback(</div><div class='add'>+            uhdev,</div><div class='add'>+            evdev,</div><div class='add'>+            [</div><div class='add'>+                # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='add'>+                # Both fingers confidently in contact</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=0, slot_num=0),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=1: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger looses confidence and has both flags cleared simultaneously</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),</div><div class='add'>+                        False,</div><div class='add'>+                        False,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=2: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger has lost confidence and has both flags cleared</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),</div><div class='add'>+                        False,</div><div class='add'>+                        False,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=3: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger has lost confidence and has both flags cleared</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),</div><div class='add'>+                        False,</div><div class='add'>+                        False,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+            ],</div><div class='add'>+        )</div><div class='ctx'> </div><div class='ctx'>     def test_confidence_loss_c(self):</div><div class='ctx'>         """</div><div class='hunk'>@@ -1113,27 +1199,68 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest</div><div class='ctx'>         uhdev = self.uhdev</div><div class='ctx'>         evdev = uhdev.get_evdev()</div><div class='ctx'> </div><div class='del'>-        self.confidence_change_assert_playback(uhdev, evdev, [</div><div class='del'>-            # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='del'>-            # Both fingers confidently in contact</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = 0, slot_num = 0), True, True),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=1: Contact 0 == Down + !confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger looses confidence and clears only the confidence flag</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), True, False),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=2: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger has lost confidence and has both flags cleared</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=3: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger has lost confidence and has both flags cleared</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)]</div><div class='del'>-        ])</div><div class='add'>+        self.confidence_change_assert_playback(</div><div class='add'>+            uhdev,</div><div class='add'>+            evdev,</div><div class='add'>+            [</div><div class='add'>+                # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='add'>+                # Both fingers confidently in contact</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=0, slot_num=0),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=1: Contact 0 == Down + !confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger looses confidence and clears only the confidence flag</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),</div><div class='add'>+                        True,</div><div class='add'>+                        False,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=2: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger has lost confidence and has both flags cleared</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),</div><div class='add'>+                        False,</div><div class='add'>+                        False,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=3: Contact 0 == !Down + !confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger has lost confidence and has both flags cleared</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),</div><div class='add'>+                        False,</div><div class='add'>+                        False,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+            ],</div><div class='add'>+        )</div><div class='ctx'> </div><div class='ctx'>     def test_confidence_gain_a(self):</div><div class='ctx'>         """</div><div class='hunk'>@@ -1144,27 +1271,68 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest</div><div class='ctx'>         uhdev = self.uhdev</div><div class='ctx'>         evdev = uhdev.get_evdev()</div><div class='ctx'> </div><div class='del'>-        self.confidence_change_assert_playback(uhdev, evdev, [</div><div class='del'>-            # t=0: Contact 0 == Down + !confident; Contact 1 == Down + confident</div><div class='del'>-            # Only second finger is confidently in contact</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = None), True, False),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 0, slot_num = 0), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=1: Contact 0 == Down + !confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger gains confidence</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = None), True, False),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 0, slot_num = 0), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=2: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger remains confident</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = 1, slot_num = 1), True, True),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 0, slot_num = 0), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=3: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger remains confident</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = 1, slot_num = 1), True, True),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 0, slot_num = 0), True, True)]</div><div class='del'>-        ])</div><div class='add'>+        self.confidence_change_assert_playback(</div><div class='add'>+            uhdev,</div><div class='add'>+            evdev,</div><div class='add'>+            [</div><div class='add'>+                # t=0: Contact 0 == Down + !confident; Contact 1 == Down + confident</div><div class='add'>+                # Only second finger is confidently in contact</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=None),</div><div class='add'>+                        True,</div><div class='add'>+                        False,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=0, slot_num=0),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=1: Contact 0 == Down + !confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger gains confidence</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=None),</div><div class='add'>+                        True,</div><div class='add'>+                        False,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=0, slot_num=0),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=2: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger remains confident</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=0, slot_num=0),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=3: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger remains confident</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=0, slot_num=0),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+            ],</div><div class='add'>+        )</div><div class='ctx'> </div><div class='ctx'>     def test_confidence_gain_b(self):</div><div class='ctx'>         """</div><div class='hunk'>@@ -1175,24 +1343,65 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest</div><div class='ctx'>         uhdev = self.uhdev</div><div class='ctx'>         evdev = uhdev.get_evdev()</div><div class='ctx'> </div><div class='del'>-        self.confidence_change_assert_playback(uhdev, evdev, [</div><div class='del'>-            # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='del'>-            # First and second finger confidently in contact</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = 0, slot_num = 0), True, True),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=1: Contact 0 == Down + !confident; Contact 1 == Down + confident</div><div class='del'>-            # Firtst finger looses confidence</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), True, False),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=2: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger gains confidence</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = 2, slot_num = 0), True, True),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],</div><div class='del'>-</div><div class='del'>-            # t=3: Contact 0 == !Down + confident; Contact 1 == Down + confident</div><div class='del'>-            # First finger goes up</div><div class='del'>-            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, True),</div><div class='del'>-             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)]</div><div class='del'>-        ])</div><div class='add'>+        self.confidence_change_assert_playback(</div><div class='add'>+            uhdev,</div><div class='add'>+            evdev,</div><div class='add'>+            [</div><div class='add'>+                # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='add'>+                # First and second finger confidently in contact</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=0, slot_num=0),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=1: Contact 0 == Down + !confident; Contact 1 == Down + confident</div><div class='add'>+                # Firtst finger looses confidence</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),</div><div class='add'>+                        True,</div><div class='add'>+                        False,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=2: Contact 0 == Down + confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger gains confidence</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=2, slot_num=0),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+                # t=3: Contact 0 == !Down + confident; Contact 1 == Down + confident</div><div class='add'>+                # First finger goes up</div><div class='add'>+                [</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),</div><div class='add'>+                        False,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                    (</div><div class='add'>+                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),</div><div class='add'>+                        True,</div><div class='add'>+                        True,</div><div class='add'>+                    ),</div><div class='add'>+                ],</div><div class='add'>+            ],</div><div class='add'>+        )</div><div class='head'>diff --git a/tools/testing/selftests/hid/vmtest.sh b/tools/testing/selftests/hid/vmtest.sh<br/>index db534e9099a8..ecbd57f775a0 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/vmtest.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/hid/vmtest.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/hid/vmtest.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/hid/vmtest.sh</a></div><div class='hunk'>@@ -1,296 +1,474 @@</div><div class='ctx'> #!/bin/bash</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#</div><div class='add'>+# Copyright (c) 2025 Red Hat</div><div class='add'>+# Copyright (c) 2025 Meta Platforms, Inc. and affiliates</div><div class='add'>+#</div><div class='add'>+# Dependencies:</div><div class='add'>+#		* virtme-ng</div><div class='add'>+#		* busybox-static (used by virtme-ng)</div><div class='add'>+#		* qemu	(used by virtme-ng)</div><div class='add'>+</div><div class='add'>+readonly SCRIPT_DIR="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" &amp;&amp; pwd -P)"</div><div class='add'>+readonly KERNEL_CHECKOUT=$(realpath "${SCRIPT_DIR}"/../../../../)</div><div class='add'>+</div><div class='add'>+source "${SCRIPT_DIR}"/../kselftest/ktap_helpers.sh</div><div class='add'>+</div><div class='add'>+readonly HID_BPF_TEST="${SCRIPT_DIR}"/hid_bpf</div><div class='add'>+readonly HIDRAW_TEST="${SCRIPT_DIR}"/hidraw</div><div class='add'>+readonly HID_BPF_PROGS="${KERNEL_CHECKOUT}/drivers/hid/bpf/progs"</div><div class='add'>+readonly SSH_GUEST_PORT=22</div><div class='add'>+readonly WAIT_PERIOD=3</div><div class='add'>+readonly WAIT_PERIOD_MAX=60</div><div class='add'>+readonly WAIT_TOTAL=$(( WAIT_PERIOD * WAIT_PERIOD_MAX ))</div><div class='add'>+readonly QEMU_PIDFILE=$(mktemp /tmp/qemu_hid_vmtest_XXXX.pid)</div><div class='add'>+</div><div class='add'>+readonly QEMU_OPTS="\</div><div class='add'>+	 --pidfile ${QEMU_PIDFILE} \</div><div class='add'>+"</div><div class='add'>+readonly KERNEL_CMDLINE=""</div><div class='add'>+readonly LOG=$(mktemp /tmp/hid_vmtest_XXXX.log)</div><div class='add'>+readonly TEST_NAMES=(vm_hid_bpf vm_hidraw vm_pytest)</div><div class='add'>+readonly TEST_DESCS=(</div><div class='add'>+	"Run hid_bpf tests in the VM."</div><div class='add'>+	"Run hidraw tests in the VM."</div><div class='add'>+	"Run the hid-tools test-suite in the VM."</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+VERBOSE=0</div><div class='add'>+SHELL_MODE=0</div><div class='add'>+BUILD_HOST=""</div><div class='add'>+BUILD_HOST_PODMAN_CONTAINER_NAME=""</div><div class='add'>+</div><div class='add'>+usage() {</div><div class='add'>+	local name</div><div class='add'>+	local desc</div><div class='add'>+	local i</div><div class='add'>+</div><div class='add'>+	echo</div><div class='add'>+	echo "$0 [OPTIONS] [TEST]... [-- tests-args]"</div><div class='add'>+	echo "If no TEST argument is given, all tests will be run."</div><div class='add'>+	echo</div><div class='add'>+	echo "Options"</div><div class='add'>+	echo "  -b: build the kernel from the current source tree and use it for guest VMs"</div><div class='add'>+	echo "  -H: hostname for remote build host (used with -b)"</div><div class='add'>+	echo "  -p: podman container name for remote build host (used with -b)"</div><div class='add'>+	echo "      Example: -H beefyserver -p vng"</div><div class='add'>+	echo "  -q: set the path to or name of qemu binary"</div><div class='add'>+	echo "  -s: start a shell in the VM instead of running tests"</div><div class='add'>+	echo "  -v: more verbose output (can be repeated multiple times)"</div><div class='add'>+	echo</div><div class='add'>+	echo "Available tests"</div><div class='add'>+</div><div class='add'>+	for ((i = 0; i &lt; ${#TEST_NAMES[@]}; i++)); do</div><div class='add'>+		name=${TEST_NAMES[${i}]}</div><div class='add'>+		desc=${TEST_DESCS[${i}]}</div><div class='add'>+		printf "\t%-35s%-35s\n" "${name}" "${desc}"</div><div class='add'>+	done</div><div class='add'>+	echo</div><div class='ctx'> </div><div class='del'>-set -u</div><div class='del'>-set -e</div><div class='del'>-</div><div class='del'>-# This script currently only works for x86_64</div><div class='del'>-ARCH="$(uname -m)"</div><div class='del'>-case "${ARCH}" in</div><div class='del'>-x86_64)</div><div class='del'>-	QEMU_BINARY=qemu-system-x86_64</div><div class='del'>-	BZIMAGE="arch/x86/boot/bzImage"</div><div class='del'>-	;;</div><div class='del'>-*)</div><div class='del'>-	echo "Unsupported architecture"</div><div class='ctx'> 	exit 1</div><div class='del'>-	;;</div><div class='del'>-esac</div><div class='del'>-SCRIPT_DIR="$(dirname $(realpath $0))"</div><div class='del'>-OUTPUT_DIR="$SCRIPT_DIR/results"</div><div class='del'>-KCONFIG_REL_PATHS=("${SCRIPT_DIR}/config" "${SCRIPT_DIR}/config.common" "${SCRIPT_DIR}/config.${ARCH}")</div><div class='del'>-B2C_URL="https://gitlab.freedesktop.org/gfx-ci/boot2container/-/raw/main/vm2c.py"</div><div class='del'>-NUM_COMPILE_JOBS="$(nproc)"</div><div class='del'>-LOG_FILE_BASE="$(date +"hid_selftests.%Y-%m-%d_%H-%M-%S")"</div><div class='del'>-LOG_FILE="${LOG_FILE_BASE}.log"</div><div class='del'>-EXIT_STATUS_FILE="${LOG_FILE_BASE}.exit_status"</div><div class='del'>-CONTAINER_IMAGE="registry.freedesktop.org/bentiss/hid/fedora/39:2023-11-22.1"</div><div class='del'>-</div><div class='del'>-TARGETS="${TARGETS:=$(basename ${SCRIPT_DIR})}"</div><div class='del'>-DEFAULT_COMMAND="pip3 install hid-tools; make -C tools/testing/selftests TARGETS=${TARGETS} run_tests"</div><div class='del'>-</div><div class='del'>-usage()</div><div class='del'>-{</div><div class='del'>-	cat &lt;&lt;EOF</div><div class='del'>-Usage: $0 [-j N] [-s] [-b] [-d &lt;output_dir&gt;] -- [&lt;command&gt;]</div><div class='del'>-</div><div class='del'>-&lt;command&gt; is the command you would normally run when you are in</div><div class='del'>-the source kernel direcory. e.g:</div><div class='del'>-</div><div class='del'>-	$0 -- ./tools/testing/selftests/hid/hid_bpf</div><div class='del'>-</div><div class='del'>-If no command is specified and a debug shell (-s) is not requested,</div><div class='del'>-"${DEFAULT_COMMAND}" will be run by default.</div><div class='del'>-</div><div class='del'>-If you build your kernel using KBUILD_OUTPUT= or O= options, these</div><div class='del'>-can be passed as environment variables to the script:</div><div class='del'>-</div><div class='del'>-  O=&lt;kernel_build_path&gt; $0 -- ./tools/testing/selftests/hid/hid_bpf</div><div class='del'>-</div><div class='del'>-or</div><div class='del'>-</div><div class='del'>-  KBUILD_OUTPUT=&lt;kernel_build_path&gt; $0 -- ./tools/testing/selftests/hid/hid_bpf</div><div class='del'>-</div><div class='del'>-Options:</div><div class='del'>-</div><div class='del'>-	-u)		Update the boot2container script to a newer version.</div><div class='del'>-	-d)		Update the output directory (default: ${OUTPUT_DIR})</div><div class='del'>-	-b)		Run only the build steps for the kernel and the selftests</div><div class='del'>-	-j)		Number of jobs for compilation, similar to -j in make</div><div class='del'>-			(default: ${NUM_COMPILE_JOBS})</div><div class='del'>-	-s)		Instead of powering off the VM, start an interactive</div><div class='del'>-			shell. If &lt;command&gt; is specified, the shell runs after</div><div class='del'>-			the command finishes executing</div><div class='del'>-EOF</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-download()</div><div class='del'>-{</div><div class='del'>-	local file="$1"</div><div class='add'>+die() {</div><div class='add'>+	echo "$*" &gt;&amp;2</div><div class='add'>+	exit "${KSFT_FAIL}"</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	echo "Downloading $file..." &gt;&amp;2</div><div class='del'>-	curl -Lsf "$file" -o "${@:2}"</div><div class='add'>+vm_ssh() {</div><div class='add'>+	# vng --ssh-client keeps shouting "Warning: Permanently added 'virtme-ng%22'</div><div class='add'>+	# (ED25519) to the list of known hosts.",</div><div class='add'>+	# So replace the command with what's actually called and add the "-q" option</div><div class='add'>+	stdbuf -oL ssh -q \</div><div class='add'>+		       -F ${HOME}/.cache/virtme-ng/.ssh/virtme-ng-ssh.conf \</div><div class='add'>+		       -l root virtme-ng%${SSH_GUEST_PORT} \</div><div class='add'>+		       "$@"</div><div class='add'>+	return $?</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-recompile_kernel()</div><div class='del'>-{</div><div class='del'>-	local kernel_checkout="$1"</div><div class='del'>-	local make_command="$2"</div><div class='add'>+cleanup() {</div><div class='add'>+	if [[ -s "${QEMU_PIDFILE}" ]]; then</div><div class='add'>+		pkill -SIGTERM -F "${QEMU_PIDFILE}" &gt; /dev/null 2&gt;&amp;1</div><div class='add'>+	fi</div><div class='ctx'> </div><div class='del'>-	cd "${kernel_checkout}"</div><div class='add'>+	# If failure occurred during or before qemu start up, then we need</div><div class='add'>+	# to clean this up ourselves.</div><div class='add'>+	if [[ -e "${QEMU_PIDFILE}" ]]; then</div><div class='add'>+		rm "${QEMU_PIDFILE}"</div><div class='add'>+	fi</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+check_args() {</div><div class='add'>+	local found</div><div class='ctx'> </div><div class='del'>-	${make_command} olddefconfig</div><div class='del'>-	${make_command} headers</div><div class='del'>-	${make_command}</div><div class='add'>+	for arg in "$@"; do</div><div class='add'>+		found=0</div><div class='add'>+		for name in "${TEST_NAMES[@]}"; do</div><div class='add'>+			if [[ "${name}" = "${arg}" ]]; then</div><div class='add'>+				found=1</div><div class='add'>+				break</div><div class='add'>+			fi</div><div class='add'>+		done</div><div class='add'>+</div><div class='add'>+		if [[ "${found}" -eq 0 ]]; then</div><div class='add'>+			echo "${arg} is not an available test" &gt;&amp;2</div><div class='add'>+			usage</div><div class='add'>+		fi</div><div class='add'>+	done</div><div class='add'>+</div><div class='add'>+	for arg in "$@"; do</div><div class='add'>+		if ! command -v &gt; /dev/null "test_${arg}"; then</div><div class='add'>+			echo "Test ${arg} not found" &gt;&amp;2</div><div class='add'>+			usage</div><div class='add'>+		fi</div><div class='add'>+	done</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+check_deps() {</div><div class='add'>+	for dep in vng ${QEMU} busybox pkill ssh pytest; do</div><div class='add'>+		if [[ ! -x $(command -v "${dep}") ]]; then</div><div class='add'>+			echo -e "skip:    dependency ${dep} not found!\n"</div><div class='add'>+			exit "${KSFT_SKIP}"</div><div class='add'>+		fi</div><div class='add'>+	done</div><div class='add'>+</div><div class='add'>+	if [[ ! -x $(command -v "${HID_BPF_TEST}") ]]; then</div><div class='add'>+		printf "skip:    %s not found!" "${HID_BPF_TEST}"</div><div class='add'>+		printf " Please build the kselftest hid_bpf target.\n"</div><div class='add'>+		exit "${KSFT_SKIP}"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if [[ ! -x $(command -v "${HIDRAW_TEST}") ]]; then</div><div class='add'>+		printf "skip:    %s not found!" "${HIDRAW_TEST}"</div><div class='add'>+		printf " Please build the kselftest hidraw target.\n"</div><div class='add'>+		exit "${KSFT_SKIP}"</div><div class='add'>+	fi</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-update_selftests()</div><div class='del'>-{</div><div class='del'>-	local kernel_checkout="$1"</div><div class='del'>-	local selftests_dir="${kernel_checkout}/tools/testing/selftests/hid"</div><div class='add'>+check_vng() {</div><div class='add'>+	local tested_versions</div><div class='add'>+	local version</div><div class='add'>+	local ok</div><div class='ctx'> </div><div class='del'>-	cd "${selftests_dir}"</div><div class='del'>-	${make_command}</div><div class='add'>+	tested_versions=("1.36" "1.37")</div><div class='add'>+	version="$(vng --version)"</div><div class='add'>+</div><div class='add'>+	ok=0</div><div class='add'>+	for tv in "${tested_versions[@]}"; do</div><div class='add'>+		if [[ "${version}" == *"${tv}"* ]]; then</div><div class='add'>+			ok=1</div><div class='add'>+			break</div><div class='add'>+		fi</div><div class='add'>+	done</div><div class='add'>+</div><div class='add'>+	if [[ ! "${ok}" -eq 1 ]]; then</div><div class='add'>+		printf "warning: vng version '%s' has not been tested and may " "${version}" &gt;&amp;2</div><div class='add'>+		printf "not function properly.\n\tThe following versions have been tested: " &gt;&amp;2</div><div class='add'>+		echo "${tested_versions[@]}" &gt;&amp;2</div><div class='add'>+	fi</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-run_vm()</div><div class='del'>-{</div><div class='del'>-	local run_dir="$1"</div><div class='del'>-	local b2c="$2"</div><div class='del'>-	local kernel_bzimage="$3"</div><div class='del'>-	local command="$4"</div><div class='del'>-	local post_command=""</div><div class='del'>-</div><div class='del'>-	cd "${run_dir}"</div><div class='del'>-</div><div class='del'>-	if ! which "${QEMU_BINARY}" &amp;&gt; /dev/null; then</div><div class='del'>-		cat &lt;&lt;EOF</div><div class='del'>-Could not find ${QEMU_BINARY}</div><div class='del'>-Please install qemu or set the QEMU_BINARY environment variable.</div><div class='del'>-EOF</div><div class='add'>+handle_build() {</div><div class='add'>+	if [[ ! "${BUILD}" -eq 1 ]]; then</div><div class='add'>+		return</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if [[ ! -d "${KERNEL_CHECKOUT}" ]]; then</div><div class='add'>+		echo "-b requires vmtest.sh called from the kernel source tree" &gt;&amp;2</div><div class='ctx'> 		exit 1</div><div class='ctx'> 	fi</div><div class='ctx'> </div><div class='del'>-	# alpine (used in post-container requires the PATH to have /bin</div><div class='del'>-	export PATH=$PATH:/bin</div><div class='add'>+	pushd "${KERNEL_CHECKOUT}" &amp;&gt;/dev/null</div><div class='ctx'> </div><div class='del'>-	if [[ "${debug_shell}" != "yes" ]]</div><div class='del'>-	then</div><div class='del'>-		touch ${OUTPUT_DIR}/${LOG_FILE}</div><div class='del'>-		command="mount bpffs -t bpf /sys/fs/bpf/; set -o pipefail ; ${command} 2&gt;&amp;1 | tee ${OUTPUT_DIR}/${LOG_FILE}"</div><div class='del'>-		post_command="cat ${OUTPUT_DIR}/${LOG_FILE}"</div><div class='del'>-	else</div><div class='del'>-		command="mount bpffs -t bpf /sys/fs/bpf/; ${command}"</div><div class='add'>+	if ! vng --kconfig --config "${SCRIPT_DIR}"/config; then</div><div class='add'>+		die "failed to generate .config for kernel source tree (${KERNEL_CHECKOUT})"</div><div class='ctx'> 	fi</div><div class='ctx'> </div><div class='del'>-	set +e</div><div class='del'>-	$b2c --command "${command}" \</div><div class='del'>-	     --kernel ${kernel_bzimage} \</div><div class='del'>-	     --workdir ${OUTPUT_DIR} \</div><div class='del'>-	     --image ${CONTAINER_IMAGE}</div><div class='add'>+	local vng_args=("-v" "--config" "${SCRIPT_DIR}/config" "--build")</div><div class='ctx'> </div><div class='del'>-	echo $? &gt; ${OUTPUT_DIR}/${EXIT_STATUS_FILE}</div><div class='add'>+	if [[ -n "${BUILD_HOST}" ]]; then</div><div class='add'>+		vng_args+=("--build-host" "${BUILD_HOST}")</div><div class='add'>+	fi</div><div class='ctx'> </div><div class='del'>-	set -e</div><div class='add'>+	if [[ -n "${BUILD_HOST_PODMAN_CONTAINER_NAME}" ]]; then</div><div class='add'>+		vng_args+=("--build-host-exec-prefix" \</div><div class='add'>+			   "podman exec -ti ${BUILD_HOST_PODMAN_CONTAINER_NAME}")</div><div class='add'>+	fi</div><div class='ctx'> </div><div class='del'>-	${post_command}</div><div class='del'>-}</div><div class='add'>+	if ! vng "${vng_args[@]}"; then</div><div class='add'>+		die "failed to build kernel from source tree (${KERNEL_CHECKOUT})"</div><div class='add'>+	fi</div><div class='ctx'> </div><div class='del'>-is_rel_path()</div><div class='del'>-{</div><div class='del'>-	local path="$1"</div><div class='add'>+	if ! make -j$(nproc) -C "${HID_BPF_PROGS}"; then</div><div class='add'>+		die "failed to build HID bpf objects from source tree (${HID_BPF_PROGS})"</div><div class='add'>+	fi</div><div class='ctx'> </div><div class='del'>-	[[ ${path:0:1} != "/" ]]</div><div class='add'>+	if ! make -j$(nproc) -C "${SCRIPT_DIR}"; then</div><div class='add'>+		die "failed to build HID selftests from source tree (${SCRIPT_DIR})"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	popd &amp;&gt;/dev/null</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-do_update_kconfig()</div><div class='del'>-{</div><div class='del'>-	local kernel_checkout="$1"</div><div class='del'>-	local kconfig_file="$2"</div><div class='add'>+vm_start() {</div><div class='add'>+	local logfile=/dev/null</div><div class='add'>+	local verbose_opt=""</div><div class='add'>+	local kernel_opt=""</div><div class='add'>+	local qemu</div><div class='ctx'> </div><div class='del'>-	rm -f "$kconfig_file" 2&gt; /dev/null</div><div class='add'>+	qemu=$(command -v "${QEMU}")</div><div class='ctx'> </div><div class='del'>-	for config in "${KCONFIG_REL_PATHS[@]}"; do</div><div class='del'>-		local kconfig_src="${config}"</div><div class='del'>-		cat "$kconfig_src" &gt;&gt; "$kconfig_file"</div><div class='del'>-	done</div><div class='del'>-}</div><div class='add'>+	if [[ "${VERBOSE}" -eq 2 ]]; then</div><div class='add'>+		verbose_opt="--verbose"</div><div class='add'>+		logfile=/dev/stdout</div><div class='add'>+	fi</div><div class='ctx'> </div><div class='del'>-update_kconfig()</div><div class='del'>-{</div><div class='del'>-	local kernel_checkout="$1"</div><div class='del'>-	local kconfig_file="$2"</div><div class='del'>-</div><div class='del'>-	if [[ -f "${kconfig_file}" ]]; then</div><div class='del'>-		local local_modified="$(stat -c %Y "${kconfig_file}")"</div><div class='del'>-</div><div class='del'>-		for config in "${KCONFIG_REL_PATHS[@]}"; do</div><div class='del'>-			local kconfig_src="${config}"</div><div class='del'>-			local src_modified="$(stat -c %Y "${kconfig_src}")"</div><div class='del'>-			# Only update the config if it has been updated after the</div><div class='del'>-			# previously cached config was created. This avoids</div><div class='del'>-			# unnecessarily compiling the kernel and selftests.</div><div class='del'>-			if [[ "${src_modified}" -gt "${local_modified}" ]]; then</div><div class='del'>-				do_update_kconfig "$kernel_checkout" "$kconfig_file"</div><div class='del'>-				# Once we have found one outdated configuration</div><div class='del'>-				# there is no need to check other ones.</div><div class='del'>-				break</div><div class='del'>-			fi</div><div class='del'>-		done</div><div class='del'>-	else</div><div class='del'>-		do_update_kconfig "$kernel_checkout" "$kconfig_file"</div><div class='add'>+	# If we are running from within the kernel source tree, use the kernel source tree</div><div class='add'>+	# as the kernel to boot, otherwise use the currently running kernel.</div><div class='add'>+	if [[ "$(realpath "$(pwd)")" == "${KERNEL_CHECKOUT}"* ]]; then</div><div class='add'>+		kernel_opt="${KERNEL_CHECKOUT}"</div><div class='ctx'> 	fi</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-main()</div><div class='del'>-{</div><div class='del'>-	local script_dir="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" &amp;&amp; pwd -P)"</div><div class='del'>-	local kernel_checkout=$(realpath "${script_dir}"/../../../../)</div><div class='del'>-	# By default the script searches for the kernel in the checkout directory but</div><div class='del'>-	# it also obeys environment variables O= and KBUILD_OUTPUT=</div><div class='del'>-	local kernel_bzimage="${kernel_checkout}/${BZIMAGE}"</div><div class='del'>-	local command="${DEFAULT_COMMAND}"</div><div class='del'>-	local update_b2c="no"</div><div class='del'>-	local debug_shell="no"</div><div class='del'>-	local build_only="no"</div><div class='del'>-</div><div class='del'>-	while getopts ':hsud:j:b' opt; do</div><div class='del'>-		case ${opt} in</div><div class='del'>-		u)</div><div class='del'>-			update_b2c="yes"</div><div class='del'>-			;;</div><div class='del'>-		d)</div><div class='del'>-			OUTPUT_DIR="$OPTARG"</div><div class='del'>-			;;</div><div class='del'>-		j)</div><div class='del'>-			NUM_COMPILE_JOBS="$OPTARG"</div><div class='del'>-			;;</div><div class='del'>-		s)</div><div class='del'>-			command="/bin/sh"</div><div class='del'>-			debug_shell="yes"</div><div class='del'>-			;;</div><div class='del'>-		b)</div><div class='del'>-			build_only="yes"</div><div class='del'>-			;;</div><div class='del'>-		h)</div><div class='del'>-			usage</div><div class='del'>-			exit 0</div><div class='del'>-			;;</div><div class='del'>-		\? )</div><div class='del'>-			echo "Invalid Option: -$OPTARG"</div><div class='del'>-			usage</div><div class='del'>-			exit 1</div><div class='del'>-			;;</div><div class='del'>-		: )</div><div class='del'>-			echo "Invalid Option: -$OPTARG requires an argument"</div><div class='del'>-			usage</div><div class='del'>-			exit 1</div><div class='del'>-			;;</div><div class='del'>-		esac</div><div class='del'>-	done</div><div class='del'>-	shift $((OPTIND -1))</div><div class='del'>-</div><div class='del'>-	# trap 'catch "$?"' EXIT</div><div class='del'>-	if [[ "${build_only}" == "no" &amp;&amp; "${debug_shell}" == "no" ]]; then</div><div class='del'>-		if [[ $# -eq 0 ]]; then</div><div class='del'>-			echo "No command specified, will run ${DEFAULT_COMMAND} in the vm"</div><div class='del'>-		else</div><div class='del'>-			command="$@"</div><div class='del'>-</div><div class='del'>-			if [[ "${command}" == "/bin/bash" || "${command}" == "bash" ]]</div><div class='del'>-			then</div><div class='del'>-				debug_shell="yes"</div><div class='del'>-			fi</div><div class='add'>+	vng \</div><div class='add'>+		--run \</div><div class='add'>+		${kernel_opt} \</div><div class='add'>+		${verbose_opt} \</div><div class='add'>+		--qemu-opts="${QEMU_OPTS}" \</div><div class='add'>+		--qemu="${qemu}" \</div><div class='add'>+		--user root \</div><div class='add'>+		--append "${KERNEL_CMDLINE}" \</div><div class='add'>+		--ssh "${SSH_GUEST_PORT}" \</div><div class='add'>+		--rw  &amp;&gt; ${logfile} &amp;</div><div class='add'>+</div><div class='add'>+	local vng_pid=$!</div><div class='add'>+	local elapsed=0</div><div class='add'>+</div><div class='add'>+	while [[ ! -s "${QEMU_PIDFILE}" ]]; do</div><div class='add'>+		if ! kill -0 "${vng_pid}" 2&gt;/dev/null; then</div><div class='add'>+			echo "vng process (PID ${vng_pid}) exited early, check logs for details" &gt;&amp;2</div><div class='add'>+			die "failed to boot VM"</div><div class='ctx'> 		fi</div><div class='del'>-	fi</div><div class='ctx'> </div><div class='del'>-	local kconfig_file="${OUTPUT_DIR}/latest.config"</div><div class='del'>-	local make_command="make -j ${NUM_COMPILE_JOBS} KCONFIG_CONFIG=${kconfig_file}"</div><div class='add'>+		if [[ ${elapsed} -ge ${WAIT_TOTAL} ]]; then</div><div class='add'>+			echo "Timed out after ${WAIT_TOTAL} seconds waiting for VM to boot" &gt;&amp;2</div><div class='add'>+			die "failed to boot VM"</div><div class='add'>+		fi</div><div class='ctx'> </div><div class='del'>-	# Figure out where the kernel is being built.</div><div class='del'>-	# O takes precedence over KBUILD_OUTPUT.</div><div class='del'>-	if [[ "${O:=""}" != "" ]]; then</div><div class='del'>-		if is_rel_path "${O}"; then</div><div class='del'>-			O="$(realpath "${PWD}/${O}")"</div><div class='add'>+		sleep 1</div><div class='add'>+		elapsed=$((elapsed + 1))</div><div class='add'>+	done</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+vm_wait_for_ssh() {</div><div class='add'>+	local i</div><div class='add'>+</div><div class='add'>+	i=0</div><div class='add'>+	while true; do</div><div class='add'>+		if [[ ${i} -gt ${WAIT_PERIOD_MAX} ]]; then</div><div class='add'>+			die "Timed out waiting for guest ssh"</div><div class='ctx'> 		fi</div><div class='del'>-		kernel_bzimage="${O}/${BZIMAGE}"</div><div class='del'>-		make_command="${make_command} O=${O}"</div><div class='del'>-	elif [[ "${KBUILD_OUTPUT:=""}" != "" ]]; then</div><div class='del'>-		if is_rel_path "${KBUILD_OUTPUT}"; then</div><div class='del'>-			KBUILD_OUTPUT="$(realpath "${PWD}/${KBUILD_OUTPUT}")"</div><div class='add'>+		if vm_ssh -- true; then</div><div class='add'>+			break</div><div class='ctx'> 		fi</div><div class='del'>-		kernel_bzimage="${KBUILD_OUTPUT}/${BZIMAGE}"</div><div class='del'>-		make_command="${make_command} KBUILD_OUTPUT=${KBUILD_OUTPUT}"</div><div class='add'>+		i=$(( i + 1 ))</div><div class='add'>+		sleep ${WAIT_PERIOD}</div><div class='add'>+	done</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+vm_mount_bpffs() {</div><div class='add'>+	vm_ssh -- mount bpffs -t bpf /sys/fs/bpf</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__log_stdin() {</div><div class='add'>+	stdbuf -oL awk '{ printf "%s:\t%s\n","'"${prefix}"'", $0; fflush() }'</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__log_args() {</div><div class='add'>+	echo "$*" | awk '{ printf "%s:\t%s\n","'"${prefix}"'", $0 }'</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+log() {</div><div class='add'>+	local verbose="$1"</div><div class='add'>+	shift</div><div class='add'>+</div><div class='add'>+	local prefix="$1"</div><div class='add'>+</div><div class='add'>+	shift</div><div class='add'>+	local redirect=</div><div class='add'>+	if [[ ${verbose} -le 0 ]]; then</div><div class='add'>+		redirect=/dev/null</div><div class='add'>+	else</div><div class='add'>+		redirect=/dev/stdout</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	if [[ "$#" -eq 0 ]]; then</div><div class='add'>+		__log_stdin | tee -a "${LOG}" &gt; ${redirect}</div><div class='add'>+	else</div><div class='add'>+		__log_args "$@" | tee -a "${LOG}" &gt; ${redirect}</div><div class='ctx'> 	fi</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	local b2c="${OUTPUT_DIR}/vm2c.py"</div><div class='add'>+log_setup() {</div><div class='add'>+	log $((VERBOSE-1)) "setup" "$@"</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	echo "Output directory: ${OUTPUT_DIR}"</div><div class='add'>+log_host() {</div><div class='add'>+	local testname=$1</div><div class='ctx'> </div><div class='del'>-	mkdir -p "${OUTPUT_DIR}"</div><div class='del'>-	update_kconfig "${kernel_checkout}" "${kconfig_file}"</div><div class='add'>+	shift</div><div class='add'>+	log $((VERBOSE-1)) "test:${testname}:host" "$@"</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	recompile_kernel "${kernel_checkout}" "${make_command}"</div><div class='del'>-	update_selftests "${kernel_checkout}" "${make_command}"</div><div class='add'>+log_guest() {</div><div class='add'>+	local testname=$1</div><div class='ctx'> </div><div class='del'>-	if [[ "${build_only}" == "no" ]]; then</div><div class='del'>-		if [[ "${update_b2c}" == "no" &amp;&amp; ! -f "${b2c}" ]]; then</div><div class='del'>-			echo "vm2c script not found in ${b2c}"</div><div class='del'>-			update_b2c="yes"</div><div class='del'>-		fi</div><div class='add'>+	shift</div><div class='add'>+	log ${VERBOSE} "# test:${testname}" "$@"</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if [[ "${update_b2c}" == "yes" ]]; then</div><div class='del'>-			download $B2C_URL $b2c</div><div class='del'>-			chmod +x $b2c</div><div class='del'>-		fi</div><div class='add'>+test_vm_hid_bpf() {</div><div class='add'>+	local testname="${FUNCNAME[0]#test_}"</div><div class='ctx'> </div><div class='del'>-		run_vm "${kernel_checkout}" $b2c "${kernel_bzimage}" "${command}"</div><div class='del'>-		if [[ "${debug_shell}" != "yes" ]]; then</div><div class='del'>-			echo "Logs saved in ${OUTPUT_DIR}/${LOG_FILE}"</div><div class='del'>-		fi</div><div class='add'>+	vm_ssh -- "${HID_BPF_TEST}" \</div><div class='add'>+		2&gt;&amp;1 | log_guest "${testname}"</div><div class='add'>+</div><div class='add'>+	return ${PIPESTATUS[0]}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+test_vm_hidraw() {</div><div class='add'>+	local testname="${FUNCNAME[0]#test_}"</div><div class='add'>+</div><div class='add'>+	vm_ssh -- "${HIDRAW_TEST}" \</div><div class='add'>+		2&gt;&amp;1 | log_guest "${testname}"</div><div class='add'>+</div><div class='add'>+	return ${PIPESTATUS[0]}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+test_vm_pytest() {</div><div class='add'>+	local testname="${FUNCNAME[0]#test_}"</div><div class='ctx'> </div><div class='del'>-		exit $(cat ${OUTPUT_DIR}/${EXIT_STATUS_FILE})</div><div class='add'>+	shift</div><div class='add'>+</div><div class='add'>+	vm_ssh -- pytest ${SCRIPT_DIR}/tests --color=yes "$@" \</div><div class='add'>+		2&gt;&amp;1 | log_guest "${testname}"</div><div class='add'>+</div><div class='add'>+	return ${PIPESTATUS[0]}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+run_test() {</div><div class='add'>+	local vm_oops_cnt_before</div><div class='add'>+	local vm_warn_cnt_before</div><div class='add'>+	local vm_oops_cnt_after</div><div class='add'>+	local vm_warn_cnt_after</div><div class='add'>+	local name</div><div class='add'>+	local rc</div><div class='add'>+</div><div class='add'>+	vm_oops_cnt_before=$(vm_ssh -- dmesg | grep -c -i 'Oops')</div><div class='add'>+	vm_error_cnt_before=$(vm_ssh -- dmesg --level=err | wc -l)</div><div class='add'>+</div><div class='add'>+	name=$(echo "${1}" | awk '{ print $1 }')</div><div class='add'>+	eval test_"${name}" "$@"</div><div class='add'>+	rc=$?</div><div class='add'>+</div><div class='add'>+	vm_oops_cnt_after=$(vm_ssh -- dmesg | grep -i 'Oops' | wc -l)</div><div class='add'>+	if [[ ${vm_oops_cnt_after} -gt ${vm_oops_cnt_before} ]]; then</div><div class='add'>+		echo "FAIL: kernel oops detected on vm" | log_host "${name}"</div><div class='add'>+		rc=$KSFT_FAIL</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	vm_error_cnt_after=$(vm_ssh -- dmesg --level=err | wc -l)</div><div class='add'>+	if [[ ${vm_error_cnt_after} -gt ${vm_error_cnt_before} ]]; then</div><div class='add'>+		echo "FAIL: kernel error detected on vm" | log_host "${name}"</div><div class='add'>+		vm_ssh -- dmesg --level=err | log_host "${name}"</div><div class='add'>+		rc=$KSFT_FAIL</div><div class='ctx'> 	fi</div><div class='add'>+</div><div class='add'>+	return "${rc}"</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-main "$@"</div><div class='add'>+QEMU="qemu-system-$(uname -m)"</div><div class='add'>+</div><div class='add'>+while getopts :hvsbq:H:p: o</div><div class='add'>+do</div><div class='add'>+	case $o in</div><div class='add'>+	v) VERBOSE=$((VERBOSE+1));;</div><div class='add'>+	s) SHELL_MODE=1;;</div><div class='add'>+	b) BUILD=1;;</div><div class='add'>+	q) QEMU=$OPTARG;;</div><div class='add'>+	H) BUILD_HOST=$OPTARG;;</div><div class='add'>+	p) BUILD_HOST_PODMAN_CONTAINER_NAME=$OPTARG;;</div><div class='add'>+	h|*) usage;;</div><div class='add'>+	esac</div><div class='add'>+done</div><div class='add'>+shift $((OPTIND-1))</div><div class='add'>+</div><div class='add'>+trap cleanup EXIT</div><div class='add'>+</div><div class='add'>+PARAMS=""</div><div class='add'>+</div><div class='add'>+if [[ ${#} -eq 0 ]]; then</div><div class='add'>+	ARGS=("${TEST_NAMES[@]}")</div><div class='add'>+else</div><div class='add'>+	ARGS=()</div><div class='add'>+	COUNT=0</div><div class='add'>+	for arg in $@; do</div><div class='add'>+		COUNT=$((COUNT+1))</div><div class='add'>+		if [[ x"$arg" == x"--" ]]; then</div><div class='add'>+			break</div><div class='add'>+		fi</div><div class='add'>+		ARGS+=($arg)</div><div class='add'>+	done</div><div class='add'>+	shift $COUNT</div><div class='add'>+	PARAMS="$@"</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+if [[ "${SHELL_MODE}" -eq 0 ]]; then</div><div class='add'>+	check_args "${ARGS[@]}"</div><div class='add'>+	echo "1..${#ARGS[@]}"</div><div class='add'>+fi</div><div class='add'>+check_deps</div><div class='add'>+check_vng</div><div class='add'>+handle_build</div><div class='add'>+</div><div class='add'>+log_setup "Booting up VM"</div><div class='add'>+vm_start</div><div class='add'>+vm_wait_for_ssh</div><div class='add'>+vm_mount_bpffs</div><div class='add'>+log_setup "VM booted up"</div><div class='add'>+</div><div class='add'>+if [[ "${SHELL_MODE}" -eq 1 ]]; then</div><div class='add'>+	log_setup "Starting interactive shell in VM"</div><div class='add'>+	echo "Starting shell in VM. Use 'exit' to quit and shutdown the VM."</div><div class='add'>+	CURRENT_DIR="$(pwd)"</div><div class='add'>+	vm_ssh -t -- "cd '${CURRENT_DIR}' &amp;&amp; exec bash -l"</div><div class='add'>+	exit "$KSFT_PASS"</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+cnt_pass=0</div><div class='add'>+cnt_fail=0</div><div class='add'>+cnt_skip=0</div><div class='add'>+cnt_total=0</div><div class='add'>+for arg in "${ARGS[@]}"; do</div><div class='add'>+	run_test "${arg}" "${PARAMS}"</div><div class='add'>+	rc=$?</div><div class='add'>+	if [[ ${rc} -eq $KSFT_PASS ]]; then</div><div class='add'>+		cnt_pass=$(( cnt_pass + 1 ))</div><div class='add'>+		echo "ok ${cnt_total} ${arg}"</div><div class='add'>+	elif [[ ${rc} -eq $KSFT_SKIP ]]; then</div><div class='add'>+		cnt_skip=$(( cnt_skip + 1 ))</div><div class='add'>+		echo "ok ${cnt_total} ${arg} # SKIP"</div><div class='add'>+	elif [[ ${rc} -eq $KSFT_FAIL ]]; then</div><div class='add'>+		cnt_fail=$(( cnt_fail + 1 ))</div><div class='add'>+		echo "not ok ${cnt_total} ${arg} # exit=$rc"</div><div class='add'>+	fi</div><div class='add'>+	cnt_total=$(( cnt_total + 1 ))</div><div class='add'>+done</div><div class='add'>+</div><div class='add'>+echo "SUMMARY: PASS=${cnt_pass} SKIP=${cnt_skip} FAIL=${cnt_fail}"</div><div class='add'>+echo "Log: ${LOG}"</div><div class='add'>+</div><div class='add'>+if [ $((cnt_pass + cnt_skip)) -eq ${cnt_total} ]; then</div><div class='add'>+	exit "$KSFT_PASS"</div><div class='add'>+else</div><div class='add'>+	exit "$KSFT_FAIL"</div><div class='add'>+fi</div><div class='head'>diff --git a/tools/testing/selftests/intel_pstate/aperf.c b/tools/testing/selftests/intel_pstate/aperf.c<br/>index a8acf3996973..953b63e5aa6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/intel_pstate/aperf.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/intel_pstate/aperf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/intel_pstate/aperf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/intel_pstate/aperf.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;time.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define MSEC_PER_SEC	1000L</div><div class='ctx'> #define NSEC_PER_MSEC	1000000L</div><div class='head'>diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c<br/>index a1b2b657999d..10e051b6f592 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/iommu/iommufd.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/iommu/iommufd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/iommu/iommufd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/iommu/iommufd.c</a></div><div class='hunk'>@@ -13,9 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> static unsigned long HUGEPAGE_SIZE;</div><div class='ctx'> </div><div class='del'>-#define MOCK_PAGE_SIZE (PAGE_SIZE / 2)</div><div class='del'>-#define MOCK_HUGE_PAGE_SIZE (512 * MOCK_PAGE_SIZE)</div><div class='del'>-</div><div class='ctx'> static unsigned long get_huge_page_size(void)</div><div class='ctx'> {</div><div class='ctx'> 	char buf[80];</div><div class='hunk'>@@ -54,6 +51,8 @@ static __attribute__((constructor)) void setup_sizes(void)</div><div class='ctx'> </div><div class='ctx'> 	mfd_buffer = memfd_mmap(BUFFER_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED,</div><div class='ctx'> 				&amp;mfd);</div><div class='add'>+	assert(mfd_buffer != MAP_FAILED);</div><div class='add'>+	assert(mfd &gt; 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> FIXTURE(iommufd)</div><div class='hunk'>@@ -342,12 +341,14 @@ FIXTURE(iommufd_ioas)</div><div class='ctx'> 	uint32_t hwpt_id;</div><div class='ctx'> 	uint32_t device_id;</div><div class='ctx'> 	uint64_t base_iova;</div><div class='add'>+	uint32_t device_pasid_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> FIXTURE_VARIANT(iommufd_ioas)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mock_domains;</div><div class='ctx'> 	unsigned int memory_limit;</div><div class='add'>+	bool pasid_capable;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> FIXTURE_SETUP(iommufd_ioas)</div><div class='hunk'>@@ -372,6 +373,12 @@ FIXTURE_SETUP(iommufd_ioas)</div><div class='ctx'> 					     IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='ctx'> 		self-&gt;base_iova = MOCK_APERTURE_START;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;pasid_capable)</div><div class='add'>+		test_cmd_mock_domain_flags(self-&gt;ioas_id,</div><div class='add'>+					   MOCK_FLAGS_DEVICE_PASID,</div><div class='add'>+					   NULL, NULL,</div><div class='add'>+					   &amp;self-&gt;device_pasid_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> FIXTURE_TEARDOWN(iommufd_ioas)</div><div class='hunk'>@@ -387,6 +394,7 @@ FIXTURE_VARIANT_ADD(iommufd_ioas, no_domain)</div><div class='ctx'> FIXTURE_VARIANT_ADD(iommufd_ioas, mock_domain)</div><div class='ctx'> {</div><div class='ctx'> 	.mock_domains = 1,</div><div class='add'>+	.pasid_capable = true,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> FIXTURE_VARIANT_ADD(iommufd_ioas, two_mock_domain)</div><div class='hunk'>@@ -439,6 +447,10 @@ TEST_F(iommufd_ioas, alloc_hwpt_nested)</div><div class='ctx'> 				    &amp;test_hwpt_id);</div><div class='ctx'> 		test_err_hwpt_alloc(EINVAL, self-&gt;device_id, self-&gt;device_id, 0,</div><div class='ctx'> 				    &amp;test_hwpt_id);</div><div class='add'>+		test_err_hwpt_alloc(EOPNOTSUPP, self-&gt;device_id, self-&gt;ioas_id,</div><div class='add'>+				    IOMMU_HWPT_ALLOC_NEST_PARENT |</div><div class='add'>+						IOMMU_HWPT_FAULT_ID_VALID,</div><div class='add'>+				    &amp;test_hwpt_id);</div><div class='ctx'> </div><div class='ctx'> 		test_cmd_hwpt_alloc(self-&gt;device_id, self-&gt;ioas_id,</div><div class='ctx'> 				    IOMMU_HWPT_ALLOC_NEST_PARENT,</div><div class='hunk'>@@ -748,25 +760,51 @@ TEST_F(iommufd_ioas, get_hw_info)</div><div class='ctx'> 	} buffer_smaller;</div><div class='ctx'> </div><div class='ctx'> 	if (self-&gt;device_id) {</div><div class='add'>+		uint8_t max_pasid = 0;</div><div class='add'>+</div><div class='ctx'> 		/* Provide a zero-size user_buffer */</div><div class='del'>-		test_cmd_get_hw_info(self-&gt;device_id, NULL, 0);</div><div class='add'>+		test_cmd_get_hw_info(self-&gt;device_id,</div><div class='add'>+				     IOMMU_HW_INFO_TYPE_DEFAULT, NULL, 0);</div><div class='ctx'> 		/* Provide a user_buffer with exact size */</div><div class='del'>-		test_cmd_get_hw_info(self-&gt;device_id, &amp;buffer_exact, sizeof(buffer_exact));</div><div class='add'>+		test_cmd_get_hw_info(self-&gt;device_id,</div><div class='add'>+				     IOMMU_HW_INFO_TYPE_DEFAULT, &amp;buffer_exact,</div><div class='add'>+				     sizeof(buffer_exact));</div><div class='add'>+</div><div class='add'>+		/* Request for a wrong data_type, and a correct one */</div><div class='add'>+		test_err_get_hw_info(EOPNOTSUPP, self-&gt;device_id,</div><div class='add'>+				     IOMMU_HW_INFO_TYPE_SELFTEST + 1,</div><div class='add'>+				     &amp;buffer_exact, sizeof(buffer_exact));</div><div class='add'>+		test_cmd_get_hw_info(self-&gt;device_id,</div><div class='add'>+				     IOMMU_HW_INFO_TYPE_SELFTEST, &amp;buffer_exact,</div><div class='add'>+				     sizeof(buffer_exact));</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Provide a user_buffer with size larger than the exact size to check if</div><div class='ctx'> 		 * kernel zero the trailing bytes.</div><div class='ctx'> 		 */</div><div class='del'>-		test_cmd_get_hw_info(self-&gt;device_id, &amp;buffer_larger, sizeof(buffer_larger));</div><div class='add'>+		test_cmd_get_hw_info(self-&gt;device_id,</div><div class='add'>+				     IOMMU_HW_INFO_TYPE_DEFAULT, &amp;buffer_larger,</div><div class='add'>+				     sizeof(buffer_larger));</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Provide a user_buffer with size smaller than the exact size to check if</div><div class='ctx'> 		 * the fields within the size range still gets updated.</div><div class='ctx'> 		 */</div><div class='del'>-		test_cmd_get_hw_info(self-&gt;device_id, &amp;buffer_smaller, sizeof(buffer_smaller));</div><div class='add'>+		test_cmd_get_hw_info(self-&gt;device_id,</div><div class='add'>+				     IOMMU_HW_INFO_TYPE_DEFAULT,</div><div class='add'>+				     &amp;buffer_smaller, sizeof(buffer_smaller));</div><div class='add'>+		test_cmd_get_hw_info_pasid(self-&gt;device_id, &amp;max_pasid);</div><div class='add'>+		ASSERT_EQ(0, max_pasid);</div><div class='add'>+		if (variant-&gt;pasid_capable) {</div><div class='add'>+			test_cmd_get_hw_info_pasid(self-&gt;device_pasid_id,</div><div class='add'>+						   &amp;max_pasid);</div><div class='add'>+			ASSERT_EQ(MOCK_PASID_WIDTH, max_pasid);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		test_err_get_hw_info(ENOENT, self-&gt;device_id,</div><div class='del'>-				     &amp;buffer_exact, sizeof(buffer_exact));</div><div class='add'>+				     IOMMU_HW_INFO_TYPE_DEFAULT, &amp;buffer_exact,</div><div class='add'>+				     sizeof(buffer_exact));</div><div class='ctx'> 		test_err_get_hw_info(ENOENT, self-&gt;device_id,</div><div class='del'>-				     &amp;buffer_larger, sizeof(buffer_larger));</div><div class='add'>+				     IOMMU_HW_INFO_TYPE_DEFAULT, &amp;buffer_larger,</div><div class='add'>+				     sizeof(buffer_larger));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -929,6 +967,33 @@ TEST_F(iommufd_ioas, area_auto_iova)</div><div class='ctx'> 		test_ioctl_ioas_unmap(iovas[i], PAGE_SIZE * (i + 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*  https://lore.kernel.org/r/685af644.a00a0220.2e5631.0094.GAE@google.com */</div><div class='add'>+TEST_F(iommufd_ioas, reserved_overflow)</div><div class='add'>+{</div><div class='add'>+	struct iommu_test_cmd test_cmd = {</div><div class='add'>+		.size = sizeof(test_cmd),</div><div class='add'>+		.op = IOMMU_TEST_OP_ADD_RESERVED,</div><div class='add'>+		.id = self-&gt;ioas_id,</div><div class='add'>+		.add_reserved.start = 6,</div><div class='add'>+	};</div><div class='add'>+	unsigned int map_len;</div><div class='add'>+	__u64 iova;</div><div class='add'>+</div><div class='add'>+	if (PAGE_SIZE == 4096) {</div><div class='add'>+		test_cmd.add_reserved.length = 0xffffffffffff8001;</div><div class='add'>+		map_len = 0x5000;</div><div class='add'>+	} else {</div><div class='add'>+		test_cmd.add_reserved.length =</div><div class='add'>+			0xffffffffffffffff - MOCK_PAGE_SIZE * 16;</div><div class='add'>+		map_len = MOCK_PAGE_SIZE * 10;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  ioctl(self-&gt;fd, _IOMMU_TEST_CMD(IOMMU_TEST_OP_ADD_RESERVED),</div><div class='add'>+			&amp;test_cmd));</div><div class='add'>+	test_err_ioctl_ioas_map(ENOSPC, buffer, map_len, &amp;iova);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> TEST_F(iommufd_ioas, area_allowed)</div><div class='ctx'> {</div><div class='ctx'> 	struct iommu_test_cmd test_cmd = {</div><div class='hunk'>@@ -1506,6 +1571,49 @@ TEST_F(iommufd_ioas, copy_sweep)</div><div class='ctx'> 	test_ioctl_destroy(dst_ioas_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+TEST_F(iommufd_ioas, dmabuf_simple)</div><div class='add'>+{</div><div class='add'>+	size_t buf_size = PAGE_SIZE*4;</div><div class='add'>+	__u64 iova;</div><div class='add'>+	int dfd;</div><div class='add'>+</div><div class='add'>+	test_cmd_get_dmabuf(buf_size, &amp;dfd);</div><div class='add'>+	test_err_ioctl_ioas_map_file(EINVAL, dfd, 0, 0, &amp;iova);</div><div class='add'>+	test_err_ioctl_ioas_map_file(EINVAL, dfd, buf_size, buf_size, &amp;iova);</div><div class='add'>+	test_err_ioctl_ioas_map_file(EINVAL, dfd, 0, buf_size + 1, &amp;iova);</div><div class='add'>+	test_ioctl_ioas_map_file(dfd, 0, buf_size, &amp;iova);</div><div class='add'>+</div><div class='add'>+	close(dfd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(iommufd_ioas, dmabuf_revoke)</div><div class='add'>+{</div><div class='add'>+	size_t buf_size = PAGE_SIZE*4;</div><div class='add'>+	__u32 hwpt_id;</div><div class='add'>+	__u64 iova;</div><div class='add'>+	__u64 iova2;</div><div class='add'>+	int dfd;</div><div class='add'>+</div><div class='add'>+	test_cmd_get_dmabuf(buf_size, &amp;dfd);</div><div class='add'>+	test_ioctl_ioas_map_file(dfd, 0, buf_size, &amp;iova);</div><div class='add'>+	test_cmd_revoke_dmabuf(dfd, true);</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;mock_domains)</div><div class='add'>+		test_cmd_hwpt_alloc(self-&gt;device_id, self-&gt;ioas_id, 0,</div><div class='add'>+				    &amp;hwpt_id);</div><div class='add'>+</div><div class='add'>+	test_err_ioctl_ioas_map_file(ENODEV, dfd, 0, buf_size, &amp;iova2);</div><div class='add'>+</div><div class='add'>+	test_cmd_revoke_dmabuf(dfd, false);</div><div class='add'>+	test_ioctl_ioas_map_file(dfd, 0, buf_size, &amp;iova2);</div><div class='add'>+</div><div class='add'>+	/* Restore the iova back */</div><div class='add'>+	test_ioctl_ioas_unmap(iova, buf_size);</div><div class='add'>+	test_ioctl_ioas_map_fixed_file(dfd, 0, buf_size, iova);</div><div class='add'>+</div><div class='add'>+	close(dfd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> FIXTURE(iommufd_mock_domain)</div><div class='ctx'> {</div><div class='ctx'> 	int fd;</div><div class='hunk'>@@ -1724,13 +1832,15 @@ TEST_F(iommufd_mock_domain, all_aligns)</div><div class='ctx'> 	unsigned int end;</div><div class='ctx'> 	uint8_t *buf;</div><div class='ctx'> 	int prot = PROT_READ | PROT_WRITE;</div><div class='del'>-	int mfd;</div><div class='add'>+	int mfd = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (variant-&gt;file)</div><div class='ctx'> 		buf = memfd_mmap(buf_size, prot, MAP_SHARED, &amp;mfd);</div><div class='ctx'> 	else</div><div class='ctx'> 		buf = mmap(0, buf_size, prot, self-&gt;mmap_flags, -1, 0);</div><div class='ctx'> 	ASSERT_NE(MAP_FAILED, buf);</div><div class='add'>+	if (variant-&gt;file)</div><div class='add'>+		ASSERT_GT(mfd, 0);</div><div class='ctx'> 	check_refs(buf, buf_size, 0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1776,13 +1886,15 @@ TEST_F(iommufd_mock_domain, all_aligns_copy)</div><div class='ctx'> 	unsigned int end;</div><div class='ctx'> 	uint8_t *buf;</div><div class='ctx'> 	int prot = PROT_READ | PROT_WRITE;</div><div class='del'>-	int mfd;</div><div class='add'>+	int mfd = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (variant-&gt;file)</div><div class='ctx'> 		buf = memfd_mmap(buf_size, prot, MAP_SHARED, &amp;mfd);</div><div class='ctx'> 	else</div><div class='ctx'> 		buf = mmap(0, buf_size, prot, self-&gt;mmap_flags, -1, 0);</div><div class='ctx'> 	ASSERT_NE(MAP_FAILED, buf);</div><div class='add'>+	if (variant-&gt;file)</div><div class='add'>+		ASSERT_GT(mfd, 0);</div><div class='ctx'> 	check_refs(buf, buf_size, 0);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1986,6 +2098,13 @@ FIXTURE_VARIANT(iommufd_dirty_tracking)</div><div class='ctx'> </div><div class='ctx'> FIXTURE_SETUP(iommufd_dirty_tracking)</div><div class='ctx'> {</div><div class='add'>+	struct iommu_option cmd = {</div><div class='add'>+		.size = sizeof(cmd),</div><div class='add'>+		.option_id = IOMMU_OPTION_HUGE_PAGES,</div><div class='add'>+		.op = IOMMU_OPTION_OP_SET,</div><div class='add'>+		.val64 = 0,</div><div class='add'>+	};</div><div class='add'>+	size_t mmap_buffer_size;</div><div class='ctx'> 	unsigned long size;</div><div class='ctx'> 	int mmap_flags;</div><div class='ctx'> 	void *vrc;</div><div class='hunk'>@@ -1993,29 +2112,40 @@ FIXTURE_SETUP(iommufd_dirty_tracking)</div><div class='ctx'> </div><div class='ctx'> 	if (variant-&gt;buffer_size &lt; MOCK_PAGE_SIZE) {</div><div class='ctx'> 		SKIP(return,</div><div class='del'>-		     "Skipping buffer_size=%lu, less than MOCK_PAGE_SIZE=%lu",</div><div class='add'>+		     "Skipping buffer_size=%lu, less than MOCK_PAGE_SIZE=%u",</div><div class='ctx'> 		     variant-&gt;buffer_size, MOCK_PAGE_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;fd = open("/dev/iommu", O_RDWR);</div><div class='ctx'> 	ASSERT_NE(-1, self-&gt;fd);</div><div class='ctx'> </div><div class='del'>-	rc = posix_memalign(&amp;self-&gt;buffer, HUGEPAGE_SIZE, variant-&gt;buffer_size);</div><div class='del'>-	if (rc || !self-&gt;buffer) {</div><div class='del'>-		SKIP(return, "Skipping buffer_size=%lu due to errno=%d",</div><div class='del'>-			   variant-&gt;buffer_size, rc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	mmap_flags = MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED;</div><div class='add'>+	mmap_buffer_size = variant-&gt;buffer_size;</div><div class='ctx'> 	if (variant-&gt;hugepages) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * MAP_POPULATE will cause the kernel to fail mmap if THPs are</div><div class='ctx'> 		 * not available.</div><div class='ctx'> 		 */</div><div class='ctx'> 		mmap_flags |= MAP_HUGETLB | MAP_POPULATE;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Allocation must be aligned to the HUGEPAGE_SIZE, because the</div><div class='add'>+		 * following mmap() will automatically align the length to be a</div><div class='add'>+		 * multiple of the underlying huge page size. Failing to do the</div><div class='add'>+		 * same at this allocation will result in a memory overwrite by</div><div class='add'>+		 * the mmap().</div><div class='add'>+		 */</div><div class='add'>+		if (mmap_buffer_size &lt; HUGEPAGE_SIZE)</div><div class='add'>+			mmap_buffer_size = HUGEPAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = posix_memalign(&amp;self-&gt;buffer, HUGEPAGE_SIZE, mmap_buffer_size);</div><div class='add'>+	if (rc || !self-&gt;buffer) {</div><div class='add'>+		SKIP(return, "Skipping buffer_size=%lu due to errno=%d",</div><div class='add'>+			   mmap_buffer_size, rc);</div><div class='ctx'> 	}</div><div class='ctx'> 	assert((uintptr_t)self-&gt;buffer % HUGEPAGE_SIZE == 0);</div><div class='del'>-	vrc = mmap(self-&gt;buffer, variant-&gt;buffer_size, PROT_READ | PROT_WRITE,</div><div class='add'>+	vrc = mmap(self-&gt;buffer, mmap_buffer_size, PROT_READ | PROT_WRITE,</div><div class='ctx'> 		   mmap_flags, -1, 0);</div><div class='ctx'> 	assert(vrc == self-&gt;buffer);</div><div class='ctx'> </div><div class='hunk'>@@ -2030,22 +2160,24 @@ FIXTURE_SETUP(iommufd_dirty_tracking)</div><div class='ctx'> 	assert((uintptr_t)self-&gt;bitmap % PAGE_SIZE == 0);</div><div class='ctx'> </div><div class='ctx'> 	test_ioctl_ioas_alloc(&amp;self-&gt;ioas_id);</div><div class='del'>-	/* Enable 1M mock IOMMU hugepages */</div><div class='del'>-	if (variant-&gt;hugepages) {</div><div class='del'>-		test_cmd_mock_domain_flags(self-&gt;ioas_id,</div><div class='del'>-					   MOCK_FLAGS_DEVICE_HUGE_IOVA,</div><div class='del'>-					   &amp;self-&gt;stdev_id, &amp;self-&gt;hwpt_id,</div><div class='del'>-					   &amp;self-&gt;idev_id);</div><div class='del'>-	} else {</div><div class='del'>-		test_cmd_mock_domain(self-&gt;ioas_id, &amp;self-&gt;stdev_id,</div><div class='del'>-				     &amp;self-&gt;hwpt_id, &amp;self-&gt;idev_id);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For dirty testing it is important that the page size fed into</div><div class='add'>+	 * the iommu page tables matches the size the dirty logic</div><div class='add'>+	 * expects, or set_dirty can touch too much stuff.</div><div class='add'>+	 */</div><div class='add'>+	cmd.object_id = self-&gt;ioas_id;</div><div class='add'>+	if (!variant-&gt;hugepages)</div><div class='add'>+		ASSERT_EQ(0, ioctl(self-&gt;fd, IOMMU_OPTION, &amp;cmd));</div><div class='add'>+</div><div class='add'>+	test_cmd_mock_domain(self-&gt;ioas_id, &amp;self-&gt;stdev_id, &amp;self-&gt;hwpt_id,</div><div class='add'>+			     &amp;self-&gt;idev_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> FIXTURE_TEARDOWN(iommufd_dirty_tracking)</div><div class='ctx'> {</div><div class='del'>-	munmap(self-&gt;buffer, variant-&gt;buffer_size);</div><div class='del'>-	munmap(self-&gt;bitmap, DIV_ROUND_UP(self-&gt;bitmap_size, BITS_PER_BYTE));</div><div class='add'>+	free(self-&gt;buffer);</div><div class='add'>+	free(self-&gt;bitmap);</div><div class='ctx'> 	teardown_iommufd(self-&gt;fd, _metadata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2153,8 +2285,7 @@ TEST_F(iommufd_dirty_tracking, device_dirty_capability)</div><div class='ctx'> </div><div class='ctx'> 	test_cmd_hwpt_alloc(self-&gt;idev_id, self-&gt;ioas_id, 0, &amp;hwpt_id);</div><div class='ctx'> 	test_cmd_mock_domain(hwpt_id, &amp;stddev_id, NULL, NULL);</div><div class='del'>-	test_cmd_get_hw_capabilities(self-&gt;idev_id, caps,</div><div class='del'>-				     IOMMU_HW_CAP_DIRTY_TRACKING);</div><div class='add'>+	test_cmd_get_hw_capabilities(self-&gt;idev_id, caps);</div><div class='ctx'> 	ASSERT_EQ(IOMMU_HW_CAP_DIRTY_TRACKING,</div><div class='ctx'> 		  caps &amp; IOMMU_HW_CAP_DIRTY_TRACKING);</div><div class='ctx'> </div><div class='hunk'>@@ -2165,18 +2296,23 @@ TEST_F(iommufd_dirty_tracking, device_dirty_capability)</div><div class='ctx'> TEST_F(iommufd_dirty_tracking, get_dirty_bitmap)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t page_size = MOCK_PAGE_SIZE;</div><div class='add'>+	uint32_t ioas_id = self-&gt;ioas_id;</div><div class='ctx'> 	uint32_t hwpt_id;</div><div class='del'>-	uint32_t ioas_id;</div><div class='ctx'> </div><div class='ctx'> 	if (variant-&gt;hugepages)</div><div class='ctx'> 		page_size = MOCK_HUGE_PAGE_SIZE;</div><div class='ctx'> </div><div class='del'>-	test_ioctl_ioas_alloc(&amp;ioas_id);</div><div class='ctx'> 	test_ioctl_ioas_map_fixed_id(ioas_id, self-&gt;buffer,</div><div class='ctx'> 				     variant-&gt;buffer_size, MOCK_APERTURE_START);</div><div class='ctx'> </div><div class='del'>-	test_cmd_hwpt_alloc(self-&gt;idev_id, ioas_id,</div><div class='del'>-			    IOMMU_HWPT_ALLOC_DIRTY_TRACKING, &amp;hwpt_id);</div><div class='add'>+	if (variant-&gt;hugepages)</div><div class='add'>+		test_cmd_hwpt_alloc_iommupt(self-&gt;idev_id, ioas_id,</div><div class='add'>+					    IOMMU_HWPT_ALLOC_DIRTY_TRACKING,</div><div class='add'>+					    MOCK_IOMMUPT_HUGE, &amp;hwpt_id);</div><div class='add'>+	else</div><div class='add'>+		test_cmd_hwpt_alloc_iommupt(self-&gt;idev_id, ioas_id,</div><div class='add'>+					    IOMMU_HWPT_ALLOC_DIRTY_TRACKING,</div><div class='add'>+					    MOCK_IOMMUPT_DEFAULT, &amp;hwpt_id);</div><div class='ctx'> </div><div class='ctx'> 	test_cmd_set_dirty_tracking(hwpt_id, true);</div><div class='ctx'> </div><div class='hunk'>@@ -2202,18 +2338,24 @@ TEST_F(iommufd_dirty_tracking, get_dirty_bitmap)</div><div class='ctx'> TEST_F(iommufd_dirty_tracking, get_dirty_bitmap_no_clear)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t page_size = MOCK_PAGE_SIZE;</div><div class='add'>+	uint32_t ioas_id = self-&gt;ioas_id;</div><div class='ctx'> 	uint32_t hwpt_id;</div><div class='del'>-	uint32_t ioas_id;</div><div class='ctx'> </div><div class='ctx'> 	if (variant-&gt;hugepages)</div><div class='ctx'> 		page_size = MOCK_HUGE_PAGE_SIZE;</div><div class='ctx'> </div><div class='del'>-	test_ioctl_ioas_alloc(&amp;ioas_id);</div><div class='ctx'> 	test_ioctl_ioas_map_fixed_id(ioas_id, self-&gt;buffer,</div><div class='ctx'> 				     variant-&gt;buffer_size, MOCK_APERTURE_START);</div><div class='ctx'> </div><div class='del'>-	test_cmd_hwpt_alloc(self-&gt;idev_id, ioas_id,</div><div class='del'>-			    IOMMU_HWPT_ALLOC_DIRTY_TRACKING, &amp;hwpt_id);</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;hugepages)</div><div class='add'>+		test_cmd_hwpt_alloc_iommupt(self-&gt;idev_id, ioas_id,</div><div class='add'>+					    IOMMU_HWPT_ALLOC_DIRTY_TRACKING,</div><div class='add'>+					    MOCK_IOMMUPT_HUGE, &amp;hwpt_id);</div><div class='add'>+	else</div><div class='add'>+		test_cmd_hwpt_alloc_iommupt(self-&gt;idev_id, ioas_id,</div><div class='add'>+					    IOMMU_HWPT_ALLOC_DIRTY_TRACKING,</div><div class='add'>+					    MOCK_IOMMUPT_DEFAULT, &amp;hwpt_id);</div><div class='ctx'> </div><div class='ctx'> 	test_cmd_set_dirty_tracking(hwpt_id, true);</div><div class='ctx'> </div><div class='hunk'>@@ -2555,6 +2697,8 @@ TEST_F(vfio_compat_mock_domain, map)</div><div class='ctx'> 	ASSERT_EQ(0, ioctl(self-&gt;fd, VFIO_IOMMU_MAP_DMA, &amp;map_cmd));</div><div class='ctx'> 	ASSERT_EQ(0, ioctl(self-&gt;fd, VFIO_IOMMU_UNMAP_DMA, &amp;unmap_cmd));</div><div class='ctx'> 	ASSERT_EQ(BUFFER_SIZE, unmap_cmd.size);</div><div class='add'>+	/* Unmap of empty is success */</div><div class='add'>+	ASSERT_EQ(0, ioctl(self-&gt;fd, VFIO_IOMMU_UNMAP_DMA, &amp;unmap_cmd));</div><div class='ctx'> </div><div class='ctx'> 	/* UNMAP_FLAG_ALL requires 0 iova/size */</div><div class='ctx'> 	ASSERT_EQ(0, ioctl(self-&gt;fd, VFIO_IOMMU_MAP_DMA, &amp;map_cmd));</div><div class='hunk'>@@ -2666,7 +2810,7 @@ FIXTURE_SETUP(iommufd_viommu)</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate a vIOMMU taking refcount of the parent hwpt */</div><div class='ctx'> 		test_cmd_viommu_alloc(self-&gt;device_id, self-&gt;hwpt_id,</div><div class='del'>-				      IOMMU_VIOMMU_TYPE_SELFTEST,</div><div class='add'>+				      IOMMU_VIOMMU_TYPE_SELFTEST, NULL, 0,</div><div class='ctx'> 				      &amp;self-&gt;viommu_id);</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate a regular nested hwpt */</div><div class='hunk'>@@ -2705,24 +2849,27 @@ TEST_F(iommufd_viommu, viommu_negative_tests)</div><div class='ctx'> 	if (self-&gt;device_id) {</div><div class='ctx'> 		/* Negative test -- invalid hwpt (hwpt_id=0) */</div><div class='ctx'> 		test_err_viommu_alloc(ENOENT, device_id, 0,</div><div class='del'>-				      IOMMU_VIOMMU_TYPE_SELFTEST, NULL);</div><div class='add'>+				      IOMMU_VIOMMU_TYPE_SELFTEST, NULL, 0,</div><div class='add'>+				      NULL);</div><div class='ctx'> </div><div class='ctx'> 		/* Negative test -- not a nesting parent hwpt */</div><div class='ctx'> 		test_cmd_hwpt_alloc(device_id, ioas_id, 0, &amp;hwpt_id);</div><div class='ctx'> 		test_err_viommu_alloc(EINVAL, device_id, hwpt_id,</div><div class='del'>-				      IOMMU_VIOMMU_TYPE_SELFTEST, NULL);</div><div class='add'>+				      IOMMU_VIOMMU_TYPE_SELFTEST, NULL, 0,</div><div class='add'>+				      NULL);</div><div class='ctx'> 		test_ioctl_destroy(hwpt_id);</div><div class='ctx'> </div><div class='ctx'> 		/* Negative test -- unsupported viommu type */</div><div class='ctx'> 		test_err_viommu_alloc(EOPNOTSUPP, device_id, self-&gt;hwpt_id,</div><div class='del'>-				      0xdead, NULL);</div><div class='add'>+				      0xdead, NULL, 0, NULL);</div><div class='ctx'> 		EXPECT_ERRNO(EBUSY,</div><div class='ctx'> 			     _test_ioctl_destroy(self-&gt;fd, self-&gt;hwpt_id));</div><div class='ctx'> 		EXPECT_ERRNO(EBUSY,</div><div class='ctx'> 			     _test_ioctl_destroy(self-&gt;fd, self-&gt;viommu_id));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		test_err_viommu_alloc(ENOENT, self-&gt;device_id, self-&gt;hwpt_id,</div><div class='del'>-				      IOMMU_VIOMMU_TYPE_SELFTEST, NULL);</div><div class='add'>+				      IOMMU_VIOMMU_TYPE_SELFTEST, NULL, 0,</div><div class='add'>+				      NULL);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2736,32 +2883,68 @@ TEST_F(iommufd_viommu, viommu_alloc_nested_iopf)</div><div class='ctx'> 	uint32_t iopf_hwpt_id;</div><div class='ctx'> 	uint32_t fault_id;</div><div class='ctx'> 	uint32_t fault_fd;</div><div class='add'>+	uint32_t vdev_id;</div><div class='add'>+</div><div class='add'>+	if (!dev_id)</div><div class='add'>+		SKIP(return, "Skipping test for variant no_viommu");</div><div class='add'>+</div><div class='add'>+	test_ioctl_fault_alloc(&amp;fault_id, &amp;fault_fd);</div><div class='add'>+	test_err_hwpt_alloc_iopf(ENOENT, dev_id, viommu_id, UINT32_MAX,</div><div class='add'>+				 IOMMU_HWPT_FAULT_ID_VALID, &amp;iopf_hwpt_id,</div><div class='add'>+				 IOMMU_HWPT_DATA_SELFTEST, &amp;data, sizeof(data));</div><div class='add'>+	test_err_hwpt_alloc_iopf(EOPNOTSUPP, dev_id, viommu_id, fault_id,</div><div class='add'>+				 IOMMU_HWPT_FAULT_ID_VALID | (1 &lt;&lt; 31),</div><div class='add'>+				 &amp;iopf_hwpt_id, IOMMU_HWPT_DATA_SELFTEST, &amp;data,</div><div class='add'>+				 sizeof(data));</div><div class='add'>+	test_cmd_hwpt_alloc_iopf(dev_id, viommu_id, fault_id,</div><div class='add'>+				 IOMMU_HWPT_FAULT_ID_VALID, &amp;iopf_hwpt_id,</div><div class='add'>+				 IOMMU_HWPT_DATA_SELFTEST, &amp;data, sizeof(data));</div><div class='add'>+</div><div class='add'>+	/* Must allocate vdevice before attaching to a nested hwpt */</div><div class='add'>+	test_err_mock_domain_replace(ENOENT, self-&gt;stdev_id, iopf_hwpt_id);</div><div class='add'>+	test_cmd_vdevice_alloc(viommu_id, dev_id, 0x99, &amp;vdev_id);</div><div class='add'>+	test_cmd_mock_domain_replace(self-&gt;stdev_id, iopf_hwpt_id);</div><div class='add'>+	EXPECT_ERRNO(EBUSY, _test_ioctl_destroy(self-&gt;fd, iopf_hwpt_id));</div><div class='add'>+	test_cmd_trigger_iopf(dev_id, fault_fd);</div><div class='add'>+</div><div class='add'>+	test_cmd_mock_domain_replace(self-&gt;stdev_id, self-&gt;ioas_id);</div><div class='add'>+	test_ioctl_destroy(iopf_hwpt_id);</div><div class='add'>+	close(fault_fd);</div><div class='add'>+	test_ioctl_destroy(fault_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(iommufd_viommu, viommu_alloc_with_data)</div><div class='add'>+{</div><div class='add'>+	struct iommu_viommu_selftest data = {</div><div class='add'>+		.in_data = 0xbeef,</div><div class='add'>+	};</div><div class='add'>+	uint32_t *test;</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;device_id) {</div><div class='del'>-		test_ioctl_fault_alloc(&amp;fault_id, &amp;fault_fd);</div><div class='del'>-		test_err_hwpt_alloc_iopf(</div><div class='del'>-			ENOENT, dev_id, viommu_id, UINT32_MAX,</div><div class='del'>-			IOMMU_HWPT_FAULT_ID_VALID, &amp;iopf_hwpt_id,</div><div class='del'>-			IOMMU_HWPT_DATA_SELFTEST, &amp;data, sizeof(data));</div><div class='del'>-		test_err_hwpt_alloc_iopf(</div><div class='del'>-			EOPNOTSUPP, dev_id, viommu_id, fault_id,</div><div class='del'>-			IOMMU_HWPT_FAULT_ID_VALID | (1 &lt;&lt; 31), &amp;iopf_hwpt_id,</div><div class='del'>-			IOMMU_HWPT_DATA_SELFTEST, &amp;data, sizeof(data));</div><div class='del'>-		test_cmd_hwpt_alloc_iopf(</div><div class='del'>-			dev_id, viommu_id, fault_id, IOMMU_HWPT_FAULT_ID_VALID,</div><div class='del'>-			&amp;iopf_hwpt_id, IOMMU_HWPT_DATA_SELFTEST, &amp;data,</div><div class='del'>-			sizeof(data));</div><div class='add'>+	if (!self-&gt;device_id)</div><div class='add'>+		SKIP(return, "Skipping test for variant no_viommu");</div><div class='ctx'> </div><div class='del'>-		test_cmd_mock_domain_replace(self-&gt;stdev_id, iopf_hwpt_id);</div><div class='del'>-		EXPECT_ERRNO(EBUSY,</div><div class='del'>-			     _test_ioctl_destroy(self-&gt;fd, iopf_hwpt_id));</div><div class='del'>-		test_cmd_trigger_iopf(dev_id, fault_fd);</div><div class='add'>+	test_cmd_viommu_alloc(self-&gt;device_id, self-&gt;hwpt_id,</div><div class='add'>+			      IOMMU_VIOMMU_TYPE_SELFTEST, &amp;data, sizeof(data),</div><div class='add'>+			      &amp;self-&gt;viommu_id);</div><div class='add'>+	ASSERT_EQ(data.out_data, data.in_data);</div><div class='ctx'> </div><div class='del'>-		test_cmd_mock_domain_replace(self-&gt;stdev_id, self-&gt;ioas_id);</div><div class='del'>-		test_ioctl_destroy(iopf_hwpt_id);</div><div class='del'>-		close(fault_fd);</div><div class='del'>-		test_ioctl_destroy(fault_id);</div><div class='del'>-	}</div><div class='add'>+	/* Negative mmap tests -- offset and length cannot be changed */</div><div class='add'>+	test_err_mmap(ENXIO, data.out_mmap_length,</div><div class='add'>+		      data.out_mmap_offset + PAGE_SIZE);</div><div class='add'>+	test_err_mmap(ENXIO, data.out_mmap_length,</div><div class='add'>+		      data.out_mmap_offset + PAGE_SIZE * 2);</div><div class='add'>+	test_err_mmap(ENXIO, data.out_mmap_length / 2, data.out_mmap_offset);</div><div class='add'>+	test_err_mmap(ENXIO, data.out_mmap_length * 2, data.out_mmap_offset);</div><div class='add'>+</div><div class='add'>+	/* Now do a correct mmap for a loopback test */</div><div class='add'>+	test = mmap(NULL, data.out_mmap_length, PROT_READ | PROT_WRITE,</div><div class='add'>+		    MAP_SHARED, self-&gt;fd, data.out_mmap_offset);</div><div class='add'>+	ASSERT_NE(MAP_FAILED, test);</div><div class='add'>+	ASSERT_EQ(data.in_data, *test);</div><div class='add'>+</div><div class='add'>+	/* The owner of the mmap region should be blocked */</div><div class='add'>+	EXPECT_ERRNO(EBUSY, _test_ioctl_destroy(self-&gt;fd, self-&gt;viommu_id));</div><div class='add'>+	munmap(test, data.out_mmap_length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> TEST_F(iommufd_viommu, vdevice_alloc)</div><div class='hunk'>@@ -2769,15 +2952,46 @@ TEST_F(iommufd_viommu, vdevice_alloc)</div><div class='ctx'> 	uint32_t viommu_id = self-&gt;viommu_id;</div><div class='ctx'> 	uint32_t dev_id = self-&gt;device_id;</div><div class='ctx'> 	uint32_t vdev_id = 0;</div><div class='add'>+	uint32_t veventq_id;</div><div class='add'>+	uint32_t veventq_fd;</div><div class='add'>+	int prev_seq = -1;</div><div class='ctx'> </div><div class='ctx'> 	if (dev_id) {</div><div class='add'>+		/* Must allocate vdevice before attaching to a nested hwpt */</div><div class='add'>+		test_err_mock_domain_replace(ENOENT, self-&gt;stdev_id,</div><div class='add'>+					     self-&gt;nested_hwpt_id);</div><div class='add'>+</div><div class='add'>+		/* Allocate a vEVENTQ with veventq_depth=2 */</div><div class='add'>+		test_cmd_veventq_alloc(viommu_id, IOMMU_VEVENTQ_TYPE_SELFTEST,</div><div class='add'>+				       &amp;veventq_id, &amp;veventq_fd);</div><div class='add'>+		test_err_veventq_alloc(EEXIST, viommu_id,</div><div class='add'>+				       IOMMU_VEVENTQ_TYPE_SELFTEST, NULL, NULL);</div><div class='ctx'> 		/* Set vdev_id to 0x99, unset it, and set to 0x88 */</div><div class='ctx'> 		test_cmd_vdevice_alloc(viommu_id, dev_id, 0x99, &amp;vdev_id);</div><div class='add'>+		test_cmd_mock_domain_replace(self-&gt;stdev_id,</div><div class='add'>+					     self-&gt;nested_hwpt_id);</div><div class='add'>+		test_cmd_trigger_vevents(dev_id, 1);</div><div class='add'>+		test_cmd_read_vevents(veventq_fd, 1, 0x99, &amp;prev_seq);</div><div class='ctx'> 		test_err_vdevice_alloc(EEXIST, viommu_id, dev_id, 0x99,</div><div class='ctx'> 				       &amp;vdev_id);</div><div class='add'>+		test_cmd_mock_domain_replace(self-&gt;stdev_id, self-&gt;ioas_id);</div><div class='ctx'> 		test_ioctl_destroy(vdev_id);</div><div class='add'>+</div><div class='add'>+		/* Try again with 0x88 */</div><div class='ctx'> 		test_cmd_vdevice_alloc(viommu_id, dev_id, 0x88, &amp;vdev_id);</div><div class='add'>+		test_cmd_mock_domain_replace(self-&gt;stdev_id,</div><div class='add'>+					     self-&gt;nested_hwpt_id);</div><div class='add'>+		/* Trigger an overflow with three events */</div><div class='add'>+		test_cmd_trigger_vevents(dev_id, 3);</div><div class='add'>+		test_err_read_vevents(EOVERFLOW, veventq_fd, 3, 0x88,</div><div class='add'>+				      &amp;prev_seq);</div><div class='add'>+		/* Overflow must be gone after the previous reads */</div><div class='add'>+		test_cmd_trigger_vevents(dev_id, 1);</div><div class='add'>+		test_cmd_read_vevents(veventq_fd, 1, 0x88, &amp;prev_seq);</div><div class='add'>+		close(veventq_fd);</div><div class='add'>+		test_cmd_mock_domain_replace(self-&gt;stdev_id, self-&gt;ioas_id);</div><div class='ctx'> 		test_ioctl_destroy(vdev_id);</div><div class='add'>+		test_ioctl_destroy(veventq_id);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		test_err_vdevice_alloc(ENOENT, viommu_id, dev_id, 0x99, NULL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2791,169 +3005,540 @@ TEST_F(iommufd_viommu, vdevice_cache)</div><div class='ctx'> 	uint32_t vdev_id = 0;</div><div class='ctx'> 	uint32_t num_inv;</div><div class='ctx'> </div><div class='del'>-	if (dev_id) {</div><div class='del'>-		test_cmd_vdevice_alloc(viommu_id, dev_id, 0x99, &amp;vdev_id);</div><div class='add'>+	if (!dev_id)</div><div class='add'>+		SKIP(return, "Skipping test for variant no_viommu");</div><div class='add'>+</div><div class='add'>+	test_cmd_vdevice_alloc(viommu_id, dev_id, 0x99, &amp;vdev_id);</div><div class='add'>+</div><div class='add'>+	test_cmd_dev_check_cache_all(dev_id, IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='add'>+</div><div class='add'>+	/* Check data_type by passing zero-length array */</div><div class='add'>+	num_inv = 0;</div><div class='add'>+	test_cmd_viommu_invalidate(viommu_id, inv_reqs, sizeof(*inv_reqs),</div><div class='add'>+				   &amp;num_inv);</div><div class='add'>+	assert(!num_inv);</div><div class='add'>+</div><div class='add'>+	/* Negative test: Invalid data_type */</div><div class='add'>+	num_inv = 1;</div><div class='add'>+	test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='add'>+				   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST_INVALID,</div><div class='add'>+				   sizeof(*inv_reqs), &amp;num_inv);</div><div class='add'>+	assert(!num_inv);</div><div class='add'>+</div><div class='add'>+	/* Negative test: structure size sanity */</div><div class='add'>+	num_inv = 1;</div><div class='add'>+	test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='add'>+				   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='add'>+				   sizeof(*inv_reqs) + 1, &amp;num_inv);</div><div class='add'>+	assert(!num_inv);</div><div class='add'>+</div><div class='add'>+	num_inv = 1;</div><div class='add'>+	test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='add'>+				   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST, 1,</div><div class='add'>+				   &amp;num_inv);</div><div class='add'>+	assert(!num_inv);</div><div class='add'>+</div><div class='add'>+	/* Negative test: invalid flag is passed */</div><div class='add'>+	num_inv = 1;</div><div class='add'>+	inv_reqs[0].flags = 0xffffffff;</div><div class='add'>+	inv_reqs[0].vdev_id = 0x99;</div><div class='add'>+	test_err_viommu_invalidate(EOPNOTSUPP, viommu_id, inv_reqs,</div><div class='add'>+				   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='add'>+				   sizeof(*inv_reqs), &amp;num_inv);</div><div class='add'>+	assert(!num_inv);</div><div class='add'>+</div><div class='add'>+	/* Negative test: invalid data_uptr when array is not empty */</div><div class='add'>+	num_inv = 1;</div><div class='add'>+	inv_reqs[0].flags = 0;</div><div class='add'>+	inv_reqs[0].vdev_id = 0x99;</div><div class='add'>+	test_err_viommu_invalidate(EINVAL, viommu_id, NULL,</div><div class='add'>+				   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='add'>+				   sizeof(*inv_reqs), &amp;num_inv);</div><div class='add'>+	assert(!num_inv);</div><div class='add'>+</div><div class='add'>+	/* Negative test: invalid entry_len when array is not empty */</div><div class='add'>+	num_inv = 1;</div><div class='add'>+	inv_reqs[0].flags = 0;</div><div class='add'>+	inv_reqs[0].vdev_id = 0x99;</div><div class='add'>+	test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='add'>+				   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST, 0,</div><div class='add'>+				   &amp;num_inv);</div><div class='add'>+	assert(!num_inv);</div><div class='add'>+</div><div class='add'>+	/* Negative test: invalid cache_id */</div><div class='add'>+	num_inv = 1;</div><div class='add'>+	inv_reqs[0].flags = 0;</div><div class='add'>+	inv_reqs[0].vdev_id = 0x99;</div><div class='add'>+	inv_reqs[0].cache_id = MOCK_DEV_CACHE_ID_MAX + 1;</div><div class='add'>+	test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='add'>+				   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='add'>+				   sizeof(*inv_reqs), &amp;num_inv);</div><div class='add'>+	assert(!num_inv);</div><div class='add'>+</div><div class='add'>+	/* Negative test: invalid vdev_id */</div><div class='add'>+	num_inv = 1;</div><div class='add'>+	inv_reqs[0].flags = 0;</div><div class='add'>+	inv_reqs[0].vdev_id = 0x9;</div><div class='add'>+	inv_reqs[0].cache_id = 0;</div><div class='add'>+	test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='add'>+				   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='add'>+				   sizeof(*inv_reqs), &amp;num_inv);</div><div class='add'>+	assert(!num_inv);</div><div class='ctx'> </div><div class='del'>-		test_cmd_dev_check_cache_all(dev_id,</div><div class='del'>-					     IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='add'>+	/*</div><div class='add'>+	 * Invalidate the 1st cache entry but fail the 2nd request</div><div class='add'>+	 * due to invalid flags configuration in the 2nd request.</div><div class='add'>+	 */</div><div class='add'>+	num_inv = 2;</div><div class='add'>+	inv_reqs[0].flags = 0;</div><div class='add'>+	inv_reqs[0].vdev_id = 0x99;</div><div class='add'>+	inv_reqs[0].cache_id = 0;</div><div class='add'>+	inv_reqs[1].flags = 0xffffffff;</div><div class='add'>+	inv_reqs[1].vdev_id = 0x99;</div><div class='add'>+	inv_reqs[1].cache_id = 1;</div><div class='add'>+	test_err_viommu_invalidate(EOPNOTSUPP, viommu_id, inv_reqs,</div><div class='add'>+				   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='add'>+				   sizeof(*inv_reqs), &amp;num_inv);</div><div class='add'>+	assert(num_inv == 1);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 0, 0);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 1, IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 2, IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 3, IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='ctx'> </div><div class='del'>-		/* Check data_type by passing zero-length array */</div><div class='del'>-		num_inv = 0;</div><div class='del'>-		test_cmd_viommu_invalidate(viommu_id, inv_reqs,</div><div class='del'>-					   sizeof(*inv_reqs), &amp;num_inv);</div><div class='del'>-		assert(!num_inv);</div><div class='add'>+	/*</div><div class='add'>+	 * Invalidate the 1st cache entry but fail the 2nd request</div><div class='add'>+	 * due to invalid cache_id configuration in the 2nd request.</div><div class='add'>+	 */</div><div class='add'>+	num_inv = 2;</div><div class='add'>+	inv_reqs[0].flags = 0;</div><div class='add'>+	inv_reqs[0].vdev_id = 0x99;</div><div class='add'>+	inv_reqs[0].cache_id = 0;</div><div class='add'>+	inv_reqs[1].flags = 0;</div><div class='add'>+	inv_reqs[1].vdev_id = 0x99;</div><div class='add'>+	inv_reqs[1].cache_id = MOCK_DEV_CACHE_ID_MAX + 1;</div><div class='add'>+	test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='add'>+				   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='add'>+				   sizeof(*inv_reqs), &amp;num_inv);</div><div class='add'>+	assert(num_inv == 1);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 0, 0);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 1, IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 2, IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 3, IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='add'>+</div><div class='add'>+	/* Invalidate the 2nd cache entry and verify */</div><div class='add'>+	num_inv = 1;</div><div class='add'>+	inv_reqs[0].flags = 0;</div><div class='add'>+	inv_reqs[0].vdev_id = 0x99;</div><div class='add'>+	inv_reqs[0].cache_id = 1;</div><div class='add'>+	test_cmd_viommu_invalidate(viommu_id, inv_reqs, sizeof(*inv_reqs),</div><div class='add'>+				   &amp;num_inv);</div><div class='add'>+	assert(num_inv == 1);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 0, 0);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 1, 0);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 2, IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='add'>+	test_cmd_dev_check_cache(dev_id, 3, IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='add'>+</div><div class='add'>+	/* Invalidate the 3rd and 4th cache entries and verify */</div><div class='add'>+	num_inv = 2;</div><div class='add'>+	inv_reqs[0].flags = 0;</div><div class='add'>+	inv_reqs[0].vdev_id = 0x99;</div><div class='add'>+	inv_reqs[0].cache_id = 2;</div><div class='add'>+	inv_reqs[1].flags = 0;</div><div class='add'>+	inv_reqs[1].vdev_id = 0x99;</div><div class='add'>+	inv_reqs[1].cache_id = 3;</div><div class='add'>+	test_cmd_viommu_invalidate(viommu_id, inv_reqs, sizeof(*inv_reqs),</div><div class='add'>+				   &amp;num_inv);</div><div class='add'>+	assert(num_inv == 2);</div><div class='add'>+	test_cmd_dev_check_cache_all(dev_id, 0);</div><div class='add'>+</div><div class='add'>+	/* Invalidate all cache entries for nested_dev_id[1] and verify */</div><div class='add'>+	num_inv = 1;</div><div class='add'>+	inv_reqs[0].vdev_id = 0x99;</div><div class='add'>+	inv_reqs[0].flags = IOMMU_TEST_INVALIDATE_FLAG_ALL;</div><div class='add'>+	test_cmd_viommu_invalidate(viommu_id, inv_reqs, sizeof(*inv_reqs),</div><div class='add'>+				   &amp;num_inv);</div><div class='add'>+	assert(num_inv == 1);</div><div class='add'>+	test_cmd_dev_check_cache_all(dev_id, 0);</div><div class='add'>+	test_ioctl_destroy(vdev_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(iommufd_viommu, hw_queue)</div><div class='add'>+{</div><div class='add'>+	__u64 iova = MOCK_APERTURE_START, iova2;</div><div class='add'>+	uint32_t viommu_id = self-&gt;viommu_id;</div><div class='add'>+	uint32_t hw_queue_id[2];</div><div class='add'>+</div><div class='add'>+	if (!viommu_id)</div><div class='add'>+		SKIP(return, "Skipping test for variant no_viommu");</div><div class='add'>+</div><div class='add'>+	/* Fail IOMMU_HW_QUEUE_TYPE_DEFAULT */</div><div class='add'>+	test_err_hw_queue_alloc(EOPNOTSUPP, viommu_id,</div><div class='add'>+				IOMMU_HW_QUEUE_TYPE_DEFAULT, 0, iova, PAGE_SIZE,</div><div class='add'>+				&amp;hw_queue_id[0]);</div><div class='add'>+	/* Fail queue addr and length */</div><div class='add'>+	test_err_hw_queue_alloc(EINVAL, viommu_id, IOMMU_HW_QUEUE_TYPE_SELFTEST,</div><div class='add'>+				0, iova, 0, &amp;hw_queue_id[0]);</div><div class='add'>+	test_err_hw_queue_alloc(EOVERFLOW, viommu_id,</div><div class='add'>+				IOMMU_HW_QUEUE_TYPE_SELFTEST, 0, ~(uint64_t)0,</div><div class='add'>+				PAGE_SIZE, &amp;hw_queue_id[0]);</div><div class='add'>+	/* Fail missing iova */</div><div class='add'>+	test_err_hw_queue_alloc(ENOENT, viommu_id, IOMMU_HW_QUEUE_TYPE_SELFTEST,</div><div class='add'>+				0, iova, PAGE_SIZE, &amp;hw_queue_id[0]);</div><div class='add'>+</div><div class='add'>+	/* Map iova */</div><div class='add'>+	test_ioctl_ioas_map(buffer, PAGE_SIZE, &amp;iova);</div><div class='add'>+	test_ioctl_ioas_map(buffer + PAGE_SIZE, PAGE_SIZE, &amp;iova2);</div><div class='add'>+</div><div class='add'>+	/* Fail index=1 and =MAX; must start from index=0 */</div><div class='add'>+	test_err_hw_queue_alloc(EIO, viommu_id, IOMMU_HW_QUEUE_TYPE_SELFTEST, 1,</div><div class='add'>+				iova, PAGE_SIZE, &amp;hw_queue_id[0]);</div><div class='add'>+	test_err_hw_queue_alloc(EINVAL, viommu_id, IOMMU_HW_QUEUE_TYPE_SELFTEST,</div><div class='add'>+				IOMMU_TEST_HW_QUEUE_MAX, iova, PAGE_SIZE,</div><div class='add'>+				&amp;hw_queue_id[0]);</div><div class='add'>+</div><div class='add'>+	/* Allocate index=0, declare ownership of the iova */</div><div class='add'>+	test_cmd_hw_queue_alloc(viommu_id, IOMMU_HW_QUEUE_TYPE_SELFTEST, 0,</div><div class='add'>+				iova, PAGE_SIZE, &amp;hw_queue_id[0]);</div><div class='add'>+	/* Fail duplicated index */</div><div class='add'>+	test_err_hw_queue_alloc(EEXIST, viommu_id, IOMMU_HW_QUEUE_TYPE_SELFTEST,</div><div class='add'>+				0, iova, PAGE_SIZE, &amp;hw_queue_id[0]);</div><div class='add'>+	/* Fail unmap, due to iova ownership */</div><div class='add'>+	test_err_ioctl_ioas_unmap(EBUSY, iova, PAGE_SIZE);</div><div class='add'>+	/* The 2nd page is not pinned, so it can be unmmap */</div><div class='add'>+	test_ioctl_ioas_unmap(iova2, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Allocate index=1, with an unaligned case */</div><div class='add'>+	test_cmd_hw_queue_alloc(viommu_id, IOMMU_HW_QUEUE_TYPE_SELFTEST, 1,</div><div class='add'>+				iova + PAGE_SIZE / 2, PAGE_SIZE / 2,</div><div class='add'>+				&amp;hw_queue_id[1]);</div><div class='add'>+	/* Fail to destroy, due to dependency */</div><div class='add'>+	EXPECT_ERRNO(EBUSY, _test_ioctl_destroy(self-&gt;fd, hw_queue_id[0]));</div><div class='add'>+</div><div class='add'>+	/* Destroy in descending order */</div><div class='add'>+	test_ioctl_destroy(hw_queue_id[1]);</div><div class='add'>+	test_ioctl_destroy(hw_queue_id[0]);</div><div class='add'>+	/* Now it can unmap the first page */</div><div class='add'>+	test_ioctl_ioas_unmap(iova, PAGE_SIZE);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/* Negative test: Invalid data_type */</div><div class='del'>-		num_inv = 1;</div><div class='del'>-		test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='del'>-					   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST_INVALID,</div><div class='del'>-					   sizeof(*inv_reqs), &amp;num_inv);</div><div class='del'>-		assert(!num_inv);</div><div class='add'>+TEST_F(iommufd_viommu, vdevice_tombstone)</div><div class='add'>+{</div><div class='add'>+	uint32_t viommu_id = self-&gt;viommu_id;</div><div class='add'>+	uint32_t dev_id = self-&gt;device_id;</div><div class='add'>+	uint32_t vdev_id = 0;</div><div class='ctx'> </div><div class='del'>-		/* Negative test: structure size sanity */</div><div class='del'>-		num_inv = 1;</div><div class='del'>-		test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='del'>-					   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='del'>-					   sizeof(*inv_reqs) + 1, &amp;num_inv);</div><div class='del'>-		assert(!num_inv);</div><div class='add'>+	if (!dev_id)</div><div class='add'>+		SKIP(return, "Skipping test for variant no_viommu");</div><div class='ctx'> </div><div class='del'>-		num_inv = 1;</div><div class='del'>-		test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='del'>-					   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='del'>-					   1, &amp;num_inv);</div><div class='del'>-		assert(!num_inv);</div><div class='add'>+	test_cmd_vdevice_alloc(viommu_id, dev_id, 0x99, &amp;vdev_id);</div><div class='add'>+	test_ioctl_destroy(self-&gt;stdev_id);</div><div class='add'>+	EXPECT_ERRNO(ENOENT, _test_ioctl_destroy(self-&gt;fd, vdev_id));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/* Negative test: invalid flag is passed */</div><div class='del'>-		num_inv = 1;</div><div class='del'>-		inv_reqs[0].flags = 0xffffffff;</div><div class='del'>-		inv_reqs[0].vdev_id = 0x99;</div><div class='del'>-		test_err_viommu_invalidate(EOPNOTSUPP, viommu_id, inv_reqs,</div><div class='del'>-					   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='del'>-					   sizeof(*inv_reqs), &amp;num_inv);</div><div class='del'>-		assert(!num_inv);</div><div class='add'>+FIXTURE(iommufd_device_pasid)</div><div class='add'>+{</div><div class='add'>+	int fd;</div><div class='add'>+	uint32_t ioas_id;</div><div class='add'>+	uint32_t hwpt_id;</div><div class='add'>+	uint32_t stdev_id;</div><div class='add'>+	uint32_t device_id;</div><div class='add'>+	uint32_t no_pasid_stdev_id;</div><div class='add'>+	uint32_t no_pasid_device_id;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		/* Negative test: invalid data_uptr when array is not empty */</div><div class='del'>-		num_inv = 1;</div><div class='del'>-		inv_reqs[0].flags = 0;</div><div class='del'>-		inv_reqs[0].vdev_id = 0x99;</div><div class='del'>-		test_err_viommu_invalidate(EINVAL, viommu_id, NULL,</div><div class='del'>-					   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='del'>-					   sizeof(*inv_reqs), &amp;num_inv);</div><div class='del'>-		assert(!num_inv);</div><div class='add'>+FIXTURE_VARIANT(iommufd_device_pasid)</div><div class='add'>+{</div><div class='add'>+	bool pasid_capable;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		/* Negative test: invalid entry_len when array is not empty */</div><div class='del'>-		num_inv = 1;</div><div class='del'>-		inv_reqs[0].flags = 0;</div><div class='del'>-		inv_reqs[0].vdev_id = 0x99;</div><div class='del'>-		test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='del'>-					   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='del'>-					   0, &amp;num_inv);</div><div class='del'>-		assert(!num_inv);</div><div class='add'>+FIXTURE_SETUP(iommufd_device_pasid)</div><div class='add'>+{</div><div class='add'>+	self-&gt;fd = open("/dev/iommu", O_RDWR);</div><div class='add'>+	ASSERT_NE(-1, self-&gt;fd);</div><div class='add'>+	test_ioctl_ioas_alloc(&amp;self-&gt;ioas_id);</div><div class='ctx'> </div><div class='del'>-		/* Negative test: invalid cache_id */</div><div class='del'>-		num_inv = 1;</div><div class='del'>-		inv_reqs[0].flags = 0;</div><div class='del'>-		inv_reqs[0].vdev_id = 0x99;</div><div class='del'>-		inv_reqs[0].cache_id = MOCK_DEV_CACHE_ID_MAX + 1;</div><div class='del'>-		test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='del'>-					   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='del'>-					   sizeof(*inv_reqs), &amp;num_inv);</div><div class='del'>-		assert(!num_inv);</div><div class='add'>+	test_cmd_mock_domain_flags(self-&gt;ioas_id,</div><div class='add'>+				   MOCK_FLAGS_DEVICE_PASID,</div><div class='add'>+				   &amp;self-&gt;stdev_id, &amp;self-&gt;hwpt_id,</div><div class='add'>+				   &amp;self-&gt;device_id);</div><div class='add'>+	if (!variant-&gt;pasid_capable)</div><div class='add'>+		test_cmd_mock_domain_flags(self-&gt;ioas_id, 0,</div><div class='add'>+					   &amp;self-&gt;no_pasid_stdev_id, NULL,</div><div class='add'>+					   &amp;self-&gt;no_pasid_device_id);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/* Negative test: invalid vdev_id */</div><div class='del'>-		num_inv = 1;</div><div class='del'>-		inv_reqs[0].flags = 0;</div><div class='del'>-		inv_reqs[0].vdev_id = 0x9;</div><div class='del'>-		inv_reqs[0].cache_id = 0;</div><div class='del'>-		test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='del'>-					   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='del'>-					   sizeof(*inv_reqs), &amp;num_inv);</div><div class='del'>-		assert(!num_inv);</div><div class='add'>+FIXTURE_TEARDOWN(iommufd_device_pasid)</div><div class='add'>+{</div><div class='add'>+	teardown_iommufd(self-&gt;fd, _metadata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT_ADD(iommufd_device_pasid, no_pasid)</div><div class='add'>+{</div><div class='add'>+	.pasid_capable = false,</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+FIXTURE_VARIANT_ADD(iommufd_device_pasid, has_pasid)</div><div class='add'>+{</div><div class='add'>+	.pasid_capable = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+TEST_F(iommufd_device_pasid, pasid_attach)</div><div class='add'>+{</div><div class='add'>+	struct iommu_hwpt_selftest data = {</div><div class='add'>+		.iotlb =  IOMMU_TEST_IOTLB_DEFAULT,</div><div class='add'>+	};</div><div class='add'>+	uint32_t nested_hwpt_id[3] = {};</div><div class='add'>+	uint32_t parent_hwpt_id = 0;</div><div class='add'>+	uint32_t fault_id, fault_fd;</div><div class='add'>+	uint32_t s2_hwpt_id = 0;</div><div class='add'>+	uint32_t iopf_hwpt_id;</div><div class='add'>+	uint32_t pasid = 100;</div><div class='add'>+	uint32_t viommu_id;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Negative, detach pasid without attaching, this is not expected.</div><div class='add'>+	 * But it should not result in failure anyway.</div><div class='add'>+	 */</div><div class='add'>+	test_cmd_pasid_detach(pasid);</div><div class='add'>+</div><div class='add'>+	/* Allocate two nested hwpts sharing one common parent hwpt */</div><div class='add'>+	test_cmd_hwpt_alloc(self-&gt;device_id, self-&gt;ioas_id,</div><div class='add'>+			    IOMMU_HWPT_ALLOC_NEST_PARENT,</div><div class='add'>+			    &amp;parent_hwpt_id);</div><div class='add'>+	test_cmd_hwpt_alloc_nested(self-&gt;device_id, parent_hwpt_id,</div><div class='add'>+				   IOMMU_HWPT_ALLOC_PASID,</div><div class='add'>+				   &amp;nested_hwpt_id[0],</div><div class='add'>+				   IOMMU_HWPT_DATA_SELFTEST,</div><div class='add'>+				   &amp;data, sizeof(data));</div><div class='add'>+	test_cmd_hwpt_alloc_nested(self-&gt;device_id, parent_hwpt_id,</div><div class='add'>+				   IOMMU_HWPT_ALLOC_PASID,</div><div class='add'>+				   &amp;nested_hwpt_id[1],</div><div class='add'>+				   IOMMU_HWPT_DATA_SELFTEST,</div><div class='add'>+				   &amp;data, sizeof(data));</div><div class='add'>+</div><div class='add'>+	/* Fault related preparation */</div><div class='add'>+	test_ioctl_fault_alloc(&amp;fault_id, &amp;fault_fd);</div><div class='add'>+	test_cmd_hwpt_alloc_iopf(self-&gt;device_id, parent_hwpt_id, fault_id,</div><div class='add'>+				 IOMMU_HWPT_FAULT_ID_VALID | IOMMU_HWPT_ALLOC_PASID,</div><div class='add'>+				 &amp;iopf_hwpt_id,</div><div class='add'>+				 IOMMU_HWPT_DATA_SELFTEST, &amp;data,</div><div class='add'>+				 sizeof(data));</div><div class='add'>+</div><div class='add'>+	/* Allocate a regular nested hwpt based on viommu */</div><div class='add'>+	test_cmd_viommu_alloc(self-&gt;device_id, parent_hwpt_id,</div><div class='add'>+			      IOMMU_VIOMMU_TYPE_SELFTEST, NULL, 0, &amp;viommu_id);</div><div class='add'>+	test_cmd_hwpt_alloc_nested(self-&gt;device_id, viommu_id,</div><div class='add'>+				   IOMMU_HWPT_ALLOC_PASID,</div><div class='add'>+				   &amp;nested_hwpt_id[2],</div><div class='add'>+				   IOMMU_HWPT_DATA_SELFTEST, &amp;data,</div><div class='add'>+				   sizeof(data));</div><div class='add'>+</div><div class='add'>+	test_cmd_hwpt_alloc(self-&gt;device_id, self-&gt;ioas_id,</div><div class='add'>+			    IOMMU_HWPT_ALLOC_PASID,</div><div class='add'>+			    &amp;s2_hwpt_id);</div><div class='add'>+</div><div class='add'>+	/* Attach RID to non-pasid compat domain, */</div><div class='add'>+	test_cmd_mock_domain_replace(self-&gt;stdev_id, parent_hwpt_id);</div><div class='add'>+	/* then attach to pasid should fail */</div><div class='add'>+	test_err_pasid_attach(EINVAL, pasid, s2_hwpt_id);</div><div class='add'>+</div><div class='add'>+	/* Attach RID to pasid compat domain, */</div><div class='add'>+	test_cmd_mock_domain_replace(self-&gt;stdev_id, s2_hwpt_id);</div><div class='add'>+	/* then attach to pasid should succeed, */</div><div class='add'>+	test_cmd_pasid_attach(pasid, nested_hwpt_id[0]);</div><div class='add'>+	/* but attach RID to non-pasid compat domain should fail now. */</div><div class='add'>+	test_err_mock_domain_replace(EINVAL, self-&gt;stdev_id, parent_hwpt_id);</div><div class='add'>+	/*</div><div class='add'>+	 * Detach hwpt from pasid 100, and check if the pasid 100</div><div class='add'>+	 * has null domain.</div><div class='add'>+	 */</div><div class='add'>+	test_cmd_pasid_detach(pasid);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, 0));</div><div class='add'>+	/* RID is attached to pasid-comapt domain, pasid path is not used */</div><div class='add'>+</div><div class='add'>+	if (!variant-&gt;pasid_capable) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Invalidate the 1st cache entry but fail the 2nd request</div><div class='del'>-		 * due to invalid flags configuration in the 2nd request.</div><div class='add'>+		 * PASID-compatible domain can be used by non-PASID-capable</div><div class='add'>+		 * device.</div><div class='ctx'> 		 */</div><div class='del'>-		num_inv = 2;</div><div class='del'>-		inv_reqs[0].flags = 0;</div><div class='del'>-		inv_reqs[0].vdev_id = 0x99;</div><div class='del'>-		inv_reqs[0].cache_id = 0;</div><div class='del'>-		inv_reqs[1].flags = 0xffffffff;</div><div class='del'>-		inv_reqs[1].vdev_id = 0x99;</div><div class='del'>-		inv_reqs[1].cache_id = 1;</div><div class='del'>-		test_err_viommu_invalidate(EOPNOTSUPP, viommu_id, inv_reqs,</div><div class='del'>-					   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='del'>-					   sizeof(*inv_reqs), &amp;num_inv);</div><div class='del'>-		assert(num_inv == 1);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 0, 0);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 1,</div><div class='del'>-					 IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 2,</div><div class='del'>-					 IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 3,</div><div class='del'>-					 IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='del'>-</div><div class='add'>+		test_cmd_mock_domain_replace(self-&gt;no_pasid_stdev_id, nested_hwpt_id[0]);</div><div class='add'>+		test_cmd_mock_domain_replace(self-&gt;no_pasid_stdev_id, self-&gt;ioas_id);</div><div class='ctx'> 		/*</div><div class='del'>-		 * Invalidate the 1st cache entry but fail the 2nd request</div><div class='del'>-		 * due to invalid cache_id configuration in the 2nd request.</div><div class='add'>+		 * Attach hwpt to pasid 100 of non-PASID-capable device,</div><div class='add'>+		 * should fail, no matter domain is pasid-comapt or not.</div><div class='ctx'> 		 */</div><div class='del'>-		num_inv = 2;</div><div class='del'>-		inv_reqs[0].flags = 0;</div><div class='del'>-		inv_reqs[0].vdev_id = 0x99;</div><div class='del'>-		inv_reqs[0].cache_id = 0;</div><div class='del'>-		inv_reqs[1].flags = 0;</div><div class='del'>-		inv_reqs[1].vdev_id = 0x99;</div><div class='del'>-		inv_reqs[1].cache_id = MOCK_DEV_CACHE_ID_MAX + 1;</div><div class='del'>-		test_err_viommu_invalidate(EINVAL, viommu_id, inv_reqs,</div><div class='del'>-					   IOMMU_VIOMMU_INVALIDATE_DATA_SELFTEST,</div><div class='del'>-					   sizeof(*inv_reqs), &amp;num_inv);</div><div class='del'>-		assert(num_inv == 1);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 0, 0);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 1,</div><div class='del'>-					 IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 2,</div><div class='del'>-					 IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 3,</div><div class='del'>-					 IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='del'>-</div><div class='del'>-		/* Invalidate the 2nd cache entry and verify */</div><div class='del'>-		num_inv = 1;</div><div class='del'>-		inv_reqs[0].flags = 0;</div><div class='del'>-		inv_reqs[0].vdev_id = 0x99;</div><div class='del'>-		inv_reqs[0].cache_id = 1;</div><div class='del'>-		test_cmd_viommu_invalidate(viommu_id, inv_reqs,</div><div class='del'>-					   sizeof(*inv_reqs), &amp;num_inv);</div><div class='del'>-		assert(num_inv == 1);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 0, 0);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 1, 0);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 2,</div><div class='del'>-					 IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='del'>-		test_cmd_dev_check_cache(dev_id, 3,</div><div class='del'>-					 IOMMU_TEST_DEV_CACHE_DEFAULT);</div><div class='del'>-</div><div class='del'>-		/* Invalidate the 3rd and 4th cache entries and verify */</div><div class='del'>-		num_inv = 2;</div><div class='del'>-		inv_reqs[0].flags = 0;</div><div class='del'>-		inv_reqs[0].vdev_id = 0x99;</div><div class='del'>-		inv_reqs[0].cache_id = 2;</div><div class='del'>-		inv_reqs[1].flags = 0;</div><div class='del'>-		inv_reqs[1].vdev_id = 0x99;</div><div class='del'>-		inv_reqs[1].cache_id = 3;</div><div class='del'>-		test_cmd_viommu_invalidate(viommu_id, inv_reqs,</div><div class='del'>-					   sizeof(*inv_reqs), &amp;num_inv);</div><div class='del'>-		assert(num_inv == 2);</div><div class='del'>-		test_cmd_dev_check_cache_all(dev_id, 0);</div><div class='del'>-</div><div class='del'>-		/* Invalidate all cache entries for nested_dev_id[1] and verify */</div><div class='del'>-		num_inv = 1;</div><div class='del'>-		inv_reqs[0].vdev_id = 0x99;</div><div class='del'>-		inv_reqs[0].flags = IOMMU_TEST_INVALIDATE_FLAG_ALL;</div><div class='del'>-		test_cmd_viommu_invalidate(viommu_id, inv_reqs,</div><div class='del'>-					   sizeof(*inv_reqs), &amp;num_inv);</div><div class='del'>-		assert(num_inv == 1);</div><div class='del'>-		test_cmd_dev_check_cache_all(dev_id, 0);</div><div class='del'>-		test_ioctl_destroy(vdev_id);</div><div class='add'>+		EXPECT_ERRNO(EINVAL,</div><div class='add'>+			     _test_cmd_pasid_attach(self-&gt;fd, self-&gt;no_pasid_stdev_id,</div><div class='add'>+						    pasid, parent_hwpt_id));</div><div class='add'>+		EXPECT_ERRNO(EINVAL,</div><div class='add'>+			     _test_cmd_pasid_attach(self-&gt;fd, self-&gt;no_pasid_stdev_id,</div><div class='add'>+						    pasid, s2_hwpt_id));</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attach non pasid compat hwpt to pasid-capable device, should</div><div class='add'>+	 * fail, and have null domain.</div><div class='add'>+	 */</div><div class='add'>+	test_err_pasid_attach(EINVAL, pasid, parent_hwpt_id);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, 0));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attach ioas to pasid 100, should fail, domain should</div><div class='add'>+	 * be null.</div><div class='add'>+	 */</div><div class='add'>+	test_err_pasid_attach(EINVAL, pasid, self-&gt;ioas_id);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, 0));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attach the s2_hwpt to pasid 100, should succeed, domain should</div><div class='add'>+	 * be valid.</div><div class='add'>+	 */</div><div class='add'>+	test_cmd_pasid_attach(pasid, s2_hwpt_id);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, s2_hwpt_id));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Try attach pasid 100 with another hwpt, should FAIL</div><div class='add'>+	 * as attach does not allow overwrite, use REPLACE instead.</div><div class='add'>+	 */</div><div class='add'>+	test_err_pasid_attach(EBUSY, pasid, nested_hwpt_id[0]);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Detach hwpt from pasid 100 for next test, should succeed,</div><div class='add'>+	 * and have null domain.</div><div class='add'>+	 */</div><div class='add'>+	test_cmd_pasid_detach(pasid);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, 0));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attach nested hwpt to pasid 100, should succeed, domain</div><div class='add'>+	 * should be valid.</div><div class='add'>+	 */</div><div class='add'>+	test_cmd_pasid_attach(pasid, nested_hwpt_id[0]);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, nested_hwpt_id[0]));</div><div class='add'>+</div><div class='add'>+	/* Attach to pasid 100 which has been attached, should fail. */</div><div class='add'>+	test_err_pasid_attach(EBUSY, pasid, nested_hwpt_id[0]);</div><div class='add'>+</div><div class='add'>+	/* cleanup pasid 100 */</div><div class='add'>+	test_cmd_pasid_detach(pasid);</div><div class='add'>+</div><div class='add'>+	/* Replace tests */</div><div class='add'>+</div><div class='add'>+	pasid = 200;</div><div class='add'>+	/*</div><div class='add'>+	 * Replace pasid 200 without attaching it, should fail</div><div class='add'>+	 * with -EINVAL.</div><div class='add'>+	 */</div><div class='add'>+	test_err_pasid_replace(EINVAL, pasid, s2_hwpt_id);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attach the s2 hwpt to pasid 200, should succeed, domain should</div><div class='add'>+	 * be valid.</div><div class='add'>+	 */</div><div class='add'>+	test_cmd_pasid_attach(pasid, s2_hwpt_id);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, s2_hwpt_id));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Replace pasid 200 with self-&gt;ioas_id, should fail</div><div class='add'>+	 * and domain should be the prior s2 hwpt.</div><div class='add'>+	 */</div><div class='add'>+	test_err_pasid_replace(EINVAL, pasid, self-&gt;ioas_id);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, s2_hwpt_id));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Replace a nested hwpt for pasid 200, should succeed,</div><div class='add'>+	 * and have valid domain.</div><div class='add'>+	 */</div><div class='add'>+	test_cmd_pasid_replace(pasid, nested_hwpt_id[0]);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, nested_hwpt_id[0]));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Replace with another nested hwpt for pasid 200, should</div><div class='add'>+	 * succeed, and have valid domain.</div><div class='add'>+	 */</div><div class='add'>+	test_cmd_pasid_replace(pasid, nested_hwpt_id[1]);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, nested_hwpt_id[1]));</div><div class='add'>+</div><div class='add'>+	/* cleanup pasid 200 */</div><div class='add'>+	test_cmd_pasid_detach(pasid);</div><div class='add'>+</div><div class='add'>+	/* Negative Tests for pasid replace, use pasid 1024 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attach the s2 hwpt to pasid 1024, should succeed, domain should</div><div class='add'>+	 * be valid.</div><div class='add'>+	 */</div><div class='add'>+	pasid = 1024;</div><div class='add'>+	test_cmd_pasid_attach(pasid, s2_hwpt_id);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, s2_hwpt_id));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Replace pasid 1024 with nested_hwpt_id[0], should fail,</div><div class='add'>+	 * but have the old valid domain. This is a designed</div><div class='add'>+	 * negative case. Normally, this shall succeed.</div><div class='add'>+	 */</div><div class='add'>+	test_err_pasid_replace(ENOMEM, pasid, nested_hwpt_id[0]);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, s2_hwpt_id));</div><div class='add'>+</div><div class='add'>+	/* cleanup pasid 1024 */</div><div class='add'>+	test_cmd_pasid_detach(pasid);</div><div class='add'>+</div><div class='add'>+	/* Attach to iopf-capable hwpt */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Attach an iopf hwpt to pasid 2048, should succeed, domain should</div><div class='add'>+	 * be valid.</div><div class='add'>+	 */</div><div class='add'>+	pasid = 2048;</div><div class='add'>+	test_cmd_pasid_attach(pasid, iopf_hwpt_id);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, iopf_hwpt_id));</div><div class='add'>+</div><div class='add'>+	test_cmd_trigger_iopf_pasid(self-&gt;device_id, pasid, fault_fd);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Replace with s2_hwpt_id for pasid 2048, should</div><div class='add'>+	 * succeed, and have valid domain.</div><div class='add'>+	 */</div><div class='add'>+	test_cmd_pasid_replace(pasid, s2_hwpt_id);</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  test_cmd_pasid_check_hwpt(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+					    pasid, s2_hwpt_id));</div><div class='add'>+</div><div class='add'>+	/* cleanup pasid 2048 */</div><div class='add'>+	test_cmd_pasid_detach(pasid);</div><div class='add'>+</div><div class='add'>+	test_ioctl_destroy(iopf_hwpt_id);</div><div class='add'>+	close(fault_fd);</div><div class='add'>+	test_ioctl_destroy(fault_id);</div><div class='add'>+</div><div class='add'>+	/* Detach the s2_hwpt_id from RID */</div><div class='add'>+	test_cmd_mock_domain_replace(self-&gt;stdev_id, self-&gt;ioas_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/iommu/iommufd_fail_nth.c b/tools/testing/selftests/iommu/iommufd_fail_nth.c<br/>index 64b1f8e1b0cf..45c14323a618 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/iommu/iommufd_fail_nth.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/iommu/iommufd_fail_nth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/iommu/iommufd_fail_nth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/iommu/iommufd_fail_nth.c</a></div><div class='hunk'>@@ -113,7 +113,7 @@ static bool fail_nth_next(struct __test_metadata *_metadata,</div><div class='ctx'> 	 * necessarily mean a test failure, just that the limit has to be made</div><div class='ctx'> 	 * bigger.</div><div class='ctx'> 	 */</div><div class='del'>-	ASSERT_GT(400, nth_state-&gt;iteration);</div><div class='add'>+	ASSERT_GT(1000, nth_state-&gt;iteration);</div><div class='ctx'> 	if (nth_state-&gt;iteration != 0) {</div><div class='ctx'> 		ssize_t res;</div><div class='ctx'> 		ssize_t res2;</div><div class='hunk'>@@ -209,12 +209,16 @@ FIXTURE(basic_fail_nth)</div><div class='ctx'> {</div><div class='ctx'> 	int fd;</div><div class='ctx'> 	uint32_t access_id;</div><div class='add'>+	uint32_t stdev_id;</div><div class='add'>+	uint32_t pasid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> FIXTURE_SETUP(basic_fail_nth)</div><div class='ctx'> {</div><div class='ctx'> 	self-&gt;fd = -1;</div><div class='ctx'> 	self-&gt;access_id = 0;</div><div class='add'>+	self-&gt;stdev_id = 0;</div><div class='add'>+	self-&gt;pasid = 0; //test should use a non-zero value</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> FIXTURE_TEARDOWN(basic_fail_nth)</div><div class='hunk'>@@ -226,6 +230,8 @@ FIXTURE_TEARDOWN(basic_fail_nth)</div><div class='ctx'> 		rc = _test_cmd_destroy_access(self-&gt;access_id);</div><div class='ctx'> 		assert(rc == 0);</div><div class='ctx'> 	}</div><div class='add'>+	if (self-&gt;pasid &amp;&amp; self-&gt;stdev_id)</div><div class='add'>+		_test_cmd_pasid_detach(self-&gt;fd, self-&gt;stdev_id, self-&gt;pasid);</div><div class='ctx'> 	teardown_iommufd(self-&gt;fd, _metadata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -620,13 +626,15 @@ TEST_FAIL_NTH(basic_fail_nth, device)</div><div class='ctx'> 	};</div><div class='ctx'> 	struct iommu_test_hw_info info;</div><div class='ctx'> 	uint32_t fault_id, fault_fd;</div><div class='add'>+	uint32_t veventq_id, veventq_fd;</div><div class='ctx'> 	uint32_t fault_hwpt_id;</div><div class='add'>+	uint32_t test_hwpt_id;</div><div class='ctx'> 	uint32_t ioas_id;</div><div class='ctx'> 	uint32_t ioas_id2;</div><div class='del'>-	uint32_t stdev_id;</div><div class='ctx'> 	uint32_t idev_id;</div><div class='ctx'> 	uint32_t hwpt_id;</div><div class='ctx'> 	uint32_t viommu_id;</div><div class='add'>+	uint32_t hw_queue_id;</div><div class='ctx'> 	uint32_t vdev_id;</div><div class='ctx'> 	__u64 iova;</div><div class='ctx'> </div><div class='hunk'>@@ -654,35 +662,46 @@ TEST_FAIL_NTH(basic_fail_nth, device)</div><div class='ctx'> </div><div class='ctx'> 	fail_nth_enable();</div><div class='ctx'> </div><div class='del'>-	if (_test_cmd_mock_domain(self-&gt;fd, ioas_id, &amp;stdev_id, NULL,</div><div class='del'>-				  &amp;idev_id))</div><div class='add'>+	if (_test_cmd_mock_domain_flags(self-&gt;fd, ioas_id,</div><div class='add'>+					MOCK_FLAGS_DEVICE_PASID,</div><div class='add'>+					&amp;self-&gt;stdev_id, NULL, &amp;idev_id))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (_test_cmd_get_hw_info(self-&gt;fd, idev_id, &amp;info, sizeof(info), NULL))</div><div class='add'>+	if (_test_cmd_get_hw_info(self-&gt;fd, idev_id, IOMMU_HW_INFO_TYPE_DEFAULT,</div><div class='add'>+				  &amp;info, sizeof(info), NULL, NULL))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (_test_cmd_hwpt_alloc(self-&gt;fd, idev_id, ioas_id, 0, 0, &amp;hwpt_id,</div><div class='add'>+	if (_test_cmd_hwpt_alloc(self-&gt;fd, idev_id, ioas_id, 0,</div><div class='add'>+				 IOMMU_HWPT_ALLOC_PASID, &amp;hwpt_id,</div><div class='ctx'> 				 IOMMU_HWPT_DATA_NONE, 0, 0))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (_test_cmd_mock_domain_replace(self-&gt;fd, stdev_id, ioas_id2, NULL))</div><div class='add'>+	if (_test_cmd_mock_domain_replace(self-&gt;fd, self-&gt;stdev_id, ioas_id2, NULL))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (_test_cmd_mock_domain_replace(self-&gt;fd, stdev_id, hwpt_id, NULL))</div><div class='add'>+	if (_test_cmd_mock_domain_replace(self-&gt;fd, self-&gt;stdev_id, hwpt_id, NULL))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (_test_cmd_hwpt_alloc(self-&gt;fd, idev_id, ioas_id, 0,</div><div class='del'>-				 IOMMU_HWPT_ALLOC_NEST_PARENT, &amp;hwpt_id,</div><div class='add'>+				 IOMMU_HWPT_ALLOC_NEST_PARENT |</div><div class='add'>+						IOMMU_HWPT_ALLOC_PASID,</div><div class='add'>+				 &amp;hwpt_id,</div><div class='ctx'> 				 IOMMU_HWPT_DATA_NONE, 0, 0))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	if (_test_cmd_viommu_alloc(self-&gt;fd, idev_id, hwpt_id,</div><div class='del'>-				   IOMMU_VIOMMU_TYPE_SELFTEST, 0, &amp;viommu_id))</div><div class='add'>+	if (_test_cmd_viommu_alloc(self-&gt;fd, idev_id, hwpt_id, 0,</div><div class='add'>+				   IOMMU_VIOMMU_TYPE_SELFTEST, NULL, 0,</div><div class='add'>+				   &amp;viommu_id))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	if (_test_cmd_vdevice_alloc(self-&gt;fd, viommu_id, idev_id, 0, &amp;vdev_id))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='add'>+	if (_test_cmd_hw_queue_alloc(self-&gt;fd, viommu_id,</div><div class='add'>+				     IOMMU_HW_QUEUE_TYPE_SELFTEST, 0, iova,</div><div class='add'>+				     PAGE_SIZE, &amp;hw_queue_id))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='ctx'> 	if (_test_ioctl_fault_alloc(self-&gt;fd, &amp;fault_id, &amp;fault_fd))</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	close(fault_fd);</div><div class='hunk'>@@ -692,6 +711,37 @@ TEST_FAIL_NTH(basic_fail_nth, device)</div><div class='ctx'> 				 IOMMU_HWPT_DATA_SELFTEST, &amp;data, sizeof(data)))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='add'>+	if (_test_cmd_veventq_alloc(self-&gt;fd, viommu_id,</div><div class='add'>+				    IOMMU_VEVENTQ_TYPE_SELFTEST, &amp;veventq_id,</div><div class='add'>+				    &amp;veventq_fd))</div><div class='add'>+		return -1;</div><div class='add'>+	close(veventq_fd);</div><div class='add'>+</div><div class='add'>+	if (_test_cmd_hwpt_alloc(self-&gt;fd, idev_id, ioas_id, 0,</div><div class='add'>+				 IOMMU_HWPT_ALLOC_PASID,</div><div class='add'>+				 &amp;test_hwpt_id,</div><div class='add'>+				 IOMMU_HWPT_DATA_NONE, 0, 0))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* Tests for pasid attach/replace/detach */</div><div class='add'>+</div><div class='add'>+	self-&gt;pasid = 200;</div><div class='add'>+</div><div class='add'>+	if (_test_cmd_pasid_attach(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+				   self-&gt;pasid, hwpt_id)) {</div><div class='add'>+		self-&gt;pasid = 0;</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (_test_cmd_pasid_replace(self-&gt;fd, self-&gt;stdev_id,</div><div class='add'>+				    self-&gt;pasid, test_hwpt_id))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (_test_cmd_pasid_detach(self-&gt;fd, self-&gt;stdev_id, self-&gt;pasid))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	self-&gt;pasid = 0;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h<br/>index d979f5b0efe8..5502751d500c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/iommu/iommufd_utils.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/iommu/iommufd_utils.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/iommu/iommufd_utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/iommu/iommufd_utils.h</a></div><div class='hunk'>@@ -9,8 +9,9 @@</div><div class='ctx'> #include &lt;sys/ioctl.h&gt;</div><div class='ctx'> #include &lt;stdint.h&gt;</div><div class='ctx'> #include &lt;assert.h&gt;</div><div class='add'>+#include &lt;poll.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> #include "../../../../drivers/iommu/iommufd/iommufd_test.h"</div><div class='ctx'> </div><div class='ctx'> /* Hack to make assertions more readable */</div><div class='hunk'>@@ -55,17 +56,26 @@ static unsigned long PAGE_SIZE;</div><div class='ctx'> #define offsetofend(TYPE, MEMBER) \</div><div class='ctx'> 	(offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER))</div><div class='ctx'> </div><div class='add'>+#define test_err_mmap(_errno, length, offset)                                 \</div><div class='add'>+	EXPECT_ERRNO(_errno, (long)mmap(NULL, length, PROT_READ | PROT_WRITE, \</div><div class='add'>+					MAP_SHARED, self-&gt;fd, offset))</div><div class='add'>+</div><div class='ctx'> static inline void *memfd_mmap(size_t length, int prot, int flags, int *mfd_p)</div><div class='ctx'> {</div><div class='ctx'> 	int mfd_flags = (flags &amp; MAP_HUGETLB) ? MFD_HUGETLB : 0;</div><div class='ctx'> 	int mfd = memfd_create("buffer", mfd_flags);</div><div class='add'>+	void *buf = MAP_FAILED;</div><div class='ctx'> </div><div class='ctx'> 	if (mfd &lt;= 0)</div><div class='ctx'> 		return MAP_FAILED;</div><div class='ctx'> 	if (ftruncate(mfd, length))</div><div class='del'>-		return MAP_FAILED;</div><div class='add'>+		goto out;</div><div class='ctx'> 	*mfd_p = mfd;</div><div class='del'>-	return mmap(0, length, prot, flags, mfd, 0);</div><div class='add'>+	buf = mmap(0, length, prot, flags, mfd, 0);</div><div class='add'>+out:</div><div class='add'>+	if (buf == MAP_FAILED)</div><div class='add'>+		close(mfd);</div><div class='add'>+	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -205,6 +215,18 @@ static int _test_cmd_hwpt_alloc(int fd, __u32 device_id, __u32 pt_id, __u32 ft_i</div><div class='ctx'> 	ASSERT_EQ(0, _test_cmd_hwpt_alloc(self-&gt;fd, device_id, pt_id, 0, flags,   \</div><div class='ctx'> 					  hwpt_id, IOMMU_HWPT_DATA_NONE, NULL, \</div><div class='ctx'> 					  0))</div><div class='add'>+#define test_cmd_hwpt_alloc_iommupt(device_id, pt_id, flags, iommupt_type, \</div><div class='add'>+				    hwpt_id)                               \</div><div class='add'>+	({                                                                 \</div><div class='add'>+		struct iommu_hwpt_selftest user_cfg = {                    \</div><div class='add'>+			.pagetable_type = iommupt_type                     \</div><div class='add'>+		};                                                         \</div><div class='add'>+                                                                           \</div><div class='add'>+		ASSERT_EQ(0, _test_cmd_hwpt_alloc(                         \</div><div class='add'>+				     self-&gt;fd, device_id, pt_id, 0, flags, \</div><div class='add'>+				     hwpt_id, IOMMU_HWPT_DATA_SELFTEST,    \</div><div class='add'>+				     &amp;user_cfg, sizeof(user_cfg)));        \</div><div class='add'>+	})</div><div class='ctx'> #define test_err_hwpt_alloc(_errno, device_id, pt_id, flags, hwpt_id)   \</div><div class='ctx'> 	EXPECT_ERRNO(_errno, _test_cmd_hwpt_alloc(                      \</div><div class='ctx'> 				     self-&gt;fd, device_id, pt_id, 0, flags, \</div><div class='hunk'>@@ -538,6 +560,39 @@ static int _test_cmd_destroy_access_pages(int fd, unsigned int access_id,</div><div class='ctx'> 	EXPECT_ERRNO(_errno, _test_cmd_destroy_access_pages(              \</div><div class='ctx'> 				     self-&gt;fd, access_id, access_pages_id))</div><div class='ctx'> </div><div class='add'>+static int _test_cmd_get_dmabuf(int fd, size_t len, int *out_fd)</div><div class='add'>+{</div><div class='add'>+	struct iommu_test_cmd cmd = {</div><div class='add'>+		.size = sizeof(cmd),</div><div class='add'>+		.op = IOMMU_TEST_OP_DMABUF_GET,</div><div class='add'>+		.dmabuf_get = { .length = len, .open_flags = O_CLOEXEC },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	*out_fd = ioctl(fd, IOMMU_TEST_CMD, &amp;cmd);</div><div class='add'>+	if (*out_fd &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#define test_cmd_get_dmabuf(len, out_fd) \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_get_dmabuf(self-&gt;fd, len, out_fd))</div><div class='add'>+</div><div class='add'>+static int _test_cmd_revoke_dmabuf(int fd, int dmabuf_fd, bool revoked)</div><div class='add'>+{</div><div class='add'>+	struct iommu_test_cmd cmd = {</div><div class='add'>+		.size = sizeof(cmd),</div><div class='add'>+		.op = IOMMU_TEST_OP_DMABUF_REVOKE,</div><div class='add'>+		.dmabuf_revoke = { .dmabuf_fd = dmabuf_fd, .revoked = revoked },</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ioctl(fd, IOMMU_TEST_CMD, &amp;cmd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#define test_cmd_revoke_dmabuf(dmabuf_fd, revoke) \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_revoke_dmabuf(self-&gt;fd, dmabuf_fd, revoke))</div><div class='add'>+</div><div class='ctx'> static int _test_ioctl_destroy(int fd, unsigned int id)</div><div class='ctx'> {</div><div class='ctx'> 	struct iommu_destroy cmd = {</div><div class='hunk'>@@ -708,6 +763,17 @@ static int _test_ioctl_ioas_map_file(int fd, unsigned int ioas_id, int mfd,</div><div class='ctx'> 			  self-&gt;fd, ioas_id, mfd, start, length, iova_p,     \</div><div class='ctx'> 			  IOMMU_IOAS_MAP_WRITEABLE | IOMMU_IOAS_MAP_READABLE))</div><div class='ctx'> </div><div class='add'>+#define test_ioctl_ioas_map_fixed_file(mfd, start, length, iova)          \</div><div class='add'>+	({                                                                \</div><div class='add'>+		__u64 __iova = iova;                                      \</div><div class='add'>+		ASSERT_EQ(0, _test_ioctl_ioas_map_file(                   \</div><div class='add'>+				     self-&gt;fd, self-&gt;ioas_id, mfd, start, \</div><div class='add'>+				     length, &amp;__iova,                     \</div><div class='add'>+				     IOMMU_IOAS_MAP_FIXED_IOVA |          \</div><div class='add'>+					     IOMMU_IOAS_MAP_WRITEABLE |   \</div><div class='add'>+					     IOMMU_IOAS_MAP_READABLE));   \</div><div class='add'>+	})</div><div class='add'>+</div><div class='ctx'> static int _test_ioctl_set_temp_memory_limit(int fd, unsigned int limit)</div><div class='ctx'> {</div><div class='ctx'> 	struct iommu_test_cmd memlimit_cmd = {</div><div class='hunk'>@@ -756,19 +822,24 @@ static void teardown_iommufd(int fd, struct __test_metadata *_metadata)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* @data can be NULL */</div><div class='del'>-static int _test_cmd_get_hw_info(int fd, __u32 device_id, void *data,</div><div class='del'>-				 size_t data_len, uint32_t *capabilities)</div><div class='add'>+static int _test_cmd_get_hw_info(int fd, __u32 device_id, __u32 data_type,</div><div class='add'>+				 void *data, size_t data_len,</div><div class='add'>+				 uint32_t *capabilities, uint8_t *max_pasid)</div><div class='ctx'> {</div><div class='ctx'> 	struct iommu_test_hw_info *info = (struct iommu_test_hw_info *)data;</div><div class='ctx'> 	struct iommu_hw_info cmd = {</div><div class='ctx'> 		.size = sizeof(cmd),</div><div class='ctx'> 		.dev_id = device_id,</div><div class='ctx'> 		.data_len = data_len,</div><div class='add'>+		.in_data_type = data_type,</div><div class='ctx'> 		.data_uptr = (uint64_t)data,</div><div class='ctx'> 		.out_capabilities = 0,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (data_type != IOMMU_HW_INFO_TYPE_DEFAULT)</div><div class='add'>+		cmd.flags |= IOMMU_HW_INFO_FLAG_INPUT_TYPE;</div><div class='add'>+</div><div class='ctx'> 	ret = ioctl(fd, IOMMU_GET_HW_INFO, &amp;cmd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -802,22 +873,33 @@ static int _test_cmd_get_hw_info(int fd, __u32 device_id, void *data,</div><div class='ctx'> 			assert(!info-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (max_pasid)</div><div class='add'>+		*max_pasid = cmd.out_max_pasid_log2;</div><div class='add'>+</div><div class='ctx'> 	if (capabilities)</div><div class='ctx'> 		*capabilities = cmd.out_capabilities;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define test_cmd_get_hw_info(device_id, data, data_len)               \</div><div class='del'>-	ASSERT_EQ(0, _test_cmd_get_hw_info(self-&gt;fd, device_id, data, \</div><div class='del'>-					   data_len, NULL))</div><div class='add'>+#define test_cmd_get_hw_info(device_id, data_type, data, data_len)         \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_get_hw_info(self-&gt;fd, device_id, data_type, \</div><div class='add'>+					   data, data_len, NULL, NULL))</div><div class='add'>+</div><div class='add'>+#define test_err_get_hw_info(_errno, device_id, data_type, data, data_len) \</div><div class='add'>+	EXPECT_ERRNO(_errno,                                               \</div><div class='add'>+		     _test_cmd_get_hw_info(self-&gt;fd, device_id, data_type, \</div><div class='add'>+					   data, data_len, NULL, NULL))</div><div class='ctx'> </div><div class='del'>-#define test_err_get_hw_info(_errno, device_id, data, data_len)               \</div><div class='del'>-	EXPECT_ERRNO(_errno, _test_cmd_get_hw_info(self-&gt;fd, device_id, data, \</div><div class='del'>-						   data_len, NULL))</div><div class='add'>+#define test_cmd_get_hw_capabilities(device_id, caps)                        \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_get_hw_info(self-&gt;fd, device_id,              \</div><div class='add'>+					   IOMMU_HW_INFO_TYPE_DEFAULT, NULL, \</div><div class='add'>+					   0, &amp;caps, NULL))</div><div class='ctx'> </div><div class='del'>-#define test_cmd_get_hw_capabilities(device_id, caps, mask) \</div><div class='del'>-	ASSERT_EQ(0, _test_cmd_get_hw_info(self-&gt;fd, device_id, NULL, 0, &amp;caps))</div><div class='add'>+#define test_cmd_get_hw_info_pasid(device_id, max_pasid)                     \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_get_hw_info(self-&gt;fd, device_id,              \</div><div class='add'>+					   IOMMU_HW_INFO_TYPE_DEFAULT, NULL, \</div><div class='add'>+					   0, NULL, max_pasid))</div><div class='ctx'> </div><div class='ctx'> static int _test_ioctl_fault_alloc(int fd, __u32 *fault_id, __u32 *fault_fd)</div><div class='ctx'> {</div><div class='hunk'>@@ -842,14 +924,15 @@ static int _test_ioctl_fault_alloc(int fd, __u32 *fault_id, __u32 *fault_fd)</div><div class='ctx'> 		ASSERT_NE(0, *(fault_fd));                               \</div><div class='ctx'> 	})</div><div class='ctx'> </div><div class='del'>-static int _test_cmd_trigger_iopf(int fd, __u32 device_id, __u32 fault_fd)</div><div class='add'>+static int _test_cmd_trigger_iopf(int fd, __u32 device_id, __u32 pasid,</div><div class='add'>+				  __u32 fault_fd)</div><div class='ctx'> {</div><div class='ctx'> 	struct iommu_test_cmd trigger_iopf_cmd = {</div><div class='ctx'> 		.size = sizeof(trigger_iopf_cmd),</div><div class='ctx'> 		.op = IOMMU_TEST_OP_TRIGGER_IOPF,</div><div class='ctx'> 		.trigger_iopf = {</div><div class='ctx'> 			.dev_id = device_id,</div><div class='del'>-			.pasid = 0x1,</div><div class='add'>+			.pasid = pasid,</div><div class='ctx'> 			.grpid = 0x2,</div><div class='ctx'> 			.perm = IOMMU_PGFAULT_PERM_READ | IOMMU_PGFAULT_PERM_WRITE,</div><div class='ctx'> 			.addr = 0xdeadbeaf,</div><div class='hunk'>@@ -880,10 +963,14 @@ static int _test_cmd_trigger_iopf(int fd, __u32 device_id, __u32 fault_fd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define test_cmd_trigger_iopf(device_id, fault_fd) \</div><div class='del'>-	ASSERT_EQ(0, _test_cmd_trigger_iopf(self-&gt;fd, device_id, fault_fd))</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_trigger_iopf(self-&gt;fd, device_id, 0x1, fault_fd))</div><div class='add'>+#define test_cmd_trigger_iopf_pasid(device_id, pasid, fault_fd) \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_trigger_iopf(self-&gt;fd, device_id, \</div><div class='add'>+					    pasid, fault_fd))</div><div class='ctx'> </div><div class='ctx'> static int _test_cmd_viommu_alloc(int fd, __u32 device_id, __u32 hwpt_id,</div><div class='del'>-				  __u32 type, __u32 flags, __u32 *viommu_id)</div><div class='add'>+				  __u32 flags, __u32 type, void *data,</div><div class='add'>+				  __u32 data_len, __u32 *viommu_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct iommu_viommu_alloc cmd = {</div><div class='ctx'> 		.size = sizeof(cmd),</div><div class='hunk'>@@ -891,6 +978,8 @@ static int _test_cmd_viommu_alloc(int fd, __u32 device_id, __u32 hwpt_id,</div><div class='ctx'> 		.type = type,</div><div class='ctx'> 		.dev_id = device_id,</div><div class='ctx'> 		.hwpt_id = hwpt_id,</div><div class='add'>+		.data_uptr = (uint64_t)data,</div><div class='add'>+		.data_len = data_len,</div><div class='ctx'> 	};</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -902,13 +991,15 @@ static int _test_cmd_viommu_alloc(int fd, __u32 device_id, __u32 hwpt_id,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define test_cmd_viommu_alloc(device_id, hwpt_id, type, viommu_id)        \</div><div class='del'>-	ASSERT_EQ(0, _test_cmd_viommu_alloc(self-&gt;fd, device_id, hwpt_id, \</div><div class='del'>-					    type, 0, viommu_id))</div><div class='del'>-#define test_err_viommu_alloc(_errno, device_id, hwpt_id, type, viommu_id) \</div><div class='del'>-	EXPECT_ERRNO(_errno,                                               \</div><div class='del'>-		     _test_cmd_viommu_alloc(self-&gt;fd, device_id, hwpt_id,  \</div><div class='del'>-					    type, 0, viommu_id))</div><div class='add'>+#define test_cmd_viommu_alloc(device_id, hwpt_id, type, data, data_len,      \</div><div class='add'>+			      viommu_id)                                     \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_viommu_alloc(self-&gt;fd, device_id, hwpt_id, 0, \</div><div class='add'>+					    type, data, data_len, viommu_id))</div><div class='add'>+#define test_err_viommu_alloc(_errno, device_id, hwpt_id, type, data,        \</div><div class='add'>+			      data_len, viommu_id)                           \</div><div class='add'>+	EXPECT_ERRNO(_errno,                                                 \</div><div class='add'>+		     _test_cmd_viommu_alloc(self-&gt;fd, device_id, hwpt_id, 0, \</div><div class='add'>+					    type, data, data_len, viommu_id))</div><div class='ctx'> </div><div class='ctx'> static int _test_cmd_vdevice_alloc(int fd, __u32 viommu_id, __u32 idev_id,</div><div class='ctx'> 				   __u64 virt_id, __u32 *vdev_id)</div><div class='hunk'>@@ -936,3 +1027,233 @@ static int _test_cmd_vdevice_alloc(int fd, __u32 viommu_id, __u32 idev_id,</div><div class='ctx'> 	EXPECT_ERRNO(_errno,                                                 \</div><div class='ctx'> 		     _test_cmd_vdevice_alloc(self-&gt;fd, viommu_id, idev_id,   \</div><div class='ctx'> 					     virt_id, vdev_id))</div><div class='add'>+</div><div class='add'>+static int _test_cmd_hw_queue_alloc(int fd, __u32 viommu_id, __u32 type,</div><div class='add'>+				    __u32 idx, __u64 base_addr, __u64 length,</div><div class='add'>+				    __u32 *hw_queue_id)</div><div class='add'>+{</div><div class='add'>+	struct iommu_hw_queue_alloc cmd = {</div><div class='add'>+		.size = sizeof(cmd),</div><div class='add'>+		.viommu_id = viommu_id,</div><div class='add'>+		.type = type,</div><div class='add'>+		.index = idx,</div><div class='add'>+		.nesting_parent_iova = base_addr,</div><div class='add'>+		.length = length,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ioctl(fd, IOMMU_HW_QUEUE_ALLOC, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (hw_queue_id)</div><div class='add'>+		*hw_queue_id = cmd.out_hw_queue_id;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define test_cmd_hw_queue_alloc(viommu_id, type, idx, base_addr, len, out_qid) \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_hw_queue_alloc(self-&gt;fd, viommu_id, type, idx,  \</div><div class='add'>+					      base_addr, len, out_qid))</div><div class='add'>+#define test_err_hw_queue_alloc(_errno, viommu_id, type, idx, base_addr, len, \</div><div class='add'>+				out_qid)                                      \</div><div class='add'>+	EXPECT_ERRNO(_errno,                                                  \</div><div class='add'>+		     _test_cmd_hw_queue_alloc(self-&gt;fd, viommu_id, type, idx, \</div><div class='add'>+					      base_addr, len, out_qid))</div><div class='add'>+</div><div class='add'>+static int _test_cmd_veventq_alloc(int fd, __u32 viommu_id, __u32 type,</div><div class='add'>+				   __u32 *veventq_id, __u32 *veventq_fd)</div><div class='add'>+{</div><div class='add'>+	struct iommu_veventq_alloc cmd = {</div><div class='add'>+		.size = sizeof(cmd),</div><div class='add'>+		.type = type,</div><div class='add'>+		.veventq_depth = 2,</div><div class='add'>+		.viommu_id = viommu_id,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ioctl(fd, IOMMU_VEVENTQ_ALLOC, &amp;cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (veventq_id)</div><div class='add'>+		*veventq_id = cmd.out_veventq_id;</div><div class='add'>+	if (veventq_fd)</div><div class='add'>+		*veventq_fd = cmd.out_veventq_fd;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define test_cmd_veventq_alloc(viommu_id, type, veventq_id, veventq_fd) \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_veventq_alloc(self-&gt;fd, viommu_id, type, \</div><div class='add'>+					     veventq_id, veventq_fd))</div><div class='add'>+#define test_err_veventq_alloc(_errno, viommu_id, type, veventq_id,     \</div><div class='add'>+			       veventq_fd)                              \</div><div class='add'>+	EXPECT_ERRNO(_errno,                                            \</div><div class='add'>+		     _test_cmd_veventq_alloc(self-&gt;fd, viommu_id, type, \</div><div class='add'>+					     veventq_id, veventq_fd))</div><div class='add'>+</div><div class='add'>+static int _test_cmd_trigger_vevents(int fd, __u32 dev_id, __u32 nvevents)</div><div class='add'>+{</div><div class='add'>+	struct iommu_test_cmd trigger_vevent_cmd = {</div><div class='add'>+		.size = sizeof(trigger_vevent_cmd),</div><div class='add'>+		.op = IOMMU_TEST_OP_TRIGGER_VEVENT,</div><div class='add'>+		.trigger_vevent = {</div><div class='add'>+			.dev_id = dev_id,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	while (nvevents--) {</div><div class='add'>+		if (ioctl(fd, _IOMMU_TEST_CMD(IOMMU_TEST_OP_TRIGGER_VEVENT),</div><div class='add'>+			  &amp;trigger_vevent_cmd))</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define test_cmd_trigger_vevents(dev_id, nvevents) \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_trigger_vevents(self-&gt;fd, dev_id, nvevents))</div><div class='add'>+</div><div class='add'>+static int _test_cmd_read_vevents(int fd, __u32 event_fd, __u32 nvevents,</div><div class='add'>+				  __u32 virt_id, int *prev_seq)</div><div class='add'>+{</div><div class='add'>+	struct pollfd pollfd = { .fd = event_fd, .events = POLLIN };</div><div class='add'>+	struct iommu_viommu_event_selftest *event;</div><div class='add'>+	struct iommufd_vevent_header *hdr;</div><div class='add'>+	ssize_t bytes;</div><div class='add'>+	void *data;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = poll(&amp;pollfd, 1, 1000);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	data = calloc(nvevents, sizeof(*hdr) + sizeof(*event));</div><div class='add'>+	if (!data) {</div><div class='add'>+		errno = ENOMEM;</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bytes = read(event_fd, data,</div><div class='add'>+		     nvevents * (sizeof(*hdr) + sizeof(*event)));</div><div class='add'>+	if (bytes &lt;= 0) {</div><div class='add'>+		errno = EFAULT;</div><div class='add'>+		ret = -1;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nvevents; i++) {</div><div class='add'>+		hdr = data + i * (sizeof(*hdr) + sizeof(*event));</div><div class='add'>+</div><div class='add'>+		if (hdr-&gt;flags &amp; IOMMU_VEVENTQ_FLAG_LOST_EVENTS ||</div><div class='add'>+		    hdr-&gt;sequence - *prev_seq &gt; 1) {</div><div class='add'>+			*prev_seq = hdr-&gt;sequence;</div><div class='add'>+			errno = EOVERFLOW;</div><div class='add'>+			ret = -1;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+		*prev_seq = hdr-&gt;sequence;</div><div class='add'>+		event = data + sizeof(*hdr);</div><div class='add'>+		if (event-&gt;virt_id != virt_id) {</div><div class='add'>+			errno = EINVAL;</div><div class='add'>+			ret = -1;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+out_free:</div><div class='add'>+	free(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define test_cmd_read_vevents(event_fd, nvevents, virt_id, prev_seq)      \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_read_vevents(self-&gt;fd, event_fd, nvevents, \</div><div class='add'>+					    virt_id, prev_seq))</div><div class='add'>+#define test_err_read_vevents(_errno, event_fd, nvevents, virt_id, prev_seq) \</div><div class='add'>+	EXPECT_ERRNO(_errno,                                                 \</div><div class='add'>+		     _test_cmd_read_vevents(self-&gt;fd, event_fd, nvevents,    \</div><div class='add'>+					    virt_id, prev_seq))</div><div class='add'>+</div><div class='add'>+static int _test_cmd_pasid_attach(int fd, __u32 stdev_id, __u32 pasid,</div><div class='add'>+				  __u32 pt_id)</div><div class='add'>+{</div><div class='add'>+	struct iommu_test_cmd test_attach = {</div><div class='add'>+		.size = sizeof(test_attach),</div><div class='add'>+		.op = IOMMU_TEST_OP_PASID_ATTACH,</div><div class='add'>+		.id = stdev_id,</div><div class='add'>+		.pasid_attach = {</div><div class='add'>+			.pasid = pasid,</div><div class='add'>+			.pt_id = pt_id,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return ioctl(fd, _IOMMU_TEST_CMD(IOMMU_TEST_OP_PASID_ATTACH),</div><div class='add'>+		     &amp;test_attach);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define test_cmd_pasid_attach(pasid, hwpt_id) \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_pasid_attach(self-&gt;fd, self-&gt;stdev_id, \</div><div class='add'>+					    pasid, hwpt_id))</div><div class='add'>+</div><div class='add'>+#define test_err_pasid_attach(_errno, pasid, hwpt_id) \</div><div class='add'>+	EXPECT_ERRNO(_errno, \</div><div class='add'>+		     _test_cmd_pasid_attach(self-&gt;fd, self-&gt;stdev_id, \</div><div class='add'>+					    pasid, hwpt_id))</div><div class='add'>+</div><div class='add'>+static int _test_cmd_pasid_replace(int fd, __u32 stdev_id, __u32 pasid,</div><div class='add'>+				   __u32 pt_id)</div><div class='add'>+{</div><div class='add'>+	struct iommu_test_cmd test_replace = {</div><div class='add'>+		.size = sizeof(test_replace),</div><div class='add'>+		.op = IOMMU_TEST_OP_PASID_REPLACE,</div><div class='add'>+		.id = stdev_id,</div><div class='add'>+		.pasid_replace = {</div><div class='add'>+			.pasid = pasid,</div><div class='add'>+			.pt_id = pt_id,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return ioctl(fd, _IOMMU_TEST_CMD(IOMMU_TEST_OP_PASID_REPLACE),</div><div class='add'>+		     &amp;test_replace);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define test_cmd_pasid_replace(pasid, hwpt_id) \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_pasid_replace(self-&gt;fd, self-&gt;stdev_id, \</div><div class='add'>+					     pasid, hwpt_id))</div><div class='add'>+</div><div class='add'>+#define test_err_pasid_replace(_errno, pasid, hwpt_id) \</div><div class='add'>+	EXPECT_ERRNO(_errno, \</div><div class='add'>+		     _test_cmd_pasid_replace(self-&gt;fd, self-&gt;stdev_id, \</div><div class='add'>+					     pasid, hwpt_id))</div><div class='add'>+</div><div class='add'>+static int _test_cmd_pasid_detach(int fd, __u32 stdev_id, __u32 pasid)</div><div class='add'>+{</div><div class='add'>+	struct iommu_test_cmd test_detach = {</div><div class='add'>+		.size = sizeof(test_detach),</div><div class='add'>+		.op = IOMMU_TEST_OP_PASID_DETACH,</div><div class='add'>+		.id = stdev_id,</div><div class='add'>+		.pasid_detach = {</div><div class='add'>+			.pasid = pasid,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return ioctl(fd, _IOMMU_TEST_CMD(IOMMU_TEST_OP_PASID_DETACH),</div><div class='add'>+		     &amp;test_detach);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define test_cmd_pasid_detach(pasid) \</div><div class='add'>+	ASSERT_EQ(0, _test_cmd_pasid_detach(self-&gt;fd, self-&gt;stdev_id, pasid))</div><div class='add'>+</div><div class='add'>+static int test_cmd_pasid_check_hwpt(int fd, __u32 stdev_id, __u32 pasid,</div><div class='add'>+				     __u32 hwpt_id)</div><div class='add'>+{</div><div class='add'>+	struct iommu_test_cmd test_pasid_check = {</div><div class='add'>+		.size = sizeof(test_pasid_check),</div><div class='add'>+		.op = IOMMU_TEST_OP_PASID_CHECK_HWPT,</div><div class='add'>+		.id = stdev_id,</div><div class='add'>+		.pasid_check = {</div><div class='add'>+			.pasid = pasid,</div><div class='add'>+			.hwpt_id = hwpt_id,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return ioctl(fd, _IOMMU_TEST_CMD(IOMMU_TEST_OP_PASID_CHECK_HWPT),</div><div class='add'>+		     &amp;test_pasid_check);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/ipc/msgque.c b/tools/testing/selftests/ipc/msgque.c<br/>index e9dbb84c100a..e107379d185c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ipc/msgque.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ipc/msgque.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ipc/msgque.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ipc/msgque.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;sys/msg.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define MAX_MSG_SIZE		32</div><div class='ctx'> </div><div class='hunk'>@@ -39,26 +39,26 @@ int restore_queue(struct msgque_data *msgque)</div><div class='ctx'> </div><div class='ctx'> 	fd = open("/proc/sys/kernel/msg_next_id", O_WRONLY);</div><div class='ctx'> 	if (fd == -1) {</div><div class='del'>-		printf("Failed to open /proc/sys/kernel/msg_next_id\n");</div><div class='add'>+		ksft_test_result_fail("Failed to open /proc/sys/kernel/msg_next_id\n");</div><div class='ctx'> 		return -errno;</div><div class='ctx'> 	}</div><div class='ctx'> 	sprintf(buf, "%d", msgque-&gt;msq_id);</div><div class='ctx'> </div><div class='ctx'> 	ret = write(fd, buf, strlen(buf));</div><div class='ctx'> 	if (ret != strlen(buf)) {</div><div class='del'>-		printf("Failed to write to /proc/sys/kernel/msg_next_id\n");</div><div class='add'>+		ksft_test_result_fail("Failed to write to /proc/sys/kernel/msg_next_id\n");</div><div class='ctx'> 		return -errno;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	id = msgget(msgque-&gt;key, msgque-&gt;mode | IPC_CREAT | IPC_EXCL);</div><div class='ctx'> 	if (id == -1) {</div><div class='del'>-		printf("Failed to create queue\n");</div><div class='add'>+		ksft_test_result_fail("Failed to create queue\n");</div><div class='ctx'> 		return -errno;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (id != msgque-&gt;msq_id) {</div><div class='del'>-		printf("Restored queue has wrong id (%d instead of %d)\n",</div><div class='del'>-							id, msgque-&gt;msq_id);</div><div class='add'>+		ksft_test_result_fail("Restored queue has wrong id (%d instead of %d)\n"</div><div class='add'>+								, id, msgque-&gt;msq_id);</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> 		goto destroy;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -66,7 +66,7 @@ int restore_queue(struct msgque_data *msgque)</div><div class='ctx'> 	for (i = 0; i &lt; msgque-&gt;qnum; i++) {</div><div class='ctx'> 		if (msgsnd(msgque-&gt;msq_id, &amp;msgque-&gt;messages[i].mtype,</div><div class='ctx'> 			   msgque-&gt;messages[i].msize, IPC_NOWAIT) != 0) {</div><div class='del'>-			printf("msgsnd failed (%m)\n");</div><div class='add'>+			ksft_test_result_fail("msgsnd failed (%m)\n");</div><div class='ctx'> 			ret = -errno;</div><div class='ctx'> 			goto destroy;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -90,23 +90,22 @@ int check_and_destroy_queue(struct msgque_data *msgque)</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			if (errno == ENOMSG)</div><div class='ctx'> 				break;</div><div class='del'>-			printf("Failed to read IPC message: %m\n");</div><div class='add'>+			ksft_test_result_fail("Failed to read IPC message: %m\n");</div><div class='ctx'> 			ret = -errno;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret != msgque-&gt;messages[cnt].msize) {</div><div class='del'>-			printf("Wrong message size: %d (expected %d)\n", ret,</div><div class='del'>-						msgque-&gt;messages[cnt].msize);</div><div class='add'>+			ksft_test_result_fail("Wrong message size: %d (expected %d)\n", ret, msgque-&gt;messages[cnt].msize);</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (message.mtype != msgque-&gt;messages[cnt].mtype) {</div><div class='del'>-			printf("Wrong message type\n");</div><div class='add'>+			ksft_test_result_fail("Wrong message type\n");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (memcmp(message.mtext, msgque-&gt;messages[cnt].mtext, ret)) {</div><div class='del'>-			printf("Wrong message content\n");</div><div class='add'>+			ksft_test_result_fail("Wrong message content\n");</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -114,7 +113,7 @@ int check_and_destroy_queue(struct msgque_data *msgque)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cnt != msgque-&gt;qnum) {</div><div class='del'>-		printf("Wrong message number\n");</div><div class='add'>+		ksft_test_result_fail("Wrong message number\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -139,7 +138,7 @@ int dump_queue(struct msgque_data *msgque)</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			if (errno == EINVAL)</div><div class='ctx'> 				continue;</div><div class='del'>-			printf("Failed to get stats for IPC queue with id %d\n",</div><div class='add'>+			ksft_test_result_fail("Failed to get stats for IPC queue with id %d\n",</div><div class='ctx'> 					kern_id);</div><div class='ctx'> 			return -errno;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -150,7 +149,7 @@ int dump_queue(struct msgque_data *msgque)</div><div class='ctx'> </div><div class='ctx'> 	msgque-&gt;messages = malloc(sizeof(struct msg1) * ds.msg_qnum);</div><div class='ctx'> 	if (msgque-&gt;messages == NULL) {</div><div class='del'>-		printf("Failed to get stats for IPC queue\n");</div><div class='add'>+		ksft_test_result_fail("Failed to get stats for IPC queue\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +161,7 @@ int dump_queue(struct msgque_data *msgque)</div><div class='ctx'> 		ret = msgrcv(msgque-&gt;msq_id, &amp;msgque-&gt;messages[i].mtype,</div><div class='ctx'> 				MAX_MSG_SIZE, i, IPC_NOWAIT | MSG_COPY);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			printf("Failed to copy IPC message: %m (%d)\n", errno);</div><div class='add'>+			ksft_test_result_fail("Failed to copy IPC message: %m (%d)\n", errno);</div><div class='ctx'> 			return -errno;</div><div class='ctx'> 		}</div><div class='ctx'> 		msgque-&gt;messages[i].msize = ret;</div><div class='hunk'>@@ -178,7 +177,7 @@ int fill_msgque(struct msgque_data *msgque)</div><div class='ctx'> 	memcpy(msgbuf.mtext, TEST_STRING, sizeof(TEST_STRING));</div><div class='ctx'> 	if (msgsnd(msgque-&gt;msq_id, &amp;msgbuf.mtype, sizeof(TEST_STRING),</div><div class='ctx'> 				IPC_NOWAIT) != 0) {</div><div class='del'>-		printf("First message send failed (%m)\n");</div><div class='add'>+		ksft_test_result_fail("First message send failed (%m)\n");</div><div class='ctx'> 		return -errno;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -186,7 +185,7 @@ int fill_msgque(struct msgque_data *msgque)</div><div class='ctx'> 	memcpy(msgbuf.mtext, ANOTHER_TEST_STRING, sizeof(ANOTHER_TEST_STRING));</div><div class='ctx'> 	if (msgsnd(msgque-&gt;msq_id, &amp;msgbuf.mtype, sizeof(ANOTHER_TEST_STRING),</div><div class='ctx'> 				IPC_NOWAIT) != 0) {</div><div class='del'>-		printf("Second message send failed (%m)\n");</div><div class='add'>+		ksft_test_result_fail("Second message send failed (%m)\n");</div><div class='ctx'> 		return -errno;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -202,44 +201,44 @@ int main(int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> 	msgque.key = ftok(argv[0], 822155650);</div><div class='ctx'> 	if (msgque.key == -1) {</div><div class='del'>-		printf("Can't make key: %d\n", -errno);</div><div class='add'>+		ksft_test_result_fail("Can't make key: %d\n", -errno);</div><div class='ctx'> 		ksft_exit_fail();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	msgque.msq_id = msgget(msgque.key, IPC_CREAT | IPC_EXCL | 0666);</div><div class='ctx'> 	if (msgque.msq_id == -1) {</div><div class='ctx'> 		err = -errno;</div><div class='del'>-		printf("Can't create queue: %d\n", err);</div><div class='add'>+		ksft_test_result_fail("Can't create queue: %d\n", err);</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = fill_msgque(&amp;msgque);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printf("Failed to fill queue: %d\n", err);</div><div class='add'>+		ksft_test_result_fail("Failed to fill queue: %d\n", err);</div><div class='ctx'> 		goto err_destroy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = dump_queue(&amp;msgque);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printf("Failed to dump queue: %d\n", err);</div><div class='add'>+		ksft_test_result_fail("Failed to dump queue: %d\n", err);</div><div class='ctx'> 		goto err_destroy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = check_and_destroy_queue(&amp;msgque);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printf("Failed to check and destroy queue: %d\n", err);</div><div class='add'>+		ksft_test_result_fail("Failed to check and destroy queue: %d\n", err);</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = restore_queue(&amp;msgque);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printf("Failed to restore queue: %d\n", err);</div><div class='add'>+		ksft_test_result_fail("Failed to restore queue: %d\n", err);</div><div class='ctx'> 		goto err_destroy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = check_and_destroy_queue(&amp;msgque);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printf("Failed to test queue: %d\n", err);</div><div class='add'>+		ksft_test_result_fail("Failed to test queue: %d\n", err);</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	ksft_exit_pass();</div><div class='head'>diff --git a/tools/testing/selftests/ir/ir_loopback.c b/tools/testing/selftests/ir/ir_loopback.c<br/>index f4a15cbdd5ea..adfcf50b1264 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ir/ir_loopback.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/ir/ir_loopback.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/ir/ir_loopback.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/ir/ir_loopback.c</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;dirent.h&gt;</div><div class='ctx'> #include &lt;sys/stat.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define TEST_SCANCODES	10</div><div class='ctx'> #define SYSFS_PATH_MAX 256</div><div class='head'>diff --git a/tools/testing/selftests/kcmp/kcmp_test.c b/tools/testing/selftests/kcmp/kcmp_test.c<br/>index d7a8e321bb16..79aa438b7479 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kcmp/kcmp_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kcmp/kcmp_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kcmp/kcmp_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kcmp/kcmp_test.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;sys/epoll.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> static long sys_kcmp(int pid1, int pid2, int type, unsigned long fd1, unsigned long fd2)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/kexec/.gitignore b/tools/testing/selftests/kexec/.gitignore<br/>new file mode 100644<br/>index 000000000000..5f3d9e089ae8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kexec/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kexec/.gitignore</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+test_kexec_jump</div><div class='head'>diff --git a/tools/testing/selftests/kexec/Makefile b/tools/testing/selftests/kexec/Makefile<br/>index 67fe7a46cb62..874cfdd3b75b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kexec/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kexec/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kexec/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kexec/Makefile</a></div><div class='hunk'>@@ -8,6 +8,13 @@ ifeq ($(ARCH_PROCESSED),$(filter $(ARCH_PROCESSED),x86 ppc64le))</div><div class='ctx'> TEST_PROGS := test_kexec_load.sh test_kexec_file_load.sh</div><div class='ctx'> TEST_FILES := kexec_common_lib.sh</div><div class='ctx'> </div><div class='add'>+include ../../../scripts/Makefile.arch</div><div class='add'>+</div><div class='add'>+ifeq ($(IS_64_BIT)$(ARCH_PROCESSED),1x86)</div><div class='add'>+TEST_PROGS += test_kexec_jump.sh</div><div class='add'>+TEST_GEN_PROGS := test_kexec_jump</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> include ../lib.mk</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='head'>diff --git a/tools/testing/selftests/kexec/test_kexec_jump.c b/tools/testing/selftests/kexec/test_kexec_jump.c<br/>new file mode 100644<br/>index 000000000000..fbce287866f5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kexec/test_kexec_jump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kexec/test_kexec_jump.c</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;sys/reboot.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+</div><div class='add'>+asm(</div><div class='add'>+    "  .code64\n"</div><div class='add'>+    "  .data\n"</div><div class='add'>+    "purgatory_start:\n"</div><div class='add'>+</div><div class='add'>+    // Trigger kexec debug exception handling</div><div class='add'>+    "  int3\n"</div><div class='add'>+</div><div class='add'>+    // Set load address for next time</div><div class='add'>+    "  leaq purgatory_start_b(%rip), %r11\n"</div><div class='add'>+    "  movq %r11, 8(%rsp)\n"</div><div class='add'>+</div><div class='add'>+    // Back to Linux</div><div class='add'>+    "  ret\n"</div><div class='add'>+</div><div class='add'>+    // Same again</div><div class='add'>+    "purgatory_start_b:\n"</div><div class='add'>+</div><div class='add'>+    // Trigger kexec debug exception handling</div><div class='add'>+    "  int3\n"</div><div class='add'>+</div><div class='add'>+    // Set load address for next time</div><div class='add'>+    "  leaq purgatory_start(%rip), %r11\n"</div><div class='add'>+    "  movq %r11, 8(%rsp)\n"</div><div class='add'>+</div><div class='add'>+    // Back to Linux</div><div class='add'>+    "  ret\n"</div><div class='add'>+</div><div class='add'>+    "purgatory_end:\n"</div><div class='add'>+    ".previous"</div><div class='add'>+);</div><div class='add'>+extern char purgatory_start[], purgatory_end[];</div><div class='add'>+</div><div class='add'>+int main (void)</div><div class='add'>+{</div><div class='add'>+        struct kexec_segment segment = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	segment.buf = purgatory_start;</div><div class='add'>+	segment.bufsz = purgatory_end - purgatory_start;</div><div class='add'>+	segment.mem = (void *)0x400000;</div><div class='add'>+	segment.memsz = 0x1000;</div><div class='add'>+	ret = syscall(__NR_kexec_load, 0x400000, 1, &amp;segment, KEXEC_PRESERVE_CONTEXT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		perror("kexec_load");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		perror("kexec reboot");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		perror("kexec reboot");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+	printf("Success\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/tools/testing/selftests/kexec/test_kexec_jump.sh b/tools/testing/selftests/kexec/test_kexec_jump.sh<br/>new file mode 100755<br/>index 000000000000..6ae977054ba2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kexec/test_kexec_jump.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kexec/test_kexec_jump.sh</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#</div><div class='add'>+# Prevent loading a kernel image via the kexec_load syscall when</div><div class='add'>+# signatures are required.  (Dependent on CONFIG_IMA_ARCH_POLICY.)</div><div class='add'>+</div><div class='add'>+TEST="$0"</div><div class='add'>+. ./kexec_common_lib.sh</div><div class='add'>+</div><div class='add'>+# kexec requires root privileges</div><div class='add'>+require_root_privileges</div><div class='add'>+</div><div class='add'>+# get the kernel config</div><div class='add'>+get_kconfig</div><div class='add'>+</div><div class='add'>+kconfig_enabled "CONFIG_KEXEC_JUMP=y" "kexec_jump is enabled"</div><div class='add'>+if [ $? -eq 0 ]; then</div><div class='add'>+	log_skip "kexec_jump is not enabled"</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+kconfig_enabled "CONFIG_IMA_APPRAISE=y" "IMA enabled"</div><div class='add'>+ima_appraise=$?</div><div class='add'>+</div><div class='add'>+kconfig_enabled "CONFIG_IMA_ARCH_POLICY=y" \</div><div class='add'>+	"IMA architecture specific policy enabled"</div><div class='add'>+arch_policy=$?</div><div class='add'>+</div><div class='add'>+get_secureboot_mode</div><div class='add'>+secureboot=$?</div><div class='add'>+</div><div class='add'>+if [ $secureboot -eq 1 ] &amp;&amp; [ $arch_policy -eq 1 ]; then</div><div class='add'>+    log_skip "Secure boot and CONFIG_IMA_ARCH_POLICY are enabled"</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+./test_kexec_jump</div><div class='add'>+if [ $? -eq 0 ]; then</div><div class='add'>+    log_pass "kexec_jump succeeded"</div><div class='add'>+else</div><div class='add'>+    # The more likely failure mode if anything went wrong is that the</div><div class='add'>+    # kernel just crashes. But if we get back here, sure, whine anyway.</div><div class='add'>+    log_fail "kexec_jump failed"</div><div class='add'>+fi</div><div class='head'>diff --git a/tools/testing/selftests/kho/arm64.conf b/tools/testing/selftests/kho/arm64.conf<br/>new file mode 100644<br/>index 000000000000..ee696807cd35<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kho/arm64.conf?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kho/arm64.conf</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+QEMU_CMD="qemu-system-aarch64 -M virt -cpu max"</div><div class='add'>+QEMU_KCONFIG="</div><div class='add'>+CONFIG_SERIAL_AMBA_PL010=y</div><div class='add'>+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_AMBA_PL011=y</div><div class='add'>+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y</div><div class='add'>+"</div><div class='add'>+KERNEL_IMAGE="Image"</div><div class='add'>+KERNEL_CMDLINE="console=ttyAMA0"</div><div class='head'>diff --git a/tools/testing/selftests/kho/init.c b/tools/testing/selftests/kho/init.c<br/>new file mode 100644<br/>index 000000000000..6d9e91d55d68<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kho/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kho/init.c</a></div><div class='hunk'>@@ -0,0 +1,95 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;sys/mount.h&gt;</div><div class='add'>+#include &lt;sys/reboot.h&gt;</div><div class='add'>+#include &lt;linux/kexec.h&gt;</div><div class='add'>+</div><div class='add'>+/* from arch/x86/include/asm/setup.h */</div><div class='add'>+#define COMMAND_LINE_SIZE	2048</div><div class='add'>+</div><div class='add'>+#define KHO_FINALIZE "/debugfs/kho/out/finalize"</div><div class='add'>+#define KERNEL_IMAGE "/kernel"</div><div class='add'>+</div><div class='add'>+static int mount_filesystems(void)</div><div class='add'>+{</div><div class='add'>+	if (mount("debugfs", "/debugfs", "debugfs", 0, NULL) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return mount("proc", "/proc", "proc", 0, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kho_enable(void)</div><div class='add'>+{</div><div class='add'>+	const char enable[] = "1";</div><div class='add'>+	int fd;</div><div class='add'>+</div><div class='add'>+	fd = open(KHO_FINALIZE, O_RDWR);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (write(fd, enable, sizeof(enable)) != sizeof(enable))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	close(fd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long kexec_file_load(int kernel_fd, int initrd_fd,</div><div class='add'>+			    unsigned long cmdline_len, const char *cmdline,</div><div class='add'>+			    unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	return syscall(__NR_kexec_file_load, kernel_fd, initrd_fd, cmdline_len,</div><div class='add'>+		       cmdline, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kexec_load(void)</div><div class='add'>+{</div><div class='add'>+	char cmdline[COMMAND_LINE_SIZE];</div><div class='add'>+	ssize_t len;</div><div class='add'>+	int fd, err;</div><div class='add'>+</div><div class='add'>+	fd = open("/proc/cmdline", O_RDONLY);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	len = read(fd, cmdline, sizeof(cmdline));</div><div class='add'>+	close(fd);</div><div class='add'>+	if (len &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* replace \n with \0 */</div><div class='add'>+	cmdline[len - 1] = 0;</div><div class='add'>+	fd = open(KERNEL_IMAGE, O_RDONLY);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	err = kexec_file_load(fd, -1, len, cmdline, KEXEC_FILE_NO_INITRAMFS);</div><div class='add'>+	close(fd);</div><div class='add'>+</div><div class='add'>+	return err ? : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	if (mount_filesystems())</div><div class='add'>+		goto err_reboot;</div><div class='add'>+</div><div class='add'>+	if (kho_enable())</div><div class='add'>+		goto err_reboot;</div><div class='add'>+</div><div class='add'>+	if (kexec_load())</div><div class='add'>+		goto err_reboot;</div><div class='add'>+</div><div class='add'>+	if (reboot(RB_KEXEC))</div><div class='add'>+		goto err_reboot;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_reboot:</div><div class='add'>+	reboot(RB_AUTOBOOT);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kho/vmtest.sh b/tools/testing/selftests/kho/vmtest.sh<br/>new file mode 100755<br/>index 000000000000..49fdac8e8b15<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kho/vmtest.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kho/vmtest.sh</a></div><div class='hunk'>@@ -0,0 +1,186 @@</div><div class='add'>+#!/bin/bash</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+set -ue</div><div class='add'>+</div><div class='add'>+CROSS_COMPILE="${CROSS_COMPILE:-""}"</div><div class='add'>+</div><div class='add'>+test_dir=$(realpath "$(dirname "$0")")</div><div class='add'>+kernel_dir=$(realpath "$test_dir/../../../..")</div><div class='add'>+</div><div class='add'>+tmp_dir=$(mktemp -d /tmp/kho-test.XXXXXXXX)</div><div class='add'>+headers_dir="$tmp_dir/usr"</div><div class='add'>+initrd="$tmp_dir/initrd.cpio"</div><div class='add'>+</div><div class='add'>+source "$test_dir/../kselftest/ktap_helpers.sh"</div><div class='add'>+</div><div class='add'>+function usage() {</div><div class='add'>+	cat &lt;&lt;EOF</div><div class='add'>+$0 [-d build_dir] [-j jobs] [-t target_arch] [-h]</div><div class='add'>+Options:</div><div class='add'>+	-d)	path to the kernel build directory</div><div class='add'>+	-j)	number of jobs for compilation, similar to -j in make</div><div class='add'>+	-t)	run test for target_arch, requires CROSS_COMPILE set</div><div class='add'>+		supported targets: aarch64, x86_64</div><div class='add'>+	-h)	display this help</div><div class='add'>+EOF</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function cleanup() {</div><div class='add'>+	rm -fr "$tmp_dir"</div><div class='add'>+	ktap_finished</div><div class='add'>+}</div><div class='add'>+trap cleanup EXIT</div><div class='add'>+</div><div class='add'>+function skip() {</div><div class='add'>+	local msg=${1:-""}</div><div class='add'>+</div><div class='add'>+	ktap_test_skip "$msg"</div><div class='add'>+	exit "$KSFT_SKIP"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function fail() {</div><div class='add'>+	local msg=${1:-""}</div><div class='add'>+</div><div class='add'>+	ktap_test_fail "$msg"</div><div class='add'>+	exit "$KSFT_FAIL"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function build_kernel() {</div><div class='add'>+	local build_dir=$1</div><div class='add'>+	local make_cmd=$2</div><div class='add'>+	local arch_kconfig=$3</div><div class='add'>+	local kimage=$4</div><div class='add'>+</div><div class='add'>+	local kho_config="$tmp_dir/kho.config"</div><div class='add'>+	local kconfig="$build_dir/.config"</div><div class='add'>+</div><div class='add'>+	# enable initrd, KHO and KHO test in kernel configuration</div><div class='add'>+	tee "$kconfig" &gt; "$kho_config" &lt;&lt;EOF</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_KEXEC_HANDOVER=y</div><div class='add'>+CONFIG_KEXEC_HANDOVER_DEBUGFS=y</div><div class='add'>+CONFIG_TEST_KEXEC_HANDOVER=y</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_DEBUG_VM=y</div><div class='add'>+$arch_kconfig</div><div class='add'>+EOF</div><div class='add'>+</div><div class='add'>+	make_cmd="$make_cmd -C $kernel_dir O=$build_dir"</div><div class='add'>+	$make_cmd olddefconfig</div><div class='add'>+</div><div class='add'>+	# verify that kernel confiration has all necessary options</div><div class='add'>+	while read -r opt ; do</div><div class='add'>+		grep "$opt" "$kconfig" &amp;&gt;/dev/null || skip "$opt is missing"</div><div class='add'>+	done &lt; "$kho_config"</div><div class='add'>+</div><div class='add'>+	$make_cmd "$kimage"</div><div class='add'>+	$make_cmd headers_install INSTALL_HDR_PATH="$headers_dir"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function mkinitrd() {</div><div class='add'>+	local kernel=$1</div><div class='add'>+</div><div class='add'>+	"$CROSS_COMPILE"gcc -s -static -Os -nostdinc -nostdlib \</div><div class='add'>+			-fno-asynchronous-unwind-tables -fno-ident \</div><div class='add'>+			-I "$headers_dir/include" \</div><div class='add'>+			-I "$kernel_dir/tools/include/nolibc" \</div><div class='add'>+			-o "$tmp_dir/init" "$test_dir/init.c"</div><div class='add'>+</div><div class='add'>+	cat &gt; "$tmp_dir/cpio_list" &lt;&lt;EOF</div><div class='add'>+dir /dev 0755 0 0</div><div class='add'>+dir /proc 0755 0 0</div><div class='add'>+dir /debugfs 0755 0 0</div><div class='add'>+nod /dev/console 0600 0 0 c 5 1</div><div class='add'>+file /init $tmp_dir/init 0755 0 0</div><div class='add'>+file /kernel $kernel 0644 0 0</div><div class='add'>+EOF</div><div class='add'>+</div><div class='add'>+	"$build_dir/usr/gen_init_cpio" "$tmp_dir/cpio_list" &gt; "$initrd"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function run_qemu() {</div><div class='add'>+	local qemu_cmd=$1</div><div class='add'>+	local cmdline=$2</div><div class='add'>+	local kernel=$3</div><div class='add'>+	local serial="$tmp_dir/qemu.serial"</div><div class='add'>+</div><div class='add'>+	cmdline="$cmdline kho=on panic=-1"</div><div class='add'>+</div><div class='add'>+	$qemu_cmd -m 1G -smp 2 -no-reboot -nographic -nodefaults \</div><div class='add'>+		  -accel kvm -accel hvf -accel tcg  \</div><div class='add'>+		  -serial file:"$serial" \</div><div class='add'>+		  -append "$cmdline" \</div><div class='add'>+		  -kernel "$kernel" \</div><div class='add'>+		  -initrd "$initrd"</div><div class='add'>+</div><div class='add'>+	grep "KHO restore succeeded" "$serial" &amp;&gt; /dev/null || fail "KHO failed"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function target_to_arch() {</div><div class='add'>+	local target=$1</div><div class='add'>+</div><div class='add'>+	case $target in</div><div class='add'>+	     aarch64) echo "arm64" ;;</div><div class='add'>+	     x86_64) echo "x86" ;;</div><div class='add'>+	     *) skip "architecture $target is not supported"</div><div class='add'>+	esac</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function main() {</div><div class='add'>+	local build_dir="$kernel_dir/.kho"</div><div class='add'>+	local jobs=$(($(nproc) * 2))</div><div class='add'>+	local target="$(uname -m)"</div><div class='add'>+</div><div class='add'>+	# skip the test if any of the preparation steps fails</div><div class='add'>+	set -o errtrace</div><div class='add'>+	trap skip ERR</div><div class='add'>+</div><div class='add'>+	while getopts 'hd:j:t:' opt; do</div><div class='add'>+		case $opt in</div><div class='add'>+		d)</div><div class='add'>+			build_dir="$OPTARG"</div><div class='add'>+			;;</div><div class='add'>+		j)</div><div class='add'>+		        jobs="$OPTARG"</div><div class='add'>+			;;</div><div class='add'>+		t)</div><div class='add'>+			target="$OPTARG"</div><div class='add'>+			;;</div><div class='add'>+		h)</div><div class='add'>+			usage</div><div class='add'>+			exit 0</div><div class='add'>+			;;</div><div class='add'>+		*)</div><div class='add'>+			echo Unknown argument "$opt"</div><div class='add'>+			usage</div><div class='add'>+			exit 1</div><div class='add'>+			;;</div><div class='add'>+		esac</div><div class='add'>+	done</div><div class='add'>+</div><div class='add'>+	ktap_print_header</div><div class='add'>+	ktap_set_plan 1</div><div class='add'>+</div><div class='add'>+	if [[ "$target" != "$(uname -m)" ]] &amp;&amp; [[ -z "$CROSS_COMPILE" ]]; then</div><div class='add'>+		skip "Cross-platform testing needs to specify CROSS_COMPILE"</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+	mkdir -p "$build_dir"</div><div class='add'>+	local arch=$(target_to_arch "$target")</div><div class='add'>+	source "$test_dir/$arch.conf"</div><div class='add'>+</div><div class='add'>+	# build the kernel and create initrd</div><div class='add'>+	# initrd includes the kernel image that will be kexec'ed</div><div class='add'>+	local make_cmd="make ARCH=$arch CROSS_COMPILE=$CROSS_COMPILE -j$jobs"</div><div class='add'>+	build_kernel "$build_dir" "$make_cmd" "$QEMU_KCONFIG" "$KERNEL_IMAGE"</div><div class='add'>+</div><div class='add'>+	local kernel="$build_dir/arch/$arch/boot/$KERNEL_IMAGE"</div><div class='add'>+	mkinitrd "$kernel"</div><div class='add'>+</div><div class='add'>+	run_qemu "$QEMU_CMD" "$KERNEL_CMDLINE" "$kernel"</div><div class='add'>+</div><div class='add'>+	ktap_test_pass "KHO succeeded"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+main "$@"</div><div class='head'>diff --git a/tools/testing/selftests/kho/x86.conf b/tools/testing/selftests/kho/x86.conf<br/>new file mode 100644<br/>index 000000000000..b419e610ca22<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kho/x86.conf?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kho/x86.conf</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+QEMU_CMD=qemu-system-x86_64</div><div class='add'>+QEMU_KCONFIG="</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+"</div><div class='add'>+KERNEL_IMAGE="bzImage"</div><div class='add'>+KERNEL_CMDLINE="console=ttyS0"</div><div class='head'>diff --git a/tools/testing/selftests/kmod/config b/tools/testing/selftests/kmod/config<br/>index 259f4fd6b5e2..1f1e63494af9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kmod/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kmod/config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kmod/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kmod/config</a></div><div class='hunk'>@@ -1,7 +1,2 @@</div><div class='ctx'> CONFIG_TEST_KMOD=m</div><div class='ctx'> CONFIG_TEST_LKM=m</div><div class='del'>-CONFIG_XFS_FS=m</div><div class='del'>-</div><div class='del'>-# For the module parameter force_init_test is used</div><div class='del'>-CONFIG_TUN=m</div><div class='del'>-CONFIG_BTRFS_FS=m</div><div class='head'>diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h<br/>index cdf91b0ca40f..afbcf8412ae5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kselftest.h</a></div><div class='hunk'>@@ -54,6 +54,7 @@</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;sys/utsname.h&gt;</div><div class='hunk'>@@ -92,6 +93,14 @@</div><div class='ctx'> #endif</div><div class='ctx'> #define __printf(a, b)   __attribute__((format(printf, a, b)))</div><div class='ctx'> </div><div class='add'>+#ifndef __always_unused</div><div class='add'>+#define __always_unused __attribute__((__unused__))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __maybe_unused</div><div class='add'>+#define __maybe_unused __attribute__((__unused__))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* counters */</div><div class='ctx'> struct ksft_count {</div><div class='ctx'> 	unsigned int ksft_pass;</div><div class='hunk'>@@ -104,6 +113,7 @@ struct ksft_count {</div><div class='ctx'> </div><div class='ctx'> static struct ksft_count ksft_cnt;</div><div class='ctx'> static unsigned int ksft_plan;</div><div class='add'>+static bool ksft_debug_enabled;</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int ksft_test_num(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -175,6 +185,18 @@ static inline __printf(1, 2) void ksft_print_msg(const char *msg, ...)</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void ksft_print_dbg_msg(const char *msg, ...)</div><div class='add'>+{</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	if (!ksft_debug_enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	va_start(args, msg);</div><div class='add'>+	ksft_print_msg(msg, args);</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void ksft_perror(const char *msg)</div><div class='ctx'> {</div><div class='ctx'> 	ksft_print_msg("%s: %s (%d)\n", msg, strerror(errno), errno);</div><div class='hunk'>@@ -444,10 +466,6 @@ static inline __noreturn __printf(1, 2) void ksft_exit_skip(const char *msg, ...</div><div class='ctx'> static inline int ksft_min_kernel_version(unsigned int min_major,</div><div class='ctx'> 					  unsigned int min_minor)</div><div class='ctx'> {</div><div class='del'>-#ifdef NOLIBC</div><div class='del'>-	ksft_print_msg("NOLIBC: Can't check kernel version: Function not implemented\n");</div><div class='del'>-	return 0;</div><div class='del'>-#else</div><div class='ctx'> 	unsigned int major, minor;</div><div class='ctx'> 	struct utsname info;</div><div class='ctx'> </div><div class='hunk'>@@ -455,7 +473,6 @@ static inline int ksft_min_kernel_version(unsigned int min_major,</div><div class='ctx'> 		ksft_exit_fail_msg("Can't parse kernel version\n");</div><div class='ctx'> </div><div class='ctx'> 	return major &gt; min_major || (major == min_major &amp;&amp; minor &gt;= min_minor);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* __KSELFTEST_H */</div><div class='head'>diff --git a/tools/testing/selftests/kselftest/module.sh b/tools/testing/selftests/kselftest/module.sh<br/>index fb4733faff12..51fb65159932 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest/module.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest/module.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest/module.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kselftest/module.sh</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #   SPDX-License-Identifier: GPL-2.0+</div><div class='ctx'> #   $(dirname $0)/../kselftest/module.sh "description" module_name</div><div class='ctx'> #</div><div class='del'>-# Example: tools/testing/selftests/lib/printf.sh</div><div class='add'>+# Example: tools/testing/selftests/lib/bitmap.sh</div><div class='ctx'> </div><div class='ctx'> desc=""				# Output prefix.</div><div class='ctx'> module=""			# Filename (without the .ko).</div><div class='head'>diff --git a/tools/testing/selftests/kselftest/runner.sh b/tools/testing/selftests/kselftest/runner.sh<br/>index 2c3c58e65a41..3a62039fa621 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest/runner.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest/runner.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest/runner.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kselftest/runner.sh</a></div><div class='hunk'>@@ -44,6 +44,12 @@ tap_timeout()</div><div class='ctx'> 	fi</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+report_failure()</div><div class='add'>+{</div><div class='add'>+	echo "not ok $*"</div><div class='add'>+	echo "$*" &gt;&gt; "$kselftest_failures_file"</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> run_one()</div><div class='ctx'> {</div><div class='ctx'> 	DIR="$1"</div><div class='hunk'>@@ -105,7 +111,7 @@ run_one()</div><div class='ctx'> 	echo "# $TEST_HDR_MSG"</div><div class='ctx'> 	if [ ! -e "$TEST" ]; then</div><div class='ctx'> 		echo "# Warning: file $TEST is missing!"</div><div class='del'>-		echo "not ok $test_num $TEST_HDR_MSG"</div><div class='add'>+		report_failure "$test_num $TEST_HDR_MSG"</div><div class='ctx'> 	else</div><div class='ctx'> 		if [ -x /usr/bin/stdbuf ]; then</div><div class='ctx'> 			stdbuf="/usr/bin/stdbuf --output=L "</div><div class='hunk'>@@ -123,7 +129,7 @@ run_one()</div><div class='ctx'> 				interpreter=$(head -n 1 "$TEST" | cut -c 3-)</div><div class='ctx'> 				cmd="$stdbuf $interpreter ./$BASENAME_TEST"</div><div class='ctx'> 			else</div><div class='del'>-				echo "not ok $test_num $TEST_HDR_MSG"</div><div class='add'>+				report_failure "$test_num $TEST_HDR_MSG"</div><div class='ctx'> 				return</div><div class='ctx'> 			fi</div><div class='ctx'> 		fi</div><div class='hunk'>@@ -137,9 +143,9 @@ run_one()</div><div class='ctx'> 			echo "ok $test_num $TEST_HDR_MSG # SKIP"</div><div class='ctx'> 		elif [ $rc -eq $timeout_rc ]; then \</div><div class='ctx'> 			echo "#"</div><div class='del'>-			echo "not ok $test_num $TEST_HDR_MSG # TIMEOUT $kselftest_timeout seconds"</div><div class='add'>+			report_failure "$test_num $TEST_HDR_MSG # TIMEOUT $kselftest_timeout seconds"</div><div class='ctx'> 		else</div><div class='del'>-			echo "not ok $test_num $TEST_HDR_MSG # exit=$rc"</div><div class='add'>+			report_failure "$test_num $TEST_HDR_MSG # exit=$rc"</div><div class='ctx'> 		fi)</div><div class='ctx'> 		cd - &gt;/dev/null</div><div class='ctx'> 	fi</div><div class='head'>diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h<br/>index 666c9fde76da..baae6b7ded41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest_harness.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kselftest_harness.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest_harness.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kselftest_harness.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * .. code-block:: c</div><div class='ctx'>  *</div><div class='del'>- *    #include "../kselftest_harness.h"</div><div class='add'>+ *    #include "kselftest_harness.h"</div><div class='ctx'>  *</div><div class='ctx'>  *    TEST(standalone_test) {</div><div class='ctx'>  *      do_some_stuff;</div><div class='hunk'>@@ -56,6 +56,8 @@</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> #include &lt;ctype.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='add'>+#include &lt;linux/unistd.h&gt;</div><div class='add'>+#include &lt;poll.h&gt;</div><div class='ctx'> #include &lt;stdbool.h&gt;</div><div class='ctx'> #include &lt;stdint.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='hunk'>@@ -65,7 +67,6 @@</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;setjmp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "kselftest.h"</div><div class='ctx'> </div><div class='hunk'>@@ -172,14 +173,11 @@</div><div class='ctx'> </div><div class='ctx'> #define __TEST_IMPL(test_name, _signal) \</div><div class='ctx'> 	static void test_name(struct __test_metadata *_metadata); \</div><div class='del'>-	static inline void wrapper_##test_name( \</div><div class='add'>+	static void wrapper_##test_name( \</div><div class='ctx'> 		struct __test_metadata *_metadata, \</div><div class='del'>-		struct __fixture_variant_metadata *variant) \</div><div class='add'>+		struct __fixture_variant_metadata __attribute__((unused)) *variant) \</div><div class='ctx'> 	{ \</div><div class='del'>-		_metadata-&gt;setup_completed = true; \</div><div class='del'>-		if (setjmp(_metadata-&gt;env) == 0) \</div><div class='del'>-			test_name(_metadata); \</div><div class='del'>-		__test_check_assert(_metadata); \</div><div class='add'>+		test_name(_metadata); \</div><div class='ctx'> 	} \</div><div class='ctx'> 	static struct __test_metadata _##test_name##_object = \</div><div class='ctx'> 		{ .name = #test_name, \</div><div class='hunk'>@@ -258,7 +256,7 @@</div><div class='ctx'>  * A bare "return;" statement may be used to return early.</div><div class='ctx'>  */</div><div class='ctx'> #define FIXTURE_SETUP(fixture_name) \</div><div class='del'>-	void fixture_name##_setup( \</div><div class='add'>+	static void fixture_name##_setup( \</div><div class='ctx'> 		struct __test_metadata __attribute__((unused)) *_metadata, \</div><div class='ctx'> 		FIXTURE_DATA(fixture_name) __attribute__((unused)) *self, \</div><div class='ctx'> 		const FIXTURE_VARIANT(fixture_name) \</div><div class='hunk'>@@ -307,7 +305,7 @@</div><div class='ctx'> 	__FIXTURE_TEARDOWN(fixture_name)</div><div class='ctx'> </div><div class='ctx'> #define __FIXTURE_TEARDOWN(fixture_name) \</div><div class='del'>-	void fixture_name##_teardown( \</div><div class='add'>+	static void fixture_name##_teardown( \</div><div class='ctx'> 		struct __test_metadata __attribute__((unused)) *_metadata, \</div><div class='ctx'> 		FIXTURE_DATA(fixture_name) __attribute__((unused)) *self, \</div><div class='ctx'> 		const FIXTURE_VARIANT(fixture_name) \</div><div class='hunk'>@@ -401,7 +399,7 @@</div><div class='ctx'> 		struct __test_metadata *_metadata, \</div><div class='ctx'> 		FIXTURE_DATA(fixture_name) *self, \</div><div class='ctx'> 		const FIXTURE_VARIANT(fixture_name) *variant); \</div><div class='del'>-	static inline void wrapper_##fixture_name##_##test_name( \</div><div class='add'>+	static void wrapper_##fixture_name##_##test_name( \</div><div class='ctx'> 		struct __test_metadata *_metadata, \</div><div class='ctx'> 		struct __fixture_variant_metadata *variant) \</div><div class='ctx'> 	{ \</div><div class='hunk'>@@ -410,9 +408,9 @@</div><div class='ctx'> 		pid_t child = 1; \</div><div class='ctx'> 		int status = 0; \</div><div class='ctx'> 		/* Makes sure there is only one teardown, even when child forks again. */ \</div><div class='del'>-		bool *teardown = mmap(NULL, sizeof(*teardown), \</div><div class='add'>+		_metadata-&gt;no_teardown = mmap(NULL, sizeof(*_metadata-&gt;no_teardown), \</div><div class='ctx'> 			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0); \</div><div class='del'>-		*teardown = false; \</div><div class='add'>+		*_metadata-&gt;no_teardown = true; \</div><div class='ctx'> 		if (sizeof(*self) &gt; 0) { \</div><div class='ctx'> 			if (fixture_name##_teardown_parent) { \</div><div class='ctx'> 				self = mmap(NULL, sizeof(*self), PROT_READ | PROT_WRITE, \</div><div class='hunk'>@@ -422,31 +420,26 @@</div><div class='ctx'> 				self = &amp;self_private; \</div><div class='ctx'> 			} \</div><div class='ctx'> 		} \</div><div class='del'>-		if (setjmp(_metadata-&gt;env) == 0) { \</div><div class='del'>-			/* _metadata and potentially self are shared with all forks. */ \</div><div class='del'>-			child = fork(); \</div><div class='del'>-			if (child == 0) { \</div><div class='del'>-				fixture_name##_setup(_metadata, self, variant-&gt;data); \</div><div class='del'>-				/* Let setup failure terminate early. */ \</div><div class='del'>-				if (_metadata-&gt;exit_code) \</div><div class='del'>-					_exit(0); \</div><div class='del'>-				_metadata-&gt;setup_completed = true; \</div><div class='del'>-				fixture_name##_##test_name(_metadata, self, variant-&gt;data); \</div><div class='del'>-			} else if (child &lt; 0 || child != waitpid(child, &amp;status, 0)) { \</div><div class='del'>-				ksft_print_msg("ERROR SPAWNING TEST GRANDCHILD\n"); \</div><div class='del'>-				_metadata-&gt;exit_code = KSFT_FAIL; \</div><div class='del'>-			} \</div><div class='del'>-		} \</div><div class='add'>+		_metadata-&gt;variant = variant-&gt;data; \</div><div class='add'>+		_metadata-&gt;self = self; \</div><div class='add'>+		/* _metadata and potentially self are shared with all forks. */ \</div><div class='add'>+		child = fork(); \</div><div class='ctx'> 		if (child == 0) { \</div><div class='del'>-			if (_metadata-&gt;setup_completed &amp;&amp; !fixture_name##_teardown_parent &amp;&amp; \</div><div class='del'>-					__sync_bool_compare_and_swap(teardown, false, true)) \</div><div class='del'>-				fixture_name##_teardown(_metadata, self, variant-&gt;data); \</div><div class='add'>+			fixture_name##_setup(_metadata, self, variant-&gt;data); \</div><div class='add'>+			/* Let setup failure terminate early. */ \</div><div class='add'>+			if (_metadata-&gt;exit_code) \</div><div class='add'>+				_exit(0); \</div><div class='add'>+			*_metadata-&gt;no_teardown = false; \</div><div class='add'>+			fixture_name##_##test_name(_metadata, self, variant-&gt;data); \</div><div class='add'>+			_metadata-&gt;teardown_fn(false, _metadata, self, variant-&gt;data); \</div><div class='ctx'> 			_exit(0); \</div><div class='add'>+		} else if (child &lt; 0 || child != waitpid(child, &amp;status, 0)) { \</div><div class='add'>+			ksft_print_msg("ERROR SPAWNING TEST GRANDCHILD\n"); \</div><div class='add'>+			_metadata-&gt;exit_code = KSFT_FAIL; \</div><div class='ctx'> 		} \</div><div class='del'>-		if (_metadata-&gt;setup_completed &amp;&amp; fixture_name##_teardown_parent &amp;&amp; \</div><div class='del'>-				__sync_bool_compare_and_swap(teardown, false, true)) \</div><div class='del'>-			fixture_name##_teardown(_metadata, self, variant-&gt;data); \</div><div class='del'>-		munmap(teardown, sizeof(*teardown)); \</div><div class='add'>+		_metadata-&gt;teardown_fn(true, _metadata, self, variant-&gt;data); \</div><div class='add'>+		munmap(_metadata-&gt;no_teardown, sizeof(*_metadata-&gt;no_teardown)); \</div><div class='add'>+		_metadata-&gt;no_teardown = NULL; \</div><div class='ctx'> 		if (self &amp;&amp; fixture_name##_teardown_parent) \</div><div class='ctx'> 			munmap(self, sizeof(*self)); \</div><div class='ctx'> 		if (WIFEXITED(status)) { \</div><div class='hunk'>@@ -456,7 +449,14 @@</div><div class='ctx'> 			/* Forward signal to __wait_for_test(). */ \</div><div class='ctx'> 			kill(getpid(), WTERMSIG(status)); \</div><div class='ctx'> 		} \</div><div class='del'>-		__test_check_assert(_metadata); \</div><div class='add'>+	} \</div><div class='add'>+	static void wrapper_##fixture_name##_##test_name##_teardown( \</div><div class='add'>+		bool in_parent, struct __test_metadata *_metadata, \</div><div class='add'>+		void *self, const void *variant) \</div><div class='add'>+	{ \</div><div class='add'>+		if (fixture_name##_teardown_parent == in_parent &amp;&amp; \</div><div class='add'>+				!__atomic_test_and_set(_metadata-&gt;no_teardown, __ATOMIC_RELAXED)) \</div><div class='add'>+			fixture_name##_teardown(_metadata, self, variant); \</div><div class='ctx'> 	} \</div><div class='ctx'> 	static struct __test_metadata *_##fixture_name##_##test_name##_object; \</div><div class='ctx'> 	static void __attribute__((constructor)) \</div><div class='hunk'>@@ -467,6 +467,7 @@</div><div class='ctx'> 		object-&gt;name = #test_name; \</div><div class='ctx'> 		object-&gt;fn = &amp;wrapper_##fixture_name##_##test_name; \</div><div class='ctx'> 		object-&gt;fixture = &amp;_##fixture_name##_fixture_object; \</div><div class='add'>+		object-&gt;teardown_fn = &amp;wrapper_##fixture_name##_##test_name##_teardown; \</div><div class='ctx'> 		object-&gt;termsig = signal; \</div><div class='ctx'> 		object-&gt;timeout = tmout; \</div><div class='ctx'> 		_##fixture_name##_##test_name##_object = object; \</div><div class='hunk'>@@ -750,7 +751,7 @@</div><div class='ctx'> 	for (; _metadata-&gt;trigger; _metadata-&gt;trigger = \</div><div class='ctx'> 			__bail(_assert, _metadata))</div><div class='ctx'> </div><div class='del'>-#define is_signed_type(var)       (!!(((__typeof__(var))(-1)) &lt; (__typeof__(var))1))</div><div class='add'>+#define is_signed_var(var)	(!!(((__typeof__(var))(-1)) &lt; (__typeof__(var))1))</div><div class='ctx'> </div><div class='ctx'> #define __EXPECT(_expected, _expected_str, _seen, _seen_str, _t, _assert) do { \</div><div class='ctx'> 	/* Avoid multiple evaluation of the cases */ \</div><div class='hunk'>@@ -758,7 +759,7 @@</div><div class='ctx'> 	__typeof__(_seen) __seen = (_seen); \</div><div class='ctx'> 	if (!(__exp _t __seen)) { \</div><div class='ctx'> 		/* Report with actual signedness to avoid weird output. */ \</div><div class='del'>-		switch (is_signed_type(__exp) * 2 + is_signed_type(__seen)) { \</div><div class='add'>+		switch (is_signed_var(__exp) * 2 + is_signed_var(__seen)) { \</div><div class='ctx'> 		case 0: { \</div><div class='ctx'> 			uintmax_t __exp_print = (uintmax_t)__exp; \</div><div class='ctx'> 			uintmax_t __seen_print = (uintmax_t)__seen; \</div><div class='hunk'>@@ -910,14 +911,16 @@ struct __test_metadata {</div><div class='ctx'> 		   struct __fixture_variant_metadata *);</div><div class='ctx'> 	pid_t pid;	/* pid of test when being run */</div><div class='ctx'> 	struct __fixture_metadata *fixture;</div><div class='add'>+	void (*teardown_fn)(bool in_parent, struct __test_metadata *_metadata,</div><div class='add'>+			    void *self, const void *variant);</div><div class='ctx'> 	int termsig;</div><div class='ctx'> 	int exit_code;</div><div class='ctx'> 	int trigger; /* extra handler after the evaluation */</div><div class='ctx'> 	int timeout;	/* seconds to wait for test timeout */</div><div class='del'>-	bool timed_out;	/* did this test timeout instead of exiting? */</div><div class='ctx'> 	bool aborted;	/* stopped test due to failed ASSERT */</div><div class='del'>-	bool setup_completed; /* did setup finish? */</div><div class='del'>-	jmp_buf env;	/* for exiting out of test early */</div><div class='add'>+	bool *no_teardown; /* fixture needs teardown */</div><div class='add'>+	void *self;</div><div class='add'>+	const void *variant;</div><div class='ctx'> 	struct __test_results *results;</div><div class='ctx'> 	struct __test_metadata *prev, *next;</div><div class='ctx'> };</div><div class='hunk'>@@ -951,88 +954,60 @@ static inline int __bail(int for_realz, struct __test_metadata *t)</div><div class='ctx'> {</div><div class='ctx'> 	/* if this is ASSERT, return immediately. */</div><div class='ctx'> 	if (for_realz) {</div><div class='del'>-		t-&gt;aborted = true;</div><div class='del'>-		longjmp(t-&gt;env, 1);</div><div class='add'>+		if (t-&gt;teardown_fn)</div><div class='add'>+			t-&gt;teardown_fn(false, t, t-&gt;self, t-&gt;variant);</div><div class='add'>+		abort();</div><div class='ctx'> 	}</div><div class='ctx'> 	/* otherwise, end the for loop and continue. */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __test_check_assert(struct __test_metadata *t)</div><div class='add'>+static void __wait_for_test(struct __test_metadata *t)</div><div class='ctx'> {</div><div class='del'>-	if (t-&gt;aborted)</div><div class='del'>-		abort();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct __test_metadata *__active_test;</div><div class='del'>-static void __timeout_handler(int sig, siginfo_t *info, void *ucontext)</div><div class='del'>-{</div><div class='del'>-	struct __test_metadata *t = __active_test;</div><div class='del'>-</div><div class='del'>-	/* Sanity check handler execution environment. */</div><div class='del'>-	if (!t) {</div><div class='del'>-		fprintf(TH_LOG_STREAM,</div><div class='del'>-			"# no active test in SIGALRM handler!?\n");</div><div class='del'>-		abort();</div><div class='del'>-	}</div><div class='del'>-	if (sig != SIGALRM || sig != info-&gt;si_signo) {</div><div class='del'>-		fprintf(TH_LOG_STREAM,</div><div class='del'>-			"# %s: SIGALRM handler caught signal %d!?\n",</div><div class='del'>-			t-&gt;name, sig != SIGALRM ? sig : info-&gt;si_signo);</div><div class='del'>-		abort();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	t-&gt;timed_out = true;</div><div class='del'>-	// signal process group</div><div class='del'>-	kill(-(t-&gt;pid), SIGKILL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __wait_for_test(struct __test_metadata *t)</div><div class='del'>-{</div><div class='del'>-	struct sigaction action = {</div><div class='del'>-		.sa_sigaction = __timeout_handler,</div><div class='del'>-		.sa_flags = SA_SIGINFO,</div><div class='del'>-	};</div><div class='del'>-	struct sigaction saved_action;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Sets status so that WIFEXITED(status) returns true and</div><div class='ctx'> 	 * WEXITSTATUS(status) returns KSFT_FAIL.  This safe default value</div><div class='ctx'> 	 * should never be evaluated because of the waitpid(2) check and</div><div class='del'>-	 * SIGALRM handling.</div><div class='add'>+	 * timeout handling.</div><div class='ctx'> 	 */</div><div class='ctx'> 	int status = KSFT_FAIL &lt;&lt; 8;</div><div class='del'>-	int child;</div><div class='add'>+	struct pollfd poll_child;</div><div class='add'>+	int ret, child, childfd;</div><div class='add'>+	bool timed_out = false;</div><div class='ctx'> </div><div class='del'>-	if (sigaction(SIGALRM, &amp;action, &amp;saved_action)) {</div><div class='add'>+	childfd = syscall(__NR_pidfd_open, t-&gt;pid, 0);</div><div class='add'>+	if (childfd == -1) {</div><div class='ctx'> 		t-&gt;exit_code = KSFT_FAIL;</div><div class='ctx'> 		fprintf(TH_LOG_STREAM,</div><div class='del'>-			"# %s: unable to install SIGALRM handler\n",</div><div class='add'>+			"# %s: unable to open pidfd\n",</div><div class='ctx'> 			t-&gt;name);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	__active_test = t;</div><div class='del'>-	t-&gt;timed_out = false;</div><div class='del'>-	alarm(t-&gt;timeout);</div><div class='del'>-	child = waitpid(t-&gt;pid, &amp;status, 0);</div><div class='del'>-	if (child == -1 &amp;&amp; errno != EINTR) {</div><div class='add'>+</div><div class='add'>+	poll_child.fd = childfd;</div><div class='add'>+	poll_child.events = POLLIN;</div><div class='add'>+	ret = poll(&amp;poll_child, 1, t-&gt;timeout * 1000);</div><div class='add'>+	if (ret == -1) {</div><div class='ctx'> 		t-&gt;exit_code = KSFT_FAIL;</div><div class='ctx'> 		fprintf(TH_LOG_STREAM,</div><div class='del'>-			"# %s: Failed to wait for PID %d (errno: %d)\n",</div><div class='del'>-			t-&gt;name, t-&gt;pid, errno);</div><div class='add'>+			"# %s: unable to wait on child pidfd\n",</div><div class='add'>+			t-&gt;name);</div><div class='ctx'> 		return;</div><div class='add'>+	} else if (ret == 0) {</div><div class='add'>+		timed_out = true;</div><div class='add'>+		/* signal process group */</div><div class='add'>+		kill(-(t-&gt;pid), SIGKILL);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	alarm(0);</div><div class='del'>-	if (sigaction(SIGALRM, &amp;saved_action, NULL)) {</div><div class='add'>+	child = waitpid(t-&gt;pid, &amp;status, WNOHANG);</div><div class='add'>+	if (child == -1 &amp;&amp; errno != EINTR) {</div><div class='ctx'> 		t-&gt;exit_code = KSFT_FAIL;</div><div class='ctx'> 		fprintf(TH_LOG_STREAM,</div><div class='del'>-			"# %s: unable to uninstall SIGALRM handler\n",</div><div class='del'>-			t-&gt;name);</div><div class='add'>+			"# %s: Failed to wait for PID %d (errno: %d)\n",</div><div class='add'>+			t-&gt;name, t-&gt;pid, errno);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	__active_test = NULL;</div><div class='ctx'> </div><div class='del'>-	if (t-&gt;timed_out) {</div><div class='add'>+	if (timed_out) {</div><div class='ctx'> 		t-&gt;exit_code = KSFT_FAIL;</div><div class='ctx'> 		fprintf(TH_LOG_STREAM,</div><div class='ctx'> 			"# %s: Test terminated by timeout\n", t-&gt;name);</div><div class='hunk'>@@ -1116,7 +1091,7 @@ static int test_harness_argv_check(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	int opt;</div><div class='ctx'> </div><div class='del'>-	while ((opt = getopt(argc, argv, "hlF:f:V:v:t:T:r:")) != -1) {</div><div class='add'>+	while ((opt = getopt(argc, argv, "dhlF:f:V:v:t:T:r:")) != -1) {</div><div class='ctx'> 		switch (opt) {</div><div class='ctx'> 		case 'f':</div><div class='ctx'> 		case 'F':</div><div class='hunk'>@@ -1129,12 +1104,16 @@ static int test_harness_argv_check(int argc, char **argv)</div><div class='ctx'> 		case 'l':</div><div class='ctx'> 			test_harness_list_tests();</div><div class='ctx'> 			return KSFT_SKIP;</div><div class='add'>+		case 'd':</div><div class='add'>+			ksft_debug_enabled = true;</div><div class='add'>+			break;</div><div class='ctx'> 		case 'h':</div><div class='ctx'> 		default:</div><div class='ctx'> 			fprintf(stderr,</div><div class='del'>-				"Usage: %s [-h|-l] [-t|-T|-v|-V|-f|-F|-r name]\n"</div><div class='add'>+				"Usage: %s [-h|-l|-d] [-t|-T|-v|-V|-f|-F|-r name]\n"</div><div class='ctx'> 				"\t-h       print help\n"</div><div class='ctx'> 				"\t-l       list all tests\n"</div><div class='add'>+				"\t-d       enable debug prints\n"</div><div class='ctx'> 				"\n"</div><div class='ctx'> 				"\t-t name  include test\n"</div><div class='ctx'> 				"\t-T name  exclude test\n"</div><div class='hunk'>@@ -1167,8 +1146,9 @@ static bool test_enabled(int argc, char **argv,</div><div class='ctx'> 	int opt;</div><div class='ctx'> </div><div class='ctx'> 	optind = 1;</div><div class='del'>-	while ((opt = getopt(argc, argv, "F:f:V:v:t:T:r:")) != -1) {</div><div class='del'>-		has_positive |= islower(opt);</div><div class='add'>+	while ((opt = getopt(argc, argv, "dF:f:V:v:t:T:r:")) != -1) {</div><div class='add'>+		if (opt != 'd')</div><div class='add'>+			has_positive |= islower(opt);</div><div class='ctx'> </div><div class='ctx'> 		switch (tolower(opt)) {</div><div class='ctx'> 		case 't':</div><div class='hunk'>@@ -1205,9 +1185,9 @@ static bool test_enabled(int argc, char **argv,</div><div class='ctx'> 	return !has_positive;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __run_test(struct __fixture_metadata *f,</div><div class='del'>-		struct __fixture_variant_metadata *variant,</div><div class='del'>-		struct __test_metadata *t)</div><div class='add'>+static void __run_test(struct __fixture_metadata *f,</div><div class='add'>+		       struct __fixture_variant_metadata *variant,</div><div class='add'>+		       struct __test_metadata *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct __test_xfail *xfail;</div><div class='ctx'> 	char test_name[1024];</div><div class='hunk'>@@ -1218,8 +1198,7 @@ void __run_test(struct __fixture_metadata *f,</div><div class='ctx'> 	t-&gt;exit_code = KSFT_PASS;</div><div class='ctx'> 	t-&gt;trigger = 0;</div><div class='ctx'> 	t-&gt;aborted = false;</div><div class='del'>-	t-&gt;setup_completed = false;</div><div class='del'>-	memset(t-&gt;env, 0, sizeof(t-&gt;env));</div><div class='add'>+	t-&gt;no_teardown = NULL;</div><div class='ctx'> 	memset(t-&gt;results-&gt;reason, 0, sizeof(t-&gt;results-&gt;reason));</div><div class='ctx'> </div><div class='ctx'> 	snprintf(test_name, sizeof(test_name), "%s%s%s.%s",</div><div class='head'>diff --git a/tools/testing/selftests/kselftest_harness/.gitignore b/tools/testing/selftests/kselftest_harness/.gitignore<br/>new file mode 100644<br/>index 000000000000..e4e476a333c9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest_harness/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kselftest_harness/.gitignore</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+/harness-selftest</div><div class='add'>+/harness-selftest.seen</div><div class='head'>diff --git a/tools/testing/selftests/kselftest_harness/Makefile b/tools/testing/selftests/kselftest_harness/Makefile<br/>new file mode 100644<br/>index 000000000000..d2369c01701a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest_harness/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kselftest_harness/Makefile</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+TEST_GEN_PROGS_EXTENDED := harness-selftest</div><div class='add'>+TEST_PROGS := harness-selftest.sh</div><div class='add'>+TEST_FILES := harness-selftest.expected</div><div class='add'>+EXTRA_CLEAN := harness-selftest.seen</div><div class='add'>+</div><div class='add'>+include ../lib.mk</div><div class='head'>diff --git a/tools/testing/selftests/kselftest_harness/harness-selftest.c b/tools/testing/selftests/kselftest_harness/harness-selftest.c<br/>new file mode 100644<br/>index 000000000000..7820bb5d0e6d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest_harness/harness-selftest.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kselftest_harness/harness-selftest.c</a></div><div class='hunk'>@@ -0,0 +1,136 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sys/resource.h&gt;</div><div class='add'>+#include &lt;sys/prctl.h&gt;</div><div class='add'>+</div><div class='add'>+/* Avoid any inconsistencies */</div><div class='add'>+#define TH_LOG_STREAM stdout</div><div class='add'>+</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+</div><div class='add'>+static void test_helper(struct __test_metadata *_metadata)</div><div class='add'>+{</div><div class='add'>+	ASSERT_EQ(0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(standalone_pass) {</div><div class='add'>+	TH_LOG("before");</div><div class='add'>+	ASSERT_EQ(0, 0);</div><div class='add'>+	EXPECT_EQ(0, 0);</div><div class='add'>+	test_helper(_metadata);</div><div class='add'>+	TH_LOG("after");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(standalone_fail) {</div><div class='add'>+	TH_LOG("before");</div><div class='add'>+	EXPECT_EQ(0, 0);</div><div class='add'>+	EXPECT_EQ(0, 1);</div><div class='add'>+	ASSERT_EQ(0, 1);</div><div class='add'>+	TH_LOG("after");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_SIGNAL(signal_pass, SIGUSR1) {</div><div class='add'>+	TH_LOG("before");</div><div class='add'>+	ASSERT_EQ(0, 0);</div><div class='add'>+	TH_LOG("after");</div><div class='add'>+	kill(getpid(), SIGUSR1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_SIGNAL(signal_fail, SIGUSR1) {</div><div class='add'>+	TH_LOG("before");</div><div class='add'>+	ASSERT_EQ(0, 1);</div><div class='add'>+	TH_LOG("after");</div><div class='add'>+	kill(getpid(), SIGUSR1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE(fixture) {</div><div class='add'>+	pid_t testpid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(fixture) {</div><div class='add'>+	TH_LOG("setup");</div><div class='add'>+	self-&gt;testpid = getpid();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(fixture) {</div><div class='add'>+	TH_LOG("teardown same-process=%d", self-&gt;testpid == getpid());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fixture, pass) {</div><div class='add'>+	TH_LOG("before");</div><div class='add'>+	ASSERT_EQ(0, 0);</div><div class='add'>+	test_helper(_metadata);</div><div class='add'>+	standalone_pass(_metadata);</div><div class='add'>+	TH_LOG("after");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fixture, fail) {</div><div class='add'>+	TH_LOG("before");</div><div class='add'>+	ASSERT_EQ(0, 1);</div><div class='add'>+	fixture_pass(_metadata, self, variant);</div><div class='add'>+	TH_LOG("after");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F_TIMEOUT(fixture, timeout, 1) {</div><div class='add'>+	TH_LOG("before");</div><div class='add'>+	sleep(2);</div><div class='add'>+	TH_LOG("after");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE(fixture_parent) {</div><div class='add'>+	pid_t testpid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(fixture_parent) {</div><div class='add'>+	TH_LOG("setup");</div><div class='add'>+	self-&gt;testpid = getpid();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN_PARENT(fixture_parent) {</div><div class='add'>+	TH_LOG("teardown same-process=%d", self-&gt;testpid == getpid());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fixture_parent, pass) {</div><div class='add'>+	TH_LOG("before");</div><div class='add'>+	ASSERT_EQ(0, 0);</div><div class='add'>+	TH_LOG("after");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE(fixture_setup_failure) {</div><div class='add'>+	pid_t testpid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(fixture_setup_failure) {</div><div class='add'>+	TH_LOG("setup");</div><div class='add'>+	self-&gt;testpid = getpid();</div><div class='add'>+	ASSERT_EQ(0, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(fixture_setup_failure) {</div><div class='add'>+	TH_LOG("teardown same-process=%d", self-&gt;testpid == getpid());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(fixture_setup_failure, pass) {</div><div class='add'>+	TH_LOG("before");</div><div class='add'>+	ASSERT_EQ(0, 0);</div><div class='add'>+	TH_LOG("after");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char **argv)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The harness uses abort() to signal assertion failures, which triggers coredumps.</div><div class='add'>+	 * This may be useful to debug real failures but not for this selftest, disable them.</div><div class='add'>+	 */</div><div class='add'>+	struct rlimit rlimit = {</div><div class='add'>+		.rlim_cur = 0,</div><div class='add'>+		.rlim_max = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	prctl(PR_SET_DUMPABLE, 0, 0, 0, 0);</div><div class='add'>+	setrlimit(RLIMIT_CORE, &amp;rlimit);</div><div class='add'>+</div><div class='add'>+	return test_harness_run(argc, argv);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kselftest_harness/harness-selftest.expected b/tools/testing/selftests/kselftest_harness/harness-selftest.expected<br/>new file mode 100644<br/>index 000000000000..97e1418c1c7e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest_harness/harness-selftest.expected?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kselftest_harness/harness-selftest.expected</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+TAP version 13</div><div class='add'>+1..9</div><div class='add'>+# Starting 9 tests from 4 test cases.</div><div class='add'>+#  RUN           global.standalone_pass ...</div><div class='add'>+# harness-selftest.c:19:standalone_pass:before</div><div class='add'>+# harness-selftest.c:23:standalone_pass:after</div><div class='add'>+#            OK  global.standalone_pass</div><div class='add'>+ok 1 global.standalone_pass</div><div class='add'>+#  RUN           global.standalone_fail ...</div><div class='add'>+# harness-selftest.c:27:standalone_fail:before</div><div class='add'>+# harness-selftest.c:29:standalone_fail:Expected 0 (0) == 1 (1)</div><div class='add'>+# harness-selftest.c:30:standalone_fail:Expected 0 (0) == 1 (1)</div><div class='add'>+# standalone_fail: Test terminated by assertion</div><div class='add'>+#          FAIL  global.standalone_fail</div><div class='add'>+not ok 2 global.standalone_fail</div><div class='add'>+#  RUN           global.signal_pass ...</div><div class='add'>+# harness-selftest.c:35:signal_pass:before</div><div class='add'>+# harness-selftest.c:37:signal_pass:after</div><div class='add'>+#            OK  global.signal_pass</div><div class='add'>+ok 3 global.signal_pass</div><div class='add'>+#  RUN           global.signal_fail ...</div><div class='add'>+# harness-selftest.c:42:signal_fail:before</div><div class='add'>+# harness-selftest.c:43:signal_fail:Expected 0 (0) == 1 (1)</div><div class='add'>+# signal_fail: Test terminated by assertion</div><div class='add'>+#          FAIL  global.signal_fail</div><div class='add'>+not ok 4 global.signal_fail</div><div class='add'>+#  RUN           fixture.pass ...</div><div class='add'>+# harness-selftest.c:53:pass:setup</div><div class='add'>+# harness-selftest.c:62:pass:before</div><div class='add'>+# harness-selftest.c:19:pass:before</div><div class='add'>+# harness-selftest.c:23:pass:after</div><div class='add'>+# harness-selftest.c:66:pass:after</div><div class='add'>+# harness-selftest.c:58:pass:teardown same-process=1</div><div class='add'>+#            OK  fixture.pass</div><div class='add'>+ok 5 fixture.pass</div><div class='add'>+#  RUN           fixture.fail ...</div><div class='add'>+# harness-selftest.c:53:fail:setup</div><div class='add'>+# harness-selftest.c:70:fail:before</div><div class='add'>+# harness-selftest.c:71:fail:Expected 0 (0) == 1 (1)</div><div class='add'>+# harness-selftest.c:58:fail:teardown same-process=1</div><div class='add'>+# fail: Test terminated by assertion</div><div class='add'>+#          FAIL  fixture.fail</div><div class='add'>+not ok 6 fixture.fail</div><div class='add'>+#  RUN           fixture.timeout ...</div><div class='add'>+# harness-selftest.c:53:timeout:setup</div><div class='add'>+# harness-selftest.c:77:timeout:before</div><div class='add'>+# timeout: Test terminated by timeout</div><div class='add'>+#          FAIL  fixture.timeout</div><div class='add'>+not ok 7 fixture.timeout</div><div class='add'>+#  RUN           fixture_parent.pass ...</div><div class='add'>+# harness-selftest.c:87:pass:setup</div><div class='add'>+# harness-selftest.c:96:pass:before</div><div class='add'>+# harness-selftest.c:98:pass:after</div><div class='add'>+# harness-selftest.c:92:pass:teardown same-process=0</div><div class='add'>+#            OK  fixture_parent.pass</div><div class='add'>+ok 8 fixture_parent.pass</div><div class='add'>+#  RUN           fixture_setup_failure.pass ...</div><div class='add'>+# harness-selftest.c:106:pass:setup</div><div class='add'>+# harness-selftest.c:108:pass:Expected 0 (0) == 1 (1)</div><div class='add'>+# pass: Test terminated by assertion</div><div class='add'>+#          FAIL  fixture_setup_failure.pass</div><div class='add'>+not ok 9 fixture_setup_failure.pass</div><div class='add'>+# FAILED: 4 / 9 tests passed.</div><div class='add'>+# Totals: pass:4 fail:5 xfail:0 xpass:0 skip:0 error:0</div><div class='head'>diff --git a/tools/testing/selftests/kselftest_harness/harness-selftest.sh b/tools/testing/selftests/kselftest_harness/harness-selftest.sh<br/>new file mode 100755<br/>index 000000000000..fe72d16370fe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kselftest_harness/harness-selftest.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kselftest_harness/harness-selftest.sh</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#</div><div class='add'>+# Selftest for kselftest_harness.h</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+set -e</div><div class='add'>+</div><div class='add'>+DIR="$(dirname $(readlink -f "$0"))"</div><div class='add'>+</div><div class='add'>+"$DIR"/harness-selftest &gt; harness-selftest.seen || true</div><div class='add'>+</div><div class='add'>+diff -u "$DIR"/harness-selftest.expected harness-selftest.seen</div><div class='head'>diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile<br/>index 20af35a91d6f..f2b223072b62 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/Makefile</a></div><div class='hunk'>@@ -3,10 +3,10 @@ top_srcdir = ../../../..</div><div class='ctx'> include $(top_srcdir)/scripts/subarch.include</div><div class='ctx'> ARCH            ?= $(SUBARCH)</div><div class='ctx'> </div><div class='del'>-ifeq ($(ARCH),$(filter $(ARCH),arm64 s390 riscv x86 x86_64))</div><div class='add'>+ifeq ($(ARCH),$(filter $(ARCH),arm64 s390 riscv x86 x86_64 loongarch))</div><div class='ctx'> # Top-level selftests allows ARCH=x86_64 :-(</div><div class='ctx'> ifeq ($(ARCH),x86_64)</div><div class='del'>-	ARCH := x86</div><div class='add'>+	override ARCH := x86</div><div class='ctx'> endif</div><div class='ctx'> include Makefile.kvm</div><div class='ctx'> else</div><div class='head'>diff --git a/tools/testing/selftests/kvm/Makefile.kvm b/tools/testing/selftests/kvm/Makefile.kvm<br/>index 4277b983cace..ba5c2b643efa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/Makefile.kvm?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/Makefile.kvm</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/Makefile.kvm?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/Makefile.kvm</a></div><div class='hunk'>@@ -8,6 +8,7 @@ LIBKVM += lib/elf.c</div><div class='ctx'> LIBKVM += lib/guest_modes.c</div><div class='ctx'> LIBKVM += lib/io.c</div><div class='ctx'> LIBKVM += lib/kvm_util.c</div><div class='add'>+LIBKVM += lib/lru_gen_util.c</div><div class='ctx'> LIBKVM += lib/memstress.c</div><div class='ctx'> LIBKVM += lib/guest_sprintf.c</div><div class='ctx'> LIBKVM += lib/rbtree.c</div><div class='hunk'>@@ -47,15 +48,31 @@ LIBKVM_riscv += lib/riscv/handlers.S</div><div class='ctx'> LIBKVM_riscv += lib/riscv/processor.c</div><div class='ctx'> LIBKVM_riscv += lib/riscv/ucall.c</div><div class='ctx'> </div><div class='add'>+LIBKVM_loongarch += lib/loongarch/processor.c</div><div class='add'>+LIBKVM_loongarch += lib/loongarch/ucall.c</div><div class='add'>+LIBKVM_loongarch += lib/loongarch/exception.S</div><div class='add'>+</div><div class='ctx'> # Non-compiled test targets</div><div class='ctx'> TEST_PROGS_x86 += x86/nx_huge_pages_test.sh</div><div class='ctx'> </div><div class='add'>+# Compiled test targets valid on all architectures with libkvm support</div><div class='add'>+TEST_GEN_PROGS_COMMON = demand_paging_test</div><div class='add'>+TEST_GEN_PROGS_COMMON += dirty_log_test</div><div class='add'>+TEST_GEN_PROGS_COMMON += guest_print_test</div><div class='add'>+TEST_GEN_PROGS_COMMON += irqfd_test</div><div class='add'>+TEST_GEN_PROGS_COMMON += kvm_binary_stats_test</div><div class='add'>+TEST_GEN_PROGS_COMMON += kvm_create_max_vcpus</div><div class='add'>+TEST_GEN_PROGS_COMMON += kvm_page_table_test</div><div class='add'>+TEST_GEN_PROGS_COMMON += set_memory_region_test</div><div class='add'>+</div><div class='ctx'> # Compiled test targets</div><div class='del'>-TEST_GEN_PROGS_x86 = x86/cpuid_test</div><div class='add'>+TEST_GEN_PROGS_x86 = $(TEST_GEN_PROGS_COMMON)</div><div class='add'>+TEST_GEN_PROGS_x86 += x86/cpuid_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/cr4_cpuid_sync_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/dirty_log_page_splitting_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/feature_msrs_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/exit_on_emulation_failure_test</div><div class='add'>+TEST_GEN_PROGS_x86 += x86/fastops_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/fix_hypercall_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/hwcr_msr_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/hyperv_clock</div><div class='hunk'>@@ -68,8 +85,15 @@ TEST_GEN_PROGS_x86 += x86/hyperv_svm_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/hyperv_tlb_flush</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/kvm_clock_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/kvm_pv_test</div><div class='add'>+TEST_GEN_PROGS_x86 += x86/kvm_buslock_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/monitor_mwait_test</div><div class='add'>+TEST_GEN_PROGS_x86 += x86/msrs_test</div><div class='add'>+TEST_GEN_PROGS_x86 += x86/nested_close_kvm_test</div><div class='add'>+TEST_GEN_PROGS_x86 += x86/nested_emulation_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/nested_exceptions_test</div><div class='add'>+TEST_GEN_PROGS_x86 += x86/nested_invalid_cr3_test</div><div class='add'>+TEST_GEN_PROGS_x86 += x86/nested_tsc_adjust_test</div><div class='add'>+TEST_GEN_PROGS_x86 += x86/nested_tsc_scaling_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/platform_info_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/pmu_counters_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/pmu_event_filter_test</div><div class='hunk'>@@ -91,14 +115,12 @@ TEST_GEN_PROGS_x86 += x86/ucna_injection_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/userspace_io_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/userspace_msr_exit_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/vmx_apic_access_test</div><div class='del'>-TEST_GEN_PROGS_x86 += x86/vmx_close_while_nested_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/vmx_dirty_log_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/vmx_exception_with_invalid_guest_state</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/vmx_msrs_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/vmx_invalid_nested_guest_state</div><div class='add'>+TEST_GEN_PROGS_x86 += x86/vmx_nested_la57_state_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/vmx_set_nested_state_test</div><div class='del'>-TEST_GEN_PROGS_x86 += x86/vmx_tsc_adjust_test</div><div class='del'>-TEST_GEN_PROGS_x86 += x86/vmx_nested_tsc_scaling_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/apic_bus_clock_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/xapic_ipi_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/xapic_state_test</div><div class='hunk'>@@ -116,36 +138,35 @@ TEST_GEN_PROGS_x86 += x86/amx_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/max_vcpuid_cap_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/triple_fault_event_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += x86/recalc_apic_map_test</div><div class='add'>+TEST_GEN_PROGS_x86 += x86/aperfmperf_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += access_tracking_perf_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += coalesced_io_test</div><div class='del'>-TEST_GEN_PROGS_x86 += demand_paging_test</div><div class='del'>-TEST_GEN_PROGS_x86 += dirty_log_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += dirty_log_perf_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += guest_memfd_test</div><div class='del'>-TEST_GEN_PROGS_x86 += guest_print_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += hardware_disable_test</div><div class='del'>-TEST_GEN_PROGS_x86 += kvm_create_max_vcpus</div><div class='del'>-TEST_GEN_PROGS_x86 += kvm_page_table_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += memslot_modification_stress_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += memslot_perf_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += mmu_stress_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += rseq_test</div><div class='del'>-TEST_GEN_PROGS_x86 += set_memory_region_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += steal_time</div><div class='del'>-TEST_GEN_PROGS_x86 += kvm_binary_stats_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += system_counter_offset_test</div><div class='ctx'> TEST_GEN_PROGS_x86 += pre_fault_memory_test</div><div class='ctx'> </div><div class='ctx'> # Compiled outputs used by test targets</div><div class='ctx'> TEST_GEN_PROGS_EXTENDED_x86 += x86/nx_huge_pages_test</div><div class='ctx'> </div><div class='add'>+TEST_GEN_PROGS_arm64 = $(TEST_GEN_PROGS_COMMON)</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/aarch32_id_regs</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/arch_timer_edge_cases</div><div class='add'>+TEST_GEN_PROGS_arm64 += arm64/at</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/debug-exceptions</div><div class='add'>+TEST_GEN_PROGS_arm64 += arm64/hello_el2</div><div class='add'>+TEST_GEN_PROGS_arm64 += arm64/host_sve</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/hypercalls</div><div class='del'>-TEST_GEN_PROGS_arm64 += arm64/mmio_abort</div><div class='add'>+TEST_GEN_PROGS_arm64 += arm64/external_aborts</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/page_fault_test</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/psci_test</div><div class='add'>+TEST_GEN_PROGS_arm64 += arm64/sea_to_user</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/set_id_regs</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/smccc_filter</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/vcpu_width_config</div><div class='hunk'>@@ -154,25 +175,21 @@ TEST_GEN_PROGS_arm64 += arm64/vgic_irq</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/vgic_lpi_stress</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/vpmu_counter_access</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arm64/no-vgic-v3</div><div class='add'>+TEST_GEN_PROGS_arm64 += arm64/kvm-uuid</div><div class='ctx'> TEST_GEN_PROGS_arm64 += access_tracking_perf_test</div><div class='ctx'> TEST_GEN_PROGS_arm64 += arch_timer</div><div class='ctx'> TEST_GEN_PROGS_arm64 += coalesced_io_test</div><div class='del'>-TEST_GEN_PROGS_arm64 += demand_paging_test</div><div class='del'>-TEST_GEN_PROGS_arm64 += dirty_log_test</div><div class='ctx'> TEST_GEN_PROGS_arm64 += dirty_log_perf_test</div><div class='del'>-TEST_GEN_PROGS_arm64 += guest_print_test</div><div class='ctx'> TEST_GEN_PROGS_arm64 += get-reg-list</div><div class='del'>-TEST_GEN_PROGS_arm64 += kvm_create_max_vcpus</div><div class='del'>-TEST_GEN_PROGS_arm64 += kvm_page_table_test</div><div class='add'>+TEST_GEN_PROGS_arm64 += guest_memfd_test</div><div class='ctx'> TEST_GEN_PROGS_arm64 += memslot_modification_stress_test</div><div class='ctx'> TEST_GEN_PROGS_arm64 += memslot_perf_test</div><div class='ctx'> TEST_GEN_PROGS_arm64 += mmu_stress_test</div><div class='ctx'> TEST_GEN_PROGS_arm64 += rseq_test</div><div class='del'>-TEST_GEN_PROGS_arm64 += set_memory_region_test</div><div class='ctx'> TEST_GEN_PROGS_arm64 += steal_time</div><div class='del'>-TEST_GEN_PROGS_arm64 += kvm_binary_stats_test</div><div class='ctx'> </div><div class='del'>-TEST_GEN_PROGS_s390 = s390/memop</div><div class='add'>+TEST_GEN_PROGS_s390 = $(TEST_GEN_PROGS_COMMON)</div><div class='add'>+TEST_GEN_PROGS_s390 += s390/memop</div><div class='ctx'> TEST_GEN_PROGS_s390 += s390/resets</div><div class='ctx'> TEST_GEN_PROGS_s390 += s390/sync_regs_test</div><div class='ctx'> TEST_GEN_PROGS_s390 += s390/tprot</div><div class='hunk'>@@ -181,29 +198,37 @@ TEST_GEN_PROGS_s390 += s390/debug_test</div><div class='ctx'> TEST_GEN_PROGS_s390 += s390/cpumodel_subfuncs_test</div><div class='ctx'> TEST_GEN_PROGS_s390 += s390/shared_zeropage_test</div><div class='ctx'> TEST_GEN_PROGS_s390 += s390/ucontrol_test</div><div class='del'>-TEST_GEN_PROGS_s390 += demand_paging_test</div><div class='del'>-TEST_GEN_PROGS_s390 += dirty_log_test</div><div class='del'>-TEST_GEN_PROGS_s390 += guest_print_test</div><div class='del'>-TEST_GEN_PROGS_s390 += kvm_create_max_vcpus</div><div class='del'>-TEST_GEN_PROGS_s390 += kvm_page_table_test</div><div class='add'>+TEST_GEN_PROGS_s390 += s390/user_operexec</div><div class='ctx'> TEST_GEN_PROGS_s390 += rseq_test</div><div class='del'>-TEST_GEN_PROGS_s390 += set_memory_region_test</div><div class='del'>-TEST_GEN_PROGS_s390 += kvm_binary_stats_test</div><div class='ctx'> </div><div class='add'>+TEST_GEN_PROGS_riscv = $(TEST_GEN_PROGS_COMMON)</div><div class='ctx'> TEST_GEN_PROGS_riscv += riscv/sbi_pmu_test</div><div class='ctx'> TEST_GEN_PROGS_riscv += riscv/ebreak_test</div><div class='add'>+TEST_GEN_PROGS_riscv += access_tracking_perf_test</div><div class='ctx'> TEST_GEN_PROGS_riscv += arch_timer</div><div class='ctx'> TEST_GEN_PROGS_riscv += coalesced_io_test</div><div class='del'>-TEST_GEN_PROGS_riscv += demand_paging_test</div><div class='del'>-TEST_GEN_PROGS_riscv += dirty_log_test</div><div class='add'>+TEST_GEN_PROGS_riscv += dirty_log_perf_test</div><div class='ctx'> TEST_GEN_PROGS_riscv += get-reg-list</div><div class='del'>-TEST_GEN_PROGS_riscv += guest_print_test</div><div class='del'>-TEST_GEN_PROGS_riscv += kvm_binary_stats_test</div><div class='del'>-TEST_GEN_PROGS_riscv += kvm_create_max_vcpus</div><div class='del'>-TEST_GEN_PROGS_riscv += kvm_page_table_test</div><div class='del'>-TEST_GEN_PROGS_riscv += set_memory_region_test</div><div class='add'>+TEST_GEN_PROGS_riscv += memslot_modification_stress_test</div><div class='add'>+TEST_GEN_PROGS_riscv += memslot_perf_test</div><div class='add'>+TEST_GEN_PROGS_riscv += mmu_stress_test</div><div class='add'>+TEST_GEN_PROGS_riscv += rseq_test</div><div class='ctx'> TEST_GEN_PROGS_riscv += steal_time</div><div class='ctx'> </div><div class='add'>+TEST_GEN_PROGS_loongarch = arch_timer</div><div class='add'>+TEST_GEN_PROGS_loongarch += coalesced_io_test</div><div class='add'>+TEST_GEN_PROGS_loongarch += demand_paging_test</div><div class='add'>+TEST_GEN_PROGS_loongarch += dirty_log_perf_test</div><div class='add'>+TEST_GEN_PROGS_loongarch += dirty_log_test</div><div class='add'>+TEST_GEN_PROGS_loongarch += guest_print_test</div><div class='add'>+TEST_GEN_PROGS_loongarch += hardware_disable_test</div><div class='add'>+TEST_GEN_PROGS_loongarch += kvm_binary_stats_test</div><div class='add'>+TEST_GEN_PROGS_loongarch += kvm_create_max_vcpus</div><div class='add'>+TEST_GEN_PROGS_loongarch += kvm_page_table_test</div><div class='add'>+TEST_GEN_PROGS_loongarch += memslot_modification_stress_test</div><div class='add'>+TEST_GEN_PROGS_loongarch += memslot_perf_test</div><div class='add'>+TEST_GEN_PROGS_loongarch += set_memory_region_test</div><div class='add'>+</div><div class='ctx'> SPLIT_TESTS += arch_timer</div><div class='ctx'> SPLIT_TESTS += get-reg-list</div><div class='ctx'> </div><div class='hunk'>@@ -218,6 +243,7 @@ OVERRIDE_TARGETS = 1</div><div class='ctx'> # importantly defines, i.e. overwrites, $(CC) (unless `make -e` or `make CC=`,</div><div class='ctx'> # which causes the environment variable to override the makefile).</div><div class='ctx'> include ../lib.mk</div><div class='add'>+include ../cgroup/lib/libcgroup.mk</div><div class='ctx'> </div><div class='ctx'> INSTALL_HDR_PATH = $(top_srcdir)/usr</div><div class='ctx'> LINUX_HDR_PATH = $(INSTALL_HDR_PATH)/include/</div><div class='hunk'>@@ -271,7 +297,7 @@ LIBKVM_S := $(filter %.S,$(LIBKVM))</div><div class='ctx'> LIBKVM_C_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_C))</div><div class='ctx'> LIBKVM_S_OBJ := $(patsubst %.S, $(OUTPUT)/%.o, $(LIBKVM_S))</div><div class='ctx'> LIBKVM_STRING_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_STRING))</div><div class='del'>-LIBKVM_OBJS = $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ) $(LIBKVM_STRING_OBJ)</div><div class='add'>+LIBKVM_OBJS = $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ) $(LIBKVM_STRING_OBJ) $(LIBCGROUP_O)</div><div class='ctx'> SPLIT_TEST_GEN_PROGS := $(patsubst %, $(OUTPUT)/%, $(SPLIT_TESTS))</div><div class='ctx'> SPLIT_TEST_GEN_OBJ := $(patsubst %, $(OUTPUT)/$(ARCH)/%.o, $(SPLIT_TESTS))</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/access_tracking_perf_test.c b/tools/testing/selftests/kvm/access_tracking_perf_test.c<br/>index 3c7defd34f56..b058f27b2141 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/access_tracking_perf_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/access_tracking_perf_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/access_tracking_perf_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/access_tracking_perf_test.c</a></div><div class='hunk'>@@ -7,9 +7,11 @@</div><div class='ctx'>  * This test measures the performance effects of KVM's access tracking.</div><div class='ctx'>  * Access tracking is driven by the MMU notifiers test_young, clear_young, and</div><div class='ctx'>  * clear_flush_young. These notifiers do not have a direct userspace API,</div><div class='del'>- * however the clear_young notifier can be triggered by marking a pages as idle</div><div class='del'>- * in /sys/kernel/mm/page_idle/bitmap. This test leverages that mechanism to</div><div class='del'>- * enable access tracking on guest memory.</div><div class='add'>+ * however the clear_young notifier can be triggered either by</div><div class='add'>+ *   1. marking a pages as idle in /sys/kernel/mm/page_idle/bitmap OR</div><div class='add'>+ *   2. adding a new MGLRU generation using the lru_gen debugfs file.</div><div class='add'>+ * This test leverages page_idle to enable access tracking on guest memory</div><div class='add'>+ * unless MGLRU is enabled, in which case MGLRU is used.</div><div class='ctx'>  *</div><div class='ctx'>  * To measure performance this test runs a VM with a configurable number of</div><div class='ctx'>  * vCPUs that each touch every page in disjoint regions of memory. Performance</div><div class='hunk'>@@ -17,10 +19,11 @@</div><div class='ctx'>  * predefined region.</div><div class='ctx'>  *</div><div class='ctx'>  * Note that a deterministic correctness test of access tracking is not possible</div><div class='del'>- * by using page_idle as it exists today. This is for a few reasons:</div><div class='add'>+ * by using page_idle or MGLRU aging as it exists today. This is for a few</div><div class='add'>+ * reasons:</div><div class='ctx'>  *</div><div class='del'>- * 1. page_idle only issues clear_young notifiers, which lack a TLB flush. This</div><div class='del'>- *    means subsequent guest accesses are not guaranteed to see page table</div><div class='add'>+ * 1. page_idle and MGLRU only issue clear_young notifiers, which lack a TLB flush.</div><div class='add'>+ *    This means subsequent guest accesses are not guaranteed to see page table</div><div class='ctx'>  *    updates made by KVM until some time in the future.</div><div class='ctx'>  *</div><div class='ctx'>  * 2. page_idle only operates on LRU pages. Newly allocated pages are not</div><div class='hunk'>@@ -47,10 +50,19 @@</div><div class='ctx'> #include "memstress.h"</div><div class='ctx'> #include "guest_modes.h"</div><div class='ctx'> #include "processor.h"</div><div class='add'>+#include "ucall_common.h"</div><div class='add'>+</div><div class='add'>+#include "cgroup_util.h"</div><div class='add'>+#include "lru_gen_util.h"</div><div class='add'>+</div><div class='add'>+static const char *TEST_MEMCG_NAME = "access_tracking_perf_test";</div><div class='ctx'> </div><div class='ctx'> /* Global variable used to synchronize all of the vCPU threads. */</div><div class='ctx'> static int iteration;</div><div class='ctx'> </div><div class='add'>+/* The cgroup memory controller root. Needed for lru_gen-based aging. */</div><div class='add'>+char cgroup_root[PATH_MAX];</div><div class='add'>+</div><div class='ctx'> /* Defines what vCPU threads should do during a given iteration. */</div><div class='ctx'> static enum {</div><div class='ctx'> 	/* Run the vCPU to access all its memory. */</div><div class='hunk'>@@ -65,6 +77,25 @@ static int vcpu_last_completed_iteration[KVM_MAX_VCPUS];</div><div class='ctx'> /* Whether to overlap the regions of memory vCPUs access. */</div><div class='ctx'> static bool overlap_memory_access;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * If the test should only warn if there are too many idle pages (i.e., it is</div><div class='add'>+ * expected).</div><div class='add'>+ * -1: Not yet set.</div><div class='add'>+ *  0: We do not expect too many idle pages, so FAIL if too many idle pages.</div><div class='add'>+ *  1: Having too many idle pages is expected, so merely print a warning if</div><div class='add'>+ *     too many idle pages are found.</div><div class='add'>+ */</div><div class='add'>+static int idle_pages_warn_only = -1;</div><div class='add'>+</div><div class='add'>+/* Whether or not to use MGLRU instead of page_idle for access tracking */</div><div class='add'>+static bool use_lru_gen;</div><div class='add'>+</div><div class='add'>+/* Total number of pages to expect in the memcg after touching everything */</div><div class='add'>+static long test_pages;</div><div class='add'>+</div><div class='add'>+/* Last generation we found the pages in */</div><div class='add'>+static int lru_gen_last_gen = -1;</div><div class='add'>+</div><div class='ctx'> struct test_params {</div><div class='ctx'> 	/* The backing source for the region of memory. */</div><div class='ctx'> 	enum vm_mem_backing_src_type backing_src;</div><div class='hunk'>@@ -123,8 +154,24 @@ static void mark_page_idle(int page_idle_fd, uint64_t pfn)</div><div class='ctx'> 		    "Set page_idle bits for PFN 0x%" PRIx64, pfn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mark_vcpu_memory_idle(struct kvm_vm *vm,</div><div class='del'>-				  struct memstress_vcpu_args *vcpu_args)</div><div class='add'>+static void too_many_idle_pages(long idle_pages, long total_pages, int vcpu_idx)</div><div class='add'>+{</div><div class='add'>+	char prefix[18] = {};</div><div class='add'>+</div><div class='add'>+	if (vcpu_idx &gt;= 0)</div><div class='add'>+		snprintf(prefix, 18, "vCPU%d: ", vcpu_idx);</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(idle_pages_warn_only,</div><div class='add'>+		    "%sToo many pages still idle (%lu out of %lu)",</div><div class='add'>+		    prefix, idle_pages, total_pages);</div><div class='add'>+</div><div class='add'>+	printf("WARNING: %sToo many pages still idle (%lu out of %lu), "</div><div class='add'>+	       "this will affect performance results.\n",</div><div class='add'>+	       prefix, idle_pages, total_pages);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pageidle_mark_vcpu_memory_idle(struct kvm_vm *vm,</div><div class='add'>+					   struct memstress_vcpu_args *vcpu_args)</div><div class='ctx'> {</div><div class='ctx'> 	int vcpu_idx = vcpu_args-&gt;vcpu_idx;</div><div class='ctx'> 	uint64_t base_gva = vcpu_args-&gt;gva;</div><div class='hunk'>@@ -177,27 +224,79 @@ static void mark_vcpu_memory_idle(struct kvm_vm *vm,</div><div class='ctx'> 	 * arbitrary; high enough that we ensure most memory access went through</div><div class='ctx'> 	 * access tracking but low enough as to not make the test too brittle</div><div class='ctx'> 	 * over time and across architectures.</div><div class='del'>-	 *</div><div class='del'>-	 * When running the guest as a nested VM, "warn" instead of asserting</div><div class='del'>-	 * as the TLB size is effectively unlimited and the KVM doesn't</div><div class='del'>-	 * explicitly flush the TLB when aging SPTEs.  As a result, more pages</div><div class='del'>-	 * are cached and the guest won't see the "idle" bit cleared.</div><div class='ctx'> 	 */</div><div class='del'>-	if (still_idle &gt;= pages / 10) {</div><div class='del'>-#ifdef __x86_64__</div><div class='del'>-		TEST_ASSERT(this_cpu_has(X86_FEATURE_HYPERVISOR),</div><div class='del'>-			    "vCPU%d: Too many pages still idle (%lu out of %lu)",</div><div class='del'>-			    vcpu_idx, still_idle, pages);</div><div class='del'>-#endif</div><div class='del'>-		printf("WARNING: vCPU%d: Too many pages still idle (%lu out of %lu), "</div><div class='del'>-		       "this will affect performance results.\n",</div><div class='del'>-		       vcpu_idx, still_idle, pages);</div><div class='del'>-	}</div><div class='add'>+	if (still_idle &gt;= pages / 10)</div><div class='add'>+		too_many_idle_pages(still_idle, pages,</div><div class='add'>+				    overlap_memory_access ? -1 : vcpu_idx);</div><div class='ctx'> </div><div class='ctx'> 	close(page_idle_fd);</div><div class='ctx'> 	close(pagemap_fd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int find_generation(struct memcg_stats *stats, long total_pages)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * For finding the generation that contains our pages, use the same</div><div class='add'>+	 * 90% threshold that page_idle uses.</div><div class='add'>+	 */</div><div class='add'>+	int gen = lru_gen_find_generation(stats, total_pages * 9 / 10);</div><div class='add'>+</div><div class='add'>+	if (gen &gt;= 0)</div><div class='add'>+		return gen;</div><div class='add'>+</div><div class='add'>+	if (!idle_pages_warn_only) {</div><div class='add'>+		TEST_FAIL("Could not find a generation with 90%% of guest memory (%ld pages).",</div><div class='add'>+			   total_pages * 9 / 10);</div><div class='add'>+		return gen;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We couldn't find a generation with 90% of guest memory, which can</div><div class='add'>+	 * happen if access tracking is unreliable. Simply look for a majority</div><div class='add'>+	 * of pages.</div><div class='add'>+	 */</div><div class='add'>+	puts("WARNING: Couldn't find a generation with 90% of guest memory. "</div><div class='add'>+	     "Performance results may not be accurate.");</div><div class='add'>+	gen = lru_gen_find_generation(stats, total_pages / 2);</div><div class='add'>+	TEST_ASSERT(gen &gt;= 0,</div><div class='add'>+		    "Could not find a generation with 50%% of guest memory (%ld pages).",</div><div class='add'>+		    total_pages / 2);</div><div class='add'>+	return gen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lru_gen_mark_memory_idle(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	struct timespec ts_start;</div><div class='add'>+	struct timespec ts_elapsed;</div><div class='add'>+	struct memcg_stats stats;</div><div class='add'>+	int new_gen;</div><div class='add'>+</div><div class='add'>+	/* Make a new generation */</div><div class='add'>+	clock_gettime(CLOCK_MONOTONIC, &amp;ts_start);</div><div class='add'>+	lru_gen_do_aging(&amp;stats, TEST_MEMCG_NAME);</div><div class='add'>+	ts_elapsed = timespec_elapsed(ts_start);</div><div class='add'>+</div><div class='add'>+	/* Check the generation again */</div><div class='add'>+	new_gen = find_generation(&amp;stats, test_pages);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This function should only be invoked with newly-accessed pages,</div><div class='add'>+	 * so pages should always move to a newer generation.</div><div class='add'>+	 */</div><div class='add'>+	if (new_gen &lt;= lru_gen_last_gen) {</div><div class='add'>+		/* We did not move to a newer generation. */</div><div class='add'>+		long idle_pages = lru_gen_sum_memcg_stats_for_gen(lru_gen_last_gen,</div><div class='add'>+								  &amp;stats);</div><div class='add'>+</div><div class='add'>+		too_many_idle_pages(min_t(long, idle_pages, test_pages),</div><div class='add'>+				    test_pages, -1);</div><div class='add'>+	}</div><div class='add'>+	pr_info("%-30s: %ld.%09lds\n",</div><div class='add'>+		"Mark memory idle (lru_gen)", ts_elapsed.tv_sec,</div><div class='add'>+		ts_elapsed.tv_nsec);</div><div class='add'>+	lru_gen_last_gen = new_gen;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void assert_ucall(struct kvm_vcpu *vcpu, uint64_t expected_ucall)</div><div class='ctx'> {</div><div class='ctx'> 	struct ucall uc;</div><div class='hunk'>@@ -237,9 +336,9 @@ static void vcpu_thread_main(struct memstress_vcpu_args *vcpu_args)</div><div class='ctx'> 			assert_ucall(vcpu, UCALL_SYNC);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ITERATION_MARK_IDLE:</div><div class='del'>-			mark_vcpu_memory_idle(vm, vcpu_args);</div><div class='add'>+			pageidle_mark_vcpu_memory_idle(vm, vcpu_args);</div><div class='ctx'> 			break;</div><div class='del'>-		};</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		vcpu_last_completed_iteration[vcpu_idx] = current_iteration;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -289,15 +388,18 @@ static void access_memory(struct kvm_vm *vm, int nr_vcpus,</div><div class='ctx'> </div><div class='ctx'> static void mark_memory_idle(struct kvm_vm *vm, int nr_vcpus)</div><div class='ctx'> {</div><div class='add'>+	if (use_lru_gen)</div><div class='add'>+		return lru_gen_mark_memory_idle(vm);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Even though this parallelizes the work across vCPUs, this is still a</div><div class='ctx'> 	 * very slow operation because page_idle forces the test to mark one pfn</div><div class='del'>-	 * at a time and the clear_young notifier serializes on the KVM MMU</div><div class='add'>+	 * at a time and the clear_young notifier may serialize on the KVM MMU</div><div class='ctx'> 	 * lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	pr_debug("Marking VM memory idle (slow)...\n");</div><div class='ctx'> 	iteration_work = ITERATION_MARK_IDLE;</div><div class='del'>-	run_iteration(vm, nr_vcpus, "Mark memory idle");</div><div class='add'>+	run_iteration(vm, nr_vcpus, "Mark memory idle (page_idle)");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_test(enum vm_guest_mode mode, void *arg)</div><div class='hunk'>@@ -309,11 +411,38 @@ static void run_test(enum vm_guest_mode mode, void *arg)</div><div class='ctx'> 	vm = memstress_create_vm(mode, nr_vcpus, params-&gt;vcpu_memory_bytes, 1,</div><div class='ctx'> 				 params-&gt;backing_src, !overlap_memory_access);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If guest_page_size is larger than the host's page size, the</div><div class='add'>+	 * guest (memstress) will only fault in a subset of the host's pages.</div><div class='add'>+	 */</div><div class='add'>+	test_pages = params-&gt;nr_vcpus * params-&gt;vcpu_memory_bytes /</div><div class='add'>+		      max(memstress_args.guest_page_size,</div><div class='add'>+			  (uint64_t)getpagesize());</div><div class='add'>+</div><div class='ctx'> 	memstress_start_vcpu_threads(nr_vcpus, vcpu_thread_main);</div><div class='ctx'> </div><div class='ctx'> 	pr_info("\n");</div><div class='ctx'> 	access_memory(vm, nr_vcpus, ACCESS_WRITE, "Populating memory");</div><div class='ctx'> </div><div class='add'>+	if (use_lru_gen) {</div><div class='add'>+		struct memcg_stats stats;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Do a page table scan now. Following initial population, aging</div><div class='add'>+		 * may not cause the pages to move to a newer generation. Do</div><div class='add'>+		 * an aging pass now so that future aging passes always move</div><div class='add'>+		 * pages to a newer generation.</div><div class='add'>+		 */</div><div class='add'>+		printf("Initial aging pass (lru_gen)\n");</div><div class='add'>+		lru_gen_do_aging(&amp;stats, TEST_MEMCG_NAME);</div><div class='add'>+		TEST_ASSERT(lru_gen_sum_memcg_stats(&amp;stats) &gt;= test_pages,</div><div class='add'>+			    "Not all pages accounted for (looking for %ld). "</div><div class='add'>+			    "Was the memcg set up correctly?", test_pages);</div><div class='add'>+		access_memory(vm, nr_vcpus, ACCESS_WRITE, "Re-populating memory");</div><div class='add'>+		lru_gen_read_memcg_stats(&amp;stats, TEST_MEMCG_NAME);</div><div class='add'>+		lru_gen_last_gen = find_generation(&amp;stats, test_pages);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* As a control, read and write to the populated memory first. */</div><div class='ctx'> 	access_memory(vm, nr_vcpus, ACCESS_WRITE, "Writing to populated memory");</div><div class='ctx'> 	access_memory(vm, nr_vcpus, ACCESS_READ, "Reading from populated memory");</div><div class='hunk'>@@ -328,6 +457,37 @@ static void run_test(enum vm_guest_mode mode, void *arg)</div><div class='ctx'> 	memstress_destroy_vm(vm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int access_tracking_unreliable(void)</div><div class='add'>+{</div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+	/*</div><div class='add'>+	 * When running nested, the TLB size may be effectively unlimited (for</div><div class='add'>+	 * example, this is the case when running on KVM L0), and KVM doesn't</div><div class='add'>+	 * explicitly flush the TLB when aging SPTEs.  As a result, more pages</div><div class='add'>+	 * are cached and the guest won't see the "idle" bit cleared.</div><div class='add'>+	 */</div><div class='add'>+	if (this_cpu_has(X86_FEATURE_HYPERVISOR)) {</div><div class='add'>+		puts("Skipping idle page count sanity check, because the test is run nested");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 * When NUMA balancing is enabled, guest memory will be unmapped to get</div><div class='add'>+	 * NUMA faults, dropping the Accessed bits.</div><div class='add'>+	 */</div><div class='add'>+	if (is_numa_balancing_enabled()) {</div><div class='add'>+		puts("Skipping idle page count sanity check, because NUMA balancing is enabled");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int run_test_for_each_guest_mode(const char *cgroup, void *arg)</div><div class='add'>+{</div><div class='add'>+	for_each_guest_mode(run_test, arg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void help(char *name)</div><div class='ctx'> {</div><div class='ctx'> 	puts("");</div><div class='hunk'>@@ -342,11 +502,22 @@ static void help(char *name)</div><div class='ctx'> 	printf(" -v: specify the number of vCPUs to run.\n");</div><div class='ctx'> 	printf(" -o: Overlap guest memory accesses instead of partitioning\n"</div><div class='ctx'> 	       "     them into a separate region of memory for each vCPU.\n");</div><div class='add'>+	printf(" -w: Control whether the test warns or fails if more than 10%%\n"</div><div class='add'>+	       "     of pages are still seen as idle/old after accessing guest\n"</div><div class='add'>+	       "     memory.  &gt;0 == warn only, 0 == fail, &lt;0 == auto.  For auto\n"</div><div class='add'>+	       "     mode, the test fails by default, but switches to warn only\n"</div><div class='add'>+	       "     if NUMA balancing is enabled or the test detects it's running\n"</div><div class='add'>+	       "     in a VM.\n");</div><div class='ctx'> 	backing_src_help("-s");</div><div class='ctx'> 	puts("");</div><div class='ctx'> 	exit(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void destroy_cgroup(char *cg)</div><div class='add'>+{</div><div class='add'>+	printf("Destroying cgroup: %s\n", cg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	struct test_params params = {</div><div class='hunk'>@@ -354,12 +525,13 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		.vcpu_memory_bytes = DEFAULT_PER_VCPU_MEM_SIZE,</div><div class='ctx'> 		.nr_vcpus = 1,</div><div class='ctx'> 	};</div><div class='add'>+	char *new_cg = NULL;</div><div class='ctx'> 	int page_idle_fd;</div><div class='ctx'> 	int opt;</div><div class='ctx'> </div><div class='ctx'> 	guest_modes_append_default();</div><div class='ctx'> </div><div class='del'>-	while ((opt = getopt(argc, argv, "hm:b:v:os:")) != -1) {</div><div class='add'>+	while ((opt = getopt(argc, argv, "hm:b:v:os:w:")) != -1) {</div><div class='ctx'> 		switch (opt) {</div><div class='ctx'> 		case 'm':</div><div class='ctx'> 			guest_modes_cmdline(optarg);</div><div class='hunk'>@@ -376,6 +548,11 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		case 's':</div><div class='ctx'> 			params.backing_src = parse_backing_src_type(optarg);</div><div class='ctx'> 			break;</div><div class='add'>+		case 'w':</div><div class='add'>+			idle_pages_warn_only =</div><div class='add'>+				atoi_non_negative("Idle pages warning",</div><div class='add'>+						  optarg);</div><div class='add'>+			break;</div><div class='ctx'> 		case 'h':</div><div class='ctx'> 		default:</div><div class='ctx'> 			help(argv[0]);</div><div class='hunk'>@@ -383,12 +560,50 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	page_idle_fd = open("/sys/kernel/mm/page_idle/bitmap", O_RDWR);</div><div class='del'>-	__TEST_REQUIRE(page_idle_fd &gt;= 0,</div><div class='del'>-		       "CONFIG_IDLE_PAGE_TRACKING is not enabled");</div><div class='del'>-	close(page_idle_fd);</div><div class='add'>+	if (idle_pages_warn_only == -1)</div><div class='add'>+		idle_pages_warn_only = access_tracking_unreliable();</div><div class='add'>+</div><div class='add'>+	if (lru_gen_usable()) {</div><div class='add'>+		bool cg_created = true;</div><div class='add'>+		int ret;</div><div class='ctx'> </div><div class='del'>-	for_each_guest_mode(run_test, &amp;params);</div><div class='add'>+		puts("Using lru_gen for aging");</div><div class='add'>+		use_lru_gen = true;</div><div class='add'>+</div><div class='add'>+		if (cg_find_controller_root(cgroup_root, sizeof(cgroup_root), "memory"))</div><div class='add'>+			ksft_exit_skip("Cannot find memory cgroup controller\n");</div><div class='add'>+</div><div class='add'>+		new_cg = cg_name(cgroup_root, TEST_MEMCG_NAME);</div><div class='add'>+		printf("Creating cgroup: %s\n", new_cg);</div><div class='add'>+		if (cg_create(new_cg)) {</div><div class='add'>+			if (errno == EEXIST) {</div><div class='add'>+				printf("Found existing cgroup");</div><div class='add'>+				cg_created = false;</div><div class='add'>+			} else {</div><div class='add'>+				ksft_exit_skip("could not create new cgroup: %s\n", new_cg);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * This will fork off a new process to run the test within</div><div class='add'>+		 * a new memcg, so we need to properly propagate the return</div><div class='add'>+		 * value up.</div><div class='add'>+		 */</div><div class='add'>+		ret = cg_run(new_cg, &amp;run_test_for_each_guest_mode, &amp;params);</div><div class='add'>+		if (cg_created)</div><div class='add'>+			cg_destroy(new_cg);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			TEST_FAIL("child did not spawn or was abnormally killed");</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else {</div><div class='add'>+		page_idle_fd = __open_path_or_exit("/sys/kernel/mm/page_idle/bitmap", O_RDWR,</div><div class='add'>+						   "Is CONFIG_IDLE_PAGE_TRACKING enabled?");</div><div class='add'>+		close(page_idle_fd);</div><div class='add'>+</div><div class='add'>+		puts("Using page_idle for aging");</div><div class='add'>+		run_test_for_each_guest_mode(NULL, &amp;params);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arch_timer.c b/tools/testing/selftests/kvm/arch_timer.c<br/>index acb2cb596332..cf8fb67104f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arch_timer.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arch_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arch_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arch_timer.c</a></div><div class='hunk'>@@ -98,16 +98,11 @@ static uint32_t test_get_pcpu(void)</div><div class='ctx'> static int test_migrate_vcpu(unsigned int vcpu_idx)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	cpu_set_t cpuset;</div><div class='ctx'> 	uint32_t new_pcpu = test_get_pcpu();</div><div class='ctx'> </div><div class='del'>-	CPU_ZERO(&amp;cpuset);</div><div class='del'>-	CPU_SET(new_pcpu, &amp;cpuset);</div><div class='del'>-</div><div class='ctx'> 	pr_debug("Migrating vCPU: %u to pCPU: %u\n", vcpu_idx, new_pcpu);</div><div class='ctx'> </div><div class='del'>-	ret = pthread_setaffinity_np(pt_vcpu_run[vcpu_idx],</div><div class='del'>-				     sizeof(cpuset), &amp;cpuset);</div><div class='add'>+	ret = __pin_task_to_cpu(pt_vcpu_run[vcpu_idx], new_pcpu);</div><div class='ctx'> </div><div class='ctx'> 	/* Allow the error where the vCPU thread is already finished */</div><div class='ctx'> 	TEST_ASSERT(ret == 0 || ret == ESRCH,</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/aarch32_id_regs.c b/tools/testing/selftests/kvm/arm64/aarch32_id_regs.c<br/>index cef8f7323ceb..713005b6f508 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/aarch32_id_regs.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/aarch32_id_regs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/aarch32_id_regs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/aarch32_id_regs.c</a></div><div class='hunk'>@@ -146,7 +146,7 @@ static bool vcpu_aarch64_only(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	val = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_ID_AA64PFR0_EL1));</div><div class='ctx'> </div><div class='del'>-	el0 = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_EL0), val);</div><div class='add'>+	el0 = FIELD_GET(ID_AA64PFR0_EL1_EL0, val);</div><div class='ctx'> 	return el0 == ID_AA64PFR0_EL1_EL0_IMP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/arch_timer.c b/tools/testing/selftests/kvm/arm64/arch_timer.c<br/>index eeba1cc87ff8..d592a4515399 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/arch_timer.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/arch_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/arch_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/arch_timer.c</a></div><div class='hunk'>@@ -165,10 +165,8 @@ static void guest_code(void)</div><div class='ctx'> static void test_init_timer_irq(struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='ctx'> 	/* Timer initid should be same for all the vCPUs, so query only vCPU-0 */</div><div class='del'>-	vcpu_device_attr_get(vcpus[0], KVM_ARM_VCPU_TIMER_CTRL,</div><div class='del'>-			     KVM_ARM_VCPU_TIMER_IRQ_PTIMER, &amp;ptimer_irq);</div><div class='del'>-	vcpu_device_attr_get(vcpus[0], KVM_ARM_VCPU_TIMER_CTRL,</div><div class='del'>-			     KVM_ARM_VCPU_TIMER_IRQ_VTIMER, &amp;vtimer_irq);</div><div class='add'>+	ptimer_irq = vcpu_get_ptimer_irq(vcpus[0]);</div><div class='add'>+	vtimer_irq = vcpu_get_vtimer_irq(vcpus[0]);</div><div class='ctx'> </div><div class='ctx'> 	sync_global_to_guest(vm, ptimer_irq);</div><div class='ctx'> 	sync_global_to_guest(vm, vtimer_irq);</div><div class='hunk'>@@ -176,14 +174,14 @@ static void test_init_timer_irq(struct kvm_vm *vm)</div><div class='ctx'> 	pr_debug("ptimer_irq: %d; vtimer_irq: %d\n", ptimer_irq, vtimer_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gic_fd;</div><div class='del'>-</div><div class='ctx'> struct kvm_vm *test_vm_create(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int nr_vcpus = test_args.nr_vcpus;</div><div class='ctx'> </div><div class='add'>+	TEST_REQUIRE(kvm_supports_vgic_v3());</div><div class='add'>+</div><div class='ctx'> 	vm = vm_create_with_vcpus(nr_vcpus, guest_code, vcpus);</div><div class='ctx'> </div><div class='ctx'> 	vm_init_descriptor_tables(vm);</div><div class='hunk'>@@ -204,8 +202,6 @@ struct kvm_vm *test_vm_create(void)</div><div class='ctx'> 		vcpu_init_descriptor_tables(vcpus[i]);</div><div class='ctx'> </div><div class='ctx'> 	test_init_timer_irq(vm);</div><div class='del'>-	gic_fd = vgic_v3_setup(vm, nr_vcpus, 64);</div><div class='del'>-	__TEST_REQUIRE(gic_fd &gt;= 0, "Failed to create vgic-v3");</div><div class='ctx'> </div><div class='ctx'> 	/* Make all the test's cmdline args visible to the guest */</div><div class='ctx'> 	sync_global_to_guest(vm, test_args);</div><div class='hunk'>@@ -215,6 +211,5 @@ struct kvm_vm *test_vm_create(void)</div><div class='ctx'> </div><div class='ctx'> void test_vm_cleanup(struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='del'>-	close(gic_fd);</div><div class='ctx'> 	kvm_vm_free(vm);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c b/tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c<br/>index a36a7e2db434..993c9e38e729 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c</a></div><div class='hunk'>@@ -22,7 +22,8 @@</div><div class='ctx'> #include "gic.h"</div><div class='ctx'> #include "vgic.h"</div><div class='ctx'> </div><div class='del'>-static const uint64_t CVAL_MAX = ~0ULL;</div><div class='add'>+/* Depends on counter width. */</div><div class='add'>+static uint64_t CVAL_MAX;</div><div class='ctx'> /* tval is a signed 32-bit int. */</div><div class='ctx'> static const int32_t TVAL_MAX = INT32_MAX;</div><div class='ctx'> static const int32_t TVAL_MIN = INT32_MIN;</div><div class='hunk'>@@ -30,8 +31,8 @@ static const int32_t TVAL_MIN = INT32_MIN;</div><div class='ctx'> /* After how much time we say there is no IRQ. */</div><div class='ctx'> static const uint32_t TIMEOUT_NO_IRQ_US = 50000;</div><div class='ctx'> </div><div class='del'>-/* A nice counter value to use as the starting one for most tests. */</div><div class='del'>-static const uint64_t DEF_CNT = (CVAL_MAX / 2);</div><div class='add'>+/* Counter value to use as the starting one for most tests. Set to CVAL_MAX/2 */</div><div class='add'>+static uint64_t DEF_CNT;</div><div class='ctx'> </div><div class='ctx'> /* Number of runs. */</div><div class='ctx'> static const uint32_t NR_TEST_ITERS_DEF = 5;</div><div class='hunk'>@@ -191,8 +192,8 @@ static void set_tval_irq(enum arch_timer timer, uint64_t tval_cycles,</div><div class='ctx'> {</div><div class='ctx'> 	atomic_set(&amp;shared_data.handled, 0);</div><div class='ctx'> 	atomic_set(&amp;shared_data.spurious, 0);</div><div class='del'>-	timer_set_ctl(timer, ctl);</div><div class='ctx'> 	timer_set_tval(timer, tval_cycles);</div><div class='add'>+	timer_set_ctl(timer, ctl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void set_xval_irq(enum arch_timer timer, uint64_t xval, uint32_t ctl,</div><div class='hunk'>@@ -732,12 +733,6 @@ static void test_move_counters_ahead_of_timers(enum arch_timer timer)</div><div class='ctx'> 		test_set_cnt_after_tval(timer, 0, tval, (uint64_t) tval + 1,</div><div class='ctx'> 					wm);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(sleep_method); i++) {</div><div class='del'>-		sleep_method_t sm = sleep_method[i];</div><div class='del'>-</div><div class='del'>-		test_set_cnt_after_cval_no_irq(timer, 0, DEF_CNT, CVAL_MAX, sm);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -849,17 +844,17 @@ static void guest_code(enum arch_timer timer)</div><div class='ctx'> 	GUEST_DONE();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static cpu_set_t default_cpuset;</div><div class='add'>+</div><div class='ctx'> static uint32_t next_pcpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t max = get_nprocs();</div><div class='ctx'> 	uint32_t cur = sched_getcpu();</div><div class='ctx'> 	uint32_t next = cur;</div><div class='del'>-	cpu_set_t cpuset;</div><div class='add'>+	cpu_set_t cpuset = default_cpuset;</div><div class='ctx'> </div><div class='ctx'> 	TEST_ASSERT(max &gt; 1, "Need at least two physical cpus");</div><div class='ctx'> </div><div class='del'>-	sched_getaffinity(0, sizeof(cpuset), &amp;cpuset);</div><div class='del'>-</div><div class='ctx'> 	do {</div><div class='ctx'> 		next = (next + 1) % CPU_SETSIZE;</div><div class='ctx'> 	} while (!CPU_ISSET(next, &amp;cpuset));</div><div class='hunk'>@@ -867,25 +862,6 @@ static uint32_t next_pcpu(void)</div><div class='ctx'> 	return next;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void migrate_self(uint32_t new_pcpu)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	cpu_set_t cpuset;</div><div class='del'>-	pthread_t thread;</div><div class='del'>-</div><div class='del'>-	thread = pthread_self();</div><div class='del'>-</div><div class='del'>-	CPU_ZERO(&amp;cpuset);</div><div class='del'>-	CPU_SET(new_pcpu, &amp;cpuset);</div><div class='del'>-</div><div class='del'>-	pr_debug("Migrating from %u to %u\n", sched_getcpu(), new_pcpu);</div><div class='del'>-</div><div class='del'>-	ret = pthread_setaffinity_np(thread, sizeof(cpuset), &amp;cpuset);</div><div class='del'>-</div><div class='del'>-	TEST_ASSERT(ret == 0, "Failed to migrate to pCPU: %u; ret: %d\n",</div><div class='del'>-		    new_pcpu, ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void kvm_set_cntxct(struct kvm_vcpu *vcpu, uint64_t cnt,</div><div class='ctx'> 			   enum arch_timer timer)</div><div class='ctx'> {</div><div class='hunk'>@@ -912,7 +888,7 @@ static void handle_sync(struct kvm_vcpu *vcpu, struct ucall *uc)</div><div class='ctx'> 		sched_yield();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case USERSPACE_MIGRATE_SELF:</div><div class='del'>-		migrate_self(next_pcpu());</div><div class='add'>+		pin_self_to_cpu(next_pcpu());</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -924,7 +900,7 @@ static void test_run(struct kvm_vm *vm, struct kvm_vcpu *vcpu)</div><div class='ctx'> 	struct ucall uc;</div><div class='ctx'> </div><div class='ctx'> 	/* Start on CPU 0 */</div><div class='del'>-	migrate_self(0);</div><div class='add'>+	pin_self_to_cpu(0);</div><div class='ctx'> </div><div class='ctx'> 	while (true) {</div><div class='ctx'> 		vcpu_run(vcpu);</div><div class='hunk'>@@ -948,10 +924,8 @@ static void test_run(struct kvm_vm *vm, struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> static void test_init_timer_irq(struct kvm_vm *vm, struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	vcpu_device_attr_get(vcpu, KVM_ARM_VCPU_TIMER_CTRL,</div><div class='del'>-			     KVM_ARM_VCPU_TIMER_IRQ_PTIMER, &amp;ptimer_irq);</div><div class='del'>-	vcpu_device_attr_get(vcpu, KVM_ARM_VCPU_TIMER_CTRL,</div><div class='del'>-			     KVM_ARM_VCPU_TIMER_IRQ_VTIMER, &amp;vtimer_irq);</div><div class='add'>+	ptimer_irq = vcpu_get_ptimer_irq(vcpu);</div><div class='add'>+	vtimer_irq = vcpu_get_vtimer_irq(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	sync_global_to_guest(vm, ptimer_irq);</div><div class='ctx'> 	sync_global_to_guest(vm, vtimer_irq);</div><div class='hunk'>@@ -973,8 +947,15 @@ static void test_vm_create(struct kvm_vm **vm, struct kvm_vcpu **vcpu,</div><div class='ctx'> 	vcpu_args_set(*vcpu, 1, timer);</div><div class='ctx'> </div><div class='ctx'> 	test_init_timer_irq(*vm, *vcpu);</div><div class='del'>-	vgic_v3_setup(*vm, 1, 64);</div><div class='add'>+</div><div class='ctx'> 	sync_global_to_guest(*vm, test_args);</div><div class='add'>+	sync_global_to_guest(*vm, CVAL_MAX);</div><div class='add'>+	sync_global_to_guest(*vm, DEF_CNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_vm_cleanup(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	kvm_vm_free(vm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void test_print_help(char *name)</div><div class='hunk'>@@ -986,7 +967,7 @@ static void test_print_help(char *name)</div><div class='ctx'> 	pr_info("\t-b: Test both physical and virtual timers (default: true)\n");</div><div class='ctx'> 	pr_info("\t-l: Delta (in ms) used for long wait time test (default: %u)\n",</div><div class='ctx'> 	     LONG_WAIT_TEST_MS);</div><div class='del'>-	pr_info("\t-l: Delta (in ms) used for wait times (default: %u)\n",</div><div class='add'>+	pr_info("\t-w: Delta (in ms) used for wait times (default: %u)\n",</div><div class='ctx'> 		WAIT_TEST_MS);</div><div class='ctx'> 	pr_info("\t-p: Test physical timer (default: true)\n");</div><div class='ctx'> 	pr_info("\t-v: Test virtual timer (default: true)\n");</div><div class='hunk'>@@ -1035,6 +1016,17 @@ static bool parse_args(int argc, char *argv[])</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void set_counter_defaults(void)</div><div class='add'>+{</div><div class='add'>+	const uint64_t MIN_ROLLOVER_SECS = 40ULL * 365 * 24 * 3600;</div><div class='add'>+	uint64_t freq = read_sysreg(CNTFRQ_EL0);</div><div class='add'>+	int width = ilog2(MIN_ROLLOVER_SECS * freq);</div><div class='add'>+</div><div class='add'>+	width = clamp(width, 56, 64);</div><div class='add'>+	CVAL_MAX = GENMASK_ULL(width - 1, 0);</div><div class='add'>+	DEF_CNT = CVAL_MAX / 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='hunk'>@@ -1043,19 +1035,24 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	/* Tell stdout not to buffer its content */</div><div class='ctx'> 	setbuf(stdout, NULL);</div><div class='ctx'> </div><div class='add'>+	TEST_REQUIRE(kvm_supports_vgic_v3());</div><div class='add'>+</div><div class='ctx'> 	if (!parse_args(argc, argv))</div><div class='ctx'> 		exit(KSFT_SKIP);</div><div class='ctx'> </div><div class='add'>+	sched_getaffinity(0, sizeof(default_cpuset), &amp;default_cpuset);</div><div class='add'>+	set_counter_defaults();</div><div class='add'>+</div><div class='ctx'> 	if (test_args.test_virtual) {</div><div class='ctx'> 		test_vm_create(&amp;vm, &amp;vcpu, VIRTUAL);</div><div class='ctx'> 		test_run(vm, vcpu);</div><div class='del'>-		kvm_vm_free(vm);</div><div class='add'>+		test_vm_cleanup(vm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_args.test_physical) {</div><div class='ctx'> 		test_vm_create(&amp;vm, &amp;vcpu, PHYSICAL);</div><div class='ctx'> 		test_run(vm, vcpu);</div><div class='del'>-		kvm_vm_free(vm);</div><div class='add'>+		test_vm_cleanup(vm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/at.c b/tools/testing/selftests/kvm/arm64/at.c<br/>new file mode 100644<br/>index 000000000000..c8ee6f520734<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/at.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/at.c</a></div><div class='hunk'>@@ -0,0 +1,166 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * at - Test for KVM's AT emulation in the EL2&amp;0 and EL1&amp;0 translation regimes.</div><div class='add'>+ */</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='add'>+#include "test_util.h"</div><div class='add'>+#include "ucall.h"</div><div class='add'>+</div><div class='add'>+#include &lt;asm/sysreg.h&gt;</div><div class='add'>+</div><div class='add'>+#define TEST_ADDR	0x80000000</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CLEAR_ACCESS_FLAG,</div><div class='add'>+	TEST_ACCESS_FLAG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 *ptep_hva;</div><div class='add'>+</div><div class='add'>+#define copy_el2_to_el1(reg)						\</div><div class='add'>+	write_sysreg_s(read_sysreg_s(SYS_##reg##_EL1), SYS_##reg##_EL12)</div><div class='add'>+</div><div class='add'>+/* Yes, this is an ugly hack */</div><div class='add'>+#define __at(op, addr)	write_sysreg_s(addr, op)</div><div class='add'>+</div><div class='add'>+#define test_at_insn(op, expect_fault)							\</div><div class='add'>+do {											\</div><div class='add'>+	u64 par, fsc;									\</div><div class='add'>+	bool fault;									\</div><div class='add'>+											\</div><div class='add'>+	GUEST_SYNC(CLEAR_ACCESS_FLAG);							\</div><div class='add'>+											\</div><div class='add'>+	__at(OP_AT_##op, TEST_ADDR);							\</div><div class='add'>+	isb();										\</div><div class='add'>+	par = read_sysreg(par_el1);							\</div><div class='add'>+											\</div><div class='add'>+	fault = par &amp; SYS_PAR_EL1_F;							\</div><div class='add'>+	fsc = FIELD_GET(SYS_PAR_EL1_FST, par);						\</div><div class='add'>+											\</div><div class='add'>+	__GUEST_ASSERT((expect_fault) == fault,						\</div><div class='add'>+		       "AT "#op": %sexpected fault (par: %lx)1",			\</div><div class='add'>+		       (expect_fault) ? "" : "un", par);				\</div><div class='add'>+	if ((expect_fault)) {								\</div><div class='add'>+		__GUEST_ASSERT(fsc == ESR_ELx_FSC_ACCESS_L(3),				\</div><div class='add'>+			       "AT "#op": expected access flag fault (par: %lx)",	\</div><div class='add'>+			       par);							\</div><div class='add'>+	} else {									\</div><div class='add'>+		GUEST_ASSERT_EQ(FIELD_GET(SYS_PAR_EL1_ATTR, par), MAIR_ATTR_NORMAL);	\</div><div class='add'>+		GUEST_ASSERT_EQ(FIELD_GET(SYS_PAR_EL1_SH, par), PTE_SHARED &gt;&gt; 8);	\</div><div class='add'>+		GUEST_ASSERT_EQ(par &amp; SYS_PAR_EL1_PA, TEST_ADDR);			\</div><div class='add'>+		GUEST_SYNC(TEST_ACCESS_FLAG);						\</div><div class='add'>+	}										\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static void test_at(bool expect_fault)</div><div class='add'>+{</div><div class='add'>+	test_at_insn(S1E2R, expect_fault);</div><div class='add'>+	test_at_insn(S1E2W, expect_fault);</div><div class='add'>+</div><div class='add'>+	/* Reuse the stage-1 MMU context from EL2 at EL1 */</div><div class='add'>+	copy_el2_to_el1(SCTLR);</div><div class='add'>+	copy_el2_to_el1(MAIR);</div><div class='add'>+	copy_el2_to_el1(TCR);</div><div class='add'>+	copy_el2_to_el1(TTBR0);</div><div class='add'>+	copy_el2_to_el1(TTBR1);</div><div class='add'>+</div><div class='add'>+	/* Disable stage-2 translation and enter a non-host context */</div><div class='add'>+	write_sysreg(0, vtcr_el2);</div><div class='add'>+	write_sysreg(0, vttbr_el2);</div><div class='add'>+	sysreg_clear_set(hcr_el2, HCR_EL2_TGE | HCR_EL2_VM, 0);</div><div class='add'>+	isb();</div><div class='add'>+</div><div class='add'>+	test_at_insn(S1E1R, expect_fault);</div><div class='add'>+	test_at_insn(S1E1W, expect_fault);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_code(void)</div><div class='add'>+{</div><div class='add'>+	sysreg_clear_set(tcr_el1, TCR_HA, 0);</div><div class='add'>+	isb();</div><div class='add'>+</div><div class='add'>+	test_at(true);</div><div class='add'>+</div><div class='add'>+	if (!SYS_FIELD_GET(ID_AA64MMFR1_EL1, HAFDBS, read_sysreg(id_aa64mmfr1_el1)))</div><div class='add'>+		GUEST_DONE();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * KVM's software PTW makes the implementation choice that the AT</div><div class='add'>+	 * instruction sets the access flag.</div><div class='add'>+	 */</div><div class='add'>+	sysreg_clear_set(tcr_el1, 0, TCR_HA);</div><div class='add'>+	isb();</div><div class='add'>+	test_at(false);</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_sync(struct kvm_vcpu *vcpu, struct ucall *uc)</div><div class='add'>+{</div><div class='add'>+	switch (uc-&gt;args[1]) {</div><div class='add'>+	case CLEAR_ACCESS_FLAG:</div><div class='add'>+		/*</div><div class='add'>+		 * Delete + reinstall the memslot to invalidate stage-2</div><div class='add'>+		 * mappings of the stage-1 page tables, forcing KVM to</div><div class='add'>+		 * use the 'slow' AT emulation path.</div><div class='add'>+		 *</div><div class='add'>+		 * This and clearing the access flag from host userspace</div><div class='add'>+		 * ensures that the access flag cannot be set speculatively</div><div class='add'>+		 * and is reliably cleared at the time of the AT instruction.</div><div class='add'>+		 */</div><div class='add'>+		clear_bit(__ffs(PTE_AF), ptep_hva);</div><div class='add'>+		vm_mem_region_reload(vcpu-&gt;vm, vcpu-&gt;vm-&gt;memslots[MEM_REGION_PT]);</div><div class='add'>+		break;</div><div class='add'>+	case TEST_ACCESS_FLAG:</div><div class='add'>+		TEST_ASSERT(test_bit(__ffs(PTE_AF), ptep_hva),</div><div class='add'>+			    "Expected access flag to be set (desc: %lu)", *ptep_hva);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		TEST_FAIL("Unexpected SYNC arg: %lu", uc-&gt;args[1]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void run_test(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct ucall uc;</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		vcpu_run(vcpu);</div><div class='add'>+		switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+		case UCALL_DONE:</div><div class='add'>+			return;</div><div class='add'>+		case UCALL_SYNC:</div><div class='add'>+			handle_sync(vcpu, &amp;uc);</div><div class='add'>+			continue;</div><div class='add'>+		case UCALL_ABORT:</div><div class='add'>+			REPORT_GUEST_ASSERT(uc);</div><div class='add'>+			return;</div><div class='add'>+		default:</div><div class='add'>+			TEST_FAIL("Unexpected ucall: %lu", uc.cmd);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu_init init;</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(kvm_check_cap(KVM_CAP_ARM_EL2));</div><div class='add'>+</div><div class='add'>+	vm = vm_create(1);</div><div class='add'>+</div><div class='add'>+	kvm_get_default_vcpu_target(vm, &amp;init);</div><div class='add'>+	init.features[0] |= BIT(KVM_ARM_VCPU_HAS_EL2);</div><div class='add'>+	vcpu = aarch64_vcpu_add(vm, 0, &amp;init, guest_code);</div><div class='add'>+	kvm_arch_vm_finalize_vcpus(vm);</div><div class='add'>+</div><div class='add'>+	virt_map(vm, TEST_ADDR, TEST_ADDR, 1);</div><div class='add'>+	ptep_hva = virt_get_pte_hva_at_level(vm, TEST_ADDR, 3);</div><div class='add'>+	run_test(vcpu);</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/debug-exceptions.c b/tools/testing/selftests/kvm/arm64/debug-exceptions.c<br/>index c7fb55c9135b..1d431de8729c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/debug-exceptions.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/debug-exceptions.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/debug-exceptions.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/debug-exceptions.c</a></div><div class='hunk'>@@ -116,12 +116,12 @@ static void reset_debug_state(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Reset all bcr/bvr/wcr/wvr registers */</div><div class='ctx'> 	dfr0 = read_sysreg(id_aa64dfr0_el1);</div><div class='del'>-	brps = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_BRPs), dfr0);</div><div class='add'>+	brps = FIELD_GET(ID_AA64DFR0_EL1_BRPs, dfr0);</div><div class='ctx'> 	for (i = 0; i &lt;= brps; i++) {</div><div class='ctx'> 		write_dbgbcr(i, 0);</div><div class='ctx'> 		write_dbgbvr(i, 0);</div><div class='ctx'> 	}</div><div class='del'>-	wrps = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_WRPs), dfr0);</div><div class='add'>+	wrps = FIELD_GET(ID_AA64DFR0_EL1_WRPs, dfr0);</div><div class='ctx'> 	for (i = 0; i &lt;= wrps; i++) {</div><div class='ctx'> 		write_dbgwcr(i, 0);</div><div class='ctx'> 		write_dbgwvr(i, 0);</div><div class='hunk'>@@ -140,7 +140,7 @@ static void enable_os_lock(void)</div><div class='ctx'> </div><div class='ctx'> static void enable_monitor_debug_exceptions(void)</div><div class='ctx'> {</div><div class='del'>-	uint32_t mdscr;</div><div class='add'>+	uint64_t mdscr;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile("msr daifclr, #8");</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +223,7 @@ void install_hw_bp_ctx(uint8_t addr_bp, uint8_t ctx_bp, uint64_t addr,</div><div class='ctx'> </div><div class='ctx'> static void install_ss(void)</div><div class='ctx'> {</div><div class='del'>-	uint32_t mdscr;</div><div class='add'>+	uint64_t mdscr;</div><div class='ctx'> </div><div class='ctx'> 	asm volatile("msr daifclr, #8");</div><div class='ctx'> </div><div class='hunk'>@@ -418,7 +418,7 @@ static void guest_code_ss(int test_cnt)</div><div class='ctx'> </div><div class='ctx'> static int debug_version(uint64_t id_aa64dfr0)</div><div class='ctx'> {</div><div class='del'>-	return FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_DebugVer), id_aa64dfr0);</div><div class='add'>+	return FIELD_GET(ID_AA64DFR0_EL1_DebugVer, id_aa64dfr0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void test_guest_debug_exceptions(uint8_t bpn, uint8_t wpn, uint8_t ctx_bpn)</div><div class='hunk'>@@ -539,14 +539,14 @@ void test_guest_debug_exceptions_all(uint64_t aa64dfr0)</div><div class='ctx'> 	int b, w, c;</div><div class='ctx'> </div><div class='ctx'> 	/* Number of breakpoints */</div><div class='del'>-	brp_num = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_BRPs), aa64dfr0) + 1;</div><div class='add'>+	brp_num = FIELD_GET(ID_AA64DFR0_EL1_BRPs, aa64dfr0) + 1;</div><div class='ctx'> 	__TEST_REQUIRE(brp_num &gt;= 2, "At least two breakpoints are required");</div><div class='ctx'> </div><div class='ctx'> 	/* Number of watchpoints */</div><div class='del'>-	wrp_num = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_WRPs), aa64dfr0) + 1;</div><div class='add'>+	wrp_num = FIELD_GET(ID_AA64DFR0_EL1_WRPs, aa64dfr0) + 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Number of context aware breakpoints */</div><div class='del'>-	ctx_brp_num = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_CTX_CMPs), aa64dfr0) + 1;</div><div class='add'>+	ctx_brp_num = FIELD_GET(ID_AA64DFR0_EL1_CTX_CMPs, aa64dfr0) + 1;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s brp_num:%d, wrp_num:%d, ctx_brp_num:%d\n", __func__,</div><div class='ctx'> 		 brp_num, wrp_num, ctx_brp_num);</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/external_aborts.c b/tools/testing/selftests/kvm/arm64/external_aborts.c<br/>new file mode 100644<br/>index 000000000000..d8fe17a6cc59<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/external_aborts.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/external_aborts.c</a></div><div class='hunk'>@@ -0,0 +1,415 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * external_abort - Tests for userspace external abort injection</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2024 Google LLC</div><div class='add'>+ */</div><div class='add'>+#include "processor.h"</div><div class='add'>+#include "test_util.h"</div><div class='add'>+</div><div class='add'>+#define MMIO_ADDR		0x8000000ULL</div><div class='add'>+#define EXPECTED_SERROR_ISS	(ESR_ELx_ISV | 0x1d1ed)</div><div class='add'>+</div><div class='add'>+static u64 expected_abort_pc;</div><div class='add'>+</div><div class='add'>+static void expect_sea_handler(struct ex_regs *regs)</div><div class='add'>+{</div><div class='add'>+	u64 esr = read_sysreg(esr_el1);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT_EQ(regs-&gt;pc, expected_abort_pc);</div><div class='add'>+	GUEST_ASSERT_EQ(ESR_ELx_EC(esr), ESR_ELx_EC_DABT_CUR);</div><div class='add'>+	GUEST_ASSERT_EQ(esr &amp; ESR_ELx_FSC_TYPE, ESR_ELx_FSC_EXTABT);</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unexpected_dabt_handler(struct ex_regs *regs)</div><div class='add'>+{</div><div class='add'>+	GUEST_FAIL("Unexpected data abort at PC: %lx\n", regs-&gt;pc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kvm_vm *vm_create_with_dabt_handler(struct kvm_vcpu **vcpu, void *guest_code,</div><div class='add'>+						  handler_fn dabt_handler)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vm *vm = vm_create_with_one_vcpu(vcpu, guest_code);</div><div class='add'>+</div><div class='add'>+	vm_init_descriptor_tables(vm);</div><div class='add'>+	vcpu_init_descriptor_tables(*vcpu);</div><div class='add'>+	vm_install_sync_handler(vm, VECTOR_SYNC_CURRENT, ESR_ELx_EC_DABT_CUR, dabt_handler);</div><div class='add'>+</div><div class='add'>+	virt_map(vm, MMIO_ADDR, MMIO_ADDR, 1);</div><div class='add'>+</div><div class='add'>+	return vm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vcpu_inject_sea(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu_events events = {};</div><div class='add'>+</div><div class='add'>+	events.exception.ext_dabt_pending = true;</div><div class='add'>+	vcpu_events_set(vcpu, &amp;events);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool vcpu_has_ras(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	u64 pfr0 = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_ID_AA64PFR0_EL1));</div><div class='add'>+</div><div class='add'>+	return SYS_FIELD_GET(ID_AA64PFR0_EL1, RAS, pfr0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool guest_has_ras(void)</div><div class='add'>+{</div><div class='add'>+	return SYS_FIELD_GET(ID_AA64PFR0_EL1, RAS, read_sysreg(id_aa64pfr0_el1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vcpu_inject_serror(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu_events events = {};</div><div class='add'>+</div><div class='add'>+	events.exception.serror_pending = true;</div><div class='add'>+	if (vcpu_has_ras(vcpu)) {</div><div class='add'>+		events.exception.serror_has_esr = true;</div><div class='add'>+		events.exception.serror_esr = EXPECTED_SERROR_ISS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vcpu_events_set(vcpu, &amp;events);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __vcpu_run_expect(struct kvm_vcpu *vcpu, unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	struct ucall uc;</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+	case UCALL_ABORT:</div><div class='add'>+		REPORT_GUEST_ASSERT(uc);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (uc.cmd == cmd)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		TEST_FAIL("Unexpected ucall: %lu", uc.cmd);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vcpu_run_expect_done(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	__vcpu_run_expect(vcpu, UCALL_DONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vcpu_run_expect_sync(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	__vcpu_run_expect(vcpu, UCALL_SYNC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern char test_mmio_abort_insn;</div><div class='add'>+</div><div class='add'>+static noinline void test_mmio_abort_guest(void)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(expected_abort_pc, (u64)&amp;test_mmio_abort_insn);</div><div class='add'>+</div><div class='add'>+	asm volatile("test_mmio_abort_insn:\n\t"</div><div class='add'>+		     "ldr x0, [%0]\n\t"</div><div class='add'>+		     : : "r" (MMIO_ADDR) : "x0", "memory");</div><div class='add'>+</div><div class='add'>+	GUEST_FAIL("MMIO instruction should not retire");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test that KVM doesn't complete MMIO emulation when userspace has made an</div><div class='add'>+ * external abort pending for the instruction.</div><div class='add'>+ */</div><div class='add'>+static void test_mmio_abort(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_mmio_abort_guest,</div><div class='add'>+							expect_sea_handler);</div><div class='add'>+	struct kvm_run *run = vcpu-&gt;run;</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_MMIO);</div><div class='add'>+	TEST_ASSERT_EQ(run-&gt;mmio.phys_addr, MMIO_ADDR);</div><div class='add'>+	TEST_ASSERT_EQ(run-&gt;mmio.len, sizeof(unsigned long));</div><div class='add'>+	TEST_ASSERT(!run-&gt;mmio.is_write, "Expected MMIO read");</div><div class='add'>+</div><div class='add'>+	vcpu_inject_sea(vcpu);</div><div class='add'>+	vcpu_run_expect_done(vcpu);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern char test_mmio_nisv_insn;</div><div class='add'>+</div><div class='add'>+static void test_mmio_nisv_guest(void)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(expected_abort_pc, (u64)&amp;test_mmio_nisv_insn);</div><div class='add'>+</div><div class='add'>+	asm volatile("test_mmio_nisv_insn:\n\t"</div><div class='add'>+		     "ldr x0, [%0], #8\n\t"</div><div class='add'>+		     : : "r" (MMIO_ADDR) : "x0", "memory");</div><div class='add'>+</div><div class='add'>+	GUEST_FAIL("MMIO instruction should not retire");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test that the KVM_RUN ioctl fails for ESR_EL2.ISV=0 MMIO aborts if userspace</div><div class='add'>+ * hasn't enabled KVM_CAP_ARM_NISV_TO_USER.</div><div class='add'>+ */</div><div class='add'>+static void test_mmio_nisv(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_mmio_nisv_guest,</div><div class='add'>+							unexpected_dabt_handler);</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(_vcpu_run(vcpu), "Expected nonzero return code from KVM_RUN");</div><div class='add'>+	TEST_ASSERT_EQ(errno, ENOSYS);</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test that ESR_EL2.ISV=0 MMIO aborts reach userspace and that an injected SEA</div><div class='add'>+ * reaches the guest.</div><div class='add'>+ */</div><div class='add'>+static void test_mmio_nisv_abort(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_mmio_nisv_guest,</div><div class='add'>+							expect_sea_handler);</div><div class='add'>+	struct kvm_run *run = vcpu-&gt;run;</div><div class='add'>+</div><div class='add'>+	vm_enable_cap(vm, KVM_CAP_ARM_NISV_TO_USER, 1);</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_ARM_NISV);</div><div class='add'>+	TEST_ASSERT_EQ(run-&gt;arm_nisv.fault_ipa, MMIO_ADDR);</div><div class='add'>+</div><div class='add'>+	vcpu_inject_sea(vcpu);</div><div class='add'>+	vcpu_run_expect_done(vcpu);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unexpected_serror_handler(struct ex_regs *regs)</div><div class='add'>+{</div><div class='add'>+	GUEST_FAIL("Took unexpected SError exception");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_serror_masked_guest(void)</div><div class='add'>+{</div><div class='add'>+	GUEST_ASSERT(read_sysreg(isr_el1) &amp; ISR_EL1_A);</div><div class='add'>+</div><div class='add'>+	isb();</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_serror_masked(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_serror_masked_guest,</div><div class='add'>+							unexpected_dabt_handler);</div><div class='add'>+</div><div class='add'>+	vm_install_exception_handler(vm, VECTOR_ERROR_CURRENT, unexpected_serror_handler);</div><div class='add'>+</div><div class='add'>+	vcpu_inject_serror(vcpu);</div><div class='add'>+	vcpu_run_expect_done(vcpu);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void expect_serror_handler(struct ex_regs *regs)</div><div class='add'>+{</div><div class='add'>+	u64 esr = read_sysreg(esr_el1);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT_EQ(ESR_ELx_EC(esr), ESR_ELx_EC_SERROR);</div><div class='add'>+	if (guest_has_ras())</div><div class='add'>+		GUEST_ASSERT_EQ(ESR_ELx_ISS(esr), EXPECTED_SERROR_ISS);</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_serror_guest(void)</div><div class='add'>+{</div><div class='add'>+	GUEST_ASSERT(read_sysreg(isr_el1) &amp; ISR_EL1_A);</div><div class='add'>+</div><div class='add'>+	local_serror_enable();</div><div class='add'>+	isb();</div><div class='add'>+	local_serror_disable();</div><div class='add'>+</div><div class='add'>+	GUEST_FAIL("Should've taken pending SError exception");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_serror(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_serror_guest,</div><div class='add'>+							unexpected_dabt_handler);</div><div class='add'>+</div><div class='add'>+	vm_install_exception_handler(vm, VECTOR_ERROR_CURRENT, expect_serror_handler);</div><div class='add'>+</div><div class='add'>+	vcpu_inject_serror(vcpu);</div><div class='add'>+	vcpu_run_expect_done(vcpu);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void expect_sea_s1ptw_handler(struct ex_regs *regs)</div><div class='add'>+{</div><div class='add'>+	u64 esr = read_sysreg(esr_el1);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT_EQ(regs-&gt;pc, expected_abort_pc);</div><div class='add'>+	GUEST_ASSERT_EQ(ESR_ELx_EC(esr), ESR_ELx_EC_DABT_CUR);</div><div class='add'>+	GUEST_ASSERT_EQ((esr &amp; ESR_ELx_FSC), ESR_ELx_FSC_SEA_TTW(3));</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static noinline void test_s1ptw_abort_guest(void)</div><div class='add'>+{</div><div class='add'>+	extern char test_s1ptw_abort_insn;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(expected_abort_pc, (u64)&amp;test_s1ptw_abort_insn);</div><div class='add'>+</div><div class='add'>+	asm volatile("test_s1ptw_abort_insn:\n\t"</div><div class='add'>+		     "ldr x0, [%0]\n\t"</div><div class='add'>+		     : : "r" (MMIO_ADDR) : "x0", "memory");</div><div class='add'>+</div><div class='add'>+	GUEST_FAIL("Load on S1PTW abort should not retire");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_s1ptw_abort(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	u64 *ptep, bad_pa;</div><div class='add'>+	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_s1ptw_abort_guest,</div><div class='add'>+							expect_sea_s1ptw_handler);</div><div class='add'>+</div><div class='add'>+	ptep = virt_get_pte_hva_at_level(vm, MMIO_ADDR, 2);</div><div class='add'>+	bad_pa = BIT(vm-&gt;pa_bits) - vm-&gt;page_size;</div><div class='add'>+</div><div class='add'>+	*ptep &amp;= ~GENMASK(47, 12);</div><div class='add'>+	*ptep |= bad_pa;</div><div class='add'>+</div><div class='add'>+	vcpu_run_expect_done(vcpu);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_serror_emulated_guest(void)</div><div class='add'>+{</div><div class='add'>+	GUEST_ASSERT(!(read_sysreg(isr_el1) &amp; ISR_EL1_A));</div><div class='add'>+</div><div class='add'>+	local_serror_enable();</div><div class='add'>+	GUEST_SYNC(0);</div><div class='add'>+	local_serror_disable();</div><div class='add'>+</div><div class='add'>+	GUEST_FAIL("Should've taken unmasked SError exception");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_serror_emulated(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_serror_emulated_guest,</div><div class='add'>+							unexpected_dabt_handler);</div><div class='add'>+</div><div class='add'>+	vm_install_exception_handler(vm, VECTOR_ERROR_CURRENT, expect_serror_handler);</div><div class='add'>+</div><div class='add'>+	vcpu_run_expect_sync(vcpu);</div><div class='add'>+	vcpu_inject_serror(vcpu);</div><div class='add'>+	vcpu_run_expect_done(vcpu);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_mmio_ease_guest(void)</div><div class='add'>+{</div><div class='add'>+	sysreg_clear_set_s(SYS_SCTLR2_EL1, 0, SCTLR2_EL1_EASE);</div><div class='add'>+	isb();</div><div class='add'>+</div><div class='add'>+	test_mmio_abort_guest();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test that KVM doesn't complete MMIO emulation when userspace has made an</div><div class='add'>+ * external abort pending for the instruction.</div><div class='add'>+ */</div><div class='add'>+static void test_mmio_ease(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_mmio_ease_guest,</div><div class='add'>+							unexpected_dabt_handler);</div><div class='add'>+	struct kvm_run *run = vcpu-&gt;run;</div><div class='add'>+	u64 pfr1;</div><div class='add'>+</div><div class='add'>+	pfr1 = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_ID_AA64PFR1_EL1));</div><div class='add'>+	if (!SYS_FIELD_GET(ID_AA64PFR1_EL1, DF2, pfr1)) {</div><div class='add'>+		pr_debug("Skipping %s\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * SCTLR2_ELx.EASE changes the exception vector to the SError vector but</div><div class='add'>+	 * doesn't further modify the exception context (e.g. ESR_ELx, FAR_ELx).</div><div class='add'>+	 */</div><div class='add'>+	vm_install_exception_handler(vm, VECTOR_ERROR_CURRENT, expect_sea_handler);</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_MMIO);</div><div class='add'>+	TEST_ASSERT_EQ(run-&gt;mmio.phys_addr, MMIO_ADDR);</div><div class='add'>+	TEST_ASSERT_EQ(run-&gt;mmio.len, sizeof(unsigned long));</div><div class='add'>+	TEST_ASSERT(!run-&gt;mmio.is_write, "Expected MMIO read");</div><div class='add'>+</div><div class='add'>+	vcpu_inject_sea(vcpu);</div><div class='add'>+	vcpu_run_expect_done(vcpu);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_serror_amo_guest(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The ISB is entirely unnecessary (and highlights how FEAT_NV2 is borked)</div><div class='add'>+	 * since the write is redirected to memory. But don't write (intentionally)</div><div class='add'>+	 * broken code!</div><div class='add'>+	 */</div><div class='add'>+	sysreg_clear_set(hcr_el2, HCR_EL2_AMO | HCR_EL2_TGE, 0);</div><div class='add'>+	isb();</div><div class='add'>+</div><div class='add'>+	GUEST_SYNC(0);</div><div class='add'>+	GUEST_ASSERT(read_sysreg(isr_el1) &amp; ISR_EL1_A);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * KVM treats the effective value of AMO as 1 when</div><div class='add'>+	 * HCR_EL2.{E2H,TGE} = {1, 0}, meaning the SError will be taken when</div><div class='add'>+	 * unmasked.</div><div class='add'>+	 */</div><div class='add'>+	local_serror_enable();</div><div class='add'>+	isb();</div><div class='add'>+	local_serror_disable();</div><div class='add'>+</div><div class='add'>+	GUEST_FAIL("Should've taken pending SError exception");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_serror_amo(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_serror_amo_guest,</div><div class='add'>+							unexpected_dabt_handler);</div><div class='add'>+</div><div class='add'>+	vm_install_exception_handler(vm, VECTOR_ERROR_CURRENT, expect_serror_handler);</div><div class='add'>+	vcpu_run_expect_sync(vcpu);</div><div class='add'>+	vcpu_inject_serror(vcpu);</div><div class='add'>+	vcpu_run_expect_done(vcpu);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(void)</div><div class='add'>+{</div><div class='add'>+	test_mmio_abort();</div><div class='add'>+	test_mmio_nisv();</div><div class='add'>+	test_mmio_nisv_abort();</div><div class='add'>+	test_serror();</div><div class='add'>+	test_serror_masked();</div><div class='add'>+	test_serror_emulated();</div><div class='add'>+	test_mmio_ease();</div><div class='add'>+	test_s1ptw_abort();</div><div class='add'>+</div><div class='add'>+	if (!test_supports_el2())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	test_serror_amo();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/get-reg-list.c b/tools/testing/selftests/kvm/arm64/get-reg-list.c<br/>index d43fb3f49050..0a3a94c4cca1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/get-reg-list.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/get-reg-list.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/get-reg-list.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/get-reg-list.c</a></div><div class='hunk'>@@ -15,6 +15,12 @@</div><div class='ctx'> #include "test_util.h"</div><div class='ctx'> #include "processor.h"</div><div class='ctx'> </div><div class='add'>+#define SYS_REG(r)	ARM64_SYS_REG(sys_reg_Op0(SYS_ ## r),	\</div><div class='add'>+				      sys_reg_Op1(SYS_ ## r),	\</div><div class='add'>+				      sys_reg_CRn(SYS_ ## r),	\</div><div class='add'>+				      sys_reg_CRm(SYS_ ## r),	\</div><div class='add'>+				      sys_reg_Op2(SYS_ ## r))</div><div class='add'>+</div><div class='ctx'> struct feature_id_reg {</div><div class='ctx'> 	__u64 reg;</div><div class='ctx'> 	__u64 id_reg;</div><div class='hunk'>@@ -22,37 +28,48 @@ struct feature_id_reg {</div><div class='ctx'> 	__u64 feat_min;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct feature_id_reg feat_id_regs[] = {</div><div class='del'>-	{</div><div class='del'>-		ARM64_SYS_REG(3, 0, 2, 0, 3),	/* TCR2_EL1 */</div><div class='del'>-		ARM64_SYS_REG(3, 0, 0, 7, 3),	/* ID_AA64MMFR3_EL1 */</div><div class='del'>-		0,</div><div class='del'>-		1</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		ARM64_SYS_REG(3, 0, 10, 2, 2),	/* PIRE0_EL1 */</div><div class='del'>-		ARM64_SYS_REG(3, 0, 0, 7, 3),	/* ID_AA64MMFR3_EL1 */</div><div class='del'>-		8,</div><div class='del'>-		1</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		ARM64_SYS_REG(3, 0, 10, 2, 3),	/* PIR_EL1 */</div><div class='del'>-		ARM64_SYS_REG(3, 0, 0, 7, 3),	/* ID_AA64MMFR3_EL1 */</div><div class='del'>-		8,</div><div class='del'>-		1</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		ARM64_SYS_REG(3, 0, 10, 2, 4),	/* POR_EL1 */</div><div class='del'>-		ARM64_SYS_REG(3, 0, 0, 7, 3),	/* ID_AA64MMFR3_EL1 */</div><div class='del'>-		16,</div><div class='del'>-		1</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		ARM64_SYS_REG(3, 3, 10, 2, 4),	/* POR_EL0 */</div><div class='del'>-		ARM64_SYS_REG(3, 0, 0, 7, 3),	/* ID_AA64MMFR3_EL1 */</div><div class='del'>-		16,</div><div class='del'>-		1</div><div class='add'>+#define FEAT(id, f, v)					\</div><div class='add'>+	.id_reg		= SYS_REG(id),			\</div><div class='add'>+	.feat_shift	= id ## _ ## f ## _SHIFT,	\</div><div class='add'>+	.feat_min	= id ## _ ## f ## _ ## v</div><div class='add'>+</div><div class='add'>+#define REG_FEAT(r, id, f, v)			\</div><div class='add'>+	{					\</div><div class='add'>+		.reg = SYS_REG(r),		\</div><div class='add'>+		FEAT(id, f, v)			\</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+static struct feature_id_reg feat_id_regs[] = {</div><div class='add'>+	REG_FEAT(TCR2_EL1,	ID_AA64MMFR3_EL1, TCRX, IMP),</div><div class='add'>+	REG_FEAT(TCR2_EL2,	ID_AA64MMFR3_EL1, TCRX, IMP),</div><div class='add'>+	REG_FEAT(PIRE0_EL1,	ID_AA64MMFR3_EL1, S1PIE, IMP),</div><div class='add'>+	REG_FEAT(PIRE0_EL2,	ID_AA64MMFR3_EL1, S1PIE, IMP),</div><div class='add'>+	REG_FEAT(PIR_EL1,	ID_AA64MMFR3_EL1, S1PIE, IMP),</div><div class='add'>+	REG_FEAT(PIR_EL2,	ID_AA64MMFR3_EL1, S1PIE, IMP),</div><div class='add'>+	REG_FEAT(POR_EL1,	ID_AA64MMFR3_EL1, S1POE, IMP),</div><div class='add'>+	REG_FEAT(POR_EL0,	ID_AA64MMFR3_EL1, S1POE, IMP),</div><div class='add'>+	REG_FEAT(POR_EL2,	ID_AA64MMFR3_EL1, S1POE, IMP),</div><div class='add'>+	REG_FEAT(HCRX_EL2,	ID_AA64MMFR1_EL1, HCX, IMP),</div><div class='add'>+	REG_FEAT(HFGRTR_EL2,	ID_AA64MMFR0_EL1, FGT, IMP),</div><div class='add'>+	REG_FEAT(HFGWTR_EL2,	ID_AA64MMFR0_EL1, FGT, IMP),</div><div class='add'>+	REG_FEAT(HFGITR_EL2,	ID_AA64MMFR0_EL1, FGT, IMP),</div><div class='add'>+	REG_FEAT(HDFGRTR_EL2,	ID_AA64MMFR0_EL1, FGT, IMP),</div><div class='add'>+	REG_FEAT(HDFGWTR_EL2,	ID_AA64MMFR0_EL1, FGT, IMP),</div><div class='add'>+	REG_FEAT(HAFGRTR_EL2,	ID_AA64MMFR0_EL1, FGT, IMP),</div><div class='add'>+	REG_FEAT(HFGRTR2_EL2,	ID_AA64MMFR0_EL1, FGT, FGT2),</div><div class='add'>+	REG_FEAT(HFGWTR2_EL2,	ID_AA64MMFR0_EL1, FGT, FGT2),</div><div class='add'>+	REG_FEAT(HFGITR2_EL2,	ID_AA64MMFR0_EL1, FGT, FGT2),</div><div class='add'>+	REG_FEAT(HDFGRTR2_EL2,	ID_AA64MMFR0_EL1, FGT, FGT2),</div><div class='add'>+	REG_FEAT(HDFGWTR2_EL2,	ID_AA64MMFR0_EL1, FGT, FGT2),</div><div class='add'>+	REG_FEAT(ZCR_EL2,	ID_AA64PFR0_EL1, SVE, IMP),</div><div class='add'>+	REG_FEAT(SCTLR2_EL1,	ID_AA64MMFR3_EL1, SCTLRX, IMP),</div><div class='add'>+	REG_FEAT(SCTLR2_EL2,	ID_AA64MMFR3_EL1, SCTLRX, IMP),</div><div class='add'>+	REG_FEAT(VDISR_EL2,	ID_AA64PFR0_EL1, RAS, IMP),</div><div class='add'>+	REG_FEAT(VSESR_EL2,	ID_AA64PFR0_EL1, RAS, IMP),</div><div class='add'>+	REG_FEAT(VNCR_EL2,	ID_AA64MMFR4_EL1, NV_frac, NV2_ONLY),</div><div class='add'>+	REG_FEAT(CNTHV_CTL_EL2, ID_AA64MMFR1_EL1, VH, IMP),</div><div class='add'>+	REG_FEAT(CNTHV_CVAL_EL2,ID_AA64MMFR1_EL1, VH, IMP),</div><div class='add'>+	REG_FEAT(ZCR_EL2,	ID_AA64PFR0_EL1, SVE, IMP),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> bool filter_reg(__u64 reg)</div><div class='hunk'>@@ -332,9 +349,21 @@ static __u64 base_regs[] = {</div><div class='ctx'> 	KVM_REG_ARM_FW_FEAT_BMAP_REG(0),	/* KVM_REG_ARM_STD_BMAP */</div><div class='ctx'> 	KVM_REG_ARM_FW_FEAT_BMAP_REG(1),	/* KVM_REG_ARM_STD_HYP_BMAP */</div><div class='ctx'> 	KVM_REG_ARM_FW_FEAT_BMAP_REG(2),	/* KVM_REG_ARM_VENDOR_HYP_BMAP */</div><div class='del'>-	ARM64_SYS_REG(3, 3, 14, 3, 1),	/* CNTV_CTL_EL0 */</div><div class='del'>-	ARM64_SYS_REG(3, 3, 14, 3, 2),	/* CNTV_CVAL_EL0 */</div><div class='del'>-	ARM64_SYS_REG(3, 3, 14, 0, 2),</div><div class='add'>+	KVM_REG_ARM_FW_FEAT_BMAP_REG(3),	/* KVM_REG_ARM_VENDOR_HYP_BMAP_2 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * EL0 Virtual Timer Registers</div><div class='add'>+	 *</div><div class='add'>+	 * WARNING:</div><div class='add'>+	 * KVM_REG_ARM_TIMER_CVAL and KVM_REG_ARM_TIMER_CNT are not defined</div><div class='add'>+	 * with the appropriate register encodings.  Their values have been</div><div class='add'>+	 * accidentally swapped.  As this is set API, the definitions here</div><div class='add'>+	 * must be used, rather than ones derived from the encodings.</div><div class='add'>+	 */</div><div class='add'>+	KVM_ARM64_SYS_REG(SYS_CNTV_CTL_EL0),</div><div class='add'>+	KVM_REG_ARM_TIMER_CVAL,</div><div class='add'>+	KVM_REG_ARM_TIMER_CNT,</div><div class='add'>+</div><div class='ctx'> 	ARM64_SYS_REG(3, 0, 0, 0, 0),	/* MIDR_EL1 */</div><div class='ctx'> 	ARM64_SYS_REG(3, 0, 0, 0, 6),	/* REVIDR_EL1 */</div><div class='ctx'> 	ARM64_SYS_REG(3, 1, 0, 0, 1),	/* CLIDR_EL1 */</div><div class='hunk'>@@ -468,6 +497,7 @@ static __u64 base_regs[] = {</div><div class='ctx'> 	ARM64_SYS_REG(3, 0, 1, 0, 0),	/* SCTLR_EL1 */</div><div class='ctx'> 	ARM64_SYS_REG(3, 0, 1, 0, 1),	/* ACTLR_EL1 */</div><div class='ctx'> 	ARM64_SYS_REG(3, 0, 1, 0, 2),	/* CPACR_EL1 */</div><div class='add'>+	KVM_ARM64_SYS_REG(SYS_SCTLR2_EL1),</div><div class='ctx'> 	ARM64_SYS_REG(3, 0, 2, 0, 0),	/* TTBR0_EL1 */</div><div class='ctx'> 	ARM64_SYS_REG(3, 0, 2, 0, 1),	/* TTBR1_EL1 */</div><div class='ctx'> 	ARM64_SYS_REG(3, 0, 2, 0, 2),	/* TCR_EL1 */</div><div class='hunk'>@@ -685,6 +715,67 @@ static __u64 pauth_generic_regs[] = {</div><div class='ctx'> 	ARM64_SYS_REG(3, 0, 2, 3, 1),	/* APGAKEYHI_EL1 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static __u64 el2_regs[] = {</div><div class='add'>+	SYS_REG(VPIDR_EL2),</div><div class='add'>+	SYS_REG(VMPIDR_EL2),</div><div class='add'>+	SYS_REG(SCTLR_EL2),</div><div class='add'>+	SYS_REG(ACTLR_EL2),</div><div class='add'>+	SYS_REG(SCTLR2_EL2),</div><div class='add'>+	SYS_REG(HCR_EL2),</div><div class='add'>+	SYS_REG(MDCR_EL2),</div><div class='add'>+	SYS_REG(CPTR_EL2),</div><div class='add'>+	SYS_REG(HSTR_EL2),</div><div class='add'>+	SYS_REG(HFGRTR_EL2),</div><div class='add'>+	SYS_REG(HFGWTR_EL2),</div><div class='add'>+	SYS_REG(HFGITR_EL2),</div><div class='add'>+	SYS_REG(HACR_EL2),</div><div class='add'>+	SYS_REG(ZCR_EL2),</div><div class='add'>+	SYS_REG(HCRX_EL2),</div><div class='add'>+	SYS_REG(TTBR0_EL2),</div><div class='add'>+	SYS_REG(TTBR1_EL2),</div><div class='add'>+	SYS_REG(TCR_EL2),</div><div class='add'>+	SYS_REG(TCR2_EL2),</div><div class='add'>+	SYS_REG(VTTBR_EL2),</div><div class='add'>+	SYS_REG(VTCR_EL2),</div><div class='add'>+	SYS_REG(VNCR_EL2),</div><div class='add'>+	SYS_REG(HDFGRTR2_EL2),</div><div class='add'>+	SYS_REG(HDFGWTR2_EL2),</div><div class='add'>+	SYS_REG(HFGRTR2_EL2),</div><div class='add'>+	SYS_REG(HFGWTR2_EL2),</div><div class='add'>+	SYS_REG(HDFGRTR_EL2),</div><div class='add'>+	SYS_REG(HDFGWTR_EL2),</div><div class='add'>+	SYS_REG(HAFGRTR_EL2),</div><div class='add'>+	SYS_REG(HFGITR2_EL2),</div><div class='add'>+	SYS_REG(SPSR_EL2),</div><div class='add'>+	SYS_REG(ELR_EL2),</div><div class='add'>+	SYS_REG(AFSR0_EL2),</div><div class='add'>+	SYS_REG(AFSR1_EL2),</div><div class='add'>+	SYS_REG(ESR_EL2),</div><div class='add'>+	SYS_REG(FAR_EL2),</div><div class='add'>+	SYS_REG(HPFAR_EL2),</div><div class='add'>+	SYS_REG(MAIR_EL2),</div><div class='add'>+	SYS_REG(PIRE0_EL2),</div><div class='add'>+	SYS_REG(PIR_EL2),</div><div class='add'>+	SYS_REG(POR_EL2),</div><div class='add'>+	SYS_REG(AMAIR_EL2),</div><div class='add'>+	SYS_REG(VBAR_EL2),</div><div class='add'>+	SYS_REG(CONTEXTIDR_EL2),</div><div class='add'>+	SYS_REG(TPIDR_EL2),</div><div class='add'>+	SYS_REG(CNTVOFF_EL2),</div><div class='add'>+	SYS_REG(CNTHCTL_EL2),</div><div class='add'>+	SYS_REG(CNTHP_CTL_EL2),</div><div class='add'>+	SYS_REG(CNTHP_CVAL_EL2),</div><div class='add'>+	SYS_REG(CNTHV_CTL_EL2),</div><div class='add'>+	SYS_REG(CNTHV_CVAL_EL2),</div><div class='add'>+	SYS_REG(SP_EL2),</div><div class='add'>+	SYS_REG(VDISR_EL2),</div><div class='add'>+	SYS_REG(VSESR_EL2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __u64 el2_e2h0_regs[] = {</div><div class='add'>+	/* Empty */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define BASE_SUBLIST \</div><div class='ctx'> 	{ "base", .regs = base_regs, .regs_n = ARRAY_SIZE(base_regs), }</div><div class='ctx'> #define VREGS_SUBLIST \</div><div class='hunk'>@@ -711,6 +802,23 @@ static __u64 pauth_generic_regs[] = {</div><div class='ctx'> 		.regs		= pauth_generic_regs,			\</div><div class='ctx'> 		.regs_n		= ARRAY_SIZE(pauth_generic_regs),	\</div><div class='ctx'> 	}</div><div class='add'>+#define EL2_SUBLIST						\</div><div class='add'>+	{							\</div><div class='add'>+		.name 		= "EL2",			\</div><div class='add'>+		.capability	= KVM_CAP_ARM_EL2,		\</div><div class='add'>+		.feature	= KVM_ARM_VCPU_HAS_EL2,		\</div><div class='add'>+		.regs		= el2_regs,			\</div><div class='add'>+		.regs_n		= ARRAY_SIZE(el2_regs),		\</div><div class='add'>+	}</div><div class='add'>+#define EL2_E2H0_SUBLIST					\</div><div class='add'>+	EL2_SUBLIST,						\</div><div class='add'>+	{							\</div><div class='add'>+		.name 		= "EL2 E2H0",			\</div><div class='add'>+		.capability	= KVM_CAP_ARM_EL2_E2H0,		\</div><div class='add'>+		.feature	= KVM_ARM_VCPU_HAS_EL2_E2H0,	\</div><div class='add'>+		.regs		= el2_e2h0_regs,		\</div><div class='add'>+		.regs_n		= ARRAY_SIZE(el2_e2h0_regs),	\</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> static struct vcpu_reg_list vregs_config = {</div><div class='ctx'> 	.sublists = {</div><div class='hunk'>@@ -760,6 +868,124 @@ static struct vcpu_reg_list pauth_pmu_config = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct vcpu_reg_list el2_vregs_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_SUBLIST,</div><div class='add'>+	VREGS_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcpu_reg_list el2_vregs_pmu_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_SUBLIST,</div><div class='add'>+	VREGS_SUBLIST,</div><div class='add'>+	PMU_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcpu_reg_list el2_sve_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_SUBLIST,</div><div class='add'>+	SVE_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcpu_reg_list el2_sve_pmu_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_SUBLIST,</div><div class='add'>+	SVE_SUBLIST,</div><div class='add'>+	PMU_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcpu_reg_list el2_pauth_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_SUBLIST,</div><div class='add'>+	VREGS_SUBLIST,</div><div class='add'>+	PAUTH_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcpu_reg_list el2_pauth_pmu_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_SUBLIST,</div><div class='add'>+	VREGS_SUBLIST,</div><div class='add'>+	PAUTH_SUBLIST,</div><div class='add'>+	PMU_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcpu_reg_list el2_e2h0_vregs_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_E2H0_SUBLIST,</div><div class='add'>+	VREGS_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcpu_reg_list el2_e2h0_vregs_pmu_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_E2H0_SUBLIST,</div><div class='add'>+	VREGS_SUBLIST,</div><div class='add'>+	PMU_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcpu_reg_list el2_e2h0_sve_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_E2H0_SUBLIST,</div><div class='add'>+	SVE_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcpu_reg_list el2_e2h0_sve_pmu_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_E2H0_SUBLIST,</div><div class='add'>+	SVE_SUBLIST,</div><div class='add'>+	PMU_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcpu_reg_list el2_e2h0_pauth_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_E2H0_SUBLIST,</div><div class='add'>+	VREGS_SUBLIST,</div><div class='add'>+	PAUTH_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcpu_reg_list el2_e2h0_pauth_pmu_config = {</div><div class='add'>+	.sublists = {</div><div class='add'>+	BASE_SUBLIST,</div><div class='add'>+	EL2_E2H0_SUBLIST,</div><div class='add'>+	VREGS_SUBLIST,</div><div class='add'>+	PAUTH_SUBLIST,</div><div class='add'>+	PMU_SUBLIST,</div><div class='add'>+	{0},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct vcpu_reg_list *vcpu_configs[] = {</div><div class='ctx'> 	&amp;vregs_config,</div><div class='ctx'> 	&amp;vregs_pmu_config,</div><div class='hunk'>@@ -767,5 +993,19 @@ struct vcpu_reg_list *vcpu_configs[] = {</div><div class='ctx'> 	&amp;sve_pmu_config,</div><div class='ctx'> 	&amp;pauth_config,</div><div class='ctx'> 	&amp;pauth_pmu_config,</div><div class='add'>+</div><div class='add'>+	&amp;el2_vregs_config,</div><div class='add'>+	&amp;el2_vregs_pmu_config,</div><div class='add'>+	&amp;el2_sve_config,</div><div class='add'>+	&amp;el2_sve_pmu_config,</div><div class='add'>+	&amp;el2_pauth_config,</div><div class='add'>+	&amp;el2_pauth_pmu_config,</div><div class='add'>+</div><div class='add'>+	&amp;el2_e2h0_vregs_config,</div><div class='add'>+	&amp;el2_e2h0_vregs_pmu_config,</div><div class='add'>+	&amp;el2_e2h0_sve_config,</div><div class='add'>+	&amp;el2_e2h0_sve_pmu_config,</div><div class='add'>+	&amp;el2_e2h0_pauth_config,</div><div class='add'>+	&amp;el2_e2h0_pauth_pmu_config,</div><div class='ctx'> };</div><div class='ctx'> int vcpu_configs_n = ARRAY_SIZE(vcpu_configs);</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/hello_el2.c b/tools/testing/selftests/kvm/arm64/hello_el2.c<br/>new file mode 100644<br/>index 000000000000..bbe6862c6ab1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/hello_el2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/hello_el2.c</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * hello_el2 - Basic KVM selftest for VM running at EL2 with E2H=RES1</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2025 Google LLC</div><div class='add'>+ */</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='add'>+#include "test_util.h"</div><div class='add'>+#include "ucall.h"</div><div class='add'>+</div><div class='add'>+#include &lt;asm/sysreg.h&gt;</div><div class='add'>+</div><div class='add'>+static void guest_code(void)</div><div class='add'>+{</div><div class='add'>+	u64 mmfr0 = read_sysreg_s(SYS_ID_AA64MMFR0_EL1);</div><div class='add'>+	u64 mmfr1 = read_sysreg_s(SYS_ID_AA64MMFR1_EL1);</div><div class='add'>+	u64 mmfr4 = read_sysreg_s(SYS_ID_AA64MMFR4_EL1);</div><div class='add'>+	u8 e2h0 = SYS_FIELD_GET(ID_AA64MMFR4_EL1, E2H0, mmfr4);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT_EQ(get_current_el(), 2);</div><div class='add'>+	GUEST_ASSERT(read_sysreg(hcr_el2) &amp; HCR_EL2_E2H);</div><div class='add'>+	GUEST_ASSERT_EQ(SYS_FIELD_GET(ID_AA64MMFR1_EL1, VH, mmfr1),</div><div class='add'>+			ID_AA64MMFR1_EL1_VH_IMP);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Traps of the complete ID register space are IMPDEF without FEAT_FGT,</div><div class='add'>+	 * which is really annoying to deal with in KVM describing E2H as RES1.</div><div class='add'>+	 *</div><div class='add'>+	 * If the implementation doesn't honor the trap then expect the register</div><div class='add'>+	 * to return all zeros.</div><div class='add'>+	 */</div><div class='add'>+	if (e2h0 == ID_AA64MMFR4_EL1_E2H0_IMP)</div><div class='add'>+		GUEST_ASSERT_EQ(SYS_FIELD_GET(ID_AA64MMFR0_EL1, FGT, mmfr0),</div><div class='add'>+				ID_AA64MMFR0_EL1_FGT_NI);</div><div class='add'>+	else</div><div class='add'>+		GUEST_ASSERT_EQ(e2h0, ID_AA64MMFR4_EL1_E2H0_NI_NV1);</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu_init init;</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	struct ucall uc;</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(kvm_check_cap(KVM_CAP_ARM_EL2));</div><div class='add'>+</div><div class='add'>+	vm = vm_create(1);</div><div class='add'>+</div><div class='add'>+	kvm_get_default_vcpu_target(vm, &amp;init);</div><div class='add'>+	init.features[0] |= BIT(KVM_ARM_VCPU_HAS_EL2);</div><div class='add'>+	vcpu = aarch64_vcpu_add(vm, 0, &amp;init, guest_code);</div><div class='add'>+	kvm_arch_vm_finalize_vcpus(vm);</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+	case UCALL_DONE:</div><div class='add'>+		break;</div><div class='add'>+	case UCALL_ABORT:</div><div class='add'>+		REPORT_GUEST_ASSERT(uc);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		TEST_FAIL("Unhandled ucall: %ld\n", uc.cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/host_sve.c b/tools/testing/selftests/kvm/arm64/host_sve.c<br/>new file mode 100644<br/>index 000000000000..3826772fd470<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/host_sve.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/host_sve.c</a></div><div class='hunk'>@@ -0,0 +1,127 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Host SVE: Check FPSIMD/SVE/SME save/restore over KVM_RUN ioctls.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2025 Arm, Ltd</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#include &lt;sys/auxv.h&gt;</div><div class='add'>+#include &lt;asm/kvm.h&gt;</div><div class='add'>+#include &lt;kvm_util.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ucall_common.h"</div><div class='add'>+</div><div class='add'>+static void guest_code(void)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; 10; i++) {</div><div class='add'>+		GUEST_UCALL_NONE();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void handle_sigill(int sig, siginfo_t *info, void *ctx)</div><div class='add'>+{</div><div class='add'>+	ucontext_t *uctx = ctx;</div><div class='add'>+</div><div class='add'>+	printf("  &lt; host signal %d &gt;\n", sig);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Skip the UDF</div><div class='add'>+	 */</div><div class='add'>+	uctx-&gt;uc_mcontext.pc += 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void register_sigill_handler(void)</div><div class='add'>+{</div><div class='add'>+	struct sigaction sa = {</div><div class='add'>+		.sa_sigaction = handle_sigill,</div><div class='add'>+		.sa_flags = SA_SIGINFO,</div><div class='add'>+	};</div><div class='add'>+	sigaction(SIGILL, &amp;sa, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_sve_roundtrip(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long before, after;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set all bits in a predicate register, force a save/restore via a</div><div class='add'>+	 * SIGILL (which handle_sigill() will recover from), then report</div><div class='add'>+	 * whether the value has changed.</div><div class='add'>+	 */</div><div class='add'>+	asm volatile(</div><div class='add'>+	"	.arch_extension sve\n"</div><div class='add'>+	"	ptrue	p0.B\n"</div><div class='add'>+	"	cntp	%[before], p0, p0.B\n"</div><div class='add'>+	"	udf #0\n"</div><div class='add'>+	"	cntp	%[after], p0, p0.B\n"</div><div class='add'>+	: [before] "=r" (before),</div><div class='add'>+	  [after] "=r" (after)</div><div class='add'>+	:</div><div class='add'>+	: "p0"</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	if (before != after) {</div><div class='add'>+		TEST_FAIL("Signal roundtrip discarded predicate bits (%ld =&gt; %ld)\n",</div><div class='add'>+			  before, after);</div><div class='add'>+	} else {</div><div class='add'>+		printf("Signal roundtrip preserved predicate bits (%ld =&gt; %ld)\n",</div><div class='add'>+		       before, after);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_run(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	struct ucall uc;</div><div class='add'>+	bool guest_done = false;</div><div class='add'>+</div><div class='add'>+	register_sigill_handler();</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code);</div><div class='add'>+</div><div class='add'>+	do_sve_roundtrip();</div><div class='add'>+</div><div class='add'>+	while (!guest_done) {</div><div class='add'>+</div><div class='add'>+		printf("Running VCPU...\n");</div><div class='add'>+		vcpu_run(vcpu);</div><div class='add'>+</div><div class='add'>+		switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+		case UCALL_NONE:</div><div class='add'>+			do_sve_roundtrip();</div><div class='add'>+			do_sve_roundtrip();</div><div class='add'>+			break;</div><div class='add'>+		case UCALL_DONE:</div><div class='add'>+			guest_done = true;</div><div class='add'>+			break;</div><div class='add'>+		case UCALL_ABORT:</div><div class='add'>+			REPORT_GUEST_ASSERT(uc);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			TEST_FAIL("Unexpected guest exit");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * This is testing the host environment, we don't care about</div><div class='add'>+	 * guest SVE support.</div><div class='add'>+	 */</div><div class='add'>+	if (!(getauxval(AT_HWCAP) &amp; HWCAP_SVE)) {</div><div class='add'>+		printf("SVE not supported\n");</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	test_run();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/hypercalls.c b/tools/testing/selftests/kvm/arm64/hypercalls.c<br/>index ec54ec7726e9..bf038a0371f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/hypercalls.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/hypercalls.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/hypercalls.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/hypercalls.c</a></div><div class='hunk'>@@ -21,22 +21,31 @@</div><div class='ctx'> #define KVM_REG_ARM_STD_BMAP_BIT_MAX		0</div><div class='ctx'> #define KVM_REG_ARM_STD_HYP_BMAP_BIT_MAX	0</div><div class='ctx'> #define KVM_REG_ARM_VENDOR_HYP_BMAP_BIT_MAX	1</div><div class='add'>+#define KVM_REG_ARM_VENDOR_HYP_BMAP_2_BIT_MAX   1</div><div class='add'>+</div><div class='add'>+#define KVM_REG_ARM_STD_BMAP_RESET_VAL		FW_REG_ULIMIT_VAL(KVM_REG_ARM_STD_BMAP_BIT_MAX)</div><div class='add'>+#define KVM_REG_ARM_STD_HYP_BMAP_RESET_VAL	FW_REG_ULIMIT_VAL(KVM_REG_ARM_STD_HYP_BMAP_BIT_MAX)</div><div class='add'>+#define KVM_REG_ARM_VENDOR_HYP_BMAP_RESET_VAL	FW_REG_ULIMIT_VAL(KVM_REG_ARM_VENDOR_HYP_BMAP_BIT_MAX)</div><div class='add'>+#define KVM_REG_ARM_VENDOR_HYP_BMAP_2_RESET_VAL 0</div><div class='ctx'> </div><div class='ctx'> struct kvm_fw_reg_info {</div><div class='ctx'> 	uint64_t reg;		/* Register definition */</div><div class='ctx'> 	uint64_t max_feat_bit;	/* Bit that represents the upper limit of the feature-map */</div><div class='add'>+	uint64_t reset_val;	/* Reset value for the register */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define FW_REG_INFO(r)			\</div><div class='ctx'> 	{					\</div><div class='ctx'> 		.reg = r,			\</div><div class='ctx'> 		.max_feat_bit = r##_BIT_MAX,	\</div><div class='add'>+		.reset_val = r##_RESET_VAL	\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> static const struct kvm_fw_reg_info fw_reg_info[] = {</div><div class='ctx'> 	FW_REG_INFO(KVM_REG_ARM_STD_BMAP),</div><div class='ctx'> 	FW_REG_INFO(KVM_REG_ARM_STD_HYP_BMAP),</div><div class='ctx'> 	FW_REG_INFO(KVM_REG_ARM_VENDOR_HYP_BMAP),</div><div class='add'>+	FW_REG_INFO(KVM_REG_ARM_VENDOR_HYP_BMAP_2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum test_stage {</div><div class='hunk'>@@ -99,7 +108,7 @@ static void guest_test_hvc(const struct test_hvc_info *hc_info)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; hvc_info_arr_sz; i++, hc_info++) {</div><div class='ctx'> 		memset(&amp;res, 0, sizeof(res));</div><div class='del'>-		smccc_hvc(hc_info-&gt;func_id, hc_info-&gt;arg1, 0, 0, 0, 0, 0, 0, &amp;res);</div><div class='add'>+		do_smccc(hc_info-&gt;func_id, hc_info-&gt;arg1, 0, 0, 0, 0, 0, 0, &amp;res);</div><div class='ctx'> </div><div class='ctx'> 		switch (stage) {</div><div class='ctx'> 		case TEST_STAGE_HVC_IFACE_FEAT_DISABLED:</div><div class='hunk'>@@ -171,22 +180,39 @@ static void test_fw_regs_before_vm_start(struct kvm_vcpu *vcpu)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(fw_reg_info); i++) {</div><div class='ctx'> 		const struct kvm_fw_reg_info *reg_info = &amp;fw_reg_info[i];</div><div class='add'>+		uint64_t set_val;</div><div class='ctx'> </div><div class='del'>-		/* First 'read' should be an upper limit of the features supported */</div><div class='add'>+		/* First 'read' should be the reset value for the reg  */</div><div class='ctx'> 		val = vcpu_get_reg(vcpu, reg_info-&gt;reg);</div><div class='del'>-		TEST_ASSERT(val == FW_REG_ULIMIT_VAL(reg_info-&gt;max_feat_bit),</div><div class='del'>-			"Expected all the features to be set for reg: 0x%lx; expected: 0x%lx; read: 0x%lx",</div><div class='del'>-			reg_info-&gt;reg, FW_REG_ULIMIT_VAL(reg_info-&gt;max_feat_bit), val);</div><div class='add'>+		TEST_ASSERT(val == reg_info-&gt;reset_val,</div><div class='add'>+			"Unexpected reset value for reg: 0x%lx; expected: 0x%lx; read: 0x%lx",</div><div class='add'>+			reg_info-&gt;reg, reg_info-&gt;reset_val, val);</div><div class='add'>+</div><div class='add'>+		if (reg_info-&gt;reset_val)</div><div class='add'>+			set_val = 0;</div><div class='add'>+		else</div><div class='add'>+			set_val = FW_REG_ULIMIT_VAL(reg_info-&gt;max_feat_bit);</div><div class='ctx'> </div><div class='del'>-		/* Test a 'write' by disabling all the features of the register map */</div><div class='del'>-		ret = __vcpu_set_reg(vcpu, reg_info-&gt;reg, 0);</div><div class='add'>+		ret = __vcpu_set_reg(vcpu, reg_info-&gt;reg, set_val);</div><div class='ctx'> 		TEST_ASSERT(ret == 0,</div><div class='del'>-			"Failed to clear all the features of reg: 0x%lx; ret: %d",</div><div class='del'>-			reg_info-&gt;reg, errno);</div><div class='add'>+			"Failed to %s all the features of reg: 0x%lx; ret: %d",</div><div class='add'>+			(set_val ? "set" : "clear"), reg_info-&gt;reg, errno);</div><div class='ctx'> </div><div class='ctx'> 		val = vcpu_get_reg(vcpu, reg_info-&gt;reg);</div><div class='del'>-		TEST_ASSERT(val == 0,</div><div class='del'>-			"Expected all the features to be cleared for reg: 0x%lx", reg_info-&gt;reg);</div><div class='add'>+		TEST_ASSERT(val == set_val,</div><div class='add'>+			"Expected all the features to be %s for reg: 0x%lx",</div><div class='add'>+			(set_val ? "set" : "cleared"), reg_info-&gt;reg);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the reg has been set, clear it as test_fw_regs_after_vm_start()</div><div class='add'>+		 * expects it to be cleared.</div><div class='add'>+		 */</div><div class='add'>+		if (set_val) {</div><div class='add'>+			ret = __vcpu_set_reg(vcpu, reg_info-&gt;reg, 0);</div><div class='add'>+			TEST_ASSERT(ret == 0,</div><div class='add'>+			"Failed to clear all the features of reg: 0x%lx; ret: %d",</div><div class='add'>+			reg_info-&gt;reg, errno);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Test enabling a feature that's not supported.</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/kvm-uuid.c b/tools/testing/selftests/kvm/arm64/kvm-uuid.c<br/>new file mode 100644<br/>index 000000000000..b5be9133535a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/kvm-uuid.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/kvm-uuid.c</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+// Check that nobody has tampered with KVM's UID</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;linux/arm-smccc.h&gt;</div><div class='add'>+#include &lt;asm/kvm.h&gt;</div><div class='add'>+#include &lt;kvm_util.h&gt;</div><div class='add'>+</div><div class='add'>+#include "processor.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Do NOT redefine these constants, or try to replace them with some</div><div class='add'>+ * "common" version. They are hardcoded here to detect any potential</div><div class='add'>+ * breakage happening in the rest of the kernel.</div><div class='add'>+ *</div><div class='add'>+ * KVM UID value: 28b46fb6-2ec5-11e9-a9ca-4b564d003a74</div><div class='add'>+ */</div><div class='add'>+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0	0xb66fb428U</div><div class='add'>+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1	0xe911c52eU</div><div class='add'>+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2	0x564bcaa9U</div><div class='add'>+#define ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3	0x743a004dU</div><div class='add'>+</div><div class='add'>+static void guest_code(void)</div><div class='add'>+{</div><div class='add'>+	struct arm_smccc_res res = {};</div><div class='add'>+</div><div class='add'>+	do_smccc(ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID, 0, 0, 0, 0, 0, 0, 0, &amp;res);</div><div class='add'>+</div><div class='add'>+	__GUEST_ASSERT(res.a0 == ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0 &amp;&amp;</div><div class='add'>+		       res.a1 == ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1 &amp;&amp;</div><div class='add'>+		       res.a2 == ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2 &amp;&amp;</div><div class='add'>+		       res.a3 == ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3,</div><div class='add'>+		       "Unexpected KVM-specific UID %lx %lx %lx %lx\n", res.a0, res.a1, res.a2, res.a3);</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main (int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	struct ucall uc;</div><div class='add'>+	bool guest_done = false;</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code);</div><div class='add'>+</div><div class='add'>+	while (!guest_done) {</div><div class='add'>+		vcpu_run(vcpu);</div><div class='add'>+</div><div class='add'>+		switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+		case UCALL_SYNC:</div><div class='add'>+			break;</div><div class='add'>+		case UCALL_DONE:</div><div class='add'>+			guest_done = true;</div><div class='add'>+			break;</div><div class='add'>+		case UCALL_ABORT:</div><div class='add'>+			REPORT_GUEST_ASSERT(uc);</div><div class='add'>+			break;</div><div class='add'>+		case UCALL_PRINTF:</div><div class='add'>+			printf("%s", uc.buffer);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			TEST_FAIL("Unexpected guest exit");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/mmio_abort.c b/tools/testing/selftests/kvm/arm64/mmio_abort.c<br/>deleted file mode 100644<br/>index 8b7a80a51b1c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/mmio_abort.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/mmio_abort.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,159 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- * mmio_abort - Tests for userspace MMIO abort injection</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2024 Google LLC</div><div class='del'>- */</div><div class='del'>-#include "processor.h"</div><div class='del'>-#include "test_util.h"</div><div class='del'>-</div><div class='del'>-#define MMIO_ADDR	0x8000000ULL</div><div class='del'>-</div><div class='del'>-static u64 expected_abort_pc;</div><div class='del'>-</div><div class='del'>-static void expect_sea_handler(struct ex_regs *regs)</div><div class='del'>-{</div><div class='del'>-	u64 esr = read_sysreg(esr_el1);</div><div class='del'>-</div><div class='del'>-	GUEST_ASSERT_EQ(regs-&gt;pc, expected_abort_pc);</div><div class='del'>-	GUEST_ASSERT_EQ(ESR_ELx_EC(esr), ESR_ELx_EC_DABT_CUR);</div><div class='del'>-	GUEST_ASSERT_EQ(esr &amp; ESR_ELx_FSC_TYPE, ESR_ELx_FSC_EXTABT);</div><div class='del'>-</div><div class='del'>-	GUEST_DONE();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unexpected_dabt_handler(struct ex_regs *regs)</div><div class='del'>-{</div><div class='del'>-	GUEST_FAIL("Unexpected data abort at PC: %lx\n", regs-&gt;pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct kvm_vm *vm_create_with_dabt_handler(struct kvm_vcpu **vcpu, void *guest_code,</div><div class='del'>-						  handler_fn dabt_handler)</div><div class='del'>-{</div><div class='del'>-	struct kvm_vm *vm = vm_create_with_one_vcpu(vcpu, guest_code);</div><div class='del'>-</div><div class='del'>-	vm_init_descriptor_tables(vm);</div><div class='del'>-	vcpu_init_descriptor_tables(*vcpu);</div><div class='del'>-	vm_install_sync_handler(vm, VECTOR_SYNC_CURRENT, ESR_ELx_EC_DABT_CUR, dabt_handler);</div><div class='del'>-</div><div class='del'>-	virt_map(vm, MMIO_ADDR, MMIO_ADDR, 1);</div><div class='del'>-</div><div class='del'>-	return vm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vcpu_inject_extabt(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct kvm_vcpu_events events = {};</div><div class='del'>-</div><div class='del'>-	events.exception.ext_dabt_pending = true;</div><div class='del'>-	vcpu_events_set(vcpu, &amp;events);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vcpu_run_expect_done(struct kvm_vcpu *vcpu)</div><div class='del'>-{</div><div class='del'>-	struct ucall uc;</div><div class='del'>-</div><div class='del'>-	vcpu_run(vcpu);</div><div class='del'>-	switch (get_ucall(vcpu, &amp;uc)) {</div><div class='del'>-	case UCALL_ABORT:</div><div class='del'>-		REPORT_GUEST_ASSERT(uc);</div><div class='del'>-		break;</div><div class='del'>-	case UCALL_DONE:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		TEST_FAIL("Unexpected ucall: %lu", uc.cmd);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern char test_mmio_abort_insn;</div><div class='del'>-</div><div class='del'>-static void test_mmio_abort_guest(void)</div><div class='del'>-{</div><div class='del'>-	WRITE_ONCE(expected_abort_pc, (u64)&amp;test_mmio_abort_insn);</div><div class='del'>-</div><div class='del'>-	asm volatile("test_mmio_abort_insn:\n\t"</div><div class='del'>-		     "ldr x0, [%0]\n\t"</div><div class='del'>-		     : : "r" (MMIO_ADDR) : "x0", "memory");</div><div class='del'>-</div><div class='del'>-	GUEST_FAIL("MMIO instruction should not retire");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Test that KVM doesn't complete MMIO emulation when userspace has made an</div><div class='del'>- * external abort pending for the instruction.</div><div class='del'>- */</div><div class='del'>-static void test_mmio_abort(void)</div><div class='del'>-{</div><div class='del'>-	struct kvm_vcpu *vcpu;</div><div class='del'>-	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_mmio_abort_guest,</div><div class='del'>-							expect_sea_handler);</div><div class='del'>-	struct kvm_run *run = vcpu-&gt;run;</div><div class='del'>-</div><div class='del'>-	vcpu_run(vcpu);</div><div class='del'>-	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_MMIO);</div><div class='del'>-	TEST_ASSERT_EQ(run-&gt;mmio.phys_addr, MMIO_ADDR);</div><div class='del'>-	TEST_ASSERT_EQ(run-&gt;mmio.len, sizeof(unsigned long));</div><div class='del'>-	TEST_ASSERT(!run-&gt;mmio.is_write, "Expected MMIO read");</div><div class='del'>-</div><div class='del'>-	vcpu_inject_extabt(vcpu);</div><div class='del'>-	vcpu_run_expect_done(vcpu);</div><div class='del'>-	kvm_vm_free(vm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern char test_mmio_nisv_insn;</div><div class='del'>-</div><div class='del'>-static void test_mmio_nisv_guest(void)</div><div class='del'>-{</div><div class='del'>-	WRITE_ONCE(expected_abort_pc, (u64)&amp;test_mmio_nisv_insn);</div><div class='del'>-</div><div class='del'>-	asm volatile("test_mmio_nisv_insn:\n\t"</div><div class='del'>-		     "ldr x0, [%0], #8\n\t"</div><div class='del'>-		     : : "r" (MMIO_ADDR) : "x0", "memory");</div><div class='del'>-</div><div class='del'>-	GUEST_FAIL("MMIO instruction should not retire");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Test that the KVM_RUN ioctl fails for ESR_EL2.ISV=0 MMIO aborts if userspace</div><div class='del'>- * hasn't enabled KVM_CAP_ARM_NISV_TO_USER.</div><div class='del'>- */</div><div class='del'>-static void test_mmio_nisv(void)</div><div class='del'>-{</div><div class='del'>-	struct kvm_vcpu *vcpu;</div><div class='del'>-	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_mmio_nisv_guest,</div><div class='del'>-							unexpected_dabt_handler);</div><div class='del'>-</div><div class='del'>-	TEST_ASSERT(_vcpu_run(vcpu), "Expected nonzero return code from KVM_RUN");</div><div class='del'>-	TEST_ASSERT_EQ(errno, ENOSYS);</div><div class='del'>-</div><div class='del'>-	kvm_vm_free(vm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Test that ESR_EL2.ISV=0 MMIO aborts reach userspace and that an injected SEA</div><div class='del'>- * reaches the guest.</div><div class='del'>- */</div><div class='del'>-static void test_mmio_nisv_abort(void)</div><div class='del'>-{</div><div class='del'>-	struct kvm_vcpu *vcpu;</div><div class='del'>-	struct kvm_vm *vm = vm_create_with_dabt_handler(&amp;vcpu, test_mmio_nisv_guest,</div><div class='del'>-							expect_sea_handler);</div><div class='del'>-	struct kvm_run *run = vcpu-&gt;run;</div><div class='del'>-</div><div class='del'>-	vm_enable_cap(vm, KVM_CAP_ARM_NISV_TO_USER, 1);</div><div class='del'>-</div><div class='del'>-	vcpu_run(vcpu);</div><div class='del'>-	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_ARM_NISV);</div><div class='del'>-	TEST_ASSERT_EQ(run-&gt;arm_nisv.fault_ipa, MMIO_ADDR);</div><div class='del'>-</div><div class='del'>-	vcpu_inject_extabt(vcpu);</div><div class='del'>-	vcpu_run_expect_done(vcpu);</div><div class='del'>-	kvm_vm_free(vm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(void)</div><div class='del'>-{</div><div class='del'>-	test_mmio_abort();</div><div class='del'>-	test_mmio_nisv();</div><div class='del'>-	test_mmio_nisv_abort();</div><div class='del'>-}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/no-vgic-v3.c b/tools/testing/selftests/kvm/arm64/no-vgic-v3.c<br/>index ebd70430c89d..152c34776981 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/no-vgic-v3.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/no-vgic-v3.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/no-vgic-v3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/no-vgic-v3.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ static void guest_code(void)</div><div class='ctx'> 	 * Check that we advertise that ID_AA64PFR0_EL1.GIC == 0, having</div><div class='ctx'> 	 * hidden the feature at runtime without any other userspace action.</div><div class='ctx'> 	 */</div><div class='del'>-	__GUEST_ASSERT(FIELD_GET(ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_GIC),</div><div class='add'>+	__GUEST_ASSERT(FIELD_GET(ID_AA64PFR0_EL1_GIC,</div><div class='ctx'> 				 read_sysreg(id_aa64pfr0_el1)) == 0,</div><div class='ctx'> 		       "GICv3 wrongly advertised");</div><div class='ctx'> </div><div class='hunk'>@@ -163,9 +163,11 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> 	uint64_t pfr0;</div><div class='ctx'> </div><div class='add'>+	test_disable_default_vgic();</div><div class='add'>+</div><div class='ctx'> 	vm = vm_create_with_one_vcpu(&amp;vcpu, NULL);</div><div class='ctx'> 	pfr0 = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_ID_AA64PFR0_EL1));</div><div class='del'>-	__TEST_REQUIRE(FIELD_GET(ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_GIC), pfr0),</div><div class='add'>+	__TEST_REQUIRE(FIELD_GET(ID_AA64PFR0_EL1_GIC, pfr0),</div><div class='ctx'> 		       "GICv3 not supported.");</div><div class='ctx'> 	kvm_vm_free(vm);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/page_fault_test.c b/tools/testing/selftests/kvm/arm64/page_fault_test.c<br/>index ec33a8f9c908..4ccbd389d133 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/page_fault_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/page_fault_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/page_fault_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/page_fault_test.c</a></div><div class='hunk'>@@ -95,14 +95,14 @@ static bool guest_check_lse(void)</div><div class='ctx'> 	uint64_t isar0 = read_sysreg(id_aa64isar0_el1);</div><div class='ctx'> 	uint64_t atomic;</div><div class='ctx'> </div><div class='del'>-	atomic = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64ISAR0_EL1_ATOMIC), isar0);</div><div class='add'>+	atomic = FIELD_GET(ID_AA64ISAR0_EL1_ATOMIC, isar0);</div><div class='ctx'> 	return atomic &gt;= 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool guest_check_dc_zva(void)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t dczid = read_sysreg(dczid_el0);</div><div class='del'>-	uint64_t dzp = FIELD_GET(ARM64_FEATURE_MASK(DCZID_EL0_DZP), dczid);</div><div class='add'>+	uint64_t dzp = FIELD_GET(DCZID_EL0_DZP, dczid);</div><div class='ctx'> </div><div class='ctx'> 	return dzp == 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -195,11 +195,11 @@ static bool guest_set_ha(void)</div><div class='ctx'> 	uint64_t hadbs, tcr;</div><div class='ctx'> </div><div class='ctx'> 	/* Skip if HA is not supported. */</div><div class='del'>-	hadbs = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR1_EL1_HAFDBS), mmfr1);</div><div class='add'>+	hadbs = FIELD_GET(ID_AA64MMFR1_EL1_HAFDBS, mmfr1);</div><div class='ctx'> 	if (hadbs == 0)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	tcr = read_sysreg(tcr_el1) | TCR_EL1_HA;</div><div class='add'>+	tcr = read_sysreg(tcr_el1) | TCR_HA;</div><div class='ctx'> 	write_sysreg(tcr, tcr_el1);</div><div class='ctx'> 	isb();</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/psci_test.c b/tools/testing/selftests/kvm/arm64/psci_test.c<br/>index ab491ee9e5f7..98e49f710aef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/psci_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/psci_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/psci_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/psci_test.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ static uint64_t psci_cpu_on(uint64_t target_cpu, uint64_t entry_addr,</div><div class='ctx'> {</div><div class='ctx'> 	struct arm_smccc_res res;</div><div class='ctx'> </div><div class='del'>-	smccc_hvc(PSCI_0_2_FN64_CPU_ON, target_cpu, entry_addr, context_id,</div><div class='add'>+	do_smccc(PSCI_0_2_FN64_CPU_ON, target_cpu, entry_addr, context_id,</div><div class='ctx'> 		  0, 0, 0, 0, &amp;res);</div><div class='ctx'> </div><div class='ctx'> 	return res.a0;</div><div class='hunk'>@@ -38,7 +38,7 @@ static uint64_t psci_affinity_info(uint64_t target_affinity,</div><div class='ctx'> {</div><div class='ctx'> 	struct arm_smccc_res res;</div><div class='ctx'> </div><div class='del'>-	smccc_hvc(PSCI_0_2_FN64_AFFINITY_INFO, target_affinity, lowest_affinity_level,</div><div class='add'>+	do_smccc(PSCI_0_2_FN64_AFFINITY_INFO, target_affinity, lowest_affinity_level,</div><div class='ctx'> 		  0, 0, 0, 0, 0, &amp;res);</div><div class='ctx'> </div><div class='ctx'> 	return res.a0;</div><div class='hunk'>@@ -48,7 +48,7 @@ static uint64_t psci_system_suspend(uint64_t entry_addr, uint64_t context_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct arm_smccc_res res;</div><div class='ctx'> </div><div class='del'>-	smccc_hvc(PSCI_1_0_FN64_SYSTEM_SUSPEND, entry_addr, context_id,</div><div class='add'>+	do_smccc(PSCI_1_0_FN64_SYSTEM_SUSPEND, entry_addr, context_id,</div><div class='ctx'> 		  0, 0, 0, 0, 0, &amp;res);</div><div class='ctx'> </div><div class='ctx'> 	return res.a0;</div><div class='hunk'>@@ -58,7 +58,7 @@ static uint64_t psci_system_off2(uint64_t type, uint64_t cookie)</div><div class='ctx'> {</div><div class='ctx'> 	struct arm_smccc_res res;</div><div class='ctx'> </div><div class='del'>-	smccc_hvc(PSCI_1_3_FN64_SYSTEM_OFF2, type, cookie, 0, 0, 0, 0, 0, &amp;res);</div><div class='add'>+	do_smccc(PSCI_1_3_FN64_SYSTEM_OFF2, type, cookie, 0, 0, 0, 0, 0, &amp;res);</div><div class='ctx'> </div><div class='ctx'> 	return res.a0;</div><div class='ctx'> }</div><div class='hunk'>@@ -67,7 +67,7 @@ static uint64_t psci_features(uint32_t func_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct arm_smccc_res res;</div><div class='ctx'> </div><div class='del'>-	smccc_hvc(PSCI_1_0_FN_PSCI_FEATURES, func_id, 0, 0, 0, 0, 0, 0, &amp;res);</div><div class='add'>+	do_smccc(PSCI_1_0_FN_PSCI_FEATURES, func_id, 0, 0, 0, 0, 0, 0, &amp;res);</div><div class='ctx'> </div><div class='ctx'> 	return res.a0;</div><div class='ctx'> }</div><div class='hunk'>@@ -89,12 +89,13 @@ static struct kvm_vm *setup_vm(void *guest_code, struct kvm_vcpu **source,</div><div class='ctx'> </div><div class='ctx'> 	vm = vm_create(2);</div><div class='ctx'> </div><div class='del'>-	vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &amp;init);</div><div class='add'>+	kvm_get_default_vcpu_target(vm, &amp;init);</div><div class='ctx'> 	init.features[0] |= (1 &lt;&lt; KVM_ARM_VCPU_PSCI_0_2);</div><div class='ctx'> </div><div class='ctx'> 	*source = aarch64_vcpu_add(vm, 0, &amp;init, guest_code);</div><div class='ctx'> 	*target = aarch64_vcpu_add(vm, 1, &amp;init, guest_code);</div><div class='ctx'> </div><div class='add'>+	kvm_arch_vm_finalize_vcpus(vm);</div><div class='ctx'> 	return vm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/sea_to_user.c b/tools/testing/selftests/kvm/arm64/sea_to_user.c<br/>new file mode 100644<br/>index 000000000000..573dd790aeb8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/sea_to_user.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/sea_to_user.c</a></div><div class='hunk'>@@ -0,0 +1,331 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Test KVM returns to userspace with KVM_EXIT_ARM_SEA if host APEI fails</div><div class='add'>+ * to handle SEA and userspace has opt-ed in KVM_CAP_ARM_SEA_TO_USER.</div><div class='add'>+ *</div><div class='add'>+ * After reaching userspace with expected arm_sea info, also test userspace</div><div class='add'>+ * injecting a synchronous external data abort into the guest.</div><div class='add'>+ *</div><div class='add'>+ * This test utilizes EINJ to generate a REAL synchronous external data</div><div class='add'>+ * abort by consuming a recoverable uncorrectable memory error. Therefore</div><div class='add'>+ * the device under test must support EINJ in both firmware and host kernel,</div><div class='add'>+ * including the notrigger feature. Otherwise the test will be skipped.</div><div class='add'>+ * The under-test platform's APEI should be unable to claim SEA. Otherwise</div><div class='add'>+ * the test will also be skipped.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include "test_util.h"</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='add'>+#include "guest_modes.h"</div><div class='add'>+</div><div class='add'>+#define PAGE_PRESENT		(1ULL &lt;&lt; 63)</div><div class='add'>+#define PAGE_PHYSICAL		0x007fffffffffffffULL</div><div class='add'>+#define PAGE_ADDR_MASK		(~(0xfffULL))</div><div class='add'>+</div><div class='add'>+/* Group ISV and ISS[23:14]. */</div><div class='add'>+#define ESR_ELx_INST_SYNDROME	((ESR_ELx_ISV) | (ESR_ELx_SAS) | \</div><div class='add'>+				 (ESR_ELx_SSE) | (ESR_ELx_SRT_MASK) | \</div><div class='add'>+				 (ESR_ELx_SF) | (ESR_ELx_AR))</div><div class='add'>+</div><div class='add'>+#define EINJ_ETYPE		"/sys/kernel/debug/apei/einj/error_type"</div><div class='add'>+#define EINJ_ADDR		"/sys/kernel/debug/apei/einj/param1"</div><div class='add'>+#define EINJ_MASK		"/sys/kernel/debug/apei/einj/param2"</div><div class='add'>+#define EINJ_FLAGS		"/sys/kernel/debug/apei/einj/flags"</div><div class='add'>+#define EINJ_NOTRIGGER		"/sys/kernel/debug/apei/einj/notrigger"</div><div class='add'>+#define EINJ_DOIT		"/sys/kernel/debug/apei/einj/error_inject"</div><div class='add'>+/* Memory Uncorrectable non-fatal. */</div><div class='add'>+#define ERROR_TYPE_MEMORY_UER	0x10</div><div class='add'>+/* Memory address and mask valid (param1 and param2). */</div><div class='add'>+#define MASK_MEMORY_UER		0b10</div><div class='add'>+</div><div class='add'>+/* Guest virtual address region = [2G, 3G).  */</div><div class='add'>+#define START_GVA		0x80000000UL</div><div class='add'>+#define VM_MEM_SIZE		0x40000000UL</div><div class='add'>+/* Note: EINJ_OFFSET must &lt; VM_MEM_SIZE. */</div><div class='add'>+#define EINJ_OFFSET		0x01234badUL</div><div class='add'>+#define EINJ_GVA		((START_GVA) + (EINJ_OFFSET))</div><div class='add'>+</div><div class='add'>+static vm_paddr_t einj_gpa;</div><div class='add'>+static void *einj_hva;</div><div class='add'>+static uint64_t einj_hpa;</div><div class='add'>+static bool far_invalid;</div><div class='add'>+</div><div class='add'>+static uint64_t translate_to_host_paddr(unsigned long vaddr)</div><div class='add'>+{</div><div class='add'>+	uint64_t pinfo;</div><div class='add'>+	int64_t offset = vaddr / getpagesize() * sizeof(pinfo);</div><div class='add'>+	int fd;</div><div class='add'>+	uint64_t page_addr;</div><div class='add'>+	uint64_t paddr;</div><div class='add'>+</div><div class='add'>+	fd = open("/proc/self/pagemap", O_RDONLY);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		ksft_exit_fail_perror("Failed to open /proc/self/pagemap");</div><div class='add'>+	if (pread(fd, &amp;pinfo, sizeof(pinfo), offset) != sizeof(pinfo)) {</div><div class='add'>+		close(fd);</div><div class='add'>+		ksft_exit_fail_perror("Failed to read /proc/self/pagemap");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	close(fd);</div><div class='add'>+</div><div class='add'>+	if ((pinfo &amp; PAGE_PRESENT) == 0)</div><div class='add'>+		ksft_exit_fail_perror("Page not present");</div><div class='add'>+</div><div class='add'>+	page_addr = (pinfo &amp; PAGE_PHYSICAL) &lt;&lt; MIN_PAGE_SHIFT;</div><div class='add'>+	paddr = page_addr + (vaddr &amp; (getpagesize() - 1));</div><div class='add'>+	return paddr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_einj_entry(const char *einj_path, uint64_t val)</div><div class='add'>+{</div><div class='add'>+	char cmd[256] = {0};</div><div class='add'>+	FILE *cmdfile = NULL;</div><div class='add'>+</div><div class='add'>+	sprintf(cmd, "echo %#lx &gt; %s", val, einj_path);</div><div class='add'>+	cmdfile = popen(cmd, "r");</div><div class='add'>+</div><div class='add'>+	if (pclose(cmdfile) == 0)</div><div class='add'>+		ksft_print_msg("echo %#lx &gt; %s - done\n", val, einj_path);</div><div class='add'>+	else</div><div class='add'>+		ksft_exit_fail_perror("Failed to write EINJ entry");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void inject_uer(uint64_t paddr)</div><div class='add'>+{</div><div class='add'>+	if (access("/sys/firmware/acpi/tables/EINJ", R_OK) == -1)</div><div class='add'>+		ksft_test_result_skip("EINJ table no available in firmware");</div><div class='add'>+</div><div class='add'>+	if (access(EINJ_ETYPE, R_OK | W_OK) == -1)</div><div class='add'>+		ksft_test_result_skip("EINJ module probably not loaded?");</div><div class='add'>+</div><div class='add'>+	write_einj_entry(EINJ_ETYPE, ERROR_TYPE_MEMORY_UER);</div><div class='add'>+	write_einj_entry(EINJ_FLAGS, MASK_MEMORY_UER);</div><div class='add'>+	write_einj_entry(EINJ_ADDR, paddr);</div><div class='add'>+	write_einj_entry(EINJ_MASK, ~0x0UL);</div><div class='add'>+	write_einj_entry(EINJ_NOTRIGGER, 1);</div><div class='add'>+	write_einj_entry(EINJ_DOIT, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * When host APEI successfully claims the SEA caused by guest_code, kernel</div><div class='add'>+ * will send SIGBUS signal with BUS_MCEERR_AR to test thread.</div><div class='add'>+ *</div><div class='add'>+ * We set up this SIGBUS handler to skip the test for that case.</div><div class='add'>+ */</div><div class='add'>+static void sigbus_signal_handler(int sig, siginfo_t *si, void *v)</div><div class='add'>+{</div><div class='add'>+	ksft_print_msg("SIGBUS (%d) received, dumping siginfo...\n", sig);</div><div class='add'>+	ksft_print_msg("si_signo=%d, si_errno=%d, si_code=%d, si_addr=%p\n",</div><div class='add'>+		       si-&gt;si_signo, si-&gt;si_errno, si-&gt;si_code, si-&gt;si_addr);</div><div class='add'>+	if (si-&gt;si_code == BUS_MCEERR_AR)</div><div class='add'>+		ksft_test_result_skip("SEA is claimed by host APEI\n");</div><div class='add'>+	else</div><div class='add'>+		ksft_test_result_fail("Exit with signal unhandled\n");</div><div class='add'>+</div><div class='add'>+	exit(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_sigbus_handler(void)</div><div class='add'>+{</div><div class='add'>+	struct sigaction act;</div><div class='add'>+</div><div class='add'>+	memset(&amp;act, 0, sizeof(act));</div><div class='add'>+	sigemptyset(&amp;act.sa_mask);</div><div class='add'>+	act.sa_sigaction = sigbus_signal_handler;</div><div class='add'>+	act.sa_flags = SA_SIGINFO;</div><div class='add'>+	TEST_ASSERT(sigaction(SIGBUS, &amp;act, NULL) == 0,</div><div class='add'>+		    "Failed to setup SIGBUS handler");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_code(void)</div><div class='add'>+{</div><div class='add'>+	uint64_t guest_data;</div><div class='add'>+</div><div class='add'>+	/* Consumes error will cause a SEA. */</div><div class='add'>+	guest_data = *(uint64_t *)EINJ_GVA;</div><div class='add'>+</div><div class='add'>+	GUEST_FAIL("Poison not protected by SEA: gva=%#lx, guest_data=%#lx\n",</div><div class='add'>+		   EINJ_GVA, guest_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void expect_sea_handler(struct ex_regs *regs)</div><div class='add'>+{</div><div class='add'>+	u64 esr = read_sysreg(esr_el1);</div><div class='add'>+	u64 far = read_sysreg(far_el1);</div><div class='add'>+	bool expect_far_invalid = far_invalid;</div><div class='add'>+</div><div class='add'>+	GUEST_PRINTF("Handling Guest SEA\n");</div><div class='add'>+	GUEST_PRINTF("ESR_EL1=%#lx, FAR_EL1=%#lx\n", esr, far);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT_EQ(ESR_ELx_EC(esr), ESR_ELx_EC_DABT_CUR);</div><div class='add'>+	GUEST_ASSERT_EQ(esr &amp; ESR_ELx_FSC_TYPE, ESR_ELx_FSC_EXTABT);</div><div class='add'>+</div><div class='add'>+	if (expect_far_invalid) {</div><div class='add'>+		GUEST_ASSERT_EQ(esr &amp; ESR_ELx_FnV, ESR_ELx_FnV);</div><div class='add'>+		GUEST_PRINTF("Guest observed garbage value in FAR\n");</div><div class='add'>+	} else {</div><div class='add'>+		GUEST_ASSERT_EQ(esr &amp; ESR_ELx_FnV, 0);</div><div class='add'>+		GUEST_ASSERT_EQ(far, EINJ_GVA);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vcpu_inject_sea(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu_events events = {};</div><div class='add'>+</div><div class='add'>+	events.exception.ext_dabt_pending = true;</div><div class='add'>+	vcpu_events_set(vcpu, &amp;events);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void run_vm(struct kvm_vm *vm, struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct ucall uc;</div><div class='add'>+	bool guest_done = false;</div><div class='add'>+	struct kvm_run *run = vcpu-&gt;run;</div><div class='add'>+	u64 esr;</div><div class='add'>+</div><div class='add'>+	/* Resume the vCPU after error injection to consume the error. */</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("Dump kvm_run info about KVM_EXIT_%s\n",</div><div class='add'>+		       exit_reason_str(run-&gt;exit_reason));</div><div class='add'>+	ksft_print_msg("kvm_run.arm_sea: esr=%#llx, flags=%#llx\n",</div><div class='add'>+		       run-&gt;arm_sea.esr, run-&gt;arm_sea.flags);</div><div class='add'>+	ksft_print_msg("kvm_run.arm_sea: gva=%#llx, gpa=%#llx\n",</div><div class='add'>+		       run-&gt;arm_sea.gva, run-&gt;arm_sea.gpa);</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_ARM_SEA);</div><div class='add'>+</div><div class='add'>+	esr = run-&gt;arm_sea.esr;</div><div class='add'>+	TEST_ASSERT_EQ(ESR_ELx_EC(esr), ESR_ELx_EC_DABT_LOW);</div><div class='add'>+	TEST_ASSERT_EQ(esr &amp; ESR_ELx_FSC_TYPE, ESR_ELx_FSC_EXTABT);</div><div class='add'>+	TEST_ASSERT_EQ(ESR_ELx_ISS2(esr), 0);</div><div class='add'>+	TEST_ASSERT_EQ((esr &amp; ESR_ELx_INST_SYNDROME), 0);</div><div class='add'>+	TEST_ASSERT_EQ(esr &amp; ESR_ELx_VNCR, 0);</div><div class='add'>+</div><div class='add'>+	if (!(esr &amp; ESR_ELx_FnV)) {</div><div class='add'>+		ksft_print_msg("Expect gva to match given FnV bit is 0\n");</div><div class='add'>+		TEST_ASSERT_EQ(run-&gt;arm_sea.gva, EINJ_GVA);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (run-&gt;arm_sea.flags &amp; KVM_EXIT_ARM_SEA_FLAG_GPA_VALID) {</div><div class='add'>+		ksft_print_msg("Expect gpa to match given KVM_EXIT_ARM_SEA_FLAG_GPA_VALID is set\n");</div><div class='add'>+		TEST_ASSERT_EQ(run-&gt;arm_sea.gpa, einj_gpa &amp; PAGE_ADDR_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	far_invalid = esr &amp; ESR_ELx_FnV;</div><div class='add'>+</div><div class='add'>+	/* Inject a SEA into guest and expect handled in SEA handler. */</div><div class='add'>+	vcpu_inject_sea(vcpu);</div><div class='add'>+</div><div class='add'>+	/* Expect the guest to reach GUEST_DONE gracefully. */</div><div class='add'>+	do {</div><div class='add'>+		vcpu_run(vcpu);</div><div class='add'>+		switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+		case UCALL_PRINTF:</div><div class='add'>+			ksft_print_msg("From guest: %s", uc.buffer);</div><div class='add'>+			break;</div><div class='add'>+		case UCALL_DONE:</div><div class='add'>+			ksft_print_msg("Guest done gracefully!\n");</div><div class='add'>+			guest_done = 1;</div><div class='add'>+			break;</div><div class='add'>+		case UCALL_ABORT:</div><div class='add'>+			ksft_print_msg("Guest aborted!\n");</div><div class='add'>+			guest_done = 1;</div><div class='add'>+			REPORT_GUEST_ASSERT(uc);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			TEST_FAIL("Unexpected ucall: %lu\n", uc.cmd);</div><div class='add'>+		}</div><div class='add'>+	} while (!guest_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kvm_vm *vm_create_with_sea_handler(struct kvm_vcpu **vcpu)</div><div class='add'>+{</div><div class='add'>+	size_t backing_page_size;</div><div class='add'>+	size_t guest_page_size;</div><div class='add'>+	size_t alignment;</div><div class='add'>+	uint64_t num_guest_pages;</div><div class='add'>+	vm_paddr_t start_gpa;</div><div class='add'>+	enum vm_mem_backing_src_type src_type = VM_MEM_SRC_ANONYMOUS_HUGETLB_1GB;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+</div><div class='add'>+	backing_page_size = get_backing_src_pagesz(src_type);</div><div class='add'>+	guest_page_size = vm_guest_mode_params[VM_MODE_DEFAULT].page_size;</div><div class='add'>+	alignment = max(backing_page_size, guest_page_size);</div><div class='add'>+	num_guest_pages = VM_MEM_SIZE / guest_page_size;</div><div class='add'>+</div><div class='add'>+	vm = __vm_create_with_one_vcpu(vcpu, num_guest_pages, guest_code);</div><div class='add'>+	vm_init_descriptor_tables(vm);</div><div class='add'>+	vcpu_init_descriptor_tables(*vcpu);</div><div class='add'>+</div><div class='add'>+	vm_install_sync_handler(vm,</div><div class='add'>+		/*vector=*/VECTOR_SYNC_CURRENT,</div><div class='add'>+		/*ec=*/ESR_ELx_EC_DABT_CUR,</div><div class='add'>+		/*handler=*/expect_sea_handler);</div><div class='add'>+</div><div class='add'>+	start_gpa = (vm-&gt;max_gfn - num_guest_pages) * guest_page_size;</div><div class='add'>+	start_gpa = align_down(start_gpa, alignment);</div><div class='add'>+</div><div class='add'>+	vm_userspace_mem_region_add(</div><div class='add'>+		/*vm=*/vm,</div><div class='add'>+		/*src_type=*/src_type,</div><div class='add'>+		/*guest_paddr=*/start_gpa,</div><div class='add'>+		/*slot=*/1,</div><div class='add'>+		/*npages=*/num_guest_pages,</div><div class='add'>+		/*flags=*/0);</div><div class='add'>+</div><div class='add'>+	virt_map(vm, START_GVA, start_gpa, num_guest_pages);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("Mapped %#lx pages: gva=%#lx to gpa=%#lx\n",</div><div class='add'>+		       num_guest_pages, START_GVA, start_gpa);</div><div class='add'>+	return vm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vm_inject_memory_uer(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	uint64_t guest_data;</div><div class='add'>+</div><div class='add'>+	einj_gpa = addr_gva2gpa(vm, EINJ_GVA);</div><div class='add'>+	einj_hva = addr_gva2hva(vm, EINJ_GVA);</div><div class='add'>+</div><div class='add'>+	/* Populate certain data before injecting UER. */</div><div class='add'>+	*(uint64_t *)einj_hva = 0xBAADCAFE;</div><div class='add'>+	guest_data = *(uint64_t *)einj_hva;</div><div class='add'>+	ksft_print_msg("Before EINJect: data=%#lx\n",</div><div class='add'>+		guest_data);</div><div class='add'>+</div><div class='add'>+	einj_hpa = translate_to_host_paddr((unsigned long)einj_hva);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("EINJ_GVA=%#lx, einj_gpa=%#lx, einj_hva=%p, einj_hpa=%#lx\n",</div><div class='add'>+		       EINJ_GVA, einj_gpa, einj_hva, einj_hpa);</div><div class='add'>+</div><div class='add'>+	inject_uer(einj_hpa);</div><div class='add'>+	ksft_print_msg("Memory UER EINJected\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(kvm_has_cap(KVM_CAP_ARM_SEA_TO_USER));</div><div class='add'>+</div><div class='add'>+	setup_sigbus_handler();</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_sea_handler(&amp;vcpu);</div><div class='add'>+	vm_enable_cap(vm, KVM_CAP_ARM_SEA_TO_USER, 0);</div><div class='add'>+	vm_inject_memory_uer(vm);</div><div class='add'>+	run_vm(vm, vcpu);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/set_id_regs.c b/tools/testing/selftests/kvm/arm64/set_id_regs.c<br/>index 217541fe6536..c4815d365816 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/set_id_regs.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/set_id_regs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/set_id_regs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/set_id_regs.c</a></div><div class='hunk'>@@ -123,20 +123,28 @@ static const struct reg_ftr_bits ftr_id_aa64isar2_el1[] = {</div><div class='ctx'> 	REG_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct reg_ftr_bits ftr_id_aa64isar3_el1[] = {</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ISAR3_EL1, FPRCVT, 0),</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ISAR3_EL1, LSFE, 0),</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ISAR3_EL1, FAMINMAX, 0),</div><div class='add'>+	REG_FTR_END,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct reg_ftr_bits ftr_id_aa64pfr0_el1[] = {</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, CSV3, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, CSV2, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, DIT, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, SEL2, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_EXACT, ID_AA64PFR0_EL1, GIC, 0),</div><div class='del'>-	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, EL3, 0),</div><div class='del'>-	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, EL2, 0),</div><div class='del'>-	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, EL1, 0),</div><div class='del'>-	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, EL0, 0),</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, EL3, 1),</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, EL2, 1),</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, EL1, 1),</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, EL0, 1),</div><div class='ctx'> 	REG_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct reg_ftr_bits ftr_id_aa64pfr1_el1[] = {</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR1_EL1, DF2, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR1_EL1, CSV2_frac, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR1_EL1, SSBS, ID_AA64PFR1_EL1_SSBS_NI),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR1_EL1, BT, 0),</div><div class='hunk'>@@ -146,6 +154,9 @@ static const struct reg_ftr_bits ftr_id_aa64pfr1_el1[] = {</div><div class='ctx'> static const struct reg_ftr_bits ftr_id_aa64mmfr0_el1[] = {</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR0_EL1, ECV, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR0_EL1, EXS, 0),</div><div class='add'>+	REG_FTR_BITS(FTR_EXACT, ID_AA64MMFR0_EL1, TGRAN4_2, 1),</div><div class='add'>+	REG_FTR_BITS(FTR_EXACT, ID_AA64MMFR0_EL1, TGRAN64_2, 1),</div><div class='add'>+	REG_FTR_BITS(FTR_EXACT, ID_AA64MMFR0_EL1, TGRAN16_2, 1),</div><div class='ctx'> 	S_REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR0_EL1, TGRAN4, 0),</div><div class='ctx'> 	S_REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR0_EL1, TGRAN64, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR0_EL1, TGRAN16, 0),</div><div class='hunk'>@@ -159,7 +170,9 @@ static const struct reg_ftr_bits ftr_id_aa64mmfr0_el1[] = {</div><div class='ctx'> static const struct reg_ftr_bits ftr_id_aa64mmfr1_el1[] = {</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR1_EL1, TIDCP1, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR1_EL1, AFP, 0),</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR1_EL1, HCX, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR1_EL1, ETS, 0),</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR1_EL1, TWED, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_HIGHER_SAFE, ID_AA64MMFR1_EL1, SpecSEI, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR1_EL1, PAN, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR1_EL1, LO, 0),</div><div class='hunk'>@@ -182,6 +195,14 @@ static const struct reg_ftr_bits ftr_id_aa64mmfr2_el1[] = {</div><div class='ctx'> 	REG_FTR_END,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct reg_ftr_bits ftr_id_aa64mmfr3_el1[] = {</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR3_EL1, S1POE, 0),</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR3_EL1, S1PIE, 0),</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR3_EL1, SCTLRX, 0),</div><div class='add'>+	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64MMFR3_EL1, TCRX, 0),</div><div class='add'>+	REG_FTR_END,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct reg_ftr_bits ftr_id_aa64zfr0_el1[] = {</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ZFR0_EL1, F64MM, 0),</div><div class='ctx'> 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ZFR0_EL1, F32MM, 0),</div><div class='hunk'>@@ -207,11 +228,13 @@ static struct test_feature_reg test_regs[] = {</div><div class='ctx'> 	TEST_REG(SYS_ID_AA64ISAR0_EL1, ftr_id_aa64isar0_el1),</div><div class='ctx'> 	TEST_REG(SYS_ID_AA64ISAR1_EL1, ftr_id_aa64isar1_el1),</div><div class='ctx'> 	TEST_REG(SYS_ID_AA64ISAR2_EL1, ftr_id_aa64isar2_el1),</div><div class='add'>+	TEST_REG(SYS_ID_AA64ISAR3_EL1, ftr_id_aa64isar3_el1),</div><div class='ctx'> 	TEST_REG(SYS_ID_AA64PFR0_EL1, ftr_id_aa64pfr0_el1),</div><div class='ctx'> 	TEST_REG(SYS_ID_AA64PFR1_EL1, ftr_id_aa64pfr1_el1),</div><div class='ctx'> 	TEST_REG(SYS_ID_AA64MMFR0_EL1, ftr_id_aa64mmfr0_el1),</div><div class='ctx'> 	TEST_REG(SYS_ID_AA64MMFR1_EL1, ftr_id_aa64mmfr1_el1),</div><div class='ctx'> 	TEST_REG(SYS_ID_AA64MMFR2_EL1, ftr_id_aa64mmfr2_el1),</div><div class='add'>+	TEST_REG(SYS_ID_AA64MMFR3_EL1, ftr_id_aa64mmfr3_el1),</div><div class='ctx'> 	TEST_REG(SYS_ID_AA64ZFR0_EL1, ftr_id_aa64zfr0_el1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -224,12 +247,20 @@ static void guest_code(void)</div><div class='ctx'> 	GUEST_REG_SYNC(SYS_ID_AA64ISAR0_EL1);</div><div class='ctx'> 	GUEST_REG_SYNC(SYS_ID_AA64ISAR1_EL1);</div><div class='ctx'> 	GUEST_REG_SYNC(SYS_ID_AA64ISAR2_EL1);</div><div class='add'>+	GUEST_REG_SYNC(SYS_ID_AA64ISAR3_EL1);</div><div class='ctx'> 	GUEST_REG_SYNC(SYS_ID_AA64PFR0_EL1);</div><div class='add'>+	GUEST_REG_SYNC(SYS_ID_AA64PFR1_EL1);</div><div class='ctx'> 	GUEST_REG_SYNC(SYS_ID_AA64MMFR0_EL1);</div><div class='ctx'> 	GUEST_REG_SYNC(SYS_ID_AA64MMFR1_EL1);</div><div class='ctx'> 	GUEST_REG_SYNC(SYS_ID_AA64MMFR2_EL1);</div><div class='add'>+	GUEST_REG_SYNC(SYS_ID_AA64MMFR3_EL1);</div><div class='ctx'> 	GUEST_REG_SYNC(SYS_ID_AA64ZFR0_EL1);</div><div class='add'>+	GUEST_REG_SYNC(SYS_MPIDR_EL1);</div><div class='add'>+	GUEST_REG_SYNC(SYS_CLIDR_EL1);</div><div class='ctx'> 	GUEST_REG_SYNC(SYS_CTR_EL0);</div><div class='add'>+	GUEST_REG_SYNC(SYS_MIDR_EL1);</div><div class='add'>+	GUEST_REG_SYNC(SYS_REVIDR_EL1);</div><div class='add'>+	GUEST_REG_SYNC(SYS_AIDR_EL1);</div><div class='ctx'> </div><div class='ctx'> 	GUEST_DONE();</div><div class='ctx'> }</div><div class='hunk'>@@ -237,7 +268,9 @@ static void guest_code(void)</div><div class='ctx'> /* Return a safe value to a given ftr_bits an ftr value */</div><div class='ctx'> uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)</div><div class='ctx'> {</div><div class='del'>-	uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);</div><div class='add'>+	uint64_t ftr_max = ftr_bits-&gt;mask &gt;&gt; ftr_bits-&gt;shift;</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(ftr_max &gt; 1, "This test doesn't support single bit features");</div><div class='ctx'> </div><div class='ctx'> 	if (ftr_bits-&gt;sign == FTR_UNSIGNED) {</div><div class='ctx'> 		switch (ftr_bits-&gt;type) {</div><div class='hunk'>@@ -289,7 +322,9 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)</div><div class='ctx'> /* Return an invalid value to a given ftr_bits an ftr value */</div><div class='ctx'> uint64_t get_invalid_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr)</div><div class='ctx'> {</div><div class='del'>-	uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0);</div><div class='add'>+	uint64_t ftr_max = ftr_bits-&gt;mask &gt;&gt; ftr_bits-&gt;shift;</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(ftr_max &gt; 1, "This test doesn't support single bit features");</div><div class='ctx'> </div><div class='ctx'> 	if (ftr_bits-&gt;sign == FTR_UNSIGNED) {</div><div class='ctx'> 		switch (ftr_bits-&gt;type) {</div><div class='hunk'>@@ -537,6 +572,69 @@ static void test_user_set_mpam_reg(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		ksft_test_result_fail("ID_AA64PFR1_EL1.MPAM_frac value should not be ignored\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define MTE_IDREG_TEST 1</div><div class='add'>+static void test_user_set_mte_reg(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	uint64_t masks[KVM_ARM_FEATURE_ID_RANGE_SIZE];</div><div class='add'>+	struct reg_mask_range range = {</div><div class='add'>+		.addr = (__u64)masks,</div><div class='add'>+	};</div><div class='add'>+	uint64_t val;</div><div class='add'>+	uint64_t mte;</div><div class='add'>+	uint64_t mte_frac;</div><div class='add'>+	int idx, err;</div><div class='add'>+</div><div class='add'>+	val = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_ID_AA64PFR1_EL1));</div><div class='add'>+	mte = FIELD_GET(ID_AA64PFR1_EL1_MTE, val);</div><div class='add'>+	if (!mte) {</div><div class='add'>+		ksft_test_result_skip("MTE capability not supported, nothing to test\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get writable masks for feature ID registers */</div><div class='add'>+	memset(range.reserved, 0, sizeof(range.reserved));</div><div class='add'>+	vm_ioctl(vcpu-&gt;vm, KVM_ARM_GET_REG_WRITABLE_MASKS, &amp;range);</div><div class='add'>+</div><div class='add'>+	idx = encoding_to_range_idx(SYS_ID_AA64PFR1_EL1);</div><div class='add'>+	if ((masks[idx] &amp; ID_AA64PFR1_EL1_MTE_frac_MASK) == ID_AA64PFR1_EL1_MTE_frac_MASK) {</div><div class='add'>+		ksft_test_result_skip("ID_AA64PFR1_EL1.MTE_frac is officially writable, nothing to test\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When MTE is supported but MTE_ASYMM is not (ID_AA64PFR1_EL1.MTE == 2)</div><div class='add'>+	 * ID_AA64PFR1_EL1.MTE_frac == 0xF indicates MTE_ASYNC is unsupported</div><div class='add'>+	 * and MTE_frac == 0 indicates it is supported.</div><div class='add'>+	 *</div><div class='add'>+	 * As MTE_frac was previously unconditionally read as 0, check</div><div class='add'>+	 * that the set to 0 succeeds but does not change MTE_frac</div><div class='add'>+	 * from unsupported (0xF) to supported (0).</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+	mte_frac = FIELD_GET(ID_AA64PFR1_EL1_MTE_frac, val);</div><div class='add'>+	if (mte != ID_AA64PFR1_EL1_MTE_MTE2 ||</div><div class='add'>+	    mte_frac != ID_AA64PFR1_EL1_MTE_frac_NI) {</div><div class='add'>+		ksft_test_result_skip("MTE_ASYNC or MTE_ASYMM are supported, nothing to test\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Try to set MTE_frac=0. */</div><div class='add'>+	val &amp;= ~ID_AA64PFR1_EL1_MTE_frac_MASK;</div><div class='add'>+	val |= FIELD_PREP(ID_AA64PFR1_EL1_MTE_frac_MASK, 0);</div><div class='add'>+	err = __vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_ID_AA64PFR1_EL1), val);</div><div class='add'>+	if (err) {</div><div class='add'>+		ksft_test_result_fail("ID_AA64PFR1_EL1.MTE_frac=0 was not accepted\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_ID_AA64PFR1_EL1));</div><div class='add'>+	mte_frac = FIELD_GET(ID_AA64PFR1_EL1_MTE_frac, val);</div><div class='add'>+	if (mte_frac == ID_AA64PFR1_EL1_MTE_frac_NI)</div><div class='add'>+		ksft_test_result_pass("ID_AA64PFR1_EL1.MTE_frac=0 accepted and still 0xF\n");</div><div class='add'>+	else</div><div class='add'>+		ksft_test_result_pass("ID_AA64PFR1_EL1.MTE_frac no longer 0xF\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void test_guest_reg_read(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	bool done = false;</div><div class='hunk'>@@ -578,7 +676,7 @@ static void test_clidr(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	clidr = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_CLIDR_EL1));</div><div class='ctx'> </div><div class='ctx'> 	/* find the first empty level in the cache hierarchy */</div><div class='del'>-	for (level = 1; level &lt; 7; level++) {</div><div class='add'>+	for (level = 1; level &lt;= 7; level++) {</div><div class='ctx'> 		if (!CLIDR_CTYPE(clidr, level))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -609,18 +707,31 @@ static void test_ctr(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	test_reg_vals[encoding_to_range_idx(SYS_CTR_EL0)] = ctr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_vcpu_ftr_id_regs(struct kvm_vcpu *vcpu)</div><div class='add'>+static void test_id_reg(struct kvm_vcpu *vcpu, u32 id)</div><div class='ctx'> {</div><div class='ctx'> 	u64 val;</div><div class='ctx'> </div><div class='add'>+	val = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(id));</div><div class='add'>+	val++;</div><div class='add'>+	vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(id), val);</div><div class='add'>+	test_reg_vals[encoding_to_range_idx(id)] = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_vcpu_ftr_id_regs(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='ctx'> 	test_clidr(vcpu);</div><div class='ctx'> 	test_ctr(vcpu);</div><div class='ctx'> </div><div class='del'>-	val = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1));</div><div class='del'>-	val++;</div><div class='del'>-	vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1), val);</div><div class='add'>+	test_id_reg(vcpu, SYS_MPIDR_EL1);</div><div class='add'>+	ksft_test_result_pass("%s\n", __func__);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_vcpu_non_ftr_id_regs(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	test_id_reg(vcpu, SYS_MIDR_EL1);</div><div class='add'>+	test_id_reg(vcpu, SYS_REVIDR_EL1);</div><div class='add'>+	test_id_reg(vcpu, SYS_AIDR_EL1);</div><div class='ctx'> </div><div class='del'>-	test_reg_vals[encoding_to_range_idx(SYS_MPIDR_EL1)] = val;</div><div class='ctx'> 	ksft_test_result_pass("%s\n", __func__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -647,6 +758,9 @@ static void test_reset_preserves_id_regs(struct kvm_vcpu *vcpu)</div><div class='ctx'> 	test_assert_id_reg_unchanged(vcpu, SYS_MPIDR_EL1);</div><div class='ctx'> 	test_assert_id_reg_unchanged(vcpu, SYS_CLIDR_EL1);</div><div class='ctx'> 	test_assert_id_reg_unchanged(vcpu, SYS_CTR_EL0);</div><div class='add'>+	test_assert_id_reg_unchanged(vcpu, SYS_MIDR_EL1);</div><div class='add'>+	test_assert_id_reg_unchanged(vcpu, SYS_REVIDR_EL1);</div><div class='add'>+	test_assert_id_reg_unchanged(vcpu, SYS_AIDR_EL1);</div><div class='ctx'> </div><div class='ctx'> 	ksft_test_result_pass("%s\n", __func__);</div><div class='ctx'> }</div><div class='hunk'>@@ -657,32 +771,37 @@ int main(void)</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> 	bool aarch64_only;</div><div class='ctx'> 	uint64_t val, el0;</div><div class='del'>-	int test_cnt;</div><div class='add'>+	int test_cnt, i, j;</div><div class='ctx'> </div><div class='ctx'> 	TEST_REQUIRE(kvm_has_cap(KVM_CAP_ARM_SUPPORTED_REG_MASK_RANGES));</div><div class='add'>+	TEST_REQUIRE(kvm_has_cap(KVM_CAP_ARM_WRITABLE_IMP_ID_REGS));</div><div class='add'>+</div><div class='add'>+	test_wants_mte();</div><div class='ctx'> </div><div class='del'>-	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code);</div><div class='add'>+	vm = vm_create(1);</div><div class='add'>+	vm_enable_cap(vm, KVM_CAP_ARM_WRITABLE_IMP_ID_REGS, 0);</div><div class='add'>+	vcpu = vm_vcpu_add(vm, 0, guest_code);</div><div class='add'>+	kvm_arch_vm_finalize_vcpus(vm);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for AARCH64 only system */</div><div class='ctx'> 	val = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_ID_AA64PFR0_EL1));</div><div class='del'>-	el0 = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_EL0), val);</div><div class='add'>+	el0 = FIELD_GET(ID_AA64PFR0_EL1_EL0, val);</div><div class='ctx'> 	aarch64_only = (el0 == ID_AA64PFR0_EL1_EL0_IMP);</div><div class='ctx'> </div><div class='ctx'> 	ksft_print_header();</div><div class='ctx'> </div><div class='del'>-	test_cnt = ARRAY_SIZE(ftr_id_aa64dfr0_el1) + ARRAY_SIZE(ftr_id_dfr0_el1) +</div><div class='del'>-		   ARRAY_SIZE(ftr_id_aa64isar0_el1) + ARRAY_SIZE(ftr_id_aa64isar1_el1) +</div><div class='del'>-		   ARRAY_SIZE(ftr_id_aa64isar2_el1) + ARRAY_SIZE(ftr_id_aa64pfr0_el1) +</div><div class='del'>-		   ARRAY_SIZE(ftr_id_aa64pfr1_el1) + ARRAY_SIZE(ftr_id_aa64mmfr0_el1) +</div><div class='del'>-		   ARRAY_SIZE(ftr_id_aa64mmfr1_el1) + ARRAY_SIZE(ftr_id_aa64mmfr2_el1) +</div><div class='del'>-		   ARRAY_SIZE(ftr_id_aa64zfr0_el1) - ARRAY_SIZE(test_regs) + 2 +</div><div class='del'>-		   MPAM_IDREG_TEST;</div><div class='add'>+	test_cnt = 3 + MPAM_IDREG_TEST + MTE_IDREG_TEST;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(test_regs); i++)</div><div class='add'>+		for (j = 0; test_regs[i].ftr_bits[j].type != FTR_END; j++)</div><div class='add'>+			test_cnt++;</div><div class='ctx'> </div><div class='ctx'> 	ksft_set_plan(test_cnt);</div><div class='ctx'> </div><div class='ctx'> 	test_vm_ftr_id_regs(vcpu, aarch64_only);</div><div class='ctx'> 	test_vcpu_ftr_id_regs(vcpu);</div><div class='add'>+	test_vcpu_non_ftr_id_regs(vcpu);</div><div class='ctx'> 	test_user_set_mpam_reg(vcpu);</div><div class='add'>+	test_user_set_mte_reg(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	test_guest_reg_read(vcpu);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/smccc_filter.c b/tools/testing/selftests/kvm/arm64/smccc_filter.c<br/>index 2d189f3da228..1763b9d45400 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/smccc_filter.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/smccc_filter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/smccc_filter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/smccc_filter.c</a></div><div class='hunk'>@@ -22,8 +22,20 @@ enum smccc_conduit {</div><div class='ctx'> 	SMC_INSN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static bool test_runs_at_el2(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vm *vm = vm_create(1);</div><div class='add'>+	struct kvm_vcpu_init init;</div><div class='add'>+</div><div class='add'>+	kvm_get_default_vcpu_target(vm, &amp;init);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+</div><div class='add'>+	return init.features[0] &amp; BIT(KVM_ARM_VCPU_HAS_EL2);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define for_each_conduit(conduit)					\</div><div class='del'>-	for (conduit = HVC_INSN; conduit &lt;= SMC_INSN; conduit++)</div><div class='add'>+	for (conduit = test_runs_at_el2() ? SMC_INSN : HVC_INSN;	\</div><div class='add'>+	     conduit &lt;= SMC_INSN; conduit++)</div><div class='ctx'> </div><div class='ctx'> static void guest_main(uint32_t func_id, enum smccc_conduit conduit)</div><div class='ctx'> {</div><div class='hunk'>@@ -64,7 +76,7 @@ static struct kvm_vm *setup_vm(struct kvm_vcpu **vcpu)</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> </div><div class='ctx'> 	vm = vm_create(1);</div><div class='del'>-	vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &amp;init);</div><div class='add'>+	kvm_get_default_vcpu_target(vm, &amp;init);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable in-kernel emulation of PSCI to ensure that calls are denied</div><div class='hunk'>@@ -73,6 +85,7 @@ static struct kvm_vm *setup_vm(struct kvm_vcpu **vcpu)</div><div class='ctx'> 	init.features[0] |= (1 &lt;&lt; KVM_ARM_VCPU_PSCI_0_2);</div><div class='ctx'> </div><div class='ctx'> 	*vcpu = aarch64_vcpu_add(vm, 0, &amp;init, guest_main);</div><div class='add'>+	kvm_arch_vm_finalize_vcpus(vm);</div><div class='ctx'> 	return vm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/vgic_init.c b/tools/testing/selftests/kvm/arm64/vgic_init.c<br/>index b3b5fb0ff0a9..8d6d3a4ae4db 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/vgic_init.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/vgic_init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/vgic_init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/vgic_init.c</a></div><div class='hunk'>@@ -9,17 +9,18 @@</div><div class='ctx'> #include &lt;asm/kvm.h&gt;</div><div class='ctx'> #include &lt;asm/kvm_para.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;arm64/gic_v3.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "test_util.h"</div><div class='ctx'> #include "kvm_util.h"</div><div class='ctx'> #include "processor.h"</div><div class='ctx'> #include "vgic.h"</div><div class='add'>+#include "gic_v3.h"</div><div class='ctx'> </div><div class='ctx'> #define NR_VCPUS		4</div><div class='ctx'> </div><div class='ctx'> #define REG_OFFSET(vcpu, offset) (((uint64_t)vcpu &lt;&lt; 32) | offset)</div><div class='ctx'> </div><div class='del'>-#define GICR_TYPER 0x8</div><div class='del'>-</div><div class='ctx'> #define VGIC_DEV_IS_V2(_d) ((_d) == KVM_DEV_TYPE_ARM_VGIC_V2)</div><div class='ctx'> #define VGIC_DEV_IS_V3(_d) ((_d) == KVM_DEV_TYPE_ARM_VGIC_V3)</div><div class='ctx'> </div><div class='hunk'>@@ -675,6 +676,44 @@ static void test_v3_its_region(void)</div><div class='ctx'> 	vm_gic_destroy(&amp;v);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_v3_nassgicap(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpus[NR_VCPUS];</div><div class='add'>+	bool has_nassgicap;</div><div class='add'>+	struct vm_gic vm;</div><div class='add'>+	u32 typer2;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	vm = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS, vcpus);</div><div class='add'>+	kvm_device_attr_get(vm.gic_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,</div><div class='add'>+			    GICD_TYPER2, &amp;typer2);</div><div class='add'>+	has_nassgicap = typer2 &amp; GICD_TYPER2_nASSGIcap;</div><div class='add'>+</div><div class='add'>+	typer2 |= GICD_TYPER2_nASSGIcap;</div><div class='add'>+	ret = __kvm_device_attr_set(vm.gic_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,</div><div class='add'>+				    GICD_TYPER2, &amp;typer2);</div><div class='add'>+	if (has_nassgicap)</div><div class='add'>+		TEST_ASSERT(!ret, KVM_IOCTL_ERROR(KVM_DEVICE_ATTR_SET, ret));</div><div class='add'>+	else</div><div class='add'>+		TEST_ASSERT(ret &amp;&amp; errno == EINVAL,</div><div class='add'>+			    "Enabled nASSGIcap even though it's unavailable");</div><div class='add'>+</div><div class='add'>+	typer2 &amp;= ~GICD_TYPER2_nASSGIcap;</div><div class='add'>+	kvm_device_attr_set(vm.gic_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,</div><div class='add'>+			    GICD_TYPER2, &amp;typer2);</div><div class='add'>+</div><div class='add'>+	kvm_device_attr_set(vm.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,</div><div class='add'>+			    KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);</div><div class='add'>+</div><div class='add'>+	typer2 ^= GICD_TYPER2_nASSGIcap;</div><div class='add'>+	ret = __kvm_device_attr_set(vm.gic_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,</div><div class='add'>+				    GICD_TYPER2, &amp;typer2);</div><div class='add'>+	TEST_ASSERT(ret &amp;&amp; errno == EBUSY,</div><div class='add'>+		    "Changed nASSGIcap after initializing the VGIC");</div><div class='add'>+</div><div class='add'>+	vm_gic_destroy(&amp;vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Returns 0 if it's possible to create GIC device of a given type (V2 or V3).</div><div class='ctx'>  */</div><div class='hunk'>@@ -715,6 +754,220 @@ int test_kvm_device(uint32_t gic_dev_type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct sr_def {</div><div class='add'>+	const char	*name;</div><div class='add'>+	u32		encoding;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PACK_SR(r)						\</div><div class='add'>+	((sys_reg_Op0(r) &lt;&lt; 14) |				\</div><div class='add'>+	 (sys_reg_Op1(r) &lt;&lt; 11) |				\</div><div class='add'>+	 (sys_reg_CRn(r) &lt;&lt; 7) |				\</div><div class='add'>+	 (sys_reg_CRm(r) &lt;&lt; 3) |				\</div><div class='add'>+	 (sys_reg_Op2(r)))</div><div class='add'>+</div><div class='add'>+#define SR(r)							\</div><div class='add'>+	{							\</div><div class='add'>+		.name		= #r,				\</div><div class='add'>+		.encoding	= r,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct sr_def sysregs_el1[] = {</div><div class='add'>+	SR(SYS_ICC_PMR_EL1),</div><div class='add'>+	SR(SYS_ICC_BPR0_EL1),</div><div class='add'>+	SR(SYS_ICC_AP0R0_EL1),</div><div class='add'>+	SR(SYS_ICC_AP0R1_EL1),</div><div class='add'>+	SR(SYS_ICC_AP0R2_EL1),</div><div class='add'>+	SR(SYS_ICC_AP0R3_EL1),</div><div class='add'>+	SR(SYS_ICC_AP1R0_EL1),</div><div class='add'>+	SR(SYS_ICC_AP1R1_EL1),</div><div class='add'>+	SR(SYS_ICC_AP1R2_EL1),</div><div class='add'>+	SR(SYS_ICC_AP1R3_EL1),</div><div class='add'>+	SR(SYS_ICC_BPR1_EL1),</div><div class='add'>+	SR(SYS_ICC_CTLR_EL1),</div><div class='add'>+	SR(SYS_ICC_SRE_EL1),</div><div class='add'>+	SR(SYS_ICC_IGRPEN0_EL1),</div><div class='add'>+	SR(SYS_ICC_IGRPEN1_EL1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sr_def sysregs_el2[] = {</div><div class='add'>+	SR(SYS_ICH_AP0R0_EL2),</div><div class='add'>+	SR(SYS_ICH_AP0R1_EL2),</div><div class='add'>+	SR(SYS_ICH_AP0R2_EL2),</div><div class='add'>+	SR(SYS_ICH_AP0R3_EL2),</div><div class='add'>+	SR(SYS_ICH_AP1R0_EL2),</div><div class='add'>+	SR(SYS_ICH_AP1R1_EL2),</div><div class='add'>+	SR(SYS_ICH_AP1R2_EL2),</div><div class='add'>+	SR(SYS_ICH_AP1R3_EL2),</div><div class='add'>+	SR(SYS_ICH_HCR_EL2),</div><div class='add'>+	SR(SYS_ICC_SRE_EL2),</div><div class='add'>+	SR(SYS_ICH_VTR_EL2),</div><div class='add'>+	SR(SYS_ICH_VMCR_EL2),</div><div class='add'>+	SR(SYS_ICH_LR0_EL2),</div><div class='add'>+	SR(SYS_ICH_LR1_EL2),</div><div class='add'>+	SR(SYS_ICH_LR2_EL2),</div><div class='add'>+	SR(SYS_ICH_LR3_EL2),</div><div class='add'>+	SR(SYS_ICH_LR4_EL2),</div><div class='add'>+	SR(SYS_ICH_LR5_EL2),</div><div class='add'>+	SR(SYS_ICH_LR6_EL2),</div><div class='add'>+	SR(SYS_ICH_LR7_EL2),</div><div class='add'>+	SR(SYS_ICH_LR8_EL2),</div><div class='add'>+	SR(SYS_ICH_LR9_EL2),</div><div class='add'>+	SR(SYS_ICH_LR10_EL2),</div><div class='add'>+	SR(SYS_ICH_LR11_EL2),</div><div class='add'>+	SR(SYS_ICH_LR12_EL2),</div><div class='add'>+	SR(SYS_ICH_LR13_EL2),</div><div class='add'>+	SR(SYS_ICH_LR14_EL2),</div><div class='add'>+	SR(SYS_ICH_LR15_EL2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void test_sysreg_array(int gic, const struct sr_def *sr, int nr,</div><div class='add'>+			      int (*check)(int, const struct sr_def *, const char *))</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; nr; i++) {</div><div class='add'>+		u64 val;</div><div class='add'>+		u64 attr;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		/* Assume MPIDR_EL1.Aff*=0 */</div><div class='add'>+		attr = PACK_SR(sr[i].encoding);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The API is braindead. A register can be advertised as</div><div class='add'>+		 * available, and yet not be readable or writable.</div><div class='add'>+		 * ICC_APnR{1,2,3}_EL1 are examples of such non-sense, and</div><div class='add'>+		 * ICH_APnR{1,2,3}_EL2 do follow suit for consistency.</div><div class='add'>+		 *</div><div class='add'>+		 * On the bright side, no known HW is implementing more than</div><div class='add'>+		 * 5 bits of priority, so we're safe. Sort of...</div><div class='add'>+		 */</div><div class='add'>+		ret = __kvm_has_device_attr(gic, KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS,</div><div class='add'>+					    attr);</div><div class='add'>+		TEST_ASSERT(ret == 0, "%s unavailable", sr[i].name);</div><div class='add'>+</div><div class='add'>+		/* Check that we can write back what we read */</div><div class='add'>+		ret = __kvm_device_attr_get(gic, KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS,</div><div class='add'>+					    attr, &amp;val);</div><div class='add'>+		TEST_ASSERT(ret == 0 || !check(gic, &amp;sr[i], "read"), "%s unreadable", sr[i].name);</div><div class='add'>+		ret = __kvm_device_attr_set(gic, KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS,</div><div class='add'>+					    attr, &amp;val);</div><div class='add'>+		TEST_ASSERT(ret == 0 || !check(gic, &amp;sr[i], "write"), "%s unwritable", sr[i].name);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 get_ctlr_pribits(int gic)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u64 val;</div><div class='add'>+	u8 pri;</div><div class='add'>+</div><div class='add'>+	ret = __kvm_device_attr_get(gic, KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS,</div><div class='add'>+				    PACK_SR(SYS_ICC_CTLR_EL1), &amp;val);</div><div class='add'>+	TEST_ASSERT(ret == 0, "ICC_CTLR_EL1 unreadable");</div><div class='add'>+</div><div class='add'>+	pri = FIELD_GET(ICC_CTLR_EL1_PRI_BITS_MASK, val) + 1;</div><div class='add'>+	TEST_ASSERT(pri &gt;= 5 &amp;&amp; pri &lt;= 7, "Bad pribits %d", pri);</div><div class='add'>+</div><div class='add'>+	return pri;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_unaccessible_el1_regs(int gic, const struct sr_def *sr, const char *what)</div><div class='add'>+{</div><div class='add'>+	switch (sr-&gt;encoding) {</div><div class='add'>+	case SYS_ICC_AP0R1_EL1:</div><div class='add'>+	case SYS_ICC_AP1R1_EL1:</div><div class='add'>+		if (get_ctlr_pribits(gic) &gt;= 6)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_ICC_AP0R2_EL1:</div><div class='add'>+	case SYS_ICC_AP0R3_EL1:</div><div class='add'>+	case SYS_ICC_AP1R2_EL1:</div><div class='add'>+	case SYS_ICC_AP1R3_EL1:</div><div class='add'>+		if (get_ctlr_pribits(gic) == 7)</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("SKIP %s for %s\n", sr-&gt;name, what);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 get_vtr_pribits(int gic)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u64 val;</div><div class='add'>+	u8 pri;</div><div class='add'>+</div><div class='add'>+	ret = __kvm_device_attr_get(gic, KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS,</div><div class='add'>+				    PACK_SR(SYS_ICH_VTR_EL2), &amp;val);</div><div class='add'>+	TEST_ASSERT(ret == 0, "ICH_VTR_EL2 unreadable");</div><div class='add'>+</div><div class='add'>+	pri = FIELD_GET(ICH_VTR_EL2_PRIbits, val) + 1;</div><div class='add'>+	TEST_ASSERT(pri &gt;= 5 &amp;&amp; pri &lt;= 7, "Bad pribits %d", pri);</div><div class='add'>+</div><div class='add'>+	return pri;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_unaccessible_el2_regs(int gic, const struct sr_def *sr, const char *what)</div><div class='add'>+{</div><div class='add'>+	switch (sr-&gt;encoding) {</div><div class='add'>+	case SYS_ICH_AP0R1_EL2:</div><div class='add'>+	case SYS_ICH_AP1R1_EL2:</div><div class='add'>+		if (get_vtr_pribits(gic) &gt;= 6)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case SYS_ICH_AP0R2_EL2:</div><div class='add'>+	case SYS_ICH_AP0R3_EL2:</div><div class='add'>+	case SYS_ICH_AP1R2_EL2:</div><div class='add'>+	case SYS_ICH_AP1R3_EL2:</div><div class='add'>+		if (get_vtr_pribits(gic) == 7)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_info("SKIP %s for %s\n", sr-&gt;name, what);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_v3_sysregs(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu_init init = {};</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	u32 feat = 0;</div><div class='add'>+	int gic;</div><div class='add'>+</div><div class='add'>+	if (kvm_check_cap(KVM_CAP_ARM_EL2))</div><div class='add'>+		feat |= BIT(KVM_ARM_VCPU_HAS_EL2);</div><div class='add'>+</div><div class='add'>+	vm = vm_create(1);</div><div class='add'>+</div><div class='add'>+	vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &amp;init);</div><div class='add'>+	init.features[0] |= feat;</div><div class='add'>+</div><div class='add'>+	vcpu = aarch64_vcpu_add(vm, 0, &amp;init, NULL);</div><div class='add'>+	TEST_ASSERT(vcpu, "Can't create a vcpu?");</div><div class='add'>+</div><div class='add'>+	gic = kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3);</div><div class='add'>+	TEST_ASSERT(gic &gt;= 0, "No GIC???");</div><div class='add'>+</div><div class='add'>+	kvm_device_attr_set(gic, KVM_DEV_ARM_VGIC_GRP_CTRL,</div><div class='add'>+			    KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);</div><div class='add'>+</div><div class='add'>+	test_sysreg_array(gic, sysregs_el1, ARRAY_SIZE(sysregs_el1), check_unaccessible_el1_regs);</div><div class='add'>+	if (feat)</div><div class='add'>+		test_sysreg_array(gic, sysregs_el2, ARRAY_SIZE(sysregs_el2), check_unaccessible_el2_regs);</div><div class='add'>+	else</div><div class='add'>+		pr_info("SKIP EL2 registers, not available\n");</div><div class='add'>+</div><div class='add'>+	close(gic);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void run_tests(uint32_t gic_dev_type)</div><div class='ctx'> {</div><div class='ctx'> 	test_vcpus_then_vgic(gic_dev_type);</div><div class='hunk'>@@ -730,6 +983,8 @@ void run_tests(uint32_t gic_dev_type)</div><div class='ctx'> 		test_v3_last_bit_single_rdist();</div><div class='ctx'> 		test_v3_redist_ipa_range_check_at_vcpu_run();</div><div class='ctx'> 		test_v3_its_region();</div><div class='add'>+		test_v3_sysregs();</div><div class='add'>+		test_v3_nassgicap();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -739,6 +994,8 @@ int main(int ac, char **av)</div><div class='ctx'> 	int pa_bits;</div><div class='ctx'> 	int cnt_impl = 0;</div><div class='ctx'> </div><div class='add'>+	test_disable_default_vgic();</div><div class='add'>+</div><div class='ctx'> 	pa_bits = vm_guest_mode_params[VM_MODE_DEFAULT].pa_bits;</div><div class='ctx'> 	max_phys_size = 1ULL &lt;&lt; pa_bits;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/vgic_irq.c b/tools/testing/selftests/kvm/arm64/vgic_irq.c<br/>index f4ac28d53747..2fb2c7939fe9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/vgic_irq.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/vgic_irq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/vgic_irq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/vgic_irq.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@ struct test_args {</div><div class='ctx'> 	bool level_sensitive; /* 1 is level, 0 is edge */</div><div class='ctx'> 	int kvm_max_routes; /* output of KVM_CAP_IRQ_ROUTING */</div><div class='ctx'> 	bool kvm_supports_irqfd; /* output of KVM_CAP_IRQFD */</div><div class='add'>+	uint32_t shared_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -205,7 +206,7 @@ static void kvm_inject_call(kvm_inject_cmd cmd, uint32_t first_intid,</div><div class='ctx'> do { 										\</div><div class='ctx'> 	uint32_t _intid;							\</div><div class='ctx'> 	_intid = gic_get_and_ack_irq();						\</div><div class='del'>-	GUEST_ASSERT(_intid == 0 || _intid == IAR_SPURIOUS);			\</div><div class='add'>+	GUEST_ASSERT(_intid == IAR_SPURIOUS);					\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #define CAT_HELPER(a, b) a ## b</div><div class='hunk'>@@ -359,8 +360,9 @@ static uint32_t wait_for_and_activate_irq(void)</div><div class='ctx'>  * interrupts for the whole test.</div><div class='ctx'>  */</div><div class='ctx'> static void test_inject_preemption(struct test_args *args,</div><div class='del'>-		uint32_t first_intid, int num,</div><div class='del'>-		kvm_inject_cmd cmd)</div><div class='add'>+				   uint32_t first_intid, int num,</div><div class='add'>+				   const unsigned long *exclude,</div><div class='add'>+				   kvm_inject_cmd cmd)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t intid, prio, step = KVM_PRIO_STEPS;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -379,6 +381,10 @@ static void test_inject_preemption(struct test_args *args,</div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='ctx'> 		uint32_t tmp;</div><div class='ctx'> 		intid = i + first_intid;</div><div class='add'>+</div><div class='add'>+		if (exclude &amp;&amp; test_bit(i, exclude))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		KVM_INJECT(cmd, intid);</div><div class='ctx'> 		/* Each successive IRQ will preempt the previous one. */</div><div class='ctx'> 		tmp = wait_for_and_activate_irq();</div><div class='hunk'>@@ -390,15 +396,33 @@ static void test_inject_preemption(struct test_args *args,</div><div class='ctx'> 	/* finish handling the IRQs starting with the highest priority one. */</div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='ctx'> 		intid = num - i - 1 + first_intid;</div><div class='add'>+</div><div class='add'>+		if (exclude &amp;&amp; test_bit(intid - first_intid, exclude))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		gic_set_eoi(intid);</div><div class='del'>-		if (args-&gt;eoi_split)</div><div class='del'>-			gic_set_dir(intid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (args-&gt;eoi_split) {</div><div class='add'>+		for (i = 0; i &lt; num; i++) {</div><div class='add'>+			intid = i + first_intid;</div><div class='add'>+</div><div class='add'>+			if (exclude &amp;&amp; test_bit(i, exclude))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (args-&gt;eoi_split)</div><div class='add'>+				gic_set_dir(intid);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num; i++)</div><div class='add'>+	for (i = 0; i &lt; num; i++) {</div><div class='add'>+		if (exclude &amp;&amp; test_bit(i, exclude))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		GUEST_ASSERT(!gic_irq_get_active(i + first_intid));</div><div class='add'>+	}</div><div class='ctx'> 	GUEST_ASSERT_EQ(gic_read_ap1r0(), 0);</div><div class='ctx'> 	GUEST_ASSERT_IAR_EMPTY();</div><div class='ctx'> </div><div class='hunk'>@@ -436,33 +460,32 @@ static void test_injection_failure(struct test_args *args,</div><div class='ctx'> </div><div class='ctx'> static void test_preemption(struct test_args *args, struct kvm_inject_desc *f)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * Test up to 4 levels of preemption. The reason is that KVM doesn't</div><div class='del'>-	 * currently implement the ability to have more than the number-of-LRs</div><div class='del'>-	 * number of concurrently active IRQs. The number of LRs implemented is</div><div class='del'>-	 * IMPLEMENTATION DEFINED, however, it seems that most implement 4.</div><div class='del'>-	 */</div><div class='add'>+	/* Timer PPIs cannot be injected from userspace */</div><div class='add'>+	static const unsigned long ppi_exclude = (BIT(27 - MIN_PPI) |</div><div class='add'>+						  BIT(30 - MIN_PPI) |</div><div class='add'>+						  BIT(28 - MIN_PPI) |</div><div class='add'>+						  BIT(26 - MIN_PPI));</div><div class='add'>+</div><div class='ctx'> 	if (f-&gt;sgi)</div><div class='del'>-		test_inject_preemption(args, MIN_SGI, 4, f-&gt;cmd);</div><div class='add'>+		test_inject_preemption(args, MIN_SGI, 16, NULL, f-&gt;cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;ppi)</div><div class='del'>-		test_inject_preemption(args, MIN_PPI, 4, f-&gt;cmd);</div><div class='add'>+		test_inject_preemption(args, MIN_PPI, 16, &amp;ppi_exclude, f-&gt;cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;spi)</div><div class='del'>-		test_inject_preemption(args, MIN_SPI, 4, f-&gt;cmd);</div><div class='add'>+		test_inject_preemption(args, MIN_SPI, 31, NULL, f-&gt;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void test_restore_active(struct test_args *args, struct kvm_inject_desc *f)</div><div class='ctx'> {</div><div class='del'>-	/* Test up to 4 active IRQs. Same reason as in test_preemption. */</div><div class='ctx'> 	if (f-&gt;sgi)</div><div class='del'>-		guest_restore_active(args, MIN_SGI, 4, f-&gt;cmd);</div><div class='add'>+		guest_restore_active(args, MIN_SGI, 16, f-&gt;cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;ppi)</div><div class='del'>-		guest_restore_active(args, MIN_PPI, 4, f-&gt;cmd);</div><div class='add'>+		guest_restore_active(args, MIN_PPI, 16, f-&gt;cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;spi)</div><div class='del'>-		guest_restore_active(args, MIN_SPI, 4, f-&gt;cmd);</div><div class='add'>+		guest_restore_active(args, MIN_SPI, 31, f-&gt;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void guest_code(struct test_args *args)</div><div class='hunk'>@@ -473,12 +496,12 @@ static void guest_code(struct test_args *args)</div><div class='ctx'> </div><div class='ctx'> 	gic_init(GIC_V3, 1);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nr_irqs; i++)</div><div class='del'>-		gic_irq_enable(i);</div><div class='del'>-</div><div class='ctx'> 	for (i = MIN_SPI; i &lt; nr_irqs; i++)</div><div class='ctx'> 		gic_irq_set_config(i, !level_sensitive);</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; nr_irqs; i++)</div><div class='add'>+		gic_irq_enable(i);</div><div class='add'>+</div><div class='ctx'> 	gic_set_eoi_split(args-&gt;eoi_split);</div><div class='ctx'> </div><div class='ctx'> 	reset_priorities(args);</div><div class='hunk'>@@ -620,18 +643,12 @@ static void kvm_routing_and_irqfd_check(struct kvm_vm *vm,</div><div class='ctx'> 	 * that no actual interrupt was injected for those cases.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	for (f = 0, i = intid; i &lt; (uint64_t)intid + num; i++, f++) {</div><div class='del'>-		fd[f] = eventfd(0, 0);</div><div class='del'>-		TEST_ASSERT(fd[f] != -1, __KVM_SYSCALL_ERROR("eventfd()", fd[f]));</div><div class='del'>-	}</div><div class='add'>+	for (f = 0, i = intid; i &lt; (uint64_t)intid + num; i++, f++)</div><div class='add'>+		fd[f] = kvm_new_eventfd();</div><div class='ctx'> </div><div class='ctx'> 	for (f = 0, i = intid; i &lt; (uint64_t)intid + num; i++, f++) {</div><div class='del'>-		struct kvm_irqfd irqfd = {</div><div class='del'>-			.fd  = fd[f],</div><div class='del'>-			.gsi = i - MIN_SPI,</div><div class='del'>-		};</div><div class='ctx'> 		assert(i &lt;= (uint64_t)UINT_MAX);</div><div class='del'>-		vm_ioctl(vm, KVM_IRQFD, &amp;irqfd);</div><div class='add'>+		kvm_assign_irqfd(vm, i - MIN_SPI, fd[f]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (f = 0, i = intid; i &lt; (uint64_t)intid + num; i++, f++) {</div><div class='hunk'>@@ -642,7 +659,7 @@ static void kvm_routing_and_irqfd_check(struct kvm_vm *vm,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (f = 0, i = intid; i &lt; (uint64_t)intid + num; i++, f++)</div><div class='del'>-		close(fd[f]);</div><div class='add'>+		kvm_close(fd[f]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* handles the valid case: intid=0xffffffff num=1 */</div><div class='hunk'>@@ -758,7 +775,6 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split)</div><div class='ctx'> 	vcpu_args_set(vcpu, 1, args_gva);</div><div class='ctx'> </div><div class='ctx'> 	gic_fd = vgic_v3_setup(vm, 1, nr_irqs);</div><div class='del'>-	__TEST_REQUIRE(gic_fd &gt;= 0, "Failed to create vgic-v3, skipping");</div><div class='ctx'> </div><div class='ctx'> 	vm_install_exception_handler(vm, VECTOR_IRQ_CURRENT,</div><div class='ctx'> 		guest_irq_handlers[args.eoi_split][args.level_sensitive]);</div><div class='hunk'>@@ -786,6 +802,221 @@ done:</div><div class='ctx'> 	kvm_vm_free(vm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void guest_code_asym_dir(struct test_args *args, int cpuid)</div><div class='add'>+{</div><div class='add'>+	gic_init(GIC_V3, 2);</div><div class='add'>+</div><div class='add'>+	gic_set_eoi_split(1);</div><div class='add'>+	gic_set_priority_mask(CPU_PRIO_MASK);</div><div class='add'>+</div><div class='add'>+	if (cpuid == 0) {</div><div class='add'>+		uint32_t intid;</div><div class='add'>+</div><div class='add'>+		local_irq_disable();</div><div class='add'>+</div><div class='add'>+		gic_set_priority(MIN_PPI, IRQ_DEFAULT_PRIO);</div><div class='add'>+		gic_irq_enable(MIN_SPI);</div><div class='add'>+		gic_irq_set_pending(MIN_SPI);</div><div class='add'>+</div><div class='add'>+		intid = wait_for_and_activate_irq();</div><div class='add'>+		GUEST_ASSERT_EQ(intid, MIN_SPI);</div><div class='add'>+</div><div class='add'>+		gic_set_eoi(intid);</div><div class='add'>+		isb();</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(args-&gt;shared_data, MIN_SPI);</div><div class='add'>+		dsb(ishst);</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			dsb(ishld);</div><div class='add'>+		} while (READ_ONCE(args-&gt;shared_data) == MIN_SPI);</div><div class='add'>+		GUEST_ASSERT(!gic_irq_get_active(MIN_SPI));</div><div class='add'>+	} else {</div><div class='add'>+		do {</div><div class='add'>+			dsb(ishld);</div><div class='add'>+		} while (READ_ONCE(args-&gt;shared_data) != MIN_SPI);</div><div class='add'>+</div><div class='add'>+		gic_set_dir(MIN_SPI);</div><div class='add'>+		isb();</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(args-&gt;shared_data, 0);</div><div class='add'>+		dsb(ishst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_code_group_en(struct test_args *args, int cpuid)</div><div class='add'>+{</div><div class='add'>+	uint32_t intid;</div><div class='add'>+</div><div class='add'>+	gic_init(GIC_V3, 2);</div><div class='add'>+</div><div class='add'>+	gic_set_eoi_split(0);</div><div class='add'>+	gic_set_priority_mask(CPU_PRIO_MASK);</div><div class='add'>+	/* SGI0 is G0, which is disabled */</div><div class='add'>+	gic_irq_set_group(0, 0);</div><div class='add'>+</div><div class='add'>+	/* Configure all SGIs with decreasing priority */</div><div class='add'>+	for (intid = 0; intid &lt; MIN_PPI; intid++) {</div><div class='add'>+		gic_set_priority(intid, (intid + 1) * 8);</div><div class='add'>+		gic_irq_enable(intid);</div><div class='add'>+		gic_irq_set_pending(intid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ack and EOI all G1 interrupts */</div><div class='add'>+	for (int i = 1; i &lt; MIN_PPI; i++) {</div><div class='add'>+		intid = wait_for_and_activate_irq();</div><div class='add'>+</div><div class='add'>+		GUEST_ASSERT(intid &lt; MIN_PPI);</div><div class='add'>+		gic_set_eoi(intid);</div><div class='add'>+		isb();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check that SGI0 is still pending, inactive, and that we cannot</div><div class='add'>+	 * ack anything.</div><div class='add'>+	 */</div><div class='add'>+	GUEST_ASSERT(gic_irq_get_pending(0));</div><div class='add'>+	GUEST_ASSERT(!gic_irq_get_active(0));</div><div class='add'>+	GUEST_ASSERT_IAR_EMPTY();</div><div class='add'>+	GUEST_ASSERT(read_sysreg_s(SYS_ICC_IAR0_EL1) == IAR_SPURIOUS);</div><div class='add'>+</div><div class='add'>+	/* Open the G0 gates, and verify we can ack SGI0 */</div><div class='add'>+	write_sysreg_s(1, SYS_ICC_IGRPEN0_EL1);</div><div class='add'>+	isb();</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		intid = read_sysreg_s(SYS_ICC_IAR0_EL1);</div><div class='add'>+	} while (intid == IAR_SPURIOUS);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT(intid == 0);</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_code_timer_spi(struct test_args *args, int cpuid)</div><div class='add'>+{</div><div class='add'>+	uint32_t intid;</div><div class='add'>+	u64 val;</div><div class='add'>+</div><div class='add'>+	gic_init(GIC_V3, 2);</div><div class='add'>+</div><div class='add'>+	gic_set_eoi_split(1);</div><div class='add'>+	gic_set_priority_mask(CPU_PRIO_MASK);</div><div class='add'>+</div><div class='add'>+	/* Add a pending SPI so that KVM starts trapping DIR */</div><div class='add'>+	gic_set_priority(MIN_SPI + cpuid, IRQ_DEFAULT_PRIO);</div><div class='add'>+	gic_irq_set_pending(MIN_SPI + cpuid);</div><div class='add'>+</div><div class='add'>+	/* Configure the timer with a higher priority, make it pending */</div><div class='add'>+	gic_set_priority(27, IRQ_DEFAULT_PRIO - 8);</div><div class='add'>+</div><div class='add'>+	isb();</div><div class='add'>+	val = read_sysreg(cntvct_el0);</div><div class='add'>+	write_sysreg(val, cntv_cval_el0);</div><div class='add'>+	write_sysreg(1, cntv_ctl_el0);</div><div class='add'>+	isb();</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT(gic_irq_get_pending(27));</div><div class='add'>+</div><div class='add'>+	/* Enable both interrupts */</div><div class='add'>+	gic_irq_enable(MIN_SPI + cpuid);</div><div class='add'>+	gic_irq_enable(27);</div><div class='add'>+</div><div class='add'>+	/* The timer must fire */</div><div class='add'>+	intid = wait_for_and_activate_irq();</div><div class='add'>+	GUEST_ASSERT(intid == 27);</div><div class='add'>+</div><div class='add'>+	/* Check that we can deassert it */</div><div class='add'>+	write_sysreg(0, cntv_ctl_el0);</div><div class='add'>+	isb();</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT(!gic_irq_get_pending(27));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Priority drop, deactivation -- we expect that the host</div><div class='add'>+	 * deactivation will have been effective</div><div class='add'>+	 */</div><div class='add'>+	gic_set_eoi(27);</div><div class='add'>+	gic_set_dir(27);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT(!gic_irq_get_active(27));</div><div class='add'>+</div><div class='add'>+	/* Do it one more time */</div><div class='add'>+	isb();</div><div class='add'>+	val = read_sysreg(cntvct_el0);</div><div class='add'>+	write_sysreg(val, cntv_cval_el0);</div><div class='add'>+	write_sysreg(1, cntv_ctl_el0);</div><div class='add'>+	isb();</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT(gic_irq_get_pending(27));</div><div class='add'>+</div><div class='add'>+	/* The timer must fire again */</div><div class='add'>+	intid = wait_for_and_activate_irq();</div><div class='add'>+	GUEST_ASSERT(intid == 27);</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *test_vcpu_run(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu = arg;</div><div class='add'>+	struct ucall uc;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		vcpu_run(vcpu);</div><div class='add'>+</div><div class='add'>+		switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+		case UCALL_ABORT:</div><div class='add'>+			REPORT_GUEST_ASSERT(uc);</div><div class='add'>+			break;</div><div class='add'>+		case UCALL_DONE:</div><div class='add'>+			return NULL;</div><div class='add'>+		default:</div><div class='add'>+			TEST_FAIL("Unknown ucall %lu", uc.cmd);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_vgic_two_cpus(void *gcode)</div><div class='add'>+{</div><div class='add'>+	pthread_t thr[2];</div><div class='add'>+	struct kvm_vcpu *vcpus[2];</div><div class='add'>+	struct test_args args = {};</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	vm_vaddr_t args_gva;</div><div class='add'>+	int gic_fd, ret;</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_vcpus(2, gcode, vcpus);</div><div class='add'>+</div><div class='add'>+	vm_init_descriptor_tables(vm);</div><div class='add'>+	vcpu_init_descriptor_tables(vcpus[0]);</div><div class='add'>+	vcpu_init_descriptor_tables(vcpus[1]);</div><div class='add'>+</div><div class='add'>+	/* Setup the guest args page (so it gets the args). */</div><div class='add'>+	args_gva = vm_vaddr_alloc_page(vm);</div><div class='add'>+	memcpy(addr_gva2hva(vm, args_gva), &amp;args, sizeof(args));</div><div class='add'>+	vcpu_args_set(vcpus[0], 2, args_gva, 0);</div><div class='add'>+	vcpu_args_set(vcpus[1], 2, args_gva, 1);</div><div class='add'>+</div><div class='add'>+	gic_fd = vgic_v3_setup(vm, 2, 64);</div><div class='add'>+</div><div class='add'>+	ret = pthread_create(&amp;thr[0], NULL, test_vcpu_run, vcpus[0]);</div><div class='add'>+	if (ret)</div><div class='add'>+		TEST_FAIL("Can't create thread for vcpu 0 (%d)\n", ret);</div><div class='add'>+	ret = pthread_create(&amp;thr[1], NULL, test_vcpu_run, vcpus[1]);</div><div class='add'>+	if (ret)</div><div class='add'>+		TEST_FAIL("Can't create thread for vcpu 1 (%d)\n", ret);</div><div class='add'>+</div><div class='add'>+	pthread_join(thr[0], NULL);</div><div class='add'>+	pthread_join(thr[1], NULL);</div><div class='add'>+</div><div class='add'>+	close(gic_fd);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void help(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	printf(</div><div class='hunk'>@@ -808,6 +1039,9 @@ int main(int argc, char **argv)</div><div class='ctx'> 	int opt;</div><div class='ctx'> 	bool eoi_split = false;</div><div class='ctx'> </div><div class='add'>+	TEST_REQUIRE(kvm_supports_vgic_v3());</div><div class='add'>+	test_disable_default_vgic();</div><div class='add'>+</div><div class='ctx'> 	while ((opt = getopt(argc, argv, "hn:e:l:")) != -1) {</div><div class='ctx'> 		switch (opt) {</div><div class='ctx'> 		case 'n':</div><div class='hunk'>@@ -839,6 +1073,9 @@ int main(int argc, char **argv)</div><div class='ctx'> 		test_vgic(nr_irqs, false /* level */, true /* eoi_split */);</div><div class='ctx'> 		test_vgic(nr_irqs, true /* level */, false /* eoi_split */);</div><div class='ctx'> 		test_vgic(nr_irqs, true /* level */, true /* eoi_split */);</div><div class='add'>+		test_vgic_two_cpus(guest_code_asym_dir);</div><div class='add'>+		test_vgic_two_cpus(guest_code_group_en);</div><div class='add'>+		test_vgic_two_cpus(guest_code_timer_spi);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		test_vgic(nr_irqs, level_sensitive, eoi_split);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c b/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c<br/>index fc4fe52fb6f8..e857a605f577 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ static vm_paddr_t gpa_base;</div><div class='ctx'> </div><div class='ctx'> static struct kvm_vm *vm;</div><div class='ctx'> static struct kvm_vcpu **vcpus;</div><div class='del'>-static int gic_fd, its_fd;</div><div class='add'>+static int its_fd;</div><div class='ctx'> </div><div class='ctx'> static struct test_data {</div><div class='ctx'> 	bool		request_vcpus_stop;</div><div class='hunk'>@@ -118,11 +118,16 @@ static void guest_setup_gic(void)</div><div class='ctx'> </div><div class='ctx'> 	guest_setup_its_mappings();</div><div class='ctx'> 	guest_invalidate_all_rdists();</div><div class='add'>+</div><div class='add'>+	/* SYNC to ensure ITS setup is complete */</div><div class='add'>+	for (cpuid = 0; cpuid &lt; test_data.nr_cpus; cpuid++)</div><div class='add'>+		its_send_sync_cmd(test_data.cmdq_base_va, cpuid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void guest_code(size_t nr_lpis)</div><div class='ctx'> {</div><div class='ctx'> 	guest_setup_gic();</div><div class='add'>+	local_irq_enable();</div><div class='ctx'> </div><div class='ctx'> 	GUEST_SYNC(0);</div><div class='ctx'> </div><div class='hunk'>@@ -214,9 +219,6 @@ static void setup_test_data(void)</div><div class='ctx'> </div><div class='ctx'> static void setup_gic(void)</div><div class='ctx'> {</div><div class='del'>-	gic_fd = vgic_v3_setup(vm, test_data.nr_cpus, 64);</div><div class='del'>-	__TEST_REQUIRE(gic_fd &gt;= 0, "Failed to create GICv3");</div><div class='del'>-</div><div class='ctx'> 	its_fd = vgic_its_setup(vm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -334,7 +336,7 @@ static void setup_vm(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	vcpus = malloc(test_data.nr_cpus * sizeof(struct kvm_vcpu));</div><div class='add'>+	vcpus = malloc(test_data.nr_cpus * sizeof(struct kvm_vcpu *));</div><div class='ctx'> 	TEST_ASSERT(vcpus, "Failed to allocate vCPU array");</div><div class='ctx'> </div><div class='ctx'> 	vm = vm_create_with_vcpus(test_data.nr_cpus, guest_code, vcpus);</div><div class='hunk'>@@ -355,7 +357,6 @@ static void setup_vm(void)</div><div class='ctx'> static void destroy_vm(void)</div><div class='ctx'> {</div><div class='ctx'> 	close(its_fd);</div><div class='del'>-	close(gic_fd);</div><div class='ctx'> 	kvm_vm_free(vm);</div><div class='ctx'> 	free(vcpus);</div><div class='ctx'> }</div><div class='hunk'>@@ -374,6 +375,8 @@ int main(int argc, char **argv)</div><div class='ctx'> 	u32 nr_threads;</div><div class='ctx'> 	int c;</div><div class='ctx'> </div><div class='add'>+	TEST_REQUIRE(kvm_supports_vgic_v3());</div><div class='add'>+</div><div class='ctx'> 	while ((c = getopt(argc, argv, "hv:d:e:i:")) != -1) {</div><div class='ctx'> 		switch (c) {</div><div class='ctx'> 		case 'v':</div><div class='head'>diff --git a/tools/testing/selftests/kvm/arm64/vpmu_counter_access.c b/tools/testing/selftests/kvm/arm64/vpmu_counter_access.c<br/>index f16b3b27e32e..ae36325c022f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/vpmu_counter_access.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/arm64/vpmu_counter_access.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/arm64/vpmu_counter_access.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/arm64/vpmu_counter_access.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> struct vpmu_vm {</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='del'>-	int gic_fd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct vpmu_vm vpmu_vm;</div><div class='hunk'>@@ -45,11 +44,6 @@ static uint64_t get_pmcr_n(uint64_t pmcr)</div><div class='ctx'> 	return FIELD_GET(ARMV8_PMU_PMCR_N, pmcr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void set_pmcr_n(uint64_t *pmcr, uint64_t pmcr_n)</div><div class='del'>-{</div><div class='del'>-	u64p_replace_bits((__u64 *) pmcr, pmcr_n, ARMV8_PMU_PMCR_N);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static uint64_t get_counters_mask(uint64_t n)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t mask = BIT(ARMV8_PMU_CYCLE_IDX);</div><div class='hunk'>@@ -415,10 +409,6 @@ static void create_vpmu_vm(void *guest_code)</div><div class='ctx'> 		.attr = KVM_ARM_VCPU_PMU_V3_IRQ,</div><div class='ctx'> 		.addr = (uint64_t)&amp;irq,</div><div class='ctx'> 	};</div><div class='del'>-	struct kvm_device_attr init_attr = {</div><div class='del'>-		.group = KVM_ARM_VCPU_PMU_V3_CTRL,</div><div class='del'>-		.attr = KVM_ARM_VCPU_PMU_V3_INIT,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	/* The test creates the vpmu_vm multiple times. Ensure a clean state */</div><div class='ctx'> 	memset(&amp;vpmu_vm, 0, sizeof(vpmu_vm));</div><div class='hunk'>@@ -431,29 +421,25 @@ static void create_vpmu_vm(void *guest_code)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create vCPU with PMUv3 */</div><div class='del'>-	vm_ioctl(vpmu_vm.vm, KVM_ARM_PREFERRED_TARGET, &amp;init);</div><div class='add'>+	kvm_get_default_vcpu_target(vpmu_vm.vm, &amp;init);</div><div class='ctx'> 	init.features[0] |= (1 &lt;&lt; KVM_ARM_VCPU_PMU_V3);</div><div class='ctx'> 	vpmu_vm.vcpu = aarch64_vcpu_add(vpmu_vm.vm, 0, &amp;init, guest_code);</div><div class='ctx'> 	vcpu_init_descriptor_tables(vpmu_vm.vcpu);</div><div class='del'>-	vpmu_vm.gic_fd = vgic_v3_setup(vpmu_vm.vm, 1, 64);</div><div class='del'>-	__TEST_REQUIRE(vpmu_vm.gic_fd &gt;= 0,</div><div class='del'>-		       "Failed to create vgic-v3, skipping");</div><div class='add'>+</div><div class='add'>+	kvm_arch_vm_finalize_vcpus(vpmu_vm.vm);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure that PMUv3 support is indicated in the ID register */</div><div class='ctx'> 	dfr0 = vcpu_get_reg(vpmu_vm.vcpu, KVM_ARM64_SYS_REG(SYS_ID_AA64DFR0_EL1));</div><div class='del'>-	pmuver = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_PMUVer), dfr0);</div><div class='add'>+	pmuver = FIELD_GET(ID_AA64DFR0_EL1_PMUVer, dfr0);</div><div class='ctx'> 	TEST_ASSERT(pmuver != ID_AA64DFR0_EL1_PMUVer_IMP_DEF &amp;&amp;</div><div class='ctx'> 		    pmuver &gt;= ID_AA64DFR0_EL1_PMUVer_IMP,</div><div class='ctx'> 		    "Unexpected PMUVER (0x%x) on the vCPU with PMUv3", pmuver);</div><div class='ctx'> </div><div class='del'>-	/* Initialize vPMU */</div><div class='ctx'> 	vcpu_ioctl(vpmu_vm.vcpu, KVM_SET_DEVICE_ATTR, &amp;irq_attr);</div><div class='del'>-	vcpu_ioctl(vpmu_vm.vcpu, KVM_SET_DEVICE_ATTR, &amp;init_attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void destroy_vpmu_vm(void)</div><div class='ctx'> {</div><div class='del'>-	close(vpmu_vm.gic_fd);</div><div class='ctx'> 	kvm_vm_free(vpmu_vm.vm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -475,33 +461,28 @@ static void run_vcpu(struct kvm_vcpu *vcpu, uint64_t pmcr_n)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_create_vpmu_vm_with_pmcr_n(uint64_t pmcr_n, bool expect_fail)</div><div class='add'>+static void test_create_vpmu_vm_with_nr_counters(unsigned int nr_counters, bool expect_fail)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='del'>-	uint64_t pmcr, pmcr_orig;</div><div class='add'>+	unsigned int prev;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	create_vpmu_vm(guest_code);</div><div class='ctx'> 	vcpu = vpmu_vm.vcpu;</div><div class='ctx'> </div><div class='del'>-	pmcr_orig = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_PMCR_EL0));</div><div class='del'>-	pmcr = pmcr_orig;</div><div class='add'>+	prev = get_pmcr_n(vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_PMCR_EL0)));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Setting a larger value of PMCR.N should not modify the field, and</div><div class='del'>-	 * return a success.</div><div class='del'>-	 */</div><div class='del'>-	set_pmcr_n(&amp;pmcr, pmcr_n);</div><div class='del'>-	vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_PMCR_EL0), pmcr);</div><div class='del'>-	pmcr = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_PMCR_EL0));</div><div class='add'>+	ret = __vcpu_device_attr_set(vcpu, KVM_ARM_VCPU_PMU_V3_CTRL,</div><div class='add'>+				     KVM_ARM_VCPU_PMU_V3_SET_NR_COUNTERS, &amp;nr_counters);</div><div class='ctx'> </div><div class='ctx'> 	if (expect_fail)</div><div class='del'>-		TEST_ASSERT(pmcr_orig == pmcr,</div><div class='del'>-			    "PMCR.N modified by KVM to a larger value (PMCR: 0x%lx) for pmcr_n: 0x%lx",</div><div class='del'>-			    pmcr, pmcr_n);</div><div class='add'>+		TEST_ASSERT(ret &amp;&amp; errno == EINVAL,</div><div class='add'>+			    "Setting more PMU counters (%u) than available (%u) unexpectedly succeeded",</div><div class='add'>+			    nr_counters, prev);</div><div class='ctx'> 	else</div><div class='del'>-		TEST_ASSERT(pmcr_n == get_pmcr_n(pmcr),</div><div class='del'>-			    "Failed to update PMCR.N to %lu (received: %lu)",</div><div class='del'>-			    pmcr_n, get_pmcr_n(pmcr));</div><div class='add'>+		TEST_ASSERT(!ret, KVM_IOCTL_ERROR(KVM_SET_DEVICE_ATTR, ret));</div><div class='add'>+</div><div class='add'>+	vcpu_device_attr_set(vcpu, KVM_ARM_VCPU_PMU_V3_CTRL, KVM_ARM_VCPU_PMU_V3_INIT, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -516,11 +497,11 @@ static void run_access_test(uint64_t pmcr_n)</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("Test with pmcr_n %lu\n", pmcr_n);</div><div class='ctx'> </div><div class='del'>-	test_create_vpmu_vm_with_pmcr_n(pmcr_n, false);</div><div class='add'>+	test_create_vpmu_vm_with_nr_counters(pmcr_n, false);</div><div class='ctx'> 	vcpu = vpmu_vm.vcpu;</div><div class='ctx'> </div><div class='ctx'> 	/* Save the initial sp to restore them later to run the guest again */</div><div class='del'>-	sp = vcpu_get_reg(vcpu, ARM64_CORE_REG(sp_el1));</div><div class='add'>+	sp = vcpu_get_reg(vcpu, ctxt_reg_alias(vcpu, SYS_SP_EL1));</div><div class='ctx'> </div><div class='ctx'> 	run_vcpu(vcpu, pmcr_n);</div><div class='ctx'> </div><div class='hunk'>@@ -528,11 +509,11 @@ static void run_access_test(uint64_t pmcr_n)</div><div class='ctx'> 	 * Reset and re-initialize the vCPU, and run the guest code again to</div><div class='ctx'> 	 * check if PMCR_EL0.N is preserved.</div><div class='ctx'> 	 */</div><div class='del'>-	vm_ioctl(vpmu_vm.vm, KVM_ARM_PREFERRED_TARGET, &amp;init);</div><div class='add'>+	kvm_get_default_vcpu_target(vpmu_vm.vm, &amp;init);</div><div class='ctx'> 	init.features[0] |= (1 &lt;&lt; KVM_ARM_VCPU_PMU_V3);</div><div class='ctx'> 	aarch64_vcpu_setup(vcpu, &amp;init);</div><div class='ctx'> 	vcpu_init_descriptor_tables(vcpu);</div><div class='del'>-	vcpu_set_reg(vcpu, ARM64_CORE_REG(sp_el1), sp);</div><div class='add'>+	vcpu_set_reg(vcpu, ctxt_reg_alias(vcpu, SYS_SP_EL1), sp);</div><div class='ctx'> 	vcpu_set_reg(vcpu, ARM64_CORE_REG(regs.pc), (uint64_t)guest_code);</div><div class='ctx'> </div><div class='ctx'> 	run_vcpu(vcpu, pmcr_n);</div><div class='hunk'>@@ -557,7 +538,7 @@ static void run_pmregs_validity_test(uint64_t pmcr_n)</div><div class='ctx'> 	uint64_t set_reg_id, clr_reg_id, reg_val;</div><div class='ctx'> 	uint64_t valid_counters_mask, max_counters_mask;</div><div class='ctx'> </div><div class='del'>-	test_create_vpmu_vm_with_pmcr_n(pmcr_n, false);</div><div class='add'>+	test_create_vpmu_vm_with_nr_counters(pmcr_n, false);</div><div class='ctx'> 	vcpu = vpmu_vm.vcpu;</div><div class='ctx'> </div><div class='ctx'> 	valid_counters_mask = get_counters_mask(pmcr_n);</div><div class='hunk'>@@ -611,7 +592,7 @@ static void run_error_test(uint64_t pmcr_n)</div><div class='ctx'> {</div><div class='ctx'> 	pr_debug("Error test with pmcr_n %lu (larger than the host)\n", pmcr_n);</div><div class='ctx'> </div><div class='del'>-	test_create_vpmu_vm_with_pmcr_n(pmcr_n, true);</div><div class='add'>+	test_create_vpmu_vm_with_nr_counters(pmcr_n, true);</div><div class='ctx'> 	destroy_vpmu_vm();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -629,11 +610,25 @@ static uint64_t get_pmcr_n_limit(void)</div><div class='ctx'> 	return get_pmcr_n(pmcr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool kvm_supports_nr_counters_attr(void)</div><div class='add'>+{</div><div class='add'>+	bool supported;</div><div class='add'>+</div><div class='add'>+	create_vpmu_vm(NULL);</div><div class='add'>+	supported = !__vcpu_has_device_attr(vpmu_vm.vcpu, KVM_ARM_VCPU_PMU_V3_CTRL,</div><div class='add'>+					    KVM_ARM_VCPU_PMU_V3_SET_NR_COUNTERS);</div><div class='add'>+	destroy_vpmu_vm();</div><div class='add'>+</div><div class='add'>+	return supported;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int main(void)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t i, pmcr_n;</div><div class='ctx'> </div><div class='ctx'> 	TEST_REQUIRE(kvm_has_cap(KVM_CAP_ARM_PMU_V3));</div><div class='add'>+	TEST_REQUIRE(kvm_supports_vgic_v3());</div><div class='add'>+	TEST_REQUIRE(kvm_supports_nr_counters_attr());</div><div class='ctx'> </div><div class='ctx'> 	pmcr_n = get_pmcr_n_limit();</div><div class='ctx'> 	for (i = 0; i &lt;= pmcr_n; i++) {</div><div class='head'>diff --git a/tools/testing/selftests/kvm/config b/tools/testing/selftests/kvm/config<br/>index 8835fed09e9f..96d874b239eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/config</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> CONFIG_KVM=y</div><div class='ctx'> CONFIG_KVM_INTEL=y</div><div class='ctx'> CONFIG_KVM_AMD=y</div><div class='add'>+CONFIG_EVENTFD=y</div><div class='ctx'> CONFIG_USERFAULTFD=y</div><div class='ctx'> CONFIG_IDLE_PAGE_TRACKING=y</div><div class='head'>diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c<br/>index e79817bd0e29..0a1ea1d1e2d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/dirty_log_perf_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/dirty_log_perf_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/dirty_log_perf_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/dirty_log_perf_test.c</a></div><div class='hunk'>@@ -20,38 +20,6 @@</div><div class='ctx'> #include "guest_modes.h"</div><div class='ctx'> #include "ucall_common.h"</div><div class='ctx'> </div><div class='del'>-#ifdef __aarch64__</div><div class='del'>-#include "arm64/vgic.h"</div><div class='del'>-</div><div class='del'>-static int gic_fd;</div><div class='del'>-</div><div class='del'>-static void arch_setup_vm(struct kvm_vm *vm, unsigned int nr_vcpus)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * The test can still run even if hardware does not support GICv3, as it</div><div class='del'>-	 * is only an optimization to reduce guest exits.</div><div class='del'>-	 */</div><div class='del'>-	gic_fd = vgic_v3_setup(vm, nr_vcpus, 64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void arch_cleanup_vm(struct kvm_vm *vm)</div><div class='del'>-{</div><div class='del'>-	if (gic_fd &gt; 0)</div><div class='del'>-		close(gic_fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else /* __aarch64__ */</div><div class='del'>-</div><div class='del'>-static void arch_setup_vm(struct kvm_vm *vm, unsigned int nr_vcpus)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void arch_cleanup_vm(struct kvm_vm *vm)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* How many host loops to run by default (one KVM_GET_DIRTY_LOG for each loop)*/</div><div class='ctx'> #define TEST_HOST_LOOP_N		2UL</div><div class='ctx'> </div><div class='hunk'>@@ -166,8 +134,6 @@ static void run_test(enum vm_guest_mode mode, void *arg)</div><div class='ctx'> 		vm_enable_cap(vm, KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2,</div><div class='ctx'> 			      dirty_log_manual_caps);</div><div class='ctx'> </div><div class='del'>-	arch_setup_vm(vm, nr_vcpus);</div><div class='del'>-</div><div class='ctx'> 	/* Start the iterations */</div><div class='ctx'> 	iteration = 0;</div><div class='ctx'> 	host_quit = false;</div><div class='hunk'>@@ -285,7 +251,6 @@ static void run_test(enum vm_guest_mode mode, void *arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memstress_free_bitmaps(bitmaps, p-&gt;slots);</div><div class='del'>-	arch_cleanup_vm(vm);</div><div class='ctx'> 	memstress_destroy_vm(vm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c<br/>index aacf80f57439..d58a641b0e6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/dirty_log_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/dirty_log_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/dirty_log_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/dirty_log_test.c</a></div><div class='hunk'>@@ -31,15 +31,18 @@</div><div class='ctx'> /* Default guest test virtual memory offset */</div><div class='ctx'> #define DEFAULT_GUEST_TEST_MEM		0xc0000000</div><div class='ctx'> </div><div class='del'>-/* How many pages to dirty for each guest loop */</div><div class='del'>-#define TEST_PAGES_PER_LOOP		1024</div><div class='del'>-</div><div class='ctx'> /* How many host loops to run (one KVM_GET_DIRTY_LOG for each loop) */</div><div class='ctx'> #define TEST_HOST_LOOP_N		32UL</div><div class='ctx'> </div><div class='ctx'> /* Interval for each host loop (ms) */</div><div class='ctx'> #define TEST_HOST_LOOP_INTERVAL		10UL</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Ensure the vCPU is able to perform a reasonable number of writes in each</div><div class='add'>+ * iteration to provide a lower bound on coverage.</div><div class='add'>+ */</div><div class='add'>+#define TEST_MIN_WRITES_PER_ITERATION	0x100</div><div class='add'>+</div><div class='ctx'> /* Dirty bitmaps are always little endian, so we need to swap on big endian */</div><div class='ctx'> #if defined(__s390x__)</div><div class='ctx'> # define BITOP_LE_SWIZZLE	((BITS_PER_LONG-1) &amp; ~0x7)</div><div class='hunk'>@@ -75,6 +78,8 @@ static uint64_t host_page_size;</div><div class='ctx'> static uint64_t guest_page_size;</div><div class='ctx'> static uint64_t guest_num_pages;</div><div class='ctx'> static uint64_t iteration;</div><div class='add'>+static uint64_t nr_writes;</div><div class='add'>+static bool vcpu_stop;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Guest physical memory offset of the testing memory slot.</div><div class='hunk'>@@ -96,7 +101,9 @@ static uint64_t guest_test_virt_mem = DEFAULT_GUEST_TEST_MEM;</div><div class='ctx'> static void guest_code(void)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t addr;</div><div class='del'>-	int i;</div><div class='add'>+</div><div class='add'>+#ifdef __s390x__</div><div class='add'>+	uint64_t i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On s390x, all pages of a 1M segment are initially marked as dirty</div><div class='hunk'>@@ -107,16 +114,19 @@ static void guest_code(void)</div><div class='ctx'> 	for (i = 0; i &lt; guest_num_pages; i++) {</div><div class='ctx'> 		addr = guest_test_virt_mem + i * guest_page_size;</div><div class='ctx'> 		vcpu_arch_put_guest(*(uint64_t *)addr, READ_ONCE(iteration));</div><div class='add'>+		nr_writes++;</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	while (true) {</div><div class='del'>-		for (i = 0; i &lt; TEST_PAGES_PER_LOOP; i++) {</div><div class='add'>+		while (!READ_ONCE(vcpu_stop)) {</div><div class='ctx'> 			addr = guest_test_virt_mem;</div><div class='ctx'> 			addr += (guest_random_u64(&amp;guest_rng) % guest_num_pages)</div><div class='ctx'> 				* guest_page_size;</div><div class='ctx'> 			addr = align_down(addr, host_page_size);</div><div class='ctx'> </div><div class='ctx'> 			vcpu_arch_put_guest(*(uint64_t *)addr, READ_ONCE(iteration));</div><div class='add'>+			nr_writes++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		GUEST_SYNC(1);</div><div class='hunk'>@@ -133,25 +143,18 @@ static uint64_t host_num_pages;</div><div class='ctx'> /* For statistics only */</div><div class='ctx'> static uint64_t host_dirty_count;</div><div class='ctx'> static uint64_t host_clear_count;</div><div class='del'>-static uint64_t host_track_next_count;</div><div class='ctx'> </div><div class='ctx'> /* Whether dirty ring reset is requested, or finished */</div><div class='ctx'> static sem_t sem_vcpu_stop;</div><div class='ctx'> static sem_t sem_vcpu_cont;</div><div class='del'>-/*</div><div class='del'>- * This is only set by main thread, and only cleared by vcpu thread.  It is</div><div class='del'>- * used to request vcpu thread to stop at the next GUEST_SYNC, since GUEST_SYNC</div><div class='del'>- * is the only place that we'll guarantee both "dirty bit" and "dirty data"</div><div class='del'>- * will match.  E.g., SIG_IPI won't guarantee that if the vcpu is interrupted</div><div class='del'>- * after setting dirty bit but before the data is written.</div><div class='del'>- */</div><div class='del'>-static atomic_t vcpu_sync_stop_requested;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is updated by the vcpu thread to tell the host whether it's a</div><div class='ctx'>  * ring-full event.  It should only be read until a sem_wait() of</div><div class='ctx'>  * sem_vcpu_stop and before vcpu continues to run.</div><div class='ctx'>  */</div><div class='ctx'> static bool dirty_ring_vcpu_ring_full;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is only used for verifying the dirty pages.  Dirty ring has a very</div><div class='ctx'>  * tricky case when the ring just got full, kvm will do userspace exit due to</div><div class='hunk'>@@ -166,7 +169,51 @@ static bool dirty_ring_vcpu_ring_full;</div><div class='ctx'>  * dirty gfn we've collected, so that if a mismatch of data found later in the</div><div class='ctx'>  * verifying process, we let it pass.</div><div class='ctx'>  */</div><div class='del'>-static uint64_t dirty_ring_last_page;</div><div class='add'>+static uint64_t dirty_ring_last_page = -1ULL;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In addition to the above, it is possible (especially if this</div><div class='add'>+ * test is run nested) for the above scenario to repeat multiple times:</div><div class='add'>+ *</div><div class='add'>+ * The following can happen:</div><div class='add'>+ *</div><div class='add'>+ * - L1 vCPU:        Memory write is logged to PML but not committed.</div><div class='add'>+ *</div><div class='add'>+ * - L1 test thread: Ignores the write because its last dirty ring entry</div><div class='add'>+ *                   Resets the dirty ring which:</div><div class='add'>+ *                     - Resets the A/D bits in EPT</div><div class='add'>+ *                     - Issues tlb flush (invept), which is intercepted by L0</div><div class='add'>+ *</div><div class='add'>+ * - L0: frees the whole nested ept mmu root as the response to invept,</div><div class='add'>+ *       and thus ensures that when memory write is retried, it will fault again</div><div class='add'>+ *</div><div class='add'>+ * - L1 vCPU:        Same memory write is logged to the PML but not committed again.</div><div class='add'>+ *</div><div class='add'>+ * - L1 test thread: Ignores the write because its last dirty ring entry (again)</div><div class='add'>+ *                   Resets the dirty ring which:</div><div class='add'>+ *                     - Resets the A/D bits in EPT (again)</div><div class='add'>+ *                     - Issues tlb flush (again) which is intercepted by L0</div><div class='add'>+ *</div><div class='add'>+ * ...</div><div class='add'>+ *</div><div class='add'>+ * N times</div><div class='add'>+ *</div><div class='add'>+ * - L1 vCPU:        Memory write is logged in the PML and then committed.</div><div class='add'>+ *                   Lots of other memory writes are logged and committed.</div><div class='add'>+ * ...</div><div class='add'>+ *</div><div class='add'>+ * - L1 test thread: Sees the memory write along with other memory writes</div><div class='add'>+ *                   in the dirty ring, and since the write is usually not</div><div class='add'>+ *                   the last entry in the dirty-ring and has a very outdated</div><div class='add'>+ *                   iteration, the test fails.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Note that this is only possible when the write was the last log entry</div><div class='add'>+ * write during iteration N-1, thus remember last iteration last log entry</div><div class='add'>+ * and also don't fail when it is reported in the next iteration, together with</div><div class='add'>+ * an outdated iteration count.</div><div class='add'>+ */</div><div class='add'>+static uint64_t dirty_ring_prev_iteration_last_page;</div><div class='ctx'> </div><div class='ctx'> enum log_mode_t {</div><div class='ctx'> 	/* Only use KVM_GET_DIRTY_LOG for logging */</div><div class='hunk'>@@ -191,24 +238,6 @@ static enum log_mode_t host_log_mode;</div><div class='ctx'> static pthread_t vcpu_thread;</div><div class='ctx'> static uint32_t test_dirty_ring_count = TEST_DIRTY_RING_COUNT;</div><div class='ctx'> </div><div class='del'>-static void vcpu_kick(void)</div><div class='del'>-{</div><div class='del'>-	pthread_kill(vcpu_thread, SIG_IPI);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * In our test we do signal tricks, let's use a better version of</div><div class='del'>- * sem_wait to avoid signal interrupts</div><div class='del'>- */</div><div class='del'>-static void sem_wait_until(sem_t *sem)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	do</div><div class='del'>-		ret = sem_wait(sem);</div><div class='del'>-	while (ret == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool clear_log_supported(void)</div><div class='ctx'> {</div><div class='ctx'> 	return kvm_has_cap(KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2);</div><div class='hunk'>@@ -243,21 +272,16 @@ static void clear_log_collect_dirty_pages(struct kvm_vcpu *vcpu, int slot,</div><div class='ctx'> /* Should only be called after a GUEST_SYNC */</div><div class='ctx'> static void vcpu_handle_sync_stop(void)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_read(&amp;vcpu_sync_stop_requested)) {</div><div class='del'>-		/* It means main thread is sleeping waiting */</div><div class='del'>-		atomic_set(&amp;vcpu_sync_stop_requested, false);</div><div class='add'>+	if (READ_ONCE(vcpu_stop)) {</div><div class='ctx'> 		sem_post(&amp;sem_vcpu_stop);</div><div class='del'>-		sem_wait_until(&amp;sem_vcpu_cont);</div><div class='add'>+		sem_wait(&amp;sem_vcpu_cont);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void default_after_vcpu_run(struct kvm_vcpu *vcpu, int ret, int err)</div><div class='add'>+static void default_after_vcpu_run(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_run *run = vcpu-&gt;run;</div><div class='ctx'> </div><div class='del'>-	TEST_ASSERT(ret == 0 || (ret == -1 &amp;&amp; err == EINTR),</div><div class='del'>-		    "vcpu run failed: errno=%d", err);</div><div class='del'>-</div><div class='ctx'> 	TEST_ASSERT(get_ucall(vcpu, NULL) == UCALL_SYNC,</div><div class='ctx'> 		    "Invalid guest sync status: exit_reason=%s",</div><div class='ctx'> 		    exit_reason_str(run-&gt;exit_reason));</div><div class='hunk'>@@ -324,7 +348,6 @@ static uint32_t dirty_ring_collect_one(struct kvm_dirty_gfn *dirty_gfns,</div><div class='ctx'> 			    "%u != %u", cur-&gt;slot, slot);</div><div class='ctx'> 		TEST_ASSERT(cur-&gt;offset &lt; num_pages, "Offset overflow: "</div><div class='ctx'> 			    "0x%llx &gt;= 0x%x", cur-&gt;offset, num_pages);</div><div class='del'>-		//pr_info("fetch 0x%x page %llu\n", *fetch_index, cur-&gt;offset);</div><div class='ctx'> 		__set_bit_le(cur-&gt;offset, bitmap);</div><div class='ctx'> 		dirty_ring_last_page = cur-&gt;offset;</div><div class='ctx'> 		dirty_gfn_set_collected(cur);</div><div class='hunk'>@@ -335,36 +358,11 @@ static uint32_t dirty_ring_collect_one(struct kvm_dirty_gfn *dirty_gfns,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dirty_ring_wait_vcpu(void)</div><div class='del'>-{</div><div class='del'>-	/* This makes sure that hardware PML cache flushed */</div><div class='del'>-	vcpu_kick();</div><div class='del'>-	sem_wait_until(&amp;sem_vcpu_stop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dirty_ring_continue_vcpu(void)</div><div class='del'>-{</div><div class='del'>-	pr_info("Notifying vcpu to continue\n");</div><div class='del'>-	sem_post(&amp;sem_vcpu_cont);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void dirty_ring_collect_dirty_pages(struct kvm_vcpu *vcpu, int slot,</div><div class='ctx'> 					   void *bitmap, uint32_t num_pages,</div><div class='ctx'> 					   uint32_t *ring_buf_idx)</div><div class='ctx'> {</div><div class='del'>-	uint32_t count = 0, cleared;</div><div class='del'>-	bool continued_vcpu = false;</div><div class='del'>-</div><div class='del'>-	dirty_ring_wait_vcpu();</div><div class='del'>-</div><div class='del'>-	if (!dirty_ring_vcpu_ring_full) {</div><div class='del'>-		/*</div><div class='del'>-		 * This is not a ring-full event, it's safe to allow</div><div class='del'>-		 * vcpu to continue</div><div class='del'>-		 */</div><div class='del'>-		dirty_ring_continue_vcpu();</div><div class='del'>-		continued_vcpu = true;</div><div class='del'>-	}</div><div class='add'>+	uint32_t count, cleared;</div><div class='ctx'> </div><div class='ctx'> 	/* Only have one vcpu */</div><div class='ctx'> 	count = dirty_ring_collect_one(vcpu_map_dirty_ring(vcpu),</div><div class='hunk'>@@ -379,35 +377,18 @@ static void dirty_ring_collect_dirty_pages(struct kvm_vcpu *vcpu, int slot,</div><div class='ctx'> 	 */</div><div class='ctx'> 	TEST_ASSERT(cleared == count, "Reset dirty pages (%u) mismatch "</div><div class='ctx'> 		    "with collected (%u)", cleared, count);</div><div class='del'>-</div><div class='del'>-	if (!continued_vcpu) {</div><div class='del'>-		TEST_ASSERT(dirty_ring_vcpu_ring_full,</div><div class='del'>-			    "Didn't continue vcpu even without ring full");</div><div class='del'>-		dirty_ring_continue_vcpu();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_info("Iteration %ld collected %u pages\n", iteration, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dirty_ring_after_vcpu_run(struct kvm_vcpu *vcpu, int ret, int err)</div><div class='add'>+static void dirty_ring_after_vcpu_run(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_run *run = vcpu-&gt;run;</div><div class='ctx'> </div><div class='ctx'> 	/* A ucall-sync or ring-full event is allowed */</div><div class='ctx'> 	if (get_ucall(vcpu, NULL) == UCALL_SYNC) {</div><div class='del'>-		/* We should allow this to continue */</div><div class='del'>-		;</div><div class='del'>-	} else if (run-&gt;exit_reason == KVM_EXIT_DIRTY_RING_FULL ||</div><div class='del'>-		   (ret == -1 &amp;&amp; err == EINTR)) {</div><div class='del'>-		/* Update the flag first before pause */</div><div class='del'>-		WRITE_ONCE(dirty_ring_vcpu_ring_full,</div><div class='del'>-			   run-&gt;exit_reason == KVM_EXIT_DIRTY_RING_FULL);</div><div class='del'>-		sem_post(&amp;sem_vcpu_stop);</div><div class='del'>-		pr_info("vcpu stops because %s...\n",</div><div class='del'>-			dirty_ring_vcpu_ring_full ?</div><div class='del'>-			"dirty ring is full" : "vcpu is kicked out");</div><div class='del'>-		sem_wait_until(&amp;sem_vcpu_cont);</div><div class='del'>-		pr_info("vcpu continues now.\n");</div><div class='add'>+		vcpu_handle_sync_stop();</div><div class='add'>+	} else if (run-&gt;exit_reason == KVM_EXIT_DIRTY_RING_FULL) {</div><div class='add'>+		WRITE_ONCE(dirty_ring_vcpu_ring_full, true);</div><div class='add'>+		vcpu_handle_sync_stop();</div><div class='ctx'> 	} else {</div><div class='ctx'> 		TEST_ASSERT(false, "Invalid guest sync status: "</div><div class='ctx'> 			    "exit_reason=%s",</div><div class='hunk'>@@ -426,7 +407,7 @@ struct log_mode {</div><div class='ctx'> 				     void *bitmap, uint32_t num_pages,</div><div class='ctx'> 				     uint32_t *ring_buf_idx);</div><div class='ctx'> 	/* Hook to call when after each vcpu run */</div><div class='del'>-	void (*after_vcpu_run)(struct kvm_vcpu *vcpu, int ret, int err);</div><div class='add'>+	void (*after_vcpu_run)(struct kvm_vcpu *vcpu);</div><div class='ctx'> } log_modes[LOG_MODE_NUM] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "dirty-log",</div><div class='hunk'>@@ -449,15 +430,6 @@ struct log_mode {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We use this bitmap to track some pages that should have its dirty</div><div class='del'>- * bit set in the _next_ iteration.  For example, if we detected the</div><div class='del'>- * page value changed to current iteration but at the same time the</div><div class='del'>- * page bit is cleared in the latest bitmap, then the system must</div><div class='del'>- * report that write in the next get dirty log call.</div><div class='del'>- */</div><div class='del'>-static unsigned long *host_bmap_track;</div><div class='del'>-</div><div class='ctx'> static void log_modes_dump(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -497,170 +469,109 @@ static void log_mode_collect_dirty_pages(struct kvm_vcpu *vcpu, int slot,</div><div class='ctx'> 	mode-&gt;collect_dirty_pages(vcpu, slot, bitmap, num_pages, ring_buf_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void log_mode_after_vcpu_run(struct kvm_vcpu *vcpu, int ret, int err)</div><div class='add'>+static void log_mode_after_vcpu_run(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct log_mode *mode = &amp;log_modes[host_log_mode];</div><div class='ctx'> </div><div class='ctx'> 	if (mode-&gt;after_vcpu_run)</div><div class='del'>-		mode-&gt;after_vcpu_run(vcpu, ret, err);</div><div class='add'>+		mode-&gt;after_vcpu_run(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *vcpu_worker(void *data)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct kvm_vcpu *vcpu = data;</div><div class='del'>-	uint64_t pages_count = 0;</div><div class='del'>-	struct kvm_signal_mask *sigmask = alloca(offsetof(struct kvm_signal_mask, sigset)</div><div class='del'>-						 + sizeof(sigset_t));</div><div class='del'>-	sigset_t *sigset = (sigset_t *) &amp;sigmask-&gt;sigset;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * SIG_IPI is unblocked atomically while in KVM_RUN.  It causes the</div><div class='del'>-	 * ioctl to return with -EINTR, but it is still pending and we need</div><div class='del'>-	 * to accept it with the sigwait.</div><div class='del'>-	 */</div><div class='del'>-	sigmask-&gt;len = 8;</div><div class='del'>-	pthread_sigmask(0, NULL, sigset);</div><div class='del'>-	sigdelset(sigset, SIG_IPI);</div><div class='del'>-	vcpu_ioctl(vcpu, KVM_SET_SIGNAL_MASK, sigmask);</div><div class='del'>-</div><div class='del'>-	sigemptyset(sigset);</div><div class='del'>-	sigaddset(sigset, SIG_IPI);</div><div class='add'>+	sem_wait(&amp;sem_vcpu_cont);</div><div class='ctx'> </div><div class='ctx'> 	while (!READ_ONCE(host_quit)) {</div><div class='del'>-		/* Clear any existing kick signals */</div><div class='del'>-		pages_count += TEST_PAGES_PER_LOOP;</div><div class='ctx'> 		/* Let the guest dirty the random pages */</div><div class='del'>-		ret = __vcpu_run(vcpu);</div><div class='del'>-		if (ret == -1 &amp;&amp; errno == EINTR) {</div><div class='del'>-			int sig = -1;</div><div class='del'>-			sigwait(sigset, &amp;sig);</div><div class='del'>-			assert(sig == SIG_IPI);</div><div class='del'>-		}</div><div class='del'>-		log_mode_after_vcpu_run(vcpu, ret, errno);</div><div class='add'>+		vcpu_run(vcpu);</div><div class='add'>+		log_mode_after_vcpu_run(vcpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_info("Dirtied %"PRIu64" pages\n", pages_count);</div><div class='del'>-</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vm_dirty_log_verify(enum vm_guest_mode mode, unsigned long *bmap)</div><div class='add'>+static void vm_dirty_log_verify(enum vm_guest_mode mode, unsigned long **bmap)</div><div class='ctx'> {</div><div class='add'>+	uint64_t page, nr_dirty_pages = 0, nr_clean_pages = 0;</div><div class='ctx'> 	uint64_t step = vm_num_host_pages(mode, 1);</div><div class='del'>-	uint64_t page;</div><div class='del'>-	uint64_t *value_ptr;</div><div class='del'>-	uint64_t min_iter = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (page = 0; page &lt; host_num_pages; page += step) {</div><div class='del'>-		value_ptr = host_test_mem + page * host_page_size;</div><div class='del'>-</div><div class='del'>-		/* If this is a special page that we were tracking... */</div><div class='del'>-		if (__test_and_clear_bit_le(page, host_bmap_track)) {</div><div class='del'>-			host_track_next_count++;</div><div class='del'>-			TEST_ASSERT(test_bit_le(page, bmap),</div><div class='del'>-				    "Page %"PRIu64" should have its dirty bit "</div><div class='del'>-				    "set in this iteration but it is missing",</div><div class='del'>-				    page);</div><div class='del'>-		}</div><div class='add'>+		uint64_t val = *(uint64_t *)(host_test_mem + page * host_page_size);</div><div class='add'>+		bool bmap0_dirty = __test_and_clear_bit_le(page, bmap[0]);</div><div class='ctx'> </div><div class='del'>-		if (__test_and_clear_bit_le(page, bmap)) {</div><div class='del'>-			bool matched;</div><div class='del'>-</div><div class='del'>-			host_dirty_count++;</div><div class='add'>+		/*</div><div class='add'>+		 * Ensure both bitmaps are cleared, as a page can be written</div><div class='add'>+		 * multiple times per iteration, i.e. can show up in both</div><div class='add'>+		 * bitmaps, and the dirty ring is additive, i.e. doesn't purge</div><div class='add'>+		 * bitmap entries from previous collections.</div><div class='add'>+		 */</div><div class='add'>+		if (__test_and_clear_bit_le(page, bmap[1]) || bmap0_dirty) {</div><div class='add'>+			nr_dirty_pages++;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			 * If the bit is set, the value written onto</div><div class='del'>-			 * the corresponding page should be either the</div><div class='del'>-			 * previous iteration number or the current one.</div><div class='add'>+			 * If the page is dirty, the value written to memory</div><div class='add'>+			 * should be the current iteration number.</div><div class='ctx'> 			 */</div><div class='del'>-			matched = (*value_ptr == iteration ||</div><div class='del'>-				   *value_ptr == iteration - 1);</div><div class='del'>-</div><div class='del'>-			if (host_log_mode == LOG_MODE_DIRTY_RING &amp;&amp; !matched) {</div><div class='del'>-				if (*value_ptr == iteration - 2 &amp;&amp; min_iter &lt;= iteration - 2) {</div><div class='del'>-					/*</div><div class='del'>-					 * Short answer: this case is special</div><div class='del'>-					 * only for dirty ring test where the</div><div class='del'>-					 * page is the last page before a kvm</div><div class='del'>-					 * dirty ring full in iteration N-2.</div><div class='del'>-					 *</div><div class='del'>-					 * Long answer: Assuming ring size R,</div><div class='del'>-					 * one possible condition is:</div><div class='del'>-					 *</div><div class='del'>-					 *      main thr       vcpu thr</div><div class='del'>-					 *      --------       --------</div><div class='del'>-					 *    iter=1</div><div class='del'>-					 *                   write 1 to page 0~(R-1)</div><div class='del'>-					 *                   full, vmexit</div><div class='del'>-					 *    collect 0~(R-1)</div><div class='del'>-					 *    kick vcpu</div><div class='del'>-					 *                   write 1 to (R-1)~(2R-2)</div><div class='del'>-					 *                   full, vmexit</div><div class='del'>-					 *    iter=2</div><div class='del'>-					 *    collect (R-1)~(2R-2)</div><div class='del'>-					 *    kick vcpu</div><div class='del'>-					 *                   write 1 to (2R-2)</div><div class='del'>-					 *                   (NOTE!!! "1" cached in cpu reg)</div><div class='del'>-					 *                   write 2 to (2R-1)~(3R-3)</div><div class='del'>-					 *                   full, vmexit</div><div class='del'>-					 *    iter=3</div><div class='del'>-					 *    collect (2R-2)~(3R-3)</div><div class='del'>-					 *    (here if we read value on page</div><div class='del'>-					 *     "2R-2" is 1, while iter=3!!!)</div><div class='del'>-					 *</div><div class='del'>-					 * This however can only happen once per iteration.</div><div class='del'>-					 */</div><div class='del'>-					min_iter = iteration - 1;</div><div class='add'>+			if (val == iteration)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (host_log_mode == LOG_MODE_DIRTY_RING) {</div><div class='add'>+				/*</div><div class='add'>+				 * The last page in the ring from previous</div><div class='add'>+				 * iteration can be written with the value</div><div class='add'>+				 * from the previous iteration, as the value to</div><div class='add'>+				 * be written may be cached in a CPU register.</div><div class='add'>+				 */</div><div class='add'>+				if (page == dirty_ring_prev_iteration_last_page &amp;&amp;</div><div class='add'>+				    val == iteration - 1)</div><div class='ctx'> 					continue;</div><div class='del'>-				} else if (page == dirty_ring_last_page) {</div><div class='del'>-					/*</div><div class='del'>-					 * Please refer to comments in</div><div class='del'>-					 * dirty_ring_last_page.</div><div class='del'>-					 */</div><div class='add'>+</div><div class='add'>+				/*</div><div class='add'>+				 * Any value from a previous iteration is legal</div><div class='add'>+				 * for the last entry, as the write may not yet</div><div class='add'>+				 * have retired, i.e. the page may hold whatever</div><div class='add'>+				 * it had before this iteration started.</div><div class='add'>+				 */</div><div class='add'>+				if (page == dirty_ring_last_page &amp;&amp;</div><div class='add'>+				    val &lt; iteration)</div><div class='ctx'> 					continue;</div><div class='del'>-				}</div><div class='add'>+			} else if (!val &amp;&amp; iteration == 1 &amp;&amp; bmap0_dirty) {</div><div class='add'>+				/*</div><div class='add'>+				 * When testing get+clear, the dirty bitmap</div><div class='add'>+				 * starts with all bits set, and so the first</div><div class='add'>+				 * iteration can observe a "dirty" page that</div><div class='add'>+				 * was never written, but only in the first</div><div class='add'>+				 * bitmap (collecting the bitmap also clears</div><div class='add'>+				 * all dirty pages).</div><div class='add'>+				 */</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			TEST_ASSERT(matched,</div><div class='del'>-				    "Set page %"PRIu64" value %"PRIu64</div><div class='del'>-				    " incorrect (iteration=%"PRIu64")",</div><div class='del'>-				    page, *value_ptr, iteration);</div><div class='add'>+			TEST_FAIL("Dirty page %lu value (%lu) != iteration (%lu) "</div><div class='add'>+				  "(last = %lu, prev_last = %lu)",</div><div class='add'>+				  page, val, iteration, dirty_ring_last_page,</div><div class='add'>+				  dirty_ring_prev_iteration_last_page);</div><div class='ctx'> 		} else {</div><div class='del'>-			host_clear_count++;</div><div class='add'>+			nr_clean_pages++;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If cleared, the value written can be any</div><div class='del'>-			 * value smaller or equals to the iteration</div><div class='del'>-			 * number.  Note that the value can be exactly</div><div class='del'>-			 * (iteration-1) if that write can happen</div><div class='del'>-			 * like this:</div><div class='del'>-			 *</div><div class='del'>-			 * (1) increase loop count to "iteration-1"</div><div class='del'>-			 * (2) write to page P happens (with value</div><div class='del'>-			 *     "iteration-1")</div><div class='del'>-			 * (3) get dirty log for "iteration-1"; we'll</div><div class='del'>-			 *     see that page P bit is set (dirtied),</div><div class='del'>-			 *     and not set the bit in host_bmap_track</div><div class='del'>-			 * (4) increase loop count to "iteration"</div><div class='del'>-			 *     (which is current iteration)</div><div class='del'>-			 * (5) get dirty log for current iteration,</div><div class='del'>-			 *     we'll see that page P is cleared, with</div><div class='del'>-			 *     value "iteration-1".</div><div class='add'>+			 * value smaller than the iteration number.</div><div class='ctx'> 			 */</div><div class='del'>-			TEST_ASSERT(*value_ptr &lt;= iteration,</div><div class='del'>-				    "Clear page %"PRIu64" value %"PRIu64</div><div class='del'>-				    " incorrect (iteration=%"PRIu64")",</div><div class='del'>-				    page, *value_ptr, iteration);</div><div class='del'>-			if (*value_ptr == iteration) {</div><div class='del'>-				/*</div><div class='del'>-				 * This page is _just_ modified; it</div><div class='del'>-				 * should report its dirtyness in the</div><div class='del'>-				 * next run</div><div class='del'>-				 */</div><div class='del'>-				__set_bit_le(page, host_bmap_track);</div><div class='del'>-			}</div><div class='add'>+			TEST_ASSERT(val &lt; iteration,</div><div class='add'>+				    "Clear page %lu value (%lu) &gt;= iteration (%lu) "</div><div class='add'>+				    "(last = %lu, prev_last = %lu)",</div><div class='add'>+				    page, val, iteration, dirty_ring_last_page,</div><div class='add'>+				    dirty_ring_prev_iteration_last_page);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	pr_info("Iteration %2ld: dirty: %-6lu clean: %-6lu writes: %-6lu\n",</div><div class='add'>+		iteration, nr_dirty_pages, nr_clean_pages, nr_writes);</div><div class='add'>+</div><div class='add'>+	host_dirty_count += nr_dirty_pages;</div><div class='add'>+	host_clear_count += nr_clean_pages;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct kvm_vm *create_vm(enum vm_guest_mode mode, struct kvm_vcpu **vcpu,</div><div class='hunk'>@@ -674,6 +585,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, struct kvm_vcpu **vcpu,</div><div class='ctx'> </div><div class='ctx'> 	log_mode_create_vm_done(vm);</div><div class='ctx'> 	*vcpu = vm_vcpu_add(vm, 0, guest_code);</div><div class='add'>+	kvm_arch_vm_finalize_vcpus(vm);</div><div class='ctx'> 	return vm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -688,7 +600,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)</div><div class='ctx'> 	struct test_params *p = arg;</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='del'>-	unsigned long *bmap;</div><div class='add'>+	unsigned long *bmap[2];</div><div class='ctx'> 	uint32_t ring_buf_idx = 0;</div><div class='ctx'> 	int sem_val;</div><div class='ctx'> </div><div class='hunk'>@@ -731,12 +643,21 @@ static void run_test(enum vm_guest_mode mode, void *arg)</div><div class='ctx'> #ifdef __s390x__</div><div class='ctx'> 	/* Align to 1M (segment size) */</div><div class='ctx'> 	guest_test_phys_mem = align_down(guest_test_phys_mem, 1 &lt;&lt; 20);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The workaround in guest_code() to write all pages prior to the first</div><div class='add'>+	 * iteration isn't compatible with the dirty ring, as the dirty ring</div><div class='add'>+	 * support relies on the vCPU to actually stop when vcpu_stop is set so</div><div class='add'>+	 * that the vCPU doesn't hang waiting for the dirty ring to be emptied.</div><div class='add'>+	 */</div><div class='add'>+	TEST_ASSERT(host_log_mode != LOG_MODE_DIRTY_RING,</div><div class='add'>+		    "Test needs to be updated to support s390 dirty ring");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	pr_info("guest physical test memory offset: 0x%lx\n", guest_test_phys_mem);</div><div class='ctx'> </div><div class='del'>-	bmap = bitmap_zalloc(host_num_pages);</div><div class='del'>-	host_bmap_track = bitmap_zalloc(host_num_pages);</div><div class='add'>+	bmap[0] = bitmap_zalloc(host_num_pages);</div><div class='add'>+	bmap[1] = bitmap_zalloc(host_num_pages);</div><div class='ctx'> </div><div class='ctx'> 	/* Add an extra memory slot for testing dirty logging */</div><div class='ctx'> 	vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS,</div><div class='hunk'>@@ -757,14 +678,9 @@ static void run_test(enum vm_guest_mode mode, void *arg)</div><div class='ctx'> 	sync_global_to_guest(vm, guest_test_virt_mem);</div><div class='ctx'> 	sync_global_to_guest(vm, guest_num_pages);</div><div class='ctx'> </div><div class='del'>-	/* Start the iterations */</div><div class='del'>-	iteration = 1;</div><div class='del'>-	sync_global_to_guest(vm, iteration);</div><div class='del'>-	WRITE_ONCE(host_quit, false);</div><div class='ctx'> 	host_dirty_count = 0;</div><div class='ctx'> 	host_clear_count = 0;</div><div class='del'>-	host_track_next_count = 0;</div><div class='del'>-	WRITE_ONCE(dirty_ring_vcpu_ring_full, false);</div><div class='add'>+	WRITE_ONCE(host_quit, false);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ensure the previous iteration didn't leave a dangling semaphore, i.e.</div><div class='hunk'>@@ -776,21 +692,95 @@ static void run_test(enum vm_guest_mode mode, void *arg)</div><div class='ctx'> 	sem_getvalue(&amp;sem_vcpu_cont, &amp;sem_val);</div><div class='ctx'> 	TEST_ASSERT_EQ(sem_val, 0);</div><div class='ctx'> </div><div class='add'>+	TEST_ASSERT_EQ(vcpu_stop, false);</div><div class='add'>+</div><div class='ctx'> 	pthread_create(&amp;vcpu_thread, NULL, vcpu_worker, vcpu);</div><div class='ctx'> </div><div class='del'>-	while (iteration &lt; p-&gt;iterations) {</div><div class='del'>-		/* Give the vcpu thread some time to dirty some pages */</div><div class='del'>-		usleep(p-&gt;interval * 1000);</div><div class='del'>-		log_mode_collect_dirty_pages(vcpu, TEST_MEM_SLOT_INDEX,</div><div class='del'>-					     bmap, host_num_pages,</div><div class='del'>-					     &amp;ring_buf_idx);</div><div class='add'>+	for (iteration = 1; iteration &lt;= p-&gt;iterations; iteration++) {</div><div class='add'>+		unsigned long i;</div><div class='add'>+</div><div class='add'>+		sync_global_to_guest(vm, iteration);</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(nr_writes, 0);</div><div class='add'>+		sync_global_to_guest(vm, nr_writes);</div><div class='add'>+</div><div class='add'>+		dirty_ring_prev_iteration_last_page = dirty_ring_last_page;</div><div class='add'>+		WRITE_ONCE(dirty_ring_vcpu_ring_full, false);</div><div class='add'>+</div><div class='add'>+		sem_post(&amp;sem_vcpu_cont);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Let the vCPU run beyond the configured interval until it has</div><div class='add'>+		 * performed the minimum number of writes.  This verifies the</div><div class='add'>+		 * guest is making forward progress, e.g. isn't stuck because</div><div class='add'>+		 * of a KVM bug, and puts a firm floor on test coverage.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; p-&gt;interval || nr_writes &lt; TEST_MIN_WRITES_PER_ITERATION; i++) {</div><div class='add'>+			/*</div><div class='add'>+			 * Sleep in 1ms chunks to keep the interval math simple</div><div class='add'>+			 * and so that the test doesn't run too far beyond the</div><div class='add'>+			 * specified interval.</div><div class='add'>+			 */</div><div class='add'>+			usleep(1000);</div><div class='add'>+</div><div class='add'>+			sync_global_from_guest(vm, nr_writes);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Reap dirty pages while the guest is running so that</div><div class='add'>+			 * dirty ring full events are resolved, i.e. so that a</div><div class='add'>+			 * larger interval doesn't always end up with a vCPU</div><div class='add'>+			 * that's effectively blocked.  Collecting while the</div><div class='add'>+			 * guest is running also verifies KVM doesn't lose any</div><div class='add'>+			 * state.</div><div class='add'>+			 *</div><div class='add'>+			 * For bitmap modes, KVM overwrites the entire bitmap,</div><div class='add'>+			 * i.e. collecting the bitmaps is destructive.  Collect</div><div class='add'>+			 * the bitmap only on the first pass, otherwise this</div><div class='add'>+			 * test would lose track of dirty pages.</div><div class='add'>+			 */</div><div class='add'>+			if (i &amp;&amp; host_log_mode != LOG_MODE_DIRTY_RING)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * For the dirty ring, empty the ring on subsequent</div><div class='add'>+			 * passes only if the ring was filled at least once,</div><div class='add'>+			 * to verify KVM's handling of a full ring (emptying</div><div class='add'>+			 * the ring on every pass would make it unlikely the</div><div class='add'>+			 * vCPU would ever fill the fing).</div><div class='add'>+			 */</div><div class='add'>+			if (i &amp;&amp; !READ_ONCE(dirty_ring_vcpu_ring_full))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			log_mode_collect_dirty_pages(vcpu, TEST_MEM_SLOT_INDEX,</div><div class='add'>+						     bmap[0], host_num_pages,</div><div class='add'>+						     &amp;ring_buf_idx);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Stop the vCPU prior to collecting and verifying the dirty</div><div class='add'>+		 * log.  If the vCPU is allowed to run during collection, then</div><div class='add'>+		 * pages that are written during this iteration may be missed,</div><div class='add'>+		 * i.e. collected in the next iteration.  And if the vCPU is</div><div class='add'>+		 * writing memory during verification, pages that this thread</div><div class='add'>+		 * sees as clean may be written with this iteration's value.</div><div class='add'>+		 */</div><div class='add'>+		WRITE_ONCE(vcpu_stop, true);</div><div class='add'>+		sync_global_to_guest(vm, vcpu_stop);</div><div class='add'>+		sem_wait(&amp;sem_vcpu_stop);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * See vcpu_sync_stop_requested definition for details on why</div><div class='del'>-		 * we need to stop vcpu when verify data.</div><div class='add'>+		 * Clear vcpu_stop after the vCPU thread has acknowledge the</div><div class='add'>+		 * stop request and is waiting, i.e. is definitely not running!</div><div class='ctx'> 		 */</div><div class='del'>-		atomic_set(&amp;vcpu_sync_stop_requested, true);</div><div class='del'>-		sem_wait_until(&amp;sem_vcpu_stop);</div><div class='add'>+		WRITE_ONCE(vcpu_stop, false);</div><div class='add'>+		sync_global_to_guest(vm, vcpu_stop);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Sync the number of writes performed before verification, the</div><div class='add'>+		 * info will be printed along with the dirty/clean page counts.</div><div class='add'>+		 */</div><div class='add'>+		sync_global_from_guest(vm, nr_writes);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * NOTE: for dirty ring, it's possible that we didn't stop at</div><div class='ctx'> 		 * GUEST_SYNC but instead we stopped because ring is full;</div><div class='hunk'>@@ -798,32 +788,22 @@ static void run_test(enum vm_guest_mode mode, void *arg)</div><div class='ctx'> 		 * the flush of the last page, and since we handle the last</div><div class='ctx'> 		 * page specially verification will succeed anyway.</div><div class='ctx'> 		 */</div><div class='del'>-		assert(host_log_mode == LOG_MODE_DIRTY_RING ||</div><div class='del'>-		       atomic_read(&amp;vcpu_sync_stop_requested) == false);</div><div class='add'>+		log_mode_collect_dirty_pages(vcpu, TEST_MEM_SLOT_INDEX,</div><div class='add'>+					     bmap[1], host_num_pages,</div><div class='add'>+					     &amp;ring_buf_idx);</div><div class='ctx'> 		vm_dirty_log_verify(mode, bmap);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set host_quit before sem_vcpu_cont in the final iteration to</div><div class='del'>-		 * ensure that the vCPU worker doesn't resume the guest.  As</div><div class='del'>-		 * above, the dirty ring test may stop and wait even when not</div><div class='del'>-		 * explicitly request to do so, i.e. would hang waiting for a</div><div class='del'>-		 * "continue" if it's allowed to resume the guest.</div><div class='del'>-		 */</div><div class='del'>-		if (++iteration == p-&gt;iterations)</div><div class='del'>-			WRITE_ONCE(host_quit, true);</div><div class='del'>-</div><div class='del'>-		sem_post(&amp;sem_vcpu_cont);</div><div class='del'>-		sync_global_to_guest(vm, iteration);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	WRITE_ONCE(host_quit, true);</div><div class='add'>+	sem_post(&amp;sem_vcpu_cont);</div><div class='add'>+</div><div class='ctx'> 	pthread_join(vcpu_thread, NULL);</div><div class='ctx'> </div><div class='del'>-	pr_info("Total bits checked: dirty (%"PRIu64"), clear (%"PRIu64"), "</div><div class='del'>-		"track_next (%"PRIu64")\n", host_dirty_count, host_clear_count,</div><div class='del'>-		host_track_next_count);</div><div class='add'>+	pr_info("Total bits checked: dirty (%lu), clear (%lu)\n",</div><div class='add'>+		host_dirty_count, host_clear_count);</div><div class='ctx'> </div><div class='del'>-	free(bmap);</div><div class='del'>-	free(host_bmap_track);</div><div class='add'>+	free(bmap[0]);</div><div class='add'>+	free(bmap[1]);</div><div class='ctx'> 	kvm_vm_free(vm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -857,7 +837,6 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		.interval = TEST_HOST_LOOP_INTERVAL,</div><div class='ctx'> 	};</div><div class='ctx'> 	int opt, i;</div><div class='del'>-	sigset_t sigset;</div><div class='ctx'> </div><div class='ctx'> 	sem_init(&amp;sem_vcpu_stop, 0, 0);</div><div class='ctx'> 	sem_init(&amp;sem_vcpu_cont, 0, 0);</div><div class='hunk'>@@ -908,19 +887,12 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	TEST_ASSERT(p.iterations &gt; 2, "Iterations must be greater than two");</div><div class='add'>+	TEST_ASSERT(p.iterations &gt; 0, "Iterations must be greater than zero");</div><div class='ctx'> 	TEST_ASSERT(p.interval &gt; 0, "Interval must be greater than zero");</div><div class='ctx'> </div><div class='ctx'> 	pr_info("Test iterations: %"PRIu64", interval: %"PRIu64" (ms)\n",</div><div class='ctx'> 		p.iterations, p.interval);</div><div class='ctx'> </div><div class='del'>-	srandom(time(0));</div><div class='del'>-</div><div class='del'>-	/* Ensure that vCPU threads start with SIG_IPI blocked.  */</div><div class='del'>-	sigemptyset(&amp;sigset);</div><div class='del'>-	sigaddset(&amp;sigset, SIG_IPI);</div><div class='del'>-	pthread_sigmask(SIG_BLOCK, &amp;sigset, NULL);</div><div class='del'>-</div><div class='ctx'> 	if (host_log_mode_option == LOG_MODE_ALL) {</div><div class='ctx'> 		/* Run each log mode */</div><div class='ctx'> 		for (i = 0; i &lt; LOG_MODE_NUM; i++) {</div><div class='head'>diff --git a/tools/testing/selftests/kvm/get-reg-list.c b/tools/testing/selftests/kvm/get-reg-list.c<br/>index 91f05f78e824..f4644c9d2d3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/get-reg-list.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/get-reg-list.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/get-reg-list.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/get-reg-list.c</a></div><div class='hunk'>@@ -116,10 +116,13 @@ void __weak finalize_vcpu(struct kvm_vcpu *vcpu, struct vcpu_reg_list *c)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef __aarch64__</div><div class='del'>-static void prepare_vcpu_init(struct vcpu_reg_list *c, struct kvm_vcpu_init *init)</div><div class='add'>+static void prepare_vcpu_init(struct kvm_vm *vm, struct vcpu_reg_list *c,</div><div class='add'>+			      struct kvm_vcpu_init *init)</div><div class='ctx'> {</div><div class='ctx'> 	struct vcpu_reg_sublist *s;</div><div class='ctx'> </div><div class='add'>+	vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, init);</div><div class='add'>+</div><div class='ctx'> 	for_each_sublist(c, s)</div><div class='ctx'> 		if (s-&gt;capability)</div><div class='ctx'> 			init-&gt;features[s-&gt;feature / 32] |= 1 &lt;&lt; (s-&gt;feature % 32);</div><div class='hunk'>@@ -127,10 +130,10 @@ static void prepare_vcpu_init(struct vcpu_reg_list *c, struct kvm_vcpu_init *ini</div><div class='ctx'> </div><div class='ctx'> static struct kvm_vcpu *vcpu_config_get_vcpu(struct vcpu_reg_list *c, struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='del'>-	struct kvm_vcpu_init init = { .target = -1, };</div><div class='add'>+	struct kvm_vcpu_init init;</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> </div><div class='del'>-	prepare_vcpu_init(c, &amp;init);</div><div class='add'>+	prepare_vcpu_init(vm, c, &amp;init);</div><div class='ctx'> 	vcpu = __vm_vcpu_add(vm, 0);</div><div class='ctx'> 	aarch64_vcpu_setup(vcpu, &amp;init);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c<br/>index ce687f8d248f..618c937f3c90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/guest_memfd_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/guest_memfd_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/guest_memfd_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/guest_memfd_test.c</a></div><div class='hunk'>@@ -13,14 +13,19 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/falloc.h&gt;</div><div class='add'>+#include &lt;linux/sizes.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> #include &lt;sys/stat.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "kvm_util.h"</div><div class='add'>+#include "numaif.h"</div><div class='ctx'> #include "test_util.h"</div><div class='add'>+#include "ucall_common.h"</div><div class='ctx'> </div><div class='del'>-static void test_file_read_write(int fd)</div><div class='add'>+static size_t page_size;</div><div class='add'>+</div><div class='add'>+static void test_file_read_write(int fd, size_t total_size)</div><div class='ctx'> {</div><div class='ctx'> 	char buf[64];</div><div class='ctx'> </div><div class='hunk'>@@ -34,15 +39,177 @@ static void test_file_read_write(int fd)</div><div class='ctx'> 		    "pwrite on a guest_mem fd should fail");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_mmap(int fd, size_t page_size)</div><div class='add'>+static void test_mmap_cow(int fd, size_t size)</div><div class='add'>+{</div><div class='add'>+	void *mem;</div><div class='add'>+</div><div class='add'>+	mem = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);</div><div class='add'>+	TEST_ASSERT(mem == MAP_FAILED, "Copy-on-write not allowed by guest_memfd.");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_mmap_supported(int fd, size_t total_size)</div><div class='add'>+{</div><div class='add'>+	const char val = 0xaa;</div><div class='add'>+	char *mem;</div><div class='add'>+	size_t i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mem = kvm_mmap(total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd);</div><div class='add'>+</div><div class='add'>+	memset(mem, val, total_size);</div><div class='add'>+	for (i = 0; i &lt; total_size; i++)</div><div class='add'>+		TEST_ASSERT_EQ(READ_ONCE(mem[i]), val);</div><div class='add'>+</div><div class='add'>+	ret = fallocate(fd, FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE, 0,</div><div class='add'>+			page_size);</div><div class='add'>+	TEST_ASSERT(!ret, "fallocate the first page should succeed.");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; page_size; i++)</div><div class='add'>+		TEST_ASSERT_EQ(READ_ONCE(mem[i]), 0x00);</div><div class='add'>+	for (; i &lt; total_size; i++)</div><div class='add'>+		TEST_ASSERT_EQ(READ_ONCE(mem[i]), val);</div><div class='add'>+</div><div class='add'>+	memset(mem, val, page_size);</div><div class='add'>+	for (i = 0; i &lt; total_size; i++)</div><div class='add'>+		TEST_ASSERT_EQ(READ_ONCE(mem[i]), val);</div><div class='add'>+</div><div class='add'>+	kvm_munmap(mem, total_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_mbind(int fd, size_t total_size)</div><div class='add'>+{</div><div class='add'>+	const unsigned long nodemask_0 = 1; /* nid: 0 */</div><div class='add'>+	unsigned long nodemask = 0;</div><div class='add'>+	unsigned long maxnode = 8;</div><div class='add'>+	int policy;</div><div class='add'>+	char *mem;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!is_multi_numa_node_system())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mem = kvm_mmap(total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd);</div><div class='add'>+</div><div class='add'>+	/* Test MPOL_INTERLEAVE policy */</div><div class='add'>+	kvm_mbind(mem, page_size * 2, MPOL_INTERLEAVE, &amp;nodemask_0, maxnode, 0);</div><div class='add'>+	kvm_get_mempolicy(&amp;policy, &amp;nodemask, maxnode, mem, MPOL_F_ADDR);</div><div class='add'>+	TEST_ASSERT(policy == MPOL_INTERLEAVE &amp;&amp; nodemask == nodemask_0,</div><div class='add'>+		    "Wanted MPOL_INTERLEAVE (%u) and nodemask 0x%lx, got %u and 0x%lx",</div><div class='add'>+		    MPOL_INTERLEAVE, nodemask_0, policy, nodemask);</div><div class='add'>+</div><div class='add'>+	/* Test basic MPOL_BIND policy */</div><div class='add'>+	kvm_mbind(mem + page_size * 2, page_size * 2, MPOL_BIND, &amp;nodemask_0, maxnode, 0);</div><div class='add'>+	kvm_get_mempolicy(&amp;policy, &amp;nodemask, maxnode, mem + page_size * 2, MPOL_F_ADDR);</div><div class='add'>+	TEST_ASSERT(policy == MPOL_BIND &amp;&amp; nodemask == nodemask_0,</div><div class='add'>+		    "Wanted MPOL_BIND (%u) and nodemask 0x%lx, got %u and 0x%lx",</div><div class='add'>+		    MPOL_BIND, nodemask_0, policy, nodemask);</div><div class='add'>+</div><div class='add'>+	/* Test MPOL_DEFAULT policy */</div><div class='add'>+	kvm_mbind(mem, total_size, MPOL_DEFAULT, NULL, 0, 0);</div><div class='add'>+	kvm_get_mempolicy(&amp;policy, &amp;nodemask, maxnode, mem, MPOL_F_ADDR);</div><div class='add'>+	TEST_ASSERT(policy == MPOL_DEFAULT &amp;&amp; !nodemask,</div><div class='add'>+		    "Wanted MPOL_DEFAULT (%u) and nodemask 0x0, got %u and 0x%lx",</div><div class='add'>+		    MPOL_DEFAULT, policy, nodemask);</div><div class='add'>+</div><div class='add'>+	/* Test with invalid policy */</div><div class='add'>+	ret = mbind(mem, page_size, 999, &amp;nodemask_0, maxnode, 0);</div><div class='add'>+	TEST_ASSERT(ret == -1 &amp;&amp; errno == EINVAL,</div><div class='add'>+		    "mbind with invalid policy should fail with EINVAL");</div><div class='add'>+</div><div class='add'>+	kvm_munmap(mem, total_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_numa_allocation(int fd, size_t total_size)</div><div class='add'>+{</div><div class='add'>+	unsigned long node0_mask = 1;  /* Node 0 */</div><div class='add'>+	unsigned long node1_mask = 2;  /* Node 1 */</div><div class='add'>+	unsigned long maxnode = 8;</div><div class='add'>+	void *pages[4];</div><div class='add'>+	int status[4];</div><div class='add'>+	char *mem;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!is_multi_numa_node_system())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mem = kvm_mmap(total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		pages[i] = (char *)mem + page_size * i;</div><div class='add'>+</div><div class='add'>+	/* Set NUMA policy after allocation */</div><div class='add'>+	memset(mem, 0xaa, page_size);</div><div class='add'>+	kvm_mbind(pages[0], page_size, MPOL_BIND, &amp;node0_mask, maxnode, 0);</div><div class='add'>+	kvm_fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, page_size);</div><div class='add'>+</div><div class='add'>+	/* Set NUMA policy before allocation */</div><div class='add'>+	kvm_mbind(pages[0], page_size * 2, MPOL_BIND, &amp;node1_mask, maxnode, 0);</div><div class='add'>+	kvm_mbind(pages[2], page_size * 2, MPOL_BIND, &amp;node0_mask, maxnode, 0);</div><div class='add'>+	memset(mem, 0xaa, total_size);</div><div class='add'>+</div><div class='add'>+	/* Validate if pages are allocated on specified NUMA nodes */</div><div class='add'>+	kvm_move_pages(0, 4, pages, NULL, status, 0);</div><div class='add'>+	TEST_ASSERT(status[0] == 1, "Expected page 0 on node 1, got it on node %d", status[0]);</div><div class='add'>+	TEST_ASSERT(status[1] == 1, "Expected page 1 on node 1, got it on node %d", status[1]);</div><div class='add'>+	TEST_ASSERT(status[2] == 0, "Expected page 2 on node 0, got it on node %d", status[2]);</div><div class='add'>+	TEST_ASSERT(status[3] == 0, "Expected page 3 on node 0, got it on node %d", status[3]);</div><div class='add'>+</div><div class='add'>+	/* Punch hole for all pages */</div><div class='add'>+	kvm_fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, total_size);</div><div class='add'>+</div><div class='add'>+	/* Change NUMA policy nodes and reallocate */</div><div class='add'>+	kvm_mbind(pages[0], page_size * 2, MPOL_BIND, &amp;node0_mask, maxnode, 0);</div><div class='add'>+	kvm_mbind(pages[2], page_size * 2, MPOL_BIND, &amp;node1_mask, maxnode, 0);</div><div class='add'>+	memset(mem, 0xaa, total_size);</div><div class='add'>+</div><div class='add'>+	kvm_move_pages(0, 4, pages, NULL, status, 0);</div><div class='add'>+	TEST_ASSERT(status[0] == 0, "Expected page 0 on node 0, got it on node %d", status[0]);</div><div class='add'>+	TEST_ASSERT(status[1] == 0, "Expected page 1 on node 0, got it on node %d", status[1]);</div><div class='add'>+	TEST_ASSERT(status[2] == 1, "Expected page 2 on node 1, got it on node %d", status[2]);</div><div class='add'>+	TEST_ASSERT(status[3] == 1, "Expected page 3 on node 1, got it on node %d", status[3]);</div><div class='add'>+</div><div class='add'>+	kvm_munmap(mem, total_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_fault_sigbus(int fd, size_t accessible_size, size_t map_size)</div><div class='add'>+{</div><div class='add'>+	const char val = 0xaa;</div><div class='add'>+	char *mem;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	mem = kvm_mmap(map_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd);</div><div class='add'>+</div><div class='add'>+	TEST_EXPECT_SIGBUS(memset(mem, val, map_size));</div><div class='add'>+	TEST_EXPECT_SIGBUS((void)READ_ONCE(mem[accessible_size]));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; accessible_size; i++)</div><div class='add'>+		TEST_ASSERT_EQ(READ_ONCE(mem[i]), val);</div><div class='add'>+</div><div class='add'>+	kvm_munmap(mem, map_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_fault_overflow(int fd, size_t total_size)</div><div class='add'>+{</div><div class='add'>+	test_fault_sigbus(fd, total_size, total_size * 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_fault_private(int fd, size_t total_size)</div><div class='add'>+{</div><div class='add'>+	test_fault_sigbus(fd, 0, total_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_mmap_not_supported(int fd, size_t total_size)</div><div class='ctx'> {</div><div class='ctx'> 	char *mem;</div><div class='ctx'> </div><div class='ctx'> 	mem = mmap(NULL, page_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);</div><div class='ctx'> 	TEST_ASSERT_EQ(mem, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	mem = mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);</div><div class='add'>+	TEST_ASSERT_EQ(mem, MAP_FAILED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_file_size(int fd, size_t page_size, size_t total_size)</div><div class='add'>+static void test_file_size(int fd, size_t total_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct stat sb;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -53,7 +220,7 @@ static void test_file_size(int fd, size_t page_size, size_t total_size)</div><div class='ctx'> 	TEST_ASSERT_EQ(sb.st_blksize, page_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_fallocate(int fd, size_t page_size, size_t total_size)</div><div class='add'>+static void test_fallocate(int fd, size_t total_size)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -90,7 +257,7 @@ static void test_fallocate(int fd, size_t page_size, size_t total_size)</div><div class='ctx'> 	TEST_ASSERT(!ret, "fallocate to restore punched hole should succeed");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_invalid_punch_hole(int fd, size_t page_size, size_t total_size)</div><div class='add'>+static void test_invalid_punch_hole(int fd, size_t total_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		off_t offset;</div><div class='hunk'>@@ -120,26 +287,18 @@ static void test_invalid_punch_hole(int fd, size_t page_size, size_t total_size)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_create_guest_memfd_invalid(struct kvm_vm *vm)</div><div class='add'>+static void test_create_guest_memfd_invalid_sizes(struct kvm_vm *vm,</div><div class='add'>+						  uint64_t guest_memfd_flags)</div><div class='ctx'> {</div><div class='del'>-	size_t page_size = getpagesize();</div><div class='del'>-	uint64_t flag;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='ctx'> 	for (size = 1; size &lt; page_size; size++) {</div><div class='del'>-		fd = __vm_create_guest_memfd(vm, size, 0);</div><div class='del'>-		TEST_ASSERT(fd == -1 &amp;&amp; errno == EINVAL,</div><div class='add'>+		fd = __vm_create_guest_memfd(vm, size, guest_memfd_flags);</div><div class='add'>+		TEST_ASSERT(fd &lt; 0 &amp;&amp; errno == EINVAL,</div><div class='ctx'> 			    "guest_memfd() with non-page-aligned page size '0x%lx' should fail with EINVAL",</div><div class='ctx'> 			    size);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	for (flag = BIT(0); flag; flag &lt;&lt;= 1) {</div><div class='del'>-		fd = __vm_create_guest_memfd(vm, page_size, flag);</div><div class='del'>-		TEST_ASSERT(fd == -1 &amp;&amp; errno == EINVAL,</div><div class='del'>-			    "guest_memfd() with flag '0x%lx' should fail with EINVAL",</div><div class='del'>-			    flag);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void test_create_guest_memfd_multiple(struct kvm_vm *vm)</div><div class='hunk'>@@ -147,53 +306,187 @@ static void test_create_guest_memfd_multiple(struct kvm_vm *vm)</div><div class='ctx'> 	int fd1, fd2, ret;</div><div class='ctx'> 	struct stat st1, st2;</div><div class='ctx'> </div><div class='del'>-	fd1 = __vm_create_guest_memfd(vm, 4096, 0);</div><div class='add'>+	fd1 = __vm_create_guest_memfd(vm, page_size, 0);</div><div class='ctx'> 	TEST_ASSERT(fd1 != -1, "memfd creation should succeed");</div><div class='ctx'> </div><div class='ctx'> 	ret = fstat(fd1, &amp;st1);</div><div class='ctx'> 	TEST_ASSERT(ret != -1, "memfd fstat should succeed");</div><div class='del'>-	TEST_ASSERT(st1.st_size == 4096, "memfd st_size should match requested size");</div><div class='add'>+	TEST_ASSERT(st1.st_size == page_size, "memfd st_size should match requested size");</div><div class='ctx'> </div><div class='del'>-	fd2 = __vm_create_guest_memfd(vm, 8192, 0);</div><div class='add'>+	fd2 = __vm_create_guest_memfd(vm, page_size * 2, 0);</div><div class='ctx'> 	TEST_ASSERT(fd2 != -1, "memfd creation should succeed");</div><div class='ctx'> </div><div class='ctx'> 	ret = fstat(fd2, &amp;st2);</div><div class='ctx'> 	TEST_ASSERT(ret != -1, "memfd fstat should succeed");</div><div class='del'>-	TEST_ASSERT(st2.st_size == 8192, "second memfd st_size should match requested size");</div><div class='add'>+	TEST_ASSERT(st2.st_size == page_size * 2, "second memfd st_size should match requested size");</div><div class='ctx'> </div><div class='ctx'> 	ret = fstat(fd1, &amp;st1);</div><div class='ctx'> 	TEST_ASSERT(ret != -1, "memfd fstat should succeed");</div><div class='del'>-	TEST_ASSERT(st1.st_size == 4096, "first memfd st_size should still match requested size");</div><div class='add'>+	TEST_ASSERT(st1.st_size == page_size, "first memfd st_size should still match requested size");</div><div class='ctx'> 	TEST_ASSERT(st1.st_ino != st2.st_ino, "different memfd should have different inode numbers");</div><div class='ctx'> </div><div class='ctx'> 	close(fd2);</div><div class='ctx'> 	close(fd1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int main(int argc, char *argv[])</div><div class='add'>+static void test_guest_memfd_flags(struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='del'>-	size_t page_size;</div><div class='del'>-	size_t total_size;</div><div class='add'>+	uint64_t valid_flags = vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS);</div><div class='add'>+	uint64_t flag;</div><div class='ctx'> 	int fd;</div><div class='add'>+</div><div class='add'>+	for (flag = BIT(0); flag; flag &lt;&lt;= 1) {</div><div class='add'>+		fd = __vm_create_guest_memfd(vm, page_size, flag);</div><div class='add'>+		if (flag &amp; valid_flags) {</div><div class='add'>+			TEST_ASSERT(fd &gt;= 0,</div><div class='add'>+				    "guest_memfd() with flag '0x%lx' should succeed",</div><div class='add'>+				    flag);</div><div class='add'>+			close(fd);</div><div class='add'>+		} else {</div><div class='add'>+			TEST_ASSERT(fd &lt; 0 &amp;&amp; errno == EINVAL,</div><div class='add'>+				    "guest_memfd() with flag '0x%lx' should fail with EINVAL",</div><div class='add'>+				    flag);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define gmem_test(__test, __vm, __flags)				\</div><div class='add'>+do {									\</div><div class='add'>+	int fd = vm_create_guest_memfd(__vm, page_size * 4, __flags);	\</div><div class='add'>+									\</div><div class='add'>+	test_##__test(fd, page_size * 4);				\</div><div class='add'>+	close(fd);							\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static void __test_guest_memfd(struct kvm_vm *vm, uint64_t flags)</div><div class='add'>+{</div><div class='add'>+	test_create_guest_memfd_multiple(vm);</div><div class='add'>+	test_create_guest_memfd_invalid_sizes(vm, flags);</div><div class='add'>+</div><div class='add'>+	gmem_test(file_read_write, vm, flags);</div><div class='add'>+</div><div class='add'>+	if (flags &amp; GUEST_MEMFD_FLAG_MMAP) {</div><div class='add'>+		if (flags &amp; GUEST_MEMFD_FLAG_INIT_SHARED) {</div><div class='add'>+			gmem_test(mmap_supported, vm, flags);</div><div class='add'>+			gmem_test(fault_overflow, vm, flags);</div><div class='add'>+			gmem_test(numa_allocation, vm, flags);</div><div class='add'>+		} else {</div><div class='add'>+			gmem_test(fault_private, vm, flags);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		gmem_test(mmap_cow, vm, flags);</div><div class='add'>+		gmem_test(mbind, vm, flags);</div><div class='add'>+	} else {</div><div class='add'>+		gmem_test(mmap_not_supported, vm, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gmem_test(file_size, vm, flags);</div><div class='add'>+	gmem_test(fallocate, vm, flags);</div><div class='add'>+	gmem_test(invalid_punch_hole, vm, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_guest_memfd(unsigned long vm_type)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vm *vm = vm_create_barebones_type(vm_type);</div><div class='add'>+	uint64_t flags;</div><div class='add'>+</div><div class='add'>+	test_guest_memfd_flags(vm);</div><div class='add'>+</div><div class='add'>+	__test_guest_memfd(vm, 0);</div><div class='add'>+</div><div class='add'>+	flags = vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS);</div><div class='add'>+	if (flags &amp; GUEST_MEMFD_FLAG_MMAP)</div><div class='add'>+		__test_guest_memfd(vm, GUEST_MEMFD_FLAG_MMAP);</div><div class='add'>+</div><div class='add'>+	/* MMAP should always be supported if INIT_SHARED is supported. */</div><div class='add'>+	if (flags &amp; GUEST_MEMFD_FLAG_INIT_SHARED)</div><div class='add'>+		__test_guest_memfd(vm, GUEST_MEMFD_FLAG_MMAP |</div><div class='add'>+				       GUEST_MEMFD_FLAG_INIT_SHARED);</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_code(uint8_t *mem, uint64_t size)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size; i++)</div><div class='add'>+		__GUEST_ASSERT(mem[i] == 0xaa,</div><div class='add'>+			       "Guest expected 0xaa at offset %lu, got 0x%x", i, mem[i]);</div><div class='add'>+</div><div class='add'>+	memset(mem, 0xff, size);</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_guest_memfd_guest(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Skip the first 4gb and slot0.  slot0 maps &lt;1gb and is used to back</div><div class='add'>+	 * the guest's code, stack, and page tables, and low memory contains</div><div class='add'>+	 * the PCI hole and other MMIO regions that need to be avoided.</div><div class='add'>+	 */</div><div class='add'>+	const uint64_t gpa = SZ_4G;</div><div class='add'>+	const int slot = 1;</div><div class='add'>+</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='add'>+	uint8_t *mem;</div><div class='add'>+	size_t size;</div><div class='add'>+	int fd, i;</div><div class='ctx'> </div><div class='del'>-	TEST_REQUIRE(kvm_has_cap(KVM_CAP_GUEST_MEMFD));</div><div class='add'>+	if (!kvm_check_cap(KVM_CAP_GUEST_MEMFD_FLAGS))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	page_size = getpagesize();</div><div class='del'>-	total_size = page_size * 4;</div><div class='add'>+	vm = __vm_create_shape_with_one_vcpu(VM_SHAPE_DEFAULT, &amp;vcpu, 1, guest_code);</div><div class='ctx'> </div><div class='del'>-	vm = vm_create_barebones();</div><div class='add'>+	TEST_ASSERT(vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS) &amp; GUEST_MEMFD_FLAG_MMAP,</div><div class='add'>+		    "Default VM type should support MMAP, supported flags = 0x%x",</div><div class='add'>+		    vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS));</div><div class='add'>+	TEST_ASSERT(vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS) &amp; GUEST_MEMFD_FLAG_INIT_SHARED,</div><div class='add'>+		    "Default VM type should support INIT_SHARED, supported flags = 0x%x",</div><div class='add'>+		    vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS));</div><div class='ctx'> </div><div class='del'>-	test_create_guest_memfd_invalid(vm);</div><div class='del'>-	test_create_guest_memfd_multiple(vm);</div><div class='add'>+	size = vm-&gt;page_size;</div><div class='add'>+	fd = vm_create_guest_memfd(vm, size, GUEST_MEMFD_FLAG_MMAP |</div><div class='add'>+					     GUEST_MEMFD_FLAG_INIT_SHARED);</div><div class='add'>+	vm_set_user_memory_region2(vm, slot, KVM_MEM_GUEST_MEMFD, gpa, size, NULL, fd, 0);</div><div class='add'>+</div><div class='add'>+	mem = kvm_mmap(size, PROT_READ | PROT_WRITE, MAP_SHARED, fd);</div><div class='add'>+	memset(mem, 0xaa, size);</div><div class='add'>+	kvm_munmap(mem, size);</div><div class='ctx'> </div><div class='del'>-	fd = vm_create_guest_memfd(vm, total_size, 0);</div><div class='add'>+	virt_pg_map(vm, gpa, gpa);</div><div class='add'>+	vcpu_args_set(vcpu, 2, gpa, size);</div><div class='add'>+	vcpu_run(vcpu);</div><div class='ctx'> </div><div class='del'>-	test_file_read_write(fd);</div><div class='del'>-	test_mmap(fd, page_size);</div><div class='del'>-	test_file_size(fd, page_size, total_size);</div><div class='del'>-	test_fallocate(fd, page_size, total_size);</div><div class='del'>-	test_invalid_punch_hole(fd, page_size, total_size);</div><div class='add'>+	TEST_ASSERT_EQ(get_ucall(vcpu, NULL), UCALL_DONE);</div><div class='add'>+</div><div class='add'>+	mem = kvm_mmap(size, PROT_READ | PROT_WRITE, MAP_SHARED, fd);</div><div class='add'>+	for (i = 0; i &lt; size; i++)</div><div class='add'>+		TEST_ASSERT_EQ(mem[i], 0xff);</div><div class='ctx'> </div><div class='ctx'> 	close(fd);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	unsigned long vm_types, vm_type;</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(kvm_has_cap(KVM_CAP_GUEST_MEMFD));</div><div class='add'>+</div><div class='add'>+	page_size = getpagesize();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Not all architectures support KVM_CAP_VM_TYPES. However, those that</div><div class='add'>+	 * support guest_memfd have that support for the default VM type.</div><div class='add'>+	 */</div><div class='add'>+	vm_types = kvm_check_cap(KVM_CAP_VM_TYPES);</div><div class='add'>+	if (!vm_types)</div><div class='add'>+		vm_types = BIT(VM_TYPE_DEFAULT);</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(vm_type, &amp;vm_types, BITS_PER_TYPE(vm_types))</div><div class='add'>+		test_guest_memfd(vm_type);</div><div class='add'>+</div><div class='add'>+	test_guest_memfd_guest();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/arm64/arch_timer.h b/tools/testing/selftests/kvm/include/arm64/arch_timer.h<br/>index bf461de34785..e2c4e9f0010f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/arch_timer.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/arch_timer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/arch_timer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/arm64/arch_timer.h</a></div><div class='hunk'>@@ -155,4 +155,28 @@ static inline void timer_set_next_tval_ms(enum arch_timer timer, uint32_t msec)</div><div class='ctx'> 	timer_set_tval(timer, msec_to_cycles(msec));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u32 vcpu_get_vtimer_irq(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	u32 intid;</div><div class='add'>+	u64 attr;</div><div class='add'>+</div><div class='add'>+	attr = vcpu_has_el2(vcpu) ? KVM_ARM_VCPU_TIMER_IRQ_HVTIMER :</div><div class='add'>+				    KVM_ARM_VCPU_TIMER_IRQ_VTIMER;</div><div class='add'>+	vcpu_device_attr_get(vcpu, KVM_ARM_VCPU_TIMER_CTRL, attr, &amp;intid);</div><div class='add'>+</div><div class='add'>+	return intid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 vcpu_get_ptimer_irq(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	u32 intid;</div><div class='add'>+	u64 attr;</div><div class='add'>+</div><div class='add'>+	attr = vcpu_has_el2(vcpu) ? KVM_ARM_VCPU_TIMER_IRQ_HPTIMER :</div><div class='add'>+				    KVM_ARM_VCPU_TIMER_IRQ_PTIMER;</div><div class='add'>+	vcpu_device_attr_get(vcpu, KVM_ARM_VCPU_TIMER_CTRL, attr, &amp;intid);</div><div class='add'>+</div><div class='add'>+	return intid;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* SELFTEST_KVM_ARCH_TIMER_H */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/arm64/gic.h b/tools/testing/selftests/kvm/include/arm64/gic.h<br/>index baeb3c859389..cc7a7f34ed37 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/gic.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/gic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/gic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/arm64/gic.h</a></div><div class='hunk'>@@ -57,6 +57,7 @@ void gic_irq_set_pending(unsigned int intid);</div><div class='ctx'> void gic_irq_clear_pending(unsigned int intid);</div><div class='ctx'> bool gic_irq_get_pending(unsigned int intid);</div><div class='ctx'> void gic_irq_set_config(unsigned int intid, bool is_edge);</div><div class='add'>+void gic_irq_set_group(unsigned int intid, bool group);</div><div class='ctx'> </div><div class='ctx'> void gic_rdist_enable_lpis(vm_paddr_t cfg_table, size_t cfg_table_size,</div><div class='ctx'> 			   vm_paddr_t pend_table);</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/arm64/gic_v3_its.h b/tools/testing/selftests/kvm/include/arm64/gic_v3_its.h<br/>index 3722ed9c8f96..58feef3eb386 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/gic_v3_its.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/gic_v3_its.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/gic_v3_its.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/arm64/gic_v3_its.h</a></div><div class='hunk'>@@ -15,5 +15,6 @@ void its_send_mapc_cmd(void *cmdq_base, u32 vcpu_id, u32 collection_id, bool val</div><div class='ctx'> void its_send_mapti_cmd(void *cmdq_base, u32 device_id, u32 event_id,</div><div class='ctx'> 			u32 collection_id, u32 intid);</div><div class='ctx'> void its_send_invall_cmd(void *cmdq_base, u32 collection_id);</div><div class='add'>+void its_send_sync_cmd(void *cmdq_base, u32 vcpu_id);</div><div class='ctx'> </div><div class='ctx'> #endif // __SELFTESTS_GIC_V3_ITS_H__</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/arm64/kvm_util_arch.h b/tools/testing/selftests/kvm/include/arm64/kvm_util_arch.h<br/>index e43a57d99b56..b973bb2c64a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/kvm_util_arch.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/kvm_util_arch.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/kvm_util_arch.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/arm64/kvm_util_arch.h</a></div><div class='hunk'>@@ -2,6 +2,9 @@</div><div class='ctx'> #ifndef SELFTEST_KVM_UTIL_ARCH_H</div><div class='ctx'> #define SELFTEST_KVM_UTIL_ARCH_H</div><div class='ctx'> </div><div class='del'>-struct kvm_vm_arch {};</div><div class='add'>+struct kvm_vm_arch {</div><div class='add'>+	bool	has_gic;</div><div class='add'>+	int	gic_fd;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #endif  // SELFTEST_KVM_UTIL_ARCH_H</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/arm64/processor.h b/tools/testing/selftests/kvm/include/arm64/processor.h<br/>index 1e8d0d531fbd..ff928716574d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/processor.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/processor.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/processor.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/arm64/processor.h</a></div><div class='hunk'>@@ -62,6 +62,67 @@</div><div class='ctx'> 	 MAIR_ATTRIDX(MAIR_ATTR_NORMAL, MT_NORMAL) |				\</div><div class='ctx'> 	 MAIR_ATTRIDX(MAIR_ATTR_NORMAL_WT, MT_NORMAL_WT))</div><div class='ctx'> </div><div class='add'>+/* TCR_EL1 specific flags */</div><div class='add'>+#define TCR_T0SZ_OFFSET	0</div><div class='add'>+#define TCR_T0SZ(x)		((UL(64) - (x)) &lt;&lt; TCR_T0SZ_OFFSET)</div><div class='add'>+</div><div class='add'>+#define TCR_IRGN0_SHIFT	8</div><div class='add'>+#define TCR_IRGN0_MASK		(UL(3) &lt;&lt; TCR_IRGN0_SHIFT)</div><div class='add'>+#define TCR_IRGN0_NC		(UL(0) &lt;&lt; TCR_IRGN0_SHIFT)</div><div class='add'>+#define TCR_IRGN0_WBWA		(UL(1) &lt;&lt; TCR_IRGN0_SHIFT)</div><div class='add'>+#define TCR_IRGN0_WT		(UL(2) &lt;&lt; TCR_IRGN0_SHIFT)</div><div class='add'>+#define TCR_IRGN0_WBnWA	(UL(3) &lt;&lt; TCR_IRGN0_SHIFT)</div><div class='add'>+</div><div class='add'>+#define TCR_ORGN0_SHIFT	10</div><div class='add'>+#define TCR_ORGN0_MASK		(UL(3) &lt;&lt; TCR_ORGN0_SHIFT)</div><div class='add'>+#define TCR_ORGN0_NC		(UL(0) &lt;&lt; TCR_ORGN0_SHIFT)</div><div class='add'>+#define TCR_ORGN0_WBWA		(UL(1) &lt;&lt; TCR_ORGN0_SHIFT)</div><div class='add'>+#define TCR_ORGN0_WT		(UL(2) &lt;&lt; TCR_ORGN0_SHIFT)</div><div class='add'>+#define TCR_ORGN0_WBnWA	(UL(3) &lt;&lt; TCR_ORGN0_SHIFT)</div><div class='add'>+</div><div class='add'>+#define TCR_SH0_SHIFT		12</div><div class='add'>+#define TCR_SH0_MASK		(UL(3) &lt;&lt; TCR_SH0_SHIFT)</div><div class='add'>+#define TCR_SH0_INNER		(UL(3) &lt;&lt; TCR_SH0_SHIFT)</div><div class='add'>+</div><div class='add'>+#define TCR_TG0_SHIFT		14</div><div class='add'>+#define TCR_TG0_MASK		(UL(3) &lt;&lt; TCR_TG0_SHIFT)</div><div class='add'>+#define TCR_TG0_4K		(UL(0) &lt;&lt; TCR_TG0_SHIFT)</div><div class='add'>+#define TCR_TG0_64K		(UL(1) &lt;&lt; TCR_TG0_SHIFT)</div><div class='add'>+#define TCR_TG0_16K		(UL(2) &lt;&lt; TCR_TG0_SHIFT)</div><div class='add'>+</div><div class='add'>+#define TCR_IPS_SHIFT		32</div><div class='add'>+#define TCR_IPS_MASK		(UL(7) &lt;&lt; TCR_IPS_SHIFT)</div><div class='add'>+#define TCR_IPS_52_BITS	(UL(6) &lt;&lt; TCR_IPS_SHIFT)</div><div class='add'>+#define TCR_IPS_48_BITS	(UL(5) &lt;&lt; TCR_IPS_SHIFT)</div><div class='add'>+#define TCR_IPS_40_BITS	(UL(2) &lt;&lt; TCR_IPS_SHIFT)</div><div class='add'>+#define TCR_IPS_36_BITS	(UL(1) &lt;&lt; TCR_IPS_SHIFT)</div><div class='add'>+</div><div class='add'>+#define TCR_HA			(UL(1) &lt;&lt; 39)</div><div class='add'>+#define TCR_DS			(UL(1) &lt;&lt; 59)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AttrIndx[2:0] encoding (mapping attributes defined in the MAIR* registers).</div><div class='add'>+ */</div><div class='add'>+#define PTE_ATTRINDX(t)	((t) &lt;&lt; 2)</div><div class='add'>+#define PTE_ATTRINDX_MASK	GENMASK(4, 2)</div><div class='add'>+#define PTE_ATTRINDX_SHIFT	2</div><div class='add'>+</div><div class='add'>+#define PTE_VALID		BIT(0)</div><div class='add'>+#define PGD_TYPE_TABLE		BIT(1)</div><div class='add'>+#define PUD_TYPE_TABLE		BIT(1)</div><div class='add'>+#define PMD_TYPE_TABLE		BIT(1)</div><div class='add'>+#define PTE_TYPE_PAGE		BIT(1)</div><div class='add'>+</div><div class='add'>+#define PTE_SHARED		(UL(3) &lt;&lt; 8) /* SH[1:0], inner shareable */</div><div class='add'>+#define PTE_AF			BIT(10)</div><div class='add'>+</div><div class='add'>+#define PTE_ADDR_MASK(page_shift)	GENMASK(47, (page_shift))</div><div class='add'>+#define PTE_ADDR_51_48			GENMASK(15, 12)</div><div class='add'>+#define PTE_ADDR_51_48_SHIFT		12</div><div class='add'>+#define PTE_ADDR_MASK_LPA2(page_shift)	GENMASK(49, (page_shift))</div><div class='add'>+#define PTE_ADDR_51_50_LPA2		GENMASK(9, 8)</div><div class='add'>+#define PTE_ADDR_51_50_LPA2_SHIFT	8</div><div class='add'>+</div><div class='ctx'> void aarch64_vcpu_setup(struct kvm_vcpu *vcpu, struct kvm_vcpu_init *init);</div><div class='ctx'> struct kvm_vcpu *aarch64_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id,</div><div class='ctx'> 				  struct kvm_vcpu_init *init, void *guest_code);</div><div class='hunk'>@@ -102,12 +163,6 @@ enum {</div><div class='ctx'> 			   (v) == VECTOR_SYNC_LOWER_64    || \</div><div class='ctx'> 			   (v) == VECTOR_SYNC_LOWER_32)</div><div class='ctx'> </div><div class='del'>-/* Access flag */</div><div class='del'>-#define PTE_AF			(1ULL &lt;&lt; 10)</div><div class='del'>-</div><div class='del'>-/* Access flag update enable/disable */</div><div class='del'>-#define TCR_EL1_HA		(1ULL &lt;&lt; 39)</div><div class='del'>-</div><div class='ctx'> void aarch64_get_supported_page_sizes(uint32_t ipa, uint32_t *ipa4k,</div><div class='ctx'> 					uint32_t *ipa16k, uint32_t *ipa64k);</div><div class='ctx'> </div><div class='hunk'>@@ -120,6 +175,7 @@ void vm_install_exception_handler(struct kvm_vm *vm,</div><div class='ctx'> void vm_install_sync_handler(struct kvm_vm *vm,</div><div class='ctx'> 		int vector, int ec, handler_fn handler);</div><div class='ctx'> </div><div class='add'>+uint64_t *virt_get_pte_hva_at_level(struct kvm_vm *vm, vm_vaddr_t gva, int level);</div><div class='ctx'> uint64_t *virt_get_pte_hva(struct kvm_vm *vm, vm_vaddr_t gva);</div><div class='ctx'> </div><div class='ctx'> static inline void cpu_relax(void)</div><div class='hunk'>@@ -199,6 +255,16 @@ static inline void local_irq_disable(void)</div><div class='ctx'> 	asm volatile("msr daifset, #3" : : : "memory");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void local_serror_enable(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile("msr daifclr, #4" : : : "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void local_serror_disable(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile("msr daifset, #4" : : : "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct arm_smccc_res - Result from SMC/HVC call</div><div class='ctx'>  * @a0-a3 result values from registers 0 to 3</div><div class='hunk'>@@ -235,4 +301,87 @@ void smccc_smc(uint32_t function_id, uint64_t arg0, uint64_t arg1,</div><div class='ctx'> /* Execute a Wait For Interrupt instruction. */</div><div class='ctx'> void wfi(void);</div><div class='ctx'> </div><div class='add'>+void test_wants_mte(void);</div><div class='add'>+void test_disable_default_vgic(void);</div><div class='add'>+</div><div class='add'>+bool vm_supports_el2(struct kvm_vm *vm);</div><div class='add'>+</div><div class='add'>+static inline bool test_supports_el2(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vm *vm = vm_create(1);</div><div class='add'>+	bool supported = vm_supports_el2(vm);</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+	return supported;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool vcpu_has_el2(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	return vcpu-&gt;init.features[0] &amp; BIT(KVM_ARM_VCPU_HAS_EL2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAPPED_EL2_SYSREG(el2, el1)		\</div><div class='add'>+	case SYS_##el1:				\</div><div class='add'>+		if (vcpu_has_el2(vcpu))		\</div><div class='add'>+			alias = SYS_##el2;	\</div><div class='add'>+		break</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static __always_inline u64 ctxt_reg_alias(struct kvm_vcpu *vcpu, u32 encoding)</div><div class='add'>+{</div><div class='add'>+	u32 alias = encoding;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(!__builtin_constant_p(encoding));</div><div class='add'>+</div><div class='add'>+	switch (encoding) {</div><div class='add'>+	MAPPED_EL2_SYSREG(SCTLR_EL2,		SCTLR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(CPTR_EL2,		CPACR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(TTBR0_EL2,		TTBR0_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(TTBR1_EL2,		TTBR1_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(TCR_EL2,		TCR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(VBAR_EL2,		VBAR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(AFSR0_EL2,		AFSR0_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(AFSR1_EL2,		AFSR1_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(ESR_EL2,		ESR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(FAR_EL2,		FAR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(MAIR_EL2,		MAIR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(TCR2_EL2,		TCR2_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(PIR_EL2,		PIR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(PIRE0_EL2,		PIRE0_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(POR_EL2,		POR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(AMAIR_EL2,		AMAIR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(ELR_EL2,		ELR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(SPSR_EL2,		SPSR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(ZCR_EL2,		ZCR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(CONTEXTIDR_EL2,	CONTEXTIDR_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(SCTLR2_EL2,		SCTLR2_EL1);</div><div class='add'>+	MAPPED_EL2_SYSREG(CNTHCTL_EL2,		CNTKCTL_EL1);</div><div class='add'>+	case SYS_SP_EL1:</div><div class='add'>+		if (!vcpu_has_el2(vcpu))</div><div class='add'>+			return ARM64_CORE_REG(sp_el1);</div><div class='add'>+</div><div class='add'>+		alias = SYS_SP_EL2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUILD_BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return KVM_ARM64_SYS_REG(alias);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_get_default_vcpu_target(struct kvm_vm *vm, struct kvm_vcpu_init *init);</div><div class='add'>+</div><div class='add'>+static inline unsigned int get_current_el(void)</div><div class='add'>+{</div><div class='add'>+	return (read_sysreg(CurrentEL) &gt;&gt; 2) &amp; 0x3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define do_smccc(...)				\</div><div class='add'>+do {						\</div><div class='add'>+	if (get_current_el() == 2)		\</div><div class='add'>+		smccc_smc(__VA_ARGS__);		\</div><div class='add'>+	else					\</div><div class='add'>+		smccc_hvc(__VA_ARGS__);		\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='ctx'> #endif /* SELFTEST_KVM_PROCESSOR_H */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/arm64/vgic.h b/tools/testing/selftests/kvm/include/arm64/vgic.h<br/>index c481d0c00a5d..688beccc9436 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/vgic.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/arm64/vgic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/arm64/vgic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/arm64/vgic.h</a></div><div class='hunk'>@@ -16,6 +16,9 @@</div><div class='ctx'> 	((uint64_t)(flags) &lt;&lt; 12) | \</div><div class='ctx'> 	index)</div><div class='ctx'> </div><div class='add'>+bool kvm_supports_vgic_v3(void);</div><div class='add'>+int __vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs);</div><div class='add'>+void __vgic_v3_init(int fd);</div><div class='ctx'> int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs);</div><div class='ctx'> </div><div class='ctx'> #define VGIC_MAX_RESERVED	1023</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/kvm_syscalls.h b/tools/testing/selftests/kvm/include/kvm_syscalls.h<br/>new file mode 100644<br/>index 000000000000..d4e613162bba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/kvm_syscalls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/kvm_syscalls.h</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+#ifndef SELFTEST_KVM_SYSCALLS_H</div><div class='add'>+#define SELFTEST_KVM_SYSCALLS_H</div><div class='add'>+</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAP_ARGS0(m,...)</div><div class='add'>+#define MAP_ARGS1(m,t,a,...) m(t,a)</div><div class='add'>+#define MAP_ARGS2(m,t,a,...) m(t,a), MAP_ARGS1(m,__VA_ARGS__)</div><div class='add'>+#define MAP_ARGS3(m,t,a,...) m(t,a), MAP_ARGS2(m,__VA_ARGS__)</div><div class='add'>+#define MAP_ARGS4(m,t,a,...) m(t,a), MAP_ARGS3(m,__VA_ARGS__)</div><div class='add'>+#define MAP_ARGS5(m,t,a,...) m(t,a), MAP_ARGS4(m,__VA_ARGS__)</div><div class='add'>+#define MAP_ARGS6(m,t,a,...) m(t,a), MAP_ARGS5(m,__VA_ARGS__)</div><div class='add'>+#define MAP_ARGS(n,...) MAP_ARGS##n(__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define __DECLARE_ARGS(t, a)	t a</div><div class='add'>+#define __UNPACK_ARGS(t, a)	a</div><div class='add'>+</div><div class='add'>+#define DECLARE_ARGS(nr_args, args...) MAP_ARGS(nr_args, __DECLARE_ARGS, args)</div><div class='add'>+#define UNPACK_ARGS(nr_args, args...) MAP_ARGS(nr_args, __UNPACK_ARGS, args)</div><div class='add'>+</div><div class='add'>+#define __KVM_SYSCALL_ERROR(_name, _ret) \</div><div class='add'>+	"%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno)</div><div class='add'>+</div><div class='add'>+/* Define a kvm_&lt;syscall&gt;() API to assert success. */</div><div class='add'>+#define __KVM_SYSCALL_DEFINE(name, nr_args, args...)			\</div><div class='add'>+static inline void kvm_##name(DECLARE_ARGS(nr_args, args))		\</div><div class='add'>+{									\</div><div class='add'>+	int r;								\</div><div class='add'>+									\</div><div class='add'>+	r = name(UNPACK_ARGS(nr_args, args));				\</div><div class='add'>+	TEST_ASSERT(!r, __KVM_SYSCALL_ERROR(#name, r));			\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Macro to define syscall APIs, either because KVM selftests doesn't link to</div><div class='add'>+ * the standard library, e.g. libnuma, or because there is no library that yet</div><div class='add'>+ * provides the syscall.  These</div><div class='add'>+ */</div><div class='add'>+#define KVM_SYSCALL_DEFINE(name, nr_args, args...)			\</div><div class='add'>+static inline long name(DECLARE_ARGS(nr_args, args))			\</div><div class='add'>+{									\</div><div class='add'>+	return syscall(__NR_##name, UNPACK_ARGS(nr_args, args));	\</div><div class='add'>+}									\</div><div class='add'>+__KVM_SYSCALL_DEFINE(name, nr_args, args)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Special case mmap(), as KVM selftest rarely/never specific an address,</div><div class='add'>+ * rarely specify an offset, and because the unique return code requires</div><div class='add'>+ * special handling anyways.</div><div class='add'>+ */</div><div class='add'>+static inline void *__kvm_mmap(size_t size, int prot, int flags, int fd,</div><div class='add'>+			       off_t offset)</div><div class='add'>+{</div><div class='add'>+	void *mem;</div><div class='add'>+</div><div class='add'>+	mem = mmap(NULL, size, prot, flags, fd, offset);</div><div class='add'>+	TEST_ASSERT(mem != MAP_FAILED, __KVM_SYSCALL_ERROR("mmap()",</div><div class='add'>+		    (int)(unsigned long)MAP_FAILED));</div><div class='add'>+	return mem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *kvm_mmap(size_t size, int prot, int flags, int fd)</div><div class='add'>+{</div><div class='add'>+	return __kvm_mmap(size, prot, flags, fd, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int kvm_dup(int fd)</div><div class='add'>+{</div><div class='add'>+	int new_fd = dup(fd);</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(new_fd &gt;= 0, __KVM_SYSCALL_ERROR("dup()", new_fd));</div><div class='add'>+	return new_fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__KVM_SYSCALL_DEFINE(munmap, 2, void *, mem, size_t, size);</div><div class='add'>+__KVM_SYSCALL_DEFINE(close, 1, int, fd);</div><div class='add'>+__KVM_SYSCALL_DEFINE(fallocate, 4, int, fd, int, mode, loff_t, offset, loff_t, len);</div><div class='add'>+__KVM_SYSCALL_DEFINE(ftruncate, 2, unsigned int, fd, off_t, length);</div><div class='add'>+</div><div class='add'>+#endif /* SELFTEST_KVM_SYSCALLS_H */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h<br/>index 4c4e5a847f67..81f4355ff28a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/kvm_util.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/kvm_util.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/kvm_util.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/kvm_util.h</a></div><div class='hunk'>@@ -18,8 +18,12 @@</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/kvm.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;sys/eventfd.h&gt;</div><div class='ctx'> #include &lt;sys/ioctl.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kvm_syscalls.h"</div><div class='ctx'> #include "kvm_util_arch.h"</div><div class='ctx'> #include "kvm_util_types.h"</div><div class='ctx'> #include "sparsebit.h"</div><div class='hunk'>@@ -46,6 +50,12 @@ struct userspace_mem_region {</div><div class='ctx'> 	struct hlist_node slot_node;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct kvm_binary_stats {</div><div class='add'>+	int fd;</div><div class='add'>+	struct kvm_stats_header header;</div><div class='add'>+	struct kvm_stats_desc *desc;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct kvm_vcpu {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	uint32_t id;</div><div class='hunk'>@@ -55,6 +65,10 @@ struct kvm_vcpu {</div><div class='ctx'> #ifdef __x86_64__</div><div class='ctx'> 	struct kvm_cpuid2 *cpuid;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef __aarch64__</div><div class='add'>+	struct kvm_vcpu_init init;</div><div class='add'>+#endif</div><div class='add'>+	struct kvm_binary_stats stats;</div><div class='ctx'> 	struct kvm_dirty_gfn *dirty_gfns;</div><div class='ctx'> 	uint32_t fetch_index;</div><div class='ctx'> 	uint32_t dirty_gfns_count;</div><div class='hunk'>@@ -99,10 +113,7 @@ struct kvm_vm {</div><div class='ctx'> </div><div class='ctx'> 	struct kvm_vm_arch arch;</div><div class='ctx'> </div><div class='del'>-	/* Cache of information for binary stats interface */</div><div class='del'>-	int stats_fd;</div><div class='del'>-	struct kvm_stats_header stats_header;</div><div class='del'>-	struct kvm_stats_desc *stats_desc;</div><div class='add'>+	struct kvm_binary_stats stats;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * KVM region slots. These are the default memslots used by page</div><div class='hunk'>@@ -167,12 +178,13 @@ enum vm_guest_mode {</div><div class='ctx'> 	VM_MODE_P40V48_4K,</div><div class='ctx'> 	VM_MODE_P40V48_16K,</div><div class='ctx'> 	VM_MODE_P40V48_64K,</div><div class='del'>-	VM_MODE_PXXV48_4K,	/* For 48bits VA but ANY bits PA */</div><div class='add'>+	VM_MODE_PXXVYY_4K,	/* For 48-bit or 57-bit VA, depending on host support */</div><div class='ctx'> 	VM_MODE_P47V64_4K,</div><div class='ctx'> 	VM_MODE_P44V64_4K,</div><div class='ctx'> 	VM_MODE_P36V48_4K,</div><div class='ctx'> 	VM_MODE_P36V48_16K,</div><div class='ctx'> 	VM_MODE_P36V48_64K,</div><div class='add'>+	VM_MODE_P47V47_16K,</div><div class='ctx'> 	VM_MODE_P36V47_16K,</div><div class='ctx'> 	NUM_VM_MODES,</div><div class='ctx'> };</div><div class='hunk'>@@ -208,7 +220,7 @@ extern enum vm_guest_mode vm_mode_default;</div><div class='ctx'> </div><div class='ctx'> #elif defined(__x86_64__)</div><div class='ctx'> </div><div class='del'>-#define VM_MODE_DEFAULT			VM_MODE_PXXV48_4K</div><div class='add'>+#define VM_MODE_DEFAULT			VM_MODE_PXXVYY_4K</div><div class='ctx'> #define MIN_PAGE_SHIFT			12U</div><div class='ctx'> #define ptes_per_page(page_size)	((page_size) / 8)</div><div class='ctx'> </div><div class='hunk'>@@ -228,6 +240,11 @@ extern enum vm_guest_mode vm_mode_default;</div><div class='ctx'> #define MIN_PAGE_SHIFT			12U</div><div class='ctx'> #define ptes_per_page(page_size)	((page_size) / 8)</div><div class='ctx'> </div><div class='add'>+#elif defined(__loongarch__)</div><div class='add'>+#define VM_MODE_DEFAULT			VM_MODE_P47V47_16K</div><div class='add'>+#define MIN_PAGE_SHIFT			12U</div><div class='add'>+#define ptes_per_page(page_size)	((page_size) / 8)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define VM_SHAPE_DEFAULT	VM_SHAPE(VM_MODE_DEFAULT)</div><div class='hunk'>@@ -243,16 +260,22 @@ struct vm_guest_mode_params {</div><div class='ctx'> };</div><div class='ctx'> extern const struct vm_guest_mode_params vm_guest_mode_params[];</div><div class='ctx'> </div><div class='add'>+int __open_path_or_exit(const char *path, int flags, const char *enoent_help);</div><div class='ctx'> int open_path_or_exit(const char *path, int flags);</div><div class='ctx'> int open_kvm_dev_path_or_exit(void);</div><div class='ctx'> </div><div class='del'>-bool get_kvm_param_bool(const char *param);</div><div class='del'>-bool get_kvm_intel_param_bool(const char *param);</div><div class='del'>-bool get_kvm_amd_param_bool(const char *param);</div><div class='add'>+int kvm_get_module_param_integer(const char *module_name, const char *param);</div><div class='add'>+bool kvm_get_module_param_bool(const char *module_name, const char *param);</div><div class='add'>+</div><div class='add'>+static inline bool get_kvm_param_bool(const char *param)</div><div class='add'>+{</div><div class='add'>+	return kvm_get_module_param_bool("kvm", param);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-int get_kvm_param_integer(const char *param);</div><div class='del'>-int get_kvm_intel_param_integer(const char *param);</div><div class='del'>-int get_kvm_amd_param_integer(const char *param);</div><div class='add'>+static inline int get_kvm_param_integer(const char *param)</div><div class='add'>+{</div><div class='add'>+	return kvm_get_module_param_integer("kvm", param);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> unsigned int kvm_check_cap(long cap);</div><div class='ctx'> </div><div class='hunk'>@@ -261,9 +284,6 @@ static inline bool kvm_has_cap(long cap)</div><div class='ctx'> 	return kvm_check_cap(cap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define __KVM_SYSCALL_ERROR(_name, _ret) \</div><div class='del'>-	"%s failed, rc: %i errno: %i (%s)", (_name), (_ret), errno, strerror(errno)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Use the "inner", double-underscore macro when reporting errors from within</div><div class='ctx'>  * other macros so that the name of ioctl() and not its literal numeric value</div><div class='hunk'>@@ -492,6 +512,45 @@ static inline int vm_get_stats_fd(struct kvm_vm *vm)</div><div class='ctx'> 	return fd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int __kvm_irqfd(struct kvm_vm *vm, uint32_t gsi, int eventfd,</div><div class='add'>+			      uint32_t flags)</div><div class='add'>+{</div><div class='add'>+	struct kvm_irqfd irqfd = {</div><div class='add'>+		.fd = eventfd,</div><div class='add'>+		.gsi = gsi,</div><div class='add'>+		.flags = flags,</div><div class='add'>+		.resamplefd = -1,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return __vm_ioctl(vm, KVM_IRQFD, &amp;irqfd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvm_irqfd(struct kvm_vm *vm, uint32_t gsi, int eventfd,</div><div class='add'>+			      uint32_t flags)</div><div class='add'>+{</div><div class='add'>+	int ret = __kvm_irqfd(vm, gsi, eventfd, flags);</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT_VM_VCPU_IOCTL(!ret, KVM_IRQFD, ret, vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvm_assign_irqfd(struct kvm_vm *vm, uint32_t gsi, int eventfd)</div><div class='add'>+{</div><div class='add'>+	kvm_irqfd(vm, gsi, eventfd, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvm_deassign_irqfd(struct kvm_vm *vm, uint32_t gsi, int eventfd)</div><div class='add'>+{</div><div class='add'>+	kvm_irqfd(vm, gsi, eventfd, KVM_IRQFD_FLAG_DEASSIGN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int kvm_new_eventfd(void)</div><div class='add'>+{</div><div class='add'>+	int fd = eventfd(0, 0);</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(fd &gt;= 0, __KVM_SYSCALL_ERROR("eventfd()", fd));</div><div class='add'>+	return fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void read_stats_header(int stats_fd, struct kvm_stats_header *header)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t ret;</div><div class='hunk'>@@ -531,15 +590,53 @@ void read_stat_data(int stats_fd, struct kvm_stats_header *header,</div><div class='ctx'> 		    struct kvm_stats_desc *desc, uint64_t *data,</div><div class='ctx'> 		    size_t max_elements);</div><div class='ctx'> </div><div class='del'>-void __vm_get_stat(struct kvm_vm *vm, const char *stat_name, uint64_t *data,</div><div class='del'>-		   size_t max_elements);</div><div class='add'>+void kvm_get_stat(struct kvm_binary_stats *stats, const char *name,</div><div class='add'>+		  uint64_t *data, size_t max_elements);</div><div class='ctx'> </div><div class='del'>-static inline uint64_t vm_get_stat(struct kvm_vm *vm, const char *stat_name)</div><div class='add'>+#define __get_stat(stats, stat)							\</div><div class='add'>+({										\</div><div class='add'>+	uint64_t data;								\</div><div class='add'>+										\</div><div class='add'>+	kvm_get_stat(stats, #stat, &amp;data, 1);					\</div><div class='add'>+	data;									\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define vm_get_stat(vm, stat) __get_stat(&amp;(vm)-&gt;stats, stat)</div><div class='add'>+#define vcpu_get_stat(vcpu, stat) __get_stat(&amp;(vcpu)-&gt;stats, stat)</div><div class='add'>+</div><div class='add'>+static inline bool read_smt_control(char *buf, size_t buf_size)</div><div class='add'>+{</div><div class='add'>+	FILE *f = fopen("/sys/devices/system/cpu/smt/control", "r");</div><div class='add'>+	bool ret;</div><div class='add'>+</div><div class='add'>+	if (!f)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ret = fread(buf, sizeof(*buf), buf_size, f) &gt; 0;</div><div class='add'>+	fclose(f);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_smt_possible(void)</div><div class='ctx'> {</div><div class='del'>-	uint64_t data;</div><div class='add'>+	char buf[16];</div><div class='add'>+</div><div class='add'>+	if (read_smt_control(buf, sizeof(buf)) &amp;&amp;</div><div class='add'>+	    (!strncmp(buf, "forceoff", 8) || !strncmp(buf, "notsupported", 12)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	__vm_get_stat(vm, stat_name, &amp;data, 1);</div><div class='del'>-	return data;</div><div class='add'>+static inline bool is_smt_on(void)</div><div class='add'>+{</div><div class='add'>+	char buf[16];</div><div class='add'>+</div><div class='add'>+	if (read_smt_control(buf, sizeof(buf)) &amp;&amp; !strncmp(buf, "on", 2))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void vm_create_irqchip(struct kvm_vm *vm);</div><div class='hunk'>@@ -576,12 +673,12 @@ int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flag</div><div class='ctx'> 				 uint32_t guest_memfd, uint64_t guest_memfd_offset);</div><div class='ctx'> </div><div class='ctx'> void vm_userspace_mem_region_add(struct kvm_vm *vm,</div><div class='del'>-	enum vm_mem_backing_src_type src_type,</div><div class='del'>-	uint64_t guest_paddr, uint32_t slot, uint64_t npages,</div><div class='del'>-	uint32_t flags);</div><div class='add'>+				 enum vm_mem_backing_src_type src_type,</div><div class='add'>+				 uint64_t gpa, uint32_t slot, uint64_t npages,</div><div class='add'>+				 uint32_t flags);</div><div class='ctx'> void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,</div><div class='del'>-		uint64_t guest_paddr, uint32_t slot, uint64_t npages,</div><div class='del'>-		uint32_t flags, int guest_memfd_fd, uint64_t guest_memfd_offset);</div><div class='add'>+		uint64_t gpa, uint32_t slot, uint64_t npages, uint32_t flags,</div><div class='add'>+		int guest_memfd_fd, uint64_t guest_memfd_offset);</div><div class='ctx'> </div><div class='ctx'> #ifndef vm_arch_has_protected_memory</div><div class='ctx'> static inline bool vm_arch_has_protected_memory(struct kvm_vm *vm)</div><div class='hunk'>@@ -591,6 +688,7 @@ static inline bool vm_arch_has_protected_memory(struct kvm_vm *vm)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags);</div><div class='add'>+void vm_mem_region_reload(struct kvm_vm *vm, uint32_t slot);</div><div class='ctx'> void vm_mem_region_move(struct kvm_vm *vm, uint32_t slot, uint64_t new_gpa);</div><div class='ctx'> void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot);</div><div class='ctx'> struct kvm_vcpu *__vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id);</div><div class='hunk'>@@ -963,7 +1061,36 @@ static inline struct kvm_vm *vm_create_shape_with_one_vcpu(struct vm_shape shape</div><div class='ctx'> </div><div class='ctx'> struct kvm_vcpu *vm_recreate_with_one_vcpu(struct kvm_vm *vm);</div><div class='ctx'> </div><div class='del'>-void kvm_pin_this_task_to_pcpu(uint32_t pcpu);</div><div class='add'>+void kvm_set_files_rlimit(uint32_t nr_vcpus);</div><div class='add'>+</div><div class='add'>+int __pin_task_to_cpu(pthread_t task, int cpu);</div><div class='add'>+</div><div class='add'>+static inline void pin_task_to_cpu(pthread_t task, int cpu)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = __pin_task_to_cpu(task, cpu);</div><div class='add'>+	TEST_ASSERT(!r, "Failed to set thread affinity to pCPU '%u'", cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pin_task_to_any_cpu(pthread_t task)</div><div class='add'>+{</div><div class='add'>+	int cpu = sched_getcpu();</div><div class='add'>+</div><div class='add'>+	pin_task_to_cpu(task, cpu);</div><div class='add'>+	return cpu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pin_self_to_cpu(int cpu)</div><div class='add'>+{</div><div class='add'>+	pin_task_to_cpu(pthread_self(), cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pin_self_to_any_cpu(void)</div><div class='add'>+{</div><div class='add'>+	return pin_task_to_any_cpu(pthread_self());</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void kvm_print_vcpu_pinning_help(void);</div><div class='ctx'> void kvm_parse_vcpu_pinning(const char *pcpus_string, uint32_t vcpu_to_pcpu[],</div><div class='ctx'> 			    int nr_vcpus);</div><div class='hunk'>@@ -1077,6 +1204,7 @@ void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr);</div><div class='ctx'> static inline void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)</div><div class='ctx'> {</div><div class='ctx'> 	virt_arch_pg_map(vm, vaddr, paddr);</div><div class='add'>+	sparsebit_set(vm-&gt;vpages_mapped, vaddr &gt;&gt; vm-&gt;page_shift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1137,10 +1265,14 @@ static inline int __vm_disable_nx_huge_pages(struct kvm_vm *vm)</div><div class='ctx'>  */</div><div class='ctx'> void kvm_selftest_arch_init(void);</div><div class='ctx'> </div><div class='del'>-void kvm_arch_vm_post_create(struct kvm_vm *vm);</div><div class='add'>+void kvm_arch_vm_post_create(struct kvm_vm *vm, unsigned int nr_vcpus);</div><div class='add'>+void kvm_arch_vm_finalize_vcpus(struct kvm_vm *vm);</div><div class='add'>+void kvm_arch_vm_release(struct kvm_vm *vm);</div><div class='ctx'> </div><div class='ctx'> bool vm_is_gpa_protected(struct kvm_vm *vm, vm_paddr_t paddr);</div><div class='ctx'> </div><div class='ctx'> uint32_t guest_get_vcpuid(void);</div><div class='ctx'> </div><div class='add'>+bool kvm_arch_has_default_irqchip(void);</div><div class='add'>+</div><div class='ctx'> #endif /* SELFTEST_KVM_UTIL_H */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/loongarch/arch_timer.h b/tools/testing/selftests/kvm/include/loongarch/arch_timer.h<br/>new file mode 100644<br/>index 000000000000..2ed106b32c81<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/loongarch/arch_timer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/loongarch/arch_timer.h</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * LoongArch Constant Timer specific interface</div><div class='add'>+ */</div><div class='add'>+#ifndef SELFTEST_KVM_ARCH_TIMER_H</div><div class='add'>+#define SELFTEST_KVM_ARCH_TIMER_H</div><div class='add'>+</div><div class='add'>+#include "processor.h"</div><div class='add'>+</div><div class='add'>+/* LoongArch timer frequency is constant 100MHZ */</div><div class='add'>+#define TIMER_FREQ		(100UL &lt;&lt; 20)</div><div class='add'>+#define msec_to_cycles(msec)	(TIMER_FREQ * (unsigned long)(msec) / 1000)</div><div class='add'>+#define usec_to_cycles(usec)	(TIMER_FREQ * (unsigned long)(usec) / 1000000)</div><div class='add'>+#define cycles_to_usec(cycles)	((unsigned long)(cycles) * 1000000 / TIMER_FREQ)</div><div class='add'>+</div><div class='add'>+static inline unsigned long timer_get_cycles(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long val = 0;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"rdtime.d %0, $zero\n\t"</div><div class='add'>+		: "=r"(val)</div><div class='add'>+		:</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long timer_get_cfg(void)</div><div class='add'>+{</div><div class='add'>+	return csr_read(LOONGARCH_CSR_TCFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long timer_get_val(void)</div><div class='add'>+{</div><div class='add'>+	return csr_read(LOONGARCH_CSR_TVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void disable_timer(void)</div><div class='add'>+{</div><div class='add'>+	csr_write(0, LOONGARCH_CSR_TCFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void timer_irq_enable(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	val = csr_read(LOONGARCH_CSR_ECFG);</div><div class='add'>+	val |= ECFGF_TIMER;</div><div class='add'>+	csr_write(val, LOONGARCH_CSR_ECFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void timer_irq_disable(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	val = csr_read(LOONGARCH_CSR_ECFG);</div><div class='add'>+	val &amp;= ~ECFGF_TIMER;</div><div class='add'>+	csr_write(val, LOONGARCH_CSR_ECFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void timer_set_next_cmp_ms(unsigned int msec, bool period)</div><div class='add'>+{</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	val = msec_to_cycles(msec) &amp; CSR_TCFG_VAL;</div><div class='add'>+	val |= CSR_TCFG_EN;</div><div class='add'>+	if (period)</div><div class='add'>+		val |= CSR_TCFG_PERIOD;</div><div class='add'>+	csr_write(val, LOONGARCH_CSR_TCFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __delay(uint64_t cycles)</div><div class='add'>+{</div><div class='add'>+	uint64_t start = timer_get_cycles();</div><div class='add'>+</div><div class='add'>+	while ((timer_get_cycles() - start) &lt; cycles)</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void udelay(unsigned long usec)</div><div class='add'>+{</div><div class='add'>+	__delay(usec_to_cycles(usec));</div><div class='add'>+}</div><div class='add'>+#endif /* SELFTEST_KVM_ARCH_TIMER_H */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/loongarch/kvm_util_arch.h b/tools/testing/selftests/kvm/include/loongarch/kvm_util_arch.h<br/>new file mode 100644<br/>index 000000000000..e43a57d99b56<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/loongarch/kvm_util_arch.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/loongarch/kvm_util_arch.h</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+#ifndef SELFTEST_KVM_UTIL_ARCH_H</div><div class='add'>+#define SELFTEST_KVM_UTIL_ARCH_H</div><div class='add'>+</div><div class='add'>+struct kvm_vm_arch {};</div><div class='add'>+</div><div class='add'>+#endif  // SELFTEST_KVM_UTIL_ARCH_H</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/loongarch/processor.h b/tools/testing/selftests/kvm/include/loongarch/processor.h<br/>new file mode 100644<br/>index 000000000000..76840ddda57d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/loongarch/processor.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/loongarch/processor.h</a></div><div class='hunk'>@@ -0,0 +1,220 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#ifndef SELFTEST_KVM_PROCESSOR_H</div><div class='add'>+#define SELFTEST_KVM_PROCESSOR_H</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLER__</div><div class='add'>+#include "ucall_common.h"</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+/* general registers */</div><div class='add'>+#define zero				$r0</div><div class='add'>+#define ra				$r1</div><div class='add'>+#define tp				$r2</div><div class='add'>+#define sp				$r3</div><div class='add'>+#define a0				$r4</div><div class='add'>+#define a1				$r5</div><div class='add'>+#define a2				$r6</div><div class='add'>+#define a3				$r7</div><div class='add'>+#define a4				$r8</div><div class='add'>+#define a5				$r9</div><div class='add'>+#define a6				$r10</div><div class='add'>+#define a7				$r11</div><div class='add'>+#define t0				$r12</div><div class='add'>+#define t1				$r13</div><div class='add'>+#define t2				$r14</div><div class='add'>+#define t3				$r15</div><div class='add'>+#define t4				$r16</div><div class='add'>+#define t5				$r17</div><div class='add'>+#define t6				$r18</div><div class='add'>+#define t7				$r19</div><div class='add'>+#define t8				$r20</div><div class='add'>+#define u0				$r21</div><div class='add'>+#define fp				$r22</div><div class='add'>+#define s0				$r23</div><div class='add'>+#define s1				$r24</div><div class='add'>+#define s2				$r25</div><div class='add'>+#define s3				$r26</div><div class='add'>+#define s4				$r27</div><div class='add'>+#define s5				$r28</div><div class='add'>+#define s6				$r29</div><div class='add'>+#define s7				$r30</div><div class='add'>+#define s8				$r31</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * LoongArch page table entry definition</div><div class='add'>+ * Original header file arch/loongarch/include/asm/loongarch.h</div><div class='add'>+ */</div><div class='add'>+#define _PAGE_VALID_SHIFT		0</div><div class='add'>+#define _PAGE_DIRTY_SHIFT		1</div><div class='add'>+#define _PAGE_PLV_SHIFT			2  /* 2~3, two bits */</div><div class='add'>+#define  PLV_KERN			0</div><div class='add'>+#define  PLV_USER			3</div><div class='add'>+#define  PLV_MASK			0x3</div><div class='add'>+#define _CACHE_SHIFT			4  /* 4~5, two bits */</div><div class='add'>+#define _PAGE_PRESENT_SHIFT		7</div><div class='add'>+#define _PAGE_WRITE_SHIFT		8</div><div class='add'>+</div><div class='add'>+#define _PAGE_VALID			BIT_ULL(_PAGE_VALID_SHIFT)</div><div class='add'>+#define _PAGE_PRESENT			BIT_ULL(_PAGE_PRESENT_SHIFT)</div><div class='add'>+#define _PAGE_WRITE			BIT_ULL(_PAGE_WRITE_SHIFT)</div><div class='add'>+#define _PAGE_DIRTY			BIT_ULL(_PAGE_DIRTY_SHIFT)</div><div class='add'>+#define _PAGE_USER			(PLV_USER &lt;&lt; _PAGE_PLV_SHIFT)</div><div class='add'>+#define   __READABLE			(_PAGE_VALID)</div><div class='add'>+#define   __WRITEABLE			(_PAGE_DIRTY | _PAGE_WRITE)</div><div class='add'>+/* Coherent Cached */</div><div class='add'>+#define _CACHE_CC			BIT_ULL(_CACHE_SHIFT)</div><div class='add'>+#define PS_4K				0x0000000c</div><div class='add'>+#define PS_16K				0x0000000e</div><div class='add'>+#define PS_64K				0x00000010</div><div class='add'>+#define PS_DEFAULT_SIZE			PS_16K</div><div class='add'>+</div><div class='add'>+/* LoongArch Basic CSR registers */</div><div class='add'>+#define LOONGARCH_CSR_CRMD		0x0 /* Current mode info */</div><div class='add'>+#define  CSR_CRMD_PG_SHIFT		4</div><div class='add'>+#define  CSR_CRMD_PG			BIT_ULL(CSR_CRMD_PG_SHIFT)</div><div class='add'>+#define  CSR_CRMD_IE_SHIFT		2</div><div class='add'>+#define  CSR_CRMD_IE			BIT_ULL(CSR_CRMD_IE_SHIFT)</div><div class='add'>+#define  CSR_CRMD_PLV_SHIFT		0</div><div class='add'>+#define  CSR_CRMD_PLV_WIDTH		2</div><div class='add'>+#define  CSR_CRMD_PLV			(0x3UL &lt;&lt; CSR_CRMD_PLV_SHIFT)</div><div class='add'>+#define  PLV_MASK			0x3</div><div class='add'>+#define LOONGARCH_CSR_PRMD		0x1</div><div class='add'>+#define LOONGARCH_CSR_EUEN		0x2</div><div class='add'>+#define LOONGARCH_CSR_ECFG		0x4</div><div class='add'>+#define  ECFGB_TIMER			11</div><div class='add'>+#define  ECFGF_TIMER			(BIT_ULL(ECFGB_TIMER))</div><div class='add'>+#define LOONGARCH_CSR_ESTAT		0x5  /* Exception status */</div><div class='add'>+#define  CSR_ESTAT_EXC_SHIFT		16</div><div class='add'>+#define  CSR_ESTAT_EXC_WIDTH		6</div><div class='add'>+#define  CSR_ESTAT_EXC			(0x3f &lt;&lt; CSR_ESTAT_EXC_SHIFT)</div><div class='add'>+#define    EXCCODE_INT			0    /* Interrupt */</div><div class='add'>+#define      INT_TI			11   /* Timer interrupt*/</div><div class='add'>+#define LOONGARCH_CSR_ERA		0x6  /* ERA */</div><div class='add'>+#define LOONGARCH_CSR_BADV		0x7  /* Bad virtual address */</div><div class='add'>+#define LOONGARCH_CSR_EENTRY		0xc</div><div class='add'>+#define LOONGARCH_CSR_TLBIDX		0x10 /* TLB Index, EHINV, PageSize */</div><div class='add'>+#define  CSR_TLBIDX_PS_SHIFT		24</div><div class='add'>+#define  CSR_TLBIDX_PS_WIDTH		6</div><div class='add'>+#define  CSR_TLBIDX_PS			(0x3fUL &lt;&lt; CSR_TLBIDX_PS_SHIFT)</div><div class='add'>+#define  CSR_TLBIDX_SIZEM		0x3f000000</div><div class='add'>+#define  CSR_TLBIDX_SIZE		CSR_TLBIDX_PS_SHIFT</div><div class='add'>+#define LOONGARCH_CSR_ASID		0x18 /* ASID */</div><div class='add'>+#define LOONGARCH_CSR_PGDL		0x19</div><div class='add'>+#define LOONGARCH_CSR_PGDH		0x1a</div><div class='add'>+/* Page table base */</div><div class='add'>+#define LOONGARCH_CSR_PGD		0x1b</div><div class='add'>+#define LOONGARCH_CSR_PWCTL0		0x1c</div><div class='add'>+#define LOONGARCH_CSR_PWCTL1		0x1d</div><div class='add'>+#define LOONGARCH_CSR_STLBPGSIZE	0x1e</div><div class='add'>+#define LOONGARCH_CSR_CPUID		0x20</div><div class='add'>+#define LOONGARCH_CSR_KS0		0x30</div><div class='add'>+#define LOONGARCH_CSR_KS1		0x31</div><div class='add'>+#define LOONGARCH_CSR_TMID		0x40</div><div class='add'>+#define LOONGARCH_CSR_TCFG		0x41</div><div class='add'>+#define  CSR_TCFG_VAL			(BIT_ULL(48) - BIT_ULL(2))</div><div class='add'>+#define  CSR_TCFG_PERIOD_SHIFT		1</div><div class='add'>+#define  CSR_TCFG_PERIOD		(0x1UL &lt;&lt; CSR_TCFG_PERIOD_SHIFT)</div><div class='add'>+#define  CSR_TCFG_EN			(0x1UL)</div><div class='add'>+#define LOONGARCH_CSR_TVAL		0x42</div><div class='add'>+#define LOONGARCH_CSR_TINTCLR		0x44 /* Timer interrupt clear */</div><div class='add'>+#define  CSR_TINTCLR_TI_SHIFT		0</div><div class='add'>+#define  CSR_TINTCLR_TI			(1 &lt;&lt; CSR_TINTCLR_TI_SHIFT)</div><div class='add'>+/* TLB refill exception entry */</div><div class='add'>+#define LOONGARCH_CSR_TLBRENTRY		0x88</div><div class='add'>+#define LOONGARCH_CSR_TLBRSAVE		0x8b</div><div class='add'>+#define LOONGARCH_CSR_TLBREHI		0x8e</div><div class='add'>+#define  CSR_TLBREHI_PS_SHIFT		0</div><div class='add'>+#define  CSR_TLBREHI_PS			(0x3fUL &lt;&lt; CSR_TLBREHI_PS_SHIFT)</div><div class='add'>+</div><div class='add'>+#define csr_read(csr)				\</div><div class='add'>+({						\</div><div class='add'>+	register unsigned long __v;		\</div><div class='add'>+	__asm__ __volatile__(			\</div><div class='add'>+		"csrrd %[val], %[reg]\n\t"	\</div><div class='add'>+		: [val] "=r" (__v)		\</div><div class='add'>+		: [reg] "i" (csr)		\</div><div class='add'>+		: "memory");			\</div><div class='add'>+	__v;					\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define csr_write(v, csr)			\</div><div class='add'>+({						\</div><div class='add'>+	register unsigned long __v = v;		\</div><div class='add'>+	__asm__ __volatile__ (			\</div><div class='add'>+		"csrwr %[val], %[reg]\n\t"	\</div><div class='add'>+		: [val] "+r" (__v)		\</div><div class='add'>+		: [reg] "i" (csr)		\</div><div class='add'>+		: "memory");			\</div><div class='add'>+	__v;					\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define EXREGS_GPRS			(32)</div><div class='add'>+</div><div class='add'>+#ifndef __ASSEMBLER__</div><div class='add'>+void handle_tlb_refill(void);</div><div class='add'>+void handle_exception(void);</div><div class='add'>+</div><div class='add'>+struct ex_regs {</div><div class='add'>+	unsigned long regs[EXREGS_GPRS];</div><div class='add'>+	unsigned long pc;</div><div class='add'>+	unsigned long estat;</div><div class='add'>+	unsigned long badv;</div><div class='add'>+	unsigned long prmd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PC_OFFSET_EXREGS		offsetof(struct ex_regs, pc)</div><div class='add'>+#define ESTAT_OFFSET_EXREGS		offsetof(struct ex_regs, estat)</div><div class='add'>+#define BADV_OFFSET_EXREGS		offsetof(struct ex_regs, badv)</div><div class='add'>+#define PRMD_OFFSET_EXREGS		offsetof(struct ex_regs, prmd)</div><div class='add'>+#define EXREGS_SIZE			sizeof(struct ex_regs)</div><div class='add'>+</div><div class='add'>+#define VECTOR_NUM			64</div><div class='add'>+</div><div class='add'>+typedef void(*handler_fn)(struct ex_regs *);</div><div class='add'>+</div><div class='add'>+struct handlers {</div><div class='add'>+	handler_fn exception_handlers[VECTOR_NUM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void vm_init_descriptor_tables(struct kvm_vm *vm);</div><div class='add'>+void vm_install_exception_handler(struct kvm_vm *vm, int vector, handler_fn handler);</div><div class='add'>+</div><div class='add'>+static inline void cpu_relax(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile("nop" ::: "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void local_irq_enable(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int flags = CSR_CRMD_IE;</div><div class='add'>+	register unsigned int mask asm("$t0") = CSR_CRMD_IE;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"csrxchg %[val], %[mask], %[reg]\n\t"</div><div class='add'>+		: [val] "+r" (flags)</div><div class='add'>+		: [mask] "r" (mask), [reg] "i" (LOONGARCH_CSR_CRMD)</div><div class='add'>+		: "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void local_irq_disable(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int flags = 0;</div><div class='add'>+	register unsigned int mask asm("$t0") = CSR_CRMD_IE;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"csrxchg %[val], %[mask], %[reg]\n\t"</div><div class='add'>+		: [val] "+r" (flags)</div><div class='add'>+		: [mask] "r" (mask), [reg] "i" (LOONGARCH_CSR_CRMD)</div><div class='add'>+		: "memory");</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define PC_OFFSET_EXREGS		((EXREGS_GPRS + 0) * 8)</div><div class='add'>+#define ESTAT_OFFSET_EXREGS		((EXREGS_GPRS + 1) * 8)</div><div class='add'>+#define BADV_OFFSET_EXREGS		((EXREGS_GPRS + 2) * 8)</div><div class='add'>+#define PRMD_OFFSET_EXREGS		((EXREGS_GPRS + 3) * 8)</div><div class='add'>+#define EXREGS_SIZE			((EXREGS_GPRS + 4) * 8)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* SELFTEST_KVM_PROCESSOR_H */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/loongarch/ucall.h b/tools/testing/selftests/kvm/include/loongarch/ucall.h<br/>new file mode 100644<br/>index 000000000000..4ec801f37f00<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/loongarch/ucall.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/loongarch/ucall.h</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+#ifndef SELFTEST_KVM_UCALL_H</div><div class='add'>+#define SELFTEST_KVM_UCALL_H</div><div class='add'>+</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+</div><div class='add'>+#define UCALL_EXIT_REASON       KVM_EXIT_MMIO</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ucall_exit_mmio_addr holds per-VM values (global data is duplicated by each</div><div class='add'>+ * VM), it must not be accessed from host code.</div><div class='add'>+ */</div><div class='add'>+extern vm_vaddr_t *ucall_exit_mmio_addr;</div><div class='add'>+</div><div class='add'>+static inline void ucall_arch_do_ucall(vm_vaddr_t uc)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(*ucall_exit_mmio_addr, uc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/lru_gen_util.h b/tools/testing/selftests/kvm/include/lru_gen_util.h<br/>new file mode 100644<br/>index 000000000000..d32ff5d8ffd0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/lru_gen_util.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/lru_gen_util.h</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Tools for integrating with lru_gen, like parsing the lru_gen debugfs output.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025, Google LLC.</div><div class='add'>+ */</div><div class='add'>+#ifndef SELFTEST_KVM_LRU_GEN_UTIL_H</div><div class='add'>+#define SELFTEST_KVM_LRU_GEN_UTIL_H</div><div class='add'>+</div><div class='add'>+#include &lt;inttypes.h&gt;</div><div class='add'>+#include &lt;limits.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+</div><div class='add'>+#include "test_util.h"</div><div class='add'>+</div><div class='add'>+#define MAX_NR_GENS 16 /* MAX_NR_GENS in include/linux/mmzone.h */</div><div class='add'>+#define MAX_NR_NODES 4 /* Maximum number of nodes supported by the test */</div><div class='add'>+</div><div class='add'>+#define LRU_GEN_DEBUGFS "/sys/kernel/debug/lru_gen"</div><div class='add'>+#define LRU_GEN_ENABLED_PATH "/sys/kernel/mm/lru_gen/enabled"</div><div class='add'>+#define LRU_GEN_ENABLED 1</div><div class='add'>+#define LRU_GEN_MM_WALK 2</div><div class='add'>+</div><div class='add'>+struct generation_stats {</div><div class='add'>+	int gen;</div><div class='add'>+	long age_ms;</div><div class='add'>+	long nr_anon;</div><div class='add'>+	long nr_file;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct node_stats {</div><div class='add'>+	int node;</div><div class='add'>+	int nr_gens; /* Number of populated gens entries. */</div><div class='add'>+	struct generation_stats gens[MAX_NR_GENS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct memcg_stats {</div><div class='add'>+	unsigned long memcg_id;</div><div class='add'>+	int nr_nodes; /* Number of populated nodes entries. */</div><div class='add'>+	struct node_stats nodes[MAX_NR_NODES];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void lru_gen_read_memcg_stats(struct memcg_stats *stats, const char *memcg);</div><div class='add'>+long lru_gen_sum_memcg_stats(const struct memcg_stats *stats);</div><div class='add'>+long lru_gen_sum_memcg_stats_for_gen(int gen, const struct memcg_stats *stats);</div><div class='add'>+void lru_gen_do_aging(struct memcg_stats *stats, const char *memcg);</div><div class='add'>+int lru_gen_find_generation(const struct memcg_stats *stats,</div><div class='add'>+			    unsigned long total_pages);</div><div class='add'>+bool lru_gen_usable(void);</div><div class='add'>+</div><div class='add'>+#endif /* SELFTEST_KVM_LRU_GEN_UTIL_H */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/numaif.h b/tools/testing/selftests/kvm/include/numaif.h<br/>index b020547403fd..29572a6d789c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/numaif.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/numaif.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/numaif.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/numaif.h</a></div><div class='hunk'>@@ -1,55 +1,83 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * tools/testing/selftests/kvm/include/numaif.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2020, Google LLC.</div><div class='del'>- *</div><div class='del'>- * This work is licensed under the terms of the GNU GPL, version 2.</div><div class='del'>- *</div><div class='del'>- * Header file that provides access to NUMA API functions not explicitly</div><div class='del'>- * exported to user space.</div><div class='del'>- */</div><div class='add'>+/* Copyright (C) 2020, Google LLC. */</div><div class='ctx'> </div><div class='ctx'> #ifndef SELFTEST_KVM_NUMAIF_H</div><div class='ctx'> #define SELFTEST_KVM_NUMAIF_H</div><div class='ctx'> </div><div class='del'>-#define __NR_get_mempolicy 239</div><div class='del'>-#define __NR_migrate_pages 256</div><div class='add'>+#include &lt;dirent.h&gt;</div><div class='ctx'> </div><div class='del'>-/* System calls */</div><div class='del'>-long get_mempolicy(int *policy, const unsigned long *nmask,</div><div class='del'>-		   unsigned long maxnode, void *addr, int flags)</div><div class='add'>+#include &lt;linux/mempolicy.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kvm_syscalls.h"</div><div class='add'>+</div><div class='add'>+KVM_SYSCALL_DEFINE(get_mempolicy, 5, int *, policy, const unsigned long *, nmask,</div><div class='add'>+		   unsigned long, maxnode, void *, addr, int, flags);</div><div class='add'>+</div><div class='add'>+KVM_SYSCALL_DEFINE(set_mempolicy, 3, int, mode, const unsigned long *, nmask,</div><div class='add'>+		   unsigned long, maxnode);</div><div class='add'>+</div><div class='add'>+KVM_SYSCALL_DEFINE(set_mempolicy_home_node, 4, unsigned long, start,</div><div class='add'>+		   unsigned long, len, unsigned long, home_node,</div><div class='add'>+		   unsigned long, flags);</div><div class='add'>+</div><div class='add'>+KVM_SYSCALL_DEFINE(migrate_pages, 4, int, pid, unsigned long, maxnode,</div><div class='add'>+		   const unsigned long *, frommask, const unsigned long *, tomask);</div><div class='add'>+</div><div class='add'>+KVM_SYSCALL_DEFINE(move_pages, 6, int, pid, unsigned long, count, void *, pages,</div><div class='add'>+		   const int *, nodes, int *, status, int, flags);</div><div class='add'>+</div><div class='add'>+KVM_SYSCALL_DEFINE(mbind, 6, void *, addr, unsigned long, size, int, mode,</div><div class='add'>+		   const unsigned long *, nodemask, unsigned long, maxnode,</div><div class='add'>+		   unsigned int, flags);</div><div class='add'>+</div><div class='add'>+static inline int get_max_numa_node(void)</div><div class='ctx'> {</div><div class='del'>-	return syscall(__NR_get_mempolicy, policy, nmask,</div><div class='del'>-		       maxnode, addr, flags);</div><div class='add'>+	struct dirent *de;</div><div class='add'>+	int max_node = 0;</div><div class='add'>+	DIR *d;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assume there's a single node if the kernel doesn't support NUMA,</div><div class='add'>+	 * or if no nodes are found.</div><div class='add'>+	 */</div><div class='add'>+	d = opendir("/sys/devices/system/node");</div><div class='add'>+	if (!d)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	while ((de = readdir(d)) != NULL) {</div><div class='add'>+		int node_id;</div><div class='add'>+		char *endptr;</div><div class='add'>+</div><div class='add'>+		if (strncmp(de-&gt;d_name, "node", 4) != 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		node_id = strtol(de-&gt;d_name + 4, &amp;endptr, 10);</div><div class='add'>+		if (*endptr != '\0')</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (node_id &gt; max_node)</div><div class='add'>+			max_node = node_id;</div><div class='add'>+	}</div><div class='add'>+	closedir(d);</div><div class='add'>+</div><div class='add'>+	return max_node;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-long migrate_pages(int pid, unsigned long maxnode,</div><div class='del'>-		   const unsigned long *frommask,</div><div class='del'>-		   const unsigned long *tomask)</div><div class='add'>+static bool is_numa_available(void)</div><div class='ctx'> {</div><div class='del'>-	return syscall(__NR_migrate_pages, pid, maxnode, frommask, tomask);</div><div class='add'>+	/*</div><div class='add'>+	 * Probe for NUMA by doing a dummy get_mempolicy().  If the syscall</div><div class='add'>+	 * fails with ENOSYS, then the kernel was built without NUMA support.</div><div class='add'>+	 * if the syscall fails with EPERM, then the process/user lacks the</div><div class='add'>+	 * necessary capabilities (CAP_SYS_NICE).</div><div class='add'>+	 */</div><div class='add'>+	return !get_mempolicy(NULL, NULL, 0, NULL, 0) ||</div><div class='add'>+		(errno != ENOSYS &amp;&amp; errno != EPERM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Policies */</div><div class='del'>-#define MPOL_DEFAULT	 0</div><div class='del'>-#define MPOL_PREFERRED	 1</div><div class='del'>-#define MPOL_BIND	 2</div><div class='del'>-#define MPOL_INTERLEAVE	 3</div><div class='del'>-</div><div class='del'>-#define MPOL_MAX MPOL_INTERLEAVE</div><div class='del'>-</div><div class='del'>-/* Flags for get_mem_policy */</div><div class='del'>-#define MPOL_F_NODE	    (1&lt;&lt;0)  /* return next il node or node of address */</div><div class='del'>-				    /* Warning: MPOL_F_NODE is unsupported and</div><div class='del'>-				     * subject to change. Don't use.</div><div class='del'>-				     */</div><div class='del'>-#define MPOL_F_ADDR	    (1&lt;&lt;1)  /* look up vma using address */</div><div class='del'>-#define MPOL_F_MEMS_ALLOWED (1&lt;&lt;2)  /* query nodes allowed in cpuset */</div><div class='del'>-</div><div class='del'>-/* Flags for mbind */</div><div class='del'>-#define MPOL_MF_STRICT	     (1&lt;&lt;0) /* Verify existing pages in the mapping */</div><div class='del'>-#define MPOL_MF_MOVE	     (1&lt;&lt;1) /* Move pages owned by this process to conform to mapping */</div><div class='del'>-#define MPOL_MF_MOVE_ALL     (1&lt;&lt;2) /* Move every page to conform to mapping */</div><div class='add'>+static inline bool is_multi_numa_node_system(void)</div><div class='add'>+{</div><div class='add'>+	return is_numa_available() &amp;&amp; get_max_numa_node() &gt;= 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* SELFTEST_KVM_NUMAIF_H */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/riscv/processor.h b/tools/testing/selftests/kvm/include/riscv/processor.h<br/>index 5f389166338c..e58282488beb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/riscv/processor.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/riscv/processor.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/riscv/processor.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/riscv/processor.h</a></div><div class='hunk'>@@ -9,8 +9,22 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;asm/csr.h&gt;</div><div class='add'>+#include &lt;asm/vdso/processor.h&gt;</div><div class='ctx'> #include "kvm_util.h"</div><div class='ctx'> </div><div class='add'>+#define INSN_OPCODE_MASK	0x007c</div><div class='add'>+#define INSN_OPCODE_SHIFT	2</div><div class='add'>+#define INSN_OPCODE_SYSTEM	28</div><div class='add'>+</div><div class='add'>+#define INSN_MASK_FUNCT3	0x7000</div><div class='add'>+#define INSN_SHIFT_FUNCT3	12</div><div class='add'>+</div><div class='add'>+#define INSN_CSR_MASK		0xfff00000</div><div class='add'>+#define INSN_CSR_SHIFT		20</div><div class='add'>+</div><div class='add'>+#define GET_RM(insn)            (((insn) &amp; INSN_MASK_FUNCT3) &gt;&gt; INSN_SHIFT_FUNCT3)</div><div class='add'>+#define GET_CSR_NUM(insn)       (((insn) &amp; INSN_CSR_MASK) &gt;&gt; INSN_CSR_SHIFT)</div><div class='add'>+</div><div class='ctx'> static inline uint64_t __kvm_reg_id(uint64_t type, uint64_t subtype,</div><div class='ctx'> 				    uint64_t idx, uint64_t size)</div><div class='ctx'> {</div><div class='hunk'>@@ -60,7 +74,8 @@ static inline bool __vcpu_has_sbi_ext(struct kvm_vcpu *vcpu, uint64_t sbi_ext)</div><div class='ctx'> 	return __vcpu_has_ext(vcpu, RISCV_SBI_EXT_REG(sbi_ext));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ex_regs {</div><div class='add'>+struct pt_regs {</div><div class='add'>+	unsigned long epc;</div><div class='ctx'> 	unsigned long ra;</div><div class='ctx'> 	unsigned long sp;</div><div class='ctx'> 	unsigned long gp;</div><div class='hunk'>@@ -92,16 +107,19 @@ struct ex_regs {</div><div class='ctx'> 	unsigned long t4;</div><div class='ctx'> 	unsigned long t5;</div><div class='ctx'> 	unsigned long t6;</div><div class='del'>-	unsigned long epc;</div><div class='add'>+	/* Supervisor/Machine CSRs */</div><div class='ctx'> 	unsigned long status;</div><div class='add'>+	unsigned long badaddr;</div><div class='ctx'> 	unsigned long cause;</div><div class='add'>+	/* a0 value before the syscall */</div><div class='add'>+	unsigned long orig_a0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define NR_VECTORS  2</div><div class='ctx'> #define NR_EXCEPTIONS  32</div><div class='ctx'> #define EC_MASK  (NR_EXCEPTIONS - 1)</div><div class='ctx'> </div><div class='del'>-typedef void(*exception_handler_fn)(struct ex_regs *);</div><div class='add'>+typedef void(*exception_handler_fn)(struct pt_regs *);</div><div class='ctx'> </div><div class='ctx'> void vm_init_vector_tables(struct kvm_vm *vm);</div><div class='ctx'> void vcpu_init_vector_tables(struct kvm_vcpu *vcpu);</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testing/selftests/kvm/include/test_util.h<br/>index 3e473058849f..b4872ba8ed12 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/test_util.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/test_util.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/test_util.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/test_util.h</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'> #ifndef SELFTEST_KVM_TEST_UTIL_H</div><div class='ctx'> #define SELFTEST_KVM_TEST_UTIL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;setjmp.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='ctx'> #include &lt;stdbool.h&gt;</div><div class='hunk'>@@ -22,7 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> #define msecs_to_usecs(msec)    ((msec) * 1000ULL)</div><div class='ctx'> </div><div class='del'>-static inline int _no_printf(const char *format, ...) { return 0; }</div><div class='add'>+static inline __printf(1, 2) int _no_printf(const char *format, ...) { return 0; }</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> #define pr_debug(...) printf(__VA_ARGS__)</div><div class='hunk'>@@ -78,6 +80,23 @@ do {									\</div><div class='ctx'> 	__builtin_unreachable(); \</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+extern sigjmp_buf expect_sigbus_jmpbuf;</div><div class='add'>+void expect_sigbus_handler(int signum);</div><div class='add'>+</div><div class='add'>+#define TEST_EXPECT_SIGBUS(action)						\</div><div class='add'>+do {										\</div><div class='add'>+	struct sigaction sa_old, sa_new = {					\</div><div class='add'>+		.sa_handler = expect_sigbus_handler,				\</div><div class='add'>+	};									\</div><div class='add'>+										\</div><div class='add'>+	sigaction(SIGBUS, &amp;sa_new, &amp;sa_old);					\</div><div class='add'>+	if (sigsetjmp(expect_sigbus_jmpbuf, 1) == 0) {				\</div><div class='add'>+		action;								\</div><div class='add'>+		TEST_FAIL("'%s' should have triggered SIGBUS", #action);	\</div><div class='add'>+	}									\</div><div class='add'>+	sigaction(SIGBUS, &amp;sa_old, NULL);					\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='ctx'> size_t parse_size(const char *size);</div><div class='ctx'> </div><div class='ctx'> int64_t timespec_to_ns(struct timespec ts);</div><div class='hunk'>@@ -153,6 +172,7 @@ bool is_backing_src_hugetlb(uint32_t i);</div><div class='ctx'> void backing_src_help(const char *flag);</div><div class='ctx'> enum vm_mem_backing_src_type parse_backing_src_type(const char *type_name);</div><div class='ctx'> long get_run_delay(void);</div><div class='add'>+bool is_numa_balancing_enabled(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Whether or not the given source type is shared memory (as opposed to</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/x86/pmu.h b/tools/testing/selftests/kvm/include/x86/pmu.h<br/>index 3c10c4dc0ae8..72575eadb63a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/x86/pmu.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/x86/pmu.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/x86/pmu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/x86/pmu.h</a></div><div class='hunk'>@@ -5,8 +5,11 @@</div><div class='ctx'> #ifndef SELFTEST_KVM_PMU_H</div><div class='ctx'> #define SELFTEST_KVM_PMU_H</div><div class='ctx'> </div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='ctx'> #include &lt;stdint.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='ctx'> #define KVM_PMU_EVENT_FILTER_MAX_EVENTS			300</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -61,6 +64,11 @@</div><div class='ctx'> #define	INTEL_ARCH_BRANCHES_RETIRED		RAW_EVENT(0xc4, 0x00)</div><div class='ctx'> #define	INTEL_ARCH_BRANCHES_MISPREDICTED	RAW_EVENT(0xc5, 0x00)</div><div class='ctx'> #define	INTEL_ARCH_TOPDOWN_SLOTS		RAW_EVENT(0xa4, 0x01)</div><div class='add'>+#define	INTEL_ARCH_TOPDOWN_BE_BOUND		RAW_EVENT(0xa4, 0x02)</div><div class='add'>+#define	INTEL_ARCH_TOPDOWN_BAD_SPEC		RAW_EVENT(0x73, 0x00)</div><div class='add'>+#define	INTEL_ARCH_TOPDOWN_FE_BOUND		RAW_EVENT(0x9c, 0x01)</div><div class='add'>+#define	INTEL_ARCH_TOPDOWN_RETIRING		RAW_EVENT(0xc2, 0x02)</div><div class='add'>+#define	INTEL_ARCH_LBR_INSERTS			RAW_EVENT(0xe4, 0x01)</div><div class='ctx'> </div><div class='ctx'> #define	AMD_ZEN_CORE_CYCLES			RAW_EVENT(0x76, 0x00)</div><div class='ctx'> #define	AMD_ZEN_INSTRUCTIONS_RETIRED		RAW_EVENT(0xc0, 0x00)</div><div class='hunk'>@@ -80,6 +88,11 @@ enum intel_pmu_architectural_events {</div><div class='ctx'> 	INTEL_ARCH_BRANCHES_RETIRED_INDEX,</div><div class='ctx'> 	INTEL_ARCH_BRANCHES_MISPREDICTED_INDEX,</div><div class='ctx'> 	INTEL_ARCH_TOPDOWN_SLOTS_INDEX,</div><div class='add'>+	INTEL_ARCH_TOPDOWN_BE_BOUND_INDEX,</div><div class='add'>+	INTEL_ARCH_TOPDOWN_BAD_SPEC_INDEX,</div><div class='add'>+	INTEL_ARCH_TOPDOWN_FE_BOUND_INDEX,</div><div class='add'>+	INTEL_ARCH_TOPDOWN_RETIRING_INDEX,</div><div class='add'>+	INTEL_ARCH_LBR_INSERTS_INDEX,</div><div class='ctx'> 	NR_INTEL_ARCH_EVENTS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -94,4 +107,17 @@ enum amd_pmu_zen_events {</div><div class='ctx'> extern const uint64_t intel_pmu_arch_events[];</div><div class='ctx'> extern const uint64_t amd_pmu_zen_events[];</div><div class='ctx'> </div><div class='add'>+enum pmu_errata {</div><div class='add'>+	INSTRUCTIONS_RETIRED_OVERCOUNT,</div><div class='add'>+	BRANCHES_RETIRED_OVERCOUNT,</div><div class='add'>+};</div><div class='add'>+extern uint64_t pmu_errata_mask;</div><div class='add'>+</div><div class='add'>+void kvm_init_pmu_errata(void);</div><div class='add'>+</div><div class='add'>+static inline bool this_pmu_has_errata(enum pmu_errata errata)</div><div class='add'>+{</div><div class='add'>+	return pmu_errata_mask &amp; BIT_ULL(errata);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* SELFTEST_KVM_PMU_H */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/x86/processor.h b/tools/testing/selftests/kvm/include/x86/processor.h<br/>index d60da8966772..57d62a425109 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/x86/processor.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/x86/processor.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/x86/processor.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/x86/processor.h</a></div><div class='hunk'>@@ -34,6 +34,8 @@ extern uint64_t guest_tsc_khz;</div><div class='ctx'> </div><div class='ctx'> #define NMI_VECTOR		0x02</div><div class='ctx'> </div><div class='add'>+const char *ex_str(int vector);</div><div class='add'>+</div><div class='ctx'> #define X86_EFLAGS_FIXED	 (1u &lt;&lt; 1)</div><div class='ctx'> </div><div class='ctx'> #define X86_CR4_VME		(1ul &lt;&lt; 0)</div><div class='hunk'>@@ -183,6 +185,9 @@ struct kvm_x86_cpu_feature {</div><div class='ctx'>  * Extended Leafs, a.k.a. AMD defined</div><div class='ctx'>  */</div><div class='ctx'> #define	X86_FEATURE_SVM			KVM_X86_CPU_FEATURE(0x80000001, 0, ECX, 2)</div><div class='add'>+#define	X86_FEATURE_PERFCTR_CORE	KVM_X86_CPU_FEATURE(0x80000001, 0, ECX, 23)</div><div class='add'>+#define	X86_FEATURE_PERFCTR_NB		KVM_X86_CPU_FEATURE(0x80000001, 0, ECX, 24)</div><div class='add'>+#define	X86_FEATURE_PERFCTR_LLC		KVM_X86_CPU_FEATURE(0x80000001, 0, ECX, 28)</div><div class='ctx'> #define	X86_FEATURE_NX			KVM_X86_CPU_FEATURE(0x80000001, 0, EDX, 20)</div><div class='ctx'> #define	X86_FEATURE_GBPAGES		KVM_X86_CPU_FEATURE(0x80000001, 0, EDX, 26)</div><div class='ctx'> #define	X86_FEATURE_RDTSCP		KVM_X86_CPU_FEATURE(0x80000001, 0, EDX, 27)</div><div class='hunk'>@@ -197,8 +202,12 @@ struct kvm_x86_cpu_feature {</div><div class='ctx'> #define X86_FEATURE_PAUSEFILTER         KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 10)</div><div class='ctx'> #define X86_FEATURE_PFTHRESHOLD         KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 12)</div><div class='ctx'> #define	X86_FEATURE_VGIF		KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 16)</div><div class='add'>+#define X86_FEATURE_IDLE_HLT		KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 30)</div><div class='ctx'> #define X86_FEATURE_SEV			KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 1)</div><div class='ctx'> #define X86_FEATURE_SEV_ES		KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 3)</div><div class='add'>+#define X86_FEATURE_SEV_SNP		KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 4)</div><div class='add'>+#define	X86_FEATURE_PERFMON_V2		KVM_X86_CPU_FEATURE(0x80000022, 0, EAX, 0)</div><div class='add'>+#define	X86_FEATURE_LBR_PMC_FREEZE	KVM_X86_CPU_FEATURE(0x80000022, 0, EAX, 2)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * KVM defined paravirt features.</div><div class='hunk'>@@ -258,7 +267,7 @@ struct kvm_x86_cpu_property {</div><div class='ctx'> #define X86_PROPERTY_PMU_NR_GP_COUNTERS		KVM_X86_CPU_PROPERTY(0xa, 0, EAX, 8, 15)</div><div class='ctx'> #define X86_PROPERTY_PMU_GP_COUNTERS_BIT_WIDTH	KVM_X86_CPU_PROPERTY(0xa, 0, EAX, 16, 23)</div><div class='ctx'> #define X86_PROPERTY_PMU_EBX_BIT_VECTOR_LENGTH	KVM_X86_CPU_PROPERTY(0xa, 0, EAX, 24, 31)</div><div class='del'>-#define X86_PROPERTY_PMU_EVENTS_MASK		KVM_X86_CPU_PROPERTY(0xa, 0, EBX, 0, 7)</div><div class='add'>+#define X86_PROPERTY_PMU_EVENTS_MASK		KVM_X86_CPU_PROPERTY(0xa, 0, EBX, 0, 12)</div><div class='ctx'> #define X86_PROPERTY_PMU_FIXED_COUNTERS_BITMASK	KVM_X86_CPU_PROPERTY(0xa, 0, ECX, 0, 31)</div><div class='ctx'> #define X86_PROPERTY_PMU_NR_FIXED_COUNTERS	KVM_X86_CPU_PROPERTY(0xa, 0, EDX, 0, 4)</div><div class='ctx'> #define X86_PROPERTY_PMU_FIXED_COUNTERS_BIT_WIDTH	KVM_X86_CPU_PROPERTY(0xa, 0, EDX, 5, 12)</div><div class='hunk'>@@ -285,6 +294,8 @@ struct kvm_x86_cpu_property {</div><div class='ctx'> #define X86_PROPERTY_GUEST_MAX_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 16, 23)</div><div class='ctx'> #define X86_PROPERTY_SEV_C_BIT			KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 0, 5)</div><div class='ctx'> #define X86_PROPERTY_PHYS_ADDR_REDUCTION	KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 6, 11)</div><div class='add'>+#define X86_PROPERTY_NR_PERFCTR_CORE		KVM_X86_CPU_PROPERTY(0x80000022, 0, EBX, 0, 3)</div><div class='add'>+#define X86_PROPERTY_NR_PERFCTR_NB		KVM_X86_CPU_PROPERTY(0x80000022, 0, EBX, 10, 15)</div><div class='ctx'> </div><div class='ctx'> #define X86_PROPERTY_MAX_CENTAUR_LEAF		KVM_X86_CPU_PROPERTY(0xC0000000, 0, EAX, 0, 31)</div><div class='ctx'> </div><div class='hunk'>@@ -323,6 +334,11 @@ struct kvm_x86_pmu_feature {</div><div class='ctx'> #define X86_PMU_FEATURE_BRANCH_INSNS_RETIRED		KVM_X86_PMU_FEATURE(EBX, 5)</div><div class='ctx'> #define X86_PMU_FEATURE_BRANCHES_MISPREDICTED		KVM_X86_PMU_FEATURE(EBX, 6)</div><div class='ctx'> #define X86_PMU_FEATURE_TOPDOWN_SLOTS			KVM_X86_PMU_FEATURE(EBX, 7)</div><div class='add'>+#define X86_PMU_FEATURE_TOPDOWN_BE_BOUND		KVM_X86_PMU_FEATURE(EBX, 8)</div><div class='add'>+#define X86_PMU_FEATURE_TOPDOWN_BAD_SPEC		KVM_X86_PMU_FEATURE(EBX, 9)</div><div class='add'>+#define X86_PMU_FEATURE_TOPDOWN_FE_BOUND		KVM_X86_PMU_FEATURE(EBX, 10)</div><div class='add'>+#define X86_PMU_FEATURE_TOPDOWN_RETIRING		KVM_X86_PMU_FEATURE(EBX, 11)</div><div class='add'>+#define X86_PMU_FEATURE_LBR_INSERTS			KVM_X86_PMU_FEATURE(EBX, 12)</div><div class='ctx'> </div><div class='ctx'> #define X86_PMU_FEATURE_INSNS_RETIRED_FIXED		KVM_X86_PMU_FEATURE(ECX, 0)</div><div class='ctx'> #define X86_PMU_FEATURE_CPU_CYCLES_FIXED		KVM_X86_PMU_FEATURE(ECX, 1)</div><div class='hunk'>@@ -1141,7 +1157,6 @@ do {											\</div><div class='ctx'> </div><div class='ctx'> void kvm_get_cpu_address_width(unsigned int *pa_bits, unsigned int *va_bits);</div><div class='ctx'> void kvm_init_vm_address_properties(struct kvm_vm *vm);</div><div class='del'>-bool vm_is_unrestricted_guest(struct kvm_vm *vm);</div><div class='ctx'> </div><div class='ctx'> struct ex_regs {</div><div class='ctx'> 	uint64_t rax, rcx, rdx, rbx;</div><div class='hunk'>@@ -1171,6 +1186,12 @@ struct idt_entry {</div><div class='ctx'> void vm_install_exception_handler(struct kvm_vm *vm, int vector,</div><div class='ctx'> 			void (*handler)(struct ex_regs *));</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Exception fixup morphs #DE to an arbitrary magic vector so that '0' can be</div><div class='add'>+ * used to signal "no expcetion".</div><div class='add'>+ */</div><div class='add'>+#define KVM_MAGIC_DE_VECTOR 0xff</div><div class='add'>+</div><div class='ctx'> /* If a toddler were to say "abracadabra". */</div><div class='ctx'> #define KVM_EXCEPTION_MAGIC 0xabacadabaULL</div><div class='ctx'> </div><div class='hunk'>@@ -1244,7 +1265,7 @@ void vm_install_exception_handler(struct kvm_vm *vm, int vector,</div><div class='ctx'> 	uint64_t ign_error_code;					\</div><div class='ctx'> 	uint8_t vector;							\</div><div class='ctx'> 									\</div><div class='del'>-	asm volatile(KVM_ASM_SAFE(insn)					\</div><div class='add'>+	asm volatile(KVM_ASM_SAFE_FEP(insn)				\</div><div class='ctx'> 		     : KVM_ASM_SAFE_OUTPUTS(vector, ign_error_code)	\</div><div class='ctx'> 		     : inputs						\</div><div class='ctx'> 		     : KVM_ASM_SAFE_CLOBBERS);				\</div><div class='hunk'>@@ -1306,6 +1327,26 @@ static inline uint8_t xsetbv_safe(uint32_t index, uint64_t value)</div><div class='ctx'> </div><div class='ctx'> bool kvm_is_tdp_enabled(void);</div><div class='ctx'> </div><div class='add'>+static inline bool get_kvm_intel_param_bool(const char *param)</div><div class='add'>+{</div><div class='add'>+	return kvm_get_module_param_bool("kvm_intel", param);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool get_kvm_amd_param_bool(const char *param)</div><div class='add'>+{</div><div class='add'>+	return kvm_get_module_param_bool("kvm_amd", param);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int get_kvm_intel_param_integer(const char *param)</div><div class='add'>+{</div><div class='add'>+	return kvm_get_module_param_integer("kvm_intel", param);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int get_kvm_amd_param_integer(const char *param)</div><div class='add'>+{</div><div class='add'>+	return kvm_get_module_param_integer("kvm_amd", param);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool kvm_is_pmu_enabled(void)</div><div class='ctx'> {</div><div class='ctx'> 	return get_kvm_param_bool("enable_pmu");</div><div class='hunk'>@@ -1316,6 +1357,16 @@ static inline bool kvm_is_forced_emulation_enabled(void)</div><div class='ctx'> 	return !!get_kvm_param_integer("force_emulation_prefix");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool kvm_is_unrestricted_guest_enabled(void)</div><div class='add'>+{</div><div class='add'>+	return get_kvm_intel_param_bool("unrestricted_guest");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool kvm_is_ignore_msrs(void)</div><div class='add'>+{</div><div class='add'>+	return get_kvm_param_bool("ignore_msrs");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> uint64_t *__vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr,</div><div class='ctx'> 				    int *level);</div><div class='ctx'> uint64_t *vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr);</div><div class='hunk'>@@ -1339,6 +1390,46 @@ static inline void kvm_hypercall_map_gpa_range(uint64_t gpa, uint64_t size,</div><div class='ctx'> 	GUEST_ASSERT(!ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Execute HLT in an STI interrupt shadow to ensure that a pending IRQ that's</div><div class='add'>+ * intended to be a wake event arrives *after* HLT is executed.  Modern CPUs,</div><div class='add'>+ * except for a few oddballs that KVM is unlikely to run on, block IRQs for one</div><div class='add'>+ * instruction after STI, *if* RFLAGS.IF=0 before STI.  Note, Intel CPUs may</div><div class='add'>+ * block other events beyond regular IRQs, e.g. may block NMIs and SMIs too.</div><div class='add'>+ */</div><div class='add'>+static inline void safe_halt(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile("sti; hlt");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable interrupts and ensure that interrupts are evaluated upon return from</div><div class='add'>+ * this function, i.e. execute a nop to consume the STi interrupt shadow.</div><div class='add'>+ */</div><div class='add'>+static inline void sti_nop(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("sti; nop");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable interrupts for one instruction (nop), to allow the CPU to process all</div><div class='add'>+ * interrupts that are already pending.</div><div class='add'>+ */</div><div class='add'>+static inline void sti_nop_cli(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("sti; nop; cli");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void sti(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile("sti");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cli(void)</div><div class='add'>+{</div><div class='add'>+	asm volatile ("cli");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __vm_xsave_require_permission(uint64_t xfeature, const char *name);</div><div class='ctx'> </div><div class='ctx'> #define vm_xsave_require_permission(xfeature)	\</div><div class='hunk'>@@ -1350,7 +1441,7 @@ enum pg_level {</div><div class='ctx'> 	PG_LEVEL_2M,</div><div class='ctx'> 	PG_LEVEL_1G,</div><div class='ctx'> 	PG_LEVEL_512G,</div><div class='del'>-	PG_LEVEL_NUM</div><div class='add'>+	PG_LEVEL_256T</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PG_LEVEL_SHIFT(_level) ((_level - 1) * 9 + 12)</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/x86/sev.h b/tools/testing/selftests/kvm/include/x86/sev.h<br/>index 82c11c81a956..008b4169f5e2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/x86/sev.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/x86/sev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/x86/sev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/x86/sev.h</a></div><div class='hunk'>@@ -25,19 +25,51 @@ enum sev_guest_state {</div><div class='ctx'> #define SEV_POLICY_NO_DBG	(1UL &lt;&lt; 0)</div><div class='ctx'> #define SEV_POLICY_ES		(1UL &lt;&lt; 2)</div><div class='ctx'> </div><div class='add'>+#define SNP_POLICY_SMT		(1ULL &lt;&lt; 16)</div><div class='add'>+#define SNP_POLICY_RSVD_MBO	(1ULL &lt;&lt; 17)</div><div class='add'>+#define SNP_POLICY_DBG		(1ULL &lt;&lt; 19)</div><div class='add'>+</div><div class='ctx'> #define GHCB_MSR_TERM_REQ	0x100</div><div class='ctx'> </div><div class='add'>+static inline bool is_sev_snp_vm(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	return vm-&gt;type == KVM_X86_SNP_VM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_sev_es_vm(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	return is_sev_snp_vm(vm) || vm-&gt;type == KVM_X86_SEV_ES_VM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_sev_vm(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	return is_sev_es_vm(vm) || vm-&gt;type == KVM_X86_SEV_VM;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void sev_vm_launch(struct kvm_vm *vm, uint32_t policy);</div><div class='ctx'> void sev_vm_launch_measure(struct kvm_vm *vm, uint8_t *measurement);</div><div class='ctx'> void sev_vm_launch_finish(struct kvm_vm *vm);</div><div class='add'>+void snp_vm_launch_start(struct kvm_vm *vm, uint64_t policy);</div><div class='add'>+void snp_vm_launch_update(struct kvm_vm *vm);</div><div class='add'>+void snp_vm_launch_finish(struct kvm_vm *vm);</div><div class='ctx'> </div><div class='ctx'> struct kvm_vm *vm_sev_create_with_one_vcpu(uint32_t type, void *guest_code,</div><div class='ctx'> 					   struct kvm_vcpu **cpu);</div><div class='del'>-void vm_sev_launch(struct kvm_vm *vm, uint32_t policy, uint8_t *measurement);</div><div class='add'>+void vm_sev_launch(struct kvm_vm *vm, uint64_t policy, uint8_t *measurement);</div><div class='ctx'> </div><div class='ctx'> kvm_static_assert(SEV_RET_SUCCESS == 0);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * A SEV-SNP VM requires the policy reserved bit to always be set.</div><div class='add'>+ * The SMT policy bit is also required to be set based on SMT being</div><div class='add'>+ * available and active on the system.</div><div class='add'>+ */</div><div class='add'>+static inline u64 snp_default_policy(void)</div><div class='add'>+{</div><div class='add'>+	return SNP_POLICY_RSVD_MBO | (is_smt_on() ? SNP_POLICY_SMT : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * The KVM_MEMORY_ENCRYPT_OP uAPI is utter garbage and takes an "unsigned long"</div><div class='ctx'>  * instead of a proper struct.  The size of the parameter is embedded in the</div><div class='ctx'>  * ioctl number, i.e. is ABI and thus immutable.  Hack around the mess by</div><div class='hunk'>@@ -70,6 +102,12 @@ kvm_static_assert(SEV_RET_SUCCESS == 0);</div><div class='ctx'> </div><div class='ctx'> void sev_vm_init(struct kvm_vm *vm);</div><div class='ctx'> void sev_es_vm_init(struct kvm_vm *vm);</div><div class='add'>+void snp_vm_init(struct kvm_vm *vm);</div><div class='add'>+</div><div class='add'>+static inline void vmgexit(void)</div><div class='add'>+{</div><div class='add'>+	__asm__ __volatile__("rep; vmmcall");</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline void sev_register_encrypted_memory(struct kvm_vm *vm,</div><div class='ctx'> 						 struct userspace_mem_region *region)</div><div class='hunk'>@@ -93,4 +131,17 @@ static inline void sev_launch_update_data(struct kvm_vm *vm, vm_paddr_t gpa,</div><div class='ctx'> 	vm_sev_ioctl(vm, KVM_SEV_LAUNCH_UPDATE_DATA, &amp;update_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void snp_launch_update_data(struct kvm_vm *vm, vm_paddr_t gpa,</div><div class='add'>+					  uint64_t hva, uint64_t size, uint8_t type)</div><div class='add'>+{</div><div class='add'>+	struct kvm_sev_snp_launch_update update_data = {</div><div class='add'>+		.uaddr = hva,</div><div class='add'>+		.gfn_start = gpa &gt;&gt; PAGE_SHIFT,</div><div class='add'>+		.len = size,</div><div class='add'>+		.type = type,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vm_sev_ioctl(vm, KVM_SEV_SNP_LAUNCH_UPDATE, &amp;update_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* SELFTEST_KVM_SEV_H */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/include/x86/vmx.h b/tools/testing/selftests/kvm/include/x86/vmx.h<br/>index edb3c391b982..96e2b4c630a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/x86/vmx.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/include/x86/vmx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/include/x86/vmx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/include/x86/vmx.h</a></div><div class='hunk'>@@ -568,8 +568,7 @@ void nested_map_memslot(struct vmx_pages *vmx, struct kvm_vm *vm,</div><div class='ctx'> void nested_identity_map_1g(struct vmx_pages *vmx, struct kvm_vm *vm,</div><div class='ctx'> 			    uint64_t addr, uint64_t size);</div><div class='ctx'> bool kvm_cpu_has_ept(void);</div><div class='del'>-void prepare_eptp(struct vmx_pages *vmx, struct kvm_vm *vm,</div><div class='del'>-		  uint32_t eptp_memslot);</div><div class='add'>+void prepare_eptp(struct vmx_pages *vmx, struct kvm_vm *vm);</div><div class='ctx'> void prepare_virtualize_apic_accesses(struct vmx_pages *vmx, struct kvm_vm *vm);</div><div class='ctx'> </div><div class='ctx'> #endif /* SELFTEST_KVM_VMX_H */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/irqfd_test.c b/tools/testing/selftests/kvm/irqfd_test.c<br/>new file mode 100644<br/>index 000000000000..5d7590d01868<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/irqfd_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/irqfd_test.c</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#include &lt;stdint.h&gt;</div><div class='add'>+#include &lt;sys/sysinfo.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+</div><div class='add'>+static struct kvm_vm *vm1;</div><div class='add'>+static struct kvm_vm *vm2;</div><div class='add'>+static int __eventfd;</div><div class='add'>+static bool done;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * KVM de-assigns based on eventfd *and* GSI, but requires unique eventfds when</div><div class='add'>+ * assigning (the API isn't symmetrical).  Abuse the oddity and use a per-task</div><div class='add'>+ * GSI base to avoid false failures due to cross-task de-assign, i.e. so that</div><div class='add'>+ * the secondary doesn't de-assign the primary's eventfd and cause assign to</div><div class='add'>+ * unexpectedly succeed on the primary.</div><div class='add'>+ */</div><div class='add'>+#define GSI_BASE_PRIMARY	0x20</div><div class='add'>+#define GSI_BASE_SECONDARY	0x30</div><div class='add'>+</div><div class='add'>+static void juggle_eventfd_secondary(struct kvm_vm *vm, int eventfd)</div><div class='add'>+{</div><div class='add'>+	int r, i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The secondary task can encounter EBADF since the primary can close</div><div class='add'>+	 * the eventfd at any time.  And because the primary can recreate the</div><div class='add'>+	 * eventfd, at the safe fd in the file table, the secondary can also</div><div class='add'>+	 * encounter "unexpected" success, e.g. if the close+recreate happens</div><div class='add'>+	 * between the first and second assignments.  The secondary's role is</div><div class='add'>+	 * mostly to antagonize KVM, not to detect bugs.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		r = __kvm_irqfd(vm, GSI_BASE_SECONDARY, eventfd, 0);</div><div class='add'>+		TEST_ASSERT(!r || errno == EBUSY || errno == EBADF,</div><div class='add'>+			    "Wanted success, EBUSY, or EBADF, r = %d, errno = %d",</div><div class='add'>+			    r, errno);</div><div class='add'>+</div><div class='add'>+		/* De-assign should succeed unless the eventfd was closed. */</div><div class='add'>+		r = __kvm_irqfd(vm, GSI_BASE_SECONDARY + i, eventfd, KVM_IRQFD_FLAG_DEASSIGN);</div><div class='add'>+		TEST_ASSERT(!r || errno == EBADF,</div><div class='add'>+			    "De-assign should succeed unless the fd was closed");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *secondary_irqfd_juggler(void *ign)</div><div class='add'>+{</div><div class='add'>+	while (!READ_ONCE(done)) {</div><div class='add'>+		juggle_eventfd_secondary(vm1, READ_ONCE(__eventfd));</div><div class='add'>+		juggle_eventfd_secondary(vm2, READ_ONCE(__eventfd));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void juggle_eventfd_primary(struct kvm_vm *vm, int eventfd)</div><div class='add'>+{</div><div class='add'>+	int r1, r2;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * At least one of the assigns should fail.  KVM disallows assigning a</div><div class='add'>+	 * single eventfd to multiple GSIs (or VMs), so it's possible that both</div><div class='add'>+	 * assignments can fail, too.</div><div class='add'>+	 */</div><div class='add'>+	r1 = __kvm_irqfd(vm, GSI_BASE_PRIMARY, eventfd, 0);</div><div class='add'>+	TEST_ASSERT(!r1 || errno == EBUSY,</div><div class='add'>+		    "Wanted success or EBUSY, r = %d, errno = %d", r1, errno);</div><div class='add'>+</div><div class='add'>+	r2 = __kvm_irqfd(vm, GSI_BASE_PRIMARY + 1, eventfd, 0);</div><div class='add'>+	TEST_ASSERT(r1 || (r2 &amp;&amp; errno == EBUSY),</div><div class='add'>+		    "Wanted failure (EBUSY), r1 = %d, r2 = %d, errno = %d",</div><div class='add'>+		    r1, r2, errno);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * De-assign should always succeed, even if the corresponding assign</div><div class='add'>+	 * failed.</div><div class='add'>+	 */</div><div class='add'>+	kvm_irqfd(vm, GSI_BASE_PRIMARY, eventfd, KVM_IRQFD_FLAG_DEASSIGN);</div><div class='add'>+	kvm_irqfd(vm, GSI_BASE_PRIMARY + 1, eventfd, KVM_IRQFD_FLAG_DEASSIGN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	pthread_t racing_thread;</div><div class='add'>+	struct kvm_vcpu *unused;</div><div class='add'>+	int r, i;</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(kvm_arch_has_default_irqchip());</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Create "full" VMs, as KVM_IRQFD requires an in-kernel IRQ chip. Also</div><div class='add'>+	 * create an unused vCPU as certain architectures (like arm64) need to</div><div class='add'>+	 * complete IRQ chip initialization after all possible vCPUs for a VM</div><div class='add'>+	 * have been created.</div><div class='add'>+	 */</div><div class='add'>+	vm1 = vm_create_with_one_vcpu(&amp;unused, NULL);</div><div class='add'>+	vm2 = vm_create_with_one_vcpu(&amp;unused, NULL);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(__eventfd, kvm_new_eventfd());</div><div class='add'>+</div><div class='add'>+	kvm_irqfd(vm1, 10, __eventfd, 0);</div><div class='add'>+</div><div class='add'>+	r = __kvm_irqfd(vm1, 11, __eventfd, 0);</div><div class='add'>+	TEST_ASSERT(r &amp;&amp; errno == EBUSY,</div><div class='add'>+		    "Wanted EBUSY, r = %d, errno = %d", r, errno);</div><div class='add'>+</div><div class='add'>+	r = __kvm_irqfd(vm2, 12, __eventfd, 0);</div><div class='add'>+	TEST_ASSERT(r &amp;&amp; errno == EBUSY,</div><div class='add'>+		    "Wanted EBUSY, r = %d, errno = %d", r, errno);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * De-assign all eventfds, along with multiple eventfds that were never</div><div class='add'>+	 * assigned.  KVM's ABI is that de-assign is allowed so long as the</div><div class='add'>+	 * eventfd itself is valid.</div><div class='add'>+	 */</div><div class='add'>+	kvm_irqfd(vm1, 11, READ_ONCE(__eventfd), KVM_IRQFD_FLAG_DEASSIGN);</div><div class='add'>+	kvm_irqfd(vm1, 12, READ_ONCE(__eventfd), KVM_IRQFD_FLAG_DEASSIGN);</div><div class='add'>+	kvm_irqfd(vm1, 13, READ_ONCE(__eventfd), KVM_IRQFD_FLAG_DEASSIGN);</div><div class='add'>+	kvm_irqfd(vm1, 14, READ_ONCE(__eventfd), KVM_IRQFD_FLAG_DEASSIGN);</div><div class='add'>+	kvm_irqfd(vm1, 10, READ_ONCE(__eventfd), KVM_IRQFD_FLAG_DEASSIGN);</div><div class='add'>+</div><div class='add'>+	close(__eventfd);</div><div class='add'>+</div><div class='add'>+	pthread_create(&amp;racing_thread, NULL, secondary_irqfd_juggler, vm2);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10000; i++) {</div><div class='add'>+		WRITE_ONCE(__eventfd, kvm_new_eventfd());</div><div class='add'>+</div><div class='add'>+		juggle_eventfd_primary(vm1, __eventfd);</div><div class='add'>+		juggle_eventfd_primary(vm2, __eventfd);</div><div class='add'>+		close(__eventfd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(done, true);</div><div class='add'>+	pthread_join(racing_thread, NULL);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/kvm_binary_stats_test.c b/tools/testing/selftests/kvm/kvm_binary_stats_test.c<br/>index f02355c3c4c2..b7dbde9c0843 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/kvm_binary_stats_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/kvm_binary_stats_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/kvm_binary_stats_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/kvm_binary_stats_test.c</a></div><div class='hunk'>@@ -239,14 +239,14 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		 * single stats file works and doesn't cause explosions.</div><div class='ctx'> 		 */</div><div class='ctx'> 		vm_stats_fds = vm_get_stats_fd(vms[i]);</div><div class='del'>-		stats_test(dup(vm_stats_fds));</div><div class='add'>+		stats_test(kvm_dup(vm_stats_fds));</div><div class='ctx'> </div><div class='ctx'> 		/* Verify userspace can instantiate multiple stats files. */</div><div class='ctx'> 		stats_test(vm_get_stats_fd(vms[i]));</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; max_vcpu; ++j) {</div><div class='ctx'> 			vcpu_stats_fds[j] = vcpu_get_stats_fd(vcpus[i * max_vcpu + j]);</div><div class='del'>-			stats_test(dup(vcpu_stats_fds[j]));</div><div class='add'>+			stats_test(kvm_dup(vcpu_stats_fds[j]));</div><div class='ctx'> 			stats_test(vcpu_get_stats_fd(vcpus[i * max_vcpu + j]));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/kvm_create_max_vcpus.c b/tools/testing/selftests/kvm/kvm_create_max_vcpus.c<br/>index c78f34699f73..c5310736ed06 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/kvm_create_max_vcpus.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/kvm_create_max_vcpus.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/kvm_create_max_vcpus.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/kvm_create_max_vcpus.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/resource.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "test_util.h"</div><div class='ctx'> </div><div class='hunk'>@@ -39,36 +38,11 @@ int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	int kvm_max_vcpu_id = kvm_check_cap(KVM_CAP_MAX_VCPU_ID);</div><div class='ctx'> 	int kvm_max_vcpus = kvm_check_cap(KVM_CAP_MAX_VCPUS);</div><div class='del'>-	/*</div><div class='del'>-	 * Number of file descriptors reqired, KVM_CAP_MAX_VCPUS for vCPU fds +</div><div class='del'>-	 * an arbitrary number for everything else.</div><div class='del'>-	 */</div><div class='del'>-	int nr_fds_wanted = kvm_max_vcpus + 100;</div><div class='del'>-	struct rlimit rl;</div><div class='ctx'> </div><div class='ctx'> 	pr_info("KVM_CAP_MAX_VCPU_ID: %d\n", kvm_max_vcpu_id);</div><div class='ctx'> 	pr_info("KVM_CAP_MAX_VCPUS: %d\n", kvm_max_vcpus);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Check that we're allowed to open nr_fds_wanted file descriptors and</div><div class='del'>-	 * try raising the limits if needed.</div><div class='del'>-	 */</div><div class='del'>-	TEST_ASSERT(!getrlimit(RLIMIT_NOFILE, &amp;rl), "getrlimit() failed!");</div><div class='del'>-</div><div class='del'>-	if (rl.rlim_cur &lt; nr_fds_wanted) {</div><div class='del'>-		rl.rlim_cur = nr_fds_wanted;</div><div class='del'>-		if (rl.rlim_max &lt; nr_fds_wanted) {</div><div class='del'>-			int old_rlim_max = rl.rlim_max;</div><div class='del'>-			rl.rlim_max = nr_fds_wanted;</div><div class='del'>-</div><div class='del'>-			int r = setrlimit(RLIMIT_NOFILE, &amp;rl);</div><div class='del'>-			__TEST_REQUIRE(r &gt;= 0,</div><div class='del'>-				       "RLIMIT_NOFILE hard limit is too low (%d, wanted %d)",</div><div class='del'>-				       old_rlim_max, nr_fds_wanted);</div><div class='del'>-		} else {</div><div class='del'>-			TEST_ASSERT(!setrlimit(RLIMIT_NOFILE, &amp;rl), "setrlimit() failed!");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	kvm_set_files_rlimit(kvm_max_vcpus);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Upstream KVM prior to 4.8 does not support KVM_CAP_MAX_VCPU_ID.</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/arm64/gic.c b/tools/testing/selftests/kvm/lib/arm64/gic.c<br/>index 7abbf8866512..b023868fe0b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/gic.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/gic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/gic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/arm64/gic.c</a></div><div class='hunk'>@@ -155,3 +155,9 @@ void gic_irq_set_config(unsigned int intid, bool is_edge)</div><div class='ctx'> 	GUEST_ASSERT(gic_common_ops);</div><div class='ctx'> 	gic_common_ops-&gt;gic_irq_set_config(intid, is_edge);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void gic_irq_set_group(unsigned int intid, bool group)</div><div class='add'>+{</div><div class='add'>+	GUEST_ASSERT(gic_common_ops);</div><div class='add'>+	gic_common_ops-&gt;gic_irq_set_group(intid, group);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/arm64/gic_private.h b/tools/testing/selftests/kvm/lib/arm64/gic_private.h<br/>index d24e9ecc96c6..b6a7e30c3eb1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/gic_private.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/gic_private.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/gic_private.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/arm64/gic_private.h</a></div><div class='hunk'>@@ -25,6 +25,7 @@ struct gic_common_ops {</div><div class='ctx'> 	void (*gic_irq_clear_pending)(uint32_t intid);</div><div class='ctx'> 	bool (*gic_irq_get_pending)(uint32_t intid);</div><div class='ctx'> 	void (*gic_irq_set_config)(uint32_t intid, bool is_edge);</div><div class='add'>+	void (*gic_irq_set_group)(uint32_t intid, bool group);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct gic_common_ops gicv3_ops;</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/arm64/gic_v3.c b/tools/testing/selftests/kvm/lib/arm64/gic_v3.c<br/>index 66d05506f78b..50754a27f493 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/gic_v3.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/gic_v3.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/gic_v3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/arm64/gic_v3.c</a></div><div class='hunk'>@@ -293,17 +293,36 @@ static void gicv3_enable_redist(volatile void *redist_base)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void gicv3_set_group(uint32_t intid, bool grp)</div><div class='add'>+{</div><div class='add'>+	uint32_t cpu_or_dist;</div><div class='add'>+	uint32_t val;</div><div class='add'>+</div><div class='add'>+	cpu_or_dist = (get_intid_range(intid) == SPI_RANGE) ? DIST_BIT : guest_get_vcpuid();</div><div class='add'>+	val = gicv3_reg_readl(cpu_or_dist, GICD_IGROUPR + (intid / 32) * 4);</div><div class='add'>+	if (grp)</div><div class='add'>+		val |= BIT(intid % 32);</div><div class='add'>+	else</div><div class='add'>+		val &amp;= ~BIT(intid % 32);</div><div class='add'>+	gicv3_reg_writel(cpu_or_dist, GICD_IGROUPR + (intid / 32) * 4, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void gicv3_cpu_init(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	volatile void *sgi_base;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	volatile void *redist_base_cpu;</div><div class='add'>+	u64 typer;</div><div class='ctx'> </div><div class='ctx'> 	GUEST_ASSERT(cpu &lt; gicv3_data.nr_cpus);</div><div class='ctx'> </div><div class='ctx'> 	redist_base_cpu = gicr_base_cpu(cpu);</div><div class='ctx'> 	sgi_base = sgi_base_from_redist(redist_base_cpu);</div><div class='ctx'> </div><div class='add'>+	/* Verify assumption that GICR_TYPER.Processor_number == cpu */</div><div class='add'>+	typer = readq_relaxed(redist_base_cpu + GICR_TYPER);</div><div class='add'>+	GUEST_ASSERT_EQ(GICR_TYPER_CPU_NUMBER(typer), cpu);</div><div class='add'>+</div><div class='ctx'> 	gicv3_enable_redist(redist_base_cpu);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -328,6 +347,8 @@ static void gicv3_cpu_init(unsigned int cpu)</div><div class='ctx'> 	/* Set a default priority threshold */</div><div class='ctx'> 	write_sysreg_s(ICC_PMR_DEF_PRIO, SYS_ICC_PMR_EL1);</div><div class='ctx'> </div><div class='add'>+	/* Disable Group-0 interrupts */</div><div class='add'>+	write_sysreg_s(ICC_IGRPEN0_EL1_MASK, SYS_ICC_IGRPEN1_EL1);</div><div class='ctx'> 	/* Enable non-secure Group-1 interrupts */</div><div class='ctx'> 	write_sysreg_s(ICC_IGRPEN1_EL1_MASK, SYS_ICC_IGRPEN1_EL1);</div><div class='ctx'> }</div><div class='hunk'>@@ -400,6 +421,7 @@ const struct gic_common_ops gicv3_ops = {</div><div class='ctx'> 	.gic_irq_clear_pending = gicv3_irq_clear_pending,</div><div class='ctx'> 	.gic_irq_get_pending = gicv3_irq_get_pending,</div><div class='ctx'> 	.gic_irq_set_config = gicv3_irq_set_config,</div><div class='add'>+	.gic_irq_set_group = gicv3_set_group,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void gic_rdist_enable_lpis(vm_paddr_t cfg_table, size_t cfg_table_size,</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c b/tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c<br/>index 09f270545646..7f9fdcf42ae6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c</a></div><div class='hunk'>@@ -15,6 +15,8 @@</div><div class='ctx'> #include "gic_v3.h"</div><div class='ctx'> #include "processor.h"</div><div class='ctx'> </div><div class='add'>+#define GITS_COLLECTION_TARGET_SHIFT 16</div><div class='add'>+</div><div class='ctx'> static u64 its_read_u64(unsigned long offset)</div><div class='ctx'> {</div><div class='ctx'> 	return readq_relaxed(GITS_BASE_GVA + offset);</div><div class='hunk'>@@ -163,6 +165,11 @@ static void its_encode_collection(struct its_cmd_block *cmd, u16 col)</div><div class='ctx'> 	its_mask_encode(&amp;cmd-&gt;raw_cmd[2], col, 15, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u64 procnum_to_rdbase(u32 vcpu_id)</div><div class='add'>+{</div><div class='add'>+	return vcpu_id &lt;&lt; GITS_COLLECTION_TARGET_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define GITS_CMDQ_POLL_ITERATIONS	0</div><div class='ctx'> </div><div class='ctx'> static void its_send_cmd(void *cmdq_base, struct its_cmd_block *cmd)</div><div class='hunk'>@@ -217,7 +224,7 @@ void its_send_mapc_cmd(void *cmdq_base, u32 vcpu_id, u32 collection_id, bool val</div><div class='ctx'> </div><div class='ctx'> 	its_encode_cmd(&amp;cmd, GITS_CMD_MAPC);</div><div class='ctx'> 	its_encode_collection(&amp;cmd, collection_id);</div><div class='del'>-	its_encode_target(&amp;cmd, vcpu_id);</div><div class='add'>+	its_encode_target(&amp;cmd, procnum_to_rdbase(vcpu_id));</div><div class='ctx'> 	its_encode_valid(&amp;cmd, valid);</div><div class='ctx'> </div><div class='ctx'> 	its_send_cmd(cmdq_base, &amp;cmd);</div><div class='hunk'>@@ -246,3 +253,13 @@ void its_send_invall_cmd(void *cmdq_base, u32 collection_id)</div><div class='ctx'> </div><div class='ctx'> 	its_send_cmd(cmdq_base, &amp;cmd);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void its_send_sync_cmd(void *cmdq_base, u32 vcpu_id)</div><div class='add'>+{</div><div class='add'>+	struct its_cmd_block cmd = {};</div><div class='add'>+</div><div class='add'>+	its_encode_cmd(&amp;cmd, GITS_CMD_SYNC);</div><div class='add'>+	its_encode_target(&amp;cmd, procnum_to_rdbase(vcpu_id));</div><div class='add'>+</div><div class='add'>+	its_send_cmd(cmdq_base, &amp;cmd);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/arm64/processor.c b/tools/testing/selftests/kvm/lib/arm64/processor.c<br/>index 7ba3aa3755f3..d46e4b13b92c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/processor.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/processor.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/processor.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/arm64/processor.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include "kvm_util.h"</div><div class='ctx'> #include "processor.h"</div><div class='ctx'> #include "ucall_common.h"</div><div class='add'>+#include "vgic.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/sizes.h&gt;</div><div class='hunk'>@@ -72,13 +73,13 @@ static uint64_t addr_pte(struct kvm_vm *vm, uint64_t pa, uint64_t attrs)</div><div class='ctx'> 	uint64_t pte;</div><div class='ctx'> </div><div class='ctx'> 	if (use_lpa2_pte_format(vm)) {</div><div class='del'>-		pte = pa &amp; GENMASK(49, vm-&gt;page_shift);</div><div class='del'>-		pte |= FIELD_GET(GENMASK(51, 50), pa) &lt;&lt; 8;</div><div class='del'>-		attrs &amp;= ~GENMASK(9, 8);</div><div class='add'>+		pte = pa &amp; PTE_ADDR_MASK_LPA2(vm-&gt;page_shift);</div><div class='add'>+		pte |= FIELD_GET(GENMASK(51, 50), pa) &lt;&lt; PTE_ADDR_51_50_LPA2_SHIFT;</div><div class='add'>+		attrs &amp;= ~PTE_ADDR_51_50_LPA2;</div><div class='ctx'> 	} else {</div><div class='del'>-		pte = pa &amp; GENMASK(47, vm-&gt;page_shift);</div><div class='add'>+		pte = pa &amp; PTE_ADDR_MASK(vm-&gt;page_shift);</div><div class='ctx'> 		if (vm-&gt;page_shift == 16)</div><div class='del'>-			pte |= FIELD_GET(GENMASK(51, 48), pa) &lt;&lt; 12;</div><div class='add'>+			pte |= FIELD_GET(GENMASK(51, 48), pa) &lt;&lt; PTE_ADDR_51_48_SHIFT;</div><div class='ctx'> 	}</div><div class='ctx'> 	pte |= attrs;</div><div class='ctx'> </div><div class='hunk'>@@ -90,12 +91,12 @@ static uint64_t pte_addr(struct kvm_vm *vm, uint64_t pte)</div><div class='ctx'> 	uint64_t pa;</div><div class='ctx'> </div><div class='ctx'> 	if (use_lpa2_pte_format(vm)) {</div><div class='del'>-		pa = pte &amp; GENMASK(49, vm-&gt;page_shift);</div><div class='del'>-		pa |= FIELD_GET(GENMASK(9, 8), pte) &lt;&lt; 50;</div><div class='add'>+		pa = pte &amp; PTE_ADDR_MASK_LPA2(vm-&gt;page_shift);</div><div class='add'>+		pa |= FIELD_GET(PTE_ADDR_51_50_LPA2, pte) &lt;&lt; 50;</div><div class='ctx'> 	} else {</div><div class='del'>-		pa = pte &amp; GENMASK(47, vm-&gt;page_shift);</div><div class='add'>+		pa = pte &amp; PTE_ADDR_MASK(vm-&gt;page_shift);</div><div class='ctx'> 		if (vm-&gt;page_shift == 16)</div><div class='del'>-			pa |= FIELD_GET(GENMASK(15, 12), pte) &lt;&lt; 48;</div><div class='add'>+			pa |= FIELD_GET(PTE_ADDR_51_48, pte) &lt;&lt; 48;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return pa;</div><div class='hunk'>@@ -128,7 +129,8 @@ void virt_arch_pgd_alloc(struct kvm_vm *vm)</div><div class='ctx'> static void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,</div><div class='ctx'> 			 uint64_t flags)</div><div class='ctx'> {</div><div class='del'>-	uint8_t attr_idx = flags &amp; 7;</div><div class='add'>+	uint8_t attr_idx = flags &amp; (PTE_ATTRINDX_MASK &gt;&gt; PTE_ATTRINDX_SHIFT);</div><div class='add'>+	uint64_t pg_attr;</div><div class='ctx'> 	uint64_t *ptep;</div><div class='ctx'> </div><div class='ctx'> 	TEST_ASSERT((vaddr % vm-&gt;page_size) == 0,</div><div class='hunk'>@@ -147,18 +149,21 @@ static void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,</div><div class='ctx'> </div><div class='ctx'> 	ptep = addr_gpa2hva(vm, vm-&gt;pgd) + pgd_index(vm, vaddr) * 8;</div><div class='ctx'> 	if (!*ptep)</div><div class='del'>-		*ptep = addr_pte(vm, vm_alloc_page_table(vm), 3);</div><div class='add'>+		*ptep = addr_pte(vm, vm_alloc_page_table(vm),</div><div class='add'>+				 PGD_TYPE_TABLE | PTE_VALID);</div><div class='ctx'> </div><div class='ctx'> 	switch (vm-&gt;pgtable_levels) {</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		ptep = addr_gpa2hva(vm, pte_addr(vm, *ptep)) + pud_index(vm, vaddr) * 8;</div><div class='ctx'> 		if (!*ptep)</div><div class='del'>-			*ptep = addr_pte(vm, vm_alloc_page_table(vm), 3);</div><div class='add'>+			*ptep = addr_pte(vm, vm_alloc_page_table(vm),</div><div class='add'>+					 PUD_TYPE_TABLE | PTE_VALID);</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		ptep = addr_gpa2hva(vm, pte_addr(vm, *ptep)) + pmd_index(vm, vaddr) * 8;</div><div class='ctx'> 		if (!*ptep)</div><div class='del'>-			*ptep = addr_pte(vm, vm_alloc_page_table(vm), 3);</div><div class='add'>+			*ptep = addr_pte(vm, vm_alloc_page_table(vm),</div><div class='add'>+					 PMD_TYPE_TABLE | PTE_VALID);</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		ptep = addr_gpa2hva(vm, pte_addr(vm, *ptep)) + pte_index(vm, vaddr) * 8;</div><div class='hunk'>@@ -167,7 +172,11 @@ static void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,</div><div class='ctx'> 		TEST_FAIL("Page table levels must be 2, 3, or 4");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*ptep = addr_pte(vm, paddr, (attr_idx &lt;&lt; 2) | (1 &lt;&lt; 10) | 3);  /* AF */</div><div class='add'>+	pg_attr = PTE_AF | PTE_ATTRINDX(attr_idx) | PTE_TYPE_PAGE | PTE_VALID;</div><div class='add'>+	if (!use_lpa2_pte_format(vm))</div><div class='add'>+		pg_attr |= PTE_SHARED;</div><div class='add'>+</div><div class='add'>+	*ptep = addr_pte(vm, paddr, pg_attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)</div><div class='hunk'>@@ -177,7 +186,7 @@ void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)</div><div class='ctx'> 	_virt_pg_map(vm, vaddr, paddr, attr_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-uint64_t *virt_get_pte_hva(struct kvm_vm *vm, vm_vaddr_t gva)</div><div class='add'>+uint64_t *virt_get_pte_hva_at_level(struct kvm_vm *vm, vm_vaddr_t gva, int level)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t *ptep;</div><div class='ctx'> </div><div class='hunk'>@@ -187,17 +196,23 @@ uint64_t *virt_get_pte_hva(struct kvm_vm *vm, vm_vaddr_t gva)</div><div class='ctx'> 	ptep = addr_gpa2hva(vm, vm-&gt;pgd) + pgd_index(vm, gva) * 8;</div><div class='ctx'> 	if (!ptep)</div><div class='ctx'> 		goto unmapped_gva;</div><div class='add'>+	if (level == 0)</div><div class='add'>+		return ptep;</div><div class='ctx'> </div><div class='ctx'> 	switch (vm-&gt;pgtable_levels) {</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		ptep = addr_gpa2hva(vm, pte_addr(vm, *ptep)) + pud_index(vm, gva) * 8;</div><div class='ctx'> 		if (!ptep)</div><div class='ctx'> 			goto unmapped_gva;</div><div class='add'>+		if (level == 1)</div><div class='add'>+			break;</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		ptep = addr_gpa2hva(vm, pte_addr(vm, *ptep)) + pmd_index(vm, gva) * 8;</div><div class='ctx'> 		if (!ptep)</div><div class='ctx'> 			goto unmapped_gva;</div><div class='add'>+		if (level == 2)</div><div class='add'>+			break;</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		ptep = addr_gpa2hva(vm, pte_addr(vm, *ptep)) + pte_index(vm, gva) * 8;</div><div class='hunk'>@@ -215,6 +230,11 @@ unmapped_gva:</div><div class='ctx'> 	exit(EXIT_FAILURE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+uint64_t *virt_get_pte_hva(struct kvm_vm *vm, vm_vaddr_t gva)</div><div class='add'>+{</div><div class='add'>+	return virt_get_pte_hva_at_level(vm, gva, 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t *ptep = virt_get_pte_hva(vm, gva);</div><div class='hunk'>@@ -258,55 +278,73 @@ void virt_arch_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool vm_supports_el2(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	const char *value = getenv("NV");</div><div class='add'>+</div><div class='add'>+	if (value &amp;&amp; *value == '0')</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return vm_check_cap(vm, KVM_CAP_ARM_EL2) &amp;&amp; vm-&gt;arch.has_gic;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_get_default_vcpu_target(struct kvm_vm *vm, struct kvm_vcpu_init *init)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu_init preferred = {};</div><div class='add'>+</div><div class='add'>+	vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &amp;preferred);</div><div class='add'>+	if (vm_supports_el2(vm))</div><div class='add'>+		preferred.features[0] |= BIT(KVM_ARM_VCPU_HAS_EL2);</div><div class='add'>+</div><div class='add'>+	*init = preferred;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void aarch64_vcpu_setup(struct kvm_vcpu *vcpu, struct kvm_vcpu_init *init)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vcpu_init default_init = { .target = -1, };</div><div class='ctx'> 	struct kvm_vm *vm = vcpu-&gt;vm;</div><div class='ctx'> 	uint64_t sctlr_el1, tcr_el1, ttbr0_el1;</div><div class='ctx'> </div><div class='del'>-	if (!init)</div><div class='add'>+	if (!init) {</div><div class='add'>+		kvm_get_default_vcpu_target(vm, &amp;default_init);</div><div class='ctx'> 		init = &amp;default_init;</div><div class='del'>-</div><div class='del'>-	if (init-&gt;target == -1) {</div><div class='del'>-		struct kvm_vcpu_init preferred;</div><div class='del'>-		vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &amp;preferred);</div><div class='del'>-		init-&gt;target = preferred.target;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vcpu_ioctl(vcpu, KVM_ARM_VCPU_INIT, init);</div><div class='add'>+	vcpu-&gt;init = *init;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable FP/ASIMD to avoid trapping when accessing Q0-Q15</div><div class='ctx'> 	 * registers, which the variable argument list macros do.</div><div class='ctx'> 	 */</div><div class='del'>-	vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_CPACR_EL1), 3 &lt;&lt; 20);</div><div class='add'>+	vcpu_set_reg(vcpu, ctxt_reg_alias(vcpu, SYS_CPACR_EL1), 3 &lt;&lt; 20);</div><div class='ctx'> </div><div class='del'>-	sctlr_el1 = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_SCTLR_EL1));</div><div class='del'>-	tcr_el1 = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_TCR_EL1));</div><div class='add'>+	sctlr_el1 = vcpu_get_reg(vcpu, ctxt_reg_alias(vcpu, SYS_SCTLR_EL1));</div><div class='add'>+	tcr_el1 = vcpu_get_reg(vcpu, ctxt_reg_alias(vcpu, SYS_TCR_EL1));</div><div class='ctx'> </div><div class='ctx'> 	/* Configure base granule size */</div><div class='ctx'> 	switch (vm-&gt;mode) {</div><div class='del'>-	case VM_MODE_PXXV48_4K:</div><div class='add'>+	case VM_MODE_PXXVYY_4K:</div><div class='ctx'> 		TEST_FAIL("AArch64 does not support 4K sized pages "</div><div class='ctx'> 			  "with ANY-bit physical address ranges");</div><div class='ctx'> 	case VM_MODE_P52V48_64K:</div><div class='ctx'> 	case VM_MODE_P48V48_64K:</div><div class='ctx'> 	case VM_MODE_P40V48_64K:</div><div class='ctx'> 	case VM_MODE_P36V48_64K:</div><div class='del'>-		tcr_el1 |= 1ul &lt;&lt; 14; /* TG0 = 64KB */</div><div class='add'>+		tcr_el1 |= TCR_TG0_64K;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VM_MODE_P52V48_16K:</div><div class='ctx'> 	case VM_MODE_P48V48_16K:</div><div class='ctx'> 	case VM_MODE_P40V48_16K:</div><div class='ctx'> 	case VM_MODE_P36V48_16K:</div><div class='ctx'> 	case VM_MODE_P36V47_16K:</div><div class='del'>-		tcr_el1 |= 2ul &lt;&lt; 14; /* TG0 = 16KB */</div><div class='add'>+		tcr_el1 |= TCR_TG0_16K;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VM_MODE_P52V48_4K:</div><div class='ctx'> 	case VM_MODE_P48V48_4K:</div><div class='ctx'> 	case VM_MODE_P40V48_4K:</div><div class='ctx'> 	case VM_MODE_P36V48_4K:</div><div class='del'>-		tcr_el1 |= 0ul &lt;&lt; 14; /* TG0 = 4KB */</div><div class='add'>+		tcr_el1 |= TCR_TG0_4K;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		TEST_FAIL("Unknown guest mode, mode: 0x%x", vm-&gt;mode);</div><div class='hunk'>@@ -319,41 +357,47 @@ void aarch64_vcpu_setup(struct kvm_vcpu *vcpu, struct kvm_vcpu_init *init)</div><div class='ctx'> 	case VM_MODE_P52V48_4K:</div><div class='ctx'> 	case VM_MODE_P52V48_16K:</div><div class='ctx'> 	case VM_MODE_P52V48_64K:</div><div class='del'>-		tcr_el1 |= 6ul &lt;&lt; 32; /* IPS = 52 bits */</div><div class='add'>+		tcr_el1 |= TCR_IPS_52_BITS;</div><div class='ctx'> 		ttbr0_el1 |= FIELD_GET(GENMASK(51, 48), vm-&gt;pgd) &lt;&lt; 2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VM_MODE_P48V48_4K:</div><div class='ctx'> 	case VM_MODE_P48V48_16K:</div><div class='ctx'> 	case VM_MODE_P48V48_64K:</div><div class='del'>-		tcr_el1 |= 5ul &lt;&lt; 32; /* IPS = 48 bits */</div><div class='add'>+		tcr_el1 |= TCR_IPS_48_BITS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VM_MODE_P40V48_4K:</div><div class='ctx'> 	case VM_MODE_P40V48_16K:</div><div class='ctx'> 	case VM_MODE_P40V48_64K:</div><div class='del'>-		tcr_el1 |= 2ul &lt;&lt; 32; /* IPS = 40 bits */</div><div class='add'>+		tcr_el1 |= TCR_IPS_40_BITS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VM_MODE_P36V48_4K:</div><div class='ctx'> 	case VM_MODE_P36V48_16K:</div><div class='ctx'> 	case VM_MODE_P36V48_64K:</div><div class='ctx'> 	case VM_MODE_P36V47_16K:</div><div class='del'>-		tcr_el1 |= 1ul &lt;&lt; 32; /* IPS = 36 bits */</div><div class='add'>+		tcr_el1 |= TCR_IPS_36_BITS;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		TEST_FAIL("Unknown guest mode, mode: 0x%x", vm-&gt;mode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sctlr_el1 |= (1 &lt;&lt; 0) | (1 &lt;&lt; 2) | (1 &lt;&lt; 12) /* M | C | I */;</div><div class='del'>-	/* TCR_EL1 |= IRGN0:WBWA | ORGN0:WBWA | SH0:Inner-Shareable */;</div><div class='del'>-	tcr_el1 |= (1 &lt;&lt; 8) | (1 &lt;&lt; 10) | (3 &lt;&lt; 12);</div><div class='del'>-	tcr_el1 |= (64 - vm-&gt;va_bits) /* T0SZ */;</div><div class='add'>+	sctlr_el1 |= SCTLR_ELx_M | SCTLR_ELx_C | SCTLR_ELx_I;</div><div class='add'>+</div><div class='add'>+	tcr_el1 |= TCR_IRGN0_WBWA | TCR_ORGN0_WBWA | TCR_SH0_INNER;</div><div class='add'>+	tcr_el1 |= TCR_T0SZ(vm-&gt;va_bits);</div><div class='ctx'> 	if (use_lpa2_pte_format(vm))</div><div class='del'>-		tcr_el1 |= (1ul &lt;&lt; 59) /* DS */;</div><div class='add'>+		tcr_el1 |= TCR_DS;</div><div class='ctx'> </div><div class='del'>-	vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_SCTLR_EL1), sctlr_el1);</div><div class='del'>-	vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_TCR_EL1), tcr_el1);</div><div class='del'>-	vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_MAIR_EL1), DEFAULT_MAIR_EL1);</div><div class='del'>-	vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_TTBR0_EL1), ttbr0_el1);</div><div class='add'>+	vcpu_set_reg(vcpu, ctxt_reg_alias(vcpu, SYS_SCTLR_EL1), sctlr_el1);</div><div class='add'>+	vcpu_set_reg(vcpu, ctxt_reg_alias(vcpu, SYS_TCR_EL1), tcr_el1);</div><div class='add'>+	vcpu_set_reg(vcpu, ctxt_reg_alias(vcpu, SYS_MAIR_EL1), DEFAULT_MAIR_EL1);</div><div class='add'>+	vcpu_set_reg(vcpu, ctxt_reg_alias(vcpu, SYS_TTBR0_EL1), ttbr0_el1);</div><div class='ctx'> 	vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_TPIDR_EL1), vcpu-&gt;id);</div><div class='add'>+</div><div class='add'>+	if (!vcpu_has_el2(vcpu))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_HCR_EL2),</div><div class='add'>+		     HCR_EL2_RW | HCR_EL2_TGE | HCR_EL2_E2H);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void vcpu_arch_dump(FILE *stream, struct kvm_vcpu *vcpu, uint8_t indent)</div><div class='hunk'>@@ -387,7 +431,7 @@ static struct kvm_vcpu *__aarch64_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id,</div><div class='ctx'> </div><div class='ctx'> 	aarch64_vcpu_setup(vcpu, init);</div><div class='ctx'> </div><div class='del'>-	vcpu_set_reg(vcpu, ARM64_CORE_REG(sp_el1), stack_vaddr + stack_size);</div><div class='add'>+	vcpu_set_reg(vcpu, ctxt_reg_alias(vcpu, SYS_SP_EL1), stack_vaddr + stack_size);</div><div class='ctx'> 	return vcpu;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -457,7 +501,7 @@ void vcpu_init_descriptor_tables(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	extern char vectors;</div><div class='ctx'> </div><div class='del'>-	vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_VBAR_EL1), (uint64_t)&amp;vectors);</div><div class='add'>+	vcpu_set_reg(vcpu, ctxt_reg_alias(vcpu, SYS_VBAR_EL1), (uint64_t)&amp;vectors);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void route_exception(struct ex_regs *regs, int vector)</div><div class='hunk'>@@ -565,15 +609,15 @@ void aarch64_get_supported_page_sizes(uint32_t ipa, uint32_t *ipa4k,</div><div class='ctx'> 	err = ioctl(vcpu_fd, KVM_GET_ONE_REG, &amp;reg);</div><div class='ctx'> 	TEST_ASSERT(err == 0, KVM_IOCTL_ERROR(KVM_GET_ONE_REG, vcpu_fd));</div><div class='ctx'> </div><div class='del'>-	gran = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN4), val);</div><div class='add'>+	gran = FIELD_GET(ID_AA64MMFR0_EL1_TGRAN4, val);</div><div class='ctx'> 	*ipa4k = max_ipa_for_page_size(ipa, gran, ID_AA64MMFR0_EL1_TGRAN4_NI,</div><div class='ctx'> 					ID_AA64MMFR0_EL1_TGRAN4_52_BIT);</div><div class='ctx'> </div><div class='del'>-	gran = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN64), val);</div><div class='add'>+	gran = FIELD_GET(ID_AA64MMFR0_EL1_TGRAN64, val);</div><div class='ctx'> 	*ipa64k = max_ipa_for_page_size(ipa, gran, ID_AA64MMFR0_EL1_TGRAN64_NI,</div><div class='ctx'> 					ID_AA64MMFR0_EL1_TGRAN64_IMP);</div><div class='ctx'> </div><div class='del'>-	gran = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64MMFR0_EL1_TGRAN16), val);</div><div class='add'>+	gran = FIELD_GET(ID_AA64MMFR0_EL1_TGRAN16, val);</div><div class='ctx'> 	*ipa16k = max_ipa_for_page_size(ipa, gran, ID_AA64MMFR0_EL1_TGRAN16_NI,</div><div class='ctx'> 					ID_AA64MMFR0_EL1_TGRAN16_52_BIT);</div><div class='ctx'> </div><div class='hunk'>@@ -645,3 +689,44 @@ void wfi(void)</div><div class='ctx'> {</div><div class='ctx'> 	asm volatile("wfi");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static bool request_mte;</div><div class='add'>+static bool request_vgic = true;</div><div class='add'>+</div><div class='add'>+void test_wants_mte(void)</div><div class='add'>+{</div><div class='add'>+	request_mte = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_disable_default_vgic(void)</div><div class='add'>+{</div><div class='add'>+	request_vgic = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_arch_vm_post_create(struct kvm_vm *vm, unsigned int nr_vcpus)</div><div class='add'>+{</div><div class='add'>+	if (request_mte &amp;&amp; vm_check_cap(vm, KVM_CAP_ARM_MTE))</div><div class='add'>+		vm_enable_cap(vm, KVM_CAP_ARM_MTE, 0);</div><div class='add'>+</div><div class='add'>+	if (request_vgic &amp;&amp; kvm_supports_vgic_v3()) {</div><div class='add'>+		vm-&gt;arch.gic_fd = __vgic_v3_setup(vm, nr_vcpus, 64);</div><div class='add'>+		vm-&gt;arch.has_gic = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_arch_vm_finalize_vcpus(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	if (vm-&gt;arch.has_gic)</div><div class='add'>+		__vgic_v3_init(vm-&gt;arch.gic_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvm_arch_vm_release(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	if (vm-&gt;arch.has_gic)</div><div class='add'>+		close(vm-&gt;arch.gic_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool kvm_arch_has_default_irqchip(void)</div><div class='add'>+{</div><div class='add'>+	return request_vgic &amp;&amp; kvm_supports_vgic_v3();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/arm64/vgic.c b/tools/testing/selftests/kvm/lib/arm64/vgic.c<br/>index 4427f43f73ea..d0f7bd0984b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/vgic.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/arm64/vgic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/arm64/vgic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/arm64/vgic.c</a></div><div class='hunk'>@@ -15,6 +15,17 @@</div><div class='ctx'> #include "gic.h"</div><div class='ctx'> #include "gic_v3.h"</div><div class='ctx'> </div><div class='add'>+bool kvm_supports_vgic_v3(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vm *vm = vm_create_barebones();</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = __kvm_test_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+</div><div class='add'>+	return !r;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * vGIC-v3 default host setup</div><div class='ctx'>  *</div><div class='hunk'>@@ -30,24 +41,11 @@</div><div class='ctx'>  * redistributor regions of the guest. Since it depends on the number of</div><div class='ctx'>  * vCPUs for the VM, it must be called after all the vCPUs have been created.</div><div class='ctx'>  */</div><div class='del'>-int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs)</div><div class='add'>+int __vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs)</div><div class='ctx'> {</div><div class='ctx'> 	int gic_fd;</div><div class='ctx'> 	uint64_t attr;</div><div class='del'>-	struct list_head *iter;</div><div class='del'>-	unsigned int nr_gic_pages, nr_vcpus_created = 0;</div><div class='del'>-</div><div class='del'>-	TEST_ASSERT(nr_vcpus, "Number of vCPUs cannot be empty");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure that the caller is infact calling this</div><div class='del'>-	 * function after all the vCPUs are added.</div><div class='del'>-	 */</div><div class='del'>-	list_for_each(iter, &amp;vm-&gt;vcpus)</div><div class='del'>-		nr_vcpus_created++;</div><div class='del'>-	TEST_ASSERT(nr_vcpus == nr_vcpus_created,</div><div class='del'>-			"Number of vCPUs requested (%u) doesn't match with the ones created for the VM (%u)",</div><div class='del'>-			nr_vcpus, nr_vcpus_created);</div><div class='add'>+	unsigned int nr_gic_pages;</div><div class='ctx'> </div><div class='ctx'> 	/* Distributor setup */</div><div class='ctx'> 	gic_fd = __kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3);</div><div class='hunk'>@@ -56,9 +54,6 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs)</div><div class='ctx'> </div><div class='ctx'> 	kvm_device_attr_set(gic_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS, 0, &amp;nr_irqs);</div><div class='ctx'> </div><div class='del'>-	kvm_device_attr_set(gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,</div><div class='del'>-			    KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);</div><div class='del'>-</div><div class='ctx'> 	attr = GICD_BASE_GPA;</div><div class='ctx'> 	kvm_device_attr_set(gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,</div><div class='ctx'> 			    KVM_VGIC_V3_ADDR_TYPE_DIST, &amp;attr);</div><div class='hunk'>@@ -73,10 +68,39 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs)</div><div class='ctx'> 						KVM_VGIC_V3_REDIST_SIZE * nr_vcpus);</div><div class='ctx'> 	virt_map(vm, GICR_BASE_GPA, GICR_BASE_GPA, nr_gic_pages);</div><div class='ctx'> </div><div class='del'>-	kvm_device_attr_set(gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,</div><div class='add'>+	return gic_fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __vgic_v3_init(int fd)</div><div class='add'>+{</div><div class='add'>+	kvm_device_attr_set(fd, KVM_DEV_ARM_VGIC_GRP_CTRL,</div><div class='ctx'> 			    KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return gic_fd;</div><div class='add'>+int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs)</div><div class='add'>+{</div><div class='add'>+	unsigned int nr_vcpus_created = 0;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	int fd;</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(nr_vcpus, "Number of vCPUs cannot be empty");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure that the caller is infact calling this</div><div class='add'>+	 * function after all the vCPUs are added.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each(iter, &amp;vm-&gt;vcpus)</div><div class='add'>+		nr_vcpus_created++;</div><div class='add'>+	TEST_ASSERT(nr_vcpus == nr_vcpus_created,</div><div class='add'>+		    "Number of vCPUs requested (%u) doesn't match with the ones created for the VM (%u)",</div><div class='add'>+		    nr_vcpus, nr_vcpus_created);</div><div class='add'>+</div><div class='add'>+	fd = __vgic_v3_setup(vm, nr_vcpus, nr_irqs);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		return fd;</div><div class='add'>+</div><div class='add'>+	__vgic_v3_init(fd);</div><div class='add'>+	return fd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* should only work for level sensitive interrupts */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c<br/>index 33fefeb3ca44..8279b6ced8d2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/kvm_util.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/kvm_util.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/kvm_util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/kvm_util.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;assert.h&gt;</div><div class='ctx'> #include &lt;sched.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='add'>+#include &lt;sys/resource.h&gt;</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> #include &lt;sys/stat.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='hunk'>@@ -23,17 +24,29 @@ uint32_t guest_random_seed;</div><div class='ctx'> struct guest_random_state guest_rng;</div><div class='ctx'> static uint32_t last_guest_seed;</div><div class='ctx'> </div><div class='del'>-static int vcpu_mmap_sz(void);</div><div class='add'>+static size_t vcpu_mmap_sz(void);</div><div class='ctx'> </div><div class='del'>-int open_path_or_exit(const char *path, int flags)</div><div class='add'>+int __open_path_or_exit(const char *path, int flags, const char *enoent_help)</div><div class='ctx'> {</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='ctx'> 	fd = open(path, flags);</div><div class='del'>-	__TEST_REQUIRE(fd &gt;= 0 || errno != ENOENT, "Cannot open %s: %s", path, strerror(errno));</div><div class='del'>-	TEST_ASSERT(fd &gt;= 0, "Failed to open '%s'", path);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='ctx'> 	return fd;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	if (errno == EACCES || errno == ENOENT)</div><div class='add'>+		ksft_exit_skip("- Cannot open '%s': %s.  %s\n",</div><div class='add'>+			       path, strerror(errno),</div><div class='add'>+			       errno == EACCES ? "Root required?" : enoent_help);</div><div class='add'>+	TEST_FAIL("Failed to open '%s'", path);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int open_path_or_exit(const char *path, int flags)</div><div class='add'>+{</div><div class='add'>+	return __open_path_or_exit(path, flags, "");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -47,7 +60,7 @@ int open_path_or_exit(const char *path, int flags)</div><div class='ctx'>  */</div><div class='ctx'> static int _open_kvm_dev_path_or_exit(int flags)</div><div class='ctx'> {</div><div class='del'>-	return open_path_or_exit(KVM_DEV_PATH, flags);</div><div class='add'>+	return __open_path_or_exit(KVM_DEV_PATH, flags, "Is KVM loaded and enabled?");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int open_kvm_dev_path_or_exit(void)</div><div class='hunk'>@@ -63,6 +76,9 @@ static ssize_t get_module_param(const char *module_name, const char *param,</div><div class='ctx'> 	ssize_t bytes_read;</div><div class='ctx'> 	int fd, r;</div><div class='ctx'> </div><div class='add'>+	/* Verify KVM is loaded, to provide a more helpful SKIP message. */</div><div class='add'>+	close(open_kvm_dev_path_or_exit());</div><div class='add'>+</div><div class='ctx'> 	r = snprintf(path, path_size, "/sys/module/%s/parameters/%s",</div><div class='ctx'> 		     module_name, param);</div><div class='ctx'> 	TEST_ASSERT(r &lt; path_size,</div><div class='hunk'>@@ -79,7 +95,7 @@ static ssize_t get_module_param(const char *module_name, const char *param,</div><div class='ctx'> 	return bytes_read;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_module_param_integer(const char *module_name, const char *param)</div><div class='add'>+int kvm_get_module_param_integer(const char *module_name, const char *param)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 16 bytes to hold a 64-bit value (1 byte per char), 1 byte for the</div><div class='hunk'>@@ -103,7 +119,7 @@ static int get_module_param_integer(const char *module_name, const char *param)</div><div class='ctx'> 	return atoi_paranoid(value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool get_module_param_bool(const char *module_name, const char *param)</div><div class='add'>+bool kvm_get_module_param_bool(const char *module_name, const char *param)</div><div class='ctx'> {</div><div class='ctx'> 	char value;</div><div class='ctx'> 	ssize_t r;</div><div class='hunk'>@@ -119,36 +135,6 @@ static bool get_module_param_bool(const char *module_name, const char *param)</div><div class='ctx'> 	TEST_FAIL("Unrecognized value '%c' for boolean module param", value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool get_kvm_param_bool(const char *param)</div><div class='del'>-{</div><div class='del'>-	return get_module_param_bool("kvm", param);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool get_kvm_intel_param_bool(const char *param)</div><div class='del'>-{</div><div class='del'>-	return get_module_param_bool("kvm_intel", param);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool get_kvm_amd_param_bool(const char *param)</div><div class='del'>-{</div><div class='del'>-	return get_module_param_bool("kvm_amd", param);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int get_kvm_param_integer(const char *param)</div><div class='del'>-{</div><div class='del'>-	return get_module_param_integer("kvm", param);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int get_kvm_intel_param_integer(const char *param)</div><div class='del'>-{</div><div class='del'>-	return get_module_param_integer("kvm_intel", param);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int get_kvm_amd_param_integer(const char *param)</div><div class='del'>-{</div><div class='del'>-	return get_module_param_integer("kvm_amd", param);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Capability</div><div class='ctx'>  *</div><div class='hunk'>@@ -196,6 +182,11 @@ static void vm_open(struct kvm_vm *vm)</div><div class='ctx'> </div><div class='ctx'> 	vm-&gt;fd = __kvm_ioctl(vm-&gt;kvm_fd, KVM_CREATE_VM, (void *)vm-&gt;type);</div><div class='ctx'> 	TEST_ASSERT(vm-&gt;fd &gt;= 0, KVM_IOCTL_ERROR(KVM_CREATE_VM, vm-&gt;fd));</div><div class='add'>+</div><div class='add'>+	if (kvm_has_cap(KVM_CAP_BINARY_STATS_FD))</div><div class='add'>+		vm-&gt;stats.fd = vm_get_stats_fd(vm);</div><div class='add'>+	else</div><div class='add'>+		vm-&gt;stats.fd = -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const char *vm_guest_mode_string(uint32_t i)</div><div class='hunk'>@@ -210,12 +201,13 @@ const char *vm_guest_mode_string(uint32_t i)</div><div class='ctx'> 		[VM_MODE_P40V48_4K]	= "PA-bits:40,  VA-bits:48,  4K pages",</div><div class='ctx'> 		[VM_MODE_P40V48_16K]	= "PA-bits:40,  VA-bits:48, 16K pages",</div><div class='ctx'> 		[VM_MODE_P40V48_64K]	= "PA-bits:40,  VA-bits:48, 64K pages",</div><div class='del'>-		[VM_MODE_PXXV48_4K]	= "PA-bits:ANY, VA-bits:48,  4K pages",</div><div class='add'>+		[VM_MODE_PXXVYY_4K]	= "PA-bits:ANY, VA-bits:48 or 57, 4K pages",</div><div class='ctx'> 		[VM_MODE_P47V64_4K]	= "PA-bits:47,  VA-bits:64,  4K pages",</div><div class='ctx'> 		[VM_MODE_P44V64_4K]	= "PA-bits:44,  VA-bits:64,  4K pages",</div><div class='ctx'> 		[VM_MODE_P36V48_4K]	= "PA-bits:36,  VA-bits:48,  4K pages",</div><div class='ctx'> 		[VM_MODE_P36V48_16K]	= "PA-bits:36,  VA-bits:48, 16K pages",</div><div class='ctx'> 		[VM_MODE_P36V48_64K]	= "PA-bits:36,  VA-bits:48, 64K pages",</div><div class='add'>+		[VM_MODE_P47V47_16K]	= "PA-bits:47,  VA-bits:47, 16K pages",</div><div class='ctx'> 		[VM_MODE_P36V47_16K]	= "PA-bits:36,  VA-bits:47, 16K pages",</div><div class='ctx'> 	};</div><div class='ctx'> 	_Static_assert(sizeof(strings)/sizeof(char *) == NUM_VM_MODES,</div><div class='hunk'>@@ -236,12 +228,13 @@ const struct vm_guest_mode_params vm_guest_mode_params[] = {</div><div class='ctx'> 	[VM_MODE_P40V48_4K]	= { 40, 48,  0x1000, 12 },</div><div class='ctx'> 	[VM_MODE_P40V48_16K]	= { 40, 48,  0x4000, 14 },</div><div class='ctx'> 	[VM_MODE_P40V48_64K]	= { 40, 48, 0x10000, 16 },</div><div class='del'>-	[VM_MODE_PXXV48_4K]	= {  0,  0,  0x1000, 12 },</div><div class='add'>+	[VM_MODE_PXXVYY_4K]	= {  0,  0,  0x1000, 12 },</div><div class='ctx'> 	[VM_MODE_P47V64_4K]	= { 47, 64,  0x1000, 12 },</div><div class='ctx'> 	[VM_MODE_P44V64_4K]	= { 44, 64,  0x1000, 12 },</div><div class='ctx'> 	[VM_MODE_P36V48_4K]	= { 36, 48,  0x1000, 12 },</div><div class='ctx'> 	[VM_MODE_P36V48_16K]	= { 36, 48,  0x4000, 14 },</div><div class='ctx'> 	[VM_MODE_P36V48_64K]	= { 36, 48, 0x10000, 16 },</div><div class='add'>+	[VM_MODE_P47V47_16K]	= { 47, 47,  0x4000, 14 },</div><div class='ctx'> 	[VM_MODE_P36V47_16K]	= { 36, 47,  0x4000, 14 },</div><div class='ctx'> };</div><div class='ctx'> _Static_assert(sizeof(vm_guest_mode_params)/sizeof(struct vm_guest_mode_params) == NUM_VM_MODES,</div><div class='hunk'>@@ -313,27 +306,30 @@ struct kvm_vm *____vm_create(struct vm_shape shape)</div><div class='ctx'> 	case VM_MODE_P36V48_16K:</div><div class='ctx'> 		vm-&gt;pgtable_levels = 4;</div><div class='ctx'> 		break;</div><div class='add'>+	case VM_MODE_P47V47_16K:</div><div class='ctx'> 	case VM_MODE_P36V47_16K:</div><div class='ctx'> 		vm-&gt;pgtable_levels = 3;</div><div class='ctx'> 		break;</div><div class='del'>-	case VM_MODE_PXXV48_4K:</div><div class='add'>+	case VM_MODE_PXXVYY_4K:</div><div class='ctx'> #ifdef __x86_64__</div><div class='ctx'> 		kvm_get_cpu_address_width(&amp;vm-&gt;pa_bits, &amp;vm-&gt;va_bits);</div><div class='ctx'> 		kvm_init_vm_address_properties(vm);</div><div class='del'>-		/*</div><div class='del'>-		 * Ignore KVM support for 5-level paging (vm-&gt;va_bits == 57),</div><div class='del'>-		 * it doesn't take effect unless a CR4.LA57 is set, which it</div><div class='del'>-		 * isn't for this mode (48-bit virtual address space).</div><div class='del'>-		 */</div><div class='del'>-		TEST_ASSERT(vm-&gt;va_bits == 48 || vm-&gt;va_bits == 57,</div><div class='del'>-			    "Linear address width (%d bits) not supported",</div><div class='del'>-			    vm-&gt;va_bits);</div><div class='add'>+</div><div class='ctx'> 		pr_debug("Guest physical address width detected: %d\n",</div><div class='ctx'> 			 vm-&gt;pa_bits);</div><div class='del'>-		vm-&gt;pgtable_levels = 4;</div><div class='del'>-		vm-&gt;va_bits = 48;</div><div class='add'>+		pr_debug("Guest virtual address width detected: %d\n",</div><div class='add'>+			 vm-&gt;va_bits);</div><div class='add'>+</div><div class='add'>+		if (vm-&gt;va_bits == 57) {</div><div class='add'>+			vm-&gt;pgtable_levels = 5;</div><div class='add'>+		} else {</div><div class='add'>+			TEST_ASSERT(vm-&gt;va_bits == 48,</div><div class='add'>+				    "Unexpected guest virtual address width: %d",</div><div class='add'>+				    vm-&gt;va_bits);</div><div class='add'>+			vm-&gt;pgtable_levels = 4;</div><div class='add'>+		}</div><div class='ctx'> #else</div><div class='del'>-		TEST_FAIL("VM_MODE_PXXV48_4K not supported on non-x86 platforms");</div><div class='add'>+		TEST_FAIL("VM_MODE_PXXVYY_4K not supported on non-x86 platforms");</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VM_MODE_P47V64_4K:</div><div class='hunk'>@@ -406,6 +402,47 @@ static uint64_t vm_nr_pages_required(enum vm_guest_mode mode,</div><div class='ctx'> 	return vm_adjust_num_guest_pages(mode, nr_pages);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void kvm_set_files_rlimit(uint32_t nr_vcpus)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Each vCPU will open two file descriptors: the vCPU itself and the</div><div class='add'>+	 * vCPU's binary stats file descriptor.  Add an arbitrary amount of</div><div class='add'>+	 * buffer for all other files a test may open.</div><div class='add'>+	 */</div><div class='add'>+	int nr_fds_wanted = nr_vcpus * 2 + 100;</div><div class='add'>+	struct rlimit rl;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check that we're allowed to open nr_fds_wanted file descriptors and</div><div class='add'>+	 * try raising the limits if needed.</div><div class='add'>+	 */</div><div class='add'>+	TEST_ASSERT(!getrlimit(RLIMIT_NOFILE, &amp;rl), "getrlimit() failed!");</div><div class='add'>+</div><div class='add'>+	if (rl.rlim_cur &lt; nr_fds_wanted) {</div><div class='add'>+		rl.rlim_cur = nr_fds_wanted;</div><div class='add'>+		if (rl.rlim_max &lt; nr_fds_wanted) {</div><div class='add'>+			int old_rlim_max = rl.rlim_max;</div><div class='add'>+</div><div class='add'>+			rl.rlim_max = nr_fds_wanted;</div><div class='add'>+			__TEST_REQUIRE(setrlimit(RLIMIT_NOFILE, &amp;rl) &gt;= 0,</div><div class='add'>+				       "RLIMIT_NOFILE hard limit is too low (%d, wanted %d)",</div><div class='add'>+				       old_rlim_max, nr_fds_wanted);</div><div class='add'>+		} else {</div><div class='add'>+			TEST_ASSERT(!setrlimit(RLIMIT_NOFILE, &amp;rl), "setrlimit() failed!");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_guest_memfd_required(struct vm_shape shape)</div><div class='add'>+{</div><div class='add'>+#ifdef __x86_64__</div><div class='add'>+	return shape.type == KVM_X86_SNP_VM;</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct kvm_vm *__vm_create(struct vm_shape shape, uint32_t nr_runnable_vcpus,</div><div class='ctx'> 			   uint64_t nr_extra_pages)</div><div class='ctx'> {</div><div class='hunk'>@@ -413,14 +450,24 @@ struct kvm_vm *__vm_create(struct vm_shape shape, uint32_t nr_runnable_vcpus,</div><div class='ctx'> 						 nr_extra_pages);</div><div class='ctx'> 	struct userspace_mem_region *slot0;</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='del'>-	int i;</div><div class='add'>+	int i, flags;</div><div class='add'>+</div><div class='add'>+	kvm_set_files_rlimit(nr_runnable_vcpus);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s: mode='%s' type='%d', pages='%ld'\n", __func__,</div><div class='ctx'> 		 vm_guest_mode_string(shape.mode), shape.type, nr_pages);</div><div class='ctx'> </div><div class='ctx'> 	vm = ____vm_create(shape);</div><div class='ctx'> </div><div class='del'>-	vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, 0, 0, nr_pages, 0);</div><div class='add'>+	/*</div><div class='add'>+	 * Force GUEST_MEMFD for the primary memory region if necessary, e.g.</div><div class='add'>+	 * for CoCo VMs that require GUEST_MEMFD backed private memory.</div><div class='add'>+	 */</div><div class='add'>+	flags = 0;</div><div class='add'>+	if (is_guest_memfd_required(shape))</div><div class='add'>+		flags |= KVM_MEM_GUEST_MEMFD;</div><div class='add'>+</div><div class='add'>+	vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, 0, 0, nr_pages, flags);</div><div class='ctx'> 	for (i = 0; i &lt; NR_MEM_REGIONS; i++)</div><div class='ctx'> 		vm-&gt;memslots[i] = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -442,7 +489,7 @@ struct kvm_vm *__vm_create(struct vm_shape shape, uint32_t nr_runnable_vcpus,</div><div class='ctx'> 	guest_rng = new_guest_random_state(guest_random_seed);</div><div class='ctx'> 	sync_global_to_guest(vm, guest_rng);</div><div class='ctx'> </div><div class='del'>-	kvm_arch_vm_post_create(vm);</div><div class='add'>+	kvm_arch_vm_post_create(vm, nr_runnable_vcpus);</div><div class='ctx'> </div><div class='ctx'> 	return vm;</div><div class='ctx'> }</div><div class='hunk'>@@ -480,6 +527,7 @@ struct kvm_vm *__vm_create_with_vcpus(struct vm_shape shape, uint32_t nr_vcpus,</div><div class='ctx'> 	for (i = 0; i &lt; nr_vcpus; ++i)</div><div class='ctx'> 		vcpus[i] = vm_vcpu_add(vm, i, guest_code);</div><div class='ctx'> </div><div class='add'>+	kvm_arch_vm_finalize_vcpus(vm);</div><div class='ctx'> 	return vm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -545,15 +593,14 @@ struct kvm_vcpu *vm_recreate_with_one_vcpu(struct kvm_vm *vm)</div><div class='ctx'> 	return vm_vcpu_recreate(vm, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void kvm_pin_this_task_to_pcpu(uint32_t pcpu)</div><div class='add'>+int __pin_task_to_cpu(pthread_t task, int cpu)</div><div class='ctx'> {</div><div class='del'>-	cpu_set_t mask;</div><div class='del'>-	int r;</div><div class='add'>+	cpu_set_t cpuset;</div><div class='add'>+</div><div class='add'>+	CPU_ZERO(&amp;cpuset);</div><div class='add'>+	CPU_SET(cpu, &amp;cpuset);</div><div class='ctx'> </div><div class='del'>-	CPU_ZERO(&amp;mask);</div><div class='del'>-	CPU_SET(pcpu, &amp;mask);</div><div class='del'>-	r = sched_setaffinity(0, sizeof(mask), &amp;mask);</div><div class='del'>-	TEST_ASSERT(!r, "sched_setaffinity() failed for pCPU '%u'.", pcpu);</div><div class='add'>+	return pthread_setaffinity_np(task, sizeof(cpuset), &amp;cpuset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static uint32_t parse_pcpu(const char *cpu_str, const cpu_set_t *allowed_mask)</div><div class='hunk'>@@ -607,7 +654,7 @@ void kvm_parse_vcpu_pinning(const char *pcpus_string, uint32_t vcpu_to_pcpu[],</div><div class='ctx'> </div><div class='ctx'> 	/* 2. Check if the main worker needs to be pinned. */</div><div class='ctx'> 	if (cpu) {</div><div class='del'>-		kvm_pin_this_task_to_pcpu(parse_pcpu(cpu, &amp;allowed_mask));</div><div class='add'>+		pin_self_to_cpu(parse_pcpu(cpu, &amp;allowed_mask));</div><div class='ctx'> 		cpu = strtok(NULL, delim);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -657,6 +704,20 @@ userspace_mem_region_find(struct kvm_vm *vm, uint64_t start, uint64_t end)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvm_stats_release(struct kvm_binary_stats *stats)</div><div class='add'>+{</div><div class='add'>+	if (stats-&gt;fd &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (stats-&gt;desc) {</div><div class='add'>+		free(stats-&gt;desc);</div><div class='add'>+		stats-&gt;desc = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvm_close(stats-&gt;fd);</div><div class='add'>+	stats-&gt;fd = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> __weak void vcpu_arch_free(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -676,19 +737,15 @@ __weak void vcpu_arch_free(struct kvm_vcpu *vcpu)</div><div class='ctx'>  */</div><div class='ctx'> static void vm_vcpu_rm(struct kvm_vm *vm, struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	if (vcpu-&gt;dirty_gfns) {</div><div class='del'>-		ret = munmap(vcpu-&gt;dirty_gfns, vm-&gt;dirty_ring_size);</div><div class='del'>-		TEST_ASSERT(!ret, __KVM_SYSCALL_ERROR("munmap()", ret));</div><div class='add'>+		kvm_munmap(vcpu-&gt;dirty_gfns, vm-&gt;dirty_ring_size);</div><div class='ctx'> 		vcpu-&gt;dirty_gfns = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = munmap(vcpu-&gt;run, vcpu_mmap_sz());</div><div class='del'>-	TEST_ASSERT(!ret, __KVM_SYSCALL_ERROR("munmap()", ret));</div><div class='add'>+	kvm_munmap(vcpu-&gt;run, vcpu_mmap_sz());</div><div class='ctx'> </div><div class='del'>-	ret = close(vcpu-&gt;fd);</div><div class='del'>-	TEST_ASSERT(!ret,  __KVM_SYSCALL_ERROR("close()", ret));</div><div class='add'>+	kvm_close(vcpu-&gt;fd);</div><div class='add'>+	kvm_stats_release(&amp;vcpu-&gt;stats);</div><div class='ctx'> </div><div class='ctx'> 	list_del(&amp;vcpu-&gt;list);</div><div class='ctx'> </div><div class='hunk'>@@ -699,35 +756,32 @@ static void vm_vcpu_rm(struct kvm_vm *vm, struct kvm_vcpu *vcpu)</div><div class='ctx'> void kvm_vm_release(struct kvm_vm *vmp)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vcpu *vcpu, *tmp;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(vcpu, tmp, &amp;vmp-&gt;vcpus, list)</div><div class='ctx'> 		vm_vcpu_rm(vmp, vcpu);</div><div class='ctx'> </div><div class='del'>-	ret = close(vmp-&gt;fd);</div><div class='del'>-	TEST_ASSERT(!ret,  __KVM_SYSCALL_ERROR("close()", ret));</div><div class='add'>+	kvm_close(vmp-&gt;fd);</div><div class='add'>+	kvm_close(vmp-&gt;kvm_fd);</div><div class='add'>+</div><div class='add'>+	/* Free cached stats metadata and close FD */</div><div class='add'>+	kvm_stats_release(&amp;vmp-&gt;stats);</div><div class='ctx'> </div><div class='del'>-	ret = close(vmp-&gt;kvm_fd);</div><div class='del'>-	TEST_ASSERT(!ret,  __KVM_SYSCALL_ERROR("close()", ret));</div><div class='add'>+	kvm_arch_vm_release(vmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __vm_mem_region_delete(struct kvm_vm *vm,</div><div class='ctx'> 				   struct userspace_mem_region *region)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	rb_erase(&amp;region-&gt;gpa_node, &amp;vm-&gt;regions.gpa_tree);</div><div class='ctx'> 	rb_erase(&amp;region-&gt;hva_node, &amp;vm-&gt;regions.hva_tree);</div><div class='ctx'> 	hash_del(&amp;region-&gt;slot_node);</div><div class='ctx'> </div><div class='ctx'> 	sparsebit_free(&amp;region-&gt;unused_phy_pages);</div><div class='ctx'> 	sparsebit_free(&amp;region-&gt;protected_phy_pages);</div><div class='del'>-	ret = munmap(region-&gt;mmap_start, region-&gt;mmap_size);</div><div class='del'>-	TEST_ASSERT(!ret, __KVM_SYSCALL_ERROR("munmap()", ret));</div><div class='add'>+	kvm_munmap(region-&gt;mmap_start, region-&gt;mmap_size);</div><div class='ctx'> 	if (region-&gt;fd &gt;= 0) {</div><div class='ctx'> 		/* There's an extra map when using shared memory. */</div><div class='del'>-		ret = munmap(region-&gt;mmap_alias, region-&gt;mmap_size);</div><div class='del'>-		TEST_ASSERT(!ret, __KVM_SYSCALL_ERROR("munmap()", ret));</div><div class='add'>+		kvm_munmap(region-&gt;mmap_alias, region-&gt;mmap_size);</div><div class='ctx'> 		close(region-&gt;fd);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (region-&gt;region.guest_memfd &gt;= 0)</div><div class='hunk'>@@ -748,12 +802,6 @@ void kvm_vm_free(struct kvm_vm *vmp)</div><div class='ctx'> 	if (vmp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* Free cached stats metadata and close FD */</div><div class='del'>-	if (vmp-&gt;stats_fd) {</div><div class='del'>-		free(vmp-&gt;stats_desc);</div><div class='del'>-		close(vmp-&gt;stats_fd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Free userspace_mem_regions. */</div><div class='ctx'> 	hash_for_each_safe(vmp-&gt;regions.slot_hash, ctr, node, region, slot_node)</div><div class='ctx'> 		__vm_mem_region_delete(vmp, region);</div><div class='hunk'>@@ -771,7 +819,7 @@ void kvm_vm_free(struct kvm_vm *vmp)</div><div class='ctx'> int kvm_memfd_alloc(size_t size, bool hugepages)</div><div class='ctx'> {</div><div class='ctx'> 	int memfd_flags = MFD_CLOEXEC;</div><div class='del'>-	int fd, r;</div><div class='add'>+	int fd;</div><div class='ctx'> </div><div class='ctx'> 	if (hugepages)</div><div class='ctx'> 		memfd_flags |= MFD_HUGETLB;</div><div class='hunk'>@@ -779,11 +827,8 @@ int kvm_memfd_alloc(size_t size, bool hugepages)</div><div class='ctx'> 	fd = memfd_create("kvm_selftest", memfd_flags);</div><div class='ctx'> 	TEST_ASSERT(fd != -1, __KVM_SYSCALL_ERROR("memfd_create()", fd));</div><div class='ctx'> </div><div class='del'>-	r = ftruncate(fd, size);</div><div class='del'>-	TEST_ASSERT(!r, __KVM_SYSCALL_ERROR("ftruncate()", r));</div><div class='del'>-</div><div class='del'>-	r = fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, size);</div><div class='del'>-	TEST_ASSERT(!r, __KVM_SYSCALL_ERROR("fallocate()", r));</div><div class='add'>+	kvm_ftruncate(fd, size);</div><div class='add'>+	kvm_fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, size);</div><div class='ctx'> </div><div class='ctx'> 	return fd;</div><div class='ctx'> }</div><div class='hunk'>@@ -900,8 +945,8 @@ void vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags</div><div class='ctx'> </div><div class='ctx'> /* FIXME: This thing needs to be ripped apart and rewritten. */</div><div class='ctx'> void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,</div><div class='del'>-		uint64_t guest_paddr, uint32_t slot, uint64_t npages,</div><div class='del'>-		uint32_t flags, int guest_memfd, uint64_t guest_memfd_offset)</div><div class='add'>+		uint64_t gpa, uint32_t slot, uint64_t npages, uint32_t flags,</div><div class='add'>+		int guest_memfd, uint64_t guest_memfd_offset)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct userspace_mem_region *region;</div><div class='hunk'>@@ -915,30 +960,29 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,</div><div class='ctx'> 		"Number of guest pages is not compatible with the host. "</div><div class='ctx'> 		"Try npages=%d", vm_adjust_num_guest_pages(vm-&gt;mode, npages));</div><div class='ctx'> </div><div class='del'>-	TEST_ASSERT((guest_paddr % vm-&gt;page_size) == 0, "Guest physical "</div><div class='add'>+	TEST_ASSERT((gpa % vm-&gt;page_size) == 0, "Guest physical "</div><div class='ctx'> 		"address not on a page boundary.\n"</div><div class='del'>-		"  guest_paddr: 0x%lx vm-&gt;page_size: 0x%x",</div><div class='del'>-		guest_paddr, vm-&gt;page_size);</div><div class='del'>-	TEST_ASSERT((((guest_paddr &gt;&gt; vm-&gt;page_shift) + npages) - 1)</div><div class='add'>+		"  gpa: 0x%lx vm-&gt;page_size: 0x%x",</div><div class='add'>+		gpa, vm-&gt;page_size);</div><div class='add'>+	TEST_ASSERT((((gpa &gt;&gt; vm-&gt;page_shift) + npages) - 1)</div><div class='ctx'> 		&lt;= vm-&gt;max_gfn, "Physical range beyond maximum "</div><div class='ctx'> 		"supported physical address,\n"</div><div class='del'>-		"  guest_paddr: 0x%lx npages: 0x%lx\n"</div><div class='add'>+		"  gpa: 0x%lx npages: 0x%lx\n"</div><div class='ctx'> 		"  vm-&gt;max_gfn: 0x%lx vm-&gt;page_size: 0x%x",</div><div class='del'>-		guest_paddr, npages, vm-&gt;max_gfn, vm-&gt;page_size);</div><div class='add'>+		gpa, npages, vm-&gt;max_gfn, vm-&gt;page_size);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Confirm a mem region with an overlapping address doesn't</div><div class='ctx'> 	 * already exist.</div><div class='ctx'> 	 */</div><div class='ctx'> 	region = (struct userspace_mem_region *) userspace_mem_region_find(</div><div class='del'>-		vm, guest_paddr, (guest_paddr + npages * vm-&gt;page_size) - 1);</div><div class='add'>+		vm, gpa, (gpa + npages * vm-&gt;page_size) - 1);</div><div class='ctx'> 	if (region != NULL)</div><div class='ctx'> 		TEST_FAIL("overlapping userspace_mem_region already "</div><div class='ctx'> 			"exists\n"</div><div class='del'>-			"  requested guest_paddr: 0x%lx npages: 0x%lx "</div><div class='del'>-			"page_size: 0x%x\n"</div><div class='del'>-			"  existing guest_paddr: 0x%lx size: 0x%lx",</div><div class='del'>-			guest_paddr, npages, vm-&gt;page_size,</div><div class='add'>+			"  requested gpa: 0x%lx npages: 0x%lx page_size: 0x%x\n"</div><div class='add'>+			"  existing gpa: 0x%lx size: 0x%lx",</div><div class='add'>+			gpa, npages, vm-&gt;page_size,</div><div class='ctx'> 			(uint64_t) region-&gt;region.guest_phys_addr,</div><div class='ctx'> 			(uint64_t) region-&gt;region.memory_size);</div><div class='ctx'> </div><div class='hunk'>@@ -952,8 +996,7 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,</div><div class='ctx'> 			"already exists.\n"</div><div class='ctx'> 			"  requested slot: %u paddr: 0x%lx npages: 0x%lx\n"</div><div class='ctx'> 			"  existing slot: %u paddr: 0x%lx size: 0x%lx",</div><div class='del'>-			slot, guest_paddr, npages,</div><div class='del'>-			region-&gt;region.slot,</div><div class='add'>+			slot, gpa, npages, region-&gt;region.slot,</div><div class='ctx'> 			(uint64_t) region-&gt;region.guest_phys_addr,</div><div class='ctx'> 			(uint64_t) region-&gt;region.memory_size);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -979,7 +1022,7 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,</div><div class='ctx'> 	if (src_type == VM_MEM_SRC_ANONYMOUS_THP)</div><div class='ctx'> 		alignment = max(backing_src_pagesz, alignment);</div><div class='ctx'> </div><div class='del'>-	TEST_ASSERT_EQ(guest_paddr, align_up(guest_paddr, backing_src_pagesz));</div><div class='add'>+	TEST_ASSERT_EQ(gpa, align_up(gpa, backing_src_pagesz));</div><div class='ctx'> </div><div class='ctx'> 	/* Add enough memory to align up if necessary */</div><div class='ctx'> 	if (alignment &gt; 1)</div><div class='hunk'>@@ -990,12 +1033,9 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,</div><div class='ctx'> 		region-&gt;fd = kvm_memfd_alloc(region-&gt;mmap_size,</div><div class='ctx'> 					     src_type == VM_MEM_SRC_SHARED_HUGETLB);</div><div class='ctx'> </div><div class='del'>-	region-&gt;mmap_start = mmap(NULL, region-&gt;mmap_size,</div><div class='del'>-				  PROT_READ | PROT_WRITE,</div><div class='del'>-				  vm_mem_backing_src_alias(src_type)-&gt;flag,</div><div class='del'>-				  region-&gt;fd, 0);</div><div class='del'>-	TEST_ASSERT(region-&gt;mmap_start != MAP_FAILED,</div><div class='del'>-		    __KVM_SYSCALL_ERROR("mmap()", (int)(unsigned long)MAP_FAILED));</div><div class='add'>+	region-&gt;mmap_start = kvm_mmap(region-&gt;mmap_size, PROT_READ | PROT_WRITE,</div><div class='add'>+				      vm_mem_backing_src_alias(src_type)-&gt;flag,</div><div class='add'>+				      region-&gt;fd);</div><div class='ctx'> </div><div class='ctx'> 	TEST_ASSERT(!is_backing_src_hugetlb(src_type) ||</div><div class='ctx'> 		    region-&gt;mmap_start == align_ptr_up(region-&gt;mmap_start, backing_src_pagesz),</div><div class='hunk'>@@ -1030,8 +1070,7 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,</div><div class='ctx'> 			 * needing to track if the fd is owned by the framework</div><div class='ctx'> 			 * or by the caller.</div><div class='ctx'> 			 */</div><div class='del'>-			guest_memfd = dup(guest_memfd);</div><div class='del'>-			TEST_ASSERT(guest_memfd &gt;= 0, __KVM_SYSCALL_ERROR("dup()", guest_memfd));</div><div class='add'>+			guest_memfd = kvm_dup(guest_memfd);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		region-&gt;region.guest_memfd = guest_memfd;</div><div class='hunk'>@@ -1043,20 +1082,18 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,</div><div class='ctx'> 	region-&gt;unused_phy_pages = sparsebit_alloc();</div><div class='ctx'> 	if (vm_arch_has_protected_memory(vm))</div><div class='ctx'> 		region-&gt;protected_phy_pages = sparsebit_alloc();</div><div class='del'>-	sparsebit_set_num(region-&gt;unused_phy_pages,</div><div class='del'>-		guest_paddr &gt;&gt; vm-&gt;page_shift, npages);</div><div class='add'>+	sparsebit_set_num(region-&gt;unused_phy_pages, gpa &gt;&gt; vm-&gt;page_shift, npages);</div><div class='ctx'> 	region-&gt;region.slot = slot;</div><div class='ctx'> 	region-&gt;region.flags = flags;</div><div class='del'>-	region-&gt;region.guest_phys_addr = guest_paddr;</div><div class='add'>+	region-&gt;region.guest_phys_addr = gpa;</div><div class='ctx'> 	region-&gt;region.memory_size = npages * vm-&gt;page_size;</div><div class='ctx'> 	region-&gt;region.userspace_addr = (uintptr_t) region-&gt;host_mem;</div><div class='ctx'> 	ret = __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, &amp;region-&gt;region);</div><div class='ctx'> 	TEST_ASSERT(ret == 0, "KVM_SET_USER_MEMORY_REGION2 IOCTL failed,\n"</div><div class='ctx'> 		"  rc: %i errno: %i\n"</div><div class='ctx'> 		"  slot: %u flags: 0x%x\n"</div><div class='del'>-		"  guest_phys_addr: 0x%lx size: 0x%lx guest_memfd: %d",</div><div class='del'>-		ret, errno, slot, flags,</div><div class='del'>-		guest_paddr, (uint64_t) region-&gt;region.memory_size,</div><div class='add'>+		"  guest_phys_addr: 0x%lx size: 0x%llx guest_memfd: %d",</div><div class='add'>+		ret, errno, slot, flags, gpa, region-&gt;region.memory_size,</div><div class='ctx'> 		region-&gt;region.guest_memfd);</div><div class='ctx'> </div><div class='ctx'> 	/* Add to quick lookup data structures */</div><div class='hunk'>@@ -1066,12 +1103,10 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,</div><div class='ctx'> </div><div class='ctx'> 	/* If shared memory, create an alias. */</div><div class='ctx'> 	if (region-&gt;fd &gt;= 0) {</div><div class='del'>-		region-&gt;mmap_alias = mmap(NULL, region-&gt;mmap_size,</div><div class='del'>-					  PROT_READ | PROT_WRITE,</div><div class='del'>-					  vm_mem_backing_src_alias(src_type)-&gt;flag,</div><div class='del'>-					  region-&gt;fd, 0);</div><div class='del'>-		TEST_ASSERT(region-&gt;mmap_alias != MAP_FAILED,</div><div class='del'>-			    __KVM_SYSCALL_ERROR("mmap()",  (int)(unsigned long)MAP_FAILED));</div><div class='add'>+		region-&gt;mmap_alias = kvm_mmap(region-&gt;mmap_size,</div><div class='add'>+					      PROT_READ | PROT_WRITE,</div><div class='add'>+					      vm_mem_backing_src_alias(src_type)-&gt;flag,</div><div class='add'>+					      region-&gt;fd);</div><div class='ctx'> </div><div class='ctx'> 		/* Align host alias address */</div><div class='ctx'> 		region-&gt;host_alias = align_ptr_up(region-&gt;mmap_alias, alignment);</div><div class='hunk'>@@ -1080,10 +1115,10 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,</div><div class='ctx'> </div><div class='ctx'> void vm_userspace_mem_region_add(struct kvm_vm *vm,</div><div class='ctx'> 				 enum vm_mem_backing_src_type src_type,</div><div class='del'>-				 uint64_t guest_paddr, uint32_t slot,</div><div class='del'>-				 uint64_t npages, uint32_t flags)</div><div class='add'>+				 uint64_t gpa, uint32_t slot, uint64_t npages,</div><div class='add'>+				 uint32_t flags)</div><div class='ctx'> {</div><div class='del'>-	vm_mem_add(vm, src_type, guest_paddr, slot, npages, flags, -1, 0);</div><div class='add'>+	vm_mem_add(vm, src_type, gpa, slot, npages, flags, -1, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1149,6 +1184,16 @@ void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags)</div><div class='ctx'> 		ret, errno, slot, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void vm_mem_region_reload(struct kvm_vm *vm, uint32_t slot)</div><div class='add'>+{</div><div class='add'>+	struct userspace_mem_region *region = memslot2region(vm, slot);</div><div class='add'>+	struct kvm_userspace_memory_region2 tmp = region-&gt;region;</div><div class='add'>+</div><div class='add'>+	tmp.memory_size = 0;</div><div class='add'>+	vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, &amp;tmp);</div><div class='add'>+	vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, &amp;region-&gt;region);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * VM Memory Region Move</div><div class='ctx'>  *</div><div class='hunk'>@@ -1231,14 +1276,14 @@ void vm_guest_mem_fallocate(struct kvm_vm *vm, uint64_t base, uint64_t size,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns the size of a vCPU's kvm_run structure. */</div><div class='del'>-static int vcpu_mmap_sz(void)</div><div class='add'>+static size_t vcpu_mmap_sz(void)</div><div class='ctx'> {</div><div class='ctx'> 	int dev_fd, ret;</div><div class='ctx'> </div><div class='ctx'> 	dev_fd = open_kvm_dev_path_or_exit();</div><div class='ctx'> </div><div class='ctx'> 	ret = ioctl(dev_fd, KVM_GET_VCPU_MMAP_SIZE, NULL);</div><div class='del'>-	TEST_ASSERT(ret &gt;= sizeof(struct kvm_run),</div><div class='add'>+	TEST_ASSERT(ret &gt;= 0 &amp;&amp; ret &gt;= sizeof(struct kvm_run),</div><div class='ctx'> 		    KVM_IOCTL_ERROR(KVM_GET_VCPU_MMAP_SIZE, ret));</div><div class='ctx'> </div><div class='ctx'> 	close(dev_fd);</div><div class='hunk'>@@ -1279,12 +1324,15 @@ struct kvm_vcpu *__vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id)</div><div class='ctx'> 	TEST_ASSERT_VM_VCPU_IOCTL(vcpu-&gt;fd &gt;= 0, KVM_CREATE_VCPU, vcpu-&gt;fd, vm);</div><div class='ctx'> </div><div class='ctx'> 	TEST_ASSERT(vcpu_mmap_sz() &gt;= sizeof(*vcpu-&gt;run), "vcpu mmap size "</div><div class='del'>-		"smaller than expected, vcpu_mmap_sz: %i expected_min: %zi",</div><div class='add'>+		"smaller than expected, vcpu_mmap_sz: %zi expected_min: %zi",</div><div class='ctx'> 		vcpu_mmap_sz(), sizeof(*vcpu-&gt;run));</div><div class='del'>-	vcpu-&gt;run = (struct kvm_run *) mmap(NULL, vcpu_mmap_sz(),</div><div class='del'>-		PROT_READ | PROT_WRITE, MAP_SHARED, vcpu-&gt;fd, 0);</div><div class='del'>-	TEST_ASSERT(vcpu-&gt;run != MAP_FAILED,</div><div class='del'>-		    __KVM_SYSCALL_ERROR("mmap()", (int)(unsigned long)MAP_FAILED));</div><div class='add'>+	vcpu-&gt;run = kvm_mmap(vcpu_mmap_sz(), PROT_READ | PROT_WRITE,</div><div class='add'>+			     MAP_SHARED, vcpu-&gt;fd);</div><div class='add'>+</div><div class='add'>+	if (kvm_has_cap(KVM_CAP_BINARY_STATS_FD))</div><div class='add'>+		vcpu-&gt;stats.fd = vcpu_get_stats_fd(vcpu);</div><div class='add'>+	else</div><div class='add'>+		vcpu-&gt;stats.fd = -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Add to linked-list of VCPUs. */</div><div class='ctx'> 	list_add(&amp;vcpu-&gt;list, &amp;vm-&gt;vcpus);</div><div class='hunk'>@@ -1401,8 +1449,6 @@ static vm_vaddr_t ____vm_vaddr_alloc(struct kvm_vm *vm, size_t sz,</div><div class='ctx'> 		pages--, vaddr += vm-&gt;page_size, paddr += vm-&gt;page_size) {</div><div class='ctx'> </div><div class='ctx'> 		virt_pg_map(vm, vaddr, paddr);</div><div class='del'>-</div><div class='del'>-		sparsebit_set(vm-&gt;vpages_mapped, vaddr &gt;&gt; vm-&gt;page_shift);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return vaddr_start;</div><div class='hunk'>@@ -1516,7 +1562,6 @@ void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,</div><div class='ctx'> </div><div class='ctx'> 	while (npages--) {</div><div class='ctx'> 		virt_pg_map(vm, vaddr, paddr);</div><div class='del'>-		sparsebit_set(vm-&gt;vpages_mapped, vaddr &gt;&gt; vm-&gt;page_shift);</div><div class='ctx'> </div><div class='ctx'> 		vaddr += page_size;</div><div class='ctx'> 		paddr += page_size;</div><div class='hunk'>@@ -1635,7 +1680,18 @@ void *addr_gpa2alias(struct kvm_vm *vm, vm_paddr_t gpa)</div><div class='ctx'> /* Create an interrupt controller chip for the specified VM. */</div><div class='ctx'> void vm_create_irqchip(struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='del'>-	vm_ioctl(vm, KVM_CREATE_IRQCHIP, NULL);</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate a fully in-kernel IRQ chip by default, but fall back to a</div><div class='add'>+	 * split model (x86 only) if that fails (KVM x86 allows compiling out</div><div class='add'>+	 * support for KVM_CREATE_IRQCHIP).</div><div class='add'>+	 */</div><div class='add'>+	r = __vm_ioctl(vm, KVM_CREATE_IRQCHIP, NULL);</div><div class='add'>+	if (r &amp;&amp; errno == ENOTTY &amp;&amp; kvm_has_cap(KVM_CAP_SPLIT_IRQCHIP))</div><div class='add'>+		vm_enable_cap(vm, KVM_CAP_SPLIT_IRQCHIP, 24);</div><div class='add'>+	else</div><div class='add'>+		TEST_ASSERT_VM_VCPU_IOCTL(!r, KVM_CREATE_IRQCHIP, r, vm);</div><div class='ctx'> </div><div class='ctx'> 	vm-&gt;has_irqchip = true;</div><div class='ctx'> }</div><div class='hunk'>@@ -1715,9 +1771,8 @@ void *vcpu_map_dirty_ring(struct kvm_vcpu *vcpu)</div><div class='ctx'> 			    page_size * KVM_DIRTY_LOG_PAGE_OFFSET);</div><div class='ctx'> 		TEST_ASSERT(addr == MAP_FAILED, "Dirty ring mapped exec");</div><div class='ctx'> </div><div class='del'>-		addr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, vcpu-&gt;fd,</div><div class='del'>-			    page_size * KVM_DIRTY_LOG_PAGE_OFFSET);</div><div class='del'>-		TEST_ASSERT(addr != MAP_FAILED, "Dirty ring map failed");</div><div class='add'>+		addr = __kvm_mmap(size, PROT_READ | PROT_WRITE, MAP_SHARED, vcpu-&gt;fd,</div><div class='add'>+				  page_size * KVM_DIRTY_LOG_PAGE_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 		vcpu-&gt;dirty_gfns = addr;</div><div class='ctx'> 		vcpu-&gt;dirty_gfns_count = size / sizeof(struct kvm_dirty_gfn);</div><div class='hunk'>@@ -1958,9 +2013,9 @@ static struct exit_reason {</div><div class='ctx'> 	KVM_EXIT_STRING(RISCV_SBI),</div><div class='ctx'> 	KVM_EXIT_STRING(RISCV_CSR),</div><div class='ctx'> 	KVM_EXIT_STRING(NOTIFY),</div><div class='del'>-#ifdef KVM_EXIT_MEMORY_NOT_PRESENT</div><div class='del'>-	KVM_EXIT_STRING(MEMORY_NOT_PRESENT),</div><div class='del'>-#endif</div><div class='add'>+	KVM_EXIT_STRING(LOONGARCH_IOCSR),</div><div class='add'>+	KVM_EXIT_STRING(MEMORY_FAULT),</div><div class='add'>+	KVM_EXIT_STRING(ARM_SEA),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2198,49 +2253,42 @@ void read_stat_data(int stats_fd, struct kvm_stats_header *header,</div><div class='ctx'> 		    desc-&gt;name, size, ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Read the data of the named stat</div><div class='del'>- *</div><div class='del'>- * Input Args:</div><div class='del'>- *   vm - the VM for which the stat should be read</div><div class='del'>- *   stat_name - the name of the stat to read</div><div class='del'>- *   max_elements - the maximum number of 8-byte values to read into data</div><div class='del'>- *</div><div class='del'>- * Output Args:</div><div class='del'>- *   data - the buffer into which stat data should be read</div><div class='del'>- *</div><div class='del'>- * Read the data values of a specified stat from the binary stats interface.</div><div class='del'>- */</div><div class='del'>-void __vm_get_stat(struct kvm_vm *vm, const char *stat_name, uint64_t *data,</div><div class='del'>-		   size_t max_elements)</div><div class='add'>+void kvm_get_stat(struct kvm_binary_stats *stats, const char *name,</div><div class='add'>+		  uint64_t *data, size_t max_elements)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_stats_desc *desc;</div><div class='ctx'> 	size_t size_desc;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!vm-&gt;stats_fd) {</div><div class='del'>-		vm-&gt;stats_fd = vm_get_stats_fd(vm);</div><div class='del'>-		read_stats_header(vm-&gt;stats_fd, &amp;vm-&gt;stats_header);</div><div class='del'>-		vm-&gt;stats_desc = read_stats_descriptors(vm-&gt;stats_fd,</div><div class='del'>-							&amp;vm-&gt;stats_header);</div><div class='add'>+	if (!stats-&gt;desc) {</div><div class='add'>+		read_stats_header(stats-&gt;fd, &amp;stats-&gt;header);</div><div class='add'>+		stats-&gt;desc = read_stats_descriptors(stats-&gt;fd, &amp;stats-&gt;header);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	size_desc = get_stats_descriptor_size(&amp;vm-&gt;stats_header);</div><div class='add'>+	size_desc = get_stats_descriptor_size(&amp;stats-&gt;header);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; vm-&gt;stats_header.num_desc; ++i) {</div><div class='del'>-		desc = (void *)vm-&gt;stats_desc + (i * size_desc);</div><div class='add'>+	for (i = 0; i &lt; stats-&gt;header.num_desc; ++i) {</div><div class='add'>+		desc = (void *)stats-&gt;desc + (i * size_desc);</div><div class='ctx'> </div><div class='del'>-		if (strcmp(desc-&gt;name, stat_name))</div><div class='add'>+		if (strcmp(desc-&gt;name, name))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		read_stat_data(vm-&gt;stats_fd, &amp;vm-&gt;stats_header, desc,</div><div class='del'>-			       data, max_elements);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='add'>+		read_stat_data(stats-&gt;fd, &amp;stats-&gt;header, desc, data, max_elements);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	TEST_FAIL("Unable to find stat '%s'", name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__weak void kvm_arch_vm_post_create(struct kvm_vm *vm, unsigned int nr_vcpus)</div><div class='add'>+{</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__weak void kvm_arch_vm_post_create(struct kvm_vm *vm)</div><div class='add'>+__weak void kvm_arch_vm_finalize_vcpus(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__weak void kvm_arch_vm_release(struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2248,11 +2296,35 @@ __weak void kvm_selftest_arch_init(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void report_unexpected_signal(int signum)</div><div class='add'>+{</div><div class='add'>+#define KVM_CASE_SIGNUM(sig)					\</div><div class='add'>+	case sig: TEST_FAIL("Unexpected " #sig " (%d)\n", signum)</div><div class='add'>+</div><div class='add'>+	switch (signum) {</div><div class='add'>+	KVM_CASE_SIGNUM(SIGBUS);</div><div class='add'>+	KVM_CASE_SIGNUM(SIGSEGV);</div><div class='add'>+	KVM_CASE_SIGNUM(SIGILL);</div><div class='add'>+	KVM_CASE_SIGNUM(SIGFPE);</div><div class='add'>+	default:</div><div class='add'>+		TEST_FAIL("Unexpected signal %d\n", signum);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __attribute((constructor)) kvm_selftest_init(void)</div><div class='ctx'> {</div><div class='add'>+	struct sigaction sig_sa = {</div><div class='add'>+		.sa_handler = report_unexpected_signal,</div><div class='add'>+	};</div><div class='add'>+</div><div class='ctx'> 	/* Tell stdout not to buffer its content. */</div><div class='ctx'> 	setbuf(stdout, NULL);</div><div class='ctx'> </div><div class='add'>+	sigaction(SIGBUS, &amp;sig_sa, NULL);</div><div class='add'>+	sigaction(SIGSEGV, &amp;sig_sa, NULL);</div><div class='add'>+	sigaction(SIGILL, &amp;sig_sa, NULL);</div><div class='add'>+	sigaction(SIGFPE, &amp;sig_sa, NULL);</div><div class='add'>+</div><div class='ctx'> 	guest_random_seed = last_guest_seed = random();</div><div class='ctx'> 	pr_info("Random seed: 0x%x\n", guest_random_seed);</div><div class='ctx'> </div><div class='hunk'>@@ -2273,3 +2345,8 @@ bool vm_is_gpa_protected(struct kvm_vm *vm, vm_paddr_t paddr)</div><div class='ctx'> 	pg = paddr &gt;&gt; vm-&gt;page_shift;</div><div class='ctx'> 	return sparsebit_is_set(region-&gt;protected_phy_pages, pg);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+__weak bool kvm_arch_has_default_irqchip(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/loongarch/exception.S b/tools/testing/selftests/kvm/lib/loongarch/exception.S<br/>new file mode 100644<br/>index 000000000000..3f1e4b67c5ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/loongarch/exception.S?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/loongarch/exception.S</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+#include "processor.h"</div><div class='add'>+</div><div class='add'>+/* address of refill exception should be 4K aligned */</div><div class='add'>+.balign	4096</div><div class='add'>+.global handle_tlb_refill</div><div class='add'>+handle_tlb_refill:</div><div class='add'>+	csrwr	t0, LOONGARCH_CSR_TLBRSAVE</div><div class='add'>+	csrrd	t0, LOONGARCH_CSR_PGD</div><div class='add'>+	lddir	t0, t0, 3</div><div class='add'>+	lddir	t0, t0, 1</div><div class='add'>+	ldpte	t0, 0</div><div class='add'>+	ldpte	t0, 1</div><div class='add'>+	tlbfill</div><div class='add'>+	csrrd	t0, LOONGARCH_CSR_TLBRSAVE</div><div class='add'>+	ertn</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * save and restore all gprs except base register,</div><div class='add'>+	 * and default value of base register is sp ($r3).</div><div class='add'>+	 */</div><div class='add'>+.macro save_gprs base</div><div class='add'>+	.irp n,1,2,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31</div><div class='add'>+	st.d    $r\n, \base, 8 * \n</div><div class='add'>+	.endr</div><div class='add'>+.endm</div><div class='add'>+</div><div class='add'>+.macro restore_gprs base</div><div class='add'>+	.irp n,1,2,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31</div><div class='add'>+	ld.d    $r\n, \base, 8 * \n</div><div class='add'>+	.endr</div><div class='add'>+.endm</div><div class='add'>+</div><div class='add'>+/* address of general exception should be 4K aligned */</div><div class='add'>+.balign	4096</div><div class='add'>+.global handle_exception</div><div class='add'>+handle_exception:</div><div class='add'>+	csrwr  sp, LOONGARCH_CSR_KS0</div><div class='add'>+	csrrd  sp, LOONGARCH_CSR_KS1</div><div class='add'>+	addi.d sp, sp, -EXREGS_SIZE</div><div class='add'>+</div><div class='add'>+	save_gprs sp</div><div class='add'>+	/* save sp register to stack */</div><div class='add'>+	csrrd  t0, LOONGARCH_CSR_KS0</div><div class='add'>+	st.d   t0, sp, 3 * 8</div><div class='add'>+</div><div class='add'>+	csrrd  t0, LOONGARCH_CSR_ERA</div><div class='add'>+	st.d   t0, sp, PC_OFFSET_EXREGS</div><div class='add'>+	csrrd  t0, LOONGARCH_CSR_ESTAT</div><div class='add'>+	st.d   t0, sp, ESTAT_OFFSET_EXREGS</div><div class='add'>+	csrrd  t0, LOONGARCH_CSR_BADV</div><div class='add'>+	st.d   t0, sp, BADV_OFFSET_EXREGS</div><div class='add'>+	csrrd  t0, LOONGARCH_CSR_PRMD</div><div class='add'>+	st.d   t0, sp, PRMD_OFFSET_EXREGS</div><div class='add'>+</div><div class='add'>+	or     a0, sp, zero</div><div class='add'>+	bl route_exception</div><div class='add'>+	ld.d   t0, sp, PC_OFFSET_EXREGS</div><div class='add'>+	csrwr  t0, LOONGARCH_CSR_ERA</div><div class='add'>+	ld.d   t0, sp, PRMD_OFFSET_EXREGS</div><div class='add'>+	csrwr  t0, LOONGARCH_CSR_PRMD</div><div class='add'>+	restore_gprs sp</div><div class='add'>+	csrrd  sp, LOONGARCH_CSR_KS0</div><div class='add'>+	ertn</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/loongarch/processor.c b/tools/testing/selftests/kvm/lib/loongarch/processor.c<br/>new file mode 100644<br/>index 000000000000..07c103369ddb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/loongarch/processor.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/loongarch/processor.c</a></div><div class='hunk'>@@ -0,0 +1,389 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;assert.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/kvm.h&gt;</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='add'>+#include "ucall_common.h"</div><div class='add'>+</div><div class='add'>+#define LOONGARCH_PAGE_TABLE_PHYS_MIN		0x200000</div><div class='add'>+#define LOONGARCH_GUEST_STACK_VADDR_MIN		0x200000</div><div class='add'>+</div><div class='add'>+static vm_paddr_t invalid_pgtable[4];</div><div class='add'>+static vm_vaddr_t exception_handlers;</div><div class='add'>+</div><div class='add'>+static uint64_t virt_pte_index(struct kvm_vm *vm, vm_vaddr_t gva, int level)</div><div class='add'>+{</div><div class='add'>+	unsigned int shift;</div><div class='add'>+	uint64_t mask;</div><div class='add'>+</div><div class='add'>+	shift = level * (vm-&gt;page_shift - 3) + vm-&gt;page_shift;</div><div class='add'>+	mask = (1UL &lt;&lt; (vm-&gt;page_shift - 3)) - 1;</div><div class='add'>+	return (gva &gt;&gt; shift) &amp; mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint64_t pte_addr(struct kvm_vm *vm, uint64_t entry)</div><div class='add'>+{</div><div class='add'>+	return entry &amp;  ~((0x1UL &lt;&lt; vm-&gt;page_shift) - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint64_t ptrs_per_pte(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	return 1 &lt;&lt; (vm-&gt;page_shift - 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void virt_set_pgtable(struct kvm_vm *vm, vm_paddr_t table, vm_paddr_t child)</div><div class='add'>+{</div><div class='add'>+	uint64_t *ptep;</div><div class='add'>+	int i, ptrs_per_pte;</div><div class='add'>+</div><div class='add'>+	ptep = addr_gpa2hva(vm, table);</div><div class='add'>+	ptrs_per_pte = 1 &lt;&lt; (vm-&gt;page_shift - 3);</div><div class='add'>+	for (i = 0; i &lt; ptrs_per_pte; i++)</div><div class='add'>+		WRITE_ONCE(*(ptep + i), child);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void virt_arch_pgd_alloc(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	vm_paddr_t child, table;</div><div class='add'>+</div><div class='add'>+	if (vm-&gt;pgd_created)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	child = table = 0;</div><div class='add'>+	for (i = 0; i &lt; vm-&gt;pgtable_levels; i++) {</div><div class='add'>+		invalid_pgtable[i] = child;</div><div class='add'>+		table = vm_phy_page_alloc(vm, LOONGARCH_PAGE_TABLE_PHYS_MIN,</div><div class='add'>+				vm-&gt;memslots[MEM_REGION_PT]);</div><div class='add'>+		TEST_ASSERT(table, "Fail to allocate page tale at level %d\n", i);</div><div class='add'>+		virt_set_pgtable(vm, table, child);</div><div class='add'>+		child = table;</div><div class='add'>+	}</div><div class='add'>+	vm-&gt;pgd = table;</div><div class='add'>+	vm-&gt;pgd_created = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int virt_pte_none(uint64_t *ptep, int level)</div><div class='add'>+{</div><div class='add'>+	return *ptep == invalid_pgtable[level];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint64_t *virt_populate_pte(struct kvm_vm *vm, vm_vaddr_t gva, int alloc)</div><div class='add'>+{</div><div class='add'>+	int level;</div><div class='add'>+	uint64_t *ptep;</div><div class='add'>+	vm_paddr_t child;</div><div class='add'>+</div><div class='add'>+	if (!vm-&gt;pgd_created)</div><div class='add'>+		goto unmapped_gva;</div><div class='add'>+</div><div class='add'>+	child = vm-&gt;pgd;</div><div class='add'>+	level = vm-&gt;pgtable_levels - 1;</div><div class='add'>+	while (level &gt; 0) {</div><div class='add'>+		ptep = addr_gpa2hva(vm, child) + virt_pte_index(vm, gva, level) * 8;</div><div class='add'>+		if (virt_pte_none(ptep, level)) {</div><div class='add'>+			if (alloc) {</div><div class='add'>+				child = vm_alloc_page_table(vm);</div><div class='add'>+				virt_set_pgtable(vm, child, invalid_pgtable[level - 1]);</div><div class='add'>+				WRITE_ONCE(*ptep, child);</div><div class='add'>+			} else</div><div class='add'>+				goto unmapped_gva;</div><div class='add'>+</div><div class='add'>+		} else</div><div class='add'>+			child = pte_addr(vm, *ptep);</div><div class='add'>+		level--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptep = addr_gpa2hva(vm, child) + virt_pte_index(vm, gva, level) * 8;</div><div class='add'>+	return ptep;</div><div class='add'>+</div><div class='add'>+unmapped_gva:</div><div class='add'>+	TEST_FAIL("No mapping for vm virtual address, gva: 0x%lx", gva);</div><div class='add'>+	exit(EXIT_FAILURE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)</div><div class='add'>+{</div><div class='add'>+	uint64_t *ptep;</div><div class='add'>+</div><div class='add'>+	ptep = virt_populate_pte(vm, gva, 0);</div><div class='add'>+	TEST_ASSERT(*ptep != 0, "Virtual address vaddr: 0x%lx not mapped\n", gva);</div><div class='add'>+</div><div class='add'>+	return pte_addr(vm, *ptep) + (gva &amp; (vm-&gt;page_size - 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)</div><div class='add'>+{</div><div class='add'>+	uint32_t prot_bits;</div><div class='add'>+	uint64_t *ptep;</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT((vaddr % vm-&gt;page_size) == 0,</div><div class='add'>+			"Virtual address not on page boundary,\n"</div><div class='add'>+			"vaddr: 0x%lx vm-&gt;page_size: 0x%x", vaddr, vm-&gt;page_size);</div><div class='add'>+	TEST_ASSERT(sparsebit_is_set(vm-&gt;vpages_valid,</div><div class='add'>+			(vaddr &gt;&gt; vm-&gt;page_shift)),</div><div class='add'>+			"Invalid virtual address, vaddr: 0x%lx", vaddr);</div><div class='add'>+	TEST_ASSERT((paddr % vm-&gt;page_size) == 0,</div><div class='add'>+			"Physical address not on page boundary,\n"</div><div class='add'>+			"paddr: 0x%lx vm-&gt;page_size: 0x%x", paddr, vm-&gt;page_size);</div><div class='add'>+	TEST_ASSERT((paddr &gt;&gt; vm-&gt;page_shift) &lt;= vm-&gt;max_gfn,</div><div class='add'>+			"Physical address beyond maximum supported,\n"</div><div class='add'>+			"paddr: 0x%lx vm-&gt;max_gfn: 0x%lx vm-&gt;page_size: 0x%x",</div><div class='add'>+			paddr, vm-&gt;max_gfn, vm-&gt;page_size);</div><div class='add'>+</div><div class='add'>+	ptep = virt_populate_pte(vm, vaddr, 1);</div><div class='add'>+	prot_bits = _PAGE_PRESENT | __READABLE | __WRITEABLE | _CACHE_CC | _PAGE_USER;</div><div class='add'>+	WRITE_ONCE(*ptep, paddr | prot_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pte_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent, uint64_t page, int level)</div><div class='add'>+{</div><div class='add'>+	uint64_t pte, *ptep;</div><div class='add'>+	static const char * const type[] = { "pte", "pmd", "pud", "pgd"};</div><div class='add'>+</div><div class='add'>+	if (level &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (pte = page; pte &lt; page + ptrs_per_pte(vm) * 8; pte += 8) {</div><div class='add'>+		ptep = addr_gpa2hva(vm, pte);</div><div class='add'>+		if (virt_pte_none(ptep, level))</div><div class='add'>+			continue;</div><div class='add'>+		fprintf(stream, "%*s%s: %lx: %lx at %p\n",</div><div class='add'>+				indent, "", type[level], pte, *ptep, ptep);</div><div class='add'>+		pte_dump(stream, vm, indent + 1, pte_addr(vm, *ptep), level--);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void virt_arch_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent)</div><div class='add'>+{</div><div class='add'>+	int level;</div><div class='add'>+</div><div class='add'>+	if (!vm-&gt;pgd_created)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	level = vm-&gt;pgtable_levels - 1;</div><div class='add'>+	pte_dump(stream, vm, indent, vm-&gt;pgd, level);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vcpu_arch_dump(FILE *stream, struct kvm_vcpu *vcpu, uint8_t indent)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void assert_on_unhandled_exception(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct ucall uc;</div><div class='add'>+</div><div class='add'>+	if (get_ucall(vcpu, &amp;uc) != UCALL_UNHANDLED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	TEST_FAIL("Unexpected exception (pc:0x%lx, estat:0x%lx, badv:0x%lx)",</div><div class='add'>+			uc.args[0], uc.args[1], uc.args[2]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void route_exception(struct ex_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int vector;</div><div class='add'>+	unsigned long pc, estat, badv;</div><div class='add'>+	struct handlers *handlers;</div><div class='add'>+</div><div class='add'>+	handlers = (struct handlers *)exception_handlers;</div><div class='add'>+	vector = (regs-&gt;estat &amp; CSR_ESTAT_EXC) &gt;&gt; CSR_ESTAT_EXC_SHIFT;</div><div class='add'>+	if (handlers &amp;&amp; handlers-&gt;exception_handlers[vector])</div><div class='add'>+		return handlers-&gt;exception_handlers[vector](regs);</div><div class='add'>+</div><div class='add'>+	pc = regs-&gt;pc;</div><div class='add'>+	badv  = regs-&gt;badv;</div><div class='add'>+	estat = regs-&gt;estat;</div><div class='add'>+	ucall(UCALL_UNHANDLED, 3, pc, estat, badv);</div><div class='add'>+	while (1) ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vm_init_descriptor_tables(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	void *addr;</div><div class='add'>+</div><div class='add'>+	vm-&gt;handlers = __vm_vaddr_alloc(vm, sizeof(struct handlers),</div><div class='add'>+			LOONGARCH_GUEST_STACK_VADDR_MIN, MEM_REGION_DATA);</div><div class='add'>+</div><div class='add'>+	addr = addr_gva2hva(vm, vm-&gt;handlers);</div><div class='add'>+	memset(addr, 0, vm-&gt;page_size);</div><div class='add'>+	exception_handlers = vm-&gt;handlers;</div><div class='add'>+	sync_global_to_guest(vm, exception_handlers);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vm_install_exception_handler(struct kvm_vm *vm, int vector, handler_fn handler)</div><div class='add'>+{</div><div class='add'>+	struct handlers *handlers = addr_gva2hva(vm, vm-&gt;handlers);</div><div class='add'>+</div><div class='add'>+	assert(vector &lt; VECTOR_NUM);</div><div class='add'>+	handlers-&gt;exception_handlers[vector] = handler;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+uint32_t guest_get_vcpuid(void)</div><div class='add'>+{</div><div class='add'>+	return csr_read(LOONGARCH_CSR_CPUID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vcpu_args_set(struct kvm_vcpu *vcpu, unsigned int num, ...)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	va_list ap;</div><div class='add'>+	struct kvm_regs regs;</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(num &gt;= 1 &amp;&amp; num &lt;= 8, "Unsupported number of args,\n"</div><div class='add'>+		    "num: %u\n", num);</div><div class='add'>+</div><div class='add'>+	vcpu_regs_get(vcpu, &amp;regs);</div><div class='add'>+</div><div class='add'>+	va_start(ap, num);</div><div class='add'>+	for (i = 0; i &lt; num; i++)</div><div class='add'>+		regs.gpr[i + 4] = va_arg(ap, uint64_t);</div><div class='add'>+	va_end(ap);</div><div class='add'>+</div><div class='add'>+	vcpu_regs_set(vcpu, &amp;regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void loongarch_set_reg(struct kvm_vcpu *vcpu, uint64_t id, uint64_t val)</div><div class='add'>+{</div><div class='add'>+	__vcpu_set_reg(vcpu, id, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void loongarch_get_csr(struct kvm_vcpu *vcpu, uint64_t id, void *addr)</div><div class='add'>+{</div><div class='add'>+	uint64_t csrid;</div><div class='add'>+</div><div class='add'>+	csrid = KVM_REG_LOONGARCH_CSR | KVM_REG_SIZE_U64 | 8 * id;</div><div class='add'>+	__vcpu_get_reg(vcpu, csrid, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void loongarch_set_csr(struct kvm_vcpu *vcpu, uint64_t id, uint64_t val)</div><div class='add'>+{</div><div class='add'>+	uint64_t csrid;</div><div class='add'>+</div><div class='add'>+	csrid = KVM_REG_LOONGARCH_CSR | KVM_REG_SIZE_U64 | 8 * id;</div><div class='add'>+	__vcpu_set_reg(vcpu, csrid, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void loongarch_vcpu_setup(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	int width;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	struct kvm_vm *vm = vcpu-&gt;vm;</div><div class='add'>+</div><div class='add'>+	switch (vm-&gt;mode) {</div><div class='add'>+	case VM_MODE_P36V47_16K:</div><div class='add'>+	case VM_MODE_P47V47_16K:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		TEST_FAIL("Unknown guest mode, mode: 0x%x", vm-&gt;mode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* kernel mode and page enable mode */</div><div class='add'>+	val = PLV_KERN | CSR_CRMD_PG;</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_CRMD, val);</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_PRMD, val);</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_EUEN, 1);</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_ECFG, 0);</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_TCFG, 0);</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_ASID, 1);</div><div class='add'>+</div><div class='add'>+	/* time count start from 0 */</div><div class='add'>+	val = 0;</div><div class='add'>+	loongarch_set_reg(vcpu, KVM_REG_LOONGARCH_COUNTER, val);</div><div class='add'>+</div><div class='add'>+	width = vm-&gt;page_shift - 3;</div><div class='add'>+</div><div class='add'>+	switch (vm-&gt;pgtable_levels) {</div><div class='add'>+	case 4:</div><div class='add'>+		/* pud page shift and width */</div><div class='add'>+		val = (vm-&gt;page_shift + width * 2) &lt;&lt; 20 | (width &lt;&lt; 25);</div><div class='add'>+		/* fall throuth */</div><div class='add'>+	case 3:</div><div class='add'>+		/* pmd page shift and width */</div><div class='add'>+		val |= (vm-&gt;page_shift + width) &lt;&lt; 10 | (width &lt;&lt; 15);</div><div class='add'>+		/* pte page shift and width */</div><div class='add'>+		val |= vm-&gt;page_shift | width &lt;&lt; 5;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		TEST_FAIL("Got %u page table levels, expected 3 or 4", vm-&gt;pgtable_levels);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_PWCTL0, val);</div><div class='add'>+</div><div class='add'>+	/* PGD page shift and width */</div><div class='add'>+	val = (vm-&gt;page_shift + width * (vm-&gt;pgtable_levels - 1)) | width &lt;&lt; 6;</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_PWCTL1, val);</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_PGDL, vm-&gt;pgd);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Refill exception runs on real mode</div><div class='add'>+	 * Entry address should be physical address</div><div class='add'>+	 */</div><div class='add'>+	val = addr_gva2gpa(vm, (unsigned long)handle_tlb_refill);</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_TLBRENTRY, val);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * General exception runs on page-enabled mode</div><div class='add'>+	 * Entry address should be virtual address</div><div class='add'>+	 */</div><div class='add'>+	val = (unsigned long)handle_exception;</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_EENTRY, val);</div><div class='add'>+</div><div class='add'>+	loongarch_get_csr(vcpu, LOONGARCH_CSR_TLBIDX, &amp;val);</div><div class='add'>+	val &amp;= ~CSR_TLBIDX_SIZEM;</div><div class='add'>+	val |= PS_DEFAULT_SIZE &lt;&lt; CSR_TLBIDX_SIZE;</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_TLBIDX, val);</div><div class='add'>+</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_STLBPGSIZE, PS_DEFAULT_SIZE);</div><div class='add'>+</div><div class='add'>+	/* LOONGARCH_CSR_KS1 is used for exception stack */</div><div class='add'>+	val = __vm_vaddr_alloc(vm, vm-&gt;page_size,</div><div class='add'>+			LOONGARCH_GUEST_STACK_VADDR_MIN, MEM_REGION_DATA);</div><div class='add'>+	TEST_ASSERT(val != 0,  "No memory for exception stack");</div><div class='add'>+	val = val + vm-&gt;page_size;</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_KS1, val);</div><div class='add'>+</div><div class='add'>+	loongarch_get_csr(vcpu, LOONGARCH_CSR_TLBREHI, &amp;val);</div><div class='add'>+	val &amp;= ~CSR_TLBREHI_PS;</div><div class='add'>+	val |= PS_DEFAULT_SIZE &lt;&lt; CSR_TLBREHI_PS_SHIFT;</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_TLBREHI, val);</div><div class='add'>+</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_CPUID, vcpu-&gt;id);</div><div class='add'>+	loongarch_set_csr(vcpu, LOONGARCH_CSR_TMID,  vcpu-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id)</div><div class='add'>+{</div><div class='add'>+	size_t stack_size;</div><div class='add'>+	uint64_t stack_vaddr;</div><div class='add'>+	struct kvm_regs regs;</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+</div><div class='add'>+	vcpu = __vm_vcpu_add(vm, vcpu_id);</div><div class='add'>+	stack_size = vm-&gt;page_size;</div><div class='add'>+	stack_vaddr = __vm_vaddr_alloc(vm, stack_size,</div><div class='add'>+			LOONGARCH_GUEST_STACK_VADDR_MIN, MEM_REGION_DATA);</div><div class='add'>+	TEST_ASSERT(stack_vaddr != 0,  "No memory for vm stack");</div><div class='add'>+</div><div class='add'>+	loongarch_vcpu_setup(vcpu);</div><div class='add'>+	/* Setup guest general purpose registers */</div><div class='add'>+	vcpu_regs_get(vcpu, &amp;regs);</div><div class='add'>+	regs.gpr[3] = stack_vaddr + stack_size;</div><div class='add'>+	vcpu_regs_set(vcpu, &amp;regs);</div><div class='add'>+</div><div class='add'>+	return vcpu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void vcpu_arch_set_entry_point(struct kvm_vcpu *vcpu, void *guest_code)</div><div class='add'>+{</div><div class='add'>+	struct kvm_regs regs;</div><div class='add'>+</div><div class='add'>+	/* Setup guest PC register */</div><div class='add'>+	vcpu_regs_get(vcpu, &amp;regs);</div><div class='add'>+	regs.pc = (uint64_t)guest_code;</div><div class='add'>+	vcpu_regs_set(vcpu, &amp;regs);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/loongarch/ucall.c b/tools/testing/selftests/kvm/lib/loongarch/ucall.c<br/>new file mode 100644<br/>index 000000000000..fc6cbb50573f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/loongarch/ucall.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/loongarch/ucall.c</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * ucall support. A ucall is a "hypercall to userspace".</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ucall_exit_mmio_addr holds per-VM values (global data is duplicated by each</div><div class='add'>+ * VM), it must not be accessed from host code.</div><div class='add'>+ */</div><div class='add'>+vm_vaddr_t *ucall_exit_mmio_addr;</div><div class='add'>+</div><div class='add'>+void ucall_arch_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa)</div><div class='add'>+{</div><div class='add'>+	vm_vaddr_t mmio_gva = vm_vaddr_unused_gap(vm, vm-&gt;page_size, KVM_UTIL_MIN_VADDR);</div><div class='add'>+</div><div class='add'>+	virt_map(vm, mmio_gva, mmio_gpa, 1);</div><div class='add'>+</div><div class='add'>+	vm-&gt;ucall_mmio_addr = mmio_gpa;</div><div class='add'>+</div><div class='add'>+	write_guest_global(vm, ucall_exit_mmio_addr, (vm_vaddr_t *)mmio_gva);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct kvm_run *run = vcpu-&gt;run;</div><div class='add'>+</div><div class='add'>+	if (run-&gt;exit_reason == KVM_EXIT_MMIO &amp;&amp;</div><div class='add'>+	    run-&gt;mmio.phys_addr == vcpu-&gt;vm-&gt;ucall_mmio_addr) {</div><div class='add'>+		TEST_ASSERT(run-&gt;mmio.is_write &amp;&amp; run-&gt;mmio.len == sizeof(uint64_t),</div><div class='add'>+			    "Unexpected ucall exit mmio address access");</div><div class='add'>+</div><div class='add'>+		return (void *)(*((uint64_t *)run-&gt;mmio.data));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/lru_gen_util.c b/tools/testing/selftests/kvm/lib/lru_gen_util.c<br/>new file mode 100644<br/>index 000000000000..46a14fd63d9e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/lru_gen_util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/lru_gen_util.c</a></div><div class='hunk'>@@ -0,0 +1,387 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025, Google LLC.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;time.h&gt;</div><div class='add'>+</div><div class='add'>+#include "lru_gen_util.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Tracks state while we parse memcg lru_gen stats. The file we're parsing is</div><div class='add'>+ * structured like this (some extra whitespace elided):</div><div class='add'>+ *</div><div class='add'>+ * memcg (id) (path)</div><div class='add'>+ * node (id)</div><div class='add'>+ * (gen_nr) (age_in_ms) (nr_anon_pages) (nr_file_pages)</div><div class='add'>+ */</div><div class='add'>+struct memcg_stats_parse_context {</div><div class='add'>+	bool consumed; /* Whether or not this line was consumed */</div><div class='add'>+	/* Next parse handler to invoke */</div><div class='add'>+	void (*next_handler)(struct memcg_stats *stats,</div><div class='add'>+			     struct memcg_stats_parse_context *ctx,</div><div class='add'>+			     char *line);</div><div class='add'>+	int current_node_idx; /* Current index in nodes array */</div><div class='add'>+	const char *name; /* The name of the memcg we're looking for */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void memcg_stats_handle_searching(struct memcg_stats *stats,</div><div class='add'>+					 struct memcg_stats_parse_context *ctx,</div><div class='add'>+					 char *line);</div><div class='add'>+static void memcg_stats_handle_in_memcg(struct memcg_stats *stats,</div><div class='add'>+					struct memcg_stats_parse_context *ctx,</div><div class='add'>+					char *line);</div><div class='add'>+static void memcg_stats_handle_in_node(struct memcg_stats *stats,</div><div class='add'>+				       struct memcg_stats_parse_context *ctx,</div><div class='add'>+				       char *line);</div><div class='add'>+</div><div class='add'>+struct split_iterator {</div><div class='add'>+	char *str;</div><div class='add'>+	char *save;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char *split_next(struct split_iterator *it)</div><div class='add'>+{</div><div class='add'>+	char *ret = strtok_r(it-&gt;str, " \t\n\r", &amp;it-&gt;save);</div><div class='add'>+</div><div class='add'>+	it-&gt;str = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void memcg_stats_handle_searching(struct memcg_stats *stats,</div><div class='add'>+					 struct memcg_stats_parse_context *ctx,</div><div class='add'>+					 char *line)</div><div class='add'>+{</div><div class='add'>+	struct split_iterator it = { .str = line };</div><div class='add'>+	char *prefix = split_next(&amp;it);</div><div class='add'>+	char *memcg_id = split_next(&amp;it);</div><div class='add'>+	char *memcg_name = split_next(&amp;it);</div><div class='add'>+	char *end;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;consumed = true;</div><div class='add'>+</div><div class='add'>+	if (!prefix || strcmp("memcg", prefix))</div><div class='add'>+		return; /* Not a memcg line (maybe empty), skip */</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(memcg_id &amp;&amp; memcg_name,</div><div class='add'>+		    "malformed memcg line; no memcg id or memcg_name");</div><div class='add'>+</div><div class='add'>+	if (strcmp(memcg_name + 1, ctx-&gt;name))</div><div class='add'>+		return; /* Wrong memcg, skip */</div><div class='add'>+</div><div class='add'>+	/* Found it! */</div><div class='add'>+</div><div class='add'>+	stats-&gt;memcg_id = strtoul(memcg_id, &amp;end, 10);</div><div class='add'>+	TEST_ASSERT(*end == '\0', "malformed memcg id '%s'", memcg_id);</div><div class='add'>+	if (!stats-&gt;memcg_id)</div><div class='add'>+		return; /* Removed memcg? */</div><div class='add'>+</div><div class='add'>+	ctx-&gt;next_handler = memcg_stats_handle_in_memcg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void memcg_stats_handle_in_memcg(struct memcg_stats *stats,</div><div class='add'>+					struct memcg_stats_parse_context *ctx,</div><div class='add'>+					char *line)</div><div class='add'>+{</div><div class='add'>+	struct split_iterator it = { .str = line };</div><div class='add'>+	char *prefix = split_next(&amp;it);</div><div class='add'>+	char *id = split_next(&amp;it);</div><div class='add'>+	long found_node_id;</div><div class='add'>+	char *end;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;consumed = true;</div><div class='add'>+	ctx-&gt;current_node_idx = -1;</div><div class='add'>+</div><div class='add'>+	if (!prefix)</div><div class='add'>+		return; /* Skip empty lines */</div><div class='add'>+</div><div class='add'>+	if (!strcmp("memcg", prefix)) {</div><div class='add'>+		/* Memcg done, found next one; stop. */</div><div class='add'>+		ctx-&gt;next_handler = NULL;</div><div class='add'>+		return;</div><div class='add'>+	} else if (strcmp("node", prefix))</div><div class='add'>+		TEST_ASSERT(false, "found malformed line after 'memcg ...',"</div><div class='add'>+				   "token: '%s'", prefix);</div><div class='add'>+</div><div class='add'>+	/* At this point we know we have a node line. Parse the ID. */</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(id, "malformed node line; no node id");</div><div class='add'>+</div><div class='add'>+	found_node_id = strtol(id, &amp;end, 10);</div><div class='add'>+	TEST_ASSERT(*end == '\0', "malformed node id '%s'", id);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;current_node_idx = stats-&gt;nr_nodes++;</div><div class='add'>+	TEST_ASSERT(ctx-&gt;current_node_idx &lt; MAX_NR_NODES,</div><div class='add'>+		    "memcg has stats for too many nodes, max is %d",</div><div class='add'>+		    MAX_NR_NODES);</div><div class='add'>+	stats-&gt;nodes[ctx-&gt;current_node_idx].node = found_node_id;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;next_handler = memcg_stats_handle_in_node;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void memcg_stats_handle_in_node(struct memcg_stats *stats,</div><div class='add'>+				       struct memcg_stats_parse_context *ctx,</div><div class='add'>+				       char *line)</div><div class='add'>+{</div><div class='add'>+	char *my_line = strdup(line);</div><div class='add'>+	struct split_iterator it = { .str = my_line };</div><div class='add'>+	char *gen, *age, *nr_anon, *nr_file;</div><div class='add'>+	struct node_stats *node_stats;</div><div class='add'>+	struct generation_stats *gen_stats;</div><div class='add'>+	char *end;</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(it.str, "failed to copy input line");</div><div class='add'>+</div><div class='add'>+	gen = split_next(&amp;it);</div><div class='add'>+</div><div class='add'>+	if (!gen)</div><div class='add'>+		goto out_consume; /* Skip empty lines */</div><div class='add'>+</div><div class='add'>+	if (!strcmp("memcg", gen) || !strcmp("node", gen)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Reached next memcg or node section. Don't consume, let the</div><div class='add'>+		 * other handler deal with this.</div><div class='add'>+		 */</div><div class='add'>+		ctx-&gt;next_handler = memcg_stats_handle_in_memcg;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	node_stats = &amp;stats-&gt;nodes[ctx-&gt;current_node_idx];</div><div class='add'>+	TEST_ASSERT(node_stats-&gt;nr_gens &lt; MAX_NR_GENS,</div><div class='add'>+		    "found too many generation lines; max is %d",</div><div class='add'>+		    MAX_NR_GENS);</div><div class='add'>+	gen_stats = &amp;node_stats-&gt;gens[node_stats-&gt;nr_gens++];</div><div class='add'>+</div><div class='add'>+	age = split_next(&amp;it);</div><div class='add'>+	nr_anon = split_next(&amp;it);</div><div class='add'>+	nr_file = split_next(&amp;it);</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(age &amp;&amp; nr_anon &amp;&amp; nr_file,</div><div class='add'>+		    "malformed generation line; not enough tokens");</div><div class='add'>+</div><div class='add'>+	gen_stats-&gt;gen = (int)strtol(gen, &amp;end, 10);</div><div class='add'>+	TEST_ASSERT(*end == '\0', "malformed generation number '%s'", gen);</div><div class='add'>+</div><div class='add'>+	gen_stats-&gt;age_ms = strtol(age, &amp;end, 10);</div><div class='add'>+	TEST_ASSERT(*end == '\0', "malformed generation age '%s'", age);</div><div class='add'>+</div><div class='add'>+	gen_stats-&gt;nr_anon = strtol(nr_anon, &amp;end, 10);</div><div class='add'>+	TEST_ASSERT(*end == '\0', "malformed anonymous page count '%s'",</div><div class='add'>+		    nr_anon);</div><div class='add'>+</div><div class='add'>+	gen_stats-&gt;nr_file = strtol(nr_file, &amp;end, 10);</div><div class='add'>+	TEST_ASSERT(*end == '\0', "malformed file page count '%s'", nr_file);</div><div class='add'>+</div><div class='add'>+out_consume:</div><div class='add'>+	ctx-&gt;consumed = true;</div><div class='add'>+out:</div><div class='add'>+	free(my_line);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_memcg_stats(const struct memcg_stats *stats, const char *name)</div><div class='add'>+{</div><div class='add'>+	int node, gen;</div><div class='add'>+</div><div class='add'>+	pr_debug("stats for memcg %s (id %lu):\n", name, stats-&gt;memcg_id);</div><div class='add'>+	for (node = 0; node &lt; stats-&gt;nr_nodes; ++node) {</div><div class='add'>+		pr_debug("\tnode %d\n", stats-&gt;nodes[node].node);</div><div class='add'>+		for (gen = 0; gen &lt; stats-&gt;nodes[node].nr_gens; ++gen) {</div><div class='add'>+			const struct generation_stats *gstats =</div><div class='add'>+				&amp;stats-&gt;nodes[node].gens[gen];</div><div class='add'>+</div><div class='add'>+			pr_debug("\t\tgen %d\tage_ms %ld"</div><div class='add'>+				 "\tnr_anon %ld\tnr_file %ld\n",</div><div class='add'>+				 gstats-&gt;gen, gstats-&gt;age_ms, gstats-&gt;nr_anon,</div><div class='add'>+				 gstats-&gt;nr_file);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Re-read lru_gen debugfs information for @memcg into @stats. */</div><div class='add'>+void lru_gen_read_memcg_stats(struct memcg_stats *stats, const char *memcg)</div><div class='add'>+{</div><div class='add'>+	FILE *f;</div><div class='add'>+	ssize_t read = 0;</div><div class='add'>+	char *line = NULL;</div><div class='add'>+	size_t bufsz;</div><div class='add'>+	struct memcg_stats_parse_context ctx = {</div><div class='add'>+		.next_handler = memcg_stats_handle_searching,</div><div class='add'>+		.name = memcg,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memset(stats, 0, sizeof(struct memcg_stats));</div><div class='add'>+</div><div class='add'>+	f = fopen(LRU_GEN_DEBUGFS, "r");</div><div class='add'>+	TEST_ASSERT(f, "fopen(%s) failed", LRU_GEN_DEBUGFS);</div><div class='add'>+</div><div class='add'>+	while (ctx.next_handler &amp;&amp; (read = getline(&amp;line, &amp;bufsz, f)) &gt; 0) {</div><div class='add'>+		ctx.consumed = false;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			ctx.next_handler(stats, &amp;ctx, line);</div><div class='add'>+			if (!ctx.next_handler)</div><div class='add'>+				break;</div><div class='add'>+		} while (!ctx.consumed);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (read &lt; 0 &amp;&amp; !feof(f))</div><div class='add'>+		TEST_ASSERT(false, "getline(%s) failed", LRU_GEN_DEBUGFS);</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(stats-&gt;memcg_id &gt; 0, "Couldn't find memcg: %s\n"</div><div class='add'>+		    "Did the memcg get created in the proper mount?",</div><div class='add'>+		    memcg);</div><div class='add'>+	if (line)</div><div class='add'>+		free(line);</div><div class='add'>+	TEST_ASSERT(!fclose(f), "fclose(%s) failed", LRU_GEN_DEBUGFS);</div><div class='add'>+</div><div class='add'>+	print_memcg_stats(stats, memcg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find all pages tracked by lru_gen for this memcg in generation @target_gen.</div><div class='add'>+ *</div><div class='add'>+ * If @target_gen is negative, look for all generations.</div><div class='add'>+ */</div><div class='add'>+long lru_gen_sum_memcg_stats_for_gen(int target_gen,</div><div class='add'>+				     const struct memcg_stats *stats)</div><div class='add'>+{</div><div class='add'>+	int node, gen;</div><div class='add'>+	long total_nr = 0;</div><div class='add'>+</div><div class='add'>+	for (node = 0; node &lt; stats-&gt;nr_nodes; ++node) {</div><div class='add'>+		const struct node_stats *node_stats = &amp;stats-&gt;nodes[node];</div><div class='add'>+</div><div class='add'>+		for (gen = 0; gen &lt; node_stats-&gt;nr_gens; ++gen) {</div><div class='add'>+			const struct generation_stats *gen_stats =</div><div class='add'>+				&amp;node_stats-&gt;gens[gen];</div><div class='add'>+</div><div class='add'>+			if (target_gen &gt;= 0 &amp;&amp; gen_stats-&gt;gen != target_gen)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			total_nr += gen_stats-&gt;nr_anon + gen_stats-&gt;nr_file;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return total_nr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Find all pages tracked by lru_gen for this memcg. */</div><div class='add'>+long lru_gen_sum_memcg_stats(const struct memcg_stats *stats)</div><div class='add'>+{</div><div class='add'>+	return lru_gen_sum_memcg_stats_for_gen(-1, stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If lru_gen aging should force page table scanning.</div><div class='add'>+ *</div><div class='add'>+ * If you want to set this to false, you will need to do eviction</div><div class='add'>+ * before doing extra aging passes.</div><div class='add'>+ */</div><div class='add'>+static const bool force_scan = true;</div><div class='add'>+</div><div class='add'>+static void run_aging_impl(unsigned long memcg_id, int node_id, int max_gen)</div><div class='add'>+{</div><div class='add'>+	FILE *f = fopen(LRU_GEN_DEBUGFS, "w");</div><div class='add'>+	char *command;</div><div class='add'>+	size_t sz;</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(f, "fopen(%s) failed", LRU_GEN_DEBUGFS);</div><div class='add'>+	sz = asprintf(&amp;command, "+ %lu %d %d 1 %d\n",</div><div class='add'>+		      memcg_id, node_id, max_gen, force_scan);</div><div class='add'>+	TEST_ASSERT(sz &gt; 0, "creating aging command failed");</div><div class='add'>+</div><div class='add'>+	pr_debug("Running aging command: %s", command);</div><div class='add'>+	if (fwrite(command, sizeof(char), sz, f) &lt; sz) {</div><div class='add'>+		TEST_ASSERT(false, "writing aging command %s to %s failed",</div><div class='add'>+			    command, LRU_GEN_DEBUGFS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT(!fclose(f), "fclose(%s) failed", LRU_GEN_DEBUGFS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lru_gen_do_aging(struct memcg_stats *stats, const char *memcg)</div><div class='add'>+{</div><div class='add'>+	int node, gen;</div><div class='add'>+</div><div class='add'>+	pr_debug("lru_gen: invoking aging...\n");</div><div class='add'>+</div><div class='add'>+	/* Must read memcg stats to construct the proper aging command. */</div><div class='add'>+	lru_gen_read_memcg_stats(stats, memcg);</div><div class='add'>+</div><div class='add'>+	for (node = 0; node &lt; stats-&gt;nr_nodes; ++node) {</div><div class='add'>+		int max_gen = 0;</div><div class='add'>+</div><div class='add'>+		for (gen = 0; gen &lt; stats-&gt;nodes[node].nr_gens; ++gen) {</div><div class='add'>+			int this_gen = stats-&gt;nodes[node].gens[gen].gen;</div><div class='add'>+</div><div class='add'>+			max_gen = max_gen &gt; this_gen ? max_gen : this_gen;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		run_aging_impl(stats-&gt;memcg_id, stats-&gt;nodes[node].node,</div><div class='add'>+			       max_gen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Re-read so callers get updated information */</div><div class='add'>+	lru_gen_read_memcg_stats(stats, memcg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find which generation contains at least @pages pages, assuming that</div><div class='add'>+ * such a generation exists.</div><div class='add'>+ */</div><div class='add'>+int lru_gen_find_generation(const struct memcg_stats *stats,</div><div class='add'>+			    unsigned long pages)</div><div class='add'>+{</div><div class='add'>+	int node, gen, gen_idx, min_gen = INT_MAX, max_gen = -1;</div><div class='add'>+</div><div class='add'>+	for (node = 0; node &lt; stats-&gt;nr_nodes; ++node)</div><div class='add'>+		for (gen_idx = 0; gen_idx &lt; stats-&gt;nodes[node].nr_gens;</div><div class='add'>+		     ++gen_idx) {</div><div class='add'>+			gen = stats-&gt;nodes[node].gens[gen_idx].gen;</div><div class='add'>+			max_gen = gen &gt; max_gen ? gen : max_gen;</div><div class='add'>+			min_gen = gen &lt; min_gen ? gen : min_gen;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	for (gen = min_gen; gen &lt;= max_gen; ++gen)</div><div class='add'>+		/* See if this generation has enough pages. */</div><div class='add'>+		if (lru_gen_sum_memcg_stats_for_gen(gen, stats) &gt; pages)</div><div class='add'>+			return gen;</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool lru_gen_usable(void)</div><div class='add'>+{</div><div class='add'>+	long required_features = LRU_GEN_ENABLED | LRU_GEN_MM_WALK;</div><div class='add'>+	int lru_gen_fd, lru_gen_debug_fd;</div><div class='add'>+	char mglru_feature_str[8] = {};</div><div class='add'>+	long mglru_features;</div><div class='add'>+</div><div class='add'>+	lru_gen_fd = open(LRU_GEN_ENABLED_PATH, O_RDONLY);</div><div class='add'>+	if (lru_gen_fd &lt; 0) {</div><div class='add'>+		puts("lru_gen: Could not open " LRU_GEN_ENABLED_PATH);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (read(lru_gen_fd, &amp;mglru_feature_str, 7) &lt; 7) {</div><div class='add'>+		puts("lru_gen: Could not read from " LRU_GEN_ENABLED_PATH);</div><div class='add'>+		close(lru_gen_fd);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	close(lru_gen_fd);</div><div class='add'>+</div><div class='add'>+	mglru_features = strtol(mglru_feature_str, NULL, 16);</div><div class='add'>+	if ((mglru_features &amp; required_features) != required_features) {</div><div class='add'>+		printf("lru_gen: missing features, got: 0x%lx, expected: 0x%lx\n",</div><div class='add'>+		       mglru_features, required_features);</div><div class='add'>+		printf("lru_gen: Try 'echo 0x%lx &gt; /sys/kernel/mm/lru_gen/enabled'\n",</div><div class='add'>+		       required_features);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lru_gen_debug_fd = open(LRU_GEN_DEBUGFS, O_RDWR);</div><div class='add'>+	__TEST_REQUIRE(lru_gen_debug_fd &gt;= 0,</div><div class='add'>+		       "lru_gen: Could not open " LRU_GEN_DEBUGFS ", "</div><div class='add'>+		       "but lru_gen is enabled, so cannot use page_idle.");</div><div class='add'>+	close(lru_gen_debug_fd);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/memstress.c b/tools/testing/selftests/kvm/lib/memstress.c<br/>index 313277486a1d..557c0a0a5658 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/memstress.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/memstress.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/memstress.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/memstress.c</a></div><div class='hunk'>@@ -265,7 +265,7 @@ static void *vcpu_thread_main(void *data)</div><div class='ctx'> 	int vcpu_idx = vcpu-&gt;vcpu_idx;</div><div class='ctx'> </div><div class='ctx'> 	if (memstress_args.pin_vcpus)</div><div class='del'>-		kvm_pin_this_task_to_pcpu(memstress_args.vcpu_to_pcpu[vcpu_idx]);</div><div class='add'>+		pin_self_to_cpu(memstress_args.vcpu_to_pcpu[vcpu_idx]);</div><div class='ctx'> </div><div class='ctx'> 	WRITE_ONCE(vcpu-&gt;running, true);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/riscv/handlers.S b/tools/testing/selftests/kvm/lib/riscv/handlers.S<br/>index aa0abd3f35bb..b787b982e922 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/riscv/handlers.S?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/riscv/handlers.S</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/riscv/handlers.S?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/riscv/handlers.S</a></div><div class='hunk'>@@ -10,85 +10,88 @@</div><div class='ctx'> #include &lt;asm/csr.h&gt;</div><div class='ctx'> </div><div class='ctx'> .macro save_context</div><div class='del'>-	addi  sp, sp, (-8*34)</div><div class='del'>-	sd    x1, 0(sp)</div><div class='del'>-	sd    x2, 8(sp)</div><div class='del'>-	sd    x3, 16(sp)</div><div class='del'>-	sd    x4, 24(sp)</div><div class='del'>-	sd    x5, 32(sp)</div><div class='del'>-	sd    x6, 40(sp)</div><div class='del'>-	sd    x7, 48(sp)</div><div class='del'>-	sd    x8, 56(sp)</div><div class='del'>-	sd    x9, 64(sp)</div><div class='del'>-	sd    x10, 72(sp)</div><div class='del'>-	sd    x11, 80(sp)</div><div class='del'>-	sd    x12, 88(sp)</div><div class='del'>-	sd    x13, 96(sp)</div><div class='del'>-	sd    x14, 104(sp)</div><div class='del'>-	sd    x15, 112(sp)</div><div class='del'>-	sd    x16, 120(sp)</div><div class='del'>-	sd    x17, 128(sp)</div><div class='del'>-	sd    x18, 136(sp)</div><div class='del'>-	sd    x19, 144(sp)</div><div class='del'>-	sd    x20, 152(sp)</div><div class='del'>-	sd    x21, 160(sp)</div><div class='del'>-	sd    x22, 168(sp)</div><div class='del'>-	sd    x23, 176(sp)</div><div class='del'>-	sd    x24, 184(sp)</div><div class='del'>-	sd    x25, 192(sp)</div><div class='del'>-	sd    x26, 200(sp)</div><div class='del'>-	sd    x27, 208(sp)</div><div class='del'>-	sd    x28, 216(sp)</div><div class='del'>-	sd    x29, 224(sp)</div><div class='del'>-	sd    x30, 232(sp)</div><div class='del'>-	sd    x31, 240(sp)</div><div class='add'>+	addi  sp, sp, (-8*36)</div><div class='add'>+	sd    x1, 8(sp)</div><div class='add'>+	sd    x2, 16(sp)</div><div class='add'>+	sd    x3, 24(sp)</div><div class='add'>+	sd    x4, 32(sp)</div><div class='add'>+	sd    x5, 40(sp)</div><div class='add'>+	sd    x6, 48(sp)</div><div class='add'>+	sd    x7, 56(sp)</div><div class='add'>+	sd    x8, 64(sp)</div><div class='add'>+	sd    x9, 72(sp)</div><div class='add'>+	sd    x10, 80(sp)</div><div class='add'>+	sd    x11, 88(sp)</div><div class='add'>+	sd    x12, 96(sp)</div><div class='add'>+	sd    x13, 104(sp)</div><div class='add'>+	sd    x14, 112(sp)</div><div class='add'>+	sd    x15, 120(sp)</div><div class='add'>+	sd    x16, 128(sp)</div><div class='add'>+	sd    x17, 136(sp)</div><div class='add'>+	sd    x18, 144(sp)</div><div class='add'>+	sd    x19, 152(sp)</div><div class='add'>+	sd    x20, 160(sp)</div><div class='add'>+	sd    x21, 168(sp)</div><div class='add'>+	sd    x22, 176(sp)</div><div class='add'>+	sd    x23, 184(sp)</div><div class='add'>+	sd    x24, 192(sp)</div><div class='add'>+	sd    x25, 200(sp)</div><div class='add'>+	sd    x26, 208(sp)</div><div class='add'>+	sd    x27, 216(sp)</div><div class='add'>+	sd    x28, 224(sp)</div><div class='add'>+	sd    x29, 232(sp)</div><div class='add'>+	sd    x30, 240(sp)</div><div class='add'>+	sd    x31, 248(sp)</div><div class='ctx'> 	csrr  s0, CSR_SEPC</div><div class='ctx'> 	csrr  s1, CSR_SSTATUS</div><div class='del'>-	csrr  s2, CSR_SCAUSE</div><div class='del'>-	sd    s0, 248(sp)</div><div class='add'>+	csrr  s2, CSR_STVAL</div><div class='add'>+	csrr  s3, CSR_SCAUSE</div><div class='add'>+	sd    s0, 0(sp)</div><div class='ctx'> 	sd    s1, 256(sp)</div><div class='ctx'> 	sd    s2, 264(sp)</div><div class='add'>+	sd    s3, 272(sp)</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='ctx'> .macro restore_context</div><div class='add'>+	ld    s3, 272(sp)</div><div class='ctx'> 	ld    s2, 264(sp)</div><div class='ctx'> 	ld    s1, 256(sp)</div><div class='del'>-	ld    s0, 248(sp)</div><div class='del'>-	csrw  CSR_SCAUSE, s2</div><div class='add'>+	ld    s0, 0(sp)</div><div class='add'>+	csrw  CSR_SCAUSE, s3</div><div class='ctx'> 	csrw  CSR_SSTATUS, s1</div><div class='ctx'> 	csrw  CSR_SEPC, s0</div><div class='del'>-	ld    x31, 240(sp)</div><div class='del'>-	ld    x30, 232(sp)</div><div class='del'>-	ld    x29, 224(sp)</div><div class='del'>-	ld    x28, 216(sp)</div><div class='del'>-	ld    x27, 208(sp)</div><div class='del'>-	ld    x26, 200(sp)</div><div class='del'>-	ld    x25, 192(sp)</div><div class='del'>-	ld    x24, 184(sp)</div><div class='del'>-	ld    x23, 176(sp)</div><div class='del'>-	ld    x22, 168(sp)</div><div class='del'>-	ld    x21, 160(sp)</div><div class='del'>-	ld    x20, 152(sp)</div><div class='del'>-	ld    x19, 144(sp)</div><div class='del'>-	ld    x18, 136(sp)</div><div class='del'>-	ld    x17, 128(sp)</div><div class='del'>-	ld    x16, 120(sp)</div><div class='del'>-	ld    x15, 112(sp)</div><div class='del'>-	ld    x14, 104(sp)</div><div class='del'>-	ld    x13, 96(sp)</div><div class='del'>-	ld    x12, 88(sp)</div><div class='del'>-	ld    x11, 80(sp)</div><div class='del'>-	ld    x10, 72(sp)</div><div class='del'>-	ld    x9, 64(sp)</div><div class='del'>-	ld    x8, 56(sp)</div><div class='del'>-	ld    x7, 48(sp)</div><div class='del'>-	ld    x6, 40(sp)</div><div class='del'>-	ld    x5, 32(sp)</div><div class='del'>-	ld    x4, 24(sp)</div><div class='del'>-	ld    x3, 16(sp)</div><div class='del'>-	ld    x2, 8(sp)</div><div class='del'>-	ld    x1, 0(sp)</div><div class='del'>-	addi  sp, sp, (8*34)</div><div class='add'>+	ld    x31, 248(sp)</div><div class='add'>+	ld    x30, 240(sp)</div><div class='add'>+	ld    x29, 232(sp)</div><div class='add'>+	ld    x28, 224(sp)</div><div class='add'>+	ld    x27, 216(sp)</div><div class='add'>+	ld    x26, 208(sp)</div><div class='add'>+	ld    x25, 200(sp)</div><div class='add'>+	ld    x24, 192(sp)</div><div class='add'>+	ld    x23, 184(sp)</div><div class='add'>+	ld    x22, 176(sp)</div><div class='add'>+	ld    x21, 168(sp)</div><div class='add'>+	ld    x20, 160(sp)</div><div class='add'>+	ld    x19, 152(sp)</div><div class='add'>+	ld    x18, 144(sp)</div><div class='add'>+	ld    x17, 136(sp)</div><div class='add'>+	ld    x16, 128(sp)</div><div class='add'>+	ld    x15, 120(sp)</div><div class='add'>+	ld    x14, 112(sp)</div><div class='add'>+	ld    x13, 104(sp)</div><div class='add'>+	ld    x12, 96(sp)</div><div class='add'>+	ld    x11, 88(sp)</div><div class='add'>+	ld    x10, 80(sp)</div><div class='add'>+	ld    x9, 72(sp)</div><div class='add'>+	ld    x8, 64(sp)</div><div class='add'>+	ld    x7, 56(sp)</div><div class='add'>+	ld    x6, 48(sp)</div><div class='add'>+	ld    x5, 40(sp)</div><div class='add'>+	ld    x4, 32(sp)</div><div class='add'>+	ld    x3, 24(sp)</div><div class='add'>+	ld    x2, 16(sp)</div><div class='add'>+	ld    x1, 8(sp)</div><div class='add'>+	addi  sp, sp, (8*36)</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='ctx'> .balign 4</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/riscv/processor.c b/tools/testing/selftests/kvm/lib/riscv/processor.c<br/>index dd663bcf0cc0..2eac7d4b59e9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/riscv/processor.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/riscv/processor.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/riscv/processor.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/riscv/processor.c</a></div><div class='hunk'>@@ -402,7 +402,7 @@ struct handlers {</div><div class='ctx'> 	exception_handler_fn exception_handlers[NR_VECTORS][NR_EXCEPTIONS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void route_exception(struct ex_regs *regs)</div><div class='add'>+void route_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct handlers *handlers = (struct handlers *)exception_handlers;</div><div class='ctx'> 	int vector = 0, ec;</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/s390/processor.c b/tools/testing/selftests/kvm/lib/s390/processor.c<br/>index 20cfe970e3e3..8ceeb17c819a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/s390/processor.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/s390/processor.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/s390/processor.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/s390/processor.c</a></div><div class='hunk'>@@ -221,3 +221,8 @@ void vcpu_arch_dump(FILE *stream, struct kvm_vcpu *vcpu, uint8_t indent)</div><div class='ctx'> void assert_on_unhandled_exception(struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+bool kvm_arch_has_default_irqchip(void)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/sparsebit.c b/tools/testing/selftests/kvm/lib/sparsebit.c<br/>index cfed9d26cc71..a99188f87a38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/sparsebit.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/sparsebit.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/sparsebit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/sparsebit.c</a></div><div class='hunk'>@@ -116,7 +116,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *   + A node with all mask bits set only occurs when the last bit</div><div class='ctx'>  *     described by the previous node is not equal to this nodes</div><div class='del'>- *     starting index - 1.  All such occurences of this condition are</div><div class='add'>+ *     starting index - 1.  All such occurrences of this condition are</div><div class='ctx'>  *     avoided by moving the setting of the nodes mask bits into</div><div class='ctx'>  *     the previous nodes num_after setting.</div><div class='ctx'>  *</div><div class='hunk'>@@ -592,7 +592,7 @@ static struct node *node_split(struct sparsebit *s, sparsebit_idx_t idx)</div><div class='ctx'>  *</div><div class='ctx'>  *   + A node with all mask bits set only occurs when the last bit</div><div class='ctx'>  *     described by the previous node is not equal to this nodes</div><div class='del'>- *     starting index - 1.  All such occurences of this condition are</div><div class='add'>+ *     starting index - 1.  All such occurrences of this condition are</div><div class='ctx'>  *     avoided by moving the setting of the nodes mask bits into</div><div class='ctx'>  *     the previous nodes num_after setting.</div><div class='ctx'>  */</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/test_util.c b/tools/testing/selftests/kvm/lib/test_util.c<br/>index 8ed0b74ae837..8a1848586a85 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/test_util.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/test_util.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/test_util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/test_util.c</a></div><div class='hunk'>@@ -18,6 +18,13 @@</div><div class='ctx'> </div><div class='ctx'> #include "test_util.h"</div><div class='ctx'> </div><div class='add'>+sigjmp_buf expect_sigbus_jmpbuf;</div><div class='add'>+</div><div class='add'>+void __attribute__((used)) expect_sigbus_handler(int signum)</div><div class='add'>+{</div><div class='add'>+	siglongjmp(expect_sigbus_jmpbuf, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Random number generator that is usable from guest code. This is the</div><div class='ctx'>  * Park-Miller LCG using standard constants.</div><div class='hunk'>@@ -132,37 +139,57 @@ void print_skip(const char *fmt, ...)</div><div class='ctx'> 	puts(", skipping test");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool thp_configured(void)</div><div class='add'>+static bool test_sysfs_path(const char *path)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct stat statbuf;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = stat("/sys/kernel/mm/transparent_hugepage", &amp;statbuf);</div><div class='add'>+	ret = stat(path, &amp;statbuf);</div><div class='ctx'> 	TEST_ASSERT(ret == 0 || (ret == -1 &amp;&amp; errno == ENOENT),</div><div class='del'>-		    "Error in stating /sys/kernel/mm/transparent_hugepage");</div><div class='add'>+		    "Error in stat()ing '%s'", path);</div><div class='ctx'> </div><div class='ctx'> 	return ret == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-size_t get_trans_hugepagesz(void)</div><div class='add'>+bool thp_configured(void)</div><div class='add'>+{</div><div class='add'>+	return test_sysfs_path("/sys/kernel/mm/transparent_hugepage");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t get_sysfs_val(const char *path)</div><div class='ctx'> {</div><div class='ctx'> 	size_t size;</div><div class='ctx'> 	FILE *f;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	TEST_ASSERT(thp_configured(), "THP is not configured in host kernel");</div><div class='del'>-</div><div class='del'>-	f = fopen("/sys/kernel/mm/transparent_hugepage/hpage_pmd_size", "r");</div><div class='del'>-	TEST_ASSERT(f != NULL, "Error in opening transparent_hugepage/hpage_pmd_size");</div><div class='add'>+	f = fopen(path, "r");</div><div class='add'>+	TEST_ASSERT(f, "Error opening '%s'", path);</div><div class='ctx'> </div><div class='ctx'> 	ret = fscanf(f, "%ld", &amp;size);</div><div class='add'>+	TEST_ASSERT(ret &gt; 0, "Error reading '%s'", path);</div><div class='add'>+</div><div class='add'>+	/* Re-scan the input stream to verify the entire file was read. */</div><div class='ctx'> 	ret = fscanf(f, "%ld", &amp;size);</div><div class='del'>-	TEST_ASSERT(ret &lt; 1, "Error reading transparent_hugepage/hpage_pmd_size");</div><div class='del'>-	fclose(f);</div><div class='add'>+	TEST_ASSERT(ret &lt; 1, "Error reading '%s'", path);</div><div class='ctx'> </div><div class='add'>+	fclose(f);</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+size_t get_trans_hugepagesz(void)</div><div class='add'>+{</div><div class='add'>+	TEST_ASSERT(thp_configured(), "THP is not configured in host kernel");</div><div class='add'>+</div><div class='add'>+	return get_sysfs_val("/sys/kernel/mm/transparent_hugepage/hpage_pmd_size");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool is_numa_balancing_enabled(void)</div><div class='add'>+{</div><div class='add'>+	if (!test_sysfs_path("/proc/sys/kernel/numa_balancing"))</div><div class='add'>+		return false;</div><div class='add'>+	return get_sysfs_val("/proc/sys/kernel/numa_balancing") == 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> size_t get_def_hugetlb_pagesz(void)</div><div class='ctx'> {</div><div class='ctx'> 	char buf[64];</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/userfaultfd_util.c b/tools/testing/selftests/kvm/lib/userfaultfd_util.c<br/>index 7c9de8414462..5bde176cedd5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/userfaultfd_util.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/userfaultfd_util.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/userfaultfd_util.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/userfaultfd_util.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ struct uffd_desc *uffd_setup_demand_paging(int uffd_mode, useconds_t delay,</div><div class='ctx'> </div><div class='ctx'> 	PER_PAGE_DEBUG("Userfaultfd %s mode, faults resolved with %s\n",</div><div class='ctx'> 		       is_minor ? "MINOR" : "MISSING",</div><div class='del'>-		       is_minor ? "UFFDIO_CONINUE" : "UFFDIO_COPY");</div><div class='add'>+		       is_minor ? "UFFDIO_CONTINUE" : "UFFDIO_COPY");</div><div class='ctx'> </div><div class='ctx'> 	uffd_desc = malloc(sizeof(struct uffd_desc));</div><div class='ctx'> 	TEST_ASSERT(uffd_desc, "Failed to malloc uffd descriptor");</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/x86/memstress.c b/tools/testing/selftests/kvm/lib/x86/memstress.c<br/>index 7f5d62a65c68..0b1f288ad556 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/x86/memstress.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/x86/memstress.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/x86/memstress.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/x86/memstress.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ void memstress_setup_ept(struct vmx_pages *vmx, struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t start, end;</div><div class='ctx'> </div><div class='del'>-	prepare_eptp(vmx, vm, 0);</div><div class='add'>+	prepare_eptp(vmx, vm);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Identity map the first 4G and the test region with 1G pages so that</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/x86/pmu.c b/tools/testing/selftests/kvm/lib/x86/pmu.c<br/>index f31f0427c17c..34cb57d1d671 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/x86/pmu.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/x86/pmu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/x86/pmu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/x86/pmu.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='ctx'> #include "pmu.h"</div><div class='ctx'> </div><div class='ctx'> const uint64_t intel_pmu_arch_events[] = {</div><div class='hunk'>@@ -19,6 +20,11 @@ const uint64_t intel_pmu_arch_events[] = {</div><div class='ctx'> 	INTEL_ARCH_BRANCHES_RETIRED,</div><div class='ctx'> 	INTEL_ARCH_BRANCHES_MISPREDICTED,</div><div class='ctx'> 	INTEL_ARCH_TOPDOWN_SLOTS,</div><div class='add'>+	INTEL_ARCH_TOPDOWN_BE_BOUND,</div><div class='add'>+	INTEL_ARCH_TOPDOWN_BAD_SPEC,</div><div class='add'>+	INTEL_ARCH_TOPDOWN_FE_BOUND,</div><div class='add'>+	INTEL_ARCH_TOPDOWN_RETIRING,</div><div class='add'>+	INTEL_ARCH_LBR_INSERTS,</div><div class='ctx'> };</div><div class='ctx'> kvm_static_assert(ARRAY_SIZE(intel_pmu_arch_events) == NR_INTEL_ARCH_EVENTS);</div><div class='ctx'> </div><div class='hunk'>@@ -29,3 +35,46 @@ const uint64_t amd_pmu_zen_events[] = {</div><div class='ctx'> 	AMD_ZEN_BRANCHES_MISPREDICTED,</div><div class='ctx'> };</div><div class='ctx'> kvm_static_assert(ARRAY_SIZE(amd_pmu_zen_events) == NR_AMD_ZEN_EVENTS);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For Intel Atom CPUs, the PMU events "Instruction Retired" or</div><div class='add'>+ * "Branch Instruction Retired" may be overcounted for some certain</div><div class='add'>+ * instructions, like FAR CALL/JMP, RETF, IRET, VMENTRY/VMEXIT/VMPTRLD</div><div class='add'>+ * and complex SGX/SMX/CSTATE instructions/flows.</div><div class='add'>+ *</div><div class='add'>+ * The detailed information can be found in the errata (section SRF7):</div><div class='add'>+ * https://edc.intel.com/content/www/us/en/design/products-and-solutions/processors-and-chipsets/sierra-forest/xeon-6700-series-processor-with-e-cores-specification-update/errata-details/</div><div class='add'>+ *</div><div class='add'>+ * For the Atom platforms before Sierra Forest (including Sierra Forest),</div><div class='add'>+ * Both 2 events "Instruction Retired" and "Branch Instruction Retired" would</div><div class='add'>+ * be overcounted on these certain instructions, but for Clearwater Forest</div><div class='add'>+ * only "Instruction Retired" event is overcounted on these instructions.</div><div class='add'>+ */</div><div class='add'>+static uint64_t get_pmu_errata(void)</div><div class='add'>+{</div><div class='add'>+	if (!this_cpu_is_intel())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (this_cpu_family() != 0x6)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (this_cpu_model()) {</div><div class='add'>+	case 0xDD: /* Clearwater Forest */</div><div class='add'>+		return BIT_ULL(INSTRUCTIONS_RETIRED_OVERCOUNT);</div><div class='add'>+	case 0xAF: /* Sierra Forest */</div><div class='add'>+	case 0x4D: /* Avaton, Rangely */</div><div class='add'>+	case 0x5F: /* Denverton */</div><div class='add'>+	case 0x86: /* Jacobsville */</div><div class='add'>+		return BIT_ULL(INSTRUCTIONS_RETIRED_OVERCOUNT) |</div><div class='add'>+		       BIT_ULL(BRANCHES_RETIRED_OVERCOUNT);</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+uint64_t pmu_errata_mask;</div><div class='add'>+</div><div class='add'>+void kvm_init_pmu_errata(void)</div><div class='add'>+{</div><div class='add'>+	pmu_errata_mask = get_pmu_errata();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testing/selftests/kvm/lib/x86/processor.c<br/>index bd5a802fa7a5..36104d27f3d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/x86/processor.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/x86/processor.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/x86/processor.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/x86/processor.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include "linux/bitmap.h"</div><div class='ctx'> #include "test_util.h"</div><div class='ctx'> #include "kvm_util.h"</div><div class='add'>+#include "pmu.h"</div><div class='ctx'> #include "processor.h"</div><div class='ctx'> #include "sev.h"</div><div class='ctx'> </div><div class='hunk'>@@ -23,6 +24,39 @@ bool host_cpu_is_intel;</div><div class='ctx'> bool is_forced_emulation_enabled;</div><div class='ctx'> uint64_t guest_tsc_khz;</div><div class='ctx'> </div><div class='add'>+const char *ex_str(int vector)</div><div class='add'>+{</div><div class='add'>+	switch (vector) {</div><div class='add'>+#define VEC_STR(v) case v##_VECTOR: return "#" #v</div><div class='add'>+	case DE_VECTOR: return "no exception";</div><div class='add'>+	case KVM_MAGIC_DE_VECTOR: return "#DE";</div><div class='add'>+	VEC_STR(DB);</div><div class='add'>+	VEC_STR(NMI);</div><div class='add'>+	VEC_STR(BP);</div><div class='add'>+	VEC_STR(OF);</div><div class='add'>+	VEC_STR(BR);</div><div class='add'>+	VEC_STR(UD);</div><div class='add'>+	VEC_STR(NM);</div><div class='add'>+	VEC_STR(DF);</div><div class='add'>+	VEC_STR(TS);</div><div class='add'>+	VEC_STR(NP);</div><div class='add'>+	VEC_STR(SS);</div><div class='add'>+	VEC_STR(GP);</div><div class='add'>+	VEC_STR(PF);</div><div class='add'>+	VEC_STR(MF);</div><div class='add'>+	VEC_STR(AC);</div><div class='add'>+	VEC_STR(MC);</div><div class='add'>+	VEC_STR(XM);</div><div class='add'>+	VEC_STR(VE);</div><div class='add'>+	VEC_STR(CP);</div><div class='add'>+	VEC_STR(HV);</div><div class='add'>+	VEC_STR(VC);</div><div class='add'>+	VEC_STR(SX);</div><div class='add'>+	default: return "#??";</div><div class='add'>+#undef VEC_STR</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void regs_dump(FILE *stream, struct kvm_regs *regs, uint8_t indent)</div><div class='ctx'> {</div><div class='ctx'> 	fprintf(stream, "%*srax: 0x%.16llx rbx: 0x%.16llx "</div><div class='hunk'>@@ -124,10 +158,10 @@ bool kvm_is_tdp_enabled(void)</div><div class='ctx'> </div><div class='ctx'> void virt_arch_pgd_alloc(struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='del'>-	TEST_ASSERT(vm-&gt;mode == VM_MODE_PXXV48_4K, "Attempt to use "</div><div class='del'>-		"unknown or unsupported guest mode, mode: 0x%x", vm-&gt;mode);</div><div class='add'>+	TEST_ASSERT(vm-&gt;mode == VM_MODE_PXXVYY_4K,</div><div class='add'>+		    "Unknown or unsupported guest mode: 0x%x", vm-&gt;mode);</div><div class='ctx'> </div><div class='del'>-	/* If needed, create page map l4 table. */</div><div class='add'>+	/* If needed, create the top-level page table. */</div><div class='ctx'> 	if (!vm-&gt;pgd_created) {</div><div class='ctx'> 		vm-&gt;pgd = vm_alloc_page_table(vm);</div><div class='ctx'> 		vm-&gt;pgd_created = true;</div><div class='hunk'>@@ -184,11 +218,11 @@ static uint64_t *virt_create_upper_pte(struct kvm_vm *vm,</div><div class='ctx'> void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level)</div><div class='ctx'> {</div><div class='ctx'> 	const uint64_t pg_size = PG_LEVEL_SIZE(level);</div><div class='del'>-	uint64_t *pml4e, *pdpe, *pde;</div><div class='del'>-	uint64_t *pte;</div><div class='add'>+	uint64_t *pte = &amp;vm-&gt;pgd;</div><div class='add'>+	int current_level;</div><div class='ctx'> </div><div class='del'>-	TEST_ASSERT(vm-&gt;mode == VM_MODE_PXXV48_4K,</div><div class='del'>-		    "Unknown or unsupported guest mode, mode: 0x%x", vm-&gt;mode);</div><div class='add'>+	TEST_ASSERT(vm-&gt;mode == VM_MODE_PXXVYY_4K,</div><div class='add'>+		    "Unknown or unsupported guest mode: 0x%x", vm-&gt;mode);</div><div class='ctx'> </div><div class='ctx'> 	TEST_ASSERT((vaddr % pg_size) == 0,</div><div class='ctx'> 		    "Virtual address not aligned,\n"</div><div class='hunk'>@@ -209,20 +243,17 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level)</div><div class='ctx'> 	 * Allocate upper level page tables, if not already present.  Return</div><div class='ctx'> 	 * early if a hugepage was created.</div><div class='ctx'> 	 */</div><div class='del'>-	pml4e = virt_create_upper_pte(vm, &amp;vm-&gt;pgd, vaddr, paddr, PG_LEVEL_512G, level);</div><div class='del'>-	if (*pml4e &amp; PTE_LARGE_MASK)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pdpe = virt_create_upper_pte(vm, pml4e, vaddr, paddr, PG_LEVEL_1G, level);</div><div class='del'>-	if (*pdpe &amp; PTE_LARGE_MASK)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pde = virt_create_upper_pte(vm, pdpe, vaddr, paddr, PG_LEVEL_2M, level);</div><div class='del'>-	if (*pde &amp; PTE_LARGE_MASK)</div><div class='del'>-		return;</div><div class='add'>+	for (current_level = vm-&gt;pgtable_levels;</div><div class='add'>+	     current_level &gt; PG_LEVEL_4K;</div><div class='add'>+	     current_level--) {</div><div class='add'>+		pte = virt_create_upper_pte(vm, pte, vaddr, paddr,</div><div class='add'>+					    current_level, level);</div><div class='add'>+		if (*pte &amp; PTE_LARGE_MASK)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in page table entry. */</div><div class='del'>-	pte = virt_get_pte(vm, pde, vaddr, PG_LEVEL_4K);</div><div class='add'>+	pte = virt_get_pte(vm, pte, vaddr, PG_LEVEL_4K);</div><div class='ctx'> 	TEST_ASSERT(!(*pte &amp; PTE_PRESENT_MASK),</div><div class='ctx'> 		    "PTE already present for 4k page at vaddr: 0x%lx", vaddr);</div><div class='ctx'> 	*pte = PTE_PRESENT_MASK | PTE_WRITABLE_MASK | (paddr &amp; PHYSICAL_PAGE_MASK);</div><div class='hunk'>@@ -255,6 +286,8 @@ void virt_map_level(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_pages; i++) {</div><div class='ctx'> 		__virt_pg_map(vm, vaddr, paddr, level);</div><div class='add'>+		sparsebit_set_num(vm-&gt;vpages_mapped, vaddr &gt;&gt; vm-&gt;page_shift,</div><div class='add'>+				  nr_bytes / PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		vaddr += pg_size;</div><div class='ctx'> 		paddr += pg_size;</div><div class='hunk'>@@ -276,40 +309,38 @@ static bool vm_is_target_pte(uint64_t *pte, int *level, int current_level)</div><div class='ctx'> uint64_t *__vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr,</div><div class='ctx'> 				    int *level)</div><div class='ctx'> {</div><div class='del'>-	uint64_t *pml4e, *pdpe, *pde;</div><div class='add'>+	int va_width = 12 + (vm-&gt;pgtable_levels) * 9;</div><div class='add'>+	uint64_t *pte = &amp;vm-&gt;pgd;</div><div class='add'>+	int current_level;</div><div class='ctx'> </div><div class='ctx'> 	TEST_ASSERT(!vm-&gt;arch.is_pt_protected,</div><div class='ctx'> 		    "Walking page tables of protected guests is impossible");</div><div class='ctx'> </div><div class='del'>-	TEST_ASSERT(*level &gt;= PG_LEVEL_NONE &amp;&amp; *level &lt; PG_LEVEL_NUM,</div><div class='add'>+	TEST_ASSERT(*level &gt;= PG_LEVEL_NONE &amp;&amp; *level &lt;= vm-&gt;pgtable_levels,</div><div class='ctx'> 		    "Invalid PG_LEVEL_* '%d'", *level);</div><div class='ctx'> </div><div class='del'>-	TEST_ASSERT(vm-&gt;mode == VM_MODE_PXXV48_4K, "Attempt to use "</div><div class='del'>-		"unknown or unsupported guest mode, mode: 0x%x", vm-&gt;mode);</div><div class='add'>+	TEST_ASSERT(vm-&gt;mode == VM_MODE_PXXVYY_4K,</div><div class='add'>+		    "Unknown or unsupported guest mode: 0x%x", vm-&gt;mode);</div><div class='ctx'> 	TEST_ASSERT(sparsebit_is_set(vm-&gt;vpages_valid,</div><div class='ctx'> 		(vaddr &gt;&gt; vm-&gt;page_shift)),</div><div class='ctx'> 		"Invalid virtual address, vaddr: 0x%lx",</div><div class='ctx'> 		vaddr);</div><div class='ctx'> 	/*</div><div class='del'>-	 * Based on the mode check above there are 48 bits in the vaddr, so</div><div class='del'>-	 * shift 16 to sign extend the last bit (bit-47),</div><div class='add'>+	 * Check that the vaddr is a sign-extended va_width value.</div><div class='ctx'> 	 */</div><div class='del'>-	TEST_ASSERT(vaddr == (((int64_t)vaddr &lt;&lt; 16) &gt;&gt; 16),</div><div class='del'>-		"Canonical check failed.  The virtual address is invalid.");</div><div class='del'>-</div><div class='del'>-	pml4e = virt_get_pte(vm, &amp;vm-&gt;pgd, vaddr, PG_LEVEL_512G);</div><div class='del'>-	if (vm_is_target_pte(pml4e, level, PG_LEVEL_512G))</div><div class='del'>-		return pml4e;</div><div class='del'>-</div><div class='del'>-	pdpe = virt_get_pte(vm, pml4e, vaddr, PG_LEVEL_1G);</div><div class='del'>-	if (vm_is_target_pte(pdpe, level, PG_LEVEL_1G))</div><div class='del'>-		return pdpe;</div><div class='del'>-</div><div class='del'>-	pde = virt_get_pte(vm, pdpe, vaddr, PG_LEVEL_2M);</div><div class='del'>-	if (vm_is_target_pte(pde, level, PG_LEVEL_2M))</div><div class='del'>-		return pde;</div><div class='add'>+	TEST_ASSERT(vaddr ==</div><div class='add'>+		    (((int64_t)vaddr &lt;&lt; (64 - va_width) &gt;&gt; (64 - va_width))),</div><div class='add'>+		    "Canonical check failed.  The virtual address is invalid.");</div><div class='add'>+</div><div class='add'>+	for (current_level = vm-&gt;pgtable_levels;</div><div class='add'>+	     current_level &gt; PG_LEVEL_4K;</div><div class='add'>+	     current_level--) {</div><div class='add'>+		pte = virt_get_pte(vm, pte, vaddr, current_level);</div><div class='add'>+		if (vm_is_target_pte(pte, level, current_level))</div><div class='add'>+			return pte;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return virt_get_pte(vm, pde, vaddr, PG_LEVEL_4K);</div><div class='add'>+	return virt_get_pte(vm, pte, vaddr, PG_LEVEL_4K);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> uint64_t *vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr)</div><div class='hunk'>@@ -492,7 +523,8 @@ static void vcpu_init_sregs(struct kvm_vm *vm, struct kvm_vcpu *vcpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_sregs sregs;</div><div class='ctx'> </div><div class='del'>-	TEST_ASSERT_EQ(vm-&gt;mode, VM_MODE_PXXV48_4K);</div><div class='add'>+	TEST_ASSERT(vm-&gt;mode == VM_MODE_PXXVYY_4K,</div><div class='add'>+		    "Unknown or unsupported guest mode: 0x%x", vm-&gt;mode);</div><div class='ctx'> </div><div class='ctx'> 	/* Set mode specific system register values. */</div><div class='ctx'> 	vcpu_sregs_get(vcpu, &amp;sregs);</div><div class='hunk'>@@ -506,6 +538,8 @@ static void vcpu_init_sregs(struct kvm_vm *vm, struct kvm_vcpu *vcpu)</div><div class='ctx'> 	sregs.cr4 |= X86_CR4_PAE | X86_CR4_OSFXSR;</div><div class='ctx'> 	if (kvm_cpu_has(X86_FEATURE_XSAVE))</div><div class='ctx'> 		sregs.cr4 |= X86_CR4_OSXSAVE;</div><div class='add'>+	if (vm-&gt;pgtable_levels == 5)</div><div class='add'>+		sregs.cr4 |= X86_CR4_LA57;</div><div class='ctx'> 	sregs.efer |= (EFER_LME | EFER_LMA | EFER_NX);</div><div class='ctx'> </div><div class='ctx'> 	kvm_seg_set_unusable(&amp;sregs.ldt);</div><div class='hunk'>@@ -557,7 +591,7 @@ static bool kvm_fixup_exception(struct ex_regs *regs)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	if (regs-&gt;vector == DE_VECTOR)</div><div class='del'>-		return false;</div><div class='add'>+		regs-&gt;vector = KVM_MAGIC_DE_VECTOR;</div><div class='ctx'> </div><div class='ctx'> 	regs-&gt;rip = regs-&gt;r11;</div><div class='ctx'> 	regs-&gt;r9 = regs-&gt;vector;</div><div class='hunk'>@@ -625,7 +659,7 @@ void assert_on_unhandled_exception(struct kvm_vcpu *vcpu)</div><div class='ctx'> 		REPORT_GUEST_ASSERT(uc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void kvm_arch_vm_post_create(struct kvm_vm *vm)</div><div class='add'>+void kvm_arch_vm_post_create(struct kvm_vm *vm, unsigned int nr_vcpus)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> </div><div class='hunk'>@@ -638,8 +672,9 @@ void kvm_arch_vm_post_create(struct kvm_vm *vm)</div><div class='ctx'> 	sync_global_to_guest(vm, host_cpu_is_intel);</div><div class='ctx'> 	sync_global_to_guest(vm, host_cpu_is_amd);</div><div class='ctx'> 	sync_global_to_guest(vm, is_forced_emulation_enabled);</div><div class='add'>+	sync_global_to_guest(vm, pmu_errata_mask);</div><div class='ctx'> </div><div class='del'>-	if (vm-&gt;type == KVM_X86_SEV_VM || vm-&gt;type == KVM_X86_SEV_ES_VM) {</div><div class='add'>+	if (is_sev_vm(vm)) {</div><div class='ctx'> 		struct kvm_sev_init init = { 0 };</div><div class='ctx'> </div><div class='ctx'> 		vm_sev_ioctl(vm, KVM_SEV_INIT2, &amp;init);</div><div class='hunk'>@@ -1156,7 +1191,7 @@ void kvm_get_cpu_address_width(unsigned int *pa_bits, unsigned int *va_bits)</div><div class='ctx'> </div><div class='ctx'> void kvm_init_vm_address_properties(struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='del'>-	if (vm-&gt;type == KVM_X86_SEV_VM || vm-&gt;type == KVM_X86_SEV_ES_VM) {</div><div class='add'>+	if (is_sev_vm(vm)) {</div><div class='ctx'> 		vm-&gt;arch.sev_fd = open_sev_dev_path_or_exit();</div><div class='ctx'> 		vm-&gt;arch.c_bit = BIT_ULL(this_cpu_property(X86_PROPERTY_SEV_C_BIT));</div><div class='ctx'> 		vm-&gt;gpa_tag_mask = vm-&gt;arch.c_bit;</div><div class='hunk'>@@ -1264,21 +1299,13 @@ done:</div><div class='ctx'> 	return min(max_gfn, ht_gfn - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Returns true if kvm_intel was loaded with unrestricted_guest=1. */</div><div class='del'>-bool vm_is_unrestricted_guest(struct kvm_vm *vm)</div><div class='del'>-{</div><div class='del'>-	/* Ensure that a KVM vendor-specific module is loaded. */</div><div class='del'>-	if (vm == NULL)</div><div class='del'>-		close(open_kvm_dev_path_or_exit());</div><div class='del'>-</div><div class='del'>-	return get_kvm_intel_param_bool("unrestricted_guest");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void kvm_selftest_arch_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	host_cpu_is_intel = this_cpu_is_intel();</div><div class='ctx'> 	host_cpu_is_amd = this_cpu_is_amd();</div><div class='ctx'> 	is_forced_emulation_enabled = kvm_is_forced_emulation_enabled();</div><div class='add'>+</div><div class='add'>+	kvm_init_pmu_errata();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool sys_clocksource_is_based_on_tsc(void)</div><div class='hunk'>@@ -1291,3 +1318,8 @@ bool sys_clocksource_is_based_on_tsc(void)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+bool kvm_arch_has_default_irqchip(void)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/x86/sev.c b/tools/testing/selftests/kvm/lib/x86/sev.c<br/>index e9535ee20b7f..c3a9838f4806 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/x86/sev.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/x86/sev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/x86/sev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/x86/sev.c</a></div><div class='hunk'>@@ -14,7 +14,8 @@</div><div class='ctx'>  * and find the first range, but that's correct because the condition</div><div class='ctx'>  * expression would cause us to quit the loop.</div><div class='ctx'>  */</div><div class='del'>-static void encrypt_region(struct kvm_vm *vm, struct userspace_mem_region *region)</div><div class='add'>+static void encrypt_region(struct kvm_vm *vm, struct userspace_mem_region *region,</div><div class='add'>+			   uint8_t page_type, bool private)</div><div class='ctx'> {</div><div class='ctx'> 	const struct sparsebit *protected_phy_pages = region-&gt;protected_phy_pages;</div><div class='ctx'> 	const vm_paddr_t gpa_base = region-&gt;region.guest_phys_addr;</div><div class='hunk'>@@ -24,25 +25,35 @@ static void encrypt_region(struct kvm_vm *vm, struct userspace_mem_region *regio</div><div class='ctx'> 	if (!sparsebit_any_set(protected_phy_pages))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	sev_register_encrypted_memory(vm, region);</div><div class='add'>+	if (!is_sev_snp_vm(vm))</div><div class='add'>+		sev_register_encrypted_memory(vm, region);</div><div class='ctx'> </div><div class='ctx'> 	sparsebit_for_each_set_range(protected_phy_pages, i, j) {</div><div class='ctx'> 		const uint64_t size = (j - i + 1) * vm-&gt;page_size;</div><div class='ctx'> 		const uint64_t offset = (i - lowest_page_in_region) * vm-&gt;page_size;</div><div class='ctx'> </div><div class='del'>-		sev_launch_update_data(vm, gpa_base + offset, size);</div><div class='add'>+		if (private)</div><div class='add'>+			vm_mem_set_private(vm, gpa_base + offset, size);</div><div class='add'>+</div><div class='add'>+		if (is_sev_snp_vm(vm))</div><div class='add'>+			snp_launch_update_data(vm, gpa_base + offset,</div><div class='add'>+					       (uint64_t)addr_gpa2hva(vm, gpa_base + offset),</div><div class='add'>+					       size, page_type);</div><div class='add'>+		else</div><div class='add'>+			sev_launch_update_data(vm, gpa_base + offset, size);</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void sev_vm_init(struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='ctx'> 	if (vm-&gt;type == KVM_X86_DEFAULT_VM) {</div><div class='del'>-		assert(vm-&gt;arch.sev_fd == -1);</div><div class='add'>+		TEST_ASSERT_EQ(vm-&gt;arch.sev_fd, -1);</div><div class='ctx'> 		vm-&gt;arch.sev_fd = open_sev_dev_path_or_exit();</div><div class='ctx'> 		vm_sev_ioctl(vm, KVM_SEV_INIT, NULL);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct kvm_sev_init init = { 0 };</div><div class='del'>-		assert(vm-&gt;type == KVM_X86_SEV_VM);</div><div class='add'>+		TEST_ASSERT_EQ(vm-&gt;type, KVM_X86_SEV_VM);</div><div class='ctx'> 		vm_sev_ioctl(vm, KVM_SEV_INIT2, &amp;init);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -50,16 +61,24 @@ void sev_vm_init(struct kvm_vm *vm)</div><div class='ctx'> void sev_es_vm_init(struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='ctx'> 	if (vm-&gt;type == KVM_X86_DEFAULT_VM) {</div><div class='del'>-		assert(vm-&gt;arch.sev_fd == -1);</div><div class='add'>+		TEST_ASSERT_EQ(vm-&gt;arch.sev_fd, -1);</div><div class='ctx'> 		vm-&gt;arch.sev_fd = open_sev_dev_path_or_exit();</div><div class='ctx'> 		vm_sev_ioctl(vm, KVM_SEV_ES_INIT, NULL);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct kvm_sev_init init = { 0 };</div><div class='del'>-		assert(vm-&gt;type == KVM_X86_SEV_ES_VM);</div><div class='add'>+		TEST_ASSERT_EQ(vm-&gt;type, KVM_X86_SEV_ES_VM);</div><div class='ctx'> 		vm_sev_ioctl(vm, KVM_SEV_INIT2, &amp;init);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void snp_vm_init(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	struct kvm_sev_init init = { 0 };</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT_EQ(vm-&gt;type, KVM_X86_SNP_VM);</div><div class='add'>+	vm_sev_ioctl(vm, KVM_SEV_INIT2, &amp;init);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void sev_vm_launch(struct kvm_vm *vm, uint32_t policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_sev_launch_start launch_start = {</div><div class='hunk'>@@ -76,7 +95,7 @@ void sev_vm_launch(struct kvm_vm *vm, uint32_t policy)</div><div class='ctx'> 	TEST_ASSERT_EQ(status.state, SEV_GUEST_STATE_LAUNCH_UPDATE);</div><div class='ctx'> </div><div class='ctx'> 	hash_for_each(vm-&gt;regions.slot_hash, ctr, region, slot_node)</div><div class='del'>-		encrypt_region(vm, region);</div><div class='add'>+		encrypt_region(vm, region, KVM_SEV_PAGE_TYPE_INVALID, false);</div><div class='ctx'> </div><div class='ctx'> 	if (policy &amp; SEV_POLICY_ES)</div><div class='ctx'> 		vm_sev_ioctl(vm, KVM_SEV_LAUNCH_UPDATE_VMSA, NULL);</div><div class='hunk'>@@ -112,6 +131,33 @@ void sev_vm_launch_finish(struct kvm_vm *vm)</div><div class='ctx'> 	TEST_ASSERT_EQ(status.state, SEV_GUEST_STATE_RUNNING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void snp_vm_launch_start(struct kvm_vm *vm, uint64_t policy)</div><div class='add'>+{</div><div class='add'>+	struct kvm_sev_snp_launch_start launch_start = {</div><div class='add'>+		.policy = policy,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	vm_sev_ioctl(vm, KVM_SEV_SNP_LAUNCH_START, &amp;launch_start);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snp_vm_launch_update(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	struct userspace_mem_region *region;</div><div class='add'>+	int ctr;</div><div class='add'>+</div><div class='add'>+	hash_for_each(vm-&gt;regions.slot_hash, ctr, region, slot_node)</div><div class='add'>+		encrypt_region(vm, region, KVM_SEV_SNP_PAGE_TYPE_NORMAL, true);</div><div class='add'>+</div><div class='add'>+	vm-&gt;arch.is_pt_protected = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snp_vm_launch_finish(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	struct kvm_sev_snp_launch_finish launch_finish = { 0 };</div><div class='add'>+</div><div class='add'>+	vm_sev_ioctl(vm, KVM_SEV_SNP_LAUNCH_FINISH, &amp;launch_finish);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct kvm_vm *vm_sev_create_with_one_vcpu(uint32_t type, void *guest_code,</div><div class='ctx'> 					   struct kvm_vcpu **cpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -128,8 +174,20 @@ struct kvm_vm *vm_sev_create_with_one_vcpu(uint32_t type, void *guest_code,</div><div class='ctx'> 	return vm;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void vm_sev_launch(struct kvm_vm *vm, uint32_t policy, uint8_t *measurement)</div><div class='add'>+void vm_sev_launch(struct kvm_vm *vm, uint64_t policy, uint8_t *measurement)</div><div class='ctx'> {</div><div class='add'>+	if (is_sev_snp_vm(vm)) {</div><div class='add'>+		vm_enable_cap(vm, KVM_CAP_EXIT_HYPERCALL, BIT(KVM_HC_MAP_GPA_RANGE));</div><div class='add'>+</div><div class='add'>+		snp_vm_launch_start(vm, policy);</div><div class='add'>+</div><div class='add'>+		snp_vm_launch_update(vm);</div><div class='add'>+</div><div class='add'>+		snp_vm_launch_finish(vm);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	sev_vm_launch(vm, policy);</div><div class='ctx'> </div><div class='ctx'> 	if (!measurement)</div><div class='head'>diff --git a/tools/testing/selftests/kvm/lib/x86/vmx.c b/tools/testing/selftests/kvm/lib/x86/vmx.c<br/>index d4d1208dd023..29b082a58daa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/x86/vmx.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/lib/x86/vmx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/lib/x86/vmx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/lib/x86/vmx.c</a></div><div class='hunk'>@@ -401,11 +401,11 @@ void __nested_pg_map(struct vmx_pages *vmx, struct kvm_vm *vm,</div><div class='ctx'> 	struct eptPageTableEntry *pt = vmx-&gt;eptp_hva, *pte;</div><div class='ctx'> 	uint16_t index;</div><div class='ctx'> </div><div class='del'>-	TEST_ASSERT(vm-&gt;mode == VM_MODE_PXXV48_4K, "Attempt to use "</div><div class='del'>-		    "unknown or unsupported guest mode, mode: 0x%x", vm-&gt;mode);</div><div class='add'>+	TEST_ASSERT(vm-&gt;mode == VM_MODE_PXXVYY_4K,</div><div class='add'>+		    "Unknown or unsupported guest mode: 0x%x", vm-&gt;mode);</div><div class='ctx'> </div><div class='ctx'> 	TEST_ASSERT((nested_paddr &gt;&gt; 48) == 0,</div><div class='del'>-		    "Nested physical address 0x%lx requires 5-level paging",</div><div class='add'>+		    "Nested physical address 0x%lx is &gt; 48-bits and requires 5-level EPT",</div><div class='ctx'> 		    nested_paddr);</div><div class='ctx'> 	TEST_ASSERT((nested_paddr % page_size) == 0,</div><div class='ctx'> 		    "Nested physical address not on page boundary,\n"</div><div class='hunk'>@@ -534,8 +534,7 @@ bool kvm_cpu_has_ept(void)</div><div class='ctx'> 	return ctrl &amp; SECONDARY_EXEC_ENABLE_EPT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void prepare_eptp(struct vmx_pages *vmx, struct kvm_vm *vm,</div><div class='del'>-		  uint32_t eptp_memslot)</div><div class='add'>+void prepare_eptp(struct vmx_pages *vmx, struct kvm_vm *vm)</div><div class='ctx'> {</div><div class='ctx'> 	TEST_ASSERT(kvm_cpu_has_ept(), "KVM doesn't support nested EPT");</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/loongarch/arch_timer.c b/tools/testing/selftests/kvm/loongarch/arch_timer.c<br/>new file mode 100644<br/>index 000000000000..355ecac30954<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/loongarch/arch_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/loongarch/arch_timer.c</a></div><div class='hunk'>@@ -0,0 +1,200 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * The test validates periodic/one-shot constant timer IRQ using</div><div class='add'>+ * CSR.TCFG and CSR.TVAL registers.</div><div class='add'>+ */</div><div class='add'>+#include "arch_timer.h"</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='add'>+#include "timer_test.h"</div><div class='add'>+#include "ucall_common.h"</div><div class='add'>+</div><div class='add'>+static void do_idle(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int intid;</div><div class='add'>+	unsigned long estat;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__("idle 0" : : : "memory");</div><div class='add'>+</div><div class='add'>+	estat = csr_read(LOONGARCH_CSR_ESTAT);</div><div class='add'>+	intid = !!(estat &amp; BIT(INT_TI));</div><div class='add'>+</div><div class='add'>+	/* Make sure pending timer IRQ arrived */</div><div class='add'>+	GUEST_ASSERT_EQ(intid, 1);</div><div class='add'>+	csr_write(CSR_TINTCLR_TI, LOONGARCH_CSR_TINTCLR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_irq_handler(struct ex_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int intid;</div><div class='add'>+	uint32_t cpu = guest_get_vcpuid();</div><div class='add'>+	uint64_t xcnt, val, cfg, xcnt_diff_us;</div><div class='add'>+	struct test_vcpu_shared_data *shared_data = &amp;vcpu_shared_data[cpu];</div><div class='add'>+</div><div class='add'>+	intid = !!(regs-&gt;estat &amp; BIT(INT_TI));</div><div class='add'>+</div><div class='add'>+	/* Make sure we are dealing with the correct timer IRQ */</div><div class='add'>+	GUEST_ASSERT_EQ(intid, 1);</div><div class='add'>+</div><div class='add'>+	cfg = timer_get_cfg();</div><div class='add'>+	if (cfg &amp; CSR_TCFG_PERIOD) {</div><div class='add'>+		WRITE_ONCE(shared_data-&gt;nr_iter, shared_data-&gt;nr_iter - 1);</div><div class='add'>+		if (shared_data-&gt;nr_iter == 0)</div><div class='add'>+			disable_timer();</div><div class='add'>+		csr_write(CSR_TINTCLR_TI, LOONGARCH_CSR_TINTCLR);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On real machine, value of LOONGARCH_CSR_TVAL is BIT_ULL(48) - 1</div><div class='add'>+	 * On virtual machine, its value counts down from BIT_ULL(48) - 1</div><div class='add'>+	 */</div><div class='add'>+	val = timer_get_val();</div><div class='add'>+	xcnt = timer_get_cycles();</div><div class='add'>+	xcnt_diff_us = cycles_to_usec(xcnt - shared_data-&gt;xcnt);</div><div class='add'>+</div><div class='add'>+	/* Basic 'timer condition met' check */</div><div class='add'>+	__GUEST_ASSERT(val &gt; cfg,</div><div class='add'>+			"val = 0x%lx, cfg = 0x%lx, xcnt_diff_us = 0x%lx",</div><div class='add'>+			val, cfg, xcnt_diff_us);</div><div class='add'>+</div><div class='add'>+	csr_write(CSR_TINTCLR_TI, LOONGARCH_CSR_TINTCLR);</div><div class='add'>+	WRITE_ONCE(shared_data-&gt;nr_iter, shared_data-&gt;nr_iter + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_test_period_timer(uint32_t cpu)</div><div class='add'>+{</div><div class='add'>+	uint32_t irq_iter, config_iter;</div><div class='add'>+	uint64_t us;</div><div class='add'>+	struct test_vcpu_shared_data *shared_data = &amp;vcpu_shared_data[cpu];</div><div class='add'>+</div><div class='add'>+	shared_data-&gt;nr_iter = test_args.nr_iter;</div><div class='add'>+	shared_data-&gt;xcnt = timer_get_cycles();</div><div class='add'>+	us = msecs_to_usecs(test_args.timer_period_ms) + test_args.timer_err_margin_us;</div><div class='add'>+	timer_set_next_cmp_ms(test_args.timer_period_ms, true);</div><div class='add'>+</div><div class='add'>+	for (config_iter = 0; config_iter &lt; test_args.nr_iter; config_iter++) {</div><div class='add'>+		/* Setup a timeout for the interrupt to arrive */</div><div class='add'>+		udelay(us);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_iter = READ_ONCE(shared_data-&gt;nr_iter);</div><div class='add'>+	__GUEST_ASSERT(irq_iter == 0,</div><div class='add'>+			"irq_iter = 0x%x.\n"</div><div class='add'>+			"  Guest period timer interrupt was not triggered within the specified\n"</div><div class='add'>+			"  interval, try to increase the error margin by [-e] option.\n",</div><div class='add'>+			irq_iter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_test_oneshot_timer(uint32_t cpu)</div><div class='add'>+{</div><div class='add'>+	uint32_t irq_iter, config_iter;</div><div class='add'>+	uint64_t us;</div><div class='add'>+	struct test_vcpu_shared_data *shared_data = &amp;vcpu_shared_data[cpu];</div><div class='add'>+</div><div class='add'>+	shared_data-&gt;nr_iter = 0;</div><div class='add'>+	shared_data-&gt;guest_stage = 0;</div><div class='add'>+	us = msecs_to_usecs(test_args.timer_period_ms) + test_args.timer_err_margin_us;</div><div class='add'>+	for (config_iter = 0; config_iter &lt; test_args.nr_iter; config_iter++) {</div><div class='add'>+		shared_data-&gt;xcnt = timer_get_cycles();</div><div class='add'>+</div><div class='add'>+		/* Setup the next interrupt */</div><div class='add'>+		timer_set_next_cmp_ms(test_args.timer_period_ms, false);</div><div class='add'>+		/* Setup a timeout for the interrupt to arrive */</div><div class='add'>+		udelay(us);</div><div class='add'>+</div><div class='add'>+		irq_iter = READ_ONCE(shared_data-&gt;nr_iter);</div><div class='add'>+		__GUEST_ASSERT(config_iter + 1 == irq_iter,</div><div class='add'>+				"config_iter + 1 = 0x%x, irq_iter = 0x%x.\n"</div><div class='add'>+				"  Guest timer interrupt was not triggered within the specified\n"</div><div class='add'>+				"  interval, try to increase the error margin by [-e] option.\n",</div><div class='add'>+				config_iter + 1, irq_iter);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_test_emulate_timer(uint32_t cpu)</div><div class='add'>+{</div><div class='add'>+	uint32_t config_iter;</div><div class='add'>+	uint64_t xcnt_diff_us, us;</div><div class='add'>+	struct test_vcpu_shared_data *shared_data = &amp;vcpu_shared_data[cpu];</div><div class='add'>+</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	shared_data-&gt;nr_iter = 0;</div><div class='add'>+	us = msecs_to_usecs(test_args.timer_period_ms);</div><div class='add'>+	for (config_iter = 0; config_iter &lt; test_args.nr_iter; config_iter++) {</div><div class='add'>+		shared_data-&gt;xcnt = timer_get_cycles();</div><div class='add'>+</div><div class='add'>+		/* Setup the next interrupt */</div><div class='add'>+		timer_set_next_cmp_ms(test_args.timer_period_ms, false);</div><div class='add'>+		do_idle();</div><div class='add'>+</div><div class='add'>+		xcnt_diff_us = cycles_to_usec(timer_get_cycles() - shared_data-&gt;xcnt);</div><div class='add'>+		__GUEST_ASSERT(xcnt_diff_us &gt;= us,</div><div class='add'>+				"xcnt_diff_us = 0x%lx, us = 0x%lx.\n",</div><div class='add'>+				xcnt_diff_us, us);</div><div class='add'>+	}</div><div class='add'>+	local_irq_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_time_count_test(uint32_t cpu)</div><div class='add'>+{</div><div class='add'>+	uint32_t config_iter;</div><div class='add'>+	unsigned long start, end, prev, us;</div><div class='add'>+</div><div class='add'>+	/* Assuming that test case starts to run in 1 second */</div><div class='add'>+	start = timer_get_cycles();</div><div class='add'>+	us = msec_to_cycles(1000);</div><div class='add'>+	__GUEST_ASSERT(start &lt;= us,</div><div class='add'>+			"start = 0x%lx, us = 0x%lx.\n",</div><div class='add'>+			start, us);</div><div class='add'>+</div><div class='add'>+	us = msec_to_cycles(test_args.timer_period_ms);</div><div class='add'>+	for (config_iter = 0; config_iter &lt; test_args.nr_iter; config_iter++) {</div><div class='add'>+		start = timer_get_cycles();</div><div class='add'>+		end = start + us;</div><div class='add'>+		/* test time count growing up always */</div><div class='add'>+		while (start &lt; end) {</div><div class='add'>+			prev = start;</div><div class='add'>+			start = timer_get_cycles();</div><div class='add'>+			__GUEST_ASSERT(prev &lt;= start,</div><div class='add'>+					"prev = 0x%lx, start = 0x%lx.\n",</div><div class='add'>+					prev, start);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_code(void)</div><div class='add'>+{</div><div class='add'>+	uint32_t cpu = guest_get_vcpuid();</div><div class='add'>+</div><div class='add'>+	/* must run at first */</div><div class='add'>+	guest_time_count_test(cpu);</div><div class='add'>+</div><div class='add'>+	timer_irq_enable();</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	guest_test_period_timer(cpu);</div><div class='add'>+	guest_test_oneshot_timer(cpu);</div><div class='add'>+	guest_test_emulate_timer(cpu);</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct kvm_vm *test_vm_create(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	int nr_vcpus = test_args.nr_vcpus;</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_vcpus(nr_vcpus, guest_code, vcpus);</div><div class='add'>+	vm_init_descriptor_tables(vm);</div><div class='add'>+	vm_install_exception_handler(vm, EXCCODE_INT, guest_irq_handler);</div><div class='add'>+</div><div class='add'>+	/* Make all the test's cmdline args visible to the guest */</div><div class='add'>+	sync_global_to_guest(vm, test_args);</div><div class='add'>+</div><div class='add'>+	return vm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void test_vm_cleanup(struct kvm_vm *vm)</div><div class='add'>+{</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/memslot_modification_stress_test.c b/tools/testing/selftests/kvm/memslot_modification_stress_test.c<br/>index c81a84990eab..3cdfa3b19b85 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/memslot_modification_stress_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/memslot_modification_stress_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/memslot_modification_stress_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/memslot_modification_stress_test.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include "processor.h"</div><div class='ctx'> #include "test_util.h"</div><div class='ctx'> #include "guest_modes.h"</div><div class='add'>+#include "ucall_common.h"</div><div class='ctx'> </div><div class='ctx'> #define DUMMY_MEMSLOT_INDEX 7</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/memslot_perf_test.c b/tools/testing/selftests/kvm/memslot_perf_test.c<br/>index e3711beff7f3..5087d082c4b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/memslot_perf_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/memslot_perf_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/memslot_perf_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/memslot_perf_test.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;test_util.h&gt;</div><div class='ctx'> #include &lt;kvm_util.h&gt;</div><div class='ctx'> #include &lt;processor.h&gt;</div><div class='add'>+#include &lt;ucall_common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MEM_EXTRA_SIZE		SZ_64K</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/mmu_stress_test.c b/tools/testing/selftests/kvm/mmu_stress_test.c<br/>index d9c76b4c0d88..51c070556f3e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/mmu_stress_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/mmu_stress_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/mmu_stress_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/mmu_stress_test.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include "ucall_common.h"</div><div class='ctx'> </div><div class='ctx'> static bool mprotect_ro_done;</div><div class='add'>+static bool all_vcpus_hit_ro_fault;</div><div class='ctx'> </div><div class='ctx'> static void guest_code(uint64_t start_gpa, uint64_t end_gpa, uint64_t stride)</div><div class='ctx'> {</div><div class='hunk'>@@ -36,9 +37,9 @@ static void guest_code(uint64_t start_gpa, uint64_t end_gpa, uint64_t stride)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Write to the region while mprotect(PROT_READ) is underway.  Keep</div><div class='del'>-	 * looping until the memory is guaranteed to be read-only, otherwise</div><div class='del'>-	 * vCPUs may complete their writes and advance to the next stage</div><div class='del'>-	 * prematurely.</div><div class='add'>+	 * looping until the memory is guaranteed to be read-only and a fault</div><div class='add'>+	 * has occurred, otherwise vCPUs may complete their writes and advance</div><div class='add'>+	 * to the next stage prematurely.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * For architectures that support skipping the faulting instruction,</div><div class='ctx'> 	 * generate the store via inline assembly to ensure the exact length</div><div class='hunk'>@@ -56,7 +57,7 @@ static void guest_code(uint64_t start_gpa, uint64_t end_gpa, uint64_t stride)</div><div class='ctx'> #else</div><div class='ctx'> 			vcpu_arch_put_guest(*((volatile uint64_t *)gpa), gpa);</div><div class='ctx'> #endif</div><div class='del'>-	} while (!READ_ONCE(mprotect_ro_done));</div><div class='add'>+	} while (!READ_ONCE(mprotect_ro_done) || !READ_ONCE(all_vcpus_hit_ro_fault));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only architectures that write the entire range can explicitly sync,</div><div class='hunk'>@@ -81,6 +82,7 @@ struct vcpu_info {</div><div class='ctx'> </div><div class='ctx'> static int nr_vcpus;</div><div class='ctx'> static atomic_t rendezvous;</div><div class='add'>+static atomic_t nr_ro_faults;</div><div class='ctx'> </div><div class='ctx'> static void rendezvous_with_boss(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -148,12 +150,16 @@ static void *vcpu_worker(void *data)</div><div class='ctx'> 	 * be stuck on the faulting instruction for other architectures.  Go to</div><div class='ctx'> 	 * stage 3 without a rendezvous</div><div class='ctx'> 	 */</div><div class='del'>-	do {</div><div class='del'>-		r = _vcpu_run(vcpu);</div><div class='del'>-	} while (!r);</div><div class='add'>+	r = _vcpu_run(vcpu);</div><div class='ctx'> 	TEST_ASSERT(r == -1 &amp;&amp; errno == EFAULT,</div><div class='ctx'> 		    "Expected EFAULT on write to RO memory, got r = %d, errno = %d", r, errno);</div><div class='ctx'> </div><div class='add'>+	atomic_inc(&amp;nr_ro_faults);</div><div class='add'>+	if (atomic_read(&amp;nr_ro_faults) == nr_vcpus) {</div><div class='add'>+		WRITE_ONCE(all_vcpus_hit_ro_fault, true);</div><div class='add'>+		sync_global_to_guest(vm, all_vcpus_hit_ro_fault);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #if defined(__x86_64__) || defined(__aarch64__)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Verify *all* writes from the guest hit EFAULT due to the VMA now</div><div class='hunk'>@@ -257,8 +263,10 @@ static void calc_default_nr_vcpus(void)</div><div class='ctx'> 	TEST_ASSERT(!r, "sched_getaffinity failed, errno = %d (%s)",</div><div class='ctx'> 		    errno, strerror(errno));</div><div class='ctx'> </div><div class='del'>-	nr_vcpus = CPU_COUNT(&amp;possible_mask) * 3/4;</div><div class='add'>+	nr_vcpus = CPU_COUNT(&amp;possible_mask);</div><div class='ctx'> 	TEST_ASSERT(nr_vcpus &gt; 0, "Uh, no CPUs?");</div><div class='add'>+	if (nr_vcpus &gt;= 2)</div><div class='add'>+		nr_vcpus = nr_vcpus * 3/4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char *argv[])</div><div class='hunk'>@@ -333,8 +341,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	TEST_ASSERT(max_gpa &gt; (4 * slot_size), "MAXPHYADDR &lt;4gb ");</div><div class='ctx'> </div><div class='ctx'> 	fd = kvm_memfd_alloc(slot_size, hugepages);</div><div class='del'>-	mem = mmap(NULL, slot_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);</div><div class='del'>-	TEST_ASSERT(mem != MAP_FAILED, "mmap() failed");</div><div class='add'>+	mem = kvm_mmap(slot_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd);</div><div class='ctx'> </div><div class='ctx'> 	TEST_ASSERT(!madvise(mem, slot_size, MADV_NOHUGEPAGE), "madvise() failed");</div><div class='ctx'> </div><div class='hunk'>@@ -355,11 +362,9 @@ int main(int argc, char *argv[])</div><div class='ctx'> </div><div class='ctx'> #ifdef __x86_64__</div><div class='ctx'> 		/* Identity map memory in the guest using 1gb pages. */</div><div class='del'>-		for (i = 0; i &lt; slot_size; i += SZ_1G)</div><div class='del'>-			__virt_pg_map(vm, gpa + i, gpa + i, PG_LEVEL_1G);</div><div class='add'>+		virt_map_level(vm, gpa, gpa, slot_size, PG_LEVEL_1G);</div><div class='ctx'> #else</div><div class='del'>-		for (i = 0; i &lt; slot_size; i += vm-&gt;page_size)</div><div class='del'>-			virt_pg_map(vm, gpa + i, gpa + i);</div><div class='add'>+		virt_map(vm, gpa, gpa, slot_size &gt;&gt; vm-&gt;page_shift);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -378,7 +383,6 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	rendezvous_with_vcpus(&amp;time_run2, "run 2");</div><div class='ctx'> </div><div class='ctx'> 	mprotect(mem, slot_size, PROT_READ);</div><div class='del'>-	usleep(10);</div><div class='ctx'> 	mprotect_ro_done = true;</div><div class='ctx'> 	sync_global_to_guest(vm, mprotect_ro_done);</div><div class='ctx'> </div><div class='hunk'>@@ -408,7 +412,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	for (slot = (slot - 1) &amp; ~1ull; slot &gt;= first_slot; slot -= 2)</div><div class='ctx'> 		vm_set_user_memory_region(vm, slot, 0, 0, 0, NULL);</div><div class='ctx'> </div><div class='del'>-	munmap(mem, slot_size / 2);</div><div class='add'>+	kvm_munmap(mem, slot_size / 2);</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity check that the vCPUs actually ran. */</div><div class='ctx'> 	for (i = 0; i &lt; nr_vcpus; i++)</div><div class='head'>diff --git a/tools/testing/selftests/kvm/pre_fault_memory_test.c b/tools/testing/selftests/kvm/pre_fault_memory_test.c<br/>index 0350a8896a2f..93e603d91311 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/pre_fault_memory_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/pre_fault_memory_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/pre_fault_memory_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/pre_fault_memory_test.c</a></div><div class='hunk'>@@ -10,19 +10,20 @@</div><div class='ctx'> #include &lt;test_util.h&gt;</div><div class='ctx'> #include &lt;kvm_util.h&gt;</div><div class='ctx'> #include &lt;processor.h&gt;</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Arbitrarily chosen values */</div><div class='ctx'> #define TEST_SIZE		(SZ_2M + PAGE_SIZE)</div><div class='ctx'> #define TEST_NPAGES		(TEST_SIZE / PAGE_SIZE)</div><div class='ctx'> #define TEST_SLOT		10</div><div class='ctx'> </div><div class='del'>-static void guest_code(uint64_t base_gpa)</div><div class='add'>+static void guest_code(uint64_t base_gva)</div><div class='ctx'> {</div><div class='ctx'> 	volatile uint64_t val __used;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; TEST_NPAGES; i++) {</div><div class='del'>-		uint64_t *src = (uint64_t *)(base_gpa + i * PAGE_SIZE);</div><div class='add'>+		uint64_t *src = (uint64_t *)(base_gva + i * PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		val = *src;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -30,18 +31,66 @@ static void guest_code(uint64_t base_gpa)</div><div class='ctx'> 	GUEST_DONE();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pre_fault_memory(struct kvm_vcpu *vcpu, u64 gpa, u64 size,</div><div class='del'>-			     u64 left)</div><div class='add'>+struct slot_worker_data {</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	u64 gpa;</div><div class='add'>+	uint32_t flags;</div><div class='add'>+	bool worker_ready;</div><div class='add'>+	bool prefault_ready;</div><div class='add'>+	bool recreate_slot;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void *delete_slot_worker(void *__data)</div><div class='add'>+{</div><div class='add'>+	struct slot_worker_data *data = __data;</div><div class='add'>+	struct kvm_vm *vm = data-&gt;vm;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(data-&gt;worker_ready, true);</div><div class='add'>+</div><div class='add'>+	while (!READ_ONCE(data-&gt;prefault_ready))</div><div class='add'>+		cpu_relax();</div><div class='add'>+</div><div class='add'>+	vm_mem_region_delete(vm, TEST_SLOT);</div><div class='add'>+</div><div class='add'>+	while (!READ_ONCE(data-&gt;recreate_slot))</div><div class='add'>+		cpu_relax();</div><div class='add'>+</div><div class='add'>+	vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, data-&gt;gpa,</div><div class='add'>+				    TEST_SLOT, TEST_NPAGES, data-&gt;flags);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pre_fault_memory(struct kvm_vcpu *vcpu, u64 base_gpa, u64 offset,</div><div class='add'>+			     u64 size, u64 expected_left, bool private)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_pre_fault_memory range = {</div><div class='del'>-		.gpa = gpa,</div><div class='add'>+		.gpa = base_gpa + offset,</div><div class='ctx'> 		.size = size,</div><div class='ctx'> 		.flags = 0,</div><div class='ctx'> 	};</div><div class='del'>-	u64 prev;</div><div class='add'>+	struct slot_worker_data data = {</div><div class='add'>+		.vm = vcpu-&gt;vm,</div><div class='add'>+		.gpa = base_gpa,</div><div class='add'>+		.flags = private ? KVM_MEM_GUEST_MEMFD : 0,</div><div class='add'>+	};</div><div class='add'>+	bool slot_recreated = false;</div><div class='add'>+	pthread_t slot_worker;</div><div class='ctx'> 	int ret, save_errno;</div><div class='add'>+	u64 prev;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Concurrently delete (and recreate) the slot to test KVM's handling</div><div class='add'>+	 * of a racing memslot deletion with prefaulting.</div><div class='add'>+	 */</div><div class='add'>+	pthread_create(&amp;slot_worker, NULL, delete_slot_worker, &amp;data);</div><div class='add'>+</div><div class='add'>+	while (!READ_ONCE(data.worker_ready))</div><div class='add'>+		cpu_relax();</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='add'>+	WRITE_ONCE(data.prefault_ready, true);</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='ctx'> 		prev = range.size;</div><div class='ctx'> 		ret = __vcpu_ioctl(vcpu, KVM_PRE_FAULT_MEMORY, &amp;range);</div><div class='ctx'> 		save_errno = errno;</div><div class='hunk'>@@ -49,22 +98,70 @@ static void pre_fault_memory(struct kvm_vcpu *vcpu, u64 gpa, u64 size,</div><div class='ctx'> 			    "%sexpecting range.size to change on %s",</div><div class='ctx'> 			    ret &lt; 0 ? "not " : "",</div><div class='ctx'> 			    ret &lt; 0 ? "failure" : "success");</div><div class='del'>-	} while (ret &gt;= 0 ? range.size : save_errno == EINTR);</div><div class='ctx'> </div><div class='del'>-	TEST_ASSERT(range.size == left,</div><div class='del'>-		    "Completed with %lld bytes left, expected %" PRId64,</div><div class='del'>-		    range.size, left);</div><div class='add'>+		/*</div><div class='add'>+		 * Immediately retry prefaulting if KVM was interrupted by an</div><div class='add'>+		 * unrelated signal/event.</div><div class='add'>+		 */</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; save_errno == EINTR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Tell the worker to recreate the slot in order to complete</div><div class='add'>+		 * prefaulting (if prefault didn't already succeed before the</div><div class='add'>+		 * slot was deleted) and/or to prepare for the next testcase.</div><div class='add'>+		 * Wait for the worker to exit so that the next invocation of</div><div class='add'>+		 * prefaulting is guaranteed to complete (assuming no KVM bugs).</div><div class='add'>+		 */</div><div class='add'>+		if (!slot_recreated) {</div><div class='add'>+			WRITE_ONCE(data.recreate_slot, true);</div><div class='add'>+			pthread_join(slot_worker, NULL);</div><div class='add'>+			slot_recreated = true;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Retry prefaulting to get a stable result, i.e. to</div><div class='add'>+			 * avoid seeing random EAGAIN failures.  Don't retry if</div><div class='add'>+			 * prefaulting already succeeded, as KVM disallows</div><div class='add'>+			 * prefaulting with size=0, i.e. blindly retrying would</div><div class='add'>+			 * result in test failures due to EINVAL.  KVM should</div><div class='add'>+			 * always return success if all bytes are prefaulted,</div><div class='add'>+			 * i.e. there is no need to guard against EAGAIN being</div><div class='add'>+			 * returned.</div><div class='add'>+			 */</div><div class='add'>+			if (range.size)</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * All done if there are no remaining bytes to prefault, or if</div><div class='add'>+		 * prefaulting failed (EINTR was handled above, and EAGAIN due</div><div class='add'>+		 * to prefaulting a memslot that's being actively deleted should</div><div class='add'>+		 * be impossible since the memslot has already been recreated).</div><div class='add'>+		 */</div><div class='add'>+		if (!range.size || ret &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (left == 0)</div><div class='del'>-		__TEST_ASSERT_VM_VCPU_IOCTL(!ret, "KVM_PRE_FAULT_MEMORY", ret, vcpu-&gt;vm);</div><div class='add'>+	TEST_ASSERT(range.size == expected_left,</div><div class='add'>+		    "Completed with %llu bytes left, expected %lu",</div><div class='add'>+		    range.size, expected_left);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assert success if prefaulting the entire range should succeed, i.e.</div><div class='add'>+	 * complete with no bytes remaining.  Otherwise prefaulting should have</div><div class='add'>+	 * failed due to ENOENT (due to RET_PF_EMULATE for emulated MMIO when</div><div class='add'>+	 * no memslot exists).</div><div class='add'>+	 */</div><div class='add'>+	if (!expected_left)</div><div class='add'>+		TEST_ASSERT_VM_VCPU_IOCTL(!ret, KVM_PRE_FAULT_MEMORY, ret, vcpu-&gt;vm);</div><div class='ctx'> 	else</div><div class='del'>-		/* No memory slot causes RET_PF_EMULATE. it results in -ENOENT. */</div><div class='del'>-		__TEST_ASSERT_VM_VCPU_IOCTL(ret &amp;&amp; save_errno == ENOENT,</div><div class='del'>-					    "KVM_PRE_FAULT_MEMORY", ret, vcpu-&gt;vm);</div><div class='add'>+		TEST_ASSERT_VM_VCPU_IOCTL(ret &amp;&amp; save_errno == ENOENT,</div><div class='add'>+					  KVM_PRE_FAULT_MEMORY, ret, vcpu-&gt;vm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __test_pre_fault_memory(unsigned long vm_type, bool private)</div><div class='ctx'> {</div><div class='add'>+	uint64_t gpa, gva, alignment, guest_page_size;</div><div class='ctx'> 	const struct vm_shape shape = {</div><div class='ctx'> 		.mode = VM_MODE_DEFAULT,</div><div class='ctx'> 		.type = vm_type,</div><div class='hunk'>@@ -74,34 +171,30 @@ static void __test_pre_fault_memory(unsigned long vm_type, bool private)</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> 	struct ucall uc;</div><div class='ctx'> </div><div class='del'>-	uint64_t guest_test_phys_mem;</div><div class='del'>-	uint64_t guest_test_virt_mem;</div><div class='del'>-	uint64_t alignment, guest_page_size;</div><div class='del'>-</div><div class='ctx'> 	vm = vm_create_shape_with_one_vcpu(shape, &amp;vcpu, guest_code);</div><div class='ctx'> </div><div class='ctx'> 	alignment = guest_page_size = vm_guest_mode_params[VM_MODE_DEFAULT].page_size;</div><div class='del'>-	guest_test_phys_mem = (vm-&gt;max_gfn - TEST_NPAGES) * guest_page_size;</div><div class='add'>+	gpa = (vm-&gt;max_gfn - TEST_NPAGES) * guest_page_size;</div><div class='ctx'> #ifdef __s390x__</div><div class='ctx'> 	alignment = max(0x100000UL, guest_page_size);</div><div class='ctx'> #else</div><div class='ctx'> 	alignment = SZ_2M;</div><div class='ctx'> #endif</div><div class='del'>-	guest_test_phys_mem = align_down(guest_test_phys_mem, alignment);</div><div class='del'>-	guest_test_virt_mem = guest_test_phys_mem &amp; ((1ULL &lt;&lt; (vm-&gt;va_bits - 1)) - 1);</div><div class='add'>+	gpa = align_down(gpa, alignment);</div><div class='add'>+	gva = gpa &amp; ((1ULL &lt;&lt; (vm-&gt;va_bits - 1)) - 1);</div><div class='ctx'> </div><div class='del'>-	vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS,</div><div class='del'>-				    guest_test_phys_mem, TEST_SLOT, TEST_NPAGES,</div><div class='del'>-				    private ? KVM_MEM_GUEST_MEMFD : 0);</div><div class='del'>-	virt_map(vm, guest_test_virt_mem, guest_test_phys_mem, TEST_NPAGES);</div><div class='add'>+	vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, gpa, TEST_SLOT,</div><div class='add'>+				    TEST_NPAGES, private ? KVM_MEM_GUEST_MEMFD : 0);</div><div class='add'>+	virt_map(vm, gva, gpa, TEST_NPAGES);</div><div class='ctx'> </div><div class='ctx'> 	if (private)</div><div class='del'>-		vm_mem_set_private(vm, guest_test_phys_mem, TEST_SIZE);</div><div class='del'>-	pre_fault_memory(vcpu, guest_test_phys_mem, SZ_2M, 0);</div><div class='del'>-	pre_fault_memory(vcpu, guest_test_phys_mem + SZ_2M, PAGE_SIZE * 2, PAGE_SIZE);</div><div class='del'>-	pre_fault_memory(vcpu, guest_test_phys_mem + TEST_SIZE, PAGE_SIZE, PAGE_SIZE);</div><div class='add'>+		vm_mem_set_private(vm, gpa, TEST_SIZE);</div><div class='add'>+</div><div class='add'>+	pre_fault_memory(vcpu, gpa, 0, SZ_2M, 0, private);</div><div class='add'>+	pre_fault_memory(vcpu, gpa, SZ_2M, PAGE_SIZE * 2, PAGE_SIZE, private);</div><div class='add'>+	pre_fault_memory(vcpu, gpa, TEST_SIZE, PAGE_SIZE, PAGE_SIZE, private);</div><div class='ctx'> </div><div class='del'>-	vcpu_args_set(vcpu, 1, guest_test_virt_mem);</div><div class='add'>+	vcpu_args_set(vcpu, 1, gva);</div><div class='ctx'> 	vcpu_run(vcpu);</div><div class='ctx'> </div><div class='ctx'> 	run = vcpu-&gt;run;</div><div class='head'>diff --git a/tools/testing/selftests/kvm/riscv/arch_timer.c b/tools/testing/selftests/kvm/riscv/arch_timer.c<br/>index 9e370800a6a2..f962fefc48fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/riscv/arch_timer.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/riscv/arch_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/riscv/arch_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/riscv/arch_timer.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> </div><div class='ctx'> static int timer_irq = IRQ_S_TIMER;</div><div class='ctx'> </div><div class='del'>-static void guest_irq_handler(struct ex_regs *regs)</div><div class='add'>+static void guest_irq_handler(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t xcnt, xcnt_diff_us, cmp;</div><div class='ctx'> 	unsigned int intid = regs-&gt;cause &amp; ~CAUSE_IRQ_FLAG;</div><div class='head'>diff --git a/tools/testing/selftests/kvm/riscv/ebreak_test.c b/tools/testing/selftests/kvm/riscv/ebreak_test.c<br/>index cfed6c727bfc..739d17befb5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/riscv/ebreak_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/riscv/ebreak_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/riscv/ebreak_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/riscv/ebreak_test.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@ static void guest_code(void)</div><div class='ctx'> 	GUEST_DONE();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void guest_breakpoint_handler(struct ex_regs *regs)</div><div class='add'>+static void guest_breakpoint_handler(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	WRITE_ONCE(sw_bp_addr, regs-&gt;epc);</div><div class='ctx'> 	regs-&gt;epc += 4;</div><div class='head'>diff --git a/tools/testing/selftests/kvm/riscv/get-reg-list.c b/tools/testing/selftests/kvm/riscv/get-reg-list.c<br/>index 8515921dfdbf..cb54a56990a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/riscv/get-reg-list.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/riscv/get-reg-list.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/riscv/get-reg-list.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/riscv/get-reg-list.c</a></div><div class='hunk'>@@ -17,6 +17,15 @@ enum {</div><div class='ctx'> 	VCPU_FEATURE_SBI_EXT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	KVM_RISC_V_REG_OFFSET_VSTART = 0,</div><div class='add'>+	KVM_RISC_V_REG_OFFSET_VL,</div><div class='add'>+	KVM_RISC_V_REG_OFFSET_VTYPE,</div><div class='add'>+	KVM_RISC_V_REG_OFFSET_VCSR,</div><div class='add'>+	KVM_RISC_V_REG_OFFSET_VLENB,</div><div class='add'>+	KVM_RISC_V_REG_OFFSET_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static bool isa_ext_cant_disable[KVM_RISCV_ISA_EXT_MAX];</div><div class='ctx'> </div><div class='ctx'> bool filter_reg(__u64 reg)</div><div class='hunk'>@@ -53,8 +62,10 @@ bool filter_reg(__u64 reg)</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_SVNAPOT:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_SVPBMT:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_SVVPTC:</div><div class='add'>+	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZAAMO:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZABHA:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZACAS:</div><div class='add'>+	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZALRSC:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZAWRS:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZBA:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZBB:</div><div class='hunk'>@@ -69,9 +80,11 @@ bool filter_reg(__u64 reg)</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZCF:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZCMOP:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZFA:</div><div class='add'>+	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZFBFMIN:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZFH:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZFHMIN:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOM:</div><div class='add'>+	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOP:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOZ:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICCRSE:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICNTR:</div><div class='hunk'>@@ -92,6 +105,8 @@ bool filter_reg(__u64 reg)</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZTSO:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZVBB:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZVBC:</div><div class='add'>+	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZVFBFMIN:</div><div class='add'>+	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZVFBFWMA:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZVFH:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZVFHMIN:</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZVKB:</div><div class='hunk'>@@ -117,6 +132,8 @@ bool filter_reg(__u64 reg)</div><div class='ctx'> 	case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_DBCN:</div><div class='ctx'> 	case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_SUSP:</div><div class='ctx'> 	case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_STA:</div><div class='add'>+	case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_FWFT:</div><div class='add'>+	case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_MPXY:</div><div class='ctx'> 	case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_EXPERIMENTAL:</div><div class='ctx'> 	case KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_VENDOR:</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -141,6 +158,38 @@ bool check_reject_set(int err)</div><div class='ctx'> 	return err == EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int override_vector_reg_size(struct kvm_vcpu *vcpu, struct vcpu_reg_sublist *s,</div><div class='add'>+				    uint64_t feature)</div><div class='add'>+{</div><div class='add'>+	unsigned long vlenb_reg = 0;</div><div class='add'>+	int rc;</div><div class='add'>+	u64 reg, size;</div><div class='add'>+</div><div class='add'>+	/* Enable V extension so that we can get the vlenb register */</div><div class='add'>+	rc = __vcpu_set_reg(vcpu, feature, 1);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	vlenb_reg = vcpu_get_reg(vcpu, s-&gt;regs[KVM_RISC_V_REG_OFFSET_VLENB]);</div><div class='add'>+	if (!vlenb_reg) {</div><div class='add'>+		TEST_FAIL("Can't compute vector register size from zero vlenb\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size = __builtin_ctzl(vlenb_reg);</div><div class='add'>+	size &lt;&lt;= KVM_REG_SIZE_SHIFT;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; 32; i++) {</div><div class='add'>+		reg = KVM_REG_RISCV | KVM_REG_RISCV_VECTOR | size | KVM_REG_RISCV_VECTOR_REG(i);</div><div class='add'>+		s-&gt;regs[KVM_RISC_V_REG_OFFSET_MAX + i] = reg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We should assert if disabling failed here while enabling succeeded before */</div><div class='add'>+	vcpu_set_reg(vcpu, feature, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void finalize_vcpu(struct kvm_vcpu *vcpu, struct vcpu_reg_list *c)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long isa_ext_state[KVM_RISCV_ISA_EXT_MAX] = { 0 };</div><div class='hunk'>@@ -170,6 +219,13 @@ void finalize_vcpu(struct kvm_vcpu *vcpu, struct vcpu_reg_list *c)</div><div class='ctx'> 		if (!s-&gt;feature)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		if (s-&gt;feature == KVM_RISCV_ISA_EXT_V) {</div><div class='add'>+			feature = RISCV_ISA_EXT_REG(s-&gt;feature);</div><div class='add'>+			rc = override_vector_reg_size(vcpu, s, feature);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto skip;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		switch (s-&gt;feature_type) {</div><div class='ctx'> 		case VCPU_FEATURE_ISA_EXT:</div><div class='ctx'> 			feature = RISCV_ISA_EXT_REG(s-&gt;feature);</div><div class='hunk'>@@ -184,6 +240,7 @@ void finalize_vcpu(struct kvm_vcpu *vcpu, struct vcpu_reg_list *c)</div><div class='ctx'> 		/* Try to enable the desired extension */</div><div class='ctx'> 		__vcpu_set_reg(vcpu, feature, 1);</div><div class='ctx'> </div><div class='add'>+skip:</div><div class='ctx'> 		/* Double check whether the desired extension was enabled */</div><div class='ctx'> 		__TEST_REQUIRE(__vcpu_has_ext(vcpu, feature),</div><div class='ctx'> 			       "%s not available, skipping tests", s-&gt;name);</div><div class='hunk'>@@ -204,6 +261,8 @@ static const char *config_id_to_str(const char *prefix, __u64 id)</div><div class='ctx'> 		return "KVM_REG_RISCV_CONFIG_REG(zicbom_block_size)";</div><div class='ctx'> 	case KVM_REG_RISCV_CONFIG_REG(zicboz_block_size):</div><div class='ctx'> 		return "KVM_REG_RISCV_CONFIG_REG(zicboz_block_size)";</div><div class='add'>+	case KVM_REG_RISCV_CONFIG_REG(zicbop_block_size):</div><div class='add'>+		return "KVM_REG_RISCV_CONFIG_REG(zicbop_block_size)";</div><div class='ctx'> 	case KVM_REG_RISCV_CONFIG_REG(mvendorid):</div><div class='ctx'> 		return "KVM_REG_RISCV_CONFIG_REG(mvendorid)";</div><div class='ctx'> 	case KVM_REG_RISCV_CONFIG_REG(marchid):</div><div class='hunk'>@@ -408,6 +467,35 @@ static const char *fp_d_id_to_str(const char *prefix, __u64 id)</div><div class='ctx'> 	return strdup_printf("%lld /* UNKNOWN */", reg_off);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const char *vector_id_to_str(const char *prefix, __u64 id)</div><div class='add'>+{</div><div class='add'>+	/* reg_off is the offset into struct __riscv_v_ext_state */</div><div class='add'>+	__u64 reg_off = id &amp; ~(REG_MASK | KVM_REG_RISCV_VECTOR);</div><div class='add'>+	int reg_index = 0;</div><div class='add'>+</div><div class='add'>+	assert((id &amp; KVM_REG_RISCV_TYPE_MASK) == KVM_REG_RISCV_VECTOR);</div><div class='add'>+</div><div class='add'>+	if (reg_off &gt;= KVM_REG_RISCV_VECTOR_REG(0))</div><div class='add'>+		reg_index = reg_off -  KVM_REG_RISCV_VECTOR_REG(0);</div><div class='add'>+	switch (reg_off) {</div><div class='add'>+	case KVM_REG_RISCV_VECTOR_REG(0) ...</div><div class='add'>+	     KVM_REG_RISCV_VECTOR_REG(31):</div><div class='add'>+		return strdup_printf("KVM_REG_RISCV_VECTOR_REG(%d)", reg_index);</div><div class='add'>+	case KVM_REG_RISCV_VECTOR_CSR_REG(vstart):</div><div class='add'>+		return "KVM_REG_RISCV_VECTOR_CSR_REG(vstart)";</div><div class='add'>+	case KVM_REG_RISCV_VECTOR_CSR_REG(vl):</div><div class='add'>+		return "KVM_REG_RISCV_VECTOR_CSR_REG(vl)";</div><div class='add'>+	case KVM_REG_RISCV_VECTOR_CSR_REG(vtype):</div><div class='add'>+		return "KVM_REG_RISCV_VECTOR_CSR_REG(vtype)";</div><div class='add'>+	case KVM_REG_RISCV_VECTOR_CSR_REG(vcsr):</div><div class='add'>+		return "KVM_REG_RISCV_VECTOR_CSR_REG(vcsr)";</div><div class='add'>+	case KVM_REG_RISCV_VECTOR_CSR_REG(vlenb):</div><div class='add'>+		return "KVM_REG_RISCV_VECTOR_CSR_REG(vlenb)";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return strdup_printf("%lld /* UNKNOWN */", reg_off);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define KVM_ISA_EXT_ARR(ext)		\</div><div class='ctx'> [KVM_RISCV_ISA_EXT_##ext] = "KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_" #ext</div><div class='ctx'> </div><div class='hunk'>@@ -434,8 +522,10 @@ static const char *isa_ext_single_id_to_str(__u64 reg_off)</div><div class='ctx'> 		KVM_ISA_EXT_ARR(SVNAPOT),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(SVPBMT),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(SVVPTC),</div><div class='add'>+		KVM_ISA_EXT_ARR(ZAAMO),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZABHA),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZACAS),</div><div class='add'>+		KVM_ISA_EXT_ARR(ZALRSC),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZAWRS),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZBA),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZBB),</div><div class='hunk'>@@ -450,9 +540,11 @@ static const char *isa_ext_single_id_to_str(__u64 reg_off)</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZCF),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZCMOP),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZFA),</div><div class='add'>+		KVM_ISA_EXT_ARR(ZFBFMIN),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZFH),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZFHMIN),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZICBOM),</div><div class='add'>+		KVM_ISA_EXT_ARR(ZICBOP),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZICBOZ),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZICCRSE),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZICNTR),</div><div class='hunk'>@@ -473,6 +565,8 @@ static const char *isa_ext_single_id_to_str(__u64 reg_off)</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZTSO),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZVBB),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZVBC),</div><div class='add'>+		KVM_ISA_EXT_ARR(ZVFBFMIN),</div><div class='add'>+		KVM_ISA_EXT_ARR(ZVFBFWMA),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZVFH),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZVFHMIN),</div><div class='ctx'> 		KVM_ISA_EXT_ARR(ZVKB),</div><div class='hunk'>@@ -545,6 +639,8 @@ static const char *sbi_ext_single_id_to_str(__u64 reg_off)</div><div class='ctx'> 		KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_DBCN),</div><div class='ctx'> 		KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_SUSP),</div><div class='ctx'> 		KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_STA),</div><div class='add'>+		KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_FWFT),</div><div class='add'>+		KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_MPXY),</div><div class='ctx'> 		KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_EXPERIMENTAL),</div><div class='ctx'> 		KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_VENDOR),</div><div class='ctx'> 	};</div><div class='hunk'>@@ -601,6 +697,19 @@ static const char *sbi_sta_id_to_str(__u64 reg_off)</div><div class='ctx'> 	return strdup_printf("KVM_REG_RISCV_SBI_STA | %lld /* UNKNOWN */", reg_off);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const char *sbi_fwft_id_to_str(__u64 reg_off)</div><div class='add'>+{</div><div class='add'>+	switch (reg_off) {</div><div class='add'>+	case 0: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misaligned_deleg.enable)";</div><div class='add'>+	case 1: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misaligned_deleg.flags)";</div><div class='add'>+	case 2: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misaligned_deleg.value)";</div><div class='add'>+	case 3: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(pointer_masking.enable)";</div><div class='add'>+	case 4: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(pointer_masking.flags)";</div><div class='add'>+	case 5: return "KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(pointer_masking.value)";</div><div class='add'>+	}</div><div class='add'>+	return strdup_printf("KVM_REG_RISCV_SBI_FWFT | %lld /* UNKNOWN */", reg_off);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const char *sbi_id_to_str(const char *prefix, __u64 id)</div><div class='ctx'> {</div><div class='ctx'> 	__u64 reg_off = id &amp; ~(REG_MASK | KVM_REG_RISCV_SBI_STATE);</div><div class='hunk'>@@ -613,6 +722,8 @@ static const char *sbi_id_to_str(const char *prefix, __u64 id)</div><div class='ctx'> 	switch (reg_subtype) {</div><div class='ctx'> 	case KVM_REG_RISCV_SBI_STA:</div><div class='ctx'> 		return sbi_sta_id_to_str(reg_off);</div><div class='add'>+	case KVM_REG_RISCV_SBI_FWFT:</div><div class='add'>+		return sbi_fwft_id_to_str(reg_off);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return strdup_printf("%lld | %lld /* UNKNOWN */", reg_subtype, reg_off);</div><div class='hunk'>@@ -635,6 +746,9 @@ void print_reg(const char *prefix, __u64 id)</div><div class='ctx'> 	case KVM_REG_SIZE_U128:</div><div class='ctx'> 		reg_size = "KVM_REG_SIZE_U128";</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_REG_SIZE_U256:</div><div class='add'>+		reg_size = "KVM_REG_SIZE_U256";</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printf("\tKVM_REG_RISCV | (%lld &lt;&lt; KVM_REG_SIZE_SHIFT) | 0x%llx /* UNKNOWN */,\n",</div><div class='ctx'> 		       (id &amp; KVM_REG_SIZE_MASK) &gt;&gt; KVM_REG_SIZE_SHIFT, id &amp; ~REG_MASK);</div><div class='hunk'>@@ -666,6 +780,10 @@ void print_reg(const char *prefix, __u64 id)</div><div class='ctx'> 		printf("\tKVM_REG_RISCV | %s | KVM_REG_RISCV_FP_D | %s,\n",</div><div class='ctx'> 				reg_size, fp_d_id_to_str(prefix, id));</div><div class='ctx'> 		break;</div><div class='add'>+	case KVM_REG_RISCV_VECTOR:</div><div class='add'>+		printf("\tKVM_REG_RISCV | %s | KVM_REG_RISCV_VECTOR | %s,\n",</div><div class='add'>+		       reg_size, vector_id_to_str(prefix, id));</div><div class='add'>+		break;</div><div class='ctx'> 	case KVM_REG_RISCV_ISA_EXT:</div><div class='ctx'> 		printf("\tKVM_REG_RISCV | %s | KVM_REG_RISCV_ISA_EXT | %s,\n",</div><div class='ctx'> 				reg_size, isa_ext_id_to_str(prefix, id));</div><div class='hunk'>@@ -691,10 +809,13 @@ void print_reg(const char *prefix, __u64 id)</div><div class='ctx'>  */</div><div class='ctx'> static __u64 base_regs[] = {</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(isa),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(zicbom_block_size),</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(mvendorid),</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(marchid),</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(mimpid),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(zicboz_block_size),</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(satp_mode),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(zicbop_block_size),</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CORE | KVM_REG_RISCV_CORE_REG(regs.pc),</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CORE | KVM_REG_RISCV_CORE_REG(regs.ra),</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CORE | KVM_REG_RISCV_CORE_REG(regs.sp),</div><div class='hunk'>@@ -770,11 +891,26 @@ static __u64 sbi_sta_regs[] = {</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RISCV_SBI_STA | KVM_REG_RISCV_SBI_STA_REG(shmem_hi),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static __u64 sbi_fwft_regs[] = {</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_FWFT,</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misaligned_deleg.enable),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misaligned_deleg.flags),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(misaligned_deleg.value),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(pointer_masking.enable),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(pointer_masking.flags),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_STATE | KVM_REG_RISCV_SBI_FWFT | KVM_REG_RISCV_SBI_FWFT_REG(pointer_masking.value),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static __u64 zicbom_regs[] = {</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(zicbom_block_size),</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static __u64 zicbop_regs[] = {</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(zicbop_block_size),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOP,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static __u64 zicboz_regs[] = {</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CONFIG | KVM_REG_RISCV_CONFIG_REG(zicboz_block_size),</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_ZICBOZ,</div><div class='hunk'>@@ -870,6 +1006,48 @@ static __u64 fp_d_regs[] = {</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_D,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Define a default vector registers with length. This will be overwritten at runtime */</div><div class='add'>+static __u64 vector_regs[] = {</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_CSR_REG(vstart),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_CSR_REG(vl),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_CSR_REG(vtype),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_CSR_REG(vcsr),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_CSR_REG(vlenb),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(0),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(1),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(2),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(3),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(4),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(5),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(6),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(7),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(8),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(9),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(10),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(11),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(12),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(13),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(14),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(15),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(16),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(17),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(18),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(19),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(20),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(21),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(22),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(23),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(24),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(25),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(26),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(27),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(28),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(29),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(30),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_U128 | KVM_REG_RISCV_VECTOR | KVM_REG_RISCV_VECTOR_REG(31),</div><div class='add'>+	KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_REG_RISCV_ISA_SINGLE | KVM_RISCV_ISA_EXT_V,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define SUBLIST_BASE \</div><div class='ctx'> 	{"base", .regs = base_regs, .regs_n = ARRAY_SIZE(base_regs), \</div><div class='ctx'> 	 .skips_set = base_skips_set, .skips_set_n = ARRAY_SIZE(base_skips_set),}</div><div class='hunk'>@@ -879,8 +1057,13 @@ static __u64 fp_d_regs[] = {</div><div class='ctx'> #define SUBLIST_SBI_STA \</div><div class='ctx'> 	{"sbi-sta", .feature_type = VCPU_FEATURE_SBI_EXT, .feature = KVM_RISCV_SBI_EXT_STA, \</div><div class='ctx'> 	 .regs = sbi_sta_regs, .regs_n = ARRAY_SIZE(sbi_sta_regs),}</div><div class='add'>+#define SUBLIST_SBI_FWFT \</div><div class='add'>+	{"sbi-fwft", .feature_type = VCPU_FEATURE_SBI_EXT, .feature = KVM_RISCV_SBI_EXT_FWFT, \</div><div class='add'>+	 .regs = sbi_fwft_regs, .regs_n = ARRAY_SIZE(sbi_fwft_regs),}</div><div class='ctx'> #define SUBLIST_ZICBOM \</div><div class='ctx'> 	{"zicbom", .feature = KVM_RISCV_ISA_EXT_ZICBOM, .regs = zicbom_regs, .regs_n = ARRAY_SIZE(zicbom_regs),}</div><div class='add'>+#define SUBLIST_ZICBOP \</div><div class='add'>+	{"zicbop", .feature = KVM_RISCV_ISA_EXT_ZICBOP, .regs = zicbop_regs, .regs_n = ARRAY_SIZE(zicbop_regs),}</div><div class='ctx'> #define SUBLIST_ZICBOZ \</div><div class='ctx'> 	{"zicboz", .feature = KVM_RISCV_ISA_EXT_ZICBOZ, .regs = zicboz_regs, .regs_n = ARRAY_SIZE(zicboz_regs),}</div><div class='ctx'> #define SUBLIST_AIA \</div><div class='hunk'>@@ -894,6 +1077,9 @@ static __u64 fp_d_regs[] = {</div><div class='ctx'> 	{"fp_d", .feature = KVM_RISCV_ISA_EXT_D, .regs = fp_d_regs, \</div><div class='ctx'> 		.regs_n = ARRAY_SIZE(fp_d_regs),}</div><div class='ctx'> </div><div class='add'>+#define SUBLIST_V \</div><div class='add'>+	{"v", .feature = KVM_RISCV_ISA_EXT_V, .regs = vector_regs, .regs_n = ARRAY_SIZE(vector_regs),}</div><div class='add'>+</div><div class='ctx'> #define KVM_ISA_EXT_SIMPLE_CONFIG(ext, extu)			\</div><div class='ctx'> static __u64 regs_##ext[] = {					\</div><div class='ctx'> 	KVM_REG_RISCV | KVM_REG_SIZE_ULONG |			\</div><div class='hunk'>@@ -958,10 +1144,13 @@ KVM_SBI_EXT_SUBLIST_CONFIG(sta, STA);</div><div class='ctx'> KVM_SBI_EXT_SIMPLE_CONFIG(pmu, PMU);</div><div class='ctx'> KVM_SBI_EXT_SIMPLE_CONFIG(dbcn, DBCN);</div><div class='ctx'> KVM_SBI_EXT_SIMPLE_CONFIG(susp, SUSP);</div><div class='add'>+KVM_SBI_EXT_SIMPLE_CONFIG(mpxy, MPXY);</div><div class='add'>+KVM_SBI_EXT_SUBLIST_CONFIG(fwft, FWFT);</div><div class='ctx'> </div><div class='ctx'> KVM_ISA_EXT_SUBLIST_CONFIG(aia, AIA);</div><div class='ctx'> KVM_ISA_EXT_SUBLIST_CONFIG(fp_f, FP_F);</div><div class='ctx'> KVM_ISA_EXT_SUBLIST_CONFIG(fp_d, FP_D);</div><div class='add'>+KVM_ISA_EXT_SUBLIST_CONFIG(v, V);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(h, H);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(smnpm, SMNPM);</div><div class='ctx'> KVM_ISA_EXT_SUBLIST_CONFIG(smstateen, SMSTATEEN);</div><div class='hunk'>@@ -974,8 +1163,10 @@ KVM_ISA_EXT_SIMPLE_CONFIG(svinval, SVINVAL);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(svnapot, SVNAPOT);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(svpbmt, SVPBMT);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(svvptc, SVVPTC);</div><div class='add'>+KVM_ISA_EXT_SIMPLE_CONFIG(zaamo, ZAAMO);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zabha, ZABHA);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zacas, ZACAS);</div><div class='add'>+KVM_ISA_EXT_SIMPLE_CONFIG(zalrsc, ZALRSC);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zawrs, ZAWRS);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zba, ZBA);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zbb, ZBB);</div><div class='hunk'>@@ -990,9 +1181,11 @@ KVM_ISA_EXT_SIMPLE_CONFIG(zcd, ZCD);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zcf, ZCF);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zcmop, ZCMOP);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zfa, ZFA);</div><div class='add'>+KVM_ISA_EXT_SIMPLE_CONFIG(zfbfmin, ZFBFMIN);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zfh, ZFH);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zfhmin, ZFHMIN);</div><div class='ctx'> KVM_ISA_EXT_SUBLIST_CONFIG(zicbom, ZICBOM);</div><div class='add'>+KVM_ISA_EXT_SUBLIST_CONFIG(zicbop, ZICBOP);</div><div class='ctx'> KVM_ISA_EXT_SUBLIST_CONFIG(zicboz, ZICBOZ);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(ziccrse, ZICCRSE);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zicntr, ZICNTR);</div><div class='hunk'>@@ -1013,6 +1206,8 @@ KVM_ISA_EXT_SIMPLE_CONFIG(zkt, ZKT);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(ztso, ZTSO);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zvbb, ZVBB);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zvbc, ZVBC);</div><div class='add'>+KVM_ISA_EXT_SIMPLE_CONFIG(zvfbfmin, ZVFBFMIN);</div><div class='add'>+KVM_ISA_EXT_SIMPLE_CONFIG(zvfbfwma, ZVFBFWMA);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zvfh, ZVFH);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zvfhmin, ZVFHMIN);</div><div class='ctx'> KVM_ISA_EXT_SIMPLE_CONFIG(zvkb, ZVKB);</div><div class='hunk'>@@ -1030,10 +1225,13 @@ struct vcpu_reg_list *vcpu_configs[] = {</div><div class='ctx'> 	&amp;config_sbi_pmu,</div><div class='ctx'> 	&amp;config_sbi_dbcn,</div><div class='ctx'> 	&amp;config_sbi_susp,</div><div class='add'>+	&amp;config_sbi_mpxy,</div><div class='add'>+	&amp;config_sbi_fwft,</div><div class='ctx'> 	&amp;config_aia,</div><div class='ctx'> 	&amp;config_fp_f,</div><div class='ctx'> 	&amp;config_fp_d,</div><div class='ctx'> 	&amp;config_h,</div><div class='add'>+	&amp;config_v,</div><div class='ctx'> 	&amp;config_smnpm,</div><div class='ctx'> 	&amp;config_smstateen,</div><div class='ctx'> 	&amp;config_sscofpmf,</div><div class='hunk'>@@ -1045,8 +1243,10 @@ struct vcpu_reg_list *vcpu_configs[] = {</div><div class='ctx'> 	&amp;config_svnapot,</div><div class='ctx'> 	&amp;config_svpbmt,</div><div class='ctx'> 	&amp;config_svvptc,</div><div class='add'>+	&amp;config_zaamo,</div><div class='ctx'> 	&amp;config_zabha,</div><div class='ctx'> 	&amp;config_zacas,</div><div class='add'>+	&amp;config_zalrsc,</div><div class='ctx'> 	&amp;config_zawrs,</div><div class='ctx'> 	&amp;config_zba,</div><div class='ctx'> 	&amp;config_zbb,</div><div class='hunk'>@@ -1061,9 +1261,11 @@ struct vcpu_reg_list *vcpu_configs[] = {</div><div class='ctx'> 	&amp;config_zcf,</div><div class='ctx'> 	&amp;config_zcmop,</div><div class='ctx'> 	&amp;config_zfa,</div><div class='add'>+	&amp;config_zfbfmin,</div><div class='ctx'> 	&amp;config_zfh,</div><div class='ctx'> 	&amp;config_zfhmin,</div><div class='ctx'> 	&amp;config_zicbom,</div><div class='add'>+	&amp;config_zicbop,</div><div class='ctx'> 	&amp;config_zicboz,</div><div class='ctx'> 	&amp;config_ziccrse,</div><div class='ctx'> 	&amp;config_zicntr,</div><div class='hunk'>@@ -1084,6 +1286,8 @@ struct vcpu_reg_list *vcpu_configs[] = {</div><div class='ctx'> 	&amp;config_ztso,</div><div class='ctx'> 	&amp;config_zvbb,</div><div class='ctx'> 	&amp;config_zvbc,</div><div class='add'>+	&amp;config_zvfbfmin,</div><div class='add'>+	&amp;config_zvfbfwma,</div><div class='ctx'> 	&amp;config_zvfh,</div><div class='ctx'> 	&amp;config_zvfhmin,</div><div class='ctx'> 	&amp;config_zvkb,</div><div class='head'>diff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c<br/>index f45c0ecc902d..924a335d2262 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/riscv/sbi_pmu_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/riscv/sbi_pmu_test.c</a></div><div class='hunk'>@@ -39,7 +39,13 @@ static bool illegal_handler_invoked;</div><div class='ctx'> #define SBI_PMU_TEST_SNAPSHOT	BIT(2)</div><div class='ctx'> #define SBI_PMU_TEST_OVERFLOW	BIT(3)</div><div class='ctx'> </div><div class='del'>-static int disabled_tests;</div><div class='add'>+#define SBI_PMU_OVERFLOW_IRQNUM_DEFAULT 5</div><div class='add'>+struct test_args {</div><div class='add'>+	int disabled_tests;</div><div class='add'>+	int overflow_irqnum;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct test_args targs;</div><div class='ctx'> </div><div class='ctx'> unsigned long pmu_csr_read_num(int csr_num)</div><div class='ctx'> {</div><div class='hunk'>@@ -67,7 +73,6 @@ unsigned long pmu_csr_read_num(int csr_num)</div><div class='ctx'> </div><div class='ctx'> 	switch (csr_num) {</div><div class='ctx'> 	switchcase_csr_read_32(CSR_CYCLE, ret)</div><div class='del'>-	switchcase_csr_read_32(CSR_CYCLEH, ret)</div><div class='ctx'> 	default :</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -118,26 +123,44 @@ static void stop_counter(unsigned long counter, unsigned long stop_flags)</div><div class='ctx'> </div><div class='ctx'> 	ret = sbi_ecall(SBI_EXT_PMU, SBI_EXT_PMU_COUNTER_STOP, counter, 1, stop_flags,</div><div class='ctx'> 			0, 0, 0);</div><div class='del'>-	__GUEST_ASSERT(ret.error == 0, "Unable to stop counter %ld error %ld\n",</div><div class='del'>-			       counter, ret.error);</div><div class='add'>+	__GUEST_ASSERT(ret.error == 0 || ret.error == SBI_ERR_ALREADY_STOPPED,</div><div class='add'>+		       "Unable to stop counter %ld error %ld\n", counter, ret.error);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void guest_illegal_exception_handler(struct ex_regs *regs)</div><div class='add'>+static void guest_illegal_exception_handler(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	unsigned long insn;</div><div class='add'>+	int opcode, csr_num, funct3;</div><div class='add'>+</div><div class='ctx'> 	__GUEST_ASSERT(regs-&gt;cause == EXC_INST_ILLEGAL,</div><div class='ctx'> 		       "Unexpected exception handler %lx\n", regs-&gt;cause);</div><div class='ctx'> </div><div class='add'>+	insn = regs-&gt;badaddr;</div><div class='add'>+	opcode = (insn &amp; INSN_OPCODE_MASK) &gt;&gt; INSN_OPCODE_SHIFT;</div><div class='add'>+	__GUEST_ASSERT(opcode == INSN_OPCODE_SYSTEM,</div><div class='add'>+		       "Unexpected instruction with opcode 0x%x insn 0x%lx\n", opcode, insn);</div><div class='add'>+</div><div class='add'>+	csr_num = GET_CSR_NUM(insn);</div><div class='add'>+	funct3 = GET_RM(insn);</div><div class='add'>+	/* Validate if it is a CSR read/write operation */</div><div class='add'>+	__GUEST_ASSERT(funct3 &lt;= 7 &amp;&amp; (funct3 != 0 &amp;&amp; funct3 != 4),</div><div class='add'>+		       "Unexpected system opcode with funct3 0x%x csr_num 0x%x\n",</div><div class='add'>+		       funct3, csr_num);</div><div class='add'>+</div><div class='add'>+	/* Validate if it is a HPMCOUNTER CSR operation */</div><div class='add'>+	__GUEST_ASSERT((csr_num &gt;= CSR_CYCLE &amp;&amp; csr_num &lt;= CSR_HPMCOUNTER31),</div><div class='add'>+		       "Unexpected csr_num 0x%x\n", csr_num);</div><div class='add'>+</div><div class='ctx'> 	illegal_handler_invoked = true;</div><div class='ctx'> 	/* skip the trapping instruction */</div><div class='ctx'> 	regs-&gt;epc += 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void guest_irq_handler(struct ex_regs *regs)</div><div class='add'>+static void guest_irq_handler(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irq_num = regs-&gt;cause &amp; ~CAUSE_IRQ_FLAG;</div><div class='ctx'> 	struct riscv_pmu_snapshot_data *snapshot_data = snapshot_gva;</div><div class='ctx'> 	unsigned long overflown_mask;</div><div class='del'>-	unsigned long counter_val = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Validate that we are in the correct irq handler */</div><div class='ctx'> 	GUEST_ASSERT_EQ(irq_num, IRQ_PMU_OVF);</div><div class='hunk'>@@ -151,10 +174,6 @@ static void guest_irq_handler(struct ex_regs *regs)</div><div class='ctx'> 	GUEST_ASSERT(overflown_mask &amp; 0x01);</div><div class='ctx'> </div><div class='ctx'> 	WRITE_ONCE(vcpu_shared_irq_count, vcpu_shared_irq_count+1);</div><div class='del'>-</div><div class='del'>-	counter_val = READ_ONCE(snapshot_data-&gt;ctr_values[0]);</div><div class='del'>-	/* Now start the counter to mimick the real driver behavior */</div><div class='del'>-	start_counter(counter_in_use, SBI_PMU_START_FLAG_SET_INIT_VALUE, counter_val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned long get_counter_index(unsigned long cbase, unsigned long cmask,</div><div class='hunk'>@@ -479,7 +498,7 @@ static void test_pmu_events_snaphost(void)</div><div class='ctx'> </div><div class='ctx'> static void test_pmu_events_overflow(void)</div><div class='ctx'> {</div><div class='del'>-	int num_counters = 0;</div><div class='add'>+	int num_counters = 0, i = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Verify presence of SBI PMU and minimum requrired SBI version */</div><div class='ctx'> 	verify_sbi_requirement_assert();</div><div class='hunk'>@@ -496,11 +515,15 @@ static void test_pmu_events_overflow(void)</div><div class='ctx'> 	 * Qemu supports overflow for cycle/instruction.</div><div class='ctx'> 	 * This test may fail on any platform that do not support overflow for these two events.</div><div class='ctx'> 	 */</div><div class='del'>-	test_pmu_event_overflow(SBI_PMU_HW_CPU_CYCLES);</div><div class='del'>-	GUEST_ASSERT_EQ(vcpu_shared_irq_count, 1);</div><div class='add'>+	for (i = 0; i &lt; targs.overflow_irqnum; i++)</div><div class='add'>+		test_pmu_event_overflow(SBI_PMU_HW_CPU_CYCLES);</div><div class='add'>+	GUEST_ASSERT_EQ(vcpu_shared_irq_count, targs.overflow_irqnum);</div><div class='ctx'> </div><div class='del'>-	test_pmu_event_overflow(SBI_PMU_HW_INSTRUCTIONS);</div><div class='del'>-	GUEST_ASSERT_EQ(vcpu_shared_irq_count, 2);</div><div class='add'>+	vcpu_shared_irq_count = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; targs.overflow_irqnum; i++)</div><div class='add'>+		test_pmu_event_overflow(SBI_PMU_HW_INSTRUCTIONS);</div><div class='add'>+	GUEST_ASSERT_EQ(vcpu_shared_irq_count, targs.overflow_irqnum);</div><div class='ctx'> </div><div class='ctx'> 	GUEST_DONE();</div><div class='ctx'> }</div><div class='hunk'>@@ -609,7 +632,11 @@ static void test_vm_events_overflow(void *guest_code)</div><div class='ctx'> 	vcpu_init_vector_tables(vcpu);</div><div class='ctx'> 	/* Initialize guest timer frequency. */</div><div class='ctx'> 	timer_freq = vcpu_get_reg(vcpu, RISCV_TIMER_REG(frequency));</div><div class='add'>+</div><div class='add'>+	/* Export the shared variables to the guest */</div><div class='ctx'> 	sync_global_to_guest(vm, timer_freq);</div><div class='add'>+	sync_global_to_guest(vm, vcpu_shared_irq_count);</div><div class='add'>+	sync_global_to_guest(vm, targs);</div><div class='ctx'> </div><div class='ctx'> 	run_vcpu(vcpu);</div><div class='ctx'> </div><div class='hunk'>@@ -618,28 +645,38 @@ static void test_vm_events_overflow(void *guest_code)</div><div class='ctx'> </div><div class='ctx'> static void test_print_help(char *name)</div><div class='ctx'> {</div><div class='del'>-	pr_info("Usage: %s [-h] [-d &lt;test name&gt;]\n", name);</div><div class='del'>-	pr_info("\t-d: Test to disable. Available tests are 'basic', 'events', 'snapshot', 'overflow'\n");</div><div class='add'>+	pr_info("Usage: %s [-h] [-t &lt;test name&gt;] [-n &lt;number of LCOFI interrupt for overflow test&gt;]\n",</div><div class='add'>+		name);</div><div class='add'>+	pr_info("\t-t: Test to run (default all). Available tests are 'basic', 'events', 'snapshot', 'overflow'\n");</div><div class='add'>+	pr_info("\t-n: Number of LCOFI interrupt to trigger for each event in overflow test (default: %d)\n",</div><div class='add'>+		SBI_PMU_OVERFLOW_IRQNUM_DEFAULT);</div><div class='ctx'> 	pr_info("\t-h: print this help screen\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool parse_args(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	int opt;</div><div class='add'>+	int temp_disabled_tests = SBI_PMU_TEST_BASIC | SBI_PMU_TEST_EVENTS | SBI_PMU_TEST_SNAPSHOT |</div><div class='add'>+				  SBI_PMU_TEST_OVERFLOW;</div><div class='add'>+	int overflow_interrupts = 0;</div><div class='ctx'> </div><div class='del'>-	while ((opt = getopt(argc, argv, "hd:")) != -1) {</div><div class='add'>+	while ((opt = getopt(argc, argv, "ht:n:")) != -1) {</div><div class='ctx'> 		switch (opt) {</div><div class='del'>-		case 'd':</div><div class='add'>+		case 't':</div><div class='ctx'> 			if (!strncmp("basic", optarg, 5))</div><div class='del'>-				disabled_tests |= SBI_PMU_TEST_BASIC;</div><div class='add'>+				temp_disabled_tests &amp;= ~SBI_PMU_TEST_BASIC;</div><div class='ctx'> 			else if (!strncmp("events", optarg, 6))</div><div class='del'>-				disabled_tests |= SBI_PMU_TEST_EVENTS;</div><div class='add'>+				temp_disabled_tests &amp;= ~SBI_PMU_TEST_EVENTS;</div><div class='ctx'> 			else if (!strncmp("snapshot", optarg, 8))</div><div class='del'>-				disabled_tests |= SBI_PMU_TEST_SNAPSHOT;</div><div class='add'>+				temp_disabled_tests &amp;= ~SBI_PMU_TEST_SNAPSHOT;</div><div class='ctx'> 			else if (!strncmp("overflow", optarg, 8))</div><div class='del'>-				disabled_tests |= SBI_PMU_TEST_OVERFLOW;</div><div class='add'>+				temp_disabled_tests &amp;= ~SBI_PMU_TEST_OVERFLOW;</div><div class='ctx'> 			else</div><div class='ctx'> 				goto done;</div><div class='add'>+			targs.disabled_tests = temp_disabled_tests;</div><div class='add'>+			break;</div><div class='add'>+		case 'n':</div><div class='add'>+			overflow_interrupts = atoi_positive("Number of LCOFI", optarg);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 'h':</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -647,6 +684,15 @@ static bool parse_args(int argc, char *argv[])</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (overflow_interrupts &gt; 0) {</div><div class='add'>+		if (targs.disabled_tests &amp; SBI_PMU_TEST_OVERFLOW) {</div><div class='add'>+			pr_info("-n option is only available for overflow test\n");</div><div class='add'>+			goto done;</div><div class='add'>+		} else {</div><div class='add'>+			targs.overflow_irqnum = overflow_interrupts;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return true;</div><div class='ctx'> done:</div><div class='ctx'> 	test_print_help(argv[0]);</div><div class='hunk'>@@ -655,25 +701,28 @@ done:</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='add'>+	targs.disabled_tests = 0;</div><div class='add'>+	targs.overflow_irqnum = SBI_PMU_OVERFLOW_IRQNUM_DEFAULT;</div><div class='add'>+</div><div class='ctx'> 	if (!parse_args(argc, argv))</div><div class='ctx'> 		exit(KSFT_SKIP);</div><div class='ctx'> </div><div class='del'>-	if (!(disabled_tests &amp; SBI_PMU_TEST_BASIC)) {</div><div class='add'>+	if (!(targs.disabled_tests &amp; SBI_PMU_TEST_BASIC)) {</div><div class='ctx'> 		test_vm_basic_test(test_pmu_basic_sanity);</div><div class='ctx'> 		pr_info("SBI PMU basic test : PASS\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(disabled_tests &amp; SBI_PMU_TEST_EVENTS)) {</div><div class='add'>+	if (!(targs.disabled_tests &amp; SBI_PMU_TEST_EVENTS)) {</div><div class='ctx'> 		test_vm_events_test(test_pmu_events);</div><div class='ctx'> 		pr_info("SBI PMU event verification test : PASS\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(disabled_tests &amp; SBI_PMU_TEST_SNAPSHOT)) {</div><div class='add'>+	if (!(targs.disabled_tests &amp; SBI_PMU_TEST_SNAPSHOT)) {</div><div class='ctx'> 		test_vm_events_snapshot_test(test_pmu_events_snaphost);</div><div class='ctx'> 		pr_info("SBI PMU event verification with snapshot test : PASS\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(disabled_tests &amp; SBI_PMU_TEST_OVERFLOW)) {</div><div class='add'>+	if (!(targs.disabled_tests &amp; SBI_PMU_TEST_OVERFLOW)) {</div><div class='ctx'> 		test_vm_events_overflow(test_pmu_events_overflow);</div><div class='ctx'> 		pr_info("SBI PMU event verification with overflow test : PASS\n");</div><div class='ctx'> 	}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/rseq_test.c b/tools/testing/selftests/kvm/rseq_test.c<br/>index e5898678bfab..1375fca80bcd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/rseq_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/rseq_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/rseq_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/rseq_test.c</a></div><div class='hunk'>@@ -196,25 +196,27 @@ static void calc_min_max_cpu(void)</div><div class='ctx'> static void help(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	puts("");</div><div class='del'>-	printf("usage: %s [-h] [-u]\n", name);</div><div class='add'>+	printf("usage: %s [-h] [-u] [-l latency]\n", name);</div><div class='ctx'> 	printf(" -u: Don't sanity check the number of successful KVM_RUNs\n");</div><div class='add'>+	printf(" -l: Set /dev/cpu_dma_latency to suppress deep sleep states\n");</div><div class='ctx'> 	puts("");</div><div class='ctx'> 	exit(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='add'>+	int r, i, snapshot, opt, fd = -1, latency = -1;</div><div class='ctx'> 	bool skip_sanity_check = false;</div><div class='del'>-	int r, i, snapshot;</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	u32 cpu, rseq_cpu;</div><div class='del'>-	int opt;</div><div class='ctx'> </div><div class='del'>-	while ((opt = getopt(argc, argv, "hu")) != -1) {</div><div class='add'>+	while ((opt = getopt(argc, argv, "hl:u")) != -1) {</div><div class='ctx'> 		switch (opt) {</div><div class='ctx'> 		case 'u':</div><div class='ctx'> 			skip_sanity_check = true;</div><div class='add'>+		case 'l':</div><div class='add'>+			latency = atoi_paranoid(optarg);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 'h':</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -243,6 +245,20 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	pthread_create(&amp;migration_thread, NULL, migration_worker,</div><div class='ctx'> 		       (void *)(unsigned long)syscall(SYS_gettid));</div><div class='ctx'> </div><div class='add'>+	if (latency &gt;= 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Writes to cpu_dma_latency persist only while the file is</div><div class='add'>+		 * open, i.e. it allows userspace to provide guaranteed latency</div><div class='add'>+		 * while running a workload.  Keep the file open until the test</div><div class='add'>+		 * completes, otherwise writing cpu_dma_latency is meaningless.</div><div class='add'>+		 */</div><div class='add'>+		fd = open("/dev/cpu_dma_latency", O_RDWR);</div><div class='add'>+		TEST_ASSERT(fd &gt;= 0, __KVM_SYSCALL_ERROR("open() /dev/cpu_dma_latency", fd));</div><div class='add'>+</div><div class='add'>+		r = write(fd, &amp;latency, 4);</div><div class='add'>+		TEST_ASSERT(r &gt;= 1, "Error setting /dev/cpu_dma_latency");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; !done; i++) {</div><div class='ctx'> 		vcpu_run(vcpu);</div><div class='ctx'> 		TEST_ASSERT(get_ucall(vcpu, NULL) == UCALL_SYNC,</div><div class='hunk'>@@ -278,6 +294,9 @@ int main(int argc, char *argv[])</div><div class='ctx'> 			    "rseq CPU = %d, sched CPU = %d", rseq_cpu, cpu);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (fd &gt; 0)</div><div class='add'>+		close(fd);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Sanity check that the test was able to enter the guest a reasonable</div><div class='ctx'> 	 * number of times, e.g. didn't get stalled too often/long waiting for</div><div class='hunk'>@@ -293,8 +312,8 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	TEST_ASSERT(skip_sanity_check || i &gt; (NR_TASK_MIGRATIONS / 2),</div><div class='ctx'> 		    "Only performed %d KVM_RUNs, task stalled too much?\n\n"</div><div class='ctx'> 		    "  Try disabling deep sleep states to reduce CPU wakeup latency,\n"</div><div class='del'>-		    "  e.g. via cpuidle.off=1 or setting /dev/cpu_dma_latency to '0',\n"</div><div class='del'>-		    "  or run with -u to disable this sanity check.", i);</div><div class='add'>+		    "  e.g. via cpuidle.off=1 or via -l &lt;latency&gt;, or run with -u to\n"</div><div class='add'>+		    "  disable this sanity check.", i);</div><div class='ctx'> </div><div class='ctx'> 	pthread_join(migration_thread, NULL);</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/s390/cmma_test.c b/tools/testing/selftests/kvm/s390/cmma_test.c<br/>index 85cc8c18d6e7..e39a724fe860 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/s390/cmma_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/s390/cmma_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/s390/cmma_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/s390/cmma_test.c</a></div><div class='hunk'>@@ -145,7 +145,7 @@ static void finish_vm_setup(struct kvm_vm *vm)</div><div class='ctx'> 	slot0 = memslot2region(vm, 0);</div><div class='ctx'> 	ucall_init(vm, slot0-&gt;region.guest_phys_addr + slot0-&gt;region.memory_size);</div><div class='ctx'> </div><div class='del'>-	kvm_arch_vm_post_create(vm);</div><div class='add'>+	kvm_arch_vm_post_create(vm, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct kvm_vm *create_vm_two_memslots(void)</div><div class='head'>diff --git a/tools/testing/selftests/kvm/s390/cpumodel_subfuncs_test.c b/tools/testing/selftests/kvm/s390/cpumodel_subfuncs_test.c<br/>index 27255880dabd..aded795d42be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/s390/cpumodel_subfuncs_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/s390/cpumodel_subfuncs_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/s390/cpumodel_subfuncs_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/s390/cpumodel_subfuncs_test.c</a></div><div class='hunk'>@@ -291,7 +291,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> 			ksft_test_result_pass("%s\n", testlist[idx].subfunc_name);</div><div class='ctx'> 			free(array);</div><div class='ctx'> 		} else {</div><div class='del'>-			ksft_test_result_skip("%s feature is not avaialable\n",</div><div class='add'>+			ksft_test_result_skip("%s feature is not available\n",</div><div class='ctx'> 					      testlist[idx].subfunc_name);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/s390/ucontrol_test.c b/tools/testing/selftests/kvm/s390/ucontrol_test.c<br/>index d265b34c54be..50bc1c38225a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/s390/ucontrol_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/s390/ucontrol_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/s390/ucontrol_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/s390/ucontrol_test.c</a></div><div class='hunk'>@@ -142,19 +142,17 @@ FIXTURE_SETUP(uc_kvm)</div><div class='ctx'> 	self-&gt;kvm_run_size = ioctl(self-&gt;kvm_fd, KVM_GET_VCPU_MMAP_SIZE, NULL);</div><div class='ctx'> 	ASSERT_GE(self-&gt;kvm_run_size, sizeof(struct kvm_run))</div><div class='ctx'> 		  TH_LOG(KVM_IOCTL_ERROR(KVM_GET_VCPU_MMAP_SIZE, self-&gt;kvm_run_size));</div><div class='del'>-	self-&gt;run = (struct kvm_run *)mmap(NULL, self-&gt;kvm_run_size,</div><div class='del'>-		    PROT_READ | PROT_WRITE, MAP_SHARED, self-&gt;vcpu_fd, 0);</div><div class='del'>-	ASSERT_NE(self-&gt;run, MAP_FAILED);</div><div class='add'>+	self-&gt;run = kvm_mmap(self-&gt;kvm_run_size, PROT_READ | PROT_WRITE,</div><div class='add'>+			     MAP_SHARED, self-&gt;vcpu_fd);</div><div class='ctx'> 	/**</div><div class='ctx'> 	 * For virtual cpus that have been created with S390 user controlled</div><div class='ctx'> 	 * virtual machines, the resulting vcpu fd can be memory mapped at page</div><div class='ctx'> 	 * offset KVM_S390_SIE_PAGE_OFFSET in order to obtain a memory map of</div><div class='ctx'> 	 * the virtual cpu's hardware control block.</div><div class='ctx'> 	 */</div><div class='del'>-	self-&gt;sie_block = (struct kvm_s390_sie_block *)mmap(NULL, PAGE_SIZE,</div><div class='del'>-			  PROT_READ | PROT_WRITE, MAP_SHARED,</div><div class='del'>-			  self-&gt;vcpu_fd, KVM_S390_SIE_PAGE_OFFSET &lt;&lt; PAGE_SHIFT);</div><div class='del'>-	ASSERT_NE(self-&gt;sie_block, MAP_FAILED);</div><div class='add'>+	self-&gt;sie_block = __kvm_mmap(PAGE_SIZE, PROT_READ | PROT_WRITE,</div><div class='add'>+				     MAP_SHARED, self-&gt;vcpu_fd,</div><div class='add'>+				     KVM_S390_SIE_PAGE_OFFSET &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	TH_LOG("VM created %p %p", self-&gt;run, self-&gt;sie_block);</div><div class='ctx'> </div><div class='hunk'>@@ -186,8 +184,8 @@ FIXTURE_SETUP(uc_kvm)</div><div class='ctx'> </div><div class='ctx'> FIXTURE_TEARDOWN(uc_kvm)</div><div class='ctx'> {</div><div class='del'>-	munmap(self-&gt;sie_block, PAGE_SIZE);</div><div class='del'>-	munmap(self-&gt;run, self-&gt;kvm_run_size);</div><div class='add'>+	kvm_munmap(self-&gt;sie_block, PAGE_SIZE);</div><div class='add'>+	kvm_munmap(self-&gt;run, self-&gt;kvm_run_size);</div><div class='ctx'> 	close(self-&gt;vcpu_fd);</div><div class='ctx'> 	close(self-&gt;vm_fd);</div><div class='ctx'> 	close(self-&gt;kvm_fd);</div><div class='head'>diff --git a/tools/testing/selftests/kvm/s390/user_operexec.c b/tools/testing/selftests/kvm/s390/user_operexec.c<br/>new file mode 100644<br/>index 000000000000..714906c1d12a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/s390/user_operexec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/s390/user_operexec.c</a></div><div class='hunk'>@@ -0,0 +1,140 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Test operation exception forwarding.</div><div class='add'>+ *</div><div class='add'>+ * Copyright IBM Corp. 2025</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *  Janosch Frank &lt;frankja@linux.ibm.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include "kselftest.h"</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "test_util.h"</div><div class='add'>+#include "sie.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kvm.h&gt;</div><div class='add'>+</div><div class='add'>+static void guest_code_instr0(void)</div><div class='add'>+{</div><div class='add'>+	asm(".word 0x0000");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_user_instr0(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code_instr0);</div><div class='add'>+	rc = __vm_enable_cap(vm, KVM_CAP_S390_USER_INSTR0, 0);</div><div class='add'>+	TEST_ASSERT_EQ(0, rc);</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_S390_SIEIC);</div><div class='add'>+	TEST_ASSERT_EQ(vcpu-&gt;run-&gt;s390_sieic.icptcode, ICPT_OPEREXC);</div><div class='add'>+	TEST_ASSERT_EQ(vcpu-&gt;run-&gt;s390_sieic.ipa, 0);</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_code_user_operexec(void)</div><div class='add'>+{</div><div class='add'>+	asm(".word 0x0807");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_user_operexec(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code_user_operexec);</div><div class='add'>+	rc = __vm_enable_cap(vm, KVM_CAP_S390_USER_OPEREXEC, 0);</div><div class='add'>+	TEST_ASSERT_EQ(0, rc);</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_S390_SIEIC);</div><div class='add'>+	TEST_ASSERT_EQ(vcpu-&gt;run-&gt;s390_sieic.icptcode, ICPT_OPEREXC);</div><div class='add'>+	TEST_ASSERT_EQ(vcpu-&gt;run-&gt;s390_sieic.ipa, 0x0807);</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Since user_operexec is the superset it can be used for the</div><div class='add'>+	 * 0 instruction.</div><div class='add'>+	 */</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code_instr0);</div><div class='add'>+	rc = __vm_enable_cap(vm, KVM_CAP_S390_USER_OPEREXEC, 0);</div><div class='add'>+	TEST_ASSERT_EQ(0, rc);</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_S390_SIEIC);</div><div class='add'>+	TEST_ASSERT_EQ(vcpu-&gt;run-&gt;s390_sieic.icptcode, ICPT_OPEREXC);</div><div class='add'>+	TEST_ASSERT_EQ(vcpu-&gt;run-&gt;s390_sieic.ipa, 0);</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* combine user_instr0 and user_operexec */</div><div class='add'>+static void test_user_operexec_combined(void)</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code_user_operexec);</div><div class='add'>+	rc = __vm_enable_cap(vm, KVM_CAP_S390_USER_INSTR0, 0);</div><div class='add'>+	TEST_ASSERT_EQ(0, rc);</div><div class='add'>+	rc = __vm_enable_cap(vm, KVM_CAP_S390_USER_OPEREXEC, 0);</div><div class='add'>+	TEST_ASSERT_EQ(0, rc);</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_S390_SIEIC);</div><div class='add'>+	TEST_ASSERT_EQ(vcpu-&gt;run-&gt;s390_sieic.icptcode, ICPT_OPEREXC);</div><div class='add'>+	TEST_ASSERT_EQ(vcpu-&gt;run-&gt;s390_sieic.ipa, 0x0807);</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+</div><div class='add'>+	/* Reverse enablement order */</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code_user_operexec);</div><div class='add'>+	rc = __vm_enable_cap(vm, KVM_CAP_S390_USER_OPEREXEC, 0);</div><div class='add'>+	TEST_ASSERT_EQ(0, rc);</div><div class='add'>+	rc = __vm_enable_cap(vm, KVM_CAP_S390_USER_INSTR0, 0);</div><div class='add'>+	TEST_ASSERT_EQ(0, rc);</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_S390_SIEIC);</div><div class='add'>+	TEST_ASSERT_EQ(vcpu-&gt;run-&gt;s390_sieic.icptcode, ICPT_OPEREXC);</div><div class='add'>+	TEST_ASSERT_EQ(vcpu-&gt;run-&gt;s390_sieic.ipa, 0x0807);</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Run all tests above.</div><div class='add'>+ *</div><div class='add'>+ * Enablement after VCPU has been added is automatically tested since</div><div class='add'>+ * we enable the capability after VCPU creation.</div><div class='add'>+ */</div><div class='add'>+static struct testdef {</div><div class='add'>+	const char *name;</div><div class='add'>+	void (*test)(void);</div><div class='add'>+} testlist[] = {</div><div class='add'>+	{ "instr0", test_user_instr0 },</div><div class='add'>+	{ "operexec", test_user_operexec },</div><div class='add'>+	{ "operexec_combined", test_user_operexec_combined},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(kvm_has_cap(KVM_CAP_S390_USER_INSTR0));</div><div class='add'>+</div><div class='add'>+	ksft_print_header();</div><div class='add'>+	ksft_set_plan(ARRAY_SIZE(testlist));</div><div class='add'>+	for (idx = 0; idx &lt; ARRAY_SIZE(testlist); idx++) {</div><div class='add'>+		testlist[idx].test();</div><div class='add'>+		ksft_test_result_pass("%s\n", testlist[idx].name);</div><div class='add'>+	}</div><div class='add'>+	ksft_finished();</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/testing/selftests/kvm/set_memory_region_test.c<br/>index bc440d5aba57..7fe427ff9b38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/set_memory_region_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/set_memory_region_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/set_memory_region_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/set_memory_region_test.c</a></div><div class='hunk'>@@ -350,7 +350,7 @@ static void test_invalid_memory_region_flags(void)</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> 	int r, i;</div><div class='ctx'> </div><div class='del'>-#if defined __aarch64__ || defined __riscv || defined __x86_64__</div><div class='add'>+#if defined __aarch64__ || defined __riscv || defined __x86_64__ || defined __loongarch__</div><div class='ctx'> 	supported_flags |= KVM_MEM_READONLY;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -433,10 +433,10 @@ static void test_add_max_memory_regions(void)</div><div class='ctx'> 	pr_info("Adding slots 0..%i, each memory region with %dK size\n",</div><div class='ctx'> 		(max_mem_slots - 1), MEM_REGION_SIZE &gt;&gt; 10);</div><div class='ctx'> </div><div class='del'>-	mem = mmap(NULL, (size_t)max_mem_slots * MEM_REGION_SIZE + alignment,</div><div class='del'>-		   PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);</div><div class='del'>-	TEST_ASSERT(mem != MAP_FAILED, "Failed to mmap() host");</div><div class='add'>+</div><div class='add'>+	mem = kvm_mmap((size_t)max_mem_slots * MEM_REGION_SIZE + alignment,</div><div class='add'>+		       PROT_READ | PROT_WRITE,</div><div class='add'>+		       MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1);</div><div class='ctx'> 	mem_aligned = (void *)(((size_t) mem + alignment - 1) &amp; ~(alignment - 1));</div><div class='ctx'> </div><div class='ctx'> 	for (slot = 0; slot &lt; max_mem_slots; slot++)</div><div class='hunk'>@@ -446,9 +446,8 @@ static void test_add_max_memory_regions(void)</div><div class='ctx'> 					  mem_aligned + (uint64_t)slot * MEM_REGION_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Check it cannot be added memory slots beyond the limit */</div><div class='del'>-	mem_extra = mmap(NULL, MEM_REGION_SIZE, PROT_READ | PROT_WRITE,</div><div class='del'>-			 MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);</div><div class='del'>-	TEST_ASSERT(mem_extra != MAP_FAILED, "Failed to mmap() host");</div><div class='add'>+	mem_extra = kvm_mmap(MEM_REGION_SIZE, PROT_READ | PROT_WRITE,</div><div class='add'>+			     MAP_PRIVATE | MAP_ANONYMOUS, -1);</div><div class='ctx'> </div><div class='ctx'> 	ret = __vm_set_user_memory_region(vm, max_mem_slots, 0,</div><div class='ctx'> 					  (uint64_t)max_mem_slots * MEM_REGION_SIZE,</div><div class='hunk'>@@ -456,8 +455,8 @@ static void test_add_max_memory_regions(void)</div><div class='ctx'> 	TEST_ASSERT(ret == -1 &amp;&amp; errno == EINVAL,</div><div class='ctx'> 		    "Adding one more memory slot should fail with EINVAL");</div><div class='ctx'> </div><div class='del'>-	munmap(mem, (size_t)max_mem_slots * MEM_REGION_SIZE + alignment);</div><div class='del'>-	munmap(mem_extra, MEM_REGION_SIZE);</div><div class='add'>+	kvm_munmap(mem, (size_t)max_mem_slots * MEM_REGION_SIZE + alignment);</div><div class='add'>+	kvm_munmap(mem_extra, MEM_REGION_SIZE);</div><div class='ctx'> 	kvm_vm_free(vm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/steal_time.c b/tools/testing/selftests/kvm/steal_time.c<br/>index cce2520af720..8edc1fca345b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/steal_time.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/steal_time.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/steal_time.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/steal_time.c</a></div><div class='hunk'>@@ -118,7 +118,7 @@ static int64_t smccc(uint32_t func, uint64_t arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct arm_smccc_res res;</div><div class='ctx'> </div><div class='del'>-	smccc_hvc(func, arg, 0, 0, 0, 0, 0, 0, &amp;res);</div><div class='add'>+	do_smccc(func, arg, 0, 0, 0, 0, 0, 0, &amp;res);</div><div class='ctx'> 	return res.a0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/aperfmperf_test.c b/tools/testing/selftests/kvm/x86/aperfmperf_test.c<br/>new file mode 100644<br/>index 000000000000..8b15a13df939<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/aperfmperf_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/aperfmperf_test.c</a></div><div class='hunk'>@@ -0,0 +1,213 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Test for KVM_X86_DISABLE_EXITS_APERFMPERF</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025, Google LLC.</div><div class='add'>+ *</div><div class='add'>+ * Test the ability to disable VM-exits for rdmsr of IA32_APERF and</div><div class='add'>+ * IA32_MPERF. When these VM-exits are disabled, reads of these MSRs</div><div class='add'>+ * return the host's values.</div><div class='add'>+ *</div><div class='add'>+ * Note: Requires read access to /dev/cpu/&lt;lpu&gt;/msr to read host MSRs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;limits.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdint.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;asm/msr-index.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='add'>+#include "svm_util.h"</div><div class='add'>+#include "test_util.h"</div><div class='add'>+#include "vmx.h"</div><div class='add'>+</div><div class='add'>+#define NUM_ITERATIONS 10000</div><div class='add'>+</div><div class='add'>+static int open_dev_msr(int cpu)</div><div class='add'>+{</div><div class='add'>+	char path[PATH_MAX];</div><div class='add'>+</div><div class='add'>+	snprintf(path, sizeof(path), "/dev/cpu/%d/msr", cpu);</div><div class='add'>+	return open_path_or_exit(path, O_RDONLY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static uint64_t read_dev_msr(int msr_fd, uint32_t msr)</div><div class='add'>+{</div><div class='add'>+	uint64_t data;</div><div class='add'>+	ssize_t rc;</div><div class='add'>+</div><div class='add'>+	rc = pread(msr_fd, &amp;data, sizeof(data), msr);</div><div class='add'>+	TEST_ASSERT(rc == sizeof(data), "Read of MSR 0x%x failed", msr);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_read_aperf_mperf(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_ITERATIONS; i++)</div><div class='add'>+		GUEST_SYNC2(rdmsr(MSR_IA32_APERF), rdmsr(MSR_IA32_MPERF));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define L2_GUEST_STACK_SIZE	64</div><div class='add'>+</div><div class='add'>+static void l2_guest_code(void)</div><div class='add'>+{</div><div class='add'>+	guest_read_aperf_mperf();</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l1_svm_code(struct svm_test_data *svm)</div><div class='add'>+{</div><div class='add'>+	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='add'>+	struct vmcb *vmcb = svm-&gt;vmcb;</div><div class='add'>+</div><div class='add'>+	generic_svm_setup(svm, l2_guest_code, &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='add'>+	run_guest(vmcb, svm-&gt;vmcb_gpa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l1_vmx_code(struct vmx_pages *vmx)</div><div class='add'>+{</div><div class='add'>+	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT_EQ(prepare_for_vmx_operation(vmx), true);</div><div class='add'>+	GUEST_ASSERT_EQ(load_vmcs(vmx), true);</div><div class='add'>+</div><div class='add'>+	prepare_vmcs(vmx, NULL, &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable MSR bitmaps (the bitmap itself is allocated, zeroed, and set</div><div class='add'>+	 * in the VMCS by prepare_vmcs()), as MSR exiting mandatory on Intel.</div><div class='add'>+	 */</div><div class='add'>+	vmwrite(CPU_BASED_VM_EXEC_CONTROL,</div><div class='add'>+		vmreadz(CPU_BASED_VM_EXEC_CONTROL) | CPU_BASED_USE_MSR_BITMAPS);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT(!vmwrite(GUEST_RIP, (u64)l2_guest_code));</div><div class='add'>+	GUEST_ASSERT(!vmlaunch());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_code(void *nested_test_data)</div><div class='add'>+{</div><div class='add'>+	guest_read_aperf_mperf();</div><div class='add'>+</div><div class='add'>+	if (this_cpu_has(X86_FEATURE_SVM))</div><div class='add'>+		l1_svm_code(nested_test_data);</div><div class='add'>+	else if (this_cpu_has(X86_FEATURE_VMX))</div><div class='add'>+		l1_vmx_code(nested_test_data);</div><div class='add'>+	else</div><div class='add'>+		GUEST_DONE();</div><div class='add'>+</div><div class='add'>+	TEST_FAIL("L2 should have signaled 'done'");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_no_aperfmperf(void)</div><div class='add'>+{</div><div class='add'>+	uint64_t msr_val;</div><div class='add'>+	uint8_t vector;</div><div class='add'>+</div><div class='add'>+	vector = rdmsr_safe(MSR_IA32_APERF, &amp;msr_val);</div><div class='add'>+	GUEST_ASSERT(vector == GP_VECTOR);</div><div class='add'>+</div><div class='add'>+	vector = rdmsr_safe(MSR_IA32_APERF, &amp;msr_val);</div><div class='add'>+	GUEST_ASSERT(vector == GP_VECTOR);</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	const bool has_nested = kvm_cpu_has(X86_FEATURE_SVM) || kvm_cpu_has(X86_FEATURE_VMX);</div><div class='add'>+	uint64_t host_aperf_before, host_mperf_before;</div><div class='add'>+	vm_vaddr_t nested_test_data_gva;</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	int msr_fd, cpu, i;</div><div class='add'>+</div><div class='add'>+	/* Sanity check that APERF/MPERF are unsupported by default. */</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_no_aperfmperf);</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	TEST_ASSERT_EQ(get_ucall(vcpu, NULL), UCALL_DONE);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+</div><div class='add'>+	cpu = pin_self_to_any_cpu();</div><div class='add'>+</div><div class='add'>+	msr_fd = open_dev_msr(cpu);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This test requires a non-standard VM initialization, because</div><div class='add'>+	 * KVM_ENABLE_CAP cannot be used on a VM file descriptor after</div><div class='add'>+	 * a VCPU has been created.</div><div class='add'>+	 */</div><div class='add'>+	vm = vm_create(1);</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(vm_check_cap(vm, KVM_CAP_X86_DISABLE_EXITS) &amp;</div><div class='add'>+		     KVM_X86_DISABLE_EXITS_APERFMPERF);</div><div class='add'>+</div><div class='add'>+	vm_enable_cap(vm, KVM_CAP_X86_DISABLE_EXITS,</div><div class='add'>+		      KVM_X86_DISABLE_EXITS_APERFMPERF);</div><div class='add'>+</div><div class='add'>+	vcpu = vm_vcpu_add(vm, 0, guest_code);</div><div class='add'>+</div><div class='add'>+	if (!has_nested)</div><div class='add'>+		nested_test_data_gva = NONCANONICAL;</div><div class='add'>+	else if (kvm_cpu_has(X86_FEATURE_SVM))</div><div class='add'>+		vcpu_alloc_svm(vm, &amp;nested_test_data_gva);</div><div class='add'>+	else</div><div class='add'>+		vcpu_alloc_vmx(vm, &amp;nested_test_data_gva);</div><div class='add'>+</div><div class='add'>+	vcpu_args_set(vcpu, 1, nested_test_data_gva);</div><div class='add'>+</div><div class='add'>+	host_aperf_before = read_dev_msr(msr_fd, MSR_IA32_APERF);</div><div class='add'>+	host_mperf_before = read_dev_msr(msr_fd, MSR_IA32_MPERF);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= NUM_ITERATIONS * (1 + has_nested); i++) {</div><div class='add'>+		uint64_t host_aperf_after, host_mperf_after;</div><div class='add'>+		uint64_t guest_aperf, guest_mperf;</div><div class='add'>+		struct ucall uc;</div><div class='add'>+</div><div class='add'>+		vcpu_run(vcpu);</div><div class='add'>+		TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_IO);</div><div class='add'>+</div><div class='add'>+		switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+		case UCALL_DONE:</div><div class='add'>+			goto done;</div><div class='add'>+		case UCALL_ABORT:</div><div class='add'>+			REPORT_GUEST_ASSERT(uc);</div><div class='add'>+		case UCALL_SYNC:</div><div class='add'>+			guest_aperf = uc.args[0];</div><div class='add'>+			guest_mperf = uc.args[1];</div><div class='add'>+</div><div class='add'>+			host_aperf_after = read_dev_msr(msr_fd, MSR_IA32_APERF);</div><div class='add'>+			host_mperf_after = read_dev_msr(msr_fd, MSR_IA32_MPERF);</div><div class='add'>+</div><div class='add'>+			TEST_ASSERT(host_aperf_before &lt; guest_aperf,</div><div class='add'>+				    "APERF: host_before (0x%" PRIx64 ") &gt;= guest (0x%" PRIx64 ")",</div><div class='add'>+				    host_aperf_before, guest_aperf);</div><div class='add'>+			TEST_ASSERT(guest_aperf &lt; host_aperf_after,</div><div class='add'>+				    "APERF: guest (0x%" PRIx64 ") &gt;= host_after (0x%" PRIx64 ")",</div><div class='add'>+				    guest_aperf, host_aperf_after);</div><div class='add'>+			TEST_ASSERT(host_mperf_before &lt; guest_mperf,</div><div class='add'>+				    "MPERF: host_before (0x%" PRIx64 ") &gt;= guest (0x%" PRIx64 ")",</div><div class='add'>+				    host_mperf_before, guest_mperf);</div><div class='add'>+			TEST_ASSERT(guest_mperf &lt; host_mperf_after,</div><div class='add'>+				    "MPERF: guest (0x%" PRIx64 ") &gt;= host_after (0x%" PRIx64 ")",</div><div class='add'>+				    guest_mperf, host_mperf_after);</div><div class='add'>+</div><div class='add'>+			host_aperf_before = host_aperf_after;</div><div class='add'>+			host_mperf_before = host_mperf_after;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	TEST_FAIL("Didn't receive UCALL_DONE\n");</div><div class='add'>+done:</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+	close(msr_fd);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c b/tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c<br/>index 2929c067c207..b0d2b04a7ff2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c</a></div><div class='hunk'>@@ -41,9 +41,9 @@ struct kvm_page_stats {</div><div class='ctx'> </div><div class='ctx'> static void get_page_stats(struct kvm_vm *vm, struct kvm_page_stats *stats, const char *stage)</div><div class='ctx'> {</div><div class='del'>-	stats-&gt;pages_4k = vm_get_stat(vm, "pages_4k");</div><div class='del'>-	stats-&gt;pages_2m = vm_get_stat(vm, "pages_2m");</div><div class='del'>-	stats-&gt;pages_1g = vm_get_stat(vm, "pages_1g");</div><div class='add'>+	stats-&gt;pages_4k = vm_get_stat(vm, pages_4k);</div><div class='add'>+	stats-&gt;pages_2m = vm_get_stat(vm, pages_2m);</div><div class='add'>+	stats-&gt;pages_1g = vm_get_stat(vm, pages_1g);</div><div class='ctx'> 	stats-&gt;hugepages = stats-&gt;pages_2m + stats-&gt;pages_1g;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("\nPage stats after %s: 4K: %ld 2M: %ld 1G: %ld huge: %ld\n",</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/fastops_test.c b/tools/testing/selftests/kvm/x86/fastops_test.c<br/>new file mode 100644<br/>index 000000000000..8926cfe0e209<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/fastops_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/fastops_test.c</a></div><div class='hunk'>@@ -0,0 +1,209 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#include "test_util.h"</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Execute a fastop() instruction, with or without forced emulation.  BT bit 0</div><div class='add'>+ * to set RFLAGS.CF based on whether or not the input is even or odd, so that</div><div class='add'>+ * instructions like ADC and SBB are deterministic.</div><div class='add'>+ */</div><div class='add'>+#define fastop(__insn)									\</div><div class='add'>+	"bt $0, %[bt_val]\n\t"								\</div><div class='add'>+	__insn "\n\t"									\</div><div class='add'>+	"pushfq\n\t"									\</div><div class='add'>+	"pop %[flags]\n\t"</div><div class='add'>+</div><div class='add'>+#define flags_constraint(flags_val) [flags]"=r"(flags_val)</div><div class='add'>+#define bt_constraint(__bt_val) [bt_val]"rm"((uint32_t)__bt_val)</div><div class='add'>+</div><div class='add'>+#define guest_execute_fastop_1(FEP, insn, __val, __flags)				\</div><div class='add'>+({											\</div><div class='add'>+	__asm__ __volatile__(fastop(FEP insn " %[val]")					\</div><div class='add'>+			     : [val]"+r"(__val), flags_constraint(__flags)		\</div><div class='add'>+			     : bt_constraint(__val)					\</div><div class='add'>+			     : "cc", "memory");						\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define guest_test_fastop_1(insn, type_t, __val)					\</div><div class='add'>+({											\</div><div class='add'>+	type_t val = __val, ex_val = __val, input = __val;				\</div><div class='add'>+	uint64_t flags, ex_flags;							\</div><div class='add'>+											\</div><div class='add'>+	guest_execute_fastop_1("", insn, ex_val, ex_flags);				\</div><div class='add'>+	guest_execute_fastop_1(KVM_FEP, insn, val, flags);				\</div><div class='add'>+											\</div><div class='add'>+	__GUEST_ASSERT(val == ex_val,							\</div><div class='add'>+		       "Wanted 0x%lx for '%s 0x%lx', got 0x%lx",			\</div><div class='add'>+		       (uint64_t)ex_val, insn, (uint64_t)input, (uint64_t)val);		\</div><div class='add'>+	__GUEST_ASSERT(flags == ex_flags,						\</div><div class='add'>+			"Wanted flags 0x%lx for '%s 0x%lx', got 0x%lx",			\</div><div class='add'>+			ex_flags, insn, (uint64_t)input, flags);			\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define guest_execute_fastop_2(FEP, insn, __input, __output, __flags)			\</div><div class='add'>+({											\</div><div class='add'>+	__asm__ __volatile__(fastop(FEP insn " %[input], %[output]")			\</div><div class='add'>+			     : [output]"+r"(__output), flags_constraint(__flags)	\</div><div class='add'>+			     : [input]"r"(__input), bt_constraint(__output)		\</div><div class='add'>+			     : "cc", "memory");						\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define guest_test_fastop_2(insn, type_t, __val1, __val2)				\</div><div class='add'>+({											\</div><div class='add'>+	type_t input = __val1, input2 = __val2, output = __val2, ex_output = __val2;	\</div><div class='add'>+	uint64_t flags, ex_flags;							\</div><div class='add'>+											\</div><div class='add'>+	guest_execute_fastop_2("", insn, input, ex_output, ex_flags);			\</div><div class='add'>+	guest_execute_fastop_2(KVM_FEP, insn, input, output, flags);			\</div><div class='add'>+											\</div><div class='add'>+	__GUEST_ASSERT(output == ex_output,						\</div><div class='add'>+		       "Wanted 0x%lx for '%s 0x%lx 0x%lx', got 0x%lx",			\</div><div class='add'>+		       (uint64_t)ex_output, insn, (uint64_t)input,			\</div><div class='add'>+		       (uint64_t)input2, (uint64_t)output);				\</div><div class='add'>+	__GUEST_ASSERT(flags == ex_flags,						\</div><div class='add'>+			"Wanted flags 0x%lx for '%s 0x%lx, 0x%lx', got 0x%lx",		\</div><div class='add'>+			ex_flags, insn, (uint64_t)input, (uint64_t)input2, flags);	\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define guest_execute_fastop_cl(FEP, insn, __shift, __output, __flags)			\</div><div class='add'>+({											\</div><div class='add'>+	__asm__ __volatile__(fastop(FEP insn " %%cl, %[output]")			\</div><div class='add'>+			     : [output]"+r"(__output), flags_constraint(__flags)	\</div><div class='add'>+			     : "c"(__shift), bt_constraint(__output)			\</div><div class='add'>+			     : "cc", "memory");						\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define guest_test_fastop_cl(insn, type_t, __val1, __val2)				\</div><div class='add'>+({											\</div><div class='add'>+	type_t output = __val2, ex_output = __val2, input = __val2;			\</div><div class='add'>+	uint8_t shift = __val1;								\</div><div class='add'>+	uint64_t flags, ex_flags;							\</div><div class='add'>+											\</div><div class='add'>+	guest_execute_fastop_cl("", insn, shift, ex_output, ex_flags);			\</div><div class='add'>+	guest_execute_fastop_cl(KVM_FEP, insn, shift, output, flags);			\</div><div class='add'>+											\</div><div class='add'>+	__GUEST_ASSERT(output == ex_output,						\</div><div class='add'>+		       "Wanted 0x%lx for '%s 0x%x, 0x%lx', got 0x%lx",			\</div><div class='add'>+		       (uint64_t)ex_output, insn, shift, (uint64_t)input,		\</div><div class='add'>+		       (uint64_t)output);						\</div><div class='add'>+	__GUEST_ASSERT(flags == ex_flags,						\</div><div class='add'>+			"Wanted flags 0x%lx for '%s 0x%x, 0x%lx', got 0x%lx",		\</div><div class='add'>+			ex_flags, insn, shift, (uint64_t)input, flags);			\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define guest_execute_fastop_div(__KVM_ASM_SAFE, insn, __a, __d, __rm, __flags)		\</div><div class='add'>+({											\</div><div class='add'>+	uint64_t ign_error_code;							\</div><div class='add'>+	uint8_t vector;									\</div><div class='add'>+											\</div><div class='add'>+	__asm__ __volatile__(fastop(__KVM_ASM_SAFE(insn " %[denom]"))			\</div><div class='add'>+			     : "+a"(__a), "+d"(__d), flags_constraint(__flags),		\</div><div class='add'>+			       KVM_ASM_SAFE_OUTPUTS(vector, ign_error_code)		\</div><div class='add'>+			     : [denom]"rm"(__rm), bt_constraint(__rm)			\</div><div class='add'>+			     : "cc", "memory", KVM_ASM_SAFE_CLOBBERS);			\</div><div class='add'>+	vector;										\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define guest_test_fastop_div(insn, type_t, __val1, __val2)				\</div><div class='add'>+({											\</div><div class='add'>+	type_t _a = __val1, _d = __val1, rm = __val2;					\</div><div class='add'>+	type_t a = _a, d = _d, ex_a = _a, ex_d = _d;					\</div><div class='add'>+	uint64_t flags, ex_flags;							\</div><div class='add'>+	uint8_t v, ex_v;								\</div><div class='add'>+											\</div><div class='add'>+	ex_v = guest_execute_fastop_div(KVM_ASM_SAFE, insn, ex_a, ex_d, rm, ex_flags);	\</div><div class='add'>+	v = guest_execute_fastop_div(KVM_ASM_SAFE_FEP, insn, a, d, rm, flags);		\</div><div class='add'>+											\</div><div class='add'>+	GUEST_ASSERT_EQ(v, ex_v);							\</div><div class='add'>+	__GUEST_ASSERT(v == ex_v,							\</div><div class='add'>+		       "Wanted vector 0x%x for '%s 0x%lx:0x%lx/0x%lx', got 0x%x",	\</div><div class='add'>+		       ex_v, insn, (uint64_t)_a, (uint64_t)_d, (uint64_t)rm, v);	\</div><div class='add'>+	__GUEST_ASSERT(a == ex_a &amp;&amp; d == ex_d,						\</div><div class='add'>+		       "Wanted 0x%lx:0x%lx for '%s 0x%lx:0x%lx/0x%lx', got 0x%lx:0x%lx",\</div><div class='add'>+		       (uint64_t)ex_a, (uint64_t)ex_d, insn, (uint64_t)_a,		\</div><div class='add'>+		       (uint64_t)_d, (uint64_t)rm, (uint64_t)a, (uint64_t)d);		\</div><div class='add'>+	__GUEST_ASSERT(v || ex_v || (flags == ex_flags),				\</div><div class='add'>+			"Wanted flags 0x%lx for '%s  0x%lx:0x%lx/0x%lx', got 0x%lx",	\</div><div class='add'>+			ex_flags, insn, (uint64_t)_a, (uint64_t)_d, (uint64_t)rm, flags);\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static const uint64_t vals[] = {</div><div class='add'>+	0,</div><div class='add'>+	1,</div><div class='add'>+	2,</div><div class='add'>+	4,</div><div class='add'>+	7,</div><div class='add'>+	0x5555555555555555,</div><div class='add'>+	0xaaaaaaaaaaaaaaaa,</div><div class='add'>+	0xfefefefefefefefe,</div><div class='add'>+	0xffffffffffffffff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define guest_test_fastops(type_t, suffix)						\</div><div class='add'>+do {											\</div><div class='add'>+	int i, j;									\</div><div class='add'>+											\</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(vals); i++) {					\</div><div class='add'>+		guest_test_fastop_1("dec" suffix, type_t, vals[i]);			\</div><div class='add'>+		guest_test_fastop_1("inc" suffix, type_t, vals[i]);			\</div><div class='add'>+		guest_test_fastop_1("neg" suffix, type_t, vals[i]);			\</div><div class='add'>+		guest_test_fastop_1("not" suffix, type_t, vals[i]);			\</div><div class='add'>+											\</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(vals); j++) {				\</div><div class='add'>+			guest_test_fastop_2("add" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("adc" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("and" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+if (sizeof(type_t) != 1) {							\</div><div class='add'>+			guest_test_fastop_2("bsf" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("bsr" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("bt" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("btc" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("btr" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("bts" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("imul" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+}											\</div><div class='add'>+			guest_test_fastop_2("cmp" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("or" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("sbb" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("sub" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("test" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_2("xor" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+											\</div><div class='add'>+			guest_test_fastop_cl("rol" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_cl("ror" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_cl("rcl" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_cl("rcr" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_cl("sar" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_cl("shl" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+			guest_test_fastop_cl("shr" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+											\</div><div class='add'>+			guest_test_fastop_div("div" suffix, type_t, vals[i], vals[j]);	\</div><div class='add'>+		}									\</div><div class='add'>+	}										\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+static void guest_code(void)</div><div class='add'>+{</div><div class='add'>+	guest_test_fastops(uint8_t, "b");</div><div class='add'>+	guest_test_fastops(uint16_t, "w");</div><div class='add'>+	guest_test_fastops(uint32_t, "l");</div><div class='add'>+	guest_test_fastops(uint64_t, "q");</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(is_forced_emulation_enabled);</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code);</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	TEST_ASSERT_EQ(get_ucall(vcpu, NULL), UCALL_DONE);</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/hyperv_cpuid.c b/tools/testing/selftests/kvm/x86/hyperv_cpuid.c<br/>index 4e920705681a..3c21af811d8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/hyperv_cpuid.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/hyperv_cpuid.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/hyperv_cpuid.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/hyperv_cpuid.c</a></div><div class='hunk'>@@ -22,25 +22,6 @@ static void guest_code(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool smt_possible(void)</div><div class='del'>-{</div><div class='del'>-	char buf[16];</div><div class='del'>-	FILE *f;</div><div class='del'>-	bool res = true;</div><div class='del'>-</div><div class='del'>-	f = fopen("/sys/devices/system/cpu/smt/control", "r");</div><div class='del'>-	if (f) {</div><div class='del'>-		if (fread(buf, sizeof(*buf), sizeof(buf), f) &gt; 0) {</div><div class='del'>-			if (!strncmp(buf, "forceoff", 8) ||</div><div class='del'>-			    !strncmp(buf, "notsupported", 12))</div><div class='del'>-				res = false;</div><div class='del'>-		}</div><div class='del'>-		fclose(f);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void test_hv_cpuid(struct kvm_vcpu *vcpu, bool evmcs_expected)</div><div class='ctx'> {</div><div class='ctx'> 	const bool has_irqchip = !vcpu || vcpu-&gt;vm-&gt;has_irqchip;</div><div class='hunk'>@@ -64,7 +45,7 @@ static void test_hv_cpuid(struct kvm_vcpu *vcpu, bool evmcs_expected)</div><div class='ctx'> </div><div class='ctx'> 		TEST_ASSERT((entry-&gt;function &gt;= 0x40000000) &amp;&amp;</div><div class='ctx'> 			    (entry-&gt;function &lt;= 0x40000082),</div><div class='del'>-			    "function %x is our of supported range",</div><div class='add'>+			    "function %x is out of supported range",</div><div class='ctx'> 			    entry-&gt;function);</div><div class='ctx'> </div><div class='ctx'> 		TEST_ASSERT(entry-&gt;index == 0,</div><div class='hunk'>@@ -93,7 +74,7 @@ static void test_hv_cpuid(struct kvm_vcpu *vcpu, bool evmcs_expected)</div><div class='ctx'> 		case 0x40000004:</div><div class='ctx'> 			test_val = entry-&gt;eax &amp; (1UL &lt;&lt; 18);</div><div class='ctx'> </div><div class='del'>-			TEST_ASSERT(!!test_val == !smt_possible(),</div><div class='add'>+			TEST_ASSERT(!!test_val == !is_smt_possible(),</div><div class='ctx'> 				    "NoNonArchitecturalCoreSharing bit"</div><div class='ctx'> 				    " doesn't reflect SMT setting");</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/hyperv_features.c b/tools/testing/selftests/kvm/x86/hyperv_features.c<br/>index 068e9c69710d..130b9ce7e5dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/hyperv_features.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/hyperv_features.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/hyperv_features.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/hyperv_features.c</a></div><div class='hunk'>@@ -54,12 +54,12 @@ static void guest_msr(struct msr_data *msr)</div><div class='ctx'> </div><div class='ctx'> 	if (msr-&gt;fault_expected)</div><div class='ctx'> 		__GUEST_ASSERT(vector == GP_VECTOR,</div><div class='del'>-			       "Expected #GP on %sMSR(0x%x), got vector '0x%x'",</div><div class='del'>-			       msr-&gt;write ? "WR" : "RD", msr-&gt;idx, vector);</div><div class='add'>+			       "Expected #GP on %sMSR(0x%x), got %s",</div><div class='add'>+			       msr-&gt;write ? "WR" : "RD", msr-&gt;idx, ex_str(vector));</div><div class='ctx'> 	else</div><div class='ctx'> 		__GUEST_ASSERT(!vector,</div><div class='del'>-			       "Expected success on %sMSR(0x%x), got vector '0x%x'",</div><div class='del'>-			       msr-&gt;write ? "WR" : "RD", msr-&gt;idx, vector);</div><div class='add'>+			       "Expected success on %sMSR(0x%x), got %s",</div><div class='add'>+			       msr-&gt;write ? "WR" : "RD", msr-&gt;idx, ex_str(vector));</div><div class='ctx'> </div><div class='ctx'> 	if (vector || is_write_only_msr(msr-&gt;idx))</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -94,7 +94,7 @@ static void guest_hcall(vm_vaddr_t pgs_gpa, struct hcall_data *hcall)</div><div class='ctx'> </div><div class='ctx'> 	if (!(hcall-&gt;control &amp; HV_HYPERCALL_FAST_BIT)) {</div><div class='ctx'> 		input = pgs_gpa;</div><div class='del'>-		output = pgs_gpa + 4096;</div><div class='add'>+		output = pgs_gpa + PAGE_SIZE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		input = output = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -102,12 +102,12 @@ static void guest_hcall(vm_vaddr_t pgs_gpa, struct hcall_data *hcall)</div><div class='ctx'> 	vector = __hyperv_hypercall(hcall-&gt;control, input, output, &amp;res);</div><div class='ctx'> 	if (hcall-&gt;ud_expected) {</div><div class='ctx'> 		__GUEST_ASSERT(vector == UD_VECTOR,</div><div class='del'>-			       "Expected #UD for control '%lu', got vector '0x%x'",</div><div class='del'>-			       hcall-&gt;control, vector);</div><div class='add'>+			       "Expected #UD for control '%lu', got %s",</div><div class='add'>+			       hcall-&gt;control, ex_str(vector));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		__GUEST_ASSERT(!vector,</div><div class='del'>-			       "Expected no exception for control '%lu', got vector '0x%x'",</div><div class='del'>-			       hcall-&gt;control, vector);</div><div class='add'>+			       "Expected no exception for control '%lu', got %s",</div><div class='add'>+			       hcall-&gt;control, ex_str(vector));</div><div class='ctx'> 		GUEST_ASSERT_EQ(res, hcall-&gt;expect);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/hyperv_ipi.c b/tools/testing/selftests/kvm/x86/hyperv_ipi.c<br/>index 22c0c124582f..ca61836c4e32 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/hyperv_ipi.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/hyperv_ipi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/hyperv_ipi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/hyperv_ipi.c</a></div><div class='hunk'>@@ -63,8 +63,10 @@ static void receiver_code(void *hcall_page, vm_vaddr_t pgs_gpa)</div><div class='ctx'> 	/* Signal sender vCPU we're ready */</div><div class='ctx'> 	ipis_rcvd[vcpu_id] = (u64)-1;</div><div class='ctx'> </div><div class='del'>-	for (;;)</div><div class='del'>-		asm volatile("sti; hlt; cli");</div><div class='add'>+	for (;;) {</div><div class='add'>+		safe_halt();</div><div class='add'>+		cli();</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void guest_ipi_handler(struct ex_regs *regs)</div><div class='hunk'>@@ -100,7 +102,7 @@ static void sender_guest_code(void *hcall_page, vm_vaddr_t pgs_gpa)</div><div class='ctx'> 	/* 'Slow' HvCallSendSyntheticClusterIpi to RECEIVER_VCPU_ID_1 */</div><div class='ctx'> 	ipi-&gt;vector = IPI_VECTOR;</div><div class='ctx'> 	ipi-&gt;cpu_mask = 1 &lt;&lt; RECEIVER_VCPU_ID_1;</div><div class='del'>-	hyperv_hypercall(HVCALL_SEND_IPI, pgs_gpa, pgs_gpa + 4096);</div><div class='add'>+	hyperv_hypercall(HVCALL_SEND_IPI, pgs_gpa, pgs_gpa + PAGE_SIZE);</div><div class='ctx'> 	nop_loop();</div><div class='ctx'> 	GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_1] == ++ipis_expected[0]);</div><div class='ctx'> 	GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_2] == ipis_expected[1]);</div><div class='hunk'>@@ -114,13 +116,13 @@ static void sender_guest_code(void *hcall_page, vm_vaddr_t pgs_gpa)</div><div class='ctx'> 	GUEST_SYNC(stage++);</div><div class='ctx'> </div><div class='ctx'> 	/* 'Slow' HvCallSendSyntheticClusterIpiEx to RECEIVER_VCPU_ID_1 */</div><div class='del'>-	memset(hcall_page, 0, 4096);</div><div class='add'>+	memset(hcall_page, 0, PAGE_SIZE);</div><div class='ctx'> 	ipi_ex-&gt;vector = IPI_VECTOR;</div><div class='ctx'> 	ipi_ex-&gt;vp_set.format = HV_GENERIC_SET_SPARSE_4K;</div><div class='ctx'> 	ipi_ex-&gt;vp_set.valid_bank_mask = 1 &lt;&lt; 0;</div><div class='ctx'> 	ipi_ex-&gt;vp_set.bank_contents[0] = BIT(RECEIVER_VCPU_ID_1);</div><div class='ctx'> 	hyperv_hypercall(HVCALL_SEND_IPI_EX | (1 &lt;&lt; HV_HYPERCALL_VARHEAD_OFFSET),</div><div class='del'>-			 pgs_gpa, pgs_gpa + 4096);</div><div class='add'>+			 pgs_gpa, pgs_gpa + PAGE_SIZE);</div><div class='ctx'> 	nop_loop();</div><div class='ctx'> 	GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_1] == ++ipis_expected[0]);</div><div class='ctx'> 	GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_2] == ipis_expected[1]);</div><div class='hunk'>@@ -136,13 +138,13 @@ static void sender_guest_code(void *hcall_page, vm_vaddr_t pgs_gpa)</div><div class='ctx'> 	GUEST_SYNC(stage++);</div><div class='ctx'> </div><div class='ctx'> 	/* 'Slow' HvCallSendSyntheticClusterIpiEx to RECEIVER_VCPU_ID_2 */</div><div class='del'>-	memset(hcall_page, 0, 4096);</div><div class='add'>+	memset(hcall_page, 0, PAGE_SIZE);</div><div class='ctx'> 	ipi_ex-&gt;vector = IPI_VECTOR;</div><div class='ctx'> 	ipi_ex-&gt;vp_set.format = HV_GENERIC_SET_SPARSE_4K;</div><div class='ctx'> 	ipi_ex-&gt;vp_set.valid_bank_mask = 1 &lt;&lt; 1;</div><div class='ctx'> 	ipi_ex-&gt;vp_set.bank_contents[0] = BIT(RECEIVER_VCPU_ID_2 - 64);</div><div class='ctx'> 	hyperv_hypercall(HVCALL_SEND_IPI_EX | (1 &lt;&lt; HV_HYPERCALL_VARHEAD_OFFSET),</div><div class='del'>-			 pgs_gpa, pgs_gpa + 4096);</div><div class='add'>+			 pgs_gpa, pgs_gpa + PAGE_SIZE);</div><div class='ctx'> 	nop_loop();</div><div class='ctx'> 	GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_1] == ipis_expected[0]);</div><div class='ctx'> 	GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_2] == ++ipis_expected[1]);</div><div class='hunk'>@@ -158,14 +160,14 @@ static void sender_guest_code(void *hcall_page, vm_vaddr_t pgs_gpa)</div><div class='ctx'> 	GUEST_SYNC(stage++);</div><div class='ctx'> </div><div class='ctx'> 	/* 'Slow' HvCallSendSyntheticClusterIpiEx to both RECEIVER_VCPU_ID_{1,2} */</div><div class='del'>-	memset(hcall_page, 0, 4096);</div><div class='add'>+	memset(hcall_page, 0, PAGE_SIZE);</div><div class='ctx'> 	ipi_ex-&gt;vector = IPI_VECTOR;</div><div class='ctx'> 	ipi_ex-&gt;vp_set.format = HV_GENERIC_SET_SPARSE_4K;</div><div class='ctx'> 	ipi_ex-&gt;vp_set.valid_bank_mask = 1 &lt;&lt; 1 | 1;</div><div class='ctx'> 	ipi_ex-&gt;vp_set.bank_contents[0] = BIT(RECEIVER_VCPU_ID_1);</div><div class='ctx'> 	ipi_ex-&gt;vp_set.bank_contents[1] = BIT(RECEIVER_VCPU_ID_2 - 64);</div><div class='ctx'> 	hyperv_hypercall(HVCALL_SEND_IPI_EX | (2 &lt;&lt; HV_HYPERCALL_VARHEAD_OFFSET),</div><div class='del'>-			 pgs_gpa, pgs_gpa + 4096);</div><div class='add'>+			 pgs_gpa, pgs_gpa + PAGE_SIZE);</div><div class='ctx'> 	nop_loop();</div><div class='ctx'> 	GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_1] == ++ipis_expected[0]);</div><div class='ctx'> 	GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_2] == ++ipis_expected[1]);</div><div class='hunk'>@@ -181,10 +183,10 @@ static void sender_guest_code(void *hcall_page, vm_vaddr_t pgs_gpa)</div><div class='ctx'> 	GUEST_SYNC(stage++);</div><div class='ctx'> </div><div class='ctx'> 	/* 'Slow' HvCallSendSyntheticClusterIpiEx to HV_GENERIC_SET_ALL */</div><div class='del'>-	memset(hcall_page, 0, 4096);</div><div class='add'>+	memset(hcall_page, 0, PAGE_SIZE);</div><div class='ctx'> 	ipi_ex-&gt;vector = IPI_VECTOR;</div><div class='ctx'> 	ipi_ex-&gt;vp_set.format = HV_GENERIC_SET_ALL;</div><div class='del'>-	hyperv_hypercall(HVCALL_SEND_IPI_EX, pgs_gpa, pgs_gpa + 4096);</div><div class='add'>+	hyperv_hypercall(HVCALL_SEND_IPI_EX, pgs_gpa, pgs_gpa + PAGE_SIZE);</div><div class='ctx'> 	nop_loop();</div><div class='ctx'> 	GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_1] == ++ipis_expected[0]);</div><div class='ctx'> 	GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_2] == ++ipis_expected[1]);</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c b/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c<br/>index 077cd0ec3040..a3b7ce155981 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c</a></div><div class='hunk'>@@ -621,7 +621,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	for (i = 0; i &lt; NTEST_PAGES; i++) {</div><div class='ctx'> 		pte = vm_get_page_table_entry(vm, data-&gt;test_pages + i * PAGE_SIZE);</div><div class='ctx'> 		gpa = addr_hva2gpa(vm, pte);</div><div class='del'>-		__virt_pg_map(vm, gva + PAGE_SIZE * i, gpa &amp; PAGE_MASK, PG_LEVEL_4K);</div><div class='add'>+		virt_pg_map(vm, gva + PAGE_SIZE * i, gpa &amp; PAGE_MASK);</div><div class='ctx'> 		data-&gt;test_pages_pte[i] = gva + (gpa &amp; ~PAGE_MASK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/kvm_buslock_test.c b/tools/testing/selftests/kvm/x86/kvm_buslock_test.c<br/>new file mode 100644<br/>index 000000000000..d88500c118eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/kvm_buslock_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/kvm_buslock_test.c</a></div><div class='hunk'>@@ -0,0 +1,135 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2024 Advanced Micro Devices, Inc.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='add'>+#include "svm_util.h"</div><div class='add'>+#include "vmx.h"</div><div class='add'>+#include "test_util.h"</div><div class='add'>+</div><div class='add'>+#define NR_BUS_LOCKS_PER_LEVEL 100</div><div class='add'>+#define CACHE_LINE_SIZE		64</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To generate a bus lock, carve out a buffer that precisely occupies two cache</div><div class='add'>+ * lines and perform an atomic access that splits the two lines.</div><div class='add'>+ */</div><div class='add'>+static u8 buffer[CACHE_LINE_SIZE * 2] __aligned(CACHE_LINE_SIZE);</div><div class='add'>+static atomic_t *val = (void *)&amp;buffer[CACHE_LINE_SIZE - (sizeof(*val) / 2)];</div><div class='add'>+</div><div class='add'>+static void guest_generate_buslocks(void)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; NR_BUS_LOCKS_PER_LEVEL; i++)</div><div class='add'>+		atomic_inc(val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define L2_GUEST_STACK_SIZE	64</div><div class='add'>+</div><div class='add'>+static void l2_guest_code(void)</div><div class='add'>+{</div><div class='add'>+	guest_generate_buslocks();</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l1_svm_code(struct svm_test_data *svm)</div><div class='add'>+{</div><div class='add'>+	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='add'>+	struct vmcb *vmcb = svm-&gt;vmcb;</div><div class='add'>+</div><div class='add'>+	generic_svm_setup(svm, l2_guest_code, &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='add'>+	run_guest(vmcb, svm-&gt;vmcb_gpa);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l1_vmx_code(struct vmx_pages *vmx)</div><div class='add'>+{</div><div class='add'>+	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT_EQ(prepare_for_vmx_operation(vmx), true);</div><div class='add'>+	GUEST_ASSERT_EQ(load_vmcs(vmx), true);</div><div class='add'>+</div><div class='add'>+	prepare_vmcs(vmx, NULL, &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT(!vmwrite(GUEST_RIP, (u64)l2_guest_code));</div><div class='add'>+	GUEST_ASSERT(!vmlaunch());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_code(void *test_data)</div><div class='add'>+{</div><div class='add'>+	guest_generate_buslocks();</div><div class='add'>+</div><div class='add'>+	if (this_cpu_has(X86_FEATURE_SVM))</div><div class='add'>+		l1_svm_code(test_data);</div><div class='add'>+	else if (this_cpu_has(X86_FEATURE_VMX))</div><div class='add'>+		l1_vmx_code(test_data);</div><div class='add'>+	else</div><div class='add'>+		GUEST_DONE();</div><div class='add'>+</div><div class='add'>+	TEST_FAIL("L2 should have signaled 'done'");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	const bool has_nested = kvm_cpu_has(X86_FEATURE_SVM) || kvm_cpu_has(X86_FEATURE_VMX);</div><div class='add'>+	vm_vaddr_t nested_test_data_gva;</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_run *run;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	int i, bus_locks = 0;</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(kvm_has_cap(KVM_CAP_X86_BUS_LOCK_EXIT));</div><div class='add'>+</div><div class='add'>+	vm = vm_create(1);</div><div class='add'>+	vm_enable_cap(vm, KVM_CAP_X86_BUS_LOCK_EXIT, KVM_BUS_LOCK_DETECTION_EXIT);</div><div class='add'>+	vcpu = vm_vcpu_add(vm, 0, guest_code);</div><div class='add'>+</div><div class='add'>+	if (kvm_cpu_has(X86_FEATURE_SVM))</div><div class='add'>+		vcpu_alloc_svm(vm, &amp;nested_test_data_gva);</div><div class='add'>+	else</div><div class='add'>+		vcpu_alloc_vmx(vm, &amp;nested_test_data_gva);</div><div class='add'>+</div><div class='add'>+	vcpu_args_set(vcpu, 1, nested_test_data_gva);</div><div class='add'>+</div><div class='add'>+	run = vcpu-&gt;run;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= NR_BUS_LOCKS_PER_LEVEL * (1 + has_nested); i++) {</div><div class='add'>+		struct ucall uc;</div><div class='add'>+</div><div class='add'>+		vcpu_run(vcpu);</div><div class='add'>+</div><div class='add'>+		if (run-&gt;exit_reason == KVM_EXIT_IO) {</div><div class='add'>+			switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+			case UCALL_ABORT:</div><div class='add'>+				REPORT_GUEST_ASSERT(uc);</div><div class='add'>+				goto done;</div><div class='add'>+			case UCALL_SYNC:</div><div class='add'>+				continue;</div><div class='add'>+			case UCALL_DONE:</div><div class='add'>+				goto done;</div><div class='add'>+			default:</div><div class='add'>+				TEST_FAIL("Unknown ucall 0x%lx.", uc.cmd);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_X86_BUS_LOCK);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Verify the counter is actually getting incremented, e.g. that</div><div class='add'>+		 * KVM isn't skipping the instruction.  On Intel, the exit is</div><div class='add'>+		 * trap-like, i.e. the counter should already have been</div><div class='add'>+		 * incremented.  On AMD, it's fault-like, i.e. the counter will</div><div class='add'>+		 * be incremented when the guest re-executes the instruction.</div><div class='add'>+		 */</div><div class='add'>+		sync_global_from_guest(vm, *val);</div><div class='add'>+		TEST_ASSERT_EQ(atomic_read(val), bus_locks + host_cpu_is_intel);</div><div class='add'>+</div><div class='add'>+		bus_locks++;</div><div class='add'>+	}</div><div class='add'>+	TEST_FAIL("Didn't receive UCALL_DONE, took %u bus lock exits\n", bus_locks);</div><div class='add'>+done:</div><div class='add'>+	TEST_ASSERT_EQ(i, bus_locks);</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/monitor_mwait_test.c b/tools/testing/selftests/kvm/x86/monitor_mwait_test.c<br/>index 2b550eff35f1..e45c028d2a7e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/monitor_mwait_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/monitor_mwait_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/monitor_mwait_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/monitor_mwait_test.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "kvm_util.h"</div><div class='ctx'> #include "processor.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define CPUID_MWAIT (1u &lt;&lt; 3)</div><div class='ctx'> </div><div class='hunk'>@@ -14,6 +15,8 @@ enum monitor_mwait_testcases {</div><div class='ctx'> 	MWAIT_QUIRK_DISABLED = BIT(0),</div><div class='ctx'> 	MISC_ENABLES_QUIRK_DISABLED = BIT(1),</div><div class='ctx'> 	MWAIT_DISABLED = BIT(2),</div><div class='add'>+	CPUID_DISABLED = BIT(3),</div><div class='add'>+	TEST_MAX = CPUID_DISABLED * 2 - 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -27,19 +30,27 @@ do {									\</div><div class='ctx'> 									\</div><div class='ctx'> 	if (fault_wanted)						\</div><div class='ctx'> 		__GUEST_ASSERT((vector) == UD_VECTOR,			\</div><div class='del'>-			       "Expected #UD on " insn " for testcase '0x%x', got '0x%x'", \</div><div class='del'>-			       testcase, vector);			\</div><div class='add'>+			       "Expected #UD on " insn " for testcase '0x%x', got %s", \</div><div class='add'>+			       testcase, ex_str(vector));		\</div><div class='ctx'> 	else								\</div><div class='ctx'> 		__GUEST_ASSERT(!(vector),				\</div><div class='del'>-			       "Expected success on " insn " for testcase '0x%x', got '0x%x'", \</div><div class='del'>-			       testcase, vector);			\</div><div class='add'>+			       "Expected success on " insn " for testcase '0x%x', got %s", \</div><div class='add'>+			       testcase, ex_str(vector));		\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-static void guest_monitor_wait(int testcase)</div><div class='add'>+static void guest_monitor_wait(void *arg)</div><div class='ctx'> {</div><div class='add'>+	int testcase = (int) (long) arg;</div><div class='ctx'> 	u8 vector;</div><div class='ctx'> </div><div class='del'>-	GUEST_SYNC(testcase);</div><div class='add'>+	u64 val = rdmsr(MSR_IA32_MISC_ENABLE) &amp; ~MSR_IA32_MISC_ENABLE_MWAIT;</div><div class='add'>+	if (!(testcase &amp; MWAIT_DISABLED))</div><div class='add'>+		val |= MSR_IA32_MISC_ENABLE_MWAIT;</div><div class='add'>+	wrmsr(MSR_IA32_MISC_ENABLE, val);</div><div class='add'>+</div><div class='add'>+	__GUEST_ASSERT(this_cpu_has(X86_FEATURE_MWAIT) == !(testcase &amp; MWAIT_DISABLED),</div><div class='add'>+		       "Expected CPUID.MWAIT %s\n",</div><div class='add'>+		       (testcase &amp; MWAIT_DISABLED) ? "cleared" : "set");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Arbitrarily MONITOR this function, SVM performs fault checks before</div><div class='hunk'>@@ -50,19 +61,6 @@ static void guest_monitor_wait(int testcase)</div><div class='ctx'> </div><div class='ctx'> 	vector = kvm_asm_safe("mwait", "a"(guest_monitor_wait), "c"(0), "d"(0));</div><div class='ctx'> 	GUEST_ASSERT_MONITOR_MWAIT("MWAIT", testcase, vector);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void guest_code(void)</div><div class='del'>-{</div><div class='del'>-	guest_monitor_wait(MWAIT_DISABLED);</div><div class='del'>-</div><div class='del'>-	guest_monitor_wait(MWAIT_QUIRK_DISABLED | MWAIT_DISABLED);</div><div class='del'>-</div><div class='del'>-	guest_monitor_wait(MISC_ENABLES_QUIRK_DISABLED | MWAIT_DISABLED);</div><div class='del'>-	guest_monitor_wait(MISC_ENABLES_QUIRK_DISABLED);</div><div class='del'>-</div><div class='del'>-	guest_monitor_wait(MISC_ENABLES_QUIRK_DISABLED | MWAIT_QUIRK_DISABLED | MWAIT_DISABLED);</div><div class='del'>-	guest_monitor_wait(MISC_ENABLES_QUIRK_DISABLED | MWAIT_QUIRK_DISABLED);</div><div class='ctx'> </div><div class='ctx'> 	GUEST_DONE();</div><div class='ctx'> }</div><div class='hunk'>@@ -74,56 +72,65 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> 	struct ucall uc;</div><div class='ctx'> 	int testcase;</div><div class='add'>+	char test[80];</div><div class='ctx'> </div><div class='ctx'> 	TEST_REQUIRE(this_cpu_has(X86_FEATURE_MWAIT));</div><div class='ctx'> 	TEST_REQUIRE(kvm_has_cap(KVM_CAP_DISABLE_QUIRKS2));</div><div class='ctx'> </div><div class='del'>-	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code);</div><div class='del'>-	vcpu_clear_cpuid_feature(vcpu, X86_FEATURE_MWAIT);</div><div class='add'>+	ksft_print_header();</div><div class='add'>+	ksft_set_plan(12);</div><div class='add'>+	for (testcase = 0; testcase &lt;= TEST_MAX; testcase++) {</div><div class='add'>+		vm = vm_create_with_one_vcpu(&amp;vcpu, guest_monitor_wait);</div><div class='add'>+		vcpu_args_set(vcpu, 1, (void *)(long)testcase);</div><div class='add'>+</div><div class='add'>+		disabled_quirks = 0;</div><div class='add'>+		if (testcase &amp; MWAIT_QUIRK_DISABLED) {</div><div class='add'>+			disabled_quirks |= KVM_X86_QUIRK_MWAIT_NEVER_UD_FAULTS;</div><div class='add'>+			strcpy(test, "MWAIT can fault");</div><div class='add'>+		} else {</div><div class='add'>+			strcpy(test, "MWAIT never faults");</div><div class='add'>+		}</div><div class='add'>+		if (testcase &amp; MISC_ENABLES_QUIRK_DISABLED) {</div><div class='add'>+			disabled_quirks |= KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT;</div><div class='add'>+			strcat(test, ", MISC_ENABLE updates CPUID");</div><div class='add'>+		} else {</div><div class='add'>+			strcat(test, ", no CPUID updates");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		vm_enable_cap(vm, KVM_CAP_DISABLE_QUIRKS2, disabled_quirks);</div><div class='add'>+</div><div class='add'>+		if (!(testcase &amp; MISC_ENABLES_QUIRK_DISABLED) &amp;&amp;</div><div class='add'>+		    (!!(testcase &amp; CPUID_DISABLED) ^ !!(testcase &amp; MWAIT_DISABLED)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (testcase &amp; CPUID_DISABLED) {</div><div class='add'>+			strcat(test, ", CPUID clear");</div><div class='add'>+			vcpu_clear_cpuid_feature(vcpu, X86_FEATURE_MWAIT);</div><div class='add'>+		} else {</div><div class='add'>+			strcat(test, ", CPUID set");</div><div class='add'>+			vcpu_set_cpuid_feature(vcpu, X86_FEATURE_MWAIT);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (testcase &amp; MWAIT_DISABLED)</div><div class='add'>+			strcat(test, ", MWAIT disabled");</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='ctx'> 		vcpu_run(vcpu);</div><div class='ctx'> 		TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_IO);</div><div class='ctx'> </div><div class='ctx'> 		switch (get_ucall(vcpu, &amp;uc)) {</div><div class='del'>-		case UCALL_SYNC:</div><div class='del'>-			testcase = uc.args[1];</div><div class='del'>-			break;</div><div class='ctx'> 		case UCALL_ABORT:</div><div class='del'>-			REPORT_GUEST_ASSERT(uc);</div><div class='del'>-			goto done;</div><div class='add'>+			/* Detected in vcpu_run */</div><div class='add'>+			break;</div><div class='ctx'> 		case UCALL_DONE:</div><div class='del'>-			goto done;</div><div class='add'>+			ksft_test_result_pass("%s\n", test);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			TEST_FAIL("Unknown ucall %lu", uc.cmd);</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		disabled_quirks = 0;</div><div class='del'>-		if (testcase &amp; MWAIT_QUIRK_DISABLED)</div><div class='del'>-			disabled_quirks |= KVM_X86_QUIRK_MWAIT_NEVER_UD_FAULTS;</div><div class='del'>-		if (testcase &amp; MISC_ENABLES_QUIRK_DISABLED)</div><div class='del'>-			disabled_quirks |= KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT;</div><div class='del'>-		vm_enable_cap(vm, KVM_CAP_DISABLE_QUIRKS2, disabled_quirks);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If the MISC_ENABLES quirk (KVM neglects to update CPUID to</div><div class='del'>-		 * enable/disable MWAIT) is disabled, toggle the ENABLE_MWAIT</div><div class='del'>-		 * bit in MISC_ENABLES accordingly.  If the quirk is enabled,</div><div class='del'>-		 * the only valid configuration is MWAIT disabled, as CPUID</div><div class='del'>-		 * can't be manually changed after running the vCPU.</div><div class='del'>-		 */</div><div class='del'>-		if (!(testcase &amp; MISC_ENABLES_QUIRK_DISABLED)) {</div><div class='del'>-			TEST_ASSERT(testcase &amp; MWAIT_DISABLED,</div><div class='del'>-				    "Can't toggle CPUID features after running vCPU");</div><div class='del'>-			continue;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		vcpu_set_msr(vcpu, MSR_IA32_MISC_ENABLE,</div><div class='del'>-			     (testcase &amp; MWAIT_DISABLED) ? 0 : MSR_IA32_MISC_ENABLE_MWAIT);</div><div class='add'>+		kvm_vm_free(vm);</div><div class='ctx'> 	}</div><div class='add'>+	ksft_finished();</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	kvm_vm_free(vm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/msrs_test.c b/tools/testing/selftests/kvm/x86/msrs_test.c<br/>new file mode 100644<br/>index 000000000000..40d918aedce6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/msrs_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/msrs_test.c</a></div><div class='hunk'>@@ -0,0 +1,489 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#include &lt;asm/msr-index.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;stdint.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='add'>+</div><div class='add'>+/* Use HYPERVISOR for MSRs that are emulated unconditionally (as is HYPERVISOR). */</div><div class='add'>+#define X86_FEATURE_NONE X86_FEATURE_HYPERVISOR</div><div class='add'>+</div><div class='add'>+struct kvm_msr {</div><div class='add'>+	const struct kvm_x86_cpu_feature feature;</div><div class='add'>+	const struct kvm_x86_cpu_feature feature2;</div><div class='add'>+	const char *name;</div><div class='add'>+	const u64 reset_val;</div><div class='add'>+	const u64 write_val;</div><div class='add'>+	const u64 rsvd_val;</div><div class='add'>+	const u32 index;</div><div class='add'>+	const bool is_kvm_defined;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ____MSR_TEST(msr, str, val, rsvd, reset, feat, f2, is_kvm)	\</div><div class='add'>+{									\</div><div class='add'>+	.index = msr,							\</div><div class='add'>+	.name = str,							\</div><div class='add'>+	.write_val = val,						\</div><div class='add'>+	.rsvd_val = rsvd,						\</div><div class='add'>+	.reset_val = reset,						\</div><div class='add'>+	.feature = X86_FEATURE_ ##feat,					\</div><div class='add'>+	.feature2 = X86_FEATURE_ ##f2,					\</div><div class='add'>+	.is_kvm_defined = is_kvm,					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __MSR_TEST(msr, str, val, rsvd, reset, feat)			\</div><div class='add'>+	____MSR_TEST(msr, str, val, rsvd, reset, feat, feat, false)</div><div class='add'>+</div><div class='add'>+#define MSR_TEST_NON_ZERO(msr, val, rsvd, reset, feat)			\</div><div class='add'>+	__MSR_TEST(msr, #msr, val, rsvd, reset, feat)</div><div class='add'>+</div><div class='add'>+#define MSR_TEST(msr, val, rsvd, feat)					\</div><div class='add'>+	__MSR_TEST(msr, #msr, val, rsvd, 0, feat)</div><div class='add'>+</div><div class='add'>+#define MSR_TEST2(msr, val, rsvd, feat, f2)				\</div><div class='add'>+	____MSR_TEST(msr, #msr, val, rsvd, 0, feat, f2, false)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Note, use a page aligned value for the canonical value so that the value</div><div class='add'>+ * is compatible with MSRs that use bits 11:0 for things other than addresses.</div><div class='add'>+ */</div><div class='add'>+static const u64 canonical_val = 0x123456789000ull;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Arbitrary value with bits set in every byte, but not all bits set.  This is</div><div class='add'>+ * also a non-canonical value, but that's coincidental (any 64-bit value with</div><div class='add'>+ * an alternating 0s/1s pattern will be non-canonical).</div><div class='add'>+ */</div><div class='add'>+static const u64 u64_val = 0xaaaa5555aaaa5555ull;</div><div class='add'>+</div><div class='add'>+#define MSR_TEST_CANONICAL(msr, feat)					\</div><div class='add'>+	__MSR_TEST(msr, #msr, canonical_val, NONCANONICAL, 0, feat)</div><div class='add'>+</div><div class='add'>+#define MSR_TEST_KVM(msr, val, rsvd, feat)				\</div><div class='add'>+	____MSR_TEST(KVM_REG_ ##msr, #msr, val, rsvd, 0, feat, feat, true)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The main struct must be scoped to a function due to the use of structures to</div><div class='add'>+ * define features.  For the global structure, allocate enough space for the</div><div class='add'>+ * foreseeable future without getting too ridiculous, to minimize maintenance</div><div class='add'>+ * costs (bumping the array size every time an MSR is added is really annoying).</div><div class='add'>+ */</div><div class='add'>+static struct kvm_msr msrs[128];</div><div class='add'>+static int idx;</div><div class='add'>+</div><div class='add'>+static bool ignore_unsupported_msrs;</div><div class='add'>+</div><div class='add'>+static u64 fixup_rdmsr_val(u32 msr, u64 want)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * AMD CPUs drop bits 63:32 on some MSRs that Intel CPUs support.  KVM</div><div class='add'>+	 * is supposed to emulate that behavior based on guest vendor model</div><div class='add'>+	 * (which is the same as the host vendor model for this test).</div><div class='add'>+	 */</div><div class='add'>+	if (!host_cpu_is_amd)</div><div class='add'>+		return want;</div><div class='add'>+</div><div class='add'>+	switch (msr) {</div><div class='add'>+	case MSR_IA32_SYSENTER_ESP:</div><div class='add'>+	case MSR_IA32_SYSENTER_EIP:</div><div class='add'>+	case MSR_TSC_AUX:</div><div class='add'>+		return want &amp; GENMASK_ULL(31, 0);</div><div class='add'>+	default:</div><div class='add'>+		return want;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __rdmsr(u32 msr, u64 want)</div><div class='add'>+{</div><div class='add'>+	u64 val;</div><div class='add'>+	u8 vec;</div><div class='add'>+</div><div class='add'>+	vec = rdmsr_safe(msr, &amp;val);</div><div class='add'>+	__GUEST_ASSERT(!vec, "Unexpected %s on RDMSR(0x%x)", ex_str(vec), msr);</div><div class='add'>+</div><div class='add'>+	__GUEST_ASSERT(val == want, "Wanted 0x%lx from RDMSR(0x%x), got 0x%lx",</div><div class='add'>+		       want, msr, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __wrmsr(u32 msr, u64 val)</div><div class='add'>+{</div><div class='add'>+	u8 vec;</div><div class='add'>+</div><div class='add'>+	vec = wrmsr_safe(msr, val);</div><div class='add'>+	__GUEST_ASSERT(!vec, "Unexpected %s on WRMSR(0x%x, 0x%lx)",</div><div class='add'>+		       ex_str(vec), msr, val);</div><div class='add'>+	__rdmsr(msr, fixup_rdmsr_val(msr, val));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_test_supported_msr(const struct kvm_msr *msr)</div><div class='add'>+{</div><div class='add'>+	__rdmsr(msr-&gt;index, msr-&gt;reset_val);</div><div class='add'>+	__wrmsr(msr-&gt;index, msr-&gt;write_val);</div><div class='add'>+	GUEST_SYNC(fixup_rdmsr_val(msr-&gt;index, msr-&gt;write_val));</div><div class='add'>+</div><div class='add'>+	__rdmsr(msr-&gt;index, msr-&gt;reset_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_test_unsupported_msr(const struct kvm_msr *msr)</div><div class='add'>+{</div><div class='add'>+	u64 val;</div><div class='add'>+	u8 vec;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * KVM's ABI with respect to ignore_msrs is a mess and largely beyond</div><div class='add'>+	 * repair, just skip the unsupported MSR tests.</div><div class='add'>+	 */</div><div class='add'>+	if (ignore_unsupported_msrs)</div><div class='add'>+		goto skip_wrmsr_gp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * {S,U}_CET exist if IBT or SHSTK is supported, but with bits that are</div><div class='add'>+	 * writable only if their associated feature is supported.  Skip the</div><div class='add'>+	 * RDMSR #GP test if the secondary feature is supported, but perform</div><div class='add'>+	 * the WRMSR #GP test as the to-be-written value is tied to the primary</div><div class='add'>+	 * feature.  For all other MSRs, simply do nothing.</div><div class='add'>+	 */</div><div class='add'>+	if (this_cpu_has(msr-&gt;feature2)) {</div><div class='add'>+		if  (msr-&gt;index != MSR_IA32_U_CET &amp;&amp;</div><div class='add'>+		     msr-&gt;index != MSR_IA32_S_CET)</div><div class='add'>+			goto skip_wrmsr_gp;</div><div class='add'>+</div><div class='add'>+		goto skip_rdmsr_gp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vec = rdmsr_safe(msr-&gt;index, &amp;val);</div><div class='add'>+	__GUEST_ASSERT(vec == GP_VECTOR, "Wanted #GP on RDMSR(0x%x), got %s",</div><div class='add'>+		       msr-&gt;index, ex_str(vec));</div><div class='add'>+</div><div class='add'>+skip_rdmsr_gp:</div><div class='add'>+	vec = wrmsr_safe(msr-&gt;index, msr-&gt;write_val);</div><div class='add'>+	__GUEST_ASSERT(vec == GP_VECTOR, "Wanted #GP on WRMSR(0x%x, 0x%lx), got %s",</div><div class='add'>+		       msr-&gt;index, msr-&gt;write_val, ex_str(vec));</div><div class='add'>+</div><div class='add'>+skip_wrmsr_gp:</div><div class='add'>+	GUEST_SYNC(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void guest_test_reserved_val(const struct kvm_msr *msr)</div><div class='add'>+{</div><div class='add'>+	/* Skip reserved value checks as well, ignore_msrs is trully a mess. */</div><div class='add'>+	if (ignore_unsupported_msrs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the CPU will truncate the written value (e.g. SYSENTER on AMD),</div><div class='add'>+	 * expect success and a truncated value, not #GP.</div><div class='add'>+	 */</div><div class='add'>+	if (!this_cpu_has(msr-&gt;feature) ||</div><div class='add'>+	    msr-&gt;rsvd_val == fixup_rdmsr_val(msr-&gt;index, msr-&gt;rsvd_val)) {</div><div class='add'>+		u8 vec = wrmsr_safe(msr-&gt;index, msr-&gt;rsvd_val);</div><div class='add'>+</div><div class='add'>+		__GUEST_ASSERT(vec == GP_VECTOR,</div><div class='add'>+			       "Wanted #GP on WRMSR(0x%x, 0x%lx), got %s",</div><div class='add'>+			       msr-&gt;index, msr-&gt;rsvd_val, ex_str(vec));</div><div class='add'>+	} else {</div><div class='add'>+		__wrmsr(msr-&gt;index, msr-&gt;rsvd_val);</div><div class='add'>+		__wrmsr(msr-&gt;index, msr-&gt;reset_val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_main(void)</div><div class='add'>+{</div><div class='add'>+	for (;;) {</div><div class='add'>+		const struct kvm_msr *msr = &amp;msrs[READ_ONCE(idx)];</div><div class='add'>+</div><div class='add'>+		if (this_cpu_has(msr-&gt;feature))</div><div class='add'>+			guest_test_supported_msr(msr);</div><div class='add'>+		else</div><div class='add'>+			guest_test_unsupported_msr(msr);</div><div class='add'>+</div><div class='add'>+		if (msr-&gt;rsvd_val)</div><div class='add'>+			guest_test_reserved_val(msr);</div><div class='add'>+</div><div class='add'>+		GUEST_SYNC(msr-&gt;reset_val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool has_one_reg;</div><div class='add'>+static bool use_one_reg;</div><div class='add'>+</div><div class='add'>+#define KVM_X86_MAX_NR_REGS	1</div><div class='add'>+</div><div class='add'>+static bool vcpu_has_reg(struct kvm_vcpu *vcpu, u64 reg)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		struct kvm_reg_list list;</div><div class='add'>+		u64 regs[KVM_X86_MAX_NR_REGS];</div><div class='add'>+	} regs = {};</div><div class='add'>+	int r, i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If KVM_GET_REG_LIST succeeds with n=0, i.e. there are no supported</div><div class='add'>+	 * regs, then the vCPU obviously doesn't support the reg.</div><div class='add'>+	 */</div><div class='add'>+	r = __vcpu_ioctl(vcpu, KVM_GET_REG_LIST, &amp;regs.list);</div><div class='add'>+	if (!r)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT_EQ(errno, E2BIG);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * KVM x86 is expected to support enumerating a relative small number</div><div class='add'>+	 * of regs.  The majority of registers supported by KVM_{G,S}ET_ONE_REG</div><div class='add'>+	 * are enumerated via other ioctls, e.g. KVM_GET_MSR_INDEX_LIST.  For</div><div class='add'>+	 * simplicity, hardcode the maximum number of regs and manually update</div><div class='add'>+	 * the test as necessary.</div><div class='add'>+	 */</div><div class='add'>+	TEST_ASSERT(regs.list.n &lt;= KVM_X86_MAX_NR_REGS,</div><div class='add'>+		    "KVM reports %llu regs, test expects at most %u regs, stale test?",</div><div class='add'>+		    regs.list.n, KVM_X86_MAX_NR_REGS);</div><div class='add'>+</div><div class='add'>+	vcpu_ioctl(vcpu, KVM_GET_REG_LIST, &amp;regs.list);</div><div class='add'>+	for (i = 0; i &lt; regs.list.n; i++) {</div><div class='add'>+		if (regs.regs[i] == reg)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void host_test_kvm_reg(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	bool has_reg = vcpu_cpuid_has(vcpu, msrs[idx].feature);</div><div class='add'>+	u64 reset_val = msrs[idx].reset_val;</div><div class='add'>+	u64 write_val = msrs[idx].write_val;</div><div class='add'>+	u64 rsvd_val = msrs[idx].rsvd_val;</div><div class='add'>+	u32 reg = msrs[idx].index;</div><div class='add'>+	u64 val;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (!use_one_reg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	TEST_ASSERT_EQ(vcpu_has_reg(vcpu, KVM_X86_REG_KVM(reg)), has_reg);</div><div class='add'>+</div><div class='add'>+	if (!has_reg) {</div><div class='add'>+		r = __vcpu_get_reg(vcpu, KVM_X86_REG_KVM(reg), &amp;val);</div><div class='add'>+		TEST_ASSERT(r &amp;&amp; errno == EINVAL,</div><div class='add'>+			    "Expected failure on get_reg(0x%x)", reg);</div><div class='add'>+		rsvd_val = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = vcpu_get_reg(vcpu, KVM_X86_REG_KVM(reg));</div><div class='add'>+	TEST_ASSERT(val == reset_val, "Wanted 0x%lx from get_reg(0x%x), got 0x%lx",</div><div class='add'>+		    reset_val, reg, val);</div><div class='add'>+</div><div class='add'>+	vcpu_set_reg(vcpu, KVM_X86_REG_KVM(reg), write_val);</div><div class='add'>+	val = vcpu_get_reg(vcpu, KVM_X86_REG_KVM(reg));</div><div class='add'>+	TEST_ASSERT(val == write_val, "Wanted 0x%lx from get_reg(0x%x), got 0x%lx",</div><div class='add'>+		    write_val, reg, val);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	r = __vcpu_set_reg(vcpu, KVM_X86_REG_KVM(reg), rsvd_val);</div><div class='add'>+	TEST_ASSERT(r, "Expected failure on set_reg(0x%x, 0x%lx)", reg, rsvd_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void host_test_msr(struct kvm_vcpu *vcpu, u64 guest_val)</div><div class='add'>+{</div><div class='add'>+	u64 reset_val = msrs[idx].reset_val;</div><div class='add'>+	u32 msr = msrs[idx].index;</div><div class='add'>+	u64 val;</div><div class='add'>+</div><div class='add'>+	if (!kvm_cpu_has(msrs[idx].feature))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val = vcpu_get_msr(vcpu, msr);</div><div class='add'>+	TEST_ASSERT(val == guest_val, "Wanted 0x%lx from get_msr(0x%x), got 0x%lx",</div><div class='add'>+		    guest_val, msr, val);</div><div class='add'>+</div><div class='add'>+	if (use_one_reg)</div><div class='add'>+		vcpu_set_reg(vcpu, KVM_X86_REG_MSR(msr), reset_val);</div><div class='add'>+	else</div><div class='add'>+		vcpu_set_msr(vcpu, msr, reset_val);</div><div class='add'>+</div><div class='add'>+	val = vcpu_get_msr(vcpu, msr);</div><div class='add'>+	TEST_ASSERT(val == reset_val, "Wanted 0x%lx from get_msr(0x%x), got 0x%lx",</div><div class='add'>+		    reset_val, msr, val);</div><div class='add'>+</div><div class='add'>+	if (!has_one_reg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val = vcpu_get_reg(vcpu, KVM_X86_REG_MSR(msr));</div><div class='add'>+	TEST_ASSERT(val == reset_val, "Wanted 0x%lx from get_reg(0x%x), got 0x%lx",</div><div class='add'>+		    reset_val, msr, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_vcpu_run(struct kvm_vcpu *vcpu)</div><div class='add'>+{</div><div class='add'>+	struct ucall uc;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		vcpu_run(vcpu);</div><div class='add'>+</div><div class='add'>+		switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+		case UCALL_SYNC:</div><div class='add'>+			host_test_msr(vcpu, uc.args[1]);</div><div class='add'>+			return;</div><div class='add'>+		case UCALL_PRINTF:</div><div class='add'>+			pr_info("%s", uc.buffer);</div><div class='add'>+			break;</div><div class='add'>+		case UCALL_ABORT:</div><div class='add'>+			REPORT_GUEST_ASSERT(uc);</div><div class='add'>+		case UCALL_DONE:</div><div class='add'>+			TEST_FAIL("Unexpected UCALL_DONE");</div><div class='add'>+		default:</div><div class='add'>+			TEST_FAIL("Unexpected ucall: %lu", uc.cmd);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vcpus_run(struct kvm_vcpu **vcpus, const int NR_VCPUS)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_VCPUS; i++)</div><div class='add'>+		do_vcpu_run(vcpus[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MISC_ENABLES_RESET_VAL (MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL | MSR_IA32_MISC_ENABLE_BTS_UNAVAIL)</div><div class='add'>+</div><div class='add'>+static void test_msrs(void)</div><div class='add'>+{</div><div class='add'>+	const struct kvm_msr __msrs[] = {</div><div class='add'>+		MSR_TEST_NON_ZERO(MSR_IA32_MISC_ENABLE,</div><div class='add'>+				  MISC_ENABLES_RESET_VAL | MSR_IA32_MISC_ENABLE_FAST_STRING,</div><div class='add'>+				  MSR_IA32_MISC_ENABLE_FAST_STRING, MISC_ENABLES_RESET_VAL, NONE),</div><div class='add'>+		MSR_TEST_NON_ZERO(MSR_IA32_CR_PAT, 0x07070707, 0, 0x7040600070406, NONE),</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * TSC_AUX is supported if RDTSCP *or* RDPID is supported.  Add</div><div class='add'>+		 * entries for each features so that TSC_AUX doesn't exists for</div><div class='add'>+		 * the "unsupported" vCPU, and obviously to test both cases.</div><div class='add'>+		 */</div><div class='add'>+		MSR_TEST2(MSR_TSC_AUX, 0x12345678, u64_val, RDTSCP, RDPID),</div><div class='add'>+		MSR_TEST2(MSR_TSC_AUX, 0x12345678, u64_val, RDPID, RDTSCP),</div><div class='add'>+</div><div class='add'>+		MSR_TEST(MSR_IA32_SYSENTER_CS, 0x1234, 0, NONE),</div><div class='add'>+		/*</div><div class='add'>+		 * SYSENTER_{ESP,EIP} are technically non-canonical on Intel,</div><div class='add'>+		 * but KVM doesn't emulate that behavior on emulated writes,</div><div class='add'>+		 * i.e. this test will observe different behavior if the MSR</div><div class='add'>+		 * writes are handed by hardware vs. KVM.  KVM's behavior is</div><div class='add'>+		 * intended (though far from ideal), so don't bother testing</div><div class='add'>+		 * non-canonical values.</div><div class='add'>+		 */</div><div class='add'>+		MSR_TEST(MSR_IA32_SYSENTER_ESP, canonical_val, 0, NONE),</div><div class='add'>+		MSR_TEST(MSR_IA32_SYSENTER_EIP, canonical_val, 0, NONE),</div><div class='add'>+</div><div class='add'>+		MSR_TEST_CANONICAL(MSR_FS_BASE, LM),</div><div class='add'>+		MSR_TEST_CANONICAL(MSR_GS_BASE, LM),</div><div class='add'>+		MSR_TEST_CANONICAL(MSR_KERNEL_GS_BASE, LM),</div><div class='add'>+		MSR_TEST_CANONICAL(MSR_LSTAR, LM),</div><div class='add'>+		MSR_TEST_CANONICAL(MSR_CSTAR, LM),</div><div class='add'>+		MSR_TEST(MSR_SYSCALL_MASK, 0xffffffff, 0, LM),</div><div class='add'>+</div><div class='add'>+		MSR_TEST2(MSR_IA32_S_CET, CET_SHSTK_EN, CET_RESERVED, SHSTK, IBT),</div><div class='add'>+		MSR_TEST2(MSR_IA32_S_CET, CET_ENDBR_EN, CET_RESERVED, IBT, SHSTK),</div><div class='add'>+		MSR_TEST2(MSR_IA32_U_CET, CET_SHSTK_EN, CET_RESERVED, SHSTK, IBT),</div><div class='add'>+		MSR_TEST2(MSR_IA32_U_CET, CET_ENDBR_EN, CET_RESERVED, IBT, SHSTK),</div><div class='add'>+		MSR_TEST_CANONICAL(MSR_IA32_PL0_SSP, SHSTK),</div><div class='add'>+		MSR_TEST(MSR_IA32_PL0_SSP, canonical_val, canonical_val | 1, SHSTK),</div><div class='add'>+		MSR_TEST_CANONICAL(MSR_IA32_PL1_SSP, SHSTK),</div><div class='add'>+		MSR_TEST(MSR_IA32_PL1_SSP, canonical_val, canonical_val | 1, SHSTK),</div><div class='add'>+		MSR_TEST_CANONICAL(MSR_IA32_PL2_SSP, SHSTK),</div><div class='add'>+		MSR_TEST(MSR_IA32_PL2_SSP, canonical_val, canonical_val | 1, SHSTK),</div><div class='add'>+		MSR_TEST_CANONICAL(MSR_IA32_PL3_SSP, SHSTK),</div><div class='add'>+		MSR_TEST(MSR_IA32_PL3_SSP, canonical_val, canonical_val | 1, SHSTK),</div><div class='add'>+</div><div class='add'>+		MSR_TEST_KVM(GUEST_SSP, canonical_val, NONCANONICAL, SHSTK),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	const struct kvm_x86_cpu_feature feat_none = X86_FEATURE_NONE;</div><div class='add'>+	const struct kvm_x86_cpu_feature feat_lm = X86_FEATURE_LM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Create three vCPUs, but run them on the same task, to validate KVM's</div><div class='add'>+	 * context switching of MSR state.  Don't pin the task to a pCPU to</div><div class='add'>+	 * also validate KVM's handling of cross-pCPU migration.  Use the full</div><div class='add'>+	 * set of features for the first two vCPUs, but clear all features in</div><div class='add'>+	 * third vCPU in order to test both positive and negative paths.</div><div class='add'>+	 */</div><div class='add'>+	const int NR_VCPUS = 3;</div><div class='add'>+	struct kvm_vcpu *vcpus[NR_VCPUS];</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	kvm_static_assert(sizeof(__msrs) &lt;= sizeof(msrs));</div><div class='add'>+	kvm_static_assert(ARRAY_SIZE(__msrs) &lt;= ARRAY_SIZE(msrs));</div><div class='add'>+	memcpy(msrs, __msrs, sizeof(__msrs));</div><div class='add'>+</div><div class='add'>+	ignore_unsupported_msrs = kvm_is_ignore_msrs();</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_vcpus(NR_VCPUS, guest_main, vcpus);</div><div class='add'>+</div><div class='add'>+	sync_global_to_guest(vm, msrs);</div><div class='add'>+	sync_global_to_guest(vm, ignore_unsupported_msrs);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clear features in the "unsupported features" vCPU.  This needs to be</div><div class='add'>+	 * done before the first vCPU run as KVM's ABI is that guest CPUID is</div><div class='add'>+	 * immutable once the vCPU has been run.</div><div class='add'>+	 */</div><div class='add'>+	for (idx = 0; idx &lt; ARRAY_SIZE(__msrs); idx++) {</div><div class='add'>+		/*</div><div class='add'>+		 * Don't clear LM; selftests are 64-bit only, and KVM doesn't</div><div class='add'>+		 * honor LM=0 for MSRs that are supposed to exist if and only</div><div class='add'>+		 * if the vCPU is a 64-bit model.  Ditto for NONE; clearing a</div><div class='add'>+		 * fake feature flag will result in false failures.</div><div class='add'>+		 */</div><div class='add'>+		if (memcmp(&amp;msrs[idx].feature, &amp;feat_lm, sizeof(feat_lm)) &amp;&amp;</div><div class='add'>+		    memcmp(&amp;msrs[idx].feature, &amp;feat_none, sizeof(feat_none)))</div><div class='add'>+			vcpu_clear_cpuid_feature(vcpus[2], msrs[idx].feature);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; ARRAY_SIZE(__msrs); idx++) {</div><div class='add'>+		struct kvm_msr *msr = &amp;msrs[idx];</div><div class='add'>+</div><div class='add'>+		if (msr-&gt;is_kvm_defined) {</div><div class='add'>+			for (i = 0; i &lt; NR_VCPUS; i++)</div><div class='add'>+				host_test_kvm_reg(vcpus[i]);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Verify KVM_GET_SUPPORTED_CPUID and KVM_GET_MSR_INDEX_LIST</div><div class='add'>+		 * are consistent with respect to MSRs whose existence is</div><div class='add'>+		 * enumerated via CPUID.  Skip the check for FS/GS.base MSRs,</div><div class='add'>+		 * as they aren't reported in the save/restore list since their</div><div class='add'>+		 * state is managed via SREGS.</div><div class='add'>+		 */</div><div class='add'>+		TEST_ASSERT(msr-&gt;index == MSR_FS_BASE || msr-&gt;index == MSR_GS_BASE ||</div><div class='add'>+			    kvm_msr_is_in_save_restore_list(msr-&gt;index) ==</div><div class='add'>+			    (kvm_cpu_has(msr-&gt;feature) || kvm_cpu_has(msr-&gt;feature2)),</div><div class='add'>+			    "%s %s in save/restore list, but %s according to CPUID", msr-&gt;name,</div><div class='add'>+			    kvm_msr_is_in_save_restore_list(msr-&gt;index) ? "is" : "isn't",</div><div class='add'>+			    (kvm_cpu_has(msr-&gt;feature) || kvm_cpu_has(msr-&gt;feature2)) ?</div><div class='add'>+			    "supported" : "unsupported");</div><div class='add'>+</div><div class='add'>+		sync_global_to_guest(vm, idx);</div><div class='add'>+</div><div class='add'>+		vcpus_run(vcpus, NR_VCPUS);</div><div class='add'>+		vcpus_run(vcpus, NR_VCPUS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(void)</div><div class='add'>+{</div><div class='add'>+	has_one_reg = kvm_has_cap(KVM_CAP_ONE_REG);</div><div class='add'>+</div><div class='add'>+	test_msrs();</div><div class='add'>+</div><div class='add'>+	if (has_one_reg) {</div><div class='add'>+		use_one_reg = true;</div><div class='add'>+		test_msrs();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/vmx_close_while_nested_test.c b/tools/testing/selftests/kvm/x86/nested_close_kvm_test.c<br/>index dad988351493..f001cb836bfa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/vmx_close_while_nested_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/vmx_close_while_nested_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/nested_close_kvm_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/nested_close_kvm_test.c</a></div><div class='hunk'>@@ -1,7 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='del'>- * vmx_close_while_nested</div><div class='del'>- *</div><div class='ctx'>  * Copyright (C) 2019, Red Hat, Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Verify that nothing bad happens if a KVM user exits with open</div><div class='hunk'>@@ -12,6 +10,7 @@</div><div class='ctx'> #include "kvm_util.h"</div><div class='ctx'> #include "processor.h"</div><div class='ctx'> #include "vmx.h"</div><div class='add'>+#include "svm_util.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;sys/ioctl.h&gt;</div><div class='hunk'>@@ -22,6 +21,8 @@ enum {</div><div class='ctx'> 	PORT_L0_EXIT = 0x2000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define L2_GUEST_STACK_SIZE 64</div><div class='add'>+</div><div class='ctx'> static void l2_guest_code(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Exit to L0 */</div><div class='hunk'>@@ -29,9 +30,8 @@ static void l2_guest_code(void)</div><div class='ctx'> 		     : : [port] "d" (PORT_L0_EXIT) : "rax");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void l1_guest_code(struct vmx_pages *vmx_pages)</div><div class='add'>+static void l1_vmx_code(struct vmx_pages *vmx_pages)</div><div class='ctx'> {</div><div class='del'>-#define L2_GUEST_STACK_SIZE 64</div><div class='ctx'> 	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	GUEST_ASSERT(prepare_for_vmx_operation(vmx_pages));</div><div class='hunk'>@@ -45,19 +45,43 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)</div><div class='ctx'> 	GUEST_ASSERT(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void l1_svm_code(struct svm_test_data *svm)</div><div class='add'>+{</div><div class='add'>+	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='add'>+</div><div class='add'>+	/* Prepare the VMCB for L2 execution. */</div><div class='add'>+	generic_svm_setup(svm, l2_guest_code,</div><div class='add'>+			  &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='add'>+</div><div class='add'>+	run_guest(svm-&gt;vmcb, svm-&gt;vmcb_gpa);</div><div class='add'>+	GUEST_ASSERT(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l1_guest_code(void *data)</div><div class='add'>+{</div><div class='add'>+	if (this_cpu_has(X86_FEATURE_VMX))</div><div class='add'>+		l1_vmx_code(data);</div><div class='add'>+	else</div><div class='add'>+		l1_svm_code(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='del'>-	vm_vaddr_t vmx_pages_gva;</div><div class='add'>+	vm_vaddr_t guest_gva;</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> </div><div class='del'>-	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX));</div><div class='add'>+	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX) ||</div><div class='add'>+		     kvm_cpu_has(X86_FEATURE_SVM));</div><div class='ctx'> </div><div class='ctx'> 	vm = vm_create_with_one_vcpu(&amp;vcpu, l1_guest_code);</div><div class='ctx'> </div><div class='del'>-	/* Allocate VMX pages and shared descriptors (vmx_pages). */</div><div class='del'>-	vcpu_alloc_vmx(vm, &amp;vmx_pages_gva);</div><div class='del'>-	vcpu_args_set(vcpu, 1, vmx_pages_gva);</div><div class='add'>+	if (kvm_cpu_has(X86_FEATURE_VMX))</div><div class='add'>+		vcpu_alloc_vmx(vm, &amp;guest_gva);</div><div class='add'>+	else</div><div class='add'>+		vcpu_alloc_svm(vm, &amp;guest_gva);</div><div class='add'>+</div><div class='add'>+	vcpu_args_set(vcpu, 1, guest_gva);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		volatile struct kvm_run *run = vcpu-&gt;run;</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/nested_emulation_test.c b/tools/testing/selftests/kvm/x86/nested_emulation_test.c<br/>new file mode 100644<br/>index 000000000000..abc824dba04f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/nested_emulation_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/nested_emulation_test.c</a></div><div class='hunk'>@@ -0,0 +1,146 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#include "test_util.h"</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='add'>+#include "vmx.h"</div><div class='add'>+#include "svm_util.h"</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	SVM_F,</div><div class='add'>+	VMX_F,</div><div class='add'>+	NR_VIRTUALIZATION_FLAVORS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct emulated_instruction {</div><div class='add'>+	const char name[32];</div><div class='add'>+	uint8_t opcode[15];</div><div class='add'>+	uint32_t exit_reason[NR_VIRTUALIZATION_FLAVORS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct emulated_instruction instructions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "pause",</div><div class='add'>+		.opcode = { 0xf3, 0x90 },</div><div class='add'>+		.exit_reason = { SVM_EXIT_PAUSE,</div><div class='add'>+				 EXIT_REASON_PAUSE_INSTRUCTION, }</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "hlt",</div><div class='add'>+		.opcode = { 0xf4 },</div><div class='add'>+		.exit_reason = { SVM_EXIT_HLT,</div><div class='add'>+				 EXIT_REASON_HLT, }</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static uint8_t kvm_fep[] = { 0x0f, 0x0b, 0x6b, 0x76, 0x6d };	/* ud2 ; .ascii "kvm" */</div><div class='add'>+static uint8_t l2_guest_code[sizeof(kvm_fep) + 15];</div><div class='add'>+static uint8_t *l2_instruction = &amp;l2_guest_code[sizeof(kvm_fep)];</div><div class='add'>+</div><div class='add'>+static uint32_t get_instruction_length(struct emulated_instruction *insn)</div><div class='add'>+{</div><div class='add'>+	uint32_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(insn-&gt;opcode) &amp;&amp; insn-&gt;opcode[i]; i++)</div><div class='add'>+		;</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void guest_code(void *test_data)</div><div class='add'>+{</div><div class='add'>+	int f = this_cpu_has(X86_FEATURE_SVM) ? SVM_F : VMX_F;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memcpy(l2_guest_code, kvm_fep, sizeof(kvm_fep));</div><div class='add'>+</div><div class='add'>+	if (f == SVM_F) {</div><div class='add'>+		struct svm_test_data *svm = test_data;</div><div class='add'>+		struct vmcb *vmcb = svm-&gt;vmcb;</div><div class='add'>+</div><div class='add'>+		generic_svm_setup(svm, NULL, NULL);</div><div class='add'>+		vmcb-&gt;save.idtr.limit = 0;</div><div class='add'>+		vmcb-&gt;save.rip = (u64)l2_guest_code;</div><div class='add'>+</div><div class='add'>+		vmcb-&gt;control.intercept |= BIT_ULL(INTERCEPT_SHUTDOWN) |</div><div class='add'>+					   BIT_ULL(INTERCEPT_PAUSE) |</div><div class='add'>+					   BIT_ULL(INTERCEPT_HLT);</div><div class='add'>+		vmcb-&gt;control.intercept_exceptions = 0;</div><div class='add'>+	} else {</div><div class='add'>+		GUEST_ASSERT(prepare_for_vmx_operation(test_data));</div><div class='add'>+		GUEST_ASSERT(load_vmcs(test_data));</div><div class='add'>+</div><div class='add'>+		prepare_vmcs(test_data, NULL, NULL);</div><div class='add'>+		GUEST_ASSERT(!vmwrite(GUEST_IDTR_LIMIT, 0));</div><div class='add'>+		GUEST_ASSERT(!vmwrite(GUEST_RIP, (u64)l2_guest_code));</div><div class='add'>+		GUEST_ASSERT(!vmwrite(EXCEPTION_BITMAP, 0));</div><div class='add'>+</div><div class='add'>+		vmwrite(CPU_BASED_VM_EXEC_CONTROL, vmreadz(CPU_BASED_VM_EXEC_CONTROL) |</div><div class='add'>+						   CPU_BASED_PAUSE_EXITING |</div><div class='add'>+						   CPU_BASED_HLT_EXITING);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(instructions); i++) {</div><div class='add'>+		struct emulated_instruction *insn = &amp;instructions[i];</div><div class='add'>+		uint32_t insn_len = get_instruction_length(insn);</div><div class='add'>+		uint32_t exit_insn_len;</div><div class='add'>+		u32 exit_reason;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Copy the target instruction to the L2 code stream, and fill</div><div class='add'>+		 * the remaining bytes with INT3s so that a missed intercept</div><div class='add'>+		 * results in a consistent failure mode (SHUTDOWN).</div><div class='add'>+		 */</div><div class='add'>+		memcpy(l2_instruction, insn-&gt;opcode, insn_len);</div><div class='add'>+		memset(l2_instruction + insn_len, 0xcc, sizeof(insn-&gt;opcode) - insn_len);</div><div class='add'>+</div><div class='add'>+		if (f == SVM_F) {</div><div class='add'>+			struct svm_test_data *svm = test_data;</div><div class='add'>+			struct vmcb *vmcb = svm-&gt;vmcb;</div><div class='add'>+</div><div class='add'>+			run_guest(vmcb, svm-&gt;vmcb_gpa);</div><div class='add'>+			exit_reason = vmcb-&gt;control.exit_code;</div><div class='add'>+			exit_insn_len = vmcb-&gt;control.next_rip - vmcb-&gt;save.rip;</div><div class='add'>+			GUEST_ASSERT_EQ(vmcb-&gt;save.rip, (u64)l2_instruction);</div><div class='add'>+		} else {</div><div class='add'>+			GUEST_ASSERT_EQ(i ? vmresume() : vmlaunch(), 0);</div><div class='add'>+			exit_reason = vmreadz(VM_EXIT_REASON);</div><div class='add'>+			exit_insn_len = vmreadz(VM_EXIT_INSTRUCTION_LEN);</div><div class='add'>+			GUEST_ASSERT_EQ(vmreadz(GUEST_RIP), (u64)l2_instruction);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__GUEST_ASSERT(exit_reason == insn-&gt;exit_reason[f],</div><div class='add'>+			       "Wanted exit_reason '0x%x' for '%s', got '0x%x'",</div><div class='add'>+			       insn-&gt;exit_reason[f], insn-&gt;name, exit_reason);</div><div class='add'>+</div><div class='add'>+		__GUEST_ASSERT(exit_insn_len == insn_len,</div><div class='add'>+			       "Wanted insn_len '%u' for '%s', got '%u'",</div><div class='add'>+			       insn_len, insn-&gt;name, exit_insn_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	vm_vaddr_t nested_test_data_gva;</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(is_forced_emulation_enabled);</div><div class='add'>+	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_SVM) || kvm_cpu_has(X86_FEATURE_VMX));</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code);</div><div class='add'>+	vm_enable_cap(vm, KVM_CAP_EXCEPTION_PAYLOAD, -2ul);</div><div class='add'>+</div><div class='add'>+	if (kvm_cpu_has(X86_FEATURE_SVM))</div><div class='add'>+		vcpu_alloc_svm(vm, &amp;nested_test_data_gva);</div><div class='add'>+	else</div><div class='add'>+		vcpu_alloc_vmx(vm, &amp;nested_test_data_gva);</div><div class='add'>+</div><div class='add'>+	vcpu_args_set(vcpu, 1, nested_test_data_gva);</div><div class='add'>+</div><div class='add'>+	vcpu_run(vcpu);</div><div class='add'>+	TEST_ASSERT_EQ(get_ucall(vcpu, NULL), UCALL_DONE);</div><div class='add'>+</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/nested_exceptions_test.c b/tools/testing/selftests/kvm/x86/nested_exceptions_test.c<br/>index 3eb0313ffa39..3641a42934ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/nested_exceptions_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/nested_exceptions_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/nested_exceptions_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/nested_exceptions_test.c</a></div><div class='hunk'>@@ -85,6 +85,7 @@ static void svm_run_l2(struct svm_test_data *svm, void *l2_code, int vector,</div><div class='ctx'> </div><div class='ctx'> 	GUEST_ASSERT_EQ(ctrl-&gt;exit_code, (SVM_EXIT_EXCP_BASE + vector));</div><div class='ctx'> 	GUEST_ASSERT_EQ(ctrl-&gt;exit_info_1, error_code);</div><div class='add'>+	GUEST_ASSERT(!ctrl-&gt;int_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l1_svm_code(struct svm_test_data *svm)</div><div class='hunk'>@@ -122,6 +123,7 @@ static void vmx_run_l2(void *l2_code, int vector, uint32_t error_code)</div><div class='ctx'> 	GUEST_ASSERT_EQ(vmreadz(VM_EXIT_REASON), EXIT_REASON_EXCEPTION_NMI);</div><div class='ctx'> 	GUEST_ASSERT_EQ((vmreadz(VM_EXIT_INTR_INFO) &amp; 0xff), vector);</div><div class='ctx'> 	GUEST_ASSERT_EQ(vmreadz(VM_EXIT_INTR_ERROR_CODE), error_code);</div><div class='add'>+	GUEST_ASSERT(!vmreadz(GUEST_INTERRUPTIBILITY_INFO));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void l1_vmx_code(struct vmx_pages *vmx)</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c b/tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c<br/>new file mode 100644<br/>index 000000000000..a6b6da9cf7fe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c</a></div><div class='hunk'>@@ -0,0 +1,116 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025, Google LLC.</div><div class='add'>+ *</div><div class='add'>+ * This test verifies that L1 fails to enter L2 with an invalid CR3, and</div><div class='add'>+ * succeeds otherwise.</div><div class='add'>+ */</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "vmx.h"</div><div class='add'>+#include "svm_util.h"</div><div class='add'>+#include "kselftest.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define L2_GUEST_STACK_SIZE 64</div><div class='add'>+</div><div class='add'>+static void l2_guest_code(void)</div><div class='add'>+{</div><div class='add'>+	vmcall();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l1_svm_code(struct svm_test_data *svm)</div><div class='add'>+{</div><div class='add'>+	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='add'>+	uintptr_t save_cr3;</div><div class='add'>+</div><div class='add'>+	generic_svm_setup(svm, l2_guest_code,</div><div class='add'>+			  &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='add'>+</div><div class='add'>+	/* Try to run L2 with invalid CR3 and make sure it fails */</div><div class='add'>+	save_cr3 = svm-&gt;vmcb-&gt;save.cr3;</div><div class='add'>+	svm-&gt;vmcb-&gt;save.cr3 = -1ull;</div><div class='add'>+	run_guest(svm-&gt;vmcb, svm-&gt;vmcb_gpa);</div><div class='add'>+	GUEST_ASSERT(svm-&gt;vmcb-&gt;control.exit_code == SVM_EXIT_ERR);</div><div class='add'>+</div><div class='add'>+	/* Now restore CR3 and make sure L2 runs successfully */</div><div class='add'>+	svm-&gt;vmcb-&gt;save.cr3 = save_cr3;</div><div class='add'>+	run_guest(svm-&gt;vmcb, svm-&gt;vmcb_gpa);</div><div class='add'>+	GUEST_ASSERT(svm-&gt;vmcb-&gt;control.exit_code == SVM_EXIT_VMMCALL);</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l1_vmx_code(struct vmx_pages *vmx_pages)</div><div class='add'>+{</div><div class='add'>+	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='add'>+	uintptr_t save_cr3;</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT(prepare_for_vmx_operation(vmx_pages));</div><div class='add'>+	GUEST_ASSERT(load_vmcs(vmx_pages));</div><div class='add'>+</div><div class='add'>+	prepare_vmcs(vmx_pages, l2_guest_code,</div><div class='add'>+		     &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='add'>+</div><div class='add'>+	/* Try to run L2 with invalid CR3 and make sure it fails */</div><div class='add'>+	save_cr3 = vmreadz(GUEST_CR3);</div><div class='add'>+	vmwrite(GUEST_CR3, -1ull);</div><div class='add'>+	GUEST_ASSERT(!vmlaunch());</div><div class='add'>+	GUEST_ASSERT(vmreadz(VM_EXIT_REASON) ==</div><div class='add'>+		     (EXIT_REASON_FAILED_VMENTRY | EXIT_REASON_INVALID_STATE));</div><div class='add'>+</div><div class='add'>+	/* Now restore CR3 and make sure L2 runs successfully */</div><div class='add'>+	vmwrite(GUEST_CR3, save_cr3);</div><div class='add'>+	GUEST_ASSERT(!vmlaunch());</div><div class='add'>+	GUEST_ASSERT(vmreadz(VM_EXIT_REASON) == EXIT_REASON_VMCALL);</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l1_guest_code(void *data)</div><div class='add'>+{</div><div class='add'>+	if (this_cpu_has(X86_FEATURE_VMX))</div><div class='add'>+		l1_vmx_code(data);</div><div class='add'>+	else</div><div class='add'>+		l1_svm_code(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	vm_vaddr_t guest_gva = 0;</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX) ||</div><div class='add'>+		     kvm_cpu_has(X86_FEATURE_SVM));</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, l1_guest_code);</div><div class='add'>+</div><div class='add'>+	if (kvm_cpu_has(X86_FEATURE_VMX))</div><div class='add'>+		vcpu_alloc_vmx(vm, &amp;guest_gva);</div><div class='add'>+	else</div><div class='add'>+		vcpu_alloc_svm(vm, &amp;guest_gva);</div><div class='add'>+</div><div class='add'>+	vcpu_args_set(vcpu, 1, guest_gva);</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		struct ucall uc;</div><div class='add'>+</div><div class='add'>+		vcpu_run(vcpu);</div><div class='add'>+		TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_IO);</div><div class='add'>+</div><div class='add'>+		switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+		case UCALL_ABORT:</div><div class='add'>+			REPORT_GUEST_ASSERT(uc);</div><div class='add'>+		case UCALL_SYNC:</div><div class='add'>+			break;</div><div class='add'>+		case UCALL_DONE:</div><div class='add'>+			goto done;</div><div class='add'>+		default:</div><div class='add'>+			TEST_FAIL("Unknown ucall %lu", uc.cmd);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/vmx_tsc_adjust_test.c b/tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c<br/>index 2ceb5c78c442..2839f650e5c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/vmx_tsc_adjust_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/vmx_tsc_adjust_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c</a></div><div class='hunk'>@@ -1,7 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='del'>- * vmx_tsc_adjust_test</div><div class='del'>- *</div><div class='ctx'>  * Copyright (C) 2018, Google LLC.</div><div class='ctx'>  *</div><div class='ctx'>  * IA32_TSC_ADJUST test</div><div class='hunk'>@@ -22,6 +20,7 @@</div><div class='ctx'> #include "kvm_util.h"</div><div class='ctx'> #include "processor.h"</div><div class='ctx'> #include "vmx.h"</div><div class='add'>+#include "svm_util.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;sys/ioctl.h&gt;</div><div class='hunk'>@@ -35,6 +34,8 @@</div><div class='ctx'> #define TSC_ADJUST_VALUE (1ll &lt;&lt; 32)</div><div class='ctx'> #define TSC_OFFSET_VALUE -(1ll &lt;&lt; 48)</div><div class='ctx'> </div><div class='add'>+#define L2_GUEST_STACK_SIZE 64</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	PORT_ABORT = 0x1000,</div><div class='ctx'> 	PORT_REPORT,</div><div class='hunk'>@@ -72,42 +73,47 @@ static void l2_guest_code(void)</div><div class='ctx'> 	__asm__ __volatile__("vmcall");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void l1_guest_code(struct vmx_pages *vmx_pages)</div><div class='add'>+static void l1_guest_code(void *data)</div><div class='ctx'> {</div><div class='del'>-#define L2_GUEST_STACK_SIZE 64</div><div class='ctx'> 	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='del'>-	uint32_t control;</div><div class='del'>-	uintptr_t save_cr3;</div><div class='ctx'> </div><div class='add'>+	/* Set TSC from L1 and make sure TSC_ADJUST is updated correctly */</div><div class='ctx'> 	GUEST_ASSERT(rdtsc() &lt; TSC_ADJUST_VALUE);</div><div class='ctx'> 	wrmsr(MSR_IA32_TSC, rdtsc() - TSC_ADJUST_VALUE);</div><div class='ctx'> 	check_ia32_tsc_adjust(-1 * TSC_ADJUST_VALUE);</div><div class='ctx'> </div><div class='del'>-	GUEST_ASSERT(prepare_for_vmx_operation(vmx_pages));</div><div class='del'>-	GUEST_ASSERT(load_vmcs(vmx_pages));</div><div class='del'>-</div><div class='del'>-	/* Prepare the VMCS for L2 execution. */</div><div class='del'>-	prepare_vmcs(vmx_pages, l2_guest_code,</div><div class='del'>-		     &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='del'>-	control = vmreadz(CPU_BASED_VM_EXEC_CONTROL);</div><div class='del'>-	control |= CPU_BASED_USE_MSR_BITMAPS | CPU_BASED_USE_TSC_OFFSETTING;</div><div class='del'>-	vmwrite(CPU_BASED_VM_EXEC_CONTROL, control);</div><div class='del'>-	vmwrite(TSC_OFFSET, TSC_OFFSET_VALUE);</div><div class='del'>-</div><div class='del'>-	/* Jump into L2.  First, test failure to load guest CR3.  */</div><div class='del'>-	save_cr3 = vmreadz(GUEST_CR3);</div><div class='del'>-	vmwrite(GUEST_CR3, -1ull);</div><div class='del'>-	GUEST_ASSERT(!vmlaunch());</div><div class='del'>-	GUEST_ASSERT(vmreadz(VM_EXIT_REASON) ==</div><div class='del'>-		     (EXIT_REASON_FAILED_VMENTRY | EXIT_REASON_INVALID_STATE));</div><div class='del'>-	check_ia32_tsc_adjust(-1 * TSC_ADJUST_VALUE);</div><div class='del'>-	vmwrite(GUEST_CR3, save_cr3);</div><div class='del'>-</div><div class='del'>-	GUEST_ASSERT(!vmlaunch());</div><div class='del'>-	GUEST_ASSERT(vmreadz(VM_EXIT_REASON) == EXIT_REASON_VMCALL);</div><div class='add'>+	/*</div><div class='add'>+	 * Run L2 with TSC_OFFSET. L2 will write to TSC, and L1 is not</div><div class='add'>+	 * intercepting the write so it should update L1's TSC_ADJUST.</div><div class='add'>+	 */</div><div class='add'>+	if (this_cpu_has(X86_FEATURE_VMX)) {</div><div class='add'>+		struct vmx_pages *vmx_pages = data;</div><div class='add'>+		uint32_t control;</div><div class='add'>+</div><div class='add'>+		GUEST_ASSERT(prepare_for_vmx_operation(vmx_pages));</div><div class='add'>+		GUEST_ASSERT(load_vmcs(vmx_pages));</div><div class='add'>+</div><div class='add'>+		prepare_vmcs(vmx_pages, l2_guest_code,</div><div class='add'>+			     &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='add'>+		control = vmreadz(CPU_BASED_VM_EXEC_CONTROL);</div><div class='add'>+		control |= CPU_BASED_USE_MSR_BITMAPS | CPU_BASED_USE_TSC_OFFSETTING;</div><div class='add'>+		vmwrite(CPU_BASED_VM_EXEC_CONTROL, control);</div><div class='add'>+		vmwrite(TSC_OFFSET, TSC_OFFSET_VALUE);</div><div class='add'>+</div><div class='add'>+		GUEST_ASSERT(!vmlaunch());</div><div class='add'>+		GUEST_ASSERT(vmreadz(VM_EXIT_REASON) == EXIT_REASON_VMCALL);</div><div class='add'>+	} else {</div><div class='add'>+		struct svm_test_data *svm = data;</div><div class='add'>+</div><div class='add'>+		generic_svm_setup(svm, l2_guest_code,</div><div class='add'>+				  &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='add'>+</div><div class='add'>+		svm-&gt;vmcb-&gt;control.tsc_offset = TSC_OFFSET_VALUE;</div><div class='add'>+		run_guest(svm-&gt;vmcb, svm-&gt;vmcb_gpa);</div><div class='add'>+		GUEST_ASSERT(svm-&gt;vmcb-&gt;control.exit_code == SVM_EXIT_VMMCALL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	check_ia32_tsc_adjust(-2 * TSC_ADJUST_VALUE);</div><div class='del'>-</div><div class='ctx'> 	GUEST_DONE();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -119,16 +125,19 @@ static void report(int64_t val)</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='del'>-	vm_vaddr_t vmx_pages_gva;</div><div class='add'>+	vm_vaddr_t nested_gva;</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> </div><div class='del'>-	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX));</div><div class='add'>+	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX) ||</div><div class='add'>+		     kvm_cpu_has(X86_FEATURE_SVM));</div><div class='ctx'> </div><div class='del'>-	vm = vm_create_with_one_vcpu(&amp;vcpu, (void *) l1_guest_code);</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, l1_guest_code);</div><div class='add'>+	if (kvm_cpu_has(X86_FEATURE_VMX))</div><div class='add'>+		vcpu_alloc_vmx(vm, &amp;nested_gva);</div><div class='add'>+	else</div><div class='add'>+		vcpu_alloc_svm(vm, &amp;nested_gva);</div><div class='ctx'> </div><div class='del'>-	/* Allocate VMX pages and shared descriptors (vmx_pages). */</div><div class='del'>-	vcpu_alloc_vmx(vm, &amp;vmx_pages_gva);</div><div class='del'>-	vcpu_args_set(vcpu, 1, vmx_pages_gva);</div><div class='add'>+	vcpu_args_set(vcpu, 1, nested_gva);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		struct ucall uc;</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/vmx_nested_tsc_scaling_test.c b/tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c<br/>index 1759fa5cb3f2..4260c9e4f489 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/vmx_nested_tsc_scaling_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/vmx_nested_tsc_scaling_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "kvm_util.h"</div><div class='ctx'> #include "vmx.h"</div><div class='add'>+#include "svm_util.h"</div><div class='ctx'> #include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> /* L2 is scaled up (from L1's perspective) by this factor */</div><div class='hunk'>@@ -79,7 +80,30 @@ static void l2_guest_code(void)</div><div class='ctx'> 	__asm__ __volatile__("vmcall");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void l1_guest_code(struct vmx_pages *vmx_pages)</div><div class='add'>+static void l1_svm_code(struct svm_test_data *svm)</div><div class='add'>+{</div><div class='add'>+	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='add'>+</div><div class='add'>+	/* check that L1's frequency looks alright before launching L2 */</div><div class='add'>+	check_tsc_freq(UCHECK_L1);</div><div class='add'>+</div><div class='add'>+	generic_svm_setup(svm, l2_guest_code,</div><div class='add'>+			  &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='add'>+</div><div class='add'>+	/* enable TSC scaling for L2 */</div><div class='add'>+	wrmsr(MSR_AMD64_TSC_RATIO, L2_SCALE_FACTOR &lt;&lt; 32);</div><div class='add'>+</div><div class='add'>+	/* launch L2 */</div><div class='add'>+	run_guest(svm-&gt;vmcb, svm-&gt;vmcb_gpa);</div><div class='add'>+	GUEST_ASSERT(svm-&gt;vmcb-&gt;control.exit_code == SVM_EXIT_VMMCALL);</div><div class='add'>+</div><div class='add'>+	/* check that L1's frequency still looks good */</div><div class='add'>+	check_tsc_freq(UCHECK_L1);</div><div class='add'>+</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l1_vmx_code(struct vmx_pages *vmx_pages)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='ctx'> 	uint32_t control;</div><div class='hunk'>@@ -116,11 +140,19 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)</div><div class='ctx'> 	GUEST_DONE();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void l1_guest_code(void *data)</div><div class='add'>+{</div><div class='add'>+	if (this_cpu_has(X86_FEATURE_VMX))</div><div class='add'>+		l1_vmx_code(data);</div><div class='add'>+	else</div><div class='add'>+		l1_svm_code(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='del'>-	vm_vaddr_t vmx_pages_gva;</div><div class='add'>+	vm_vaddr_t guest_gva = 0;</div><div class='ctx'> </div><div class='ctx'> 	uint64_t tsc_start, tsc_end;</div><div class='ctx'> 	uint64_t tsc_khz;</div><div class='hunk'>@@ -129,7 +161,8 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	uint64_t l1_tsc_freq = 0;</div><div class='ctx'> 	uint64_t l2_tsc_freq = 0;</div><div class='ctx'> </div><div class='del'>-	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX));</div><div class='add'>+	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX) ||</div><div class='add'>+		     kvm_cpu_has(X86_FEATURE_SVM));</div><div class='ctx'> 	TEST_REQUIRE(kvm_has_cap(KVM_CAP_TSC_CONTROL));</div><div class='ctx'> 	TEST_REQUIRE(sys_clocksource_is_based_on_tsc());</div><div class='ctx'> </div><div class='hunk'>@@ -152,8 +185,13 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	printf("real TSC frequency is around: %"PRIu64"\n", l0_tsc_freq);</div><div class='ctx'> </div><div class='ctx'> 	vm = vm_create_with_one_vcpu(&amp;vcpu, l1_guest_code);</div><div class='del'>-	vcpu_alloc_vmx(vm, &amp;vmx_pages_gva);</div><div class='del'>-	vcpu_args_set(vcpu, 1, vmx_pages_gva);</div><div class='add'>+</div><div class='add'>+	if (kvm_cpu_has(X86_FEATURE_VMX))</div><div class='add'>+		vcpu_alloc_vmx(vm, &amp;guest_gva);</div><div class='add'>+	else</div><div class='add'>+		vcpu_alloc_svm(vm, &amp;guest_gva);</div><div class='add'>+</div><div class='add'>+	vcpu_args_set(vcpu, 1, guest_gva);</div><div class='ctx'> </div><div class='ctx'> 	tsc_khz = __vcpu_ioctl(vcpu, KVM_GET_TSC_KHZ, NULL);</div><div class='ctx'> 	TEST_ASSERT(tsc_khz != -1, "vcpu ioctl KVM_GET_TSC_KHZ failed");</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/nx_huge_pages_test.c b/tools/testing/selftests/kvm/x86/nx_huge_pages_test.c<br/>index e7efb2b35f8b..c0d84827f736 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/nx_huge_pages_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/nx_huge_pages_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/nx_huge_pages_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/nx_huge_pages_test.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ static void check_2m_page_count(struct kvm_vm *vm, int expected_pages_2m)</div><div class='ctx'> {</div><div class='ctx'> 	int actual_pages_2m;</div><div class='ctx'> </div><div class='del'>-	actual_pages_2m = vm_get_stat(vm, "pages_2m");</div><div class='add'>+	actual_pages_2m = vm_get_stat(vm, pages_2m);</div><div class='ctx'> </div><div class='ctx'> 	TEST_ASSERT(actual_pages_2m == expected_pages_2m,</div><div class='ctx'> 		    "Unexpected 2m page count. Expected %d, got %d",</div><div class='hunk'>@@ -84,7 +84,7 @@ static void check_split_count(struct kvm_vm *vm, int expected_splits)</div><div class='ctx'> {</div><div class='ctx'> 	int actual_splits;</div><div class='ctx'> </div><div class='del'>-	actual_splits = vm_get_stat(vm, "nx_lpage_splits");</div><div class='add'>+	actual_splits = vm_get_stat(vm, nx_lpage_splits);</div><div class='ctx'> </div><div class='ctx'> 	TEST_ASSERT(actual_splits == expected_splits,</div><div class='ctx'> 		    "Unexpected NX huge page split count. Expected %d, got %d",</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/pmu_counters_test.c b/tools/testing/selftests/kvm/x86/pmu_counters_test.c<br/>index 698cb36989db..3eaa216b96c0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/pmu_counters_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/pmu_counters_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/pmu_counters_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/pmu_counters_test.c</a></div><div class='hunk'>@@ -14,10 +14,10 @@</div><div class='ctx'> #define NUM_BRANCH_INSNS_RETIRED	(NUM_LOOPS)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Number of instructions in each loop. 1 CLFLUSH/CLFLUSHOPT/NOP, 1 MFENCE,</div><div class='del'>- * 1 LOOP.</div><div class='add'>+ * Number of instructions in each loop. 1 ENTER, 1 CLFLUSH/CLFLUSHOPT/NOP,</div><div class='add'>+ * 1 MFENCE, 1 MOV, 1 LEAVE, 1 LOOP.</div><div class='ctx'>  */</div><div class='del'>-#define NUM_INSNS_PER_LOOP		3</div><div class='add'>+#define NUM_INSNS_PER_LOOP		6</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Number of "extra" instructions that will be counted, i.e. the number of</div><div class='hunk'>@@ -29,10 +29,64 @@</div><div class='ctx'> /* Total number of instructions retired within the measured section. */</div><div class='ctx'> #define NUM_INSNS_RETIRED		(NUM_LOOPS * NUM_INSNS_PER_LOOP + NUM_EXTRA_INSNS)</div><div class='ctx'> </div><div class='add'>+/* Track which architectural events are supported by hardware. */</div><div class='add'>+static uint32_t hardware_pmu_arch_events;</div><div class='ctx'> </div><div class='ctx'> static uint8_t kvm_pmu_version;</div><div class='ctx'> static bool kvm_has_perf_caps;</div><div class='ctx'> </div><div class='add'>+#define X86_PMU_FEATURE_NULL						\</div><div class='add'>+({									\</div><div class='add'>+	struct kvm_x86_pmu_feature feature = {};			\</div><div class='add'>+									\</div><div class='add'>+	feature;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static bool pmu_is_null_feature(struct kvm_x86_pmu_feature event)</div><div class='add'>+{</div><div class='add'>+	return !(*(u64 *)&amp;event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct kvm_intel_pmu_event {</div><div class='add'>+	struct kvm_x86_pmu_feature gp_event;</div><div class='add'>+	struct kvm_x86_pmu_feature fixed_event;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wrap the array to appease the compiler, as the macros used to construct each</div><div class='add'>+ * kvm_x86_pmu_feature use syntax that's only valid in function scope, and the</div><div class='add'>+ * compiler often thinks the feature definitions aren't compile-time constants.</div><div class='add'>+ */</div><div class='add'>+static struct kvm_intel_pmu_event intel_event_to_feature(uint8_t idx)</div><div class='add'>+{</div><div class='add'>+	const struct kvm_intel_pmu_event __intel_event_to_feature[] = {</div><div class='add'>+		[INTEL_ARCH_CPU_CYCLES_INDEX]		 = { X86_PMU_FEATURE_CPU_CYCLES, X86_PMU_FEATURE_CPU_CYCLES_FIXED },</div><div class='add'>+		[INTEL_ARCH_INSTRUCTIONS_RETIRED_INDEX]	 = { X86_PMU_FEATURE_INSNS_RETIRED, X86_PMU_FEATURE_INSNS_RETIRED_FIXED },</div><div class='add'>+		/*</div><div class='add'>+		 * Note, the fixed counter for reference cycles is NOT the same as the</div><div class='add'>+		 * general purpose architectural event.  The fixed counter explicitly</div><div class='add'>+		 * counts at the same frequency as the TSC, whereas the GP event counts</div><div class='add'>+		 * at a fixed, but uarch specific, frequency.  Bundle them here for</div><div class='add'>+		 * simplicity.</div><div class='add'>+		 */</div><div class='add'>+		[INTEL_ARCH_REFERENCE_CYCLES_INDEX]	 = { X86_PMU_FEATURE_REFERENCE_CYCLES, X86_PMU_FEATURE_REFERENCE_TSC_CYCLES_FIXED },</div><div class='add'>+		[INTEL_ARCH_LLC_REFERENCES_INDEX]	 = { X86_PMU_FEATURE_LLC_REFERENCES, X86_PMU_FEATURE_NULL },</div><div class='add'>+		[INTEL_ARCH_LLC_MISSES_INDEX]		 = { X86_PMU_FEATURE_LLC_MISSES, X86_PMU_FEATURE_NULL },</div><div class='add'>+		[INTEL_ARCH_BRANCHES_RETIRED_INDEX]	 = { X86_PMU_FEATURE_BRANCH_INSNS_RETIRED, X86_PMU_FEATURE_NULL },</div><div class='add'>+		[INTEL_ARCH_BRANCHES_MISPREDICTED_INDEX] = { X86_PMU_FEATURE_BRANCHES_MISPREDICTED, X86_PMU_FEATURE_NULL },</div><div class='add'>+		[INTEL_ARCH_TOPDOWN_SLOTS_INDEX]	 = { X86_PMU_FEATURE_TOPDOWN_SLOTS, X86_PMU_FEATURE_TOPDOWN_SLOTS_FIXED },</div><div class='add'>+		[INTEL_ARCH_TOPDOWN_BE_BOUND_INDEX]	 = { X86_PMU_FEATURE_TOPDOWN_BE_BOUND, X86_PMU_FEATURE_NULL },</div><div class='add'>+		[INTEL_ARCH_TOPDOWN_BAD_SPEC_INDEX]	 = { X86_PMU_FEATURE_TOPDOWN_BAD_SPEC, X86_PMU_FEATURE_NULL },</div><div class='add'>+		[INTEL_ARCH_TOPDOWN_FE_BOUND_INDEX]	 = { X86_PMU_FEATURE_TOPDOWN_FE_BOUND, X86_PMU_FEATURE_NULL },</div><div class='add'>+		[INTEL_ARCH_TOPDOWN_RETIRING_INDEX]	 = { X86_PMU_FEATURE_TOPDOWN_RETIRING, X86_PMU_FEATURE_NULL },</div><div class='add'>+		[INTEL_ARCH_LBR_INSERTS_INDEX]		 = { X86_PMU_FEATURE_LBR_INSERTS, X86_PMU_FEATURE_NULL },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	kvm_static_assert(ARRAY_SIZE(__intel_event_to_feature) == NR_INTEL_ARCH_EVENTS);</div><div class='add'>+</div><div class='add'>+	return __intel_event_to_feature[idx];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct kvm_vm *pmu_vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,</div><div class='ctx'> 						  void *guest_code,</div><div class='ctx'> 						  uint8_t pmu_version,</div><div class='hunk'>@@ -42,6 +96,7 @@ static struct kvm_vm *pmu_vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,</div><div class='ctx'> </div><div class='ctx'> 	vm = vm_create_with_one_vcpu(vcpu, guest_code);</div><div class='ctx'> 	sync_global_to_guest(vm, kvm_pmu_version);</div><div class='add'>+	sync_global_to_guest(vm, hardware_pmu_arch_events);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set PERF_CAPABILITIES before PMU version as KVM disallows enabling</div><div class='hunk'>@@ -98,22 +153,28 @@ static uint8_t guest_get_pmu_version(void)</div><div class='ctx'>  * Sanity check that in all cases, the event doesn't count when it's disabled,</div><div class='ctx'>  * and that KVM correctly emulates the write of an arbitrary value.</div><div class='ctx'>  */</div><div class='del'>-static void guest_assert_event_count(uint8_t idx,</div><div class='del'>-				     struct kvm_x86_pmu_feature event,</div><div class='del'>-				     uint32_t pmc, uint32_t pmc_msr)</div><div class='add'>+static void guest_assert_event_count(uint8_t idx, uint32_t pmc, uint32_t pmc_msr)</div><div class='ctx'> {</div><div class='ctx'> 	uint64_t count;</div><div class='ctx'> </div><div class='ctx'> 	count = _rdpmc(pmc);</div><div class='del'>-	if (!this_pmu_has(event))</div><div class='add'>+	if (!(hardware_pmu_arch_events &amp; BIT(idx)))</div><div class='ctx'> 		goto sanity_checks;</div><div class='ctx'> </div><div class='ctx'> 	switch (idx) {</div><div class='ctx'> 	case INTEL_ARCH_INSTRUCTIONS_RETIRED_INDEX:</div><div class='del'>-		GUEST_ASSERT_EQ(count, NUM_INSNS_RETIRED);</div><div class='add'>+		/* Relax precise count check due to VM-EXIT/VM-ENTRY overcount issue */</div><div class='add'>+		if (this_pmu_has_errata(INSTRUCTIONS_RETIRED_OVERCOUNT))</div><div class='add'>+			GUEST_ASSERT(count &gt;= NUM_INSNS_RETIRED);</div><div class='add'>+		else</div><div class='add'>+			GUEST_ASSERT_EQ(count, NUM_INSNS_RETIRED);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case INTEL_ARCH_BRANCHES_RETIRED_INDEX:</div><div class='del'>-		GUEST_ASSERT_EQ(count, NUM_BRANCH_INSNS_RETIRED);</div><div class='add'>+		/* Relax precise count check due to VM-EXIT/VM-ENTRY overcount issue */</div><div class='add'>+		if (this_pmu_has_errata(BRANCHES_RETIRED_OVERCOUNT))</div><div class='add'>+			GUEST_ASSERT(count &gt;= NUM_BRANCH_INSNS_RETIRED);</div><div class='add'>+		else</div><div class='add'>+			GUEST_ASSERT_EQ(count, NUM_BRANCH_INSNS_RETIRED);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case INTEL_ARCH_LLC_REFERENCES_INDEX:</div><div class='ctx'> 	case INTEL_ARCH_LLC_MISSES_INDEX:</div><div class='hunk'>@@ -123,10 +184,15 @@ static void guest_assert_event_count(uint8_t idx,</div><div class='ctx'> 		fallthrough;</div><div class='ctx'> 	case INTEL_ARCH_CPU_CYCLES_INDEX:</div><div class='ctx'> 	case INTEL_ARCH_REFERENCE_CYCLES_INDEX:</div><div class='add'>+	case INTEL_ARCH_TOPDOWN_BE_BOUND_INDEX:</div><div class='add'>+	case INTEL_ARCH_TOPDOWN_FE_BOUND_INDEX:</div><div class='ctx'> 		GUEST_ASSERT_NE(count, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case INTEL_ARCH_TOPDOWN_SLOTS_INDEX:</div><div class='del'>-		GUEST_ASSERT(count &gt;= NUM_INSNS_RETIRED);</div><div class='add'>+	case INTEL_ARCH_TOPDOWN_RETIRING_INDEX:</div><div class='add'>+		__GUEST_ASSERT(count &gt;= NUM_INSNS_RETIRED,</div><div class='add'>+			       "Expected top-down slots &gt;= %u, got count = %lu",</div><div class='add'>+			       NUM_INSNS_RETIRED, count);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -160,77 +226,46 @@ do {										\</div><div class='ctx'> 	__asm__ __volatile__("wrmsr\n\t"					\</div><div class='ctx'> 			     " mov $" __stringify(NUM_LOOPS) ", %%ecx\n\t"	\</div><div class='ctx'> 			     "1:\n\t"						\</div><div class='add'>+			     FEP "enter $0, $0\n\t"				\</div><div class='ctx'> 			     clflush "\n\t"					\</div><div class='ctx'> 			     "mfence\n\t"					\</div><div class='add'>+			     "mov %[m], %%eax\n\t"				\</div><div class='add'>+			     FEP "leave\n\t"					\</div><div class='ctx'> 			     FEP "loop 1b\n\t"					\</div><div class='ctx'> 			     FEP "mov %%edi, %%ecx\n\t"				\</div><div class='ctx'> 			     FEP "xor %%eax, %%eax\n\t"				\</div><div class='ctx'> 			     FEP "xor %%edx, %%edx\n\t"				\</div><div class='ctx'> 			     "wrmsr\n\t"					\</div><div class='ctx'> 			     :: "a"((uint32_t)_value), "d"(_value &gt;&gt; 32),	\</div><div class='del'>-				"c"(_msr), "D"(_msr)				\</div><div class='add'>+				"c"(_msr), "D"(_msr), [m]"m"(kvm_pmu_version)	\</div><div class='ctx'> 	);									\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-#define GUEST_TEST_EVENT(_idx, _event, _pmc, _pmc_msr, _ctrl_msr, _value, FEP)	\</div><div class='add'>+#define GUEST_TEST_EVENT(_idx, _pmc, _pmc_msr, _ctrl_msr, _value, FEP)		\</div><div class='ctx'> do {										\</div><div class='del'>-	wrmsr(pmc_msr, 0);							\</div><div class='add'>+	wrmsr(_pmc_msr, 0);							\</div><div class='ctx'> 										\</div><div class='ctx'> 	if (this_cpu_has(X86_FEATURE_CLFLUSHOPT))				\</div><div class='del'>-		GUEST_MEASURE_EVENT(_ctrl_msr, _value, "clflushopt .", FEP);	\</div><div class='add'>+		GUEST_MEASURE_EVENT(_ctrl_msr, _value, "clflushopt %[m]", FEP);	\</div><div class='ctx'> 	else if (this_cpu_has(X86_FEATURE_CLFLUSH))				\</div><div class='del'>-		GUEST_MEASURE_EVENT(_ctrl_msr, _value, "clflush .", FEP);	\</div><div class='add'>+		GUEST_MEASURE_EVENT(_ctrl_msr, _value, "clflush  %[m]", FEP);	\</div><div class='ctx'> 	else									\</div><div class='ctx'> 		GUEST_MEASURE_EVENT(_ctrl_msr, _value, "nop", FEP);		\</div><div class='ctx'> 										\</div><div class='del'>-	guest_assert_event_count(_idx, _event, _pmc, _pmc_msr);			\</div><div class='add'>+	guest_assert_event_count(_idx, _pmc, _pmc_msr);				\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-static void __guest_test_arch_event(uint8_t idx, struct kvm_x86_pmu_feature event,</div><div class='del'>-				    uint32_t pmc, uint32_t pmc_msr,</div><div class='add'>+static void __guest_test_arch_event(uint8_t idx, uint32_t pmc, uint32_t pmc_msr,</div><div class='ctx'> 				    uint32_t ctrl_msr, uint64_t ctrl_msr_value)</div><div class='ctx'> {</div><div class='del'>-	GUEST_TEST_EVENT(idx, event, pmc, pmc_msr, ctrl_msr, ctrl_msr_value, "");</div><div class='add'>+	GUEST_TEST_EVENT(idx, pmc, pmc_msr, ctrl_msr, ctrl_msr_value, "");</div><div class='ctx'> </div><div class='ctx'> 	if (is_forced_emulation_enabled)</div><div class='del'>-		GUEST_TEST_EVENT(idx, event, pmc, pmc_msr, ctrl_msr, ctrl_msr_value, KVM_FEP);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define X86_PMU_FEATURE_NULL						\</div><div class='del'>-({									\</div><div class='del'>-	struct kvm_x86_pmu_feature feature = {};			\</div><div class='del'>-									\</div><div class='del'>-	feature;							\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static bool pmu_is_null_feature(struct kvm_x86_pmu_feature event)</div><div class='del'>-{</div><div class='del'>-	return !(*(u64 *)&amp;event);</div><div class='add'>+		GUEST_TEST_EVENT(idx, pmc, pmc_msr, ctrl_msr, ctrl_msr_value, KVM_FEP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void guest_test_arch_event(uint8_t idx)</div><div class='ctx'> {</div><div class='del'>-	const struct {</div><div class='del'>-		struct kvm_x86_pmu_feature gp_event;</div><div class='del'>-		struct kvm_x86_pmu_feature fixed_event;</div><div class='del'>-	} intel_event_to_feature[] = {</div><div class='del'>-		[INTEL_ARCH_CPU_CYCLES_INDEX]		 = { X86_PMU_FEATURE_CPU_CYCLES, X86_PMU_FEATURE_CPU_CYCLES_FIXED },</div><div class='del'>-		[INTEL_ARCH_INSTRUCTIONS_RETIRED_INDEX]	 = { X86_PMU_FEATURE_INSNS_RETIRED, X86_PMU_FEATURE_INSNS_RETIRED_FIXED },</div><div class='del'>-		/*</div><div class='del'>-		 * Note, the fixed counter for reference cycles is NOT the same</div><div class='del'>-		 * as the general purpose architectural event.  The fixed counter</div><div class='del'>-		 * explicitly counts at the same frequency as the TSC, whereas</div><div class='del'>-		 * the GP event counts at a fixed, but uarch specific, frequency.</div><div class='del'>-		 * Bundle them here for simplicity.</div><div class='del'>-		 */</div><div class='del'>-		[INTEL_ARCH_REFERENCE_CYCLES_INDEX]	 = { X86_PMU_FEATURE_REFERENCE_CYCLES, X86_PMU_FEATURE_REFERENCE_TSC_CYCLES_FIXED },</div><div class='del'>-		[INTEL_ARCH_LLC_REFERENCES_INDEX]	 = { X86_PMU_FEATURE_LLC_REFERENCES, X86_PMU_FEATURE_NULL },</div><div class='del'>-		[INTEL_ARCH_LLC_MISSES_INDEX]		 = { X86_PMU_FEATURE_LLC_MISSES, X86_PMU_FEATURE_NULL },</div><div class='del'>-		[INTEL_ARCH_BRANCHES_RETIRED_INDEX]	 = { X86_PMU_FEATURE_BRANCH_INSNS_RETIRED, X86_PMU_FEATURE_NULL },</div><div class='del'>-		[INTEL_ARCH_BRANCHES_MISPREDICTED_INDEX] = { X86_PMU_FEATURE_BRANCHES_MISPREDICTED, X86_PMU_FEATURE_NULL },</div><div class='del'>-		[INTEL_ARCH_TOPDOWN_SLOTS_INDEX]	 = { X86_PMU_FEATURE_TOPDOWN_SLOTS, X86_PMU_FEATURE_TOPDOWN_SLOTS_FIXED },</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	uint32_t nr_gp_counters = this_cpu_property(X86_PROPERTY_PMU_NR_GP_COUNTERS);</div><div class='ctx'> 	uint32_t pmu_version = guest_get_pmu_version();</div><div class='ctx'> 	/* PERF_GLOBAL_CTRL exists only for Architectural PMU Version 2+. */</div><div class='hunk'>@@ -248,7 +283,7 @@ static void guest_test_arch_event(uint8_t idx)</div><div class='ctx'> 	else</div><div class='ctx'> 		base_pmc_msr = MSR_IA32_PERFCTR0;</div><div class='ctx'> </div><div class='del'>-	gp_event = intel_event_to_feature[idx].gp_event;</div><div class='add'>+	gp_event = intel_event_to_feature(idx).gp_event;</div><div class='ctx'> 	GUEST_ASSERT_EQ(idx, gp_event.f.bit);</div><div class='ctx'> </div><div class='ctx'> 	GUEST_ASSERT(nr_gp_counters);</div><div class='hunk'>@@ -262,14 +297,14 @@ static void guest_test_arch_event(uint8_t idx)</div><div class='ctx'> 		if (guest_has_perf_global_ctrl)</div><div class='ctx'> 			wrmsr(MSR_CORE_PERF_GLOBAL_CTRL, BIT_ULL(i));</div><div class='ctx'> </div><div class='del'>-		__guest_test_arch_event(idx, gp_event, i, base_pmc_msr + i,</div><div class='add'>+		__guest_test_arch_event(idx, i, base_pmc_msr + i,</div><div class='ctx'> 					MSR_P6_EVNTSEL0 + i, eventsel);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!guest_has_perf_global_ctrl)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	fixed_event = intel_event_to_feature[idx].fixed_event;</div><div class='add'>+	fixed_event = intel_event_to_feature(idx).fixed_event;</div><div class='ctx'> 	if (pmu_is_null_feature(fixed_event) || !this_pmu_has(fixed_event))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -277,7 +312,7 @@ static void guest_test_arch_event(uint8_t idx)</div><div class='ctx'> </div><div class='ctx'> 	wrmsr(MSR_CORE_PERF_FIXED_CTR_CTRL, FIXED_PMC_CTRL(i, FIXED_PMC_KERNEL));</div><div class='ctx'> </div><div class='del'>-	__guest_test_arch_event(idx, fixed_event, i | INTEL_RDPMC_FIXED,</div><div class='add'>+	__guest_test_arch_event(idx, i | INTEL_RDPMC_FIXED,</div><div class='ctx'> 				MSR_CORE_PERF_FIXED_CTR0 + i,</div><div class='ctx'> 				MSR_CORE_PERF_GLOBAL_CTRL,</div><div class='ctx'> 				FIXED_PMC_GLOBAL_CTRL_ENABLE(i));</div><div class='hunk'>@@ -294,7 +329,7 @@ static void guest_test_arch_events(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void test_arch_events(uint8_t pmu_version, uint64_t perf_capabilities,</div><div class='del'>-			     uint8_t length, uint8_t unavailable_mask)</div><div class='add'>+			     uint8_t length, uint32_t unavailable_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='hunk'>@@ -303,6 +338,9 @@ static void test_arch_events(uint8_t pmu_version, uint64_t perf_capabilities,</div><div class='ctx'> 	if (!pmu_version)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	unavailable_mask &amp;= GENMASK(X86_PROPERTY_PMU_EVENTS_MASK.hi_bit,</div><div class='add'>+				    X86_PROPERTY_PMU_EVENTS_MASK.lo_bit);</div><div class='add'>+</div><div class='ctx'> 	vm = pmu_vm_create_with_one_vcpu(&amp;vcpu, guest_test_arch_events,</div><div class='ctx'> 					 pmu_version, perf_capabilities);</div><div class='ctx'> </div><div class='hunk'>@@ -327,13 +365,13 @@ static void test_arch_events(uint8_t pmu_version, uint64_t perf_capabilities,</div><div class='ctx'> </div><div class='ctx'> #define GUEST_ASSERT_PMC_MSR_ACCESS(insn, msr, expect_gp, vector)		\</div><div class='ctx'> __GUEST_ASSERT(expect_gp ? vector == GP_VECTOR : !vector,			\</div><div class='del'>-	       "Expected %s on " #insn "(0x%x), got vector %u",			\</div><div class='del'>-	       expect_gp ? "#GP" : "no fault", msr, vector)			\</div><div class='add'>+	       "Expected %s on " #insn "(0x%x), got %s",			\</div><div class='add'>+	       expect_gp ? "#GP" : "no fault", msr, ex_str(vector))		\</div><div class='ctx'> </div><div class='ctx'> #define GUEST_ASSERT_PMC_VALUE(insn, msr, val, expected)			\</div><div class='del'>-	__GUEST_ASSERT(val == expected_val,					\</div><div class='add'>+	__GUEST_ASSERT(val == expected,					\</div><div class='ctx'> 		       "Expected " #insn "(0x%x) to yield 0x%lx, got 0x%lx",	\</div><div class='del'>-		       msr, expected_val, val);</div><div class='add'>+		       msr, expected, val);</div><div class='ctx'> </div><div class='ctx'> static void guest_test_rdpmc(uint32_t rdpmc_idx, bool expect_success,</div><div class='ctx'> 			     uint64_t expected_val)</div><div class='hunk'>@@ -545,7 +583,6 @@ static void test_fixed_counters(uint8_t pmu_version, uint64_t perf_capabilities,</div><div class='ctx'> </div><div class='ctx'> static void test_intel_counters(void)</div><div class='ctx'> {</div><div class='del'>-	uint8_t nr_arch_events = kvm_cpu_property(X86_PROPERTY_PMU_EBX_BIT_VECTOR_LENGTH);</div><div class='ctx'> 	uint8_t nr_fixed_counters = kvm_cpu_property(X86_PROPERTY_PMU_NR_FIXED_COUNTERS);</div><div class='ctx'> 	uint8_t nr_gp_counters = kvm_cpu_property(X86_PROPERTY_PMU_NR_GP_COUNTERS);</div><div class='ctx'> 	uint8_t pmu_version = kvm_cpu_property(X86_PROPERTY_PMU_VERSION);</div><div class='hunk'>@@ -559,6 +596,26 @@ static void test_intel_counters(void)</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * To keep the total runtime reasonable, test only a handful of select,</div><div class='add'>+	 * semi-arbitrary values for the mask of unavailable PMU events.  Test</div><div class='add'>+	 * 0 (all events available) and all ones (no events available) as well</div><div class='add'>+	 * as alternating bit sequencues, e.g. to detect if KVM is checking the</div><div class='add'>+	 * wrong bit(s).</div><div class='add'>+	 */</div><div class='add'>+	const uint32_t unavailable_masks[] = {</div><div class='add'>+		0x0,</div><div class='add'>+		0xffffffffu,</div><div class='add'>+		0xaaaaaaaau,</div><div class='add'>+		0x55555555u,</div><div class='add'>+		0xf0f0f0f0u,</div><div class='add'>+		0x0f0f0f0fu,</div><div class='add'>+		0xa0a0a0a0u,</div><div class='add'>+		0x0a0a0a0au,</div><div class='add'>+		0x50505050u,</div><div class='add'>+		0x05050505u,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Test up to PMU v5, which is the current maximum version defined by</div><div class='ctx'> 	 * Intel, i.e. is the last version that is guaranteed to be backwards</div><div class='ctx'> 	 * compatible with KVM's existing behavior.</div><div class='hunk'>@@ -567,18 +624,26 @@ static void test_intel_counters(void)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Detect the existence of events that aren't supported by selftests.</div><div class='del'>-	 * This will (obviously) fail any time the kernel adds support for a</div><div class='del'>-	 * new event, but it's worth paying that price to keep the test fresh.</div><div class='add'>+	 * This will (obviously) fail any time hardware adds support for a new</div><div class='add'>+	 * event, but it's worth paying that price to keep the test fresh.</div><div class='ctx'> 	 */</div><div class='del'>-	TEST_ASSERT(nr_arch_events &lt;= NR_INTEL_ARCH_EVENTS,</div><div class='add'>+	TEST_ASSERT(this_cpu_property(X86_PROPERTY_PMU_EBX_BIT_VECTOR_LENGTH) &lt;= NR_INTEL_ARCH_EVENTS,</div><div class='ctx'> 		    "New architectural event(s) detected; please update this test (length = %u, mask = %x)",</div><div class='del'>-		    nr_arch_events, kvm_cpu_property(X86_PROPERTY_PMU_EVENTS_MASK));</div><div class='add'>+		    this_cpu_property(X86_PROPERTY_PMU_EBX_BIT_VECTOR_LENGTH),</div><div class='add'>+		    this_cpu_property(X86_PROPERTY_PMU_EVENTS_MASK));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Force iterating over known arch events regardless of whether or not</div><div class='del'>-	 * KVM/hardware supports a given event.</div><div class='add'>+	 * Iterate over known arch events irrespective of KVM/hardware support</div><div class='add'>+	 * to verify that KVM doesn't reject programming of events just because</div><div class='add'>+	 * the *architectural* encoding is unsupported.  Track which events are</div><div class='add'>+	 * supported in hardware; the guest side will validate supported events</div><div class='add'>+	 * count correctly, even if *enumeration* of the event is unsupported</div><div class='add'>+	 * by KVM and/or isn't exposed to the guest.</div><div class='ctx'> 	 */</div><div class='del'>-	nr_arch_events = max_t(typeof(nr_arch_events), nr_arch_events, NR_INTEL_ARCH_EVENTS);</div><div class='add'>+	for (i = 0; i &lt; NR_INTEL_ARCH_EVENTS; i++) {</div><div class='add'>+		if (this_pmu_has(intel_event_to_feature(i).gp_event))</div><div class='add'>+			hardware_pmu_arch_events |= BIT(i);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (v = 0; v &lt;= max_pmu_version; v++) {</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(perf_caps); i++) {</div><div class='hunk'>@@ -587,16 +652,7 @@ static void test_intel_counters(void)</div><div class='ctx'> </div><div class='ctx'> 			pr_info("Testing arch events, PMU version %u, perf_caps = %lx\n",</div><div class='ctx'> 				v, perf_caps[i]);</div><div class='del'>-			/*</div><div class='del'>-			 * To keep the total runtime reasonable, test every</div><div class='del'>-			 * possible non-zero, non-reserved bitmap combination</div><div class='del'>-			 * only with the native PMU version and the full bit</div><div class='del'>-			 * vector length.</div><div class='del'>-			 */</div><div class='del'>-			if (v == pmu_version) {</div><div class='del'>-				for (k = 1; k &lt; (BIT(nr_arch_events) - 1); k++)</div><div class='del'>-					test_arch_events(v, perf_caps[i], nr_arch_events, k);</div><div class='del'>-			}</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Test single bits for all PMU version and lengths up</div><div class='ctx'> 			 * the number of events +1 (to verify KVM doesn't do</div><div class='hunk'>@@ -604,12 +660,9 @@ static void test_intel_counters(void)</div><div class='ctx'> 			 * host length).  Explicitly test a mask of '0' and all</div><div class='ctx'> 			 * ones i.e. all events being available and unavailable.</div><div class='ctx'> 			 */</div><div class='del'>-			for (j = 0; j &lt;= nr_arch_events + 1; j++) {</div><div class='del'>-				test_arch_events(v, perf_caps[i], j, 0);</div><div class='del'>-				test_arch_events(v, perf_caps[i], j, 0xff);</div><div class='del'>-</div><div class='del'>-				for (k = 0; k &lt; nr_arch_events; k++)</div><div class='del'>-					test_arch_events(v, perf_caps[i], j, BIT(k));</div><div class='add'>+			for (j = 0; j &lt;= NR_INTEL_ARCH_EVENTS + 1; j++) {</div><div class='add'>+				for (k = 1; k &lt; ARRAY_SIZE(unavailable_masks); k++)</div><div class='add'>+					test_arch_events(v, perf_caps[i], j, unavailable_masks[k]);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			pr_info("Testing GP counters, PMU version %u, perf_caps = %lx\n",</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c b/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c<br/>index c15513cd74d1..1c5b7611db24 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/pmu_event_filter_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/pmu_event_filter_test.c</a></div><div class='hunk'>@@ -214,8 +214,10 @@ static void remove_event(struct __kvm_pmu_event_filter *f, uint64_t event)</div><div class='ctx'> do {											\</div><div class='ctx'> 	uint64_t br = pmc_results.branches_retired;					\</div><div class='ctx'> 	uint64_t ir = pmc_results.instructions_retired;					\</div><div class='add'>+	bool br_matched = this_pmu_has_errata(BRANCHES_RETIRED_OVERCOUNT) ?		\</div><div class='add'>+			  br &gt;= NUM_BRANCHES : br == NUM_BRANCHES;			\</div><div class='ctx'> 											\</div><div class='del'>-	if (br &amp;&amp; br != NUM_BRANCHES)							\</div><div class='add'>+	if (br &amp;&amp; !br_matched)								\</div><div class='ctx'> 		pr_info("%s: Branch instructions retired = %lu (expected %u)\n",	\</div><div class='ctx'> 			__func__, br, NUM_BRANCHES);					\</div><div class='ctx'> 	TEST_ASSERT(br, "%s: Branch instructions retired = %lu (expected &gt; 0)",		\</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c<br/>index 82a8d88b5338..1969f4ab9b28 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/private_mem_conversions_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/private_mem_conversions_test.c</a></div><div class='hunk'>@@ -380,7 +380,7 @@ static void test_mem_conversions(enum vm_mem_backing_src_type src_type, uint32_t</div><div class='ctx'> 	struct kvm_vcpu *vcpus[KVM_MAX_VCPUS];</div><div class='ctx'> 	pthread_t threads[KVM_MAX_VCPUS];</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='del'>-	int memfd, i, r;</div><div class='add'>+	int memfd, i;</div><div class='ctx'> </div><div class='ctx'> 	const struct vm_shape shape = {</div><div class='ctx'> 		.mode = VM_MODE_DEFAULT,</div><div class='hunk'>@@ -428,11 +428,8 @@ static void test_mem_conversions(enum vm_mem_backing_src_type src_type, uint32_t</div><div class='ctx'> 	 * should prevent the VM from being fully destroyed until the last</div><div class='ctx'> 	 * reference to the guest_memfd is also put.</div><div class='ctx'> 	 */</div><div class='del'>-	r = fallocate(memfd, FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE, 0, memfd_size);</div><div class='del'>-	TEST_ASSERT(!r, __KVM_SYSCALL_ERROR("fallocate()", r));</div><div class='del'>-</div><div class='del'>-	r = fallocate(memfd, FALLOC_FL_KEEP_SIZE, 0, memfd_size);</div><div class='del'>-	TEST_ASSERT(!r, __KVM_SYSCALL_ERROR("fallocate()", r));</div><div class='add'>+	kvm_fallocate(memfd, FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE, 0, memfd_size);</div><div class='add'>+	kvm_fallocate(memfd, FALLOC_FL_KEEP_SIZE, 0, memfd_size);</div><div class='ctx'> </div><div class='ctx'> 	close(memfd);</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/sev_init2_tests.c b/tools/testing/selftests/kvm/x86/sev_init2_tests.c<br/>index 3fb967f40c6a..b238615196ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/sev_init2_tests.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/sev_init2_tests.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/sev_init2_tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/sev_init2_tests.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> int kvm_fd;</div><div class='ctx'> u64 supported_vmsa_features;</div><div class='ctx'> bool have_sev_es;</div><div class='add'>+bool have_snp;</div><div class='ctx'> </div><div class='ctx'> static int __sev_ioctl(int vm_fd, int cmd_id, void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -83,6 +84,9 @@ void test_vm_types(void)</div><div class='ctx'> 	if (have_sev_es)</div><div class='ctx'> 		test_init2(KVM_X86_SEV_ES_VM, &amp;(struct kvm_sev_init){});</div><div class='ctx'> </div><div class='add'>+	if (have_snp)</div><div class='add'>+		test_init2(KVM_X86_SNP_VM, &amp;(struct kvm_sev_init){});</div><div class='add'>+</div><div class='ctx'> 	test_init2_invalid(0, &amp;(struct kvm_sev_init){},</div><div class='ctx'> 			   "VM type is KVM_X86_DEFAULT_VM");</div><div class='ctx'> 	if (kvm_check_cap(KVM_CAP_VM_TYPES) &amp; BIT(KVM_X86_SW_PROTECTED_VM))</div><div class='hunk'>@@ -138,15 +142,24 @@ int main(int argc, char *argv[])</div><div class='ctx'> 		    "sev-es: KVM_CAP_VM_TYPES (%x) does not match cpuid (checking %x)",</div><div class='ctx'> 		    kvm_check_cap(KVM_CAP_VM_TYPES), 1 &lt;&lt; KVM_X86_SEV_ES_VM);</div><div class='ctx'> </div><div class='add'>+	have_snp = kvm_cpu_has(X86_FEATURE_SEV_SNP);</div><div class='add'>+	TEST_ASSERT(have_snp == !!(kvm_check_cap(KVM_CAP_VM_TYPES) &amp; BIT(KVM_X86_SNP_VM)),</div><div class='add'>+		    "sev-snp: KVM_CAP_VM_TYPES (%x) indicates SNP support (bit %d), but CPUID does not",</div><div class='add'>+		    kvm_check_cap(KVM_CAP_VM_TYPES), KVM_X86_SNP_VM);</div><div class='add'>+</div><div class='ctx'> 	test_vm_types();</div><div class='ctx'> </div><div class='ctx'> 	test_flags(KVM_X86_SEV_VM);</div><div class='ctx'> 	if (have_sev_es)</div><div class='ctx'> 		test_flags(KVM_X86_SEV_ES_VM);</div><div class='add'>+	if (have_snp)</div><div class='add'>+		test_flags(KVM_X86_SNP_VM);</div><div class='ctx'> </div><div class='ctx'> 	test_features(KVM_X86_SEV_VM, 0);</div><div class='ctx'> 	if (have_sev_es)</div><div class='ctx'> 		test_features(KVM_X86_SEV_ES_VM, supported_vmsa_features);</div><div class='add'>+	if (have_snp)</div><div class='add'>+		test_features(KVM_X86_SNP_VM, supported_vmsa_features);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/sev_smoke_test.c b/tools/testing/selftests/kvm/x86/sev_smoke_test.c<br/>index a1a688e75266..86ad1c7d068f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/sev_smoke_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/sev_smoke_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/sev_smoke_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/sev_smoke_test.c</a></div><div class='hunk'>@@ -16,6 +16,18 @@</div><div class='ctx'> </div><div class='ctx'> #define XFEATURE_MASK_X87_AVX (XFEATURE_MASK_FP | XFEATURE_MASK_SSE | XFEATURE_MASK_YMM)</div><div class='ctx'> </div><div class='add'>+static void guest_snp_code(void)</div><div class='add'>+{</div><div class='add'>+	uint64_t sev_msr = rdmsr(MSR_AMD64_SEV);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT(sev_msr &amp; MSR_AMD64_SEV_ENABLED);</div><div class='add'>+	GUEST_ASSERT(sev_msr &amp; MSR_AMD64_SEV_ES_ENABLED);</div><div class='add'>+	GUEST_ASSERT(sev_msr &amp; MSR_AMD64_SEV_SNP_ENABLED);</div><div class='add'>+</div><div class='add'>+	wrmsr(MSR_AMD64_SEV_ES_GHCB, GHCB_MSR_TERM_REQ);</div><div class='add'>+	vmgexit();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void guest_sev_es_code(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* TODO: Check CPUID after GHCB-based hypercall support is added. */</div><div class='hunk'>@@ -27,7 +39,7 @@ static void guest_sev_es_code(void)</div><div class='ctx'> 	 * force "termination" to signal "done" via the GHCB MSR protocol.</div><div class='ctx'> 	 */</div><div class='ctx'> 	wrmsr(MSR_AMD64_SEV_ES_GHCB, GHCB_MSR_TERM_REQ);</div><div class='del'>-	__asm__ __volatile__("rep; vmmcall");</div><div class='add'>+	vmgexit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void guest_sev_code(void)</div><div class='hunk'>@@ -52,7 +64,8 @@ static void compare_xsave(u8 *from_host, u8 *from_guest)</div><div class='ctx'> 	bool bad = false;</div><div class='ctx'> 	for (i = 0; i &lt; 4095; i++) {</div><div class='ctx'> 		if (from_host[i] != from_guest[i]) {</div><div class='del'>-			printf("mismatch at %02hhx | %02hhx %02hhx\n", i, from_host[i], from_guest[i]);</div><div class='add'>+			printf("mismatch at %u | %02hhx %02hhx\n",</div><div class='add'>+			       i, from_host[i], from_guest[i]);</div><div class='ctx'> 			bad = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -61,7 +74,7 @@ static void compare_xsave(u8 *from_host, u8 *from_guest)</div><div class='ctx'> 		abort();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_sync_vmsa(uint32_t policy)</div><div class='add'>+static void test_sync_vmsa(uint32_t type, uint64_t policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='hunk'>@@ -71,7 +84,7 @@ static void test_sync_vmsa(uint32_t policy)</div><div class='ctx'> 	double x87val = M_PI;</div><div class='ctx'> 	struct kvm_xsave __attribute__((aligned(64))) xsave = { 0 };</div><div class='ctx'> </div><div class='del'>-	vm = vm_sev_create_with_one_vcpu(KVM_X86_SEV_ES_VM, guest_code_xsave, &amp;vcpu);</div><div class='add'>+	vm = vm_sev_create_with_one_vcpu(type, guest_code_xsave, &amp;vcpu);</div><div class='ctx'> 	gva = vm_vaddr_alloc_shared(vm, PAGE_SIZE, KVM_UTIL_MIN_VADDR,</div><div class='ctx'> 				    MEM_REGION_TEST_DATA);</div><div class='ctx'> 	hva = addr_gva2hva(vm, gva);</div><div class='hunk'>@@ -88,10 +101,10 @@ static void test_sync_vmsa(uint32_t policy)</div><div class='ctx'> 	    : "ymm4", "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)");</div><div class='ctx'> 	vcpu_xsave_set(vcpu, &amp;xsave);</div><div class='ctx'> </div><div class='del'>-	vm_sev_launch(vm, SEV_POLICY_ES | policy, NULL);</div><div class='add'>+	vm_sev_launch(vm, policy, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* This page is shared, so make it decrypted.  */</div><div class='del'>-	memset(hva, 0, 4096);</div><div class='add'>+	memset(hva, 0, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	vcpu_run(vcpu);</div><div class='ctx'> </div><div class='hunk'>@@ -107,14 +120,12 @@ static void test_sync_vmsa(uint32_t policy)</div><div class='ctx'> 	kvm_vm_free(vm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_sev(void *guest_code, uint64_t policy)</div><div class='add'>+static void test_sev(void *guest_code, uint32_t type, uint64_t policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> 	struct ucall uc;</div><div class='ctx'> </div><div class='del'>-	uint32_t type = policy &amp; SEV_POLICY_ES ? KVM_X86_SEV_ES_VM : KVM_X86_SEV_VM;</div><div class='del'>-</div><div class='ctx'> 	vm = vm_sev_create_with_one_vcpu(type, guest_code, &amp;vcpu);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Validate the measurement is as expected. */</div><div class='hunk'>@@ -123,7 +134,7 @@ static void test_sev(void *guest_code, uint64_t policy)</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		vcpu_run(vcpu);</div><div class='ctx'> </div><div class='del'>-		if (policy &amp; SEV_POLICY_ES) {</div><div class='add'>+		if (is_sev_es_vm(vm)) {</div><div class='ctx'> 			TEST_ASSERT(vcpu-&gt;run-&gt;exit_reason == KVM_EXIT_SYSTEM_EVENT,</div><div class='ctx'> 				    "Wanted SYSTEM_EVENT, got %s",</div><div class='ctx'> 				    exit_reason_str(vcpu-&gt;run-&gt;exit_reason));</div><div class='hunk'>@@ -160,16 +171,14 @@ static void guest_shutdown_code(void)</div><div class='ctx'> 	__asm__ __volatile__("ud2");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void test_sev_es_shutdown(void)</div><div class='add'>+static void test_sev_shutdown(uint32_t type, uint64_t policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvm_vcpu *vcpu;</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> </div><div class='del'>-	uint32_t type = KVM_X86_SEV_ES_VM;</div><div class='del'>-</div><div class='ctx'> 	vm = vm_sev_create_with_one_vcpu(type, guest_shutdown_code, &amp;vcpu);</div><div class='ctx'> </div><div class='del'>-	vm_sev_launch(vm, SEV_POLICY_ES, NULL);</div><div class='add'>+	vm_sev_launch(vm, policy, NULL);</div><div class='ctx'> </div><div class='ctx'> 	vcpu_run(vcpu);</div><div class='ctx'> 	TEST_ASSERT(vcpu-&gt;run-&gt;exit_reason == KVM_EXIT_SHUTDOWN,</div><div class='hunk'>@@ -179,27 +188,42 @@ static void test_sev_es_shutdown(void)</div><div class='ctx'> 	kvm_vm_free(vm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int main(int argc, char *argv[])</div><div class='add'>+static void test_sev_smoke(void *guest, uint32_t type, uint64_t policy)</div><div class='ctx'> {</div><div class='ctx'> 	const u64 xf_mask = XFEATURE_MASK_X87_AVX;</div><div class='ctx'> </div><div class='del'>-	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_SEV));</div><div class='del'>-</div><div class='del'>-	test_sev(guest_sev_code, SEV_POLICY_NO_DBG);</div><div class='del'>-	test_sev(guest_sev_code, 0);</div><div class='add'>+	if (type == KVM_X86_SNP_VM)</div><div class='add'>+		test_sev(guest, type, policy | SNP_POLICY_DBG);</div><div class='add'>+	else</div><div class='add'>+		test_sev(guest, type, policy | SEV_POLICY_NO_DBG);</div><div class='add'>+	test_sev(guest, type, policy);</div><div class='ctx'> </div><div class='del'>-	if (kvm_cpu_has(X86_FEATURE_SEV_ES)) {</div><div class='del'>-		test_sev(guest_sev_es_code, SEV_POLICY_ES | SEV_POLICY_NO_DBG);</div><div class='del'>-		test_sev(guest_sev_es_code, SEV_POLICY_ES);</div><div class='add'>+	if (type == KVM_X86_SEV_VM)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		test_sev_es_shutdown();</div><div class='add'>+	test_sev_shutdown(type, policy);</div><div class='ctx'> </div><div class='del'>-		if (kvm_has_cap(KVM_CAP_XCRS) &amp;&amp;</div><div class='del'>-		    (xgetbv(0) &amp; kvm_cpu_supported_xcr0() &amp; xf_mask) == xf_mask) {</div><div class='del'>-			test_sync_vmsa(0);</div><div class='del'>-			test_sync_vmsa(SEV_POLICY_NO_DBG);</div><div class='del'>-		}</div><div class='add'>+	if (kvm_has_cap(KVM_CAP_XCRS) &amp;&amp;</div><div class='add'>+	    (xgetbv(0) &amp; kvm_cpu_supported_xcr0() &amp; xf_mask) == xf_mask) {</div><div class='add'>+		test_sync_vmsa(type, policy);</div><div class='add'>+		if (type == KVM_X86_SNP_VM)</div><div class='add'>+			test_sync_vmsa(type, policy | SNP_POLICY_DBG);</div><div class='add'>+		else</div><div class='add'>+			test_sync_vmsa(type, policy | SEV_POLICY_NO_DBG);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_SEV));</div><div class='add'>+</div><div class='add'>+	test_sev_smoke(guest_sev_code, KVM_X86_SEV_VM, 0);</div><div class='add'>+</div><div class='add'>+	if (kvm_cpu_has(X86_FEATURE_SEV_ES))</div><div class='add'>+		test_sev_smoke(guest_sev_es_code, KVM_X86_SEV_ES_VM, SEV_POLICY_ES);</div><div class='add'>+</div><div class='add'>+	if (kvm_cpu_has(X86_FEATURE_SEV_SNP))</div><div class='add'>+		test_sev_smoke(guest_snp_code, KVM_X86_SNP_VM, snp_default_policy());</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/state_test.c b/tools/testing/selftests/kvm/x86/state_test.c<br/>index 141b7fc0c965..f2c7a1c297e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/state_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/state_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/state_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/state_test.c</a></div><div class='hunk'>@@ -141,7 +141,7 @@ static void __attribute__((__flatten__)) guest_code(void *arg)</div><div class='ctx'> </div><div class='ctx'> 	if (this_cpu_has(X86_FEATURE_XSAVE)) {</div><div class='ctx'> 		uint64_t supported_xcr0 = this_cpu_supported_xcr0();</div><div class='del'>-		uint8_t buffer[4096];</div><div class='add'>+		uint8_t buffer[PAGE_SIZE];</div><div class='ctx'> </div><div class='ctx'> 		memset(buffer, 0xcc, sizeof(buffer));</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/svm_int_ctl_test.c b/tools/testing/selftests/kvm/x86/svm_int_ctl_test.c<br/>index 916e04248fbb..917b6066cfc1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/svm_int_ctl_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/svm_int_ctl_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/svm_int_ctl_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/svm_int_ctl_test.c</a></div><div class='hunk'>@@ -42,10 +42,7 @@ static void l2_guest_code(struct svm_test_data *svm)</div><div class='ctx'> 	x2apic_write_reg(APIC_ICR,</div><div class='ctx'> 		APIC_DEST_SELF | APIC_INT_ASSERT | INTR_IRQ_NUMBER);</div><div class='ctx'> </div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-		"sti\n"</div><div class='del'>-		"nop\n"</div><div class='del'>-	);</div><div class='add'>+	sti_nop();</div><div class='ctx'> </div><div class='ctx'> 	GUEST_ASSERT(vintr_irq_called);</div><div class='ctx'> 	GUEST_ASSERT(intr_irq_called);</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/ucna_injection_test.c b/tools/testing/selftests/kvm/x86/ucna_injection_test.c<br/>index 57f157c06b39..1e5e564523b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/ucna_injection_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/ucna_injection_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/ucna_injection_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/ucna_injection_test.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static void ucna_injection_guest_code(void)</div><div class='ctx'> 	wrmsr(MSR_IA32_MCx_CTL2(UCNA_BANK), ctl2 | MCI_CTL2_CMCI_EN);</div><div class='ctx'> </div><div class='ctx'> 	/* Enables interrupt in guest. */</div><div class='del'>-	asm volatile("sti");</div><div class='add'>+	sti();</div><div class='ctx'> </div><div class='ctx'> 	/* Let user space inject the first UCNA */</div><div class='ctx'> 	GUEST_SYNC(SYNC_FIRST_UCNA);</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/userspace_io_test.c b/tools/testing/selftests/kvm/x86/userspace_io_test.c<br/>index 9481cbcf284f..be7d72f3c029 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/userspace_io_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/userspace_io_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/userspace_io_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/userspace_io_test.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> 			regs.rcx = 1;</div><div class='ctx'> 		if (regs.rcx == 3)</div><div class='ctx'> 			regs.rcx = 8192;</div><div class='del'>-		memset((void *)run + run-&gt;io.data_offset, 0xaa, 4096);</div><div class='add'>+		memset((void *)run + run-&gt;io.data_offset, 0xaa, PAGE_SIZE);</div><div class='ctx'> 		vcpu_regs_set(vcpu, &amp;regs);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/userspace_msr_exit_test.c b/tools/testing/selftests/kvm/x86/userspace_msr_exit_test.c<br/>index 32b2794b78fe..8463a9956410 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/userspace_msr_exit_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/userspace_msr_exit_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/userspace_msr_exit_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/userspace_msr_exit_test.c</a></div><div class='hunk'>@@ -343,6 +343,12 @@ static void guest_code_permission_bitmap(void)</div><div class='ctx'> 	data = test_rdmsr(MSR_GS_BASE);</div><div class='ctx'> 	GUEST_ASSERT(data == MSR_GS_BASE);</div><div class='ctx'> </div><div class='add'>+	/* Access the MSRs again to ensure KVM has disabled interception.*/</div><div class='add'>+	data = test_rdmsr(MSR_FS_BASE);</div><div class='add'>+	GUEST_ASSERT(data != MSR_FS_BASE);</div><div class='add'>+	data = test_rdmsr(MSR_GS_BASE);</div><div class='add'>+	GUEST_ASSERT(data != MSR_GS_BASE);</div><div class='add'>+</div><div class='ctx'> 	GUEST_DONE();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -682,6 +688,8 @@ KVM_ONE_VCPU_TEST(user_msr, msr_permission_bitmap, guest_code_permission_bitmap)</div><div class='ctx'> 		    "Expected ucall state to be UCALL_SYNC.");</div><div class='ctx'> 	vm_ioctl(vm, KVM_X86_SET_MSR_FILTER, &amp;filter_gs);</div><div class='ctx'> 	run_guest_then_process_rdmsr(vcpu, MSR_GS_BASE);</div><div class='add'>+</div><div class='add'>+	vm_ioctl(vm, KVM_X86_SET_MSR_FILTER, &amp;filter_allow);</div><div class='ctx'> 	run_guest_then_process_ucall_done(vcpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c b/tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c<br/>index fa512d033205..98cb6bdab3e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c</a></div><div class='hunk'>@@ -120,17 +120,17 @@ static void test_vmx_dirty_log(bool enable_ept)</div><div class='ctx'> 	 * GPAs as the EPT enabled case.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (enable_ept) {</div><div class='del'>-		prepare_eptp(vmx, vm, 0);</div><div class='add'>+		prepare_eptp(vmx, vm);</div><div class='ctx'> 		nested_map_memslot(vmx, vm, 0);</div><div class='del'>-		nested_map(vmx, vm, NESTED_TEST_MEM1, GUEST_TEST_MEM, 4096);</div><div class='del'>-		nested_map(vmx, vm, NESTED_TEST_MEM2, GUEST_TEST_MEM, 4096);</div><div class='add'>+		nested_map(vmx, vm, NESTED_TEST_MEM1, GUEST_TEST_MEM, PAGE_SIZE);</div><div class='add'>+		nested_map(vmx, vm, NESTED_TEST_MEM2, GUEST_TEST_MEM, PAGE_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bmap = bitmap_zalloc(TEST_MEM_PAGES);</div><div class='ctx'> 	host_test_mem = addr_gpa2hva(vm, GUEST_TEST_MEM);</div><div class='ctx'> </div><div class='ctx'> 	while (!done) {</div><div class='del'>-		memset(host_test_mem, 0xaa, TEST_MEM_PAGES * 4096);</div><div class='add'>+		memset(host_test_mem, 0xaa, TEST_MEM_PAGES * PAGE_SIZE);</div><div class='ctx'> 		vcpu_run(vcpu);</div><div class='ctx'> 		TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_IO);</div><div class='ctx'> </div><div class='hunk'>@@ -153,9 +153,9 @@ static void test_vmx_dirty_log(bool enable_ept)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			TEST_ASSERT(!test_bit(1, bmap), "Page 1 incorrectly reported dirty");</div><div class='del'>-			TEST_ASSERT(host_test_mem[4096 / 8] == 0xaaaaaaaaaaaaaaaaULL, "Page 1 written by guest");</div><div class='add'>+			TEST_ASSERT(host_test_mem[PAGE_SIZE / 8] == 0xaaaaaaaaaaaaaaaaULL, "Page 1 written by guest");</div><div class='ctx'> 			TEST_ASSERT(!test_bit(2, bmap), "Page 2 incorrectly reported dirty");</div><div class='del'>-			TEST_ASSERT(host_test_mem[8192 / 8] == 0xaaaaaaaaaaaaaaaaULL, "Page 2 written by guest");</div><div class='add'>+			TEST_ASSERT(host_test_mem[PAGE_SIZE*2 / 8] == 0xaaaaaaaaaaaaaaaaULL, "Page 2 written by guest");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case UCALL_DONE:</div><div class='ctx'> 			done = true;</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/vmx_exception_with_invalid_guest_state.c b/tools/testing/selftests/kvm/x86/vmx_exception_with_invalid_guest_state.c<br/>index 3fd6eceab46f..2cae86d9d5e2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/vmx_exception_with_invalid_guest_state.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/vmx_exception_with_invalid_guest_state.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/vmx_exception_with_invalid_guest_state.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/vmx_exception_with_invalid_guest_state.c</a></div><div class='hunk'>@@ -110,7 +110,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	struct kvm_vm *vm;</div><div class='ctx'> </div><div class='ctx'> 	TEST_REQUIRE(host_cpu_is_intel);</div><div class='del'>-	TEST_REQUIRE(!vm_is_unrestricted_guest(NULL));</div><div class='add'>+	TEST_REQUIRE(!kvm_is_unrestricted_guest_enabled());</div><div class='ctx'> </div><div class='ctx'> 	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code);</div><div class='ctx'> 	get_set_sigalrm_vcpu(vcpu);</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c b/tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c<br/>new file mode 100644<br/>index 000000000000..cf1d2d1f2a8f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c</a></div><div class='hunk'>@@ -0,0 +1,132 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2025, Google LLC.</div><div class='add'>+ *</div><div class='add'>+ * Test KVM's ability to save and restore nested state when the L1 guest</div><div class='add'>+ * is using 5-level paging and the L2 guest is using 4-level paging.</div><div class='add'>+ *</div><div class='add'>+ * This test would have failed prior to commit 9245fd6b8531 ("KVM: x86:</div><div class='add'>+ * model canonical checks more precisely").</div><div class='add'>+ */</div><div class='add'>+#include "test_util.h"</div><div class='add'>+#include "kvm_util.h"</div><div class='add'>+#include "processor.h"</div><div class='add'>+#include "vmx.h"</div><div class='add'>+</div><div class='add'>+#define LA57_GS_BASE 0xff2bc0311fb00000ull</div><div class='add'>+</div><div class='add'>+static void l2_guest_code(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Sync with L0 to trigger save/restore.  After</div><div class='add'>+	 * resuming, execute VMCALL to exit back to L1.</div><div class='add'>+	 */</div><div class='add'>+	GUEST_SYNC(1);</div><div class='add'>+	vmcall();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void l1_guest_code(struct vmx_pages *vmx_pages)</div><div class='add'>+{</div><div class='add'>+#define L2_GUEST_STACK_SIZE 64</div><div class='add'>+	unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];</div><div class='add'>+	u64 guest_cr4;</div><div class='add'>+	vm_paddr_t pml5_pa, pml4_pa;</div><div class='add'>+	u64 *pml5;</div><div class='add'>+	u64 exit_reason;</div><div class='add'>+</div><div class='add'>+	/* Set GS_BASE to a value that is only canonical with LA57. */</div><div class='add'>+	wrmsr(MSR_GS_BASE, LA57_GS_BASE);</div><div class='add'>+	GUEST_ASSERT(rdmsr(MSR_GS_BASE) == LA57_GS_BASE);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT(vmx_pages-&gt;vmcs_gpa);</div><div class='add'>+	GUEST_ASSERT(prepare_for_vmx_operation(vmx_pages));</div><div class='add'>+	GUEST_ASSERT(load_vmcs(vmx_pages));</div><div class='add'>+</div><div class='add'>+	prepare_vmcs(vmx_pages, l2_guest_code,</div><div class='add'>+		     &amp;l2_guest_stack[L2_GUEST_STACK_SIZE]);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up L2 with a 4-level page table by pointing its CR3 to</div><div class='add'>+	 * L1's first PML4 table and clearing CR4.LA57. This creates</div><div class='add'>+	 * the CR4.LA57 mismatch that exercises the bug.</div><div class='add'>+	 */</div><div class='add'>+	pml5_pa = get_cr3() &amp; PHYSICAL_PAGE_MASK;</div><div class='add'>+	pml5 = (u64 *)pml5_pa;</div><div class='add'>+	pml4_pa = pml5[0] &amp; PHYSICAL_PAGE_MASK;</div><div class='add'>+	vmwrite(GUEST_CR3, pml4_pa);</div><div class='add'>+</div><div class='add'>+	guest_cr4 = vmreadz(GUEST_CR4);</div><div class='add'>+	guest_cr4 &amp;= ~X86_CR4_LA57;</div><div class='add'>+	vmwrite(GUEST_CR4, guest_cr4);</div><div class='add'>+</div><div class='add'>+	GUEST_ASSERT(!vmlaunch());</div><div class='add'>+</div><div class='add'>+	exit_reason = vmreadz(VM_EXIT_REASON);</div><div class='add'>+	GUEST_ASSERT(exit_reason == EXIT_REASON_VMCALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void guest_code(struct vmx_pages *vmx_pages)</div><div class='add'>+{</div><div class='add'>+	l1_guest_code(vmx_pages);</div><div class='add'>+	GUEST_DONE();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	vm_vaddr_t vmx_pages_gva = 0;</div><div class='add'>+	struct kvm_vm *vm;</div><div class='add'>+	struct kvm_vcpu *vcpu;</div><div class='add'>+	struct kvm_x86_state *state;</div><div class='add'>+	struct ucall uc;</div><div class='add'>+	int stage;</div><div class='add'>+</div><div class='add'>+	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX));</div><div class='add'>+	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_LA57));</div><div class='add'>+	TEST_REQUIRE(kvm_has_cap(KVM_CAP_NESTED_STATE));</div><div class='add'>+</div><div class='add'>+	vm = vm_create_with_one_vcpu(&amp;vcpu, guest_code);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * L1 needs to read its own PML5 table to set up L2. Identity map</div><div class='add'>+	 * the PML5 table to facilitate this.</div><div class='add'>+	 */</div><div class='add'>+	virt_map(vm, vm-&gt;pgd, vm-&gt;pgd, 1);</div><div class='add'>+</div><div class='add'>+	vcpu_alloc_vmx(vm, &amp;vmx_pages_gva);</div><div class='add'>+	vcpu_args_set(vcpu, 1, vmx_pages_gva);</div><div class='add'>+</div><div class='add'>+	for (stage = 1;; stage++) {</div><div class='add'>+		vcpu_run(vcpu);</div><div class='add'>+		TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_IO);</div><div class='add'>+</div><div class='add'>+		switch (get_ucall(vcpu, &amp;uc)) {</div><div class='add'>+		case UCALL_ABORT:</div><div class='add'>+			REPORT_GUEST_ASSERT(uc);</div><div class='add'>+			/* NOT REACHED */</div><div class='add'>+		case UCALL_SYNC:</div><div class='add'>+			break;</div><div class='add'>+		case UCALL_DONE:</div><div class='add'>+			goto done;</div><div class='add'>+		default:</div><div class='add'>+			TEST_FAIL("Unknown ucall %lu", uc.cmd);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		TEST_ASSERT(uc.args[1] == stage,</div><div class='add'>+			    "Expected stage %d, got stage %lu", stage, (ulong)uc.args[1]);</div><div class='add'>+		if (stage == 1) {</div><div class='add'>+			pr_info("L2 is active; performing save/restore.\n");</div><div class='add'>+			state = vcpu_save_state(vcpu);</div><div class='add'>+</div><div class='add'>+			kvm_vm_release(vm);</div><div class='add'>+</div><div class='add'>+			/* Restore state in a new VM. */</div><div class='add'>+			vcpu = vm_recreate_with_one_vcpu(vm);</div><div class='add'>+			vcpu_load_state(vcpu, state);</div><div class='add'>+			kvm_x86_state_cleanup(state);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	kvm_vm_free(vm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c b/tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c<br/>index a1f5ff45d518..7ff6f62e20a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c</a></div><div class='hunk'>@@ -29,7 +29,7 @@ static union perf_capabilities {</div><div class='ctx'> 		u64 pebs_baseline:1;</div><div class='ctx'> 		u64	perf_metrics:1;</div><div class='ctx'> 		u64	pebs_output_pt_available:1;</div><div class='del'>-		u64	anythread_deprecated:1;</div><div class='add'>+		u64	pebs_timing_info:1;</div><div class='ctx'> 	};</div><div class='ctx'> 	u64	capabilities;</div><div class='ctx'> } host_cap;</div><div class='hunk'>@@ -44,6 +44,7 @@ static const union perf_capabilities immutable_caps = {</div><div class='ctx'> 	.pebs_arch_reg = 1,</div><div class='ctx'> 	.pebs_format = -1,</div><div class='ctx'> 	.pebs_baseline = 1,</div><div class='add'>+	.pebs_timing_info = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const union perf_capabilities format_caps = {</div><div class='hunk'>@@ -56,8 +57,8 @@ static void guest_test_perf_capabilities_gp(uint64_t val)</div><div class='ctx'> 	uint8_t vector = wrmsr_safe(MSR_IA32_PERF_CAPABILITIES, val);</div><div class='ctx'> </div><div class='ctx'> 	__GUEST_ASSERT(vector == GP_VECTOR,</div><div class='del'>-		       "Expected #GP for value '0x%lx', got vector '0x%x'",</div><div class='del'>-		       val, vector);</div><div class='add'>+		       "Expected #GP for value '0x%lx', got %s",</div><div class='add'>+		       val, ex_str(vector));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void guest_code(uint64_t current_val)</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c b/tools/testing/selftests/kvm/x86/xapic_ipi_test.c<br/>index a76078a08ff8..ae4a4b6c05ca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/xapic_ipi_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/xapic_ipi_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/xapic_ipi_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/xapic_ipi_test.c</a></div><div class='hunk'>@@ -106,7 +106,8 @@ static void halter_guest_code(struct test_data_page *data)</div><div class='ctx'> 		data-&gt;halter_tpr = xapic_read_reg(APIC_TASKPRI);</div><div class='ctx'> 		data-&gt;halter_ppr = xapic_read_reg(APIC_PROCPRI);</div><div class='ctx'> 		data-&gt;hlt_count++;</div><div class='del'>-		asm volatile("sti; hlt; cli");</div><div class='add'>+		safe_halt();</div><div class='add'>+		cli();</div><div class='ctx'> 		data-&gt;wake_count++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -255,7 +256,7 @@ void do_migrations(struct test_data_page *data, int run_secs, int delay_usecs,</div><div class='ctx'> 	int nodes = 0;</div><div class='ctx'> 	time_t start_time, last_update, now;</div><div class='ctx'> 	time_t interval_secs = 1;</div><div class='del'>-	int i, r;</div><div class='add'>+	int i;</div><div class='ctx'> 	int from, to;</div><div class='ctx'> 	unsigned long bit;</div><div class='ctx'> 	uint64_t hlt_count;</div><div class='hunk'>@@ -266,9 +267,8 @@ void do_migrations(struct test_data_page *data, int run_secs, int delay_usecs,</div><div class='ctx'> 		delay_usecs);</div><div class='ctx'> </div><div class='ctx'> 	/* Get set of first 64 numa nodes available */</div><div class='del'>-	r = get_mempolicy(NULL, &amp;nodemask, sizeof(nodemask) * 8,</div><div class='add'>+	kvm_get_mempolicy(NULL, &amp;nodemask, sizeof(nodemask) * 8,</div><div class='ctx'> 			  0, MPOL_F_MEMS_ALLOWED);</div><div class='del'>-	TEST_ASSERT(r == 0, "get_mempolicy failed errno=%d", errno);</div><div class='ctx'> </div><div class='ctx'> 	fprintf(stderr, "Numa nodes found amongst first %lu possible nodes "</div><div class='ctx'> 		"(each 1-bit indicates node is present): %#lx\n",</div><div class='hunk'>@@ -465,6 +465,19 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	cancel_join_vcpu_thread(threads[0], params[0].vcpu);</div><div class='ctx'> 	cancel_join_vcpu_thread(threads[1], params[1].vcpu);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If the host support Idle HLT, i.e. KVM *might* be using Idle HLT,</div><div class='add'>+	 * then the number of HLT exits may be less than the number of HLTs</div><div class='add'>+	 * that were executed, as Idle HLT elides the exit if the vCPU has an</div><div class='add'>+	 * unmasked, pending IRQ (or NMI).</div><div class='add'>+	 */</div><div class='add'>+	if (this_cpu_has(X86_FEATURE_IDLE_HLT))</div><div class='add'>+		TEST_ASSERT(data-&gt;hlt_count &gt;= vcpu_get_stat(params[0].vcpu, halt_exits),</div><div class='add'>+			    "HLT insns = %lu, HLT exits = %lu",</div><div class='add'>+			    data-&gt;hlt_count, vcpu_get_stat(params[0].vcpu, halt_exits));</div><div class='add'>+	else</div><div class='add'>+		TEST_ASSERT_EQ(data-&gt;hlt_count, vcpu_get_stat(params[0].vcpu, halt_exits));</div><div class='add'>+</div><div class='ctx'> 	fprintf(stderr,</div><div class='ctx'> 		"Test successful after running for %d seconds.\n"</div><div class='ctx'> 		"Sending vCPU sent %lu IPIs to halting vCPU\n"</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/xapic_state_test.c b/tools/testing/selftests/kvm/x86/xapic_state_test.c<br/>index 88bcca188799..3b4814c55722 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/xapic_state_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/xapic_state_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/xapic_state_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/xapic_state_test.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@ struct xapic_vcpu {</div><div class='ctx'> </div><div class='ctx'> static void xapic_guest_code(void)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("cli");</div><div class='add'>+	cli();</div><div class='ctx'> </div><div class='ctx'> 	xapic_enable();</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +38,7 @@ static void xapic_guest_code(void)</div><div class='ctx'> </div><div class='ctx'> static void x2apic_guest_code(void)</div><div class='ctx'> {</div><div class='del'>-	asm volatile("cli");</div><div class='add'>+	cli();</div><div class='ctx'> </div><div class='ctx'> 	x2apic_enable();</div><div class='ctx'> </div><div class='hunk'>@@ -120,8 +120,8 @@ static void test_icr(struct xapic_vcpu *x)</div><div class='ctx'> 		__test_icr(x, icr | i);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Send all flavors of IPIs to non-existent vCPUs.  TODO: use number of</div><div class='del'>-	 * vCPUs, not vcpu.id + 1.  Arbitrarily use vector 0xff.</div><div class='add'>+	 * Send all flavors of IPIs to non-existent vCPUs. Arbitrarily use</div><div class='add'>+	 * vector 0xff.</div><div class='ctx'> 	 */</div><div class='ctx'> 	icr = APIC_INT_ASSERT | 0xff;</div><div class='ctx'> 	for (i = 0; i &lt; 0xff; i++) {</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/xcr0_cpuid_test.c b/tools/testing/selftests/kvm/x86/xcr0_cpuid_test.c<br/>index c8a5c5e51661..d038c1571729 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/xcr0_cpuid_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/xcr0_cpuid_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/xcr0_cpuid_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/xcr0_cpuid_test.c</a></div><div class='hunk'>@@ -81,13 +81,13 @@ static void guest_code(void)</div><div class='ctx'> </div><div class='ctx'> 	vector = xsetbv_safe(0, XFEATURE_MASK_FP);</div><div class='ctx'> 	__GUEST_ASSERT(!vector,</div><div class='del'>-		       "Expected success on XSETBV(FP), got vector '0x%x'",</div><div class='del'>-		       vector);</div><div class='add'>+		       "Expected success on XSETBV(FP), got %s",</div><div class='add'>+		       ex_str(vector));</div><div class='ctx'> </div><div class='ctx'> 	vector = xsetbv_safe(0, supported_xcr0);</div><div class='ctx'> 	__GUEST_ASSERT(!vector,</div><div class='del'>-		       "Expected success on XSETBV(0x%lx), got vector '0x%x'",</div><div class='del'>-		       supported_xcr0, vector);</div><div class='add'>+		       "Expected success on XSETBV(0x%lx), got %s",</div><div class='add'>+		       supported_xcr0, ex_str(vector));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 64; i++) {</div><div class='ctx'> 		if (supported_xcr0 &amp; BIT_ULL(i))</div><div class='hunk'>@@ -95,8 +95,8 @@ static void guest_code(void)</div><div class='ctx'> </div><div class='ctx'> 		vector = xsetbv_safe(0, supported_xcr0 | BIT_ULL(i));</div><div class='ctx'> 		__GUEST_ASSERT(vector == GP_VECTOR,</div><div class='del'>-			       "Expected #GP on XSETBV(0x%llx), supported XCR0 = %lx, got vector '0x%x'",</div><div class='del'>-			       BIT_ULL(i), supported_xcr0, vector);</div><div class='add'>+			       "Expected #GP on XSETBV(0x%llx), supported XCR0 = %lx, got %s",</div><div class='add'>+			       BIT_ULL(i), supported_xcr0, ex_str(vector));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	GUEST_DONE();</div><div class='head'>diff --git a/tools/testing/selftests/kvm/x86/xen_shinfo_test.c b/tools/testing/selftests/kvm/x86/xen_shinfo_test.c<br/>index a59b3c799bb2..23909b501ac2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/xen_shinfo_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/kvm/x86/xen_shinfo_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/kvm/x86/xen_shinfo_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/kvm/x86/xen_shinfo_test.c</a></div><div class='hunk'>@@ -191,10 +191,7 @@ static void guest_code(void)</div><div class='ctx'> 	struct vcpu_runstate_info *rs = (void *)RUNSTATE_VADDR;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-		"sti\n"</div><div class='del'>-		"nop\n"</div><div class='del'>-	);</div><div class='add'>+	sti_nop();</div><div class='ctx'> </div><div class='ctx'> 	/* Trigger an interrupt injection */</div><div class='ctx'> 	GUEST_SYNC(TEST_INJECT_VECTOR);</div><div class='hunk'>@@ -550,15 +547,9 @@ int main(int argc, char *argv[])</div><div class='ctx'> 	int irq_fd[2] = { -1, -1 };</div><div class='ctx'> </div><div class='ctx'> 	if (do_eventfd_tests) {</div><div class='del'>-		irq_fd[0] = eventfd(0, 0);</div><div class='del'>-		irq_fd[1] = eventfd(0, 0);</div><div class='add'>+		irq_fd[0] = kvm_new_eventfd();</div><div class='add'>+		irq_fd[1] = kvm_new_eventfd();</div><div class='ctx'> </div><div class='del'>-		/* Unexpected, but not a KVM failure */</div><div class='del'>-		if (irq_fd[0] == -1 || irq_fd[1] == -1)</div><div class='del'>-			do_evtchn_tests = do_eventfd_tests = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (do_eventfd_tests) {</div><div class='ctx'> 		irq_routes.info.nr = 2;</div><div class='ctx'> </div><div class='ctx'> 		irq_routes.entries[0].gsi = 32;</div><div class='hunk'>@@ -575,15 +566,8 @@ int main(int argc, char *argv[])</div><div class='ctx'> </div><div class='ctx'> 		vm_ioctl(vm, KVM_SET_GSI_ROUTING, &amp;irq_routes.info);</div><div class='ctx'> </div><div class='del'>-		struct kvm_irqfd ifd = { };</div><div class='del'>-</div><div class='del'>-		ifd.fd = irq_fd[0];</div><div class='del'>-		ifd.gsi = 32;</div><div class='del'>-		vm_ioctl(vm, KVM_IRQFD, &amp;ifd);</div><div class='del'>-</div><div class='del'>-		ifd.fd = irq_fd[1];</div><div class='del'>-		ifd.gsi = 33;</div><div class='del'>-		vm_ioctl(vm, KVM_IRQFD, &amp;ifd);</div><div class='add'>+		kvm_assign_irqfd(vm, 32, irq_fd[0]);</div><div class='add'>+		kvm_assign_irqfd(vm, 33, irq_fd[1]);</div><div class='ctx'> </div><div class='ctx'> 		struct sigaction sa = { };</div><div class='ctx'> 		sa.sa_handler = handle_alrm;</div><div class='head'>diff --git a/tools/testing/selftests/landlock/.gitignore b/tools/testing/selftests/landlock/.gitignore<br/>index 470203a7cd73..a820329cae0d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/.gitignore?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/.gitignore</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/.gitignore</a></div><div class='hunk'>@@ -1,2 +1,5 @@</div><div class='ctx'> /*_test</div><div class='add'>+/sandbox-and-launch</div><div class='ctx'> /true</div><div class='add'>+/wait-pipe</div><div class='add'>+/wait-pipe-sandbox</div><div class='head'>diff --git a/tools/testing/selftests/landlock/Makefile b/tools/testing/selftests/landlock/Makefile<br/>index 5cb0828f0514..044b83bde16e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/Makefile</a></div><div class='hunk'>@@ -4,13 +4,17 @@</div><div class='ctx'> </div><div class='ctx'> CFLAGS += -Wall -O2 $(KHDR_INCLUDES)</div><div class='ctx'> </div><div class='del'>-LOCAL_HDRS += common.h</div><div class='add'>+LOCAL_HDRS += $(wildcard *.h)</div><div class='ctx'> </div><div class='ctx'> src_test := $(wildcard *_test.c)</div><div class='ctx'> </div><div class='ctx'> TEST_GEN_PROGS := $(src_test:.c=)</div><div class='ctx'> </div><div class='del'>-TEST_GEN_PROGS_EXTENDED := true sandbox-and-launch wait-pipe</div><div class='add'>+TEST_GEN_PROGS_EXTENDED := \</div><div class='add'>+	true \</div><div class='add'>+	sandbox-and-launch \</div><div class='add'>+	wait-pipe \</div><div class='add'>+	wait-pipe-sandbox</div><div class='ctx'> </div><div class='ctx'> # Short targets:</div><div class='ctx'> $(TEST_GEN_PROGS): LDLIBS += -lcap -lpthread</div><div class='head'>diff --git a/tools/testing/selftests/landlock/audit.h b/tools/testing/selftests/landlock/audit.h<br/>new file mode 100644<br/>index 000000000000..44eb433e9666<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/audit.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/audit.h</a></div><div class='hunk'>@@ -0,0 +1,478 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Landlock audit helpers</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2024-2025 Microsoft Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;linux/audit.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+#include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;regex.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;stdint.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include "kselftest.h"</div><div class='add'>+</div><div class='add'>+#ifndef ARRAY_SIZE</div><div class='add'>+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define REGEX_LANDLOCK_PREFIX "^audit([0-9.:]\\+): domain=\\([0-9a-f]\\+\\)"</div><div class='add'>+</div><div class='add'>+struct audit_filter {</div><div class='add'>+	__u32 record_type;</div><div class='add'>+	size_t exe_len;</div><div class='add'>+	char exe[PATH_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct audit_message {</div><div class='add'>+	struct nlmsghdr header;</div><div class='add'>+	union {</div><div class='add'>+		struct audit_status status;</div><div class='add'>+		struct audit_features features;</div><div class='add'>+		struct audit_rule_data rule;</div><div class='add'>+		struct nlmsgerr err;</div><div class='add'>+		char data[PATH_MAX + 200];</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct timeval audit_tv_dom_drop = {</div><div class='add'>+	/*</div><div class='add'>+	 * Because domain deallocation is tied to asynchronous credential</div><div class='add'>+	 * freeing, receiving such event may take some time.  In practice,</div><div class='add'>+	 * on a small VM, it should not exceed 100k usec, but let's wait up</div><div class='add'>+	 * to 1 second to be safe.</div><div class='add'>+	 */</div><div class='add'>+	.tv_sec = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct timeval audit_tv_default = {</div><div class='add'>+	.tv_usec = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int audit_send(const int fd, const struct audit_message *const msg)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_nl addr = {</div><div class='add'>+		.nl_family = AF_NETLINK,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = sendto(fd, msg, msg-&gt;header.nlmsg_len, 0,</div><div class='add'>+			     (struct sockaddr *)&amp;addr, sizeof(addr));</div><div class='add'>+	} while (ret &lt; 0 &amp;&amp; errno == EINTR);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	if (ret != msg-&gt;header.nlmsg_len)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int audit_recv(const int fd, struct audit_message *msg)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_nl addr;</div><div class='add'>+	socklen_t addrlen = sizeof(addr);</div><div class='add'>+	struct audit_message msg_tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!msg)</div><div class='add'>+		msg = &amp;msg_tmp;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = recvfrom(fd, msg, sizeof(*msg), 0,</div><div class='add'>+			       (struct sockaddr *)&amp;addr, &amp;addrlen);</div><div class='add'>+	} while (err &lt; 0 &amp;&amp; errno == EINTR);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	if (addrlen != sizeof(addr) || addr.nl_pid != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Checks Netlink error or end of messages. */</div><div class='add'>+	if (msg-&gt;header.nlmsg_type == NLMSG_ERROR)</div><div class='add'>+		return msg-&gt;err.error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int audit_request(const int fd,</div><div class='add'>+			 const struct audit_message *const request,</div><div class='add'>+			 struct audit_message *reply)</div><div class='add'>+{</div><div class='add'>+	struct audit_message msg_tmp;</div><div class='add'>+	bool first_reply = true;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = audit_send(fd, request);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!reply)</div><div class='add'>+		reply = &amp;msg_tmp;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (first_reply)</div><div class='add'>+			first_reply = false;</div><div class='add'>+		else</div><div class='add'>+			reply = &amp;msg_tmp;</div><div class='add'>+</div><div class='add'>+		err = audit_recv(fd, reply);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} while (reply-&gt;header.nlmsg_type != NLMSG_ERROR &amp;&amp;</div><div class='add'>+		 reply-&gt;err.msg.nlmsg_type != request-&gt;header.nlmsg_type);</div><div class='add'>+</div><div class='add'>+	return reply-&gt;err.error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int audit_filter_exe(const int audit_fd,</div><div class='add'>+			    const struct audit_filter *const filter,</div><div class='add'>+			    const __u16 type)</div><div class='add'>+{</div><div class='add'>+	struct audit_message msg = {</div><div class='add'>+		.header = {</div><div class='add'>+			.nlmsg_len = NLMSG_SPACE(sizeof(msg.rule)) +</div><div class='add'>+				     NLMSG_ALIGN(filter-&gt;exe_len),</div><div class='add'>+			.nlmsg_type = type,</div><div class='add'>+			.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK,</div><div class='add'>+		},</div><div class='add'>+		.rule = {</div><div class='add'>+			.flags = AUDIT_FILTER_EXCLUDE,</div><div class='add'>+			.action = AUDIT_NEVER,</div><div class='add'>+			.field_count = 1,</div><div class='add'>+			.fields[0] = filter-&gt;record_type,</div><div class='add'>+			.fieldflags[0] = AUDIT_NOT_EQUAL,</div><div class='add'>+			.values[0] = filter-&gt;exe_len,</div><div class='add'>+			.buflen = filter-&gt;exe_len,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (filter-&gt;record_type != AUDIT_EXE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(msg.rule.buf, filter-&gt;exe, filter-&gt;exe_len);</div><div class='add'>+	return audit_request(audit_fd, &amp;msg, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int audit_filter_drop(const int audit_fd, const __u16 type)</div><div class='add'>+{</div><div class='add'>+	struct audit_message msg = {</div><div class='add'>+		.header = {</div><div class='add'>+			.nlmsg_len = NLMSG_SPACE(sizeof(msg.rule)),</div><div class='add'>+			.nlmsg_type = type,</div><div class='add'>+			.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK,</div><div class='add'>+		},</div><div class='add'>+		.rule = {</div><div class='add'>+			.flags = AUDIT_FILTER_EXCLUDE,</div><div class='add'>+			.action = AUDIT_NEVER,</div><div class='add'>+			.field_count = 1,</div><div class='add'>+			.fields[0] = AUDIT_MSGTYPE,</div><div class='add'>+			.fieldflags[0] = AUDIT_NOT_EQUAL,</div><div class='add'>+			.values[0] = AUDIT_LANDLOCK_DOMAIN,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return audit_request(audit_fd, &amp;msg, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int audit_set_status(int fd, __u32 key, __u32 val)</div><div class='add'>+{</div><div class='add'>+	const struct audit_message msg = {</div><div class='add'>+		.header = {</div><div class='add'>+			.nlmsg_len = NLMSG_SPACE(sizeof(msg.status)),</div><div class='add'>+			.nlmsg_type = AUDIT_SET,</div><div class='add'>+			.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK,</div><div class='add'>+		},</div><div class='add'>+		.status = {</div><div class='add'>+			.mask = key,</div><div class='add'>+			.enabled = key == AUDIT_STATUS_ENABLED ? val : 0,</div><div class='add'>+			.pid = key == AUDIT_STATUS_PID ? val : 0,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return audit_request(fd, &amp;msg, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns a pointer to the last filled character of @dst, which is `\0`.  */</div><div class='add'>+static __maybe_unused char *regex_escape(const char *const src, char *dst,</div><div class='add'>+					 size_t dst_size)</div><div class='add'>+{</div><div class='add'>+	char *d = dst;</div><div class='add'>+</div><div class='add'>+	for (const char *s = src; *s; s++) {</div><div class='add'>+		switch (*s) {</div><div class='add'>+		case '$':</div><div class='add'>+		case '*':</div><div class='add'>+		case '.':</div><div class='add'>+		case '[':</div><div class='add'>+		case '\\':</div><div class='add'>+		case ']':</div><div class='add'>+		case '^':</div><div class='add'>+			if (d &gt;= dst + dst_size - 2)</div><div class='add'>+				return (char *)-ENOMEM;</div><div class='add'>+</div><div class='add'>+			*d++ = '\\';</div><div class='add'>+			*d++ = *s;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			if (d &gt;= dst + dst_size - 1)</div><div class='add'>+				return (char *)-ENOMEM;</div><div class='add'>+</div><div class='add'>+			*d++ = *s;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (d &gt;= dst + dst_size - 1)</div><div class='add'>+		return (char *)-ENOMEM;</div><div class='add'>+</div><div class='add'>+	*d = '\0';</div><div class='add'>+	return d;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * @domain_id: The domain ID extracted from the audit message (if the first part</div><div class='add'>+ * of @pattern is REGEX_LANDLOCK_PREFIX).  It is set to 0 if the domain ID is</div><div class='add'>+ * not found.</div><div class='add'>+ */</div><div class='add'>+static int audit_match_record(int audit_fd, const __u16 type,</div><div class='add'>+			      const char *const pattern, __u64 *domain_id)</div><div class='add'>+{</div><div class='add'>+	struct audit_message msg;</div><div class='add'>+	int ret, err = 0;</div><div class='add'>+	bool matches_record = !type;</div><div class='add'>+	regmatch_t matches[2];</div><div class='add'>+	regex_t regex;</div><div class='add'>+</div><div class='add'>+	ret = regcomp(&amp;regex, pattern, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+		err = audit_recv(audit_fd, &amp;msg);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (msg.header.nlmsg_type == type)</div><div class='add'>+			matches_record = true;</div><div class='add'>+	} while (!matches_record);</div><div class='add'>+</div><div class='add'>+	ret = regexec(&amp;regex, msg.data, ARRAY_SIZE(matches), matches, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printf("DATA: %s\n", msg.data);</div><div class='add'>+		printf("ERROR: no match for pattern: %s\n", pattern);</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (domain_id) {</div><div class='add'>+		*domain_id = 0;</div><div class='add'>+		if (matches[1].rm_so != -1) {</div><div class='add'>+			int match_len = matches[1].rm_eo - matches[1].rm_so;</div><div class='add'>+			/* The maximal characters of a 2^64 hexadecimal number is 17. */</div><div class='add'>+			char dom_id[18];</div><div class='add'>+</div><div class='add'>+			if (match_len &gt; 0 &amp;&amp; match_len &lt; sizeof(dom_id)) {</div><div class='add'>+				memcpy(dom_id, msg.data + matches[1].rm_so,</div><div class='add'>+				       match_len);</div><div class='add'>+				dom_id[match_len] = '\0';</div><div class='add'>+				if (domain_id)</div><div class='add'>+					*domain_id = strtoull(dom_id, NULL, 16);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	regfree(&amp;regex);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused matches_log_domain_allocated(int audit_fd, pid_t pid,</div><div class='add'>+						       __u64 *domain_id)</div><div class='add'>+{</div><div class='add'>+	static const char log_template[] = REGEX_LANDLOCK_PREFIX</div><div class='add'>+		" status=allocated mode=enforcing pid=%d uid=[0-9]\\+"</div><div class='add'>+		" exe=\"[^\"]\\+\" comm=\".*_test\"$";</div><div class='add'>+	char log_match[sizeof(log_template) + 10];</div><div class='add'>+	int log_match_len;</div><div class='add'>+</div><div class='add'>+	log_match_len =</div><div class='add'>+		snprintf(log_match, sizeof(log_match), log_template, pid);</div><div class='add'>+	if (log_match_len &gt; sizeof(log_match))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	return audit_match_record(audit_fd, AUDIT_LANDLOCK_DOMAIN, log_match,</div><div class='add'>+				  domain_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused matches_log_domain_deallocated(</div><div class='add'>+	int audit_fd, unsigned int num_denials, __u64 *domain_id)</div><div class='add'>+{</div><div class='add'>+	static const char log_template[] = REGEX_LANDLOCK_PREFIX</div><div class='add'>+		" status=deallocated denials=%u$";</div><div class='add'>+	char log_match[sizeof(log_template) + 10];</div><div class='add'>+	int log_match_len;</div><div class='add'>+</div><div class='add'>+	log_match_len = snprintf(log_match, sizeof(log_match), log_template,</div><div class='add'>+				 num_denials);</div><div class='add'>+	if (log_match_len &gt; sizeof(log_match))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	return audit_match_record(audit_fd, AUDIT_LANDLOCK_DOMAIN, log_match,</div><div class='add'>+				  domain_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct audit_records {</div><div class='add'>+	size_t access;</div><div class='add'>+	size_t domain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int audit_count_records(int audit_fd, struct audit_records *records)</div><div class='add'>+{</div><div class='add'>+	struct audit_message msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	records-&gt;access = 0;</div><div class='add'>+	records-&gt;domain = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+		err = audit_recv(audit_fd, &amp;msg);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (err == -EAGAIN)</div><div class='add'>+				return 0;</div><div class='add'>+			else</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (msg.header.nlmsg_type) {</div><div class='add'>+		case AUDIT_LANDLOCK_ACCESS:</div><div class='add'>+			records-&gt;access++;</div><div class='add'>+			break;</div><div class='add'>+		case AUDIT_LANDLOCK_DOMAIN:</div><div class='add'>+			records-&gt;domain++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int audit_init(void)</div><div class='add'>+{</div><div class='add'>+	int fd, err;</div><div class='add'>+</div><div class='add'>+	fd = socket(PF_NETLINK, SOCK_RAW, NETLINK_AUDIT);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	err = audit_set_status(fd, AUDIT_STATUS_ENABLED, 1);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = audit_set_status(fd, AUDIT_STATUS_PID, getpid());</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Sets a timeout for negative tests. */</div><div class='add'>+	err = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &amp;audit_tv_default,</div><div class='add'>+			 sizeof(audit_tv_default));</div><div class='add'>+	if (err)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	return fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int audit_init_filter_exe(struct audit_filter *filter, const char *path)</div><div class='add'>+{</div><div class='add'>+	char *absolute_path = NULL;</div><div class='add'>+</div><div class='add'>+	/* It is assume that there is not already filtering rules. */</div><div class='add'>+	filter-&gt;record_type = AUDIT_EXE;</div><div class='add'>+	if (!path) {</div><div class='add'>+		int ret = readlink("/proc/self/exe", filter-&gt;exe,</div><div class='add'>+				   sizeof(filter-&gt;exe) - 1);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return -errno;</div><div class='add'>+</div><div class='add'>+		filter-&gt;exe_len = ret;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	absolute_path = realpath(path, NULL);</div><div class='add'>+	if (!absolute_path)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	/* No need for the terminating NULL byte. */</div><div class='add'>+	filter-&gt;exe_len = strlen(absolute_path);</div><div class='add'>+	if (filter-&gt;exe_len &gt; sizeof(filter-&gt;exe))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	memcpy(filter-&gt;exe, absolute_path, filter-&gt;exe_len);</div><div class='add'>+	free(absolute_path);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int audit_cleanup(int audit_fd, struct audit_filter *filter)</div><div class='add'>+{</div><div class='add'>+	struct audit_filter new_filter;</div><div class='add'>+</div><div class='add'>+	if (audit_fd &lt; 0 || !filter) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Simulates audit_init_with_exe_filter() when called from</div><div class='add'>+		 * FIXTURE_TEARDOWN_PARENT().</div><div class='add'>+		 */</div><div class='add'>+		audit_fd = audit_init();</div><div class='add'>+		if (audit_fd &lt; 0)</div><div class='add'>+			return audit_fd;</div><div class='add'>+</div><div class='add'>+		filter = &amp;new_filter;</div><div class='add'>+		err = audit_init_filter_exe(filter, NULL);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Filters might not be in place. */</div><div class='add'>+	audit_filter_exe(audit_fd, filter, AUDIT_DEL_RULE);</div><div class='add'>+	audit_filter_drop(audit_fd, AUDIT_DEL_RULE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Because audit_cleanup() might not be called by the test auditd</div><div class='add'>+	 * process, it might not be possible to explicitly set it.  Anyway,</div><div class='add'>+	 * AUDIT_STATUS_ENABLED will implicitly be set to 0 when the auditd</div><div class='add'>+	 * process will exit.</div><div class='add'>+	 */</div><div class='add'>+	return close(audit_fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int audit_init_with_exe_filter(struct audit_filter *filter)</div><div class='add'>+{</div><div class='add'>+	int fd, err;</div><div class='add'>+</div><div class='add'>+	fd = audit_init();</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		return fd;</div><div class='add'>+</div><div class='add'>+	err = audit_init_filter_exe(filter, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = audit_filter_exe(fd, filter, AUDIT_ADD_RULE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return fd;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/landlock/audit_test.c b/tools/testing/selftests/landlock/audit_test.c<br/>new file mode 100644<br/>index 000000000000..46d02d49835a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/audit_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/audit_test.c</a></div><div class='hunk'>@@ -0,0 +1,672 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Landlock tests - Audit</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2024-2025 Microsoft Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;limits.h&gt;</div><div class='add'>+#include &lt;linux/landlock.h&gt;</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;sys/mount.h&gt;</div><div class='add'>+#include &lt;sys/prctl.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include "audit.h"</div><div class='add'>+#include "common.h"</div><div class='add'>+</div><div class='add'>+static int matches_log_signal(struct __test_metadata *const _metadata,</div><div class='add'>+			      int audit_fd, const pid_t opid, __u64 *domain_id)</div><div class='add'>+{</div><div class='add'>+	static const char log_template[] = REGEX_LANDLOCK_PREFIX</div><div class='add'>+		" blockers=scope\\.signal opid=%d ocomm=\"audit_test\"$";</div><div class='add'>+	char log_match[sizeof(log_template) + 10];</div><div class='add'>+	int log_match_len;</div><div class='add'>+</div><div class='add'>+	log_match_len =</div><div class='add'>+		snprintf(log_match, sizeof(log_match), log_template, opid);</div><div class='add'>+	if (log_match_len &gt; sizeof(log_match))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	return audit_match_record(audit_fd, AUDIT_LANDLOCK_ACCESS, log_match,</div><div class='add'>+				  domain_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE(audit)</div><div class='add'>+{</div><div class='add'>+	struct audit_filter audit_filter;</div><div class='add'>+	int audit_fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(audit)</div><div class='add'>+{</div><div class='add'>+	disable_caps(_metadata);</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	self-&gt;audit_fd = audit_init_with_exe_filter(&amp;self-&gt;audit_filter);</div><div class='add'>+	EXPECT_LE(0, self-&gt;audit_fd)</div><div class='add'>+	{</div><div class='add'>+		const char *error_msg;</div><div class='add'>+</div><div class='add'>+		/* kill "$(auditctl -s | sed -ne 's/^pid \([0-9]\+\)$/\1/p')" */</div><div class='add'>+		if (self-&gt;audit_fd == -EEXIST)</div><div class='add'>+			error_msg = "socket already in use (e.g. auditd)";</div><div class='add'>+		else</div><div class='add'>+			error_msg = strerror(-self-&gt;audit_fd);</div><div class='add'>+		TH_LOG("Failed to initialize audit: %s", error_msg);</div><div class='add'>+	}</div><div class='add'>+	clear_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(audit)</div><div class='add'>+{</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	EXPECT_EQ(0, audit_cleanup(self-&gt;audit_fd, &amp;self-&gt;audit_filter));</div><div class='add'>+	clear_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit, layers)</div><div class='add'>+{</div><div class='add'>+	const struct landlock_ruleset_attr ruleset_attr = {</div><div class='add'>+		.scoped = LANDLOCK_SCOPE_SIGNAL,</div><div class='add'>+	};</div><div class='add'>+	int status, ruleset_fd, i;</div><div class='add'>+	__u64(*domain_stack)[16];</div><div class='add'>+	__u64 prev_dom = 3;</div><div class='add'>+	pid_t child;</div><div class='add'>+</div><div class='add'>+	domain_stack = mmap(NULL, sizeof(*domain_stack), PROT_READ | PROT_WRITE,</div><div class='add'>+			    MAP_SHARED | MAP_ANONYMOUS, -1, 0);</div><div class='add'>+	ASSERT_NE(MAP_FAILED, domain_stack);</div><div class='add'>+	memset(domain_stack, 0, sizeof(*domain_stack));</div><div class='add'>+</div><div class='add'>+	ruleset_fd =</div><div class='add'>+		landlock_create_ruleset(&amp;ruleset_attr, sizeof(ruleset_attr), 0);</div><div class='add'>+	ASSERT_LE(0, ruleset_fd);</div><div class='add'>+	EXPECT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0));</div><div class='add'>+</div><div class='add'>+	child = fork();</div><div class='add'>+	ASSERT_LE(0, child);</div><div class='add'>+	if (child == 0) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(*domain_stack); i++) {</div><div class='add'>+			__u64 denial_dom = 1;</div><div class='add'>+			__u64 allocated_dom = 2;</div><div class='add'>+</div><div class='add'>+			EXPECT_EQ(0, landlock_restrict_self(ruleset_fd, 0));</div><div class='add'>+</div><div class='add'>+			/* Creates a denial to get the domain ID. */</div><div class='add'>+			EXPECT_EQ(-1, kill(getppid(), 0));</div><div class='add'>+			EXPECT_EQ(EPERM, errno);</div><div class='add'>+			EXPECT_EQ(0,</div><div class='add'>+				  matches_log_signal(_metadata, self-&gt;audit_fd,</div><div class='add'>+						     getppid(), &amp;denial_dom));</div><div class='add'>+			EXPECT_EQ(0, matches_log_domain_allocated(</div><div class='add'>+					     self-&gt;audit_fd, getpid(),</div><div class='add'>+					     &amp;allocated_dom));</div><div class='add'>+			EXPECT_NE(denial_dom, 1);</div><div class='add'>+			EXPECT_NE(denial_dom, 0);</div><div class='add'>+			EXPECT_EQ(denial_dom, allocated_dom);</div><div class='add'>+</div><div class='add'>+			/* Checks that the new domain is younger than the previous one. */</div><div class='add'>+			EXPECT_GT(allocated_dom, prev_dom);</div><div class='add'>+			prev_dom = allocated_dom;</div><div class='add'>+			(*domain_stack)[i] = allocated_dom;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Checks that we reached the maximum number of layers. */</div><div class='add'>+		EXPECT_EQ(-1, landlock_restrict_self(ruleset_fd, 0));</div><div class='add'>+		EXPECT_EQ(E2BIG, errno);</div><div class='add'>+</div><div class='add'>+		/* Updates filter rules to match the drop record. */</div><div class='add'>+		set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+		EXPECT_EQ(0, audit_filter_drop(self-&gt;audit_fd, AUDIT_ADD_RULE));</div><div class='add'>+		EXPECT_EQ(0,</div><div class='add'>+			  audit_filter_exe(self-&gt;audit_fd, &amp;self-&gt;audit_filter,</div><div class='add'>+					   AUDIT_DEL_RULE));</div><div class='add'>+		clear_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+</div><div class='add'>+		_exit(_metadata-&gt;exit_code);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(child, waitpid(child, &amp;status, 0));</div><div class='add'>+	if (WIFSIGNALED(status) || !WIFEXITED(status) ||</div><div class='add'>+	    WEXITSTATUS(status) != EXIT_SUCCESS)</div><div class='add'>+		_metadata-&gt;exit_code = KSFT_FAIL;</div><div class='add'>+</div><div class='add'>+	/* Purges log from deallocated domains. */</div><div class='add'>+	EXPECT_EQ(0, setsockopt(self-&gt;audit_fd, SOL_SOCKET, SO_RCVTIMEO,</div><div class='add'>+				&amp;audit_tv_dom_drop, sizeof(audit_tv_dom_drop)));</div><div class='add'>+	for (i = ARRAY_SIZE(*domain_stack) - 1; i &gt;= 0; i--) {</div><div class='add'>+		__u64 deallocated_dom = 2;</div><div class='add'>+</div><div class='add'>+		EXPECT_EQ(0, matches_log_domain_deallocated(self-&gt;audit_fd, 1,</div><div class='add'>+							    &amp;deallocated_dom));</div><div class='add'>+		EXPECT_EQ((*domain_stack)[i], deallocated_dom)</div><div class='add'>+		{</div><div class='add'>+			TH_LOG("Failed to match domain %llx (#%d)",</div><div class='add'>+			       (*domain_stack)[i], i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, munmap(domain_stack, sizeof(*domain_stack)));</div><div class='add'>+	EXPECT_EQ(0, setsockopt(self-&gt;audit_fd, SOL_SOCKET, SO_RCVTIMEO,</div><div class='add'>+				&amp;audit_tv_default, sizeof(audit_tv_default)));</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct thread_data {</div><div class='add'>+	pid_t parent_pid;</div><div class='add'>+	int ruleset_fd, pipe_child, pipe_parent;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void *thread_audit_test(void *arg)</div><div class='add'>+{</div><div class='add'>+	const struct thread_data *data = (struct thread_data *)arg;</div><div class='add'>+	uintptr_t err = 0;</div><div class='add'>+	char buffer;</div><div class='add'>+</div><div class='add'>+	/* TGID and TID are different for a second thread. */</div><div class='add'>+	if (getpid() == gettid()) {</div><div class='add'>+		err = 1;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (landlock_restrict_self(data-&gt;ruleset_fd, 0)) {</div><div class='add'>+		err = 2;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (close(data-&gt;ruleset_fd)) {</div><div class='add'>+		err = 3;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Creates a denial to get the domain ID. */</div><div class='add'>+	if (kill(data-&gt;parent_pid, 0) != -1) {</div><div class='add'>+		err = 4;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (EPERM != errno) {</div><div class='add'>+		err = 5;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Signals the parent to read denial logs. */</div><div class='add'>+	if (write(data-&gt;pipe_child, ".", 1) != 1) {</div><div class='add'>+		err = 6;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Waits for the parent to update audit filters. */</div><div class='add'>+	if (read(data-&gt;pipe_parent, &amp;buffer, 1) != 1) {</div><div class='add'>+		err = 7;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	close(data-&gt;pipe_child);</div><div class='add'>+	close(data-&gt;pipe_parent);</div><div class='add'>+	return (void *)err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Checks that the PID tied to a domain is not a TID but the TGID. */</div><div class='add'>+TEST_F(audit, thread)</div><div class='add'>+{</div><div class='add'>+	const struct landlock_ruleset_attr ruleset_attr = {</div><div class='add'>+		.scoped = LANDLOCK_SCOPE_SIGNAL,</div><div class='add'>+	};</div><div class='add'>+	__u64 denial_dom = 1;</div><div class='add'>+	__u64 allocated_dom = 2;</div><div class='add'>+	__u64 deallocated_dom = 3;</div><div class='add'>+	pthread_t thread;</div><div class='add'>+	int pipe_child[2], pipe_parent[2];</div><div class='add'>+	char buffer;</div><div class='add'>+	struct thread_data child_data;</div><div class='add'>+</div><div class='add'>+	child_data.parent_pid = getppid();</div><div class='add'>+	ASSERT_EQ(0, pipe2(pipe_child, O_CLOEXEC));</div><div class='add'>+	child_data.pipe_child = pipe_child[1];</div><div class='add'>+	ASSERT_EQ(0, pipe2(pipe_parent, O_CLOEXEC));</div><div class='add'>+	child_data.pipe_parent = pipe_parent[0];</div><div class='add'>+	child_data.ruleset_fd =</div><div class='add'>+		landlock_create_ruleset(&amp;ruleset_attr, sizeof(ruleset_attr), 0);</div><div class='add'>+	ASSERT_LE(0, child_data.ruleset_fd);</div><div class='add'>+</div><div class='add'>+	/* TGID and TID are the same for the initial thread . */</div><div class='add'>+	EXPECT_EQ(getpid(), gettid());</div><div class='add'>+	EXPECT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0));</div><div class='add'>+	ASSERT_EQ(0, pthread_create(&amp;thread, NULL, thread_audit_test,</div><div class='add'>+				    &amp;child_data));</div><div class='add'>+</div><div class='add'>+	/* Waits for the child to generate a denial. */</div><div class='add'>+	ASSERT_EQ(1, read(pipe_child[0], &amp;buffer, 1));</div><div class='add'>+	EXPECT_EQ(0, close(pipe_child[0]));</div><div class='add'>+</div><div class='add'>+	/* Matches the signal log to get the domain ID. */</div><div class='add'>+	EXPECT_EQ(0, matches_log_signal(_metadata, self-&gt;audit_fd,</div><div class='add'>+					child_data.parent_pid, &amp;denial_dom));</div><div class='add'>+	EXPECT_NE(denial_dom, 1);</div><div class='add'>+	EXPECT_NE(denial_dom, 0);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, matches_log_domain_allocated(self-&gt;audit_fd, getpid(),</div><div class='add'>+						  &amp;allocated_dom));</div><div class='add'>+	EXPECT_EQ(denial_dom, allocated_dom);</div><div class='add'>+</div><div class='add'>+	/* Updates filter rules to match the drop record. */</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	EXPECT_EQ(0, audit_filter_drop(self-&gt;audit_fd, AUDIT_ADD_RULE));</div><div class='add'>+	EXPECT_EQ(0, audit_filter_exe(self-&gt;audit_fd, &amp;self-&gt;audit_filter,</div><div class='add'>+				      AUDIT_DEL_RULE));</div><div class='add'>+	clear_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* Signals the thread to exit, which will generate a domain deallocation. */</div><div class='add'>+	ASSERT_EQ(1, write(pipe_parent[1], ".", 1));</div><div class='add'>+	EXPECT_EQ(0, close(pipe_parent[1]));</div><div class='add'>+	ASSERT_EQ(0, pthread_join(thread, NULL));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, setsockopt(self-&gt;audit_fd, SOL_SOCKET, SO_RCVTIMEO,</div><div class='add'>+				&amp;audit_tv_dom_drop, sizeof(audit_tv_dom_drop)));</div><div class='add'>+	EXPECT_EQ(0, matches_log_domain_deallocated(self-&gt;audit_fd, 1,</div><div class='add'>+						    &amp;deallocated_dom));</div><div class='add'>+	EXPECT_EQ(denial_dom, deallocated_dom);</div><div class='add'>+	EXPECT_EQ(0, setsockopt(self-&gt;audit_fd, SOL_SOCKET, SO_RCVTIMEO,</div><div class='add'>+				&amp;audit_tv_default, sizeof(audit_tv_default)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE(audit_flags)</div><div class='add'>+{</div><div class='add'>+	struct audit_filter audit_filter;</div><div class='add'>+	int audit_fd;</div><div class='add'>+	__u64 *domain_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT(audit_flags)</div><div class='add'>+{</div><div class='add'>+	const int restrict_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(audit_flags, default) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.restrict_flags = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(audit_flags, same_exec_off) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.restrict_flags = LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(audit_flags, subdomains_off) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.restrict_flags = LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(audit_flags, cross_exec_on) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.restrict_flags = LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(audit_flags)</div><div class='add'>+{</div><div class='add'>+	disable_caps(_metadata);</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	self-&gt;audit_fd = audit_init_with_exe_filter(&amp;self-&gt;audit_filter);</div><div class='add'>+	EXPECT_LE(0, self-&gt;audit_fd)</div><div class='add'>+	{</div><div class='add'>+		const char *error_msg;</div><div class='add'>+</div><div class='add'>+		/* kill "$(auditctl -s | sed -ne 's/^pid \([0-9]\+\)$/\1/p')" */</div><div class='add'>+		if (self-&gt;audit_fd == -EEXIST)</div><div class='add'>+			error_msg = "socket already in use (e.g. auditd)";</div><div class='add'>+		else</div><div class='add'>+			error_msg = strerror(-self-&gt;audit_fd);</div><div class='add'>+		TH_LOG("Failed to initialize audit: %s", error_msg);</div><div class='add'>+	}</div><div class='add'>+	clear_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+</div><div class='add'>+	self-&gt;domain_id = mmap(NULL, sizeof(*self-&gt;domain_id),</div><div class='add'>+			       PROT_READ | PROT_WRITE,</div><div class='add'>+			       MAP_SHARED | MAP_ANONYMOUS, -1, 0);</div><div class='add'>+	ASSERT_NE(MAP_FAILED, self-&gt;domain_id);</div><div class='add'>+	/* Domain IDs are greater or equal to 2^32. */</div><div class='add'>+	*self-&gt;domain_id = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(audit_flags)</div><div class='add'>+{</div><div class='add'>+	EXPECT_EQ(0, munmap(self-&gt;domain_id, sizeof(*self-&gt;domain_id)));</div><div class='add'>+</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	EXPECT_EQ(0, audit_cleanup(self-&gt;audit_fd, &amp;self-&gt;audit_filter));</div><div class='add'>+	clear_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_flags, signal)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	pid_t child;</div><div class='add'>+	struct audit_records records;</div><div class='add'>+	__u64 deallocated_dom = 2;</div><div class='add'>+</div><div class='add'>+	child = fork();</div><div class='add'>+	ASSERT_LE(0, child);</div><div class='add'>+	if (child == 0) {</div><div class='add'>+		const struct landlock_ruleset_attr ruleset_attr = {</div><div class='add'>+			.scoped = LANDLOCK_SCOPE_SIGNAL,</div><div class='add'>+		};</div><div class='add'>+		int ruleset_fd;</div><div class='add'>+</div><div class='add'>+		/* Add filesystem restrictions. */</div><div class='add'>+		ruleset_fd = landlock_create_ruleset(&amp;ruleset_attr,</div><div class='add'>+						     sizeof(ruleset_attr), 0);</div><div class='add'>+		ASSERT_LE(0, ruleset_fd);</div><div class='add'>+		EXPECT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0));</div><div class='add'>+		ASSERT_EQ(0, landlock_restrict_self(ruleset_fd,</div><div class='add'>+						    variant-&gt;restrict_flags));</div><div class='add'>+		EXPECT_EQ(0, close(ruleset_fd));</div><div class='add'>+</div><div class='add'>+		/* First signal checks to test log entries. */</div><div class='add'>+		EXPECT_EQ(-1, kill(getppid(), 0));</div><div class='add'>+		EXPECT_EQ(EPERM, errno);</div><div class='add'>+</div><div class='add'>+		if (variant-&gt;restrict_flags &amp;</div><div class='add'>+		    LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF) {</div><div class='add'>+			EXPECT_EQ(-EAGAIN, matches_log_signal(</div><div class='add'>+						   _metadata, self-&gt;audit_fd,</div><div class='add'>+						   getppid(), self-&gt;domain_id));</div><div class='add'>+			EXPECT_EQ(*self-&gt;domain_id, 1);</div><div class='add'>+		} else {</div><div class='add'>+			__u64 allocated_dom = 3;</div><div class='add'>+</div><div class='add'>+			EXPECT_EQ(0, matches_log_signal(</div><div class='add'>+					     _metadata, self-&gt;audit_fd,</div><div class='add'>+					     getppid(), self-&gt;domain_id));</div><div class='add'>+</div><div class='add'>+			/* Checks domain information records. */</div><div class='add'>+			EXPECT_EQ(0, matches_log_domain_allocated(</div><div class='add'>+					     self-&gt;audit_fd, getpid(),</div><div class='add'>+					     &amp;allocated_dom));</div><div class='add'>+			EXPECT_NE(*self-&gt;domain_id, 1);</div><div class='add'>+			EXPECT_NE(*self-&gt;domain_id, 0);</div><div class='add'>+			EXPECT_EQ(*self-&gt;domain_id, allocated_dom);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Second signal checks to test audit_count_records(). */</div><div class='add'>+		EXPECT_EQ(-1, kill(getppid(), 0));</div><div class='add'>+		EXPECT_EQ(EPERM, errno);</div><div class='add'>+</div><div class='add'>+		/* Makes sure there is no superfluous logged records. */</div><div class='add'>+		EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+		if (variant-&gt;restrict_flags &amp;</div><div class='add'>+		    LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF) {</div><div class='add'>+			EXPECT_EQ(0, records.access);</div><div class='add'>+		} else {</div><div class='add'>+			EXPECT_EQ(1, records.access);</div><div class='add'>+		}</div><div class='add'>+		EXPECT_EQ(0, records.domain);</div><div class='add'>+</div><div class='add'>+		/* Updates filter rules to match the drop record. */</div><div class='add'>+		set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+		EXPECT_EQ(0, audit_filter_drop(self-&gt;audit_fd, AUDIT_ADD_RULE));</div><div class='add'>+		EXPECT_EQ(0,</div><div class='add'>+			  audit_filter_exe(self-&gt;audit_fd, &amp;self-&gt;audit_filter,</div><div class='add'>+					   AUDIT_DEL_RULE));</div><div class='add'>+		clear_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+</div><div class='add'>+		_exit(_metadata-&gt;exit_code);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(child, waitpid(child, &amp;status, 0));</div><div class='add'>+	if (WIFSIGNALED(status) || !WIFEXITED(status) ||</div><div class='add'>+	    WEXITSTATUS(status) != EXIT_SUCCESS)</div><div class='add'>+		_metadata-&gt;exit_code = KSFT_FAIL;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;restrict_flags &amp;</div><div class='add'>+	    LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF) {</div><div class='add'>+		EXPECT_EQ(-EAGAIN,</div><div class='add'>+			  matches_log_domain_deallocated(self-&gt;audit_fd, 0,</div><div class='add'>+							 &amp;deallocated_dom));</div><div class='add'>+		EXPECT_EQ(deallocated_dom, 2);</div><div class='add'>+	} else {</div><div class='add'>+		EXPECT_EQ(0, setsockopt(self-&gt;audit_fd, SOL_SOCKET, SO_RCVTIMEO,</div><div class='add'>+					&amp;audit_tv_dom_drop,</div><div class='add'>+					sizeof(audit_tv_dom_drop)));</div><div class='add'>+		EXPECT_EQ(0, matches_log_domain_deallocated(self-&gt;audit_fd, 2,</div><div class='add'>+							    &amp;deallocated_dom));</div><div class='add'>+		EXPECT_NE(deallocated_dom, 2);</div><div class='add'>+		EXPECT_NE(deallocated_dom, 0);</div><div class='add'>+		EXPECT_EQ(deallocated_dom, *self-&gt;domain_id);</div><div class='add'>+		EXPECT_EQ(0, setsockopt(self-&gt;audit_fd, SOL_SOCKET, SO_RCVTIMEO,</div><div class='add'>+					&amp;audit_tv_default,</div><div class='add'>+					sizeof(audit_tv_default)));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int matches_log_fs_read_root(int audit_fd)</div><div class='add'>+{</div><div class='add'>+	return audit_match_record(</div><div class='add'>+		audit_fd, AUDIT_LANDLOCK_ACCESS,</div><div class='add'>+		REGEX_LANDLOCK_PREFIX</div><div class='add'>+		" blockers=fs\\.read_dir path=\"/\" dev=\"[^\"]\\+\" ino=[0-9]\\+$",</div><div class='add'>+		NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE(audit_exec)</div><div class='add'>+{</div><div class='add'>+	struct audit_filter audit_filter;</div><div class='add'>+	int audit_fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT(audit_exec)</div><div class='add'>+{</div><div class='add'>+	const int restrict_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(audit_exec, default) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.restrict_flags = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(audit_exec, same_exec_off) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.restrict_flags = LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(audit_exec, subdomains_off) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.restrict_flags = LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(audit_exec, cross_exec_on) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.restrict_flags = LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(audit_exec, subdomains_off_and_cross_exec_on) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.restrict_flags = LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF |</div><div class='add'>+			  LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(audit_exec)</div><div class='add'>+{</div><div class='add'>+	disable_caps(_metadata);</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+</div><div class='add'>+	self-&gt;audit_fd = audit_init();</div><div class='add'>+	EXPECT_LE(0, self-&gt;audit_fd)</div><div class='add'>+	{</div><div class='add'>+		const char *error_msg;</div><div class='add'>+</div><div class='add'>+		/* kill "$(auditctl -s | sed -ne 's/^pid \([0-9]\+\)$/\1/p')" */</div><div class='add'>+		if (self-&gt;audit_fd == -EEXIST)</div><div class='add'>+			error_msg = "socket already in use (e.g. auditd)";</div><div class='add'>+		else</div><div class='add'>+			error_msg = strerror(-self-&gt;audit_fd);</div><div class='add'>+		TH_LOG("Failed to initialize audit: %s", error_msg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Applies test filter for the bin_wait_pipe_sandbox program. */</div><div class='add'>+	EXPECT_EQ(0, audit_init_filter_exe(&amp;self-&gt;audit_filter,</div><div class='add'>+					   bin_wait_pipe_sandbox));</div><div class='add'>+	EXPECT_EQ(0, audit_filter_exe(self-&gt;audit_fd, &amp;self-&gt;audit_filter,</div><div class='add'>+				      AUDIT_ADD_RULE));</div><div class='add'>+</div><div class='add'>+	clear_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(audit_exec)</div><div class='add'>+{</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	EXPECT_EQ(0, audit_filter_exe(self-&gt;audit_fd, &amp;self-&gt;audit_filter,</div><div class='add'>+				      AUDIT_DEL_RULE));</div><div class='add'>+	clear_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	EXPECT_EQ(0, close(self-&gt;audit_fd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_exec, signal_and_open)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+	int pipe_child[2], pipe_parent[2];</div><div class='add'>+	char buf_parent;</div><div class='add'>+	pid_t child;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(0, pipe2(pipe_child, 0));</div><div class='add'>+	ASSERT_EQ(0, pipe2(pipe_parent, 0));</div><div class='add'>+</div><div class='add'>+	child = fork();</div><div class='add'>+	ASSERT_LE(0, child);</div><div class='add'>+	if (child == 0) {</div><div class='add'>+		const struct landlock_ruleset_attr layer1 = {</div><div class='add'>+			.scoped = LANDLOCK_SCOPE_SIGNAL,</div><div class='add'>+		};</div><div class='add'>+		char pipe_child_str[12], pipe_parent_str[12];</div><div class='add'>+		char *const argv[] = { (char *)bin_wait_pipe_sandbox,</div><div class='add'>+				       pipe_child_str, pipe_parent_str, NULL };</div><div class='add'>+		int ruleset_fd;</div><div class='add'>+</div><div class='add'>+		/* Passes the pipe FDs to the executed binary. */</div><div class='add'>+		EXPECT_EQ(0, close(pipe_child[0]));</div><div class='add'>+		EXPECT_EQ(0, close(pipe_parent[1]));</div><div class='add'>+		snprintf(pipe_child_str, sizeof(pipe_child_str), "%d",</div><div class='add'>+			 pipe_child[1]);</div><div class='add'>+		snprintf(pipe_parent_str, sizeof(pipe_parent_str), "%d",</div><div class='add'>+			 pipe_parent[0]);</div><div class='add'>+</div><div class='add'>+		ruleset_fd =</div><div class='add'>+			landlock_create_ruleset(&amp;layer1, sizeof(layer1), 0);</div><div class='add'>+		if (ruleset_fd &lt; 0) {</div><div class='add'>+			perror("Failed to create a ruleset");</div><div class='add'>+			_exit(1);</div><div class='add'>+		}</div><div class='add'>+		prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0);</div><div class='add'>+		if (landlock_restrict_self(ruleset_fd,</div><div class='add'>+					   variant-&gt;restrict_flags)) {</div><div class='add'>+			perror("Failed to restrict self");</div><div class='add'>+			_exit(1);</div><div class='add'>+		}</div><div class='add'>+		close(ruleset_fd);</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(0, execve(argv[0], argv, NULL))</div><div class='add'>+		{</div><div class='add'>+			TH_LOG("Failed to execute \"%s\": %s", argv[0],</div><div class='add'>+			       strerror(errno));</div><div class='add'>+		};</div><div class='add'>+		_exit(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, close(pipe_child[1]));</div><div class='add'>+	EXPECT_EQ(0, close(pipe_parent[0]));</div><div class='add'>+</div><div class='add'>+	/* Waits for the child. */</div><div class='add'>+	EXPECT_EQ(1, read(pipe_child[0], &amp;buf_parent, 1));</div><div class='add'>+</div><div class='add'>+	/* Tests that there was no denial until now. */</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(0, records.domain);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for the child to do a first denied action by layer1 and</div><div class='add'>+	 * sandbox itself with layer2.</div><div class='add'>+	 */</div><div class='add'>+	EXPECT_EQ(1, write(pipe_parent[1], ".", 1));</div><div class='add'>+	EXPECT_EQ(1, read(pipe_child[0], &amp;buf_parent, 1));</div><div class='add'>+</div><div class='add'>+	/* Tests that the audit record only matches the child. */</div><div class='add'>+	if (variant-&gt;restrict_flags &amp; LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON) {</div><div class='add'>+		/* Matches the current domain. */</div><div class='add'>+		EXPECT_EQ(0, matches_log_signal(_metadata, self-&gt;audit_fd,</div><div class='add'>+						getpid(), NULL));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Checks that we didn't miss anything. */</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait for the child to do a second denied action by layer1 and</div><div class='add'>+	 * layer2, and sandbox itself with layer3.</div><div class='add'>+	 */</div><div class='add'>+	EXPECT_EQ(1, write(pipe_parent[1], ".", 1));</div><div class='add'>+	EXPECT_EQ(1, read(pipe_child[0], &amp;buf_parent, 1));</div><div class='add'>+</div><div class='add'>+	/* Tests that the audit record only matches the child. */</div><div class='add'>+	if (variant-&gt;restrict_flags &amp; LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON) {</div><div class='add'>+		/* Matches the current domain. */</div><div class='add'>+		EXPECT_EQ(0, matches_log_signal(_metadata, self-&gt;audit_fd,</div><div class='add'>+						getpid(), NULL));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(variant-&gt;restrict_flags &amp;</div><div class='add'>+	      LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF)) {</div><div class='add'>+		/* Matches the child domain. */</div><div class='add'>+		EXPECT_EQ(0, matches_log_fs_read_root(self-&gt;audit_fd));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Checks that we didn't miss anything. */</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+</div><div class='add'>+	/* Waits for the child to terminate. */</div><div class='add'>+	EXPECT_EQ(1, write(pipe_parent[1], ".", 1));</div><div class='add'>+	ASSERT_EQ(child, waitpid(child, &amp;status, 0));</div><div class='add'>+	ASSERT_EQ(1, WIFEXITED(status));</div><div class='add'>+	ASSERT_EQ(0, WEXITSTATUS(status));</div><div class='add'>+</div><div class='add'>+	/* Tests that the audit record only matches the child. */</div><div class='add'>+	if (!(variant-&gt;restrict_flags &amp;</div><div class='add'>+	      LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Matches the child domains, which tests that the</div><div class='add'>+		 * llcred-&gt;domain_exec bitmask is correctly updated with a new</div><div class='add'>+		 * domain.</div><div class='add'>+		 */</div><div class='add'>+		EXPECT_EQ(0, matches_log_fs_read_root(self-&gt;audit_fd));</div><div class='add'>+		EXPECT_EQ(0, matches_log_signal(_metadata, self-&gt;audit_fd,</div><div class='add'>+						getpid(), NULL));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Checks that we didn't miss anything. */</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/landlock/base_test.c b/tools/testing/selftests/landlock/base_test.c<br/>index 1bc16fde2e8a..7b69002239d7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/base_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/base_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/base_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/base_test.c</a></div><div class='hunk'>@@ -76,7 +76,7 @@ TEST(abi_version)</div><div class='ctx'> 	const struct landlock_ruleset_attr ruleset_attr = {</div><div class='ctx'> 		.handled_access_fs = LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='ctx'> 	};</div><div class='del'>-	ASSERT_EQ(6, landlock_create_ruleset(NULL, 0,</div><div class='add'>+	ASSERT_EQ(7, landlock_create_ruleset(NULL, 0,</div><div class='ctx'> 					     LANDLOCK_CREATE_RULESET_VERSION));</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_EQ(-1, landlock_create_ruleset(&amp;ruleset_attr, 0,</div><div class='hunk'>@@ -98,10 +98,54 @@ TEST(abi_version)</div><div class='ctx'> 	ASSERT_EQ(EINVAL, errno);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Old source trees might not have the set of Kselftest fixes related to kernel</div><div class='add'>+ * UAPI headers.</div><div class='add'>+ */</div><div class='add'>+#ifndef LANDLOCK_CREATE_RULESET_ERRATA</div><div class='add'>+#define LANDLOCK_CREATE_RULESET_ERRATA (1U &lt;&lt; 1)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+TEST(errata)</div><div class='add'>+{</div><div class='add'>+	const struct landlock_ruleset_attr ruleset_attr = {</div><div class='add'>+		.handled_access_fs = LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	};</div><div class='add'>+	int errata;</div><div class='add'>+</div><div class='add'>+	errata = landlock_create_ruleset(NULL, 0,</div><div class='add'>+					 LANDLOCK_CREATE_RULESET_ERRATA);</div><div class='add'>+	/* The errata bitmask will not be backported to tests. */</div><div class='add'>+	ASSERT_LE(0, errata);</div><div class='add'>+	TH_LOG("errata: 0x%x", errata);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(-1, landlock_create_ruleset(&amp;ruleset_attr, 0,</div><div class='add'>+					      LANDLOCK_CREATE_RULESET_ERRATA));</div><div class='add'>+	ASSERT_EQ(EINVAL, errno);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(-1, landlock_create_ruleset(NULL, sizeof(ruleset_attr),</div><div class='add'>+					      LANDLOCK_CREATE_RULESET_ERRATA));</div><div class='add'>+	ASSERT_EQ(EINVAL, errno);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(-1,</div><div class='add'>+		  landlock_create_ruleset(&amp;ruleset_attr, sizeof(ruleset_attr),</div><div class='add'>+					  LANDLOCK_CREATE_RULESET_ERRATA));</div><div class='add'>+	ASSERT_EQ(EINVAL, errno);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(-1, landlock_create_ruleset(</div><div class='add'>+			      NULL, 0,</div><div class='add'>+			      LANDLOCK_CREATE_RULESET_VERSION |</div><div class='add'>+				      LANDLOCK_CREATE_RULESET_ERRATA));</div><div class='add'>+	ASSERT_EQ(-1, landlock_create_ruleset(NULL, 0,</div><div class='add'>+					      LANDLOCK_CREATE_RULESET_ERRATA |</div><div class='add'>+						      1 &lt;&lt; 31));</div><div class='add'>+	ASSERT_EQ(EINVAL, errno);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Tests ordering of syscall argument checks. */</div><div class='ctx'> TEST(create_ruleset_checks_ordering)</div><div class='ctx'> {</div><div class='del'>-	const int last_flag = LANDLOCK_CREATE_RULESET_VERSION;</div><div class='add'>+	const int last_flag = LANDLOCK_CREATE_RULESET_ERRATA;</div><div class='ctx'> 	const int invalid_flag = last_flag &lt;&lt; 1;</div><div class='ctx'> 	int ruleset_fd;</div><div class='ctx'> 	const struct landlock_ruleset_attr ruleset_attr = {</div><div class='hunk'>@@ -233,6 +277,88 @@ TEST(restrict_self_checks_ordering)</div><div class='ctx'> 	ASSERT_EQ(0, close(ruleset_fd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+TEST(restrict_self_fd)</div><div class='add'>+{</div><div class='add'>+	int fd;</div><div class='add'>+</div><div class='add'>+	fd = open("/dev/null", O_RDONLY | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, fd);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, landlock_restrict_self(fd, 0));</div><div class='add'>+	EXPECT_EQ(EBADFD, errno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(restrict_self_fd_flags)</div><div class='add'>+{</div><div class='add'>+	int fd;</div><div class='add'>+</div><div class='add'>+	fd = open("/dev/null", O_RDONLY | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, fd);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF accepts -1 but not any file</div><div class='add'>+	 * descriptor.</div><div class='add'>+	 */</div><div class='add'>+	EXPECT_EQ(-1, landlock_restrict_self(</div><div class='add'>+			      fd, LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF));</div><div class='add'>+	EXPECT_EQ(EBADFD, errno);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(restrict_self_flags)</div><div class='add'>+{</div><div class='add'>+	const __u32 last_flag = LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF;</div><div class='add'>+</div><div class='add'>+	/* Tests invalid flag combinations. */</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, landlock_restrict_self(-1, last_flag &lt;&lt; 1));</div><div class='add'>+	EXPECT_EQ(EINVAL, errno);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, landlock_restrict_self(-1, -1));</div><div class='add'>+	EXPECT_EQ(EINVAL, errno);</div><div class='add'>+</div><div class='add'>+	/* Tests valid flag combinations. */</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, landlock_restrict_self(-1, 0));</div><div class='add'>+	EXPECT_EQ(EBADF, errno);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, landlock_restrict_self(</div><div class='add'>+			      -1, LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF));</div><div class='add'>+	EXPECT_EQ(EBADF, errno);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1,</div><div class='add'>+		  landlock_restrict_self(</div><div class='add'>+			  -1,</div><div class='add'>+			  LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF |</div><div class='add'>+				  LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF));</div><div class='add'>+	EXPECT_EQ(EBADF, errno);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1,</div><div class='add'>+		  landlock_restrict_self(</div><div class='add'>+			  -1,</div><div class='add'>+			  LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON |</div><div class='add'>+				  LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF));</div><div class='add'>+	EXPECT_EQ(EBADF, errno);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, landlock_restrict_self(</div><div class='add'>+			      -1, LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON));</div><div class='add'>+	EXPECT_EQ(EBADF, errno);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1,</div><div class='add'>+		  landlock_restrict_self(</div><div class='add'>+			  -1, LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF |</div><div class='add'>+				      LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON));</div><div class='add'>+	EXPECT_EQ(EBADF, errno);</div><div class='add'>+</div><div class='add'>+	/* Tests with an invalid ruleset_fd. */</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, landlock_restrict_self(</div><div class='add'>+			      -2, LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF));</div><div class='add'>+	EXPECT_EQ(EBADF, errno);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, landlock_restrict_self(</div><div class='add'>+			     -1, LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> TEST(ruleset_fd_io)</div><div class='ctx'> {</div><div class='ctx'> 	struct landlock_ruleset_attr ruleset_attr = {</div><div class='head'>diff --git a/tools/testing/selftests/landlock/common.h b/tools/testing/selftests/landlock/common.h<br/>index a604ea5d8297..230b75f6015b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/common.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/common.h</a></div><div class='hunk'>@@ -11,25 +11,23 @@</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;linux/securebits.h&gt;</div><div class='ctx'> #include &lt;sys/capability.h&gt;</div><div class='add'>+#include &lt;sys/prctl.h&gt;</div><div class='ctx'> #include &lt;sys/socket.h&gt;</div><div class='ctx'> #include &lt;sys/un.h&gt;</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> #include "wrappers.h"</div><div class='ctx'> </div><div class='ctx'> #define TMP_DIR "tmp"</div><div class='ctx'> </div><div class='del'>-#ifndef __maybe_unused</div><div class='del'>-#define __maybe_unused __attribute__((__unused__))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* TEST_F_FORK() should not be used for new tests. */</div><div class='ctx'> #define TEST_F_FORK(fixture_name, test_name) TEST_F(fixture_name, test_name)</div><div class='ctx'> </div><div class='ctx'> static const char bin_sandbox_and_launch[] = "./sandbox-and-launch";</div><div class='ctx'> static const char bin_wait_pipe[] = "./wait-pipe";</div><div class='add'>+static const char bin_wait_pipe_sandbox[] = "./wait-pipe-sandbox";</div><div class='ctx'> </div><div class='ctx'> static void _init_caps(struct __test_metadata *const _metadata, bool drop_all)</div><div class='ctx'> {</div><div class='hunk'>@@ -37,10 +35,12 @@ static void _init_caps(struct __test_metadata *const _metadata, bool drop_all)</div><div class='ctx'> 	/* Only these three capabilities are useful for the tests. */</div><div class='ctx'> 	const cap_value_t caps[] = {</div><div class='ctx'> 		/* clang-format off */</div><div class='add'>+		CAP_AUDIT_CONTROL,</div><div class='ctx'> 		CAP_DAC_OVERRIDE,</div><div class='ctx'> 		CAP_MKNOD,</div><div class='ctx'> 		CAP_NET_ADMIN,</div><div class='ctx'> 		CAP_NET_BIND_SERVICE,</div><div class='add'>+		CAP_SETUID,</div><div class='ctx'> 		CAP_SYS_ADMIN,</div><div class='ctx'> 		CAP_SYS_CHROOT,</div><div class='ctx'> 		/* clang-format on */</div><div class='hunk'>@@ -204,9 +204,26 @@ enforce_ruleset(struct __test_metadata *const _metadata, const int ruleset_fd)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __maybe_unused</div><div class='add'>+drop_access_rights(struct __test_metadata *const _metadata,</div><div class='add'>+		   const struct landlock_ruleset_attr *const ruleset_attr)</div><div class='add'>+{</div><div class='add'>+	int ruleset_fd;</div><div class='add'>+</div><div class='add'>+	ruleset_fd =</div><div class='add'>+		landlock_create_ruleset(ruleset_attr, sizeof(*ruleset_attr), 0);</div><div class='add'>+	EXPECT_LE(0, ruleset_fd)</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to create a ruleset: %s", strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd);</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct protocol_variant {</div><div class='ctx'> 	int domain;</div><div class='ctx'> 	int type;</div><div class='add'>+	int protocol;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct service_fixture {</div><div class='head'>diff --git a/tools/testing/selftests/landlock/config b/tools/testing/selftests/landlock/config<br/>index 29af19c4e9f9..8fe9b461b1fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/config</a></div><div class='hunk'>@@ -1,8 +1,12 @@</div><div class='add'>+CONFIG_AF_UNIX_OOB=y</div><div class='add'>+CONFIG_AUDIT=y</div><div class='ctx'> CONFIG_CGROUPS=y</div><div class='ctx'> CONFIG_CGROUP_SCHED=y</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IPV6=y</div><div class='ctx'> CONFIG_KEYS=y</div><div class='add'>+CONFIG_MPTCP=y</div><div class='add'>+CONFIG_MPTCP_IPV6=y</div><div class='ctx'> CONFIG_NET=y</div><div class='ctx'> CONFIG_NET_NS=y</div><div class='ctx'> CONFIG_OVERLAY_FS=y</div><div class='head'>diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c<br/>index aa6f2c1cbec7..eee814e09dd7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/fs_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/fs_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/fs_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/fs_test.c</a></div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'> #define _ASM_GENERIC_FCNTL_H</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "audit.h"</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef renameat2</div><div class='hunk'>@@ -1831,6 +1832,46 @@ TEST_F_FORK(layout1, release_inodes)</div><div class='ctx'> 	ASSERT_EQ(ENOENT, test_open(dir_s3d3, O_RDONLY));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This test checks that a rule on a directory used as a mount point does not</div><div class='add'>+ * grant access to the mount covering it.  It is a generalization of the bind</div><div class='add'>+ * mount case in layout3_fs.hostfs.release_inodes that tests hidden mount points.</div><div class='add'>+ */</div><div class='add'>+TEST_F_FORK(layout1, covered_rule)</div><div class='add'>+{</div><div class='add'>+	const struct rule layer1[] = {</div><div class='add'>+		{</div><div class='add'>+			.path = dir_s3d2,</div><div class='add'>+			.access = LANDLOCK_ACCESS_FS_READ_DIR,</div><div class='add'>+		},</div><div class='add'>+		{},</div><div class='add'>+	};</div><div class='add'>+	int ruleset_fd;</div><div class='add'>+</div><div class='add'>+	/* Unmount to simplify FIXTURE_TEARDOWN. */</div><div class='add'>+	set_cap(_metadata, CAP_SYS_ADMIN);</div><div class='add'>+	ASSERT_EQ(0, umount(dir_s3d2));</div><div class='add'>+	clear_cap(_metadata, CAP_SYS_ADMIN);</div><div class='add'>+</div><div class='add'>+	/* Creates a ruleset with the future hidden directory. */</div><div class='add'>+	ruleset_fd =</div><div class='add'>+		create_ruleset(_metadata, LANDLOCK_ACCESS_FS_READ_DIR, layer1);</div><div class='add'>+	ASSERT_LE(0, ruleset_fd);</div><div class='add'>+</div><div class='add'>+	/* Covers with a new mount point. */</div><div class='add'>+	set_cap(_metadata, CAP_SYS_ADMIN);</div><div class='add'>+	ASSERT_EQ(0, mount_opt(&amp;mnt_tmp, dir_s3d2));</div><div class='add'>+	clear_cap(_metadata, CAP_SYS_ADMIN);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(0, test_open(dir_s3d2, O_RDONLY));</div><div class='add'>+</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd);</div><div class='add'>+	ASSERT_EQ(0, close(ruleset_fd));</div><div class='add'>+</div><div class='add'>+	/* Checks that access to the new mount point is denied. */</div><div class='add'>+	ASSERT_EQ(EACCES, test_open(dir_s3d2, O_RDONLY));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> enum relative_access {</div><div class='ctx'> 	REL_OPEN,</div><div class='ctx'> 	REL_CHDIR,</div><div class='hunk'>@@ -2226,6 +2267,22 @@ static int test_exchange(const char *const oldpath, const char *const newpath)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int test_renameat(int olddirfd, const char *oldpath, int newdirfd,</div><div class='add'>+			 const char *newpath)</div><div class='add'>+{</div><div class='add'>+	if (renameat2(olddirfd, oldpath, newdirfd, newpath, 0))</div><div class='add'>+		return errno;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_exchangeat(int olddirfd, const char *oldpath, int newdirfd,</div><div class='add'>+			   const char *newpath)</div><div class='add'>+{</div><div class='add'>+	if (renameat2(olddirfd, oldpath, newdirfd, newpath, RENAME_EXCHANGE))</div><div class='add'>+		return errno;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> TEST_F_FORK(layout1, rename_file)</div><div class='ctx'> {</div><div class='ctx'> 	const struct rule rules[] = {</div><div class='hunk'>@@ -4520,6 +4577,18 @@ TEST_F_FORK(ioctl, handle_file_access_file)</div><div class='ctx'> FIXTURE(layout1_bind) {};</div><div class='ctx'> /* clang-format on */</div><div class='ctx'> </div><div class='add'>+static const char bind_dir_s1d3[] = TMP_DIR "/s2d1/s2d2/s1d3";</div><div class='add'>+static const char bind_file1_s1d3[] = TMP_DIR "/s2d1/s2d2/s1d3/f1";</div><div class='add'>+</div><div class='add'>+/* Move targets for disconnected path tests. */</div><div class='add'>+static const char dir_s4d1[] = TMP_DIR "/s4d1";</div><div class='add'>+static const char file1_s4d1[] = TMP_DIR "/s4d1/f1";</div><div class='add'>+static const char file2_s4d1[] = TMP_DIR "/s4d1/f2";</div><div class='add'>+static const char dir_s4d2[] = TMP_DIR "/s4d1/s4d2";</div><div class='add'>+static const char file1_s4d2[] = TMP_DIR "/s4d1/s4d2/f1";</div><div class='add'>+static const char file1_name[] = "f1";</div><div class='add'>+static const char file2_name[] = "f2";</div><div class='add'>+</div><div class='ctx'> FIXTURE_SETUP(layout1_bind)</div><div class='ctx'> {</div><div class='ctx'> 	prepare_layout(_metadata);</div><div class='hunk'>@@ -4535,14 +4604,14 @@ FIXTURE_TEARDOWN_PARENT(layout1_bind)</div><div class='ctx'> {</div><div class='ctx'> 	/* umount(dir_s2d2)) is handled by namespace lifetime. */</div><div class='ctx'> </div><div class='add'>+	remove_path(file1_s4d1);</div><div class='add'>+	remove_path(file2_s4d1);</div><div class='add'>+</div><div class='ctx'> 	remove_layout1(_metadata);</div><div class='ctx'> </div><div class='ctx'> 	cleanup_layout(_metadata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char bind_dir_s1d3[] = TMP_DIR "/s2d1/s2d2/s1d3";</div><div class='del'>-static const char bind_file1_s1d3[] = TMP_DIR "/s2d1/s2d2/s1d3/f1";</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * layout1_bind hierarchy:</div><div class='ctx'>  *</div><div class='hunk'>@@ -4553,20 +4622,25 @@ static const char bind_file1_s1d3[] = TMP_DIR "/s2d1/s2d2/s1d3/f1";</div><div class='ctx'>  * │   └── s1d2</div><div class='ctx'>  * │       ├── f1</div><div class='ctx'>  * │       ├── f2</div><div class='del'>- * │       └── s1d3</div><div class='add'>+ * │       └── s1d3 [disconnected by path_disconnected]</div><div class='ctx'>  * │           ├── f1</div><div class='ctx'>  * │           └── f2</div><div class='ctx'>  * ├── s2d1</div><div class='ctx'>  * │   ├── f1</div><div class='del'>- * │   └── s2d2</div><div class='add'>+ * │   └── s2d2 [bind mount from s1d2]</div><div class='ctx'>  * │       ├── f1</div><div class='ctx'>  * │       ├── f2</div><div class='ctx'>  * │       └── s1d3</div><div class='ctx'>  * │           ├── f1</div><div class='ctx'>  * │           └── f2</div><div class='del'>- * └── s3d1</div><div class='del'>- *     └── s3d2</div><div class='del'>- *         └── s3d3</div><div class='add'>+ * ├── s3d1</div><div class='add'>+ * │   └── s3d2</div><div class='add'>+ * │       └── s3d3</div><div class='add'>+ * └── s4d1 [renamed from s1d3 by path_disconnected]</div><div class='add'>+ *     ├── f1</div><div class='add'>+ *     ├── f2</div><div class='add'>+ *     └── s4d2</div><div class='add'>+ *         └── f1</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> TEST_F_FORK(layout1_bind, no_restriction)</div><div class='hunk'>@@ -4765,6 +4839,1431 @@ TEST_F_FORK(layout1_bind, reparent_cross_mount)</div><div class='ctx'> 	ASSERT_EQ(0, rename(bind_file1_s1d3, file1_s2d2));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Make sure access to file through a disconnected path works as expected.</div><div class='add'>+ * This test moves s1d3 to s4d1.</div><div class='add'>+ */</div><div class='add'>+TEST_F_FORK(layout1_bind, path_disconnected)</div><div class='add'>+{</div><div class='add'>+	const struct rule layer1_allow_all[] = {</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR,</div><div class='add'>+			.access = ACCESS_ALL,</div><div class='add'>+		},</div><div class='add'>+		{},</div><div class='add'>+	};</div><div class='add'>+	const struct rule layer2_allow_just_f1[] = {</div><div class='add'>+		{</div><div class='add'>+			.path = file1_s1d3,</div><div class='add'>+			.access = LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+		},</div><div class='add'>+		{},</div><div class='add'>+	};</div><div class='add'>+	const struct rule layer3_only_s1d2[] = {</div><div class='add'>+		{</div><div class='add'>+			.path = dir_s1d2,</div><div class='add'>+			.access = LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+		},</div><div class='add'>+		{},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Landlock should not deny access just because it is disconnected. */</div><div class='add'>+	int ruleset_fd_l1 =</div><div class='add'>+		create_ruleset(_metadata, ACCESS_ALL, layer1_allow_all);</div><div class='add'>+</div><div class='add'>+	/* Creates the new ruleset now before we move the dir containing the file. */</div><div class='add'>+	int ruleset_fd_l2 =</div><div class='add'>+		create_ruleset(_metadata, ACCESS_RW, layer2_allow_just_f1);</div><div class='add'>+	int ruleset_fd_l3 =</div><div class='add'>+		create_ruleset(_metadata, ACCESS_RW, layer3_only_s1d2);</div><div class='add'>+	int bind_s1d3_fd;</div><div class='add'>+</div><div class='add'>+	ASSERT_LE(0, ruleset_fd_l1);</div><div class='add'>+	ASSERT_LE(0, ruleset_fd_l2);</div><div class='add'>+	ASSERT_LE(0, ruleset_fd_l3);</div><div class='add'>+</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd_l1);</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd_l1));</div><div class='add'>+</div><div class='add'>+	bind_s1d3_fd = open(bind_dir_s1d3, O_PATH | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, bind_s1d3_fd);</div><div class='add'>+</div><div class='add'>+	/* Tests access is possible before we move. */</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file1_name, O_RDONLY));</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file2_name, O_RDONLY));</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, "..", O_RDONLY | O_DIRECTORY));</div><div class='add'>+</div><div class='add'>+	/* Makes it disconnected. */</div><div class='add'>+	ASSERT_EQ(0, rename(dir_s1d3, dir_s4d1))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to rename %s to %s: %s", dir_s1d3, dir_s4d1,</div><div class='add'>+		       strerror(errno));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Tests that access is still possible. */</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file1_name, O_RDONLY));</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file2_name, O_RDONLY));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Tests that ".." is not possible (not because of Landlock, but just</div><div class='add'>+	 * because it's disconnected).</div><div class='add'>+	 */</div><div class='add'>+	EXPECT_EQ(ENOENT,</div><div class='add'>+		  test_open_rel(bind_s1d3_fd, "..", O_RDONLY | O_DIRECTORY));</div><div class='add'>+</div><div class='add'>+	/* This should still work with a narrower rule. */</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd_l2);</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd_l2));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, test_open(file1_s4d1, O_RDONLY));</div><div class='add'>+	/*</div><div class='add'>+	 * Accessing a file through a disconnected file descriptor can still be</div><div class='add'>+	 * allowed by a rule tied to this file, even if it is no longer visible in</div><div class='add'>+	 * its mount point.</div><div class='add'>+	 */</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file1_name, O_RDONLY));</div><div class='add'>+	EXPECT_EQ(EACCES, test_open_rel(bind_s1d3_fd, file2_name, O_RDONLY));</div><div class='add'>+</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd_l3);</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd_l3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(EACCES, test_open(file1_s4d1, O_RDONLY));</div><div class='add'>+	/*</div><div class='add'>+	 * Accessing a file through a disconnected file descriptor can still be</div><div class='add'>+	 * allowed by a rule tied to the original mount point, even if it is no</div><div class='add'>+	 * longer visible in its mount point.</div><div class='add'>+	 */</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file1_name, O_RDONLY));</div><div class='add'>+	EXPECT_EQ(EACCES, test_open_rel(bind_s1d3_fd, file2_name, O_RDONLY));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test that renameat with disconnected paths works under Landlock.  This test</div><div class='add'>+ * moves s1d3 to s4d2, so that we can have a rule allowing refers on the move</div><div class='add'>+ * target's immediate parent.</div><div class='add'>+ */</div><div class='add'>+TEST_F_FORK(layout1_bind, path_disconnected_rename)</div><div class='add'>+{</div><div class='add'>+	const struct rule layer1[] = {</div><div class='add'>+		{</div><div class='add'>+			.path = dir_s1d2,</div><div class='add'>+			.access = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_MAKE_DIR |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_REMOVE_DIR |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_MAKE_REG |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_REMOVE_FILE |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = dir_s4d1,</div><div class='add'>+			.access = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_MAKE_DIR |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_REMOVE_DIR |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_MAKE_REG |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_REMOVE_FILE |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+		},</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* This layer only handles LANDLOCK_ACCESS_FS_READ_FILE. */</div><div class='add'>+	const struct rule layer2_only_s1d2[] = {</div><div class='add'>+		{</div><div class='add'>+			.path = dir_s1d2,</div><div class='add'>+			.access = LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+		},</div><div class='add'>+		{},</div><div class='add'>+	};</div><div class='add'>+	int ruleset_fd_l1, ruleset_fd_l2;</div><div class='add'>+	pid_t child_pid;</div><div class='add'>+	int bind_s1d3_fd, status;</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(0, mkdir(dir_s4d1, 0755))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to create %s: %s", dir_s4d1, strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	ruleset_fd_l1 = create_ruleset(_metadata, ACCESS_ALL, layer1);</div><div class='add'>+	ruleset_fd_l2 = create_ruleset(_metadata, LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+				       layer2_only_s1d2);</div><div class='add'>+	ASSERT_LE(0, ruleset_fd_l1);</div><div class='add'>+	ASSERT_LE(0, ruleset_fd_l2);</div><div class='add'>+</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd_l1);</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd_l1));</div><div class='add'>+</div><div class='add'>+	bind_s1d3_fd = open(bind_dir_s1d3, O_PATH | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, bind_s1d3_fd);</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file1_name, O_RDONLY));</div><div class='add'>+</div><div class='add'>+	/* Tests ENOENT priority over EACCES for disconnected directory. */</div><div class='add'>+	EXPECT_EQ(EACCES, test_open_rel(bind_s1d3_fd, "..", O_DIRECTORY));</div><div class='add'>+	ASSERT_EQ(0, rename(dir_s1d3, dir_s4d2))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to rename %s to %s: %s", dir_s1d3, dir_s4d2,</div><div class='add'>+		       strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(ENOENT, test_open_rel(bind_s1d3_fd, "..", O_DIRECTORY));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The file is no longer under s1d2 but we should still be able to access it</div><div class='add'>+	 * with layer 2 because its mount point is evaluated as the first valid</div><div class='add'>+	 * directory because it was initially a parent.  Do a fork to test this so</div><div class='add'>+	 * we don't prevent ourselves from renaming it back later.</div><div class='add'>+	 */</div><div class='add'>+	child_pid = fork();</div><div class='add'>+	ASSERT_LE(0, child_pid);</div><div class='add'>+	if (child_pid == 0) {</div><div class='add'>+		enforce_ruleset(_metadata, ruleset_fd_l2);</div><div class='add'>+		EXPECT_EQ(0, close(ruleset_fd_l2));</div><div class='add'>+		EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file1_name, O_RDONLY));</div><div class='add'>+		EXPECT_EQ(EACCES, test_open(file1_s4d2, O_RDONLY));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Tests that access widening checks indeed prevents us from renaming it</div><div class='add'>+		 * back.</div><div class='add'>+		 */</div><div class='add'>+		EXPECT_EQ(-1, rename(dir_s4d2, dir_s1d3));</div><div class='add'>+		EXPECT_EQ(EXDEV, errno);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Including through the now disconnected fd (but it should return</div><div class='add'>+		 * EXDEV).</div><div class='add'>+		 */</div><div class='add'>+		EXPECT_EQ(-1, renameat(bind_s1d3_fd, file1_name, AT_FDCWD,</div><div class='add'>+				       file1_s2d2));</div><div class='add'>+		EXPECT_EQ(EXDEV, errno);</div><div class='add'>+		_exit(_metadata-&gt;exit_code);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(child_pid, waitpid(child_pid, &amp;status, 0));</div><div class='add'>+	EXPECT_EQ(1, WIFEXITED(status));</div><div class='add'>+	EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status));</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(0, rename(dir_s4d2, dir_s1d3))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to rename %s back to %s: %s", dir_s4d1, dir_s1d3,</div><div class='add'>+		       strerror(errno));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now checks that we can access it under l2. */</div><div class='add'>+	child_pid = fork();</div><div class='add'>+	ASSERT_LE(0, child_pid);</div><div class='add'>+	if (child_pid == 0) {</div><div class='add'>+		enforce_ruleset(_metadata, ruleset_fd_l2);</div><div class='add'>+		EXPECT_EQ(0, close(ruleset_fd_l2));</div><div class='add'>+		EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file1_name, O_RDONLY));</div><div class='add'>+		EXPECT_EQ(0, test_open(file1_s1d3, O_RDONLY));</div><div class='add'>+		_exit(_metadata-&gt;exit_code);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(child_pid, waitpid(child_pid, &amp;status, 0));</div><div class='add'>+	EXPECT_EQ(1, WIFEXITED(status));</div><div class='add'>+	EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Also test that we can rename via a disconnected path.  We move the</div><div class='add'>+	 * dir back to the disconnected place first, then we rename file1 to</div><div class='add'>+	 * file2 through our dir fd.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(0, rename(dir_s1d3, dir_s4d2))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to rename %s to %s: %s", dir_s1d3, dir_s4d2,</div><div class='add'>+		       strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  renameat(bind_s1d3_fd, file1_name, bind_s1d3_fd, file2_name))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to rename %s to %s within disconnected %s: %s",</div><div class='add'>+		       file1_name, file2_name, bind_dir_s1d3, strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file2_name, O_RDONLY));</div><div class='add'>+	ASSERT_EQ(0, renameat(bind_s1d3_fd, file2_name, AT_FDCWD, file1_s2d2))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to rename %s to %s through disconnected %s: %s",</div><div class='add'>+		       file2_name, file1_s2d2, bind_dir_s1d3, strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, test_open(file1_s2d2, O_RDONLY));</div><div class='add'>+	EXPECT_EQ(0, test_open(file1_s1d2, O_RDONLY));</div><div class='add'>+</div><div class='add'>+	/* Move it back using the disconnected path as the target. */</div><div class='add'>+	ASSERT_EQ(0, renameat(AT_FDCWD, file1_s2d2, bind_s1d3_fd, file1_name))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to rename %s to %s through disconnected %s: %s",</div><div class='add'>+		       file1_s1d2, file1_name, bind_dir_s1d3, strerror(errno));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now make it connected again. */</div><div class='add'>+	ASSERT_EQ(0, rename(dir_s4d2, dir_s1d3))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to rename %s back to %s: %s", dir_s4d2, dir_s1d3,</div><div class='add'>+		       strerror(errno));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Checks again that we can access it under l2. */</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd_l2);</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd_l2));</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file1_name, O_RDONLY));</div><div class='add'>+	EXPECT_EQ(0, test_open(file1_s1d3, O_RDONLY));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test that linkat(2) with disconnected paths works under Landlock. This</div><div class='add'>+ * test moves s1d3 to s4d1.</div><div class='add'>+ */</div><div class='add'>+TEST_F_FORK(layout1_bind, path_disconnected_link)</div><div class='add'>+{</div><div class='add'>+	/* Ruleset to be applied after renaming s1d3 to s4d1. */</div><div class='add'>+	const struct rule layer1[] = {</div><div class='add'>+		{</div><div class='add'>+			.path = dir_s4d1,</div><div class='add'>+			.access = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_MAKE_REG |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_REMOVE_FILE,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = dir_s2d2,</div><div class='add'>+			.access = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_MAKE_REG |</div><div class='add'>+				  LANDLOCK_ACCESS_FS_REMOVE_FILE,</div><div class='add'>+		},</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	int ruleset_fd, bind_s1d3_fd;</div><div class='add'>+</div><div class='add'>+	/* Removes unneeded files created by layout1, otherwise it will EEXIST. */</div><div class='add'>+	ASSERT_EQ(0, unlink(file1_s1d2));</div><div class='add'>+	ASSERT_EQ(0, unlink(file2_s1d3));</div><div class='add'>+</div><div class='add'>+	bind_s1d3_fd = open(bind_dir_s1d3, O_PATH | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, bind_s1d3_fd);</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file1_name, O_RDONLY));</div><div class='add'>+</div><div class='add'>+	/* Disconnects bind_s1d3_fd. */</div><div class='add'>+	ASSERT_EQ(0, rename(dir_s1d3, dir_s4d1))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to rename %s to %s: %s", dir_s1d3, dir_s4d1,</div><div class='add'>+		       strerror(errno));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Need this later to test different parent link. */</div><div class='add'>+	ASSERT_EQ(0, mkdir(dir_s4d2, 0755))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to create %s: %s", dir_s4d2, strerror(errno));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ruleset_fd = create_ruleset(_metadata, ACCESS_ALL, layer1);</div><div class='add'>+	ASSERT_LE(0, ruleset_fd);</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd);</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd));</div><div class='add'>+</div><div class='add'>+	/* From disconnected to connected. */</div><div class='add'>+	ASSERT_EQ(0, linkat(bind_s1d3_fd, file1_name, AT_FDCWD, file1_s2d2, 0))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to link %s to %s via disconnected %s: %s",</div><div class='add'>+		       file1_name, file1_s2d2, bind_dir_s1d3, strerror(errno));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Tests that we can access via the new link... */</div><div class='add'>+	EXPECT_EQ(0, test_open(file1_s2d2, O_RDONLY))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to open newly linked %s: %s", file1_s2d2,</div><div class='add'>+		       strerror(errno));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ...as well as the old one. */</div><div class='add'>+	EXPECT_EQ(0, test_open(file1_s4d1, O_RDONLY))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to open original %s: %s", file1_s4d1,</div><div class='add'>+		       strerror(errno));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* From connected to disconnected. */</div><div class='add'>+	ASSERT_EQ(0, unlink(file1_s4d1));</div><div class='add'>+	ASSERT_EQ(0, linkat(AT_FDCWD, file1_s2d2, bind_s1d3_fd, file2_name, 0))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to link %s to %s via disconnected %s: %s",</div><div class='add'>+		       file1_s2d2, file2_name, bind_dir_s1d3, strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, test_open(file2_s4d1, O_RDONLY));</div><div class='add'>+	ASSERT_EQ(0, unlink(file1_s2d2));</div><div class='add'>+</div><div class='add'>+	/* From disconnected to disconnected (same parent). */</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  linkat(bind_s1d3_fd, file2_name, bind_s1d3_fd, file1_name, 0))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to link %s to %s within disconnected %s: %s",</div><div class='add'>+		       file2_name, file1_name, bind_dir_s1d3, strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, test_open(file1_s4d1, O_RDONLY))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to open newly linked %s: %s", file1_s4d1,</div><div class='add'>+		       strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, file1_name, O_RDONLY))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to open %s through newly created link under disconnected path: %s",</div><div class='add'>+		       file1_name, strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	ASSERT_EQ(0, unlink(file2_s4d1));</div><div class='add'>+</div><div class='add'>+	/* From disconnected to disconnected (different parent). */</div><div class='add'>+	ASSERT_EQ(0,</div><div class='add'>+		  linkat(bind_s1d3_fd, file1_name, bind_s1d3_fd, "s4d2/f1", 0))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to link %s to %s within disconnected %s: %s",</div><div class='add'>+		       file1_name, "s4d2/f1", bind_dir_s1d3, strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, test_open(file1_s4d2, O_RDONLY))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to open %s after link: %s", file1_s4d2,</div><div class='add'>+		       strerror(errno));</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(bind_s1d3_fd, "s4d2/f1", O_RDONLY))</div><div class='add'>+	{</div><div class='add'>+		TH_LOG("Failed to open %s through disconnected path after link: %s",</div><div class='add'>+		       "s4d2/f1", strerror(errno));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * layout4_disconnected_leafs with bind mount and renames:</div><div class='add'>+ *</div><div class='add'>+ * tmp</div><div class='add'>+ * ├── s1d1</div><div class='add'>+ * │   └── s1d2 [source of the bind mount]</div><div class='add'>+ * │       ├── s1d31</div><div class='add'>+ * │       │   └── s1d41 [now renamed beneath s3d1]</div><div class='add'>+ * │       │       ├── f1</div><div class='add'>+ * │       │       └── f2</div><div class='add'>+ * │       └── s1d32</div><div class='add'>+ * │           └── s1d42 [now renamed beneath s4d1]</div><div class='add'>+ * │               ├── f3</div><div class='add'>+ * │               └── f4</div><div class='add'>+ * ├── s2d1</div><div class='add'>+ * │   └── s2d2 [bind mount of s1d2]</div><div class='add'>+ * │       ├── s1d31</div><div class='add'>+ * │       │   └── s1d41 [opened FD, now renamed beneath s3d1]</div><div class='add'>+ * │       │       ├── f1</div><div class='add'>+ * │       │       └── f2</div><div class='add'>+ * │       └── s1d32</div><div class='add'>+ * │           └── s1d42 [opened FD, now renamed beneath s4d1]</div><div class='add'>+ * │               ├── f3</div><div class='add'>+ * │               └── f4</div><div class='add'>+ * ├── s3d1</div><div class='add'>+ * │   └── s1d41 [renamed here]</div><div class='add'>+ * │       ├── f1</div><div class='add'>+ * │       └── f2</div><div class='add'>+ * └── s4d1</div><div class='add'>+ *     └── s1d42 [renamed here]</div><div class='add'>+ *         ├── f3</div><div class='add'>+ *         └── f4</div><div class='add'>+ */</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE(layout4_disconnected_leafs) {</div><div class='add'>+	int s2d2_fd;</div><div class='add'>+};</div><div class='add'>+/* clang-format on */</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(layout4_disconnected_leafs)</div><div class='add'>+{</div><div class='add'>+	prepare_layout(_metadata);</div><div class='add'>+</div><div class='add'>+	create_file(_metadata, TMP_DIR "/s1d1/s1d2/s1d31/s1d41/f1");</div><div class='add'>+	create_file(_metadata, TMP_DIR "/s1d1/s1d2/s1d31/s1d41/f2");</div><div class='add'>+	create_file(_metadata, TMP_DIR "/s1d1/s1d2/s1d32/s1d42/f3");</div><div class='add'>+	create_file(_metadata, TMP_DIR "/s1d1/s1d2/s1d32/s1d42/f4");</div><div class='add'>+	create_directory(_metadata, TMP_DIR "/s2d1/s2d2");</div><div class='add'>+	create_directory(_metadata, TMP_DIR "/s3d1");</div><div class='add'>+	create_directory(_metadata, TMP_DIR "/s4d1");</div><div class='add'>+</div><div class='add'>+	self-&gt;s2d2_fd =</div><div class='add'>+		open(TMP_DIR "/s2d1/s2d2", O_DIRECTORY | O_PATH | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, self-&gt;s2d2_fd);</div><div class='add'>+</div><div class='add'>+	set_cap(_metadata, CAP_SYS_ADMIN);</div><div class='add'>+	ASSERT_EQ(0, mount(TMP_DIR "/s1d1/s1d2", TMP_DIR "/s2d1/s2d2", NULL,</div><div class='add'>+			   MS_BIND, NULL));</div><div class='add'>+	clear_cap(_metadata, CAP_SYS_ADMIN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN_PARENT(layout4_disconnected_leafs)</div><div class='add'>+{</div><div class='add'>+	/* umount(TMP_DIR "/s2d1") is handled by namespace lifetime. */</div><div class='add'>+</div><div class='add'>+	/* Removes files after renames. */</div><div class='add'>+	remove_path(TMP_DIR "/s3d1/s1d41/f1");</div><div class='add'>+	remove_path(TMP_DIR "/s3d1/s1d41/f2");</div><div class='add'>+	remove_path(TMP_DIR "/s4d1/s1d42/f1");</div><div class='add'>+	remove_path(TMP_DIR "/s4d1/s1d42/f3");</div><div class='add'>+	remove_path(TMP_DIR "/s4d1/s1d42/f4");</div><div class='add'>+	remove_path(TMP_DIR "/s4d1/s1d42/f5");</div><div class='add'>+</div><div class='add'>+	cleanup_layout(_metadata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT(layout4_disconnected_leafs)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Parent of the bind mount source.  It should always be ignored when</div><div class='add'>+	 * testing against files under the s1d41 or s1d42 disconnected directories.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_s1d1;</div><div class='add'>+	/*</div><div class='add'>+	 * Source of bind mount (to s2d2).  It should always be enforced when</div><div class='add'>+	 * testing against files under the s1d41 or s1d42 disconnected directories.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_s1d2;</div><div class='add'>+	/*</div><div class='add'>+	 * Original parent of s1d41.  It should always be ignored when testing</div><div class='add'>+	 * against files under the s1d41 disconnected directory.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_s1d31;</div><div class='add'>+	/*</div><div class='add'>+	 * Original parent of s1d42.  It should always be ignored when testing</div><div class='add'>+	 * against files under the s1d42 disconnected directory.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_s1d32;</div><div class='add'>+	/*</div><div class='add'>+	 * Opened and disconnected source directory.  It should always be enforced</div><div class='add'>+	 * when testing against files under the s1d41 disconnected directory.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_s1d41;</div><div class='add'>+	/*</div><div class='add'>+	 * Opened and disconnected source directory.  It should always be enforced</div><div class='add'>+	 * when testing against files under the s1d42 disconnected directory.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_s1d42;</div><div class='add'>+	/*</div><div class='add'>+	 * File in the s1d41 disconnected directory.  It should always be enforced</div><div class='add'>+	 * when testing against itself under the s1d41 disconnected directory.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_f1;</div><div class='add'>+	/*</div><div class='add'>+	 * File in the s1d41 disconnected directory.  It should always be enforced</div><div class='add'>+	 * when testing against itself under the s1d41 disconnected directory.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_f2;</div><div class='add'>+	/*</div><div class='add'>+	 * File in the s1d42 disconnected directory.  It should always be enforced</div><div class='add'>+	 * when testing against itself under the s1d42 disconnected directory.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_f3;</div><div class='add'>+	/*</div><div class='add'>+	 * Parent of the bind mount destination.  It should always be enforced when</div><div class='add'>+	 * testing against files under the s1d41 or s1d42 disconnected directories.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_s2d1;</div><div class='add'>+	/*</div><div class='add'>+	 * Directory covered by the bind mount.  It should always be ignored when</div><div class='add'>+	 * testing against files under the s1d41 or s1d42 disconnected directories.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_s2d2;</div><div class='add'>+	/*</div><div class='add'>+	 * New parent of the renamed s1d41.  It should always be ignored when</div><div class='add'>+	 * testing against files under the s1d41 disconnected directory.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_s3d1;</div><div class='add'>+	/*</div><div class='add'>+	 * New parent of the renamed s1d42.  It should always be ignored when</div><div class='add'>+	 * testing against files under the s1d42 disconnected directory.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_s4d1;</div><div class='add'>+</div><div class='add'>+	/* Expected result of the call to open([fd:s1d41]/f1, O_RDONLY). */</div><div class='add'>+	const int expected_read_result;</div><div class='add'>+	/* Expected result of the call to renameat([fd:s1d41]/f1, [fd:s1d42]/f1). */</div><div class='add'>+	const int expected_rename_result;</div><div class='add'>+	/*</div><div class='add'>+	 * Expected result of the call to renameat([fd:s1d41]/f2, [fd:s1d42]/f3,</div><div class='add'>+	 * RENAME_EXCHANGE).</div><div class='add'>+	 */</div><div class='add'>+	const int expected_exchange_result;</div><div class='add'>+	/* Expected result of the call to renameat([fd:s1d42]/f4, [fd:s1d42]/f5). */</div><div class='add'>+	const int expected_same_dir_rename_result;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s1d1_mount_src_parent) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d1 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_EXECUTE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s1d2_mount_src_refer) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d2 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s1d2_mount_src_create) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d2 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s1d2_mount_src_rename) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d2 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s1d31_s1d32_old_parent) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d31 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_EXECUTE |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.allowed_s1d32 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_EXECUTE |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s1d41_s1d42_disconnected_refer) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d41 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.allowed_s1d42 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s1d41_s1d42_disconnected_create) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d41 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.allowed_s1d42 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s1d41_s1d42_disconnected_rename_even) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d41 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.allowed_s1d42 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The destination directory has more access right. */</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s1d41_s1d42_disconnected_rename_more) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d41 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.allowed_s1d42 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_MAKE_REG |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_EXECUTE,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	/* Access denied. */</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The destination directory has less access right. */</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s1d41_s1d42_disconnected_rename_less) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d41 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_MAKE_REG |</div><div class='add'>+			 LANDLOCK_ACCESS_FS_EXECUTE,</div><div class='add'>+	.allowed_s1d42 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	/* Access allowed. */</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s2d1_mount_dst_parent_create) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d1 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s2d1_mount_dst_parent_refer) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s2d1_mount_dst_parent_mini) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d1 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s2d2_covered_by_mount) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d2 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_EXECUTE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Tests collect_domain_accesses(). */</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s3d1_s4d1_new_parent_refer) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s3d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.allowed_s4d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s3d1_s4d1_new_parent_create) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s3d1 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.allowed_s4d1 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs,</div><div class='add'>+		    s3d1_s4d1_disconnected_rename_even){</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s3d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.allowed_s4d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The destination directory has more access right. */</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s3d1_s4d1_disconnected_rename_more) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s3d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.allowed_s4d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG |</div><div class='add'>+			LANDLOCK_ACCESS_FS_EXECUTE,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	/* Access denied. */</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The destination directory has less access right. */</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, s3d1_s4d1_disconnected_rename_less) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s3d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG |</div><div class='add'>+			LANDLOCK_ACCESS_FS_EXECUTE,</div><div class='add'>+	.allowed_s4d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	/* Access allowed. */</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout4_disconnected_leafs, f1_f2_f3) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_f1 = LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.allowed_f2 = LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.allowed_f3 = LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+TEST_F_FORK(layout4_disconnected_leafs, read_rename_exchange)</div><div class='add'>+{</div><div class='add'>+	const __u64 handled_access =</div><div class='add'>+		LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+		LANDLOCK_ACCESS_FS_EXECUTE | LANDLOCK_ACCESS_FS_MAKE_REG;</div><div class='add'>+	const struct rule rules[] = {</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1",</div><div class='add'>+			.access = variant-&gt;allowed_s1d1,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1/s1d2",</div><div class='add'>+			.access = variant-&gt;allowed_s1d2,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1/s1d2/s1d31",</div><div class='add'>+			.access = variant-&gt;allowed_s1d31,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1/s1d2/s1d32",</div><div class='add'>+			.access = variant-&gt;allowed_s1d32,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1/s1d2/s1d31/s1d41",</div><div class='add'>+			.access = variant-&gt;allowed_s1d41,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1/s1d2/s1d32/s1d42",</div><div class='add'>+			.access = variant-&gt;allowed_s1d42,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1/s1d2/s1d31/s1d41/f1",</div><div class='add'>+			.access = variant-&gt;allowed_f1,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1/s1d2/s1d31/s1d41/f2",</div><div class='add'>+			.access = variant-&gt;allowed_f2,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1/s1d2/s1d32/s1d42/f3",</div><div class='add'>+			.access = variant-&gt;allowed_f3,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s2d1",</div><div class='add'>+			.access = variant-&gt;allowed_s2d1,</div><div class='add'>+		},</div><div class='add'>+		/* s2d2_fd */</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s3d1",</div><div class='add'>+			.access = variant-&gt;allowed_s3d1,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s4d1",</div><div class='add'>+			.access = variant-&gt;allowed_s4d1,</div><div class='add'>+		},</div><div class='add'>+		{},</div><div class='add'>+	};</div><div class='add'>+	int ruleset_fd, s1d41_bind_fd, s1d42_bind_fd;</div><div class='add'>+</div><div class='add'>+	ruleset_fd = create_ruleset(_metadata, handled_access, rules);</div><div class='add'>+	ASSERT_LE(0, ruleset_fd);</div><div class='add'>+</div><div class='add'>+	/* Adds rule for the covered directory. */</div><div class='add'>+	if (variant-&gt;allowed_s2d2) {</div><div class='add'>+		ASSERT_EQ(0, landlock_add_rule(</div><div class='add'>+				     ruleset_fd, LANDLOCK_RULE_PATH_BENEATH,</div><div class='add'>+				     &amp;(struct landlock_path_beneath_attr){</div><div class='add'>+					     .parent_fd = self-&gt;s2d2_fd,</div><div class='add'>+					     .allowed_access =</div><div class='add'>+						     variant-&gt;allowed_s2d2,</div><div class='add'>+				     },</div><div class='add'>+				     0));</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, close(self-&gt;s2d2_fd));</div><div class='add'>+</div><div class='add'>+	s1d41_bind_fd = open(TMP_DIR "/s2d1/s2d2/s1d31/s1d41",</div><div class='add'>+			     O_DIRECTORY | O_PATH | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, s1d41_bind_fd);</div><div class='add'>+	s1d42_bind_fd = open(TMP_DIR "/s2d1/s2d2/s1d32/s1d42",</div><div class='add'>+			     O_DIRECTORY | O_PATH | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, s1d42_bind_fd);</div><div class='add'>+</div><div class='add'>+	/* Disconnects and checks source and destination directories. */</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(s1d41_bind_fd, "..", O_DIRECTORY));</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(s1d42_bind_fd, "..", O_DIRECTORY));</div><div class='add'>+	/* Renames to make it accessible through s3d1/s1d41 */</div><div class='add'>+	ASSERT_EQ(0, test_renameat(AT_FDCWD, TMP_DIR "/s1d1/s1d2/s1d31/s1d41",</div><div class='add'>+				   AT_FDCWD, TMP_DIR "/s3d1/s1d41"));</div><div class='add'>+	/* Renames to make it accessible through s4d1/s1d42 */</div><div class='add'>+	ASSERT_EQ(0, test_renameat(AT_FDCWD, TMP_DIR "/s1d1/s1d2/s1d32/s1d42",</div><div class='add'>+				   AT_FDCWD, TMP_DIR "/s4d1/s1d42"));</div><div class='add'>+	EXPECT_EQ(ENOENT, test_open_rel(s1d41_bind_fd, "..", O_DIRECTORY));</div><div class='add'>+	EXPECT_EQ(ENOENT, test_open_rel(s1d42_bind_fd, "..", O_DIRECTORY));</div><div class='add'>+</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd);</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(variant-&gt;expected_read_result,</div><div class='add'>+		  test_open_rel(s1d41_bind_fd, "f1", O_RDONLY));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(variant-&gt;expected_rename_result,</div><div class='add'>+		  test_renameat(s1d41_bind_fd, "f1", s1d42_bind_fd, "f1"));</div><div class='add'>+	EXPECT_EQ(variant-&gt;expected_exchange_result,</div><div class='add'>+		  test_exchangeat(s1d41_bind_fd, "f2", s1d42_bind_fd, "f3"));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(variant-&gt;expected_same_dir_rename_result,</div><div class='add'>+		  test_renameat(s1d42_bind_fd, "f4", s1d42_bind_fd, "f5"));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * layout5_disconnected_branch before rename:</div><div class='add'>+ *</div><div class='add'>+ * tmp</div><div class='add'>+ * ├── s1d1</div><div class='add'>+ * │   └── s1d2 [source of the first bind mount]</div><div class='add'>+ * │       └── s1d3</div><div class='add'>+ * │           ├── s1d41</div><div class='add'>+ * │           │   ├── f1</div><div class='add'>+ * │           │   └── f2</div><div class='add'>+ * │           └── s1d42</div><div class='add'>+ * │               ├── f3</div><div class='add'>+ * │               └── f4</div><div class='add'>+ * ├── s2d1</div><div class='add'>+ * │   └── s2d2 [source of the second bind mount]</div><div class='add'>+ * │       └── s2d3</div><div class='add'>+ * │           └── s2d4 [first s1d2 bind mount]</div><div class='add'>+ * │               └── s1d3</div><div class='add'>+ * │                   ├── s1d41</div><div class='add'>+ * │                   │   ├── f1</div><div class='add'>+ * │                   │   └── f2</div><div class='add'>+ * │                   └── s1d42</div><div class='add'>+ * │                       ├── f3</div><div class='add'>+ * │                       └── f4</div><div class='add'>+ * ├── s3d1</div><div class='add'>+ * │   └── s3d2 [second s2d2 bind mount]</div><div class='add'>+ * │       └── s2d3</div><div class='add'>+ * │           └── s2d4 [first s1d2 bind mount]</div><div class='add'>+ * │               └── s1d3</div><div class='add'>+ * │                   ├── s1d41</div><div class='add'>+ * │                   │   ├── f1</div><div class='add'>+ * │                   │   └── f2</div><div class='add'>+ * │                   └── s1d42</div><div class='add'>+ * │                       ├── f3</div><div class='add'>+ * │                       └── f4</div><div class='add'>+ * └── s4d1</div><div class='add'>+ *</div><div class='add'>+ * After rename:</div><div class='add'>+ *</div><div class='add'>+ * tmp</div><div class='add'>+ * ├── s1d1</div><div class='add'>+ * │   └── s1d2 [source of the first bind mount]</div><div class='add'>+ * │       └── s1d3</div><div class='add'>+ * │           ├── s1d41</div><div class='add'>+ * │           │   ├── f1</div><div class='add'>+ * │           │   └── f2</div><div class='add'>+ * │           └── s1d42</div><div class='add'>+ * │               ├── f3</div><div class='add'>+ * │               └── f4</div><div class='add'>+ * ├── s2d1</div><div class='add'>+ * │   └── s2d2 [source of the second bind mount]</div><div class='add'>+ * ├── s3d1</div><div class='add'>+ * │   └── s3d2 [second s2d2 bind mount]</div><div class='add'>+ * └── s4d1</div><div class='add'>+ *     └── s2d3 [renamed here]</div><div class='add'>+ *         └── s2d4 [first s1d2 bind mount]</div><div class='add'>+ *             └── s1d3</div><div class='add'>+ *                 ├── s1d41</div><div class='add'>+ *                 │   ├── f1</div><div class='add'>+ *                 │   └── f2</div><div class='add'>+ *                 └── s1d42</div><div class='add'>+ *                     ├── f3</div><div class='add'>+ *                     └── f4</div><div class='add'>+ *</div><div class='add'>+ * Decision path for access from the s3d1/s3d2/s2d3/s2d4/s1d3 file descriptor:</div><div class='add'>+ *   1. first bind mount:   s1d3 -&gt; s1d2</div><div class='add'>+ *   2. second bind mount:    s2d3</div><div class='add'>+ *   3. tmp mount:              s4d1 -&gt; tmp [disconnected branch]</div><div class='add'>+ *   4. second bind mount:        s2d2</div><div class='add'>+ *   5. tmp mount:                  s3d1 -&gt; tmp</div><div class='add'>+ *   6. parent mounts:                [...] -&gt; /</div><div class='add'>+ *</div><div class='add'>+ * The s4d1 directory is evaluated even if it is not in the s2d2 mount.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE(layout5_disconnected_branch) {</div><div class='add'>+	int s2d4_fd, s3d2_fd;</div><div class='add'>+};</div><div class='add'>+/* clang-format on */</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(layout5_disconnected_branch)</div><div class='add'>+{</div><div class='add'>+	prepare_layout(_metadata);</div><div class='add'>+</div><div class='add'>+	create_file(_metadata, TMP_DIR "/s1d1/s1d2/s1d3/s1d41/f1");</div><div class='add'>+	create_file(_metadata, TMP_DIR "/s1d1/s1d2/s1d3/s1d41/f2");</div><div class='add'>+	create_file(_metadata, TMP_DIR "/s1d1/s1d2/s1d3/s1d42/f3");</div><div class='add'>+	create_file(_metadata, TMP_DIR "/s1d1/s1d2/s1d3/s1d42/f4");</div><div class='add'>+	create_directory(_metadata, TMP_DIR "/s2d1/s2d2/s2d3/s2d4");</div><div class='add'>+	create_directory(_metadata, TMP_DIR "/s3d1/s3d2");</div><div class='add'>+	create_directory(_metadata, TMP_DIR "/s4d1");</div><div class='add'>+</div><div class='add'>+	self-&gt;s2d4_fd = open(TMP_DIR "/s2d1/s2d2/s2d3/s2d4",</div><div class='add'>+			     O_DIRECTORY | O_PATH | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, self-&gt;s2d4_fd);</div><div class='add'>+</div><div class='add'>+	self-&gt;s3d2_fd =</div><div class='add'>+		open(TMP_DIR "/s3d1/s3d2", O_DIRECTORY | O_PATH | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, self-&gt;s3d2_fd);</div><div class='add'>+</div><div class='add'>+	set_cap(_metadata, CAP_SYS_ADMIN);</div><div class='add'>+	ASSERT_EQ(0, mount(TMP_DIR "/s1d1/s1d2", TMP_DIR "/s2d1/s2d2/s2d3/s2d4",</div><div class='add'>+			   NULL, MS_BIND, NULL));</div><div class='add'>+	ASSERT_EQ(0, mount(TMP_DIR "/s2d1/s2d2", TMP_DIR "/s3d1/s3d2", NULL,</div><div class='add'>+			   MS_BIND | MS_REC, NULL));</div><div class='add'>+	clear_cap(_metadata, CAP_SYS_ADMIN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN_PARENT(layout5_disconnected_branch)</div><div class='add'>+{</div><div class='add'>+	/* Bind mounts are handled by namespace lifetime. */</div><div class='add'>+</div><div class='add'>+	/* Removes files after renames. */</div><div class='add'>+	remove_path(TMP_DIR "/s1d1/s1d2/s1d3/s1d41/f1");</div><div class='add'>+	remove_path(TMP_DIR "/s1d1/s1d2/s1d3/s1d41/f2");</div><div class='add'>+	remove_path(TMP_DIR "/s1d1/s1d2/s1d3/s1d42/f1");</div><div class='add'>+	remove_path(TMP_DIR "/s1d1/s1d2/s1d3/s1d42/f3");</div><div class='add'>+	remove_path(TMP_DIR "/s1d1/s1d2/s1d3/s1d42/f4");</div><div class='add'>+	remove_path(TMP_DIR "/s1d1/s1d2/s1d3/s1d42/f5");</div><div class='add'>+</div><div class='add'>+	cleanup_layout(_metadata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT(layout5_disconnected_branch)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Parent of all files.  It should always be enforced when testing against</div><div class='add'>+	 * files under the s1d41 or s1d42 disconnected directories.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_base;</div><div class='add'>+	/*</div><div class='add'>+	 * Parent of the first bind mount source.  It should always be ignored when</div><div class='add'>+	 * testing against files under the s1d41 or s1d42 disconnected directories.</div><div class='add'>+	 */</div><div class='add'>+	const __u64 allowed_s1d1;</div><div class='add'>+	const __u64 allowed_s1d2;</div><div class='add'>+	const __u64 allowed_s1d3;</div><div class='add'>+	const __u64 allowed_s2d1;</div><div class='add'>+	const __u64 allowed_s2d2;</div><div class='add'>+	const __u64 allowed_s2d3;</div><div class='add'>+	const __u64 allowed_s2d4;</div><div class='add'>+	const __u64 allowed_s3d1;</div><div class='add'>+	const __u64 allowed_s3d2;</div><div class='add'>+	const __u64 allowed_s4d1;</div><div class='add'>+</div><div class='add'>+	/* Expected result of the call to open([fd:s1d3]/s1d41/f1, O_RDONLY). */</div><div class='add'>+	const int expected_read_result;</div><div class='add'>+	/*</div><div class='add'>+	 * Expected result of the call to renameat([fd:s1d3]/s1d41/f1,</div><div class='add'>+	 * [fd:s1d3]/s1d42/f1).</div><div class='add'>+	 */</div><div class='add'>+	const int expected_rename_result;</div><div class='add'>+	/*</div><div class='add'>+	 * Expected result of the call to renameat([fd:s1d3]/s1d41/f2,</div><div class='add'>+	 * [fd:s1d3]/s1d42/f3,  RENAME_EXCHANGE).</div><div class='add'>+	 */</div><div class='add'>+	const int expected_exchange_result;</div><div class='add'>+	/*</div><div class='add'>+	 * Expected result of the call to renameat([fd:s1d3]/s1d42/f4,</div><div class='add'>+	 * [fd:s1d3]/s1d42/f5).</div><div class='add'>+	 */</div><div class='add'>+	const int expected_same_dir_rename_result;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s1d1_mount1_src_parent) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d1 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_EXECUTE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s1d2_mount1_src_refer) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d2 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s1d2_mount1_src_create) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d2 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s1d2_mount1_src_rename) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d2 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s1d3_fd_refer) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d3 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s1d3_fd_create) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d3 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s1d3_fd_rename) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d3 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s1d3_fd_full) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s1d3 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_EXECUTE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s2d1_mount2_src_parent) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d1 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_EXECUTE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s2d2_mount2_src_refer) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d2 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s2d2_mount2_src_create) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d2 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s2d2_mount2_src_rename) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d2 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s2d3_mount1_dst_parent_refer) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d3 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s2d3_mount1_dst_parent_create) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d3 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s2d3_mount1_dst_parent_rename) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d3 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s2d4_mount1_dst) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s2d4 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_EXECUTE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s3d1_mount2_dst_parent_refer) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s3d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s3d1_mount2_dst_parent_create) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s3d1 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s3d1_mount2_dst_parent_rename) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s3d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s3d2_mount1_dst) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s3d2 = LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+			LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_EXECUTE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s4d1_rename_parent_refer) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s4d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = EACCES,</div><div class='add'>+	.expected_rename_result = EACCES,</div><div class='add'>+	.expected_exchange_result = EACCES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s4d1_rename_parent_create) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s4d1 = LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+			LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = 0,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = EXDEV,</div><div class='add'>+	.expected_exchange_result = EXDEV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(layout5_disconnected_branch, s4d1_rename_parent_rename) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.allowed_s4d1 = LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_MAKE_REG,</div><div class='add'>+	.expected_read_result = EACCES,</div><div class='add'>+	.expected_same_dir_rename_result = 0,</div><div class='add'>+	.expected_rename_result = 0,</div><div class='add'>+	.expected_exchange_result = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+TEST_F_FORK(layout5_disconnected_branch, read_rename_exchange)</div><div class='add'>+{</div><div class='add'>+	const __u64 handled_access =</div><div class='add'>+		LANDLOCK_ACCESS_FS_REFER | LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+		LANDLOCK_ACCESS_FS_EXECUTE | LANDLOCK_ACCESS_FS_MAKE_REG;</div><div class='add'>+	const struct rule rules[] = {</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1",</div><div class='add'>+			.access = variant-&gt;allowed_s1d1,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1/s1d2",</div><div class='add'>+			.access = variant-&gt;allowed_s1d2,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s1d1/s1d2/s1d3",</div><div class='add'>+			.access = variant-&gt;allowed_s1d3,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s2d1",</div><div class='add'>+			.access = variant-&gt;allowed_s2d1,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s2d1/s2d2",</div><div class='add'>+			.access = variant-&gt;allowed_s2d2,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s2d1/s2d2/s2d3",</div><div class='add'>+			.access = variant-&gt;allowed_s2d3,</div><div class='add'>+		},</div><div class='add'>+		/* s2d4_fd */</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s3d1",</div><div class='add'>+			.access = variant-&gt;allowed_s3d1,</div><div class='add'>+		},</div><div class='add'>+		/* s3d2_fd */</div><div class='add'>+		{</div><div class='add'>+			.path = TMP_DIR "/s4d1",</div><div class='add'>+			.access = variant-&gt;allowed_s4d1,</div><div class='add'>+		},</div><div class='add'>+		{},</div><div class='add'>+	};</div><div class='add'>+	int ruleset_fd, s1d3_bind_fd;</div><div class='add'>+</div><div class='add'>+	ruleset_fd = create_ruleset(_metadata, handled_access, rules);</div><div class='add'>+	ASSERT_LE(0, ruleset_fd);</div><div class='add'>+</div><div class='add'>+	/* Adds rules for the covered directories. */</div><div class='add'>+	if (variant-&gt;allowed_s2d4) {</div><div class='add'>+		ASSERT_EQ(0, landlock_add_rule(</div><div class='add'>+				     ruleset_fd, LANDLOCK_RULE_PATH_BENEATH,</div><div class='add'>+				     &amp;(struct landlock_path_beneath_attr){</div><div class='add'>+					     .parent_fd = self-&gt;s2d4_fd,</div><div class='add'>+					     .allowed_access =</div><div class='add'>+						     variant-&gt;allowed_s2d4,</div><div class='add'>+				     },</div><div class='add'>+				     0));</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, close(self-&gt;s2d4_fd));</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;allowed_s3d2) {</div><div class='add'>+		ASSERT_EQ(0, landlock_add_rule(</div><div class='add'>+				     ruleset_fd, LANDLOCK_RULE_PATH_BENEATH,</div><div class='add'>+				     &amp;(struct landlock_path_beneath_attr){</div><div class='add'>+					     .parent_fd = self-&gt;s3d2_fd,</div><div class='add'>+					     .allowed_access =</div><div class='add'>+						     variant-&gt;allowed_s3d2,</div><div class='add'>+				     },</div><div class='add'>+				     0));</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, close(self-&gt;s3d2_fd));</div><div class='add'>+</div><div class='add'>+	s1d3_bind_fd = open(TMP_DIR "/s3d1/s3d2/s2d3/s2d4/s1d3",</div><div class='add'>+			    O_DIRECTORY | O_PATH | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, s1d3_bind_fd);</div><div class='add'>+</div><div class='add'>+	/* Disconnects and checks source and destination directories. */</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(s1d3_bind_fd, "..", O_DIRECTORY));</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(s1d3_bind_fd, "../..", O_DIRECTORY));</div><div class='add'>+	/* Renames to make it accessible through s3d1/s1d41 */</div><div class='add'>+	ASSERT_EQ(0, test_renameat(AT_FDCWD, TMP_DIR "/s2d1/s2d2/s2d3",</div><div class='add'>+				   AT_FDCWD, TMP_DIR "/s4d1/s2d3"));</div><div class='add'>+	EXPECT_EQ(0, test_open_rel(s1d3_bind_fd, "..", O_DIRECTORY));</div><div class='add'>+	EXPECT_EQ(ENOENT, test_open_rel(s1d3_bind_fd, "../..", O_DIRECTORY));</div><div class='add'>+</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd);</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(variant-&gt;expected_read_result,</div><div class='add'>+		  test_open_rel(s1d3_bind_fd, "s1d41/f1", O_RDONLY));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(variant-&gt;expected_rename_result,</div><div class='add'>+		  test_renameat(s1d3_bind_fd, "s1d41/f1", s1d3_bind_fd,</div><div class='add'>+				"s1d42/f1"));</div><div class='add'>+	EXPECT_EQ(variant-&gt;expected_exchange_result,</div><div class='add'>+		  test_exchangeat(s1d3_bind_fd, "s1d41/f2", s1d3_bind_fd,</div><div class='add'>+				  "s1d42/f3"));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(variant-&gt;expected_same_dir_rename_result,</div><div class='add'>+		  test_renameat(s1d3_bind_fd, "s1d42/f4", s1d3_bind_fd,</div><div class='add'>+				"s1d42/f5"));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define LOWER_BASE TMP_DIR "/lower"</div><div class='ctx'> #define LOWER_DATA LOWER_BASE "/data"</div><div class='ctx'> static const char lower_fl1[] = LOWER_DATA "/fl1";</div><div class='hunk'>@@ -5554,4 +7053,598 @@ TEST_F_FORK(layout3_fs, release_inodes)</div><div class='ctx'> 	ASSERT_EQ(EACCES, test_open(TMP_DIR, O_RDONLY));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int matches_log_fs_extra(struct __test_metadata *const _metadata,</div><div class='add'>+				int audit_fd, const char *const blockers,</div><div class='add'>+				const char *const path, const char *const extra)</div><div class='add'>+{</div><div class='add'>+	static const char log_template[] = REGEX_LANDLOCK_PREFIX</div><div class='add'>+		" blockers=fs\\.%s path=\"%s\" dev=\"[^\"]\\+\" ino=[0-9]\\+$";</div><div class='add'>+	char *absolute_path = NULL;</div><div class='add'>+	size_t log_match_remaining = sizeof(log_template) + strlen(blockers) +</div><div class='add'>+				     PATH_MAX * 2 +</div><div class='add'>+				     (extra ? strlen(extra) : 0) + 1;</div><div class='add'>+	char log_match[log_match_remaining];</div><div class='add'>+	char *log_match_cursor = log_match;</div><div class='add'>+	size_t chunk_len;</div><div class='add'>+</div><div class='add'>+	chunk_len = snprintf(log_match_cursor, log_match_remaining,</div><div class='add'>+			     REGEX_LANDLOCK_PREFIX " blockers=%s path=\"",</div><div class='add'>+			     blockers);</div><div class='add'>+	if (chunk_len &lt; 0 || chunk_len &gt;= log_match_remaining)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It is assume that absolute_path does not contain control characters nor</div><div class='add'>+	 * spaces, see audit_string_contains_control().</div><div class='add'>+	 */</div><div class='add'>+	absolute_path = realpath(path, NULL);</div><div class='add'>+	if (!absolute_path)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	log_match_remaining -= chunk_len;</div><div class='add'>+	log_match_cursor += chunk_len;</div><div class='add'>+	log_match_cursor = regex_escape(absolute_path, log_match_cursor,</div><div class='add'>+					log_match_remaining);</div><div class='add'>+	free(absolute_path);</div><div class='add'>+	if (log_match_cursor &lt; 0)</div><div class='add'>+		return (long long)log_match_cursor;</div><div class='add'>+</div><div class='add'>+	log_match_remaining -= log_match_cursor - log_match;</div><div class='add'>+	chunk_len = snprintf(log_match_cursor, log_match_remaining,</div><div class='add'>+			     "\" dev=\"[^\"]\\+\" ino=[0-9]\\+%s$",</div><div class='add'>+			     extra ?: "");</div><div class='add'>+	if (chunk_len &lt; 0 || chunk_len &gt;= log_match_remaining)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	return audit_match_record(audit_fd, AUDIT_LANDLOCK_ACCESS, log_match,</div><div class='add'>+				  NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int matches_log_fs(struct __test_metadata *const _metadata, int audit_fd,</div><div class='add'>+			  const char *const blockers, const char *const path)</div><div class='add'>+{</div><div class='add'>+	return matches_log_fs_extra(_metadata, audit_fd, blockers, path, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE(audit_layout1)</div><div class='add'>+{</div><div class='add'>+	struct audit_filter audit_filter;</div><div class='add'>+	int audit_fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(audit_layout1)</div><div class='add'>+{</div><div class='add'>+	prepare_layout(_metadata);</div><div class='add'>+</div><div class='add'>+	create_layout1(_metadata);</div><div class='add'>+</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	self-&gt;audit_fd = audit_init_with_exe_filter(&amp;self-&gt;audit_filter);</div><div class='add'>+	EXPECT_LE(0, self-&gt;audit_fd);</div><div class='add'>+	disable_caps(_metadata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN_PARENT(audit_layout1)</div><div class='add'>+{</div><div class='add'>+	remove_layout1(_metadata);</div><div class='add'>+</div><div class='add'>+	cleanup_layout(_metadata);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_cleanup(-1, NULL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, execute_make)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	copy_file(_metadata, bin_true, file1_s1d1);</div><div class='add'>+	test_execute(_metadata, 0, file1_s1d1);</div><div class='add'>+	test_check_exec(_metadata, 0, file1_s1d1);</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata,</div><div class='add'>+			   &amp;(struct landlock_ruleset_attr){</div><div class='add'>+				   .handled_access_fs =</div><div class='add'>+					   LANDLOCK_ACCESS_FS_EXECUTE,</div><div class='add'>+			   });</div><div class='add'>+</div><div class='add'>+	test_execute(_metadata, EACCES, file1_s1d1);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.execute",</div><div class='add'>+				    file1_s1d1));</div><div class='add'>+	test_check_exec(_metadata, EACCES, file1_s1d1);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.execute",</div><div class='add'>+				    file1_s1d1));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(0, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Using a set of handled/denied access rights make it possible to check that</div><div class='add'>+ * only the blocked ones are logged.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+static const __u64 access_fs_16 =</div><div class='add'>+	LANDLOCK_ACCESS_FS_EXECUTE |</div><div class='add'>+	LANDLOCK_ACCESS_FS_WRITE_FILE |</div><div class='add'>+	LANDLOCK_ACCESS_FS_READ_FILE |</div><div class='add'>+	LANDLOCK_ACCESS_FS_READ_DIR |</div><div class='add'>+	LANDLOCK_ACCESS_FS_REMOVE_DIR |</div><div class='add'>+	LANDLOCK_ACCESS_FS_REMOVE_FILE |</div><div class='add'>+	LANDLOCK_ACCESS_FS_MAKE_CHAR |</div><div class='add'>+	LANDLOCK_ACCESS_FS_MAKE_DIR |</div><div class='add'>+	LANDLOCK_ACCESS_FS_MAKE_REG |</div><div class='add'>+	LANDLOCK_ACCESS_FS_MAKE_SOCK |</div><div class='add'>+	LANDLOCK_ACCESS_FS_MAKE_FIFO |</div><div class='add'>+	LANDLOCK_ACCESS_FS_MAKE_BLOCK |</div><div class='add'>+	LANDLOCK_ACCESS_FS_MAKE_SYM |</div><div class='add'>+	LANDLOCK_ACCESS_FS_REFER |</div><div class='add'>+	LANDLOCK_ACCESS_FS_TRUNCATE |</div><div class='add'>+	LANDLOCK_ACCESS_FS_IOCTL_DEV;</div><div class='add'>+/* clang-format on */</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, execute_read)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	copy_file(_metadata, bin_true, file1_s1d1);</div><div class='add'>+	test_execute(_metadata, 0, file1_s1d1);</div><div class='add'>+	test_check_exec(_metadata, 0, file1_s1d1);</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The only difference with the previous audit_layout1.execute_read test is</div><div class='add'>+	 * the extra ",fs\\.read_file" blocked by the executable file.</div><div class='add'>+	 */</div><div class='add'>+	test_execute(_metadata, EACCES, file1_s1d1);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.execute,fs\\.read_file", file1_s1d1));</div><div class='add'>+	test_check_exec(_metadata, EACCES, file1_s1d1);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.execute,fs\\.read_file", file1_s1d1));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(0, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, write_file)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(EACCES, test_open(file1_s1d1, O_WRONLY));</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.write_file", file1_s1d1));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, read_file)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(EACCES, test_open(file1_s1d1, O_RDONLY));</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.read_file",</div><div class='add'>+				    file1_s1d1));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, read_dir)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(EACCES, test_open(dir_s1d1, O_DIRECTORY));</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.read_dir",</div><div class='add'>+				    dir_s1d1));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, remove_dir)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+	EXPECT_EQ(0, unlink(file2_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, rmdir(dir_s1d3));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.remove_dir", dir_s1d2));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, unlinkat(AT_FDCWD, dir_s1d3, AT_REMOVEDIR));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.remove_dir", dir_s1d2));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(0, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, remove_file)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, unlink(file1_s1d3));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.remove_file", dir_s1d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, make_char)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, mknod(file1_s1d3, S_IFCHR | 0644, 0));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.make_char",</div><div class='add'>+				    dir_s1d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, make_dir)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, mkdir(file1_s1d3, 0755));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.make_dir",</div><div class='add'>+				    dir_s1d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, make_reg)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, mknod(file1_s1d3, S_IFREG | 0644, 0));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.make_reg",</div><div class='add'>+				    dir_s1d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, make_sock)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, mknod(file1_s1d3, S_IFSOCK | 0644, 0));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.make_sock",</div><div class='add'>+				    dir_s1d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, make_fifo)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, mknod(file1_s1d3, S_IFIFO | 0644, 0));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.make_fifo",</div><div class='add'>+				    dir_s1d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, make_block)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, mknod(file1_s1d3, S_IFBLK | 0644, 0));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.make_block", dir_s1d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, make_sym)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, symlink("target", file1_s1d3));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.make_sym",</div><div class='add'>+				    dir_s1d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, refer_handled)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs =</div><div class='add'>+						      LANDLOCK_ACCESS_FS_REFER,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, link(file1_s1d1, file1_s1d3));</div><div class='add'>+	EXPECT_EQ(EXDEV, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.refer",</div><div class='add'>+				    dir_s1d1));</div><div class='add'>+	EXPECT_EQ(0,</div><div class='add'>+		  matches_log_domain_allocated(self-&gt;audit_fd, getpid(), NULL));</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.refer",</div><div class='add'>+				    dir_s1d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(0, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, refer_make)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata,</div><div class='add'>+			   &amp;(struct landlock_ruleset_attr){</div><div class='add'>+				   .handled_access_fs =</div><div class='add'>+					   LANDLOCK_ACCESS_FS_MAKE_REG |</div><div class='add'>+					   LANDLOCK_ACCESS_FS_REFER,</div><div class='add'>+			   });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, link(file1_s1d1, file1_s1d3));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.refer",</div><div class='add'>+				    dir_s1d1));</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.make_reg,fs\\.refer", dir_s1d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(0, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, refer_rename)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(EACCES, test_rename(file1_s1d2, file1_s2d3));</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.remove_file,fs\\.refer", dir_s1d2));</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.remove_file,fs\\.make_reg,fs\\.refer",</div><div class='add'>+				    dir_s2d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(0, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, refer_exchange)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, unlink(file1_s1d3));</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The only difference with the previous audit_layout1.refer_rename test is</div><div class='add'>+	 * the extra ",fs\\.make_reg" blocked by the source directory.</div><div class='add'>+	 */</div><div class='add'>+	EXPECT_EQ(EACCES, test_exchange(file1_s1d2, file1_s2d3));</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.remove_file,fs\\.make_reg,fs\\.refer",</div><div class='add'>+				    dir_s1d2));</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.remove_file,fs\\.make_reg,fs\\.refer",</div><div class='add'>+				    dir_s2d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(0, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This test checks that the audit record is correctly generated when the</div><div class='add'>+ * operation is only partially denied.  This is the case for rename(2) when the</div><div class='add'>+ * source file is allowed to be referenced but the destination directory is not.</div><div class='add'>+ *</div><div class='add'>+ * This is also a regression test for commit d617f0d72d80 ("landlock: Optimize</div><div class='add'>+ * file path walks and prepare for audit support") and commit 058518c20920</div><div class='add'>+ * ("landlock: Align partial refer access checks with final ones").</div><div class='add'>+ */</div><div class='add'>+TEST_F(audit_layout1, refer_rename_half)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+	const struct rule layer1[] = {</div><div class='add'>+		{</div><div class='add'>+			.path = dir_s2d2,</div><div class='add'>+			.access = LANDLOCK_ACCESS_FS_REFER,</div><div class='add'>+		},</div><div class='add'>+		{},</div><div class='add'>+	};</div><div class='add'>+	int ruleset_fd =</div><div class='add'>+		create_ruleset(_metadata, LANDLOCK_ACCESS_FS_REFER, layer1);</div><div class='add'>+</div><div class='add'>+	ASSERT_LE(0, ruleset_fd);</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd);</div><div class='add'>+	ASSERT_EQ(0, close(ruleset_fd));</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(-1, rename(dir_s1d2, dir_s2d3));</div><div class='add'>+	ASSERT_EQ(EXDEV, errno);</div><div class='add'>+</div><div class='add'>+	/* Only half of the request is denied. */</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.refer",</div><div class='add'>+				    dir_s1d1));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, truncate)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata, &amp;(struct landlock_ruleset_attr){</div><div class='add'>+					      .handled_access_fs = access_fs_16,</div><div class='add'>+				      });</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(-1, truncate(file1_s1d3, 0));</div><div class='add'>+	EXPECT_EQ(EACCES, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd, "fs\\.truncate",</div><div class='add'>+				    file1_s1d3));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, ioctl_dev)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+	int fd;</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata,</div><div class='add'>+			   &amp;(struct landlock_ruleset_attr){</div><div class='add'>+				   .handled_access_fs =</div><div class='add'>+					   access_fs_16 &amp;</div><div class='add'>+					   ~LANDLOCK_ACCESS_FS_READ_FILE,</div><div class='add'>+			   });</div><div class='add'>+</div><div class='add'>+	fd = open("/dev/null", O_RDONLY | O_CLOEXEC);</div><div class='add'>+	ASSERT_LE(0, fd);</div><div class='add'>+	EXPECT_EQ(EACCES, ioctl_error(_metadata, fd, FIONREAD));</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs_extra(_metadata, self-&gt;audit_fd,</div><div class='add'>+					  "fs\\.ioctl_dev", "/dev/null",</div><div class='add'>+					  " ioctlcmd=0x541b"));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit_layout1, mount)</div><div class='add'>+{</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	drop_access_rights(_metadata,</div><div class='add'>+			   &amp;(struct landlock_ruleset_attr){</div><div class='add'>+				   .handled_access_fs =</div><div class='add'>+					   LANDLOCK_ACCESS_FS_EXECUTE,</div><div class='add'>+			   });</div><div class='add'>+</div><div class='add'>+	set_cap(_metadata, CAP_SYS_ADMIN);</div><div class='add'>+	EXPECT_EQ(-1, mount(NULL, dir_s3d2, NULL, MS_RDONLY, NULL));</div><div class='add'>+	EXPECT_EQ(EPERM, errno);</div><div class='add'>+	clear_cap(_metadata, CAP_SYS_ADMIN);</div><div class='add'>+	EXPECT_EQ(0, matches_log_fs(_metadata, self-&gt;audit_fd,</div><div class='add'>+				    "fs\\.change_topology", dir_s3d2));</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/landlock/net_test.c b/tools/testing/selftests/landlock/net_test.c<br/>index 4e0aeb53b225..2a45208551e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/net_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/net_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/net_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/net_test.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;sys/syscall.h&gt;</div><div class='ctx'> #include &lt;sys/un.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "audit.h"</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> const short sock_port_start = (1 &lt;&lt; 10);</div><div class='hunk'>@@ -85,18 +86,18 @@ static void setup_loopback(struct __test_metadata *const _metadata)</div><div class='ctx'> 	clear_ambient_cap(_metadata, CAP_NET_ADMIN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool prot_is_tcp(const struct protocol_variant *const prot)</div><div class='add'>+{</div><div class='add'>+	return (prot-&gt;domain == AF_INET || prot-&gt;domain == AF_INET6) &amp;&amp;</div><div class='add'>+	       prot-&gt;type == SOCK_STREAM &amp;&amp;</div><div class='add'>+	       (prot-&gt;protocol == IPPROTO_TCP || prot-&gt;protocol == IPPROTO_IP);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool is_restricted(const struct protocol_variant *const prot,</div><div class='ctx'> 			  const enum sandbox_type sandbox)</div><div class='ctx'> {</div><div class='del'>-	switch (prot-&gt;domain) {</div><div class='del'>-	case AF_INET:</div><div class='del'>-	case AF_INET6:</div><div class='del'>-		switch (prot-&gt;type) {</div><div class='del'>-		case SOCK_STREAM:</div><div class='del'>-			return sandbox == TCP_SANDBOX;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (sandbox == TCP_SANDBOX)</div><div class='add'>+		return prot_is_tcp(prot);</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +106,7 @@ static int socket_variant(const struct service_fixture *const srv)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = socket(srv-&gt;protocol.domain, srv-&gt;protocol.type | SOCK_CLOEXEC,</div><div class='del'>-		     0);</div><div class='add'>+		     srv-&gt;protocol.protocol);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return -errno;</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -290,22 +291,70 @@ FIXTURE_TEARDOWN(protocol)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* clang-format off */</div><div class='del'>-FIXTURE_VARIANT_ADD(protocol, no_sandbox_with_ipv4_tcp) {</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, no_sandbox_with_ipv4_tcp1) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.sandbox = NO_SANDBOX,</div><div class='add'>+	.prot = {</div><div class='add'>+		.domain = AF_INET,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+		/* IPPROTO_IP == 0 */</div><div class='add'>+		.protocol = IPPROTO_IP,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, no_sandbox_with_ipv4_tcp2) {</div><div class='ctx'> 	/* clang-format on */</div><div class='ctx'> 	.sandbox = NO_SANDBOX,</div><div class='ctx'> 	.prot = {</div><div class='ctx'> 		.domain = AF_INET,</div><div class='ctx'> 		.type = SOCK_STREAM,</div><div class='add'>+		.protocol = IPPROTO_TCP,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* clang-format off */</div><div class='del'>-FIXTURE_VARIANT_ADD(protocol, no_sandbox_with_ipv6_tcp) {</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, no_sandbox_with_ipv4_mptcp) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.sandbox = NO_SANDBOX,</div><div class='add'>+	.prot = {</div><div class='add'>+		.domain = AF_INET,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+		.protocol = IPPROTO_MPTCP,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, no_sandbox_with_ipv6_tcp1) {</div><div class='ctx'> 	/* clang-format on */</div><div class='ctx'> 	.sandbox = NO_SANDBOX,</div><div class='ctx'> 	.prot = {</div><div class='ctx'> 		.domain = AF_INET6,</div><div class='ctx'> 		.type = SOCK_STREAM,</div><div class='add'>+		/* IPPROTO_IP == 0 */</div><div class='add'>+		.protocol = IPPROTO_IP,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, no_sandbox_with_ipv6_tcp2) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.sandbox = NO_SANDBOX,</div><div class='add'>+	.prot = {</div><div class='add'>+		.domain = AF_INET6,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+		.protocol = IPPROTO_TCP,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, no_sandbox_with_ipv6_mptcp) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.sandbox = NO_SANDBOX,</div><div class='add'>+	.prot = {</div><div class='add'>+		.domain = AF_INET6,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+		.protocol = IPPROTO_MPTCP,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -350,22 +399,70 @@ FIXTURE_VARIANT_ADD(protocol, no_sandbox_with_unix_datagram) {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* clang-format off */</div><div class='del'>-FIXTURE_VARIANT_ADD(protocol, tcp_sandbox_with_ipv4_tcp) {</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, tcp_sandbox_with_ipv4_tcp1) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.sandbox = TCP_SANDBOX,</div><div class='add'>+	.prot = {</div><div class='add'>+		.domain = AF_INET,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+		/* IPPROTO_IP == 0 */</div><div class='add'>+		.protocol = IPPROTO_IP,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, tcp_sandbox_with_ipv4_tcp2) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.sandbox = TCP_SANDBOX,</div><div class='add'>+	.prot = {</div><div class='add'>+		.domain = AF_INET,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+		.protocol = IPPROTO_TCP,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, tcp_sandbox_with_ipv4_mptcp) {</div><div class='ctx'> 	/* clang-format on */</div><div class='ctx'> 	.sandbox = TCP_SANDBOX,</div><div class='ctx'> 	.prot = {</div><div class='ctx'> 		.domain = AF_INET,</div><div class='ctx'> 		.type = SOCK_STREAM,</div><div class='add'>+		.protocol = IPPROTO_MPTCP,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, tcp_sandbox_with_ipv6_tcp1) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.sandbox = TCP_SANDBOX,</div><div class='add'>+	.prot = {</div><div class='add'>+		.domain = AF_INET6,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+		/* IPPROTO_IP == 0 */</div><div class='add'>+		.protocol = IPPROTO_IP,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, tcp_sandbox_with_ipv6_tcp2) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.sandbox = TCP_SANDBOX,</div><div class='add'>+	.prot = {</div><div class='add'>+		.domain = AF_INET6,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+		.protocol = IPPROTO_TCP,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* clang-format off */</div><div class='del'>-FIXTURE_VARIANT_ADD(protocol, tcp_sandbox_with_ipv6_tcp) {</div><div class='add'>+FIXTURE_VARIANT_ADD(protocol, tcp_sandbox_with_ipv6_mptcp) {</div><div class='ctx'> 	/* clang-format on */</div><div class='ctx'> 	.sandbox = TCP_SANDBOX,</div><div class='ctx'> 	.prot = {</div><div class='ctx'> 		.domain = AF_INET6,</div><div class='ctx'> 		.type = SOCK_STREAM,</div><div class='add'>+		.protocol = IPPROTO_MPTCP,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1772,4 +1869,135 @@ TEST_F(port_specific, bind_connect_1023)</div><div class='ctx'> 	EXPECT_EQ(0, close(bind_fd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int matches_log_tcp(const int audit_fd, const char *const blockers,</div><div class='add'>+			   const char *const dir_addr, const char *const addr,</div><div class='add'>+			   const char *const dir_port)</div><div class='add'>+{</div><div class='add'>+	static const char log_template[] = REGEX_LANDLOCK_PREFIX</div><div class='add'>+		" blockers=%s %s=%s %s=1024$";</div><div class='add'>+	/*</div><div class='add'>+	 * Max strlen(blockers): 16</div><div class='add'>+	 * Max strlen(dir_addr): 5</div><div class='add'>+	 * Max strlen(addr): 12</div><div class='add'>+	 * Max strlen(dir_port): 4</div><div class='add'>+	 */</div><div class='add'>+	char log_match[sizeof(log_template) + 37];</div><div class='add'>+	int log_match_len;</div><div class='add'>+</div><div class='add'>+	log_match_len = snprintf(log_match, sizeof(log_match), log_template,</div><div class='add'>+				 blockers, dir_addr, addr, dir_port);</div><div class='add'>+	if (log_match_len &gt; sizeof(log_match))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	return audit_match_record(audit_fd, AUDIT_LANDLOCK_ACCESS, log_match,</div><div class='add'>+				  NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE(audit)</div><div class='add'>+{</div><div class='add'>+	struct service_fixture srv0;</div><div class='add'>+	struct audit_filter audit_filter;</div><div class='add'>+	int audit_fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT(audit)</div><div class='add'>+{</div><div class='add'>+	const char *const addr;</div><div class='add'>+	const struct protocol_variant prot;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(audit, ipv4) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.addr = "127\\.0\\.0\\.1",</div><div class='add'>+	.prot = {</div><div class='add'>+		.domain = AF_INET,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clang-format off */</div><div class='add'>+FIXTURE_VARIANT_ADD(audit, ipv6) {</div><div class='add'>+	/* clang-format on */</div><div class='add'>+	.addr = "::1",</div><div class='add'>+	.prot = {</div><div class='add'>+		.domain = AF_INET6,</div><div class='add'>+		.type = SOCK_STREAM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(audit)</div><div class='add'>+{</div><div class='add'>+	ASSERT_EQ(0, set_service(&amp;self-&gt;srv0, variant-&gt;prot, 0));</div><div class='add'>+	setup_loopback(_metadata);</div><div class='add'>+</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	self-&gt;audit_fd = audit_init_with_exe_filter(&amp;self-&gt;audit_filter);</div><div class='add'>+	EXPECT_LE(0, self-&gt;audit_fd);</div><div class='add'>+	disable_caps(_metadata);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(audit)</div><div class='add'>+{</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	EXPECT_EQ(0, audit_cleanup(self-&gt;audit_fd, &amp;self-&gt;audit_filter));</div><div class='add'>+	clear_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit, bind)</div><div class='add'>+{</div><div class='add'>+	const struct landlock_ruleset_attr ruleset_attr = {</div><div class='add'>+		.handled_access_net = LANDLOCK_ACCESS_NET_BIND_TCP |</div><div class='add'>+				      LANDLOCK_ACCESS_NET_CONNECT_TCP,</div><div class='add'>+	};</div><div class='add'>+	struct audit_records records;</div><div class='add'>+	int ruleset_fd, sock_fd;</div><div class='add'>+</div><div class='add'>+	ruleset_fd =</div><div class='add'>+		landlock_create_ruleset(&amp;ruleset_attr, sizeof(ruleset_attr), 0);</div><div class='add'>+	ASSERT_LE(0, ruleset_fd);</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd);</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd));</div><div class='add'>+</div><div class='add'>+	sock_fd = socket_variant(&amp;self-&gt;srv0);</div><div class='add'>+	ASSERT_LE(0, sock_fd);</div><div class='add'>+	EXPECT_EQ(-EACCES, bind_variant(sock_fd, &amp;self-&gt;srv0));</div><div class='add'>+	EXPECT_EQ(0, matches_log_tcp(self-&gt;audit_fd, "net\\.bind_tcp", "saddr",</div><div class='add'>+				     variant-&gt;addr, "src"));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, close(sock_fd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(audit, connect)</div><div class='add'>+{</div><div class='add'>+	const struct landlock_ruleset_attr ruleset_attr = {</div><div class='add'>+		.handled_access_net = LANDLOCK_ACCESS_NET_BIND_TCP |</div><div class='add'>+				      LANDLOCK_ACCESS_NET_CONNECT_TCP,</div><div class='add'>+	};</div><div class='add'>+	struct audit_records records;</div><div class='add'>+	int ruleset_fd, sock_fd;</div><div class='add'>+</div><div class='add'>+	ruleset_fd =</div><div class='add'>+		landlock_create_ruleset(&amp;ruleset_attr, sizeof(ruleset_attr), 0);</div><div class='add'>+	ASSERT_LE(0, ruleset_fd);</div><div class='add'>+	enforce_ruleset(_metadata, ruleset_fd);</div><div class='add'>+	EXPECT_EQ(0, close(ruleset_fd));</div><div class='add'>+</div><div class='add'>+	sock_fd = socket_variant(&amp;self-&gt;srv0);</div><div class='add'>+	ASSERT_LE(0, sock_fd);</div><div class='add'>+	EXPECT_EQ(-EACCES, connect_variant(sock_fd, &amp;self-&gt;srv0));</div><div class='add'>+	EXPECT_EQ(0, matches_log_tcp(self-&gt;audit_fd, "net\\.connect_tcp",</div><div class='add'>+				     "daddr", variant-&gt;addr, "dest"));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(1, records.domain);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, close(sock_fd));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/landlock/ptrace_test.c b/tools/testing/selftests/landlock/ptrace_test.c<br/>index 8f31b673ff2d..4e356334ecb7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/ptrace_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/ptrace_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/ptrace_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/ptrace_test.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright © 2017-2020 Mickaël Salaün &lt;mic@digikod.net&gt;</div><div class='ctx'>  * Copyright © 2019-2020 ANSSI</div><div class='add'>+ * Copyright © 2024-2025 Microsoft Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define _GNU_SOURCE</div><div class='hunk'>@@ -17,6 +18,7 @@</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "audit.h"</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> /* Copied from security/yama/yama_lsm.c */</div><div class='hunk'>@@ -434,4 +436,142 @@ TEST_F(hierarchy, trace)</div><div class='ctx'> 		_metadata-&gt;exit_code = KSFT_FAIL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int matches_log_ptrace(struct __test_metadata *const _metadata,</div><div class='add'>+			      int audit_fd, const pid_t opid)</div><div class='add'>+{</div><div class='add'>+	static const char log_template[] = REGEX_LANDLOCK_PREFIX</div><div class='add'>+		" blockers=ptrace opid=%d ocomm=\"ptrace_test\"$";</div><div class='add'>+	char log_match[sizeof(log_template) + 10];</div><div class='add'>+	int log_match_len;</div><div class='add'>+</div><div class='add'>+	log_match_len =</div><div class='add'>+		snprintf(log_match, sizeof(log_match), log_template, opid);</div><div class='add'>+	if (log_match_len &gt; sizeof(log_match))</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	return audit_match_record(audit_fd, AUDIT_LANDLOCK_ACCESS, log_match,</div><div class='add'>+				  NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE(audit)</div><div class='add'>+{</div><div class='add'>+	struct audit_filter audit_filter;</div><div class='add'>+	int audit_fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(audit)</div><div class='add'>+{</div><div class='add'>+	disable_caps(_metadata);</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	self-&gt;audit_fd = audit_init_with_exe_filter(&amp;self-&gt;audit_filter);</div><div class='add'>+	EXPECT_LE(0, self-&gt;audit_fd);</div><div class='add'>+	clear_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN_PARENT(audit)</div><div class='add'>+{</div><div class='add'>+	EXPECT_EQ(0, audit_cleanup(-1, NULL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test PTRACE_TRACEME and PTRACE_ATTACH for parent and child. */</div><div class='add'>+TEST_F(audit, trace)</div><div class='add'>+{</div><div class='add'>+	pid_t child;</div><div class='add'>+	int status;</div><div class='add'>+	int pipe_child[2], pipe_parent[2];</div><div class='add'>+	int yama_ptrace_scope;</div><div class='add'>+	char buf_parent;</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	/* Makes sure there is no superfluous logged records. */</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(0, records.domain);</div><div class='add'>+</div><div class='add'>+	yama_ptrace_scope = get_yama_ptrace_scope();</div><div class='add'>+	ASSERT_LE(0, yama_ptrace_scope);</div><div class='add'>+</div><div class='add'>+	if (yama_ptrace_scope &gt; YAMA_SCOPE_DISABLED)</div><div class='add'>+		TH_LOG("Incomplete tests due to Yama restrictions (scope %d)",</div><div class='add'>+		       yama_ptrace_scope);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Removes all effective and permitted capabilities to not interfere</div><div class='add'>+	 * with cap_ptrace_access_check() in case of PTRACE_MODE_FSCREDS.</div><div class='add'>+	 */</div><div class='add'>+	drop_caps(_metadata);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(0, pipe2(pipe_child, O_CLOEXEC));</div><div class='add'>+	ASSERT_EQ(0, pipe2(pipe_parent, O_CLOEXEC));</div><div class='add'>+</div><div class='add'>+	child = fork();</div><div class='add'>+	ASSERT_LE(0, child);</div><div class='add'>+	if (child == 0) {</div><div class='add'>+		char buf_child;</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(0, close(pipe_parent[1]));</div><div class='add'>+		ASSERT_EQ(0, close(pipe_child[0]));</div><div class='add'>+</div><div class='add'>+		/* Waits for the parent to be in a domain, if any. */</div><div class='add'>+		ASSERT_EQ(1, read(pipe_parent[0], &amp;buf_child, 1));</div><div class='add'>+</div><div class='add'>+		/* Tests child PTRACE_TRACEME. */</div><div class='add'>+		EXPECT_EQ(-1, ptrace(PTRACE_TRACEME));</div><div class='add'>+		EXPECT_EQ(EPERM, errno);</div><div class='add'>+		/* We should see the child process. */</div><div class='add'>+		EXPECT_EQ(0, matches_log_ptrace(_metadata, self-&gt;audit_fd,</div><div class='add'>+						getpid()));</div><div class='add'>+</div><div class='add'>+		EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+		EXPECT_EQ(0, records.access);</div><div class='add'>+		/* Checks for a domain creation. */</div><div class='add'>+		EXPECT_EQ(1, records.domain);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Signals that the PTRACE_ATTACH test is done and the</div><div class='add'>+		 * PTRACE_TRACEME test is ongoing.</div><div class='add'>+		 */</div><div class='add'>+		ASSERT_EQ(1, write(pipe_child[1], ".", 1));</div><div class='add'>+</div><div class='add'>+		/* Waits for the parent PTRACE_ATTACH test. */</div><div class='add'>+		ASSERT_EQ(1, read(pipe_parent[0], &amp;buf_child, 1));</div><div class='add'>+		_exit(_metadata-&gt;exit_code);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(0, close(pipe_child[1]));</div><div class='add'>+	ASSERT_EQ(0, close(pipe_parent[0]));</div><div class='add'>+	create_domain(_metadata);</div><div class='add'>+</div><div class='add'>+	/* Signals that the parent is in a domain. */</div><div class='add'>+	ASSERT_EQ(1, write(pipe_parent[1], ".", 1));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Waits for the child to test PTRACE_ATTACH on the parent and start</div><div class='add'>+	 * testing PTRACE_TRACEME.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(1, read(pipe_child[0], &amp;buf_parent, 1));</div><div class='add'>+</div><div class='add'>+	/* The child should not be traced by the parent. */</div><div class='add'>+	EXPECT_EQ(-1, ptrace(PTRACE_DETACH, child, NULL, 0));</div><div class='add'>+	EXPECT_EQ(ESRCH, errno);</div><div class='add'>+</div><div class='add'>+	/* Tests PTRACE_ATTACH on the child. */</div><div class='add'>+	EXPECT_EQ(-1, ptrace(PTRACE_ATTACH, child, NULL, 0));</div><div class='add'>+	EXPECT_EQ(EPERM, errno);</div><div class='add'>+	EXPECT_EQ(0, matches_log_ptrace(_metadata, self-&gt;audit_fd, child));</div><div class='add'>+</div><div class='add'>+	/* Signals that the parent PTRACE_ATTACH test is done. */</div><div class='add'>+	ASSERT_EQ(1, write(pipe_parent[1], ".", 1));</div><div class='add'>+	ASSERT_EQ(child, waitpid(child, &amp;status, 0));</div><div class='add'>+	if (WIFSIGNALED(status) || !WIFEXITED(status) ||</div><div class='add'>+	    WEXITSTATUS(status) != EXIT_SUCCESS)</div><div class='add'>+		_metadata-&gt;exit_code = KSFT_FAIL;</div><div class='add'>+</div><div class='add'>+	/* Makes sure there is no superfluous logged records. */</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(0, records.domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/landlock/scoped_abstract_unix_test.c b/tools/testing/selftests/landlock/scoped_abstract_unix_test.c<br/>index a6b59d2ab1b4..6825082c079c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/scoped_abstract_unix_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/scoped_abstract_unix_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/scoped_abstract_unix_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/scoped_abstract_unix_test.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "audit.h"</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "scoped_common.h"</div><div class='ctx'> </div><div class='hunk'>@@ -267,6 +268,116 @@ TEST_F(scoped_domains, connect_to_child)</div><div class='ctx'> 		_metadata-&gt;exit_code = KSFT_FAIL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+FIXTURE(scoped_audit)</div><div class='add'>+{</div><div class='add'>+	struct service_fixture dgram_address;</div><div class='add'>+	struct audit_filter audit_filter;</div><div class='add'>+	int audit_fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(scoped_audit)</div><div class='add'>+{</div><div class='add'>+	disable_caps(_metadata);</div><div class='add'>+</div><div class='add'>+	memset(&amp;self-&gt;dgram_address, 0, sizeof(self-&gt;dgram_address));</div><div class='add'>+	set_unix_address(&amp;self-&gt;dgram_address, 1);</div><div class='add'>+</div><div class='add'>+	set_cap(_metadata, CAP_AUDIT_CONTROL);</div><div class='add'>+	self-&gt;audit_fd = audit_init_with_exe_filter(&amp;self-&gt;audit_filter);</div><div class='add'>+	EXPECT_LE(0, self-&gt;audit_fd);</div><div class='add'>+	drop_caps(_metadata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN_PARENT(scoped_audit)</div><div class='add'>+{</div><div class='add'>+	EXPECT_EQ(0, audit_cleanup(-1, NULL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* python -c 'print(b"\0selftests-landlock-abstract-unix-".hex().upper())' */</div><div class='add'>+#define ABSTRACT_SOCKET_PATH_PREFIX \</div><div class='add'>+	"0073656C6674657374732D6C616E646C6F636B2D61627374726163742D756E69782D"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Simpler version of scoped_domains.connect_to_child, but with audit tests.</div><div class='add'>+ */</div><div class='add'>+TEST_F(scoped_audit, connect_to_child)</div><div class='add'>+{</div><div class='add'>+	pid_t child;</div><div class='add'>+	int err_dgram, status;</div><div class='add'>+	int pipe_child[2], pipe_parent[2];</div><div class='add'>+	char buf;</div><div class='add'>+	int dgram_client;</div><div class='add'>+	struct audit_records records;</div><div class='add'>+</div><div class='add'>+	/* Makes sure there is no superfluous logged records. */</div><div class='add'>+	EXPECT_EQ(0, audit_count_records(self-&gt;audit_fd, &amp;records));</div><div class='add'>+	EXPECT_EQ(0, records.access);</div><div class='add'>+	EXPECT_EQ(0, records.domain);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(0, pipe2(pipe_child, O_CLOEXEC));</div><div class='add'>+	ASSERT_EQ(0, pipe2(pipe_parent, O_CLOEXEC));</div><div class='add'>+</div><div class='add'>+	child = fork();</div><div class='add'>+	ASSERT_LE(0, child);</div><div class='add'>+	if (child == 0) {</div><div class='add'>+		int dgram_server;</div><div class='add'>+</div><div class='add'>+		EXPECT_EQ(0, close(pipe_parent[1]));</div><div class='add'>+		EXPECT_EQ(0, close(pipe_child[0]));</div><div class='add'>+</div><div class='add'>+		/* Waits for the parent to be in a domain. */</div><div class='add'>+		ASSERT_EQ(1, read(pipe_parent[0], &amp;buf, 1));</div><div class='add'>+</div><div class='add'>+		dgram_server = socket(AF_UNIX, SOCK_DGRAM, 0);</div><div class='add'>+		ASSERT_LE(0, dgram_server);</div><div class='add'>+		ASSERT_EQ(0, bind(dgram_server, &amp;self-&gt;dgram_address.unix_addr,</div><div class='add'>+				  self-&gt;dgram_address.unix_addr_len));</div><div class='add'>+</div><div class='add'>+		/* Signals to the parent that child is listening. */</div><div class='add'>+		ASSERT_EQ(1, write(pipe_child[1], ".", 1));</div><div class='add'>+</div><div class='add'>+		/* Waits to connect. */</div><div class='add'>+		ASSERT_EQ(1, read(pipe_parent[0], &amp;buf, 1));</div><div class='add'>+		EXPECT_EQ(0, close(dgram_server));</div><div class='add'>+		_exit(_metadata-&gt;exit_code);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	EXPECT_EQ(0, close(pipe_child[1]));</div><div class='add'>+	EXPECT_EQ(0, close(pipe_parent[0]));</div><div class='add'>+</div><div class='add'>+	create_scoped_domain(_metadata, LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET);</div><div class='add'>+</div><div class='add'>+	/* Signals that the parent is in a domain, if any. */</div><div class='add'>+	ASSERT_EQ(1, write(pipe_parent[1], ".", 1));</div><div class='add'>+</div><div class='add'>+	dgram_client = socket(AF_UNIX, SOCK_DGRAM, 0);</div><div class='add'>+	ASSERT_LE(0, dgram_client);</div><div class='add'>+</div><div class='add'>+	/* Waits for the child to listen */</div><div class='add'>+	ASSERT_EQ(1, read(pipe_child[0], &amp;buf, 1));</div><div class='add'>+	err_dgram = connect(dgram_client, &amp;self-&gt;dgram_address.unix_addr,</div><div class='add'>+			    self-&gt;dgram_address.unix_addr_len);</div><div class='add'>+	EXPECT_EQ(-1, err_dgram);</div><div class='add'>+	EXPECT_EQ(EPERM, errno);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(</div><div class='add'>+		0,</div><div class='add'>+		audit_match_record(</div><div class='add'>+			self-&gt;audit_fd, AUDIT_LANDLOCK_ACCESS,</div><div class='add'>+			REGEX_LANDLOCK_PREFIX</div><div class='add'>+			" blockers=scope\\.abstract_unix_socket path=" ABSTRACT_SOCKET_PATH_PREFIX</div><div class='add'>+			"[0-9A-F]\\+$",</div><div class='add'>+			NULL));</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(1, write(pipe_parent[1], ".", 1));</div><div class='add'>+	EXPECT_EQ(0, close(dgram_client));</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(child, waitpid(child, &amp;status, 0));</div><div class='add'>+	if (WIFSIGNALED(status) || !WIFEXITED(status) ||</div><div class='add'>+	    WEXITSTATUS(status) != EXIT_SUCCESS)</div><div class='add'>+		_metadata-&gt;exit_code = KSFT_FAIL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> FIXTURE(scoped_vs_unscoped)</div><div class='ctx'> {</div><div class='ctx'> 	struct service_fixture parent_stream_address, parent_dgram_address,</div><div class='head'>diff --git a/tools/testing/selftests/landlock/scoped_signal_test.c b/tools/testing/selftests/landlock/scoped_signal_test.c<br/>index 475ee62a832d..d8bf33417619 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/scoped_signal_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/landlock/scoped_signal_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/scoped_signal_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/scoped_signal_test.c</a></div><div class='hunk'>@@ -249,47 +249,67 @@ TEST_F(scoped_domains, check_access_signal)</div><div class='ctx'> 		_metadata-&gt;exit_code = KSFT_FAIL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int thread_pipe[2];</div><div class='del'>-</div><div class='ctx'> enum thread_return {</div><div class='ctx'> 	THREAD_INVALID = 0,</div><div class='ctx'> 	THREAD_SUCCESS = 1,</div><div class='ctx'> 	THREAD_ERROR = 2,</div><div class='add'>+	THREAD_TEST_FAILED = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void *thread_func(void *arg)</div><div class='add'>+static void *thread_sync(void *arg)</div><div class='ctx'> {</div><div class='add'>+	const int pipe_read = *(int *)arg;</div><div class='ctx'> 	char buf;</div><div class='ctx'> </div><div class='del'>-	if (read(thread_pipe[0], &amp;buf, 1) != 1)</div><div class='add'>+	if (read(pipe_read, &amp;buf, 1) != 1)</div><div class='ctx'> 		return (void *)THREAD_ERROR;</div><div class='ctx'> </div><div class='ctx'> 	return (void *)THREAD_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-TEST(signal_scoping_threads)</div><div class='add'>+TEST(signal_scoping_thread_before)</div><div class='ctx'> {</div><div class='del'>-	pthread_t no_sandbox_thread, scoped_thread;</div><div class='add'>+	pthread_t no_sandbox_thread;</div><div class='ctx'> 	enum thread_return ret = THREAD_INVALID;</div><div class='add'>+	int thread_pipe[2];</div><div class='ctx'> </div><div class='ctx'> 	drop_caps(_metadata);</div><div class='ctx'> 	ASSERT_EQ(0, pipe2(thread_pipe, O_CLOEXEC));</div><div class='ctx'> </div><div class='del'>-	ASSERT_EQ(0,</div><div class='del'>-		  pthread_create(&amp;no_sandbox_thread, NULL, thread_func, NULL));</div><div class='add'>+	ASSERT_EQ(0, pthread_create(&amp;no_sandbox_thread, NULL, thread_sync,</div><div class='add'>+				    &amp;thread_pipe[0]));</div><div class='ctx'> </div><div class='del'>-	/* Restricts the domain after creating the first thread. */</div><div class='add'>+	/* Enforces restriction after creating the thread. */</div><div class='ctx'> 	create_scoped_domain(_metadata, LANDLOCK_SCOPE_SIGNAL);</div><div class='ctx'> </div><div class='del'>-	ASSERT_EQ(EPERM, pthread_kill(no_sandbox_thread, 0));</div><div class='del'>-	ASSERT_EQ(1, write(thread_pipe[1], ".", 1));</div><div class='del'>-</div><div class='del'>-	ASSERT_EQ(0, pthread_create(&amp;scoped_thread, NULL, thread_func, NULL));</div><div class='del'>-	ASSERT_EQ(0, pthread_kill(scoped_thread, 0));</div><div class='del'>-	ASSERT_EQ(1, write(thread_pipe[1], ".", 1));</div><div class='add'>+	EXPECT_EQ(0, pthread_kill(no_sandbox_thread, 0));</div><div class='add'>+	EXPECT_EQ(1, write(thread_pipe[1], ".", 1));</div><div class='ctx'> </div><div class='ctx'> 	EXPECT_EQ(0, pthread_join(no_sandbox_thread, (void **)&amp;ret));</div><div class='ctx'> 	EXPECT_EQ(THREAD_SUCCESS, ret);</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, close(thread_pipe[0]));</div><div class='add'>+	EXPECT_EQ(0, close(thread_pipe[1]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(signal_scoping_thread_after)</div><div class='add'>+{</div><div class='add'>+	pthread_t scoped_thread;</div><div class='add'>+	enum thread_return ret = THREAD_INVALID;</div><div class='add'>+	int thread_pipe[2];</div><div class='add'>+</div><div class='add'>+	drop_caps(_metadata);</div><div class='add'>+	ASSERT_EQ(0, pipe2(thread_pipe, O_CLOEXEC));</div><div class='add'>+</div><div class='add'>+	/* Enforces restriction before creating the thread. */</div><div class='add'>+	create_scoped_domain(_metadata, LANDLOCK_SCOPE_SIGNAL);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(0, pthread_create(&amp;scoped_thread, NULL, thread_sync,</div><div class='add'>+				    &amp;thread_pipe[0]));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, pthread_kill(scoped_thread, 0));</div><div class='add'>+	EXPECT_EQ(1, write(thread_pipe[1], ".", 1));</div><div class='add'>+</div><div class='ctx'> 	EXPECT_EQ(0, pthread_join(scoped_thread, (void **)&amp;ret));</div><div class='ctx'> 	EXPECT_EQ(THREAD_SUCCESS, ret);</div><div class='ctx'> </div><div class='hunk'>@@ -297,6 +317,64 @@ TEST(signal_scoping_threads)</div><div class='ctx'> 	EXPECT_EQ(0, close(thread_pipe[1]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct thread_setuid_args {</div><div class='add'>+	int pipe_read, new_uid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void *thread_setuid(void *ptr)</div><div class='add'>+{</div><div class='add'>+	const struct thread_setuid_args *arg = ptr;</div><div class='add'>+	char buf;</div><div class='add'>+</div><div class='add'>+	if (read(arg-&gt;pipe_read, &amp;buf, 1) != 1)</div><div class='add'>+		return (void *)THREAD_ERROR;</div><div class='add'>+</div><div class='add'>+	/* libc's setuid() should update all thread's credentials. */</div><div class='add'>+	if (getuid() != arg-&gt;new_uid)</div><div class='add'>+		return (void *)THREAD_TEST_FAILED;</div><div class='add'>+</div><div class='add'>+	return (void *)THREAD_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST(signal_scoping_thread_setuid)</div><div class='add'>+{</div><div class='add'>+	struct thread_setuid_args arg;</div><div class='add'>+	pthread_t no_sandbox_thread;</div><div class='add'>+	enum thread_return ret = THREAD_INVALID;</div><div class='add'>+	int pipe_parent[2];</div><div class='add'>+	int prev_uid;</div><div class='add'>+</div><div class='add'>+	disable_caps(_metadata);</div><div class='add'>+</div><div class='add'>+	/* This test does not need to be run as root. */</div><div class='add'>+	prev_uid = getuid();</div><div class='add'>+	arg.new_uid = prev_uid + 1;</div><div class='add'>+	EXPECT_LT(0, arg.new_uid);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(0, pipe2(pipe_parent, O_CLOEXEC));</div><div class='add'>+	arg.pipe_read = pipe_parent[0];</div><div class='add'>+</div><div class='add'>+	/* Capabilities must be set before creating a new thread. */</div><div class='add'>+	set_cap(_metadata, CAP_SETUID);</div><div class='add'>+	ASSERT_EQ(0, pthread_create(&amp;no_sandbox_thread, NULL, thread_setuid,</div><div class='add'>+				    &amp;arg));</div><div class='add'>+</div><div class='add'>+	/* Enforces restriction after creating the thread. */</div><div class='add'>+	create_scoped_domain(_metadata, LANDLOCK_SCOPE_SIGNAL);</div><div class='add'>+</div><div class='add'>+	EXPECT_NE(arg.new_uid, getuid());</div><div class='add'>+	EXPECT_EQ(0, setuid(arg.new_uid));</div><div class='add'>+	EXPECT_EQ(arg.new_uid, getuid());</div><div class='add'>+	EXPECT_EQ(1, write(pipe_parent[1], ".", 1));</div><div class='add'>+</div><div class='add'>+	EXPECT_EQ(0, pthread_join(no_sandbox_thread, (void **)&amp;ret));</div><div class='add'>+	EXPECT_EQ(THREAD_SUCCESS, ret);</div><div class='add'>+</div><div class='add'>+	clear_cap(_metadata, CAP_SETUID);</div><div class='add'>+	EXPECT_EQ(0, close(pipe_parent[0]));</div><div class='add'>+	EXPECT_EQ(0, close(pipe_parent[1]));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const short backlog = 10;</div><div class='ctx'> </div><div class='ctx'> static volatile sig_atomic_t signal_received;</div><div class='head'>diff --git a/tools/testing/selftests/landlock/wait-pipe-sandbox.c b/tools/testing/selftests/landlock/wait-pipe-sandbox.c<br/>new file mode 100644<br/>index 000000000000..87dbc9164430<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/landlock/wait-pipe-sandbox.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/landlock/wait-pipe-sandbox.c</a></div><div class='hunk'>@@ -0,0 +1,131 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Write in a pipe, wait, sandbox itself, test sandboxing, and wait again.</div><div class='add'>+ *</div><div class='add'>+ * Used by audit_exec.flags from audit_test.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright © 2024-2025 Microsoft Corporation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;linux/landlock.h&gt;</div><div class='add'>+#include &lt;linux/prctl.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;sys/prctl.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include "wrappers.h"</div><div class='add'>+</div><div class='add'>+static int sync_with(int pipe_child, int pipe_parent)</div><div class='add'>+{</div><div class='add'>+	char buf;</div><div class='add'>+</div><div class='add'>+	/* Signals that we are waiting. */</div><div class='add'>+	if (write(pipe_child, ".", 1) != 1) {</div><div class='add'>+		perror("Failed to write to first argument");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Waits for the parent do its test. */</div><div class='add'>+	if (read(pipe_parent, &amp;buf, 1) != 1) {</div><div class='add'>+		perror("Failed to write to the second argument");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	const struct landlock_ruleset_attr layer2 = {</div><div class='add'>+		.handled_access_fs = LANDLOCK_ACCESS_FS_READ_DIR,</div><div class='add'>+	};</div><div class='add'>+	const struct landlock_ruleset_attr layer3 = {</div><div class='add'>+		.scoped = LANDLOCK_SCOPE_SIGNAL,</div><div class='add'>+	};</div><div class='add'>+	int err, pipe_child, pipe_parent, ruleset_fd;</div><div class='add'>+</div><div class='add'>+	/* The first argument must be the file descriptor number of a pipe. */</div><div class='add'>+	if (argc != 3) {</div><div class='add'>+		fprintf(stderr, "Wrong number of arguments (not two)\n");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pipe_child = atoi(argv[1]);</div><div class='add'>+	pipe_parent = atoi(argv[2]);</div><div class='add'>+	/* PR_SET_NO_NEW_PRIVS already set by parent. */</div><div class='add'>+</div><div class='add'>+	/* First step to test parent's layer1. */</div><div class='add'>+	err = sync_with(pipe_child, pipe_parent);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Tries to send a signal, denied by layer1. */</div><div class='add'>+	if (!kill(getppid(), 0)) {</div><div class='add'>+		fprintf(stderr, "Successfully sent a signal to the parent");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Second step to test parent's layer1 and our layer2. */</div><div class='add'>+	err = sync_with(pipe_child, pipe_parent);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ruleset_fd = landlock_create_ruleset(&amp;layer2, sizeof(layer2), 0);</div><div class='add'>+	if (ruleset_fd &lt; 0) {</div><div class='add'>+		perror("Failed to create the layer2 ruleset");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (landlock_restrict_self(ruleset_fd, 0)) {</div><div class='add'>+		perror("Failed to restrict self");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	close(ruleset_fd);</div><div class='add'>+</div><div class='add'>+	/* Tries to send a signal, denied by layer1. */</div><div class='add'>+	if (!kill(getppid(), 0)) {</div><div class='add'>+		fprintf(stderr, "Successfully sent a signal to the parent");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Tries to open ., denied by layer2. */</div><div class='add'>+	if (open("/", O_RDONLY | O_DIRECTORY | O_CLOEXEC) &gt;= 0) {</div><div class='add'>+		fprintf(stderr, "Successfully opened /");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Third step to test our layer2 and layer3. */</div><div class='add'>+	err = sync_with(pipe_child, pipe_parent);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ruleset_fd = landlock_create_ruleset(&amp;layer3, sizeof(layer3), 0);</div><div class='add'>+	if (ruleset_fd &lt; 0) {</div><div class='add'>+		perror("Failed to create the layer3 ruleset");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (landlock_restrict_self(ruleset_fd, 0)) {</div><div class='add'>+		perror("Failed to restrict self");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	close(ruleset_fd);</div><div class='add'>+</div><div class='add'>+	/* Tries to open ., denied by layer2. */</div><div class='add'>+	if (open("/", O_RDONLY | O_DIRECTORY | O_CLOEXEC) &gt;= 0) {</div><div class='add'>+		fprintf(stderr, "Successfully opened /");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Tries to send a signal, denied by layer3. */</div><div class='add'>+	if (!kill(getppid(), 0)) {</div><div class='add'>+		fprintf(stderr, "Successfully sent a signal to the parent");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk<br/>index d6edcfcb5be8..f02cc8a2e4ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lib.mk?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib.mk</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lib.mk?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/lib.mk</a></div><div class='hunk'>@@ -199,6 +199,9 @@ clean: $(if $(TEST_GEN_MODS_DIR),clean_mods_dir)</div><div class='ctx'> # Build with _GNU_SOURCE by default</div><div class='ctx'> CFLAGS += -D_GNU_SOURCE=</div><div class='ctx'> </div><div class='add'>+# Additional include paths needed by kselftest.h and local headers</div><div class='add'>+CFLAGS += -I${top_srcdir}/tools/testing/selftests</div><div class='add'>+</div><div class='ctx'> # Enables to extend CFLAGS and LDFLAGS from command line, e.g.</div><div class='ctx'> # make USERCFLAGS=-Werror USERLDFLAGS=-static</div><div class='ctx'> CFLAGS += $(USERCFLAGS)</div><div class='hunk'>@@ -228,4 +231,10 @@ $(OUTPUT)/%:%.S</div><div class='ctx'> 	$(LINK.S) $^ $(LDLIBS) -o $@</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-.PHONY: run_tests all clean install emit_tests gen_mods_dir clean_mods_dir</div><div class='add'>+# Extract the expected header directory</div><div class='add'>+khdr_output := $(patsubst %/usr/include,%,$(filter %/usr/include,$(KHDR_INCLUDES)))</div><div class='add'>+</div><div class='add'>+headers:</div><div class='add'>+	$(Q)$(MAKE) -f $(top_srcdir)/Makefile -C $(khdr_output) headers</div><div class='add'>+</div><div class='add'>+.PHONY: run_tests all clean install emit_tests gen_mods_dir clean_mods_dir headers</div><div class='head'>diff --git a/tools/testing/selftests/lib/Makefile b/tools/testing/selftests/lib/Makefile<br/>index c52fe3ad8e98..f876bf4744e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lib/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lib/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/lib/Makefile</a></div><div class='hunk'>@@ -4,5 +4,5 @@</div><div class='ctx'> # No binaries, but make sure arg-less "make" doesn't trigger "run_tests"</div><div class='ctx'> all:</div><div class='ctx'> </div><div class='del'>-TEST_PROGS := printf.sh bitmap.sh prime_numbers.sh scanf.sh</div><div class='add'>+TEST_PROGS := bitmap.sh</div><div class='ctx'> include ../lib.mk</div><div class='head'>diff --git a/tools/testing/selftests/lib/config b/tools/testing/selftests/lib/config<br/>index dc15aba8d0a3..377b3699ff31 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lib/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib/config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lib/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/lib/config</a></div><div class='hunk'>@@ -1,5 +1,3 @@</div><div class='del'>-CONFIG_TEST_PRINTF=m</div><div class='del'>-CONFIG_TEST_SCANF=m</div><div class='ctx'> CONFIG_TEST_BITMAP=m</div><div class='ctx'> CONFIG_PRIME_NUMBERS=m</div><div class='ctx'> CONFIG_TEST_BITOPS=m</div><div class='head'>diff --git a/tools/testing/selftests/lib/prime_numbers.sh b/tools/testing/selftests/lib/prime_numbers.sh<br/>deleted file mode 100755<br/>index 370b79a9cb2e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lib/prime_numbers.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib/prime_numbers.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-#!/bin/sh</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-# Checks fast/slow prime_number generation for inconsistencies</div><div class='del'>-$(dirname $0)/../kselftest/module.sh "prime numbers" prime_numbers selftest=65536</div><div class='head'>diff --git a/tools/testing/selftests/lib/printf.sh b/tools/testing/selftests/lib/printf.sh<br/>deleted file mode 100755<br/>index 05f4544e87f9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lib/printf.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib/printf.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-#!/bin/sh</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-# Tests the printf infrastructure using test_printf kernel module.</div><div class='del'>-$(dirname $0)/../kselftest/module.sh "printf" test_printf</div><div class='head'>diff --git a/tools/testing/selftests/lib/scanf.sh b/tools/testing/selftests/lib/scanf.sh<br/>deleted file mode 100755<br/>index b59b8ba561c3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lib/scanf.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lib/scanf.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-#!/bin/sh</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-# Tests the scanf infrastructure using test_scanf kernel module.</div><div class='del'>-$(dirname $0)/../kselftest/module.sh "scanf" test_scanf</div><div class='head'>diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh<br/>index 15601402dee6..8ec0cb64ad94 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/livepatch/functions.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/livepatch/functions.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/livepatch/functions.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/livepatch/functions.sh</a></div><div class='hunk'>@@ -10,6 +10,11 @@ SYSFS_KERNEL_DIR="/sys/kernel"</div><div class='ctx'> SYSFS_KLP_DIR="$SYSFS_KERNEL_DIR/livepatch"</div><div class='ctx'> SYSFS_DEBUG_DIR="$SYSFS_KERNEL_DIR/debug"</div><div class='ctx'> SYSFS_KPROBES_DIR="$SYSFS_DEBUG_DIR/kprobes"</div><div class='add'>+if [[ -e /sys/kernel/tracing/trace ]]; then</div><div class='add'>+	SYSFS_TRACING_DIR="$SYSFS_KERNEL_DIR/tracing"</div><div class='add'>+else</div><div class='add'>+	SYSFS_TRACING_DIR="$SYSFS_DEBUG_DIR/tracing"</div><div class='add'>+fi</div><div class='ctx'> </div><div class='ctx'> # Kselftest framework requirement - SKIP code is 4</div><div class='ctx'> ksft_skip=4</div><div class='hunk'>@@ -62,6 +67,9 @@ function push_config() {</div><div class='ctx'> 			awk -F'[: ]' '{print "file " $1 " line " $2 " " $4}')</div><div class='ctx'> 	FTRACE_ENABLED=$(sysctl --values kernel.ftrace_enabled)</div><div class='ctx'> 	KPROBE_ENABLED=$(cat "$SYSFS_KPROBES_DIR/enabled")</div><div class='add'>+	TRACING_ON=$(cat "$SYSFS_TRACING_DIR/tracing_on")</div><div class='add'>+	CURRENT_TRACER=$(cat "$SYSFS_TRACING_DIR/current_tracer")</div><div class='add'>+	FTRACE_FILTER=$(cat "$SYSFS_TRACING_DIR/set_ftrace_filter")</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> function pop_config() {</div><div class='hunk'>@@ -74,6 +82,17 @@ function pop_config() {</div><div class='ctx'> 	if [[ -n "$KPROBE_ENABLED" ]]; then</div><div class='ctx'> 		echo "$KPROBE_ENABLED" &gt; "$SYSFS_KPROBES_DIR/enabled"</div><div class='ctx'> 	fi</div><div class='add'>+	if [[ -n "$TRACING_ON" ]]; then</div><div class='add'>+		echo "$TRACING_ON" &gt; "$SYSFS_TRACING_DIR/tracing_on"</div><div class='add'>+	fi</div><div class='add'>+	if [[ -n "$CURRENT_TRACER" ]]; then</div><div class='add'>+		echo "$CURRENT_TRACER" &gt; "$SYSFS_TRACING_DIR/current_tracer"</div><div class='add'>+	fi</div><div class='add'>+	if [[ -n "$FTRACE_FILTER" ]]; then</div><div class='add'>+		echo "$FTRACE_FILTER" \</div><div class='add'>+			| sed -e "/#### all functions enabled ####/d" \</div><div class='add'>+			&gt; "$SYSFS_TRACING_DIR/set_ftrace_filter"</div><div class='add'>+	fi</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> function set_dynamic_debug() {</div><div class='hunk'>@@ -352,3 +371,37 @@ function check_sysfs_value() {</div><div class='ctx'> 		die "Unexpected value in $path: $expected_value vs. $value"</div><div class='ctx'> 	fi</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+# cleanup_tracing() - stop and clean up function tracing</div><div class='add'>+function cleanup_tracing() {</div><div class='add'>+	echo 0 &gt; "$SYSFS_TRACING_DIR/tracing_on"</div><div class='add'>+	echo "" &gt; "$SYSFS_TRACING_DIR/set_ftrace_filter"</div><div class='add'>+	echo "nop" &gt; "$SYSFS_TRACING_DIR/current_tracer"</div><div class='add'>+	echo "" &gt; "$SYSFS_TRACING_DIR/trace"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# trace_function(function) - start tracing of a function</div><div class='add'>+#	function - to be traced function</div><div class='add'>+function trace_function() {</div><div class='add'>+	local function="$1"; shift</div><div class='add'>+</div><div class='add'>+	cleanup_tracing</div><div class='add'>+</div><div class='add'>+	echo "function" &gt; "$SYSFS_TRACING_DIR/current_tracer"</div><div class='add'>+	echo "$function" &gt; "$SYSFS_TRACING_DIR/set_ftrace_filter"</div><div class='add'>+	echo 1 &gt; "$SYSFS_TRACING_DIR/tracing_on"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# check_traced_functions(functions...) - check whether each function appeared in the trace log</div><div class='add'>+#	functions - list of functions to be checked</div><div class='add'>+function check_traced_functions() {</div><div class='add'>+	local function</div><div class='add'>+</div><div class='add'>+	for function in "$@"; do</div><div class='add'>+		if ! grep -Fwq "$function" "$SYSFS_TRACING_DIR/trace" ; then</div><div class='add'>+			die "Function ($function) did not appear in the trace"</div><div class='add'>+		fi</div><div class='add'>+	done</div><div class='add'>+</div><div class='add'>+	cleanup_tracing</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/livepatch/test-ftrace.sh b/tools/testing/selftests/livepatch/test-ftrace.sh<br/>index fe14f248913a..094176f1a46a 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/livepatch/test-ftrace.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/livepatch/test-ftrace.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/livepatch/test-ftrace.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/livepatch/test-ftrace.sh</a></div><div class='hunk'>@@ -61,4 +61,38 @@ livepatch: '$MOD_LIVEPATCH': unpatching complete</div><div class='ctx'> % rmmod $MOD_LIVEPATCH"</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+# - verify livepatch can load</div><div class='add'>+# - check if traces have a patched function</div><div class='add'>+# - reset trace and unload livepatch</div><div class='add'>+</div><div class='add'>+start_test "trace livepatched function and check that the live patch remains in effect"</div><div class='add'>+</div><div class='add'>+FUNCTION_NAME="livepatch_cmdline_proc_show"</div><div class='add'>+</div><div class='add'>+load_lp $MOD_LIVEPATCH</div><div class='add'>+trace_function "$FUNCTION_NAME"</div><div class='add'>+</div><div class='add'>+if [[ "$(cat /proc/cmdline)" == "$MOD_LIVEPATCH: this has been live patched" ]] ; then</div><div class='add'>+	log "livepatch: ok"</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+check_traced_functions "$FUNCTION_NAME"</div><div class='add'>+</div><div class='add'>+disable_lp $MOD_LIVEPATCH</div><div class='add'>+unload_lp $MOD_LIVEPATCH</div><div class='add'>+</div><div class='add'>+check_result "% insmod test_modules/$MOD_LIVEPATCH.ko</div><div class='add'>+livepatch: enabling patch '$MOD_LIVEPATCH'</div><div class='add'>+livepatch: '$MOD_LIVEPATCH': initializing patching transition</div><div class='add'>+livepatch: '$MOD_LIVEPATCH': starting patching transition</div><div class='add'>+livepatch: '$MOD_LIVEPATCH': completing patching transition</div><div class='add'>+livepatch: '$MOD_LIVEPATCH': patching complete</div><div class='add'>+livepatch: ok</div><div class='add'>+% echo 0 &gt; $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled</div><div class='add'>+livepatch: '$MOD_LIVEPATCH': initializing unpatching transition</div><div class='add'>+livepatch: '$MOD_LIVEPATCH': starting unpatching transition</div><div class='add'>+livepatch: '$MOD_LIVEPATCH': completing unpatching transition</div><div class='add'>+livepatch: '$MOD_LIVEPATCH': unpatching complete</div><div class='add'>+% rmmod $MOD_LIVEPATCH"</div><div class='add'>+</div><div class='ctx'> exit 0</div><div class='head'>diff --git a/tools/testing/selftests/livepatch/test-kprobe.sh b/tools/testing/selftests/livepatch/test-kprobe.sh<br/>index 115065156016..b67dfad03d97 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/livepatch/test-kprobe.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/livepatch/test-kprobe.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/livepatch/test-kprobe.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/livepatch/test-kprobe.sh</a></div><div class='hunk'>@@ -5,6 +5,8 @@</div><div class='ctx'> </div><div class='ctx'> . $(dirname $0)/functions.sh</div><div class='ctx'> </div><div class='add'>+grep -q kprobe_ftrace_ops /proc/kallsyms || skip "test-kprobe requires CONFIG_KPROBES_ON_FTRACE"</div><div class='add'>+</div><div class='ctx'> MOD_LIVEPATCH=test_klp_livepatch</div><div class='ctx'> MOD_KPROBE=test_klp_kprobe</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/liveupdate/.gitignore b/tools/testing/selftests/liveupdate/.gitignore<br/>new file mode 100644<br/>index 000000000000..661827083ab6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/liveupdate/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/liveupdate/.gitignore</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+*</div><div class='add'>+!/**/</div><div class='add'>+!*.c</div><div class='add'>+!*.h</div><div class='add'>+!*.sh</div><div class='add'>+!.gitignore</div><div class='add'>+!config</div><div class='add'>+!Makefile</div><div class='head'>diff --git a/tools/testing/selftests/liveupdate/Makefile b/tools/testing/selftests/liveupdate/Makefile<br/>new file mode 100644<br/>index 000000000000..080754787ede<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/liveupdate/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/liveupdate/Makefile</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+LIB_C += luo_test_utils.c</div><div class='add'>+</div><div class='add'>+TEST_GEN_PROGS += liveupdate</div><div class='add'>+</div><div class='add'>+TEST_GEN_PROGS_EXTENDED += luo_kexec_simple</div><div class='add'>+TEST_GEN_PROGS_EXTENDED += luo_multi_session</div><div class='add'>+</div><div class='add'>+TEST_FILES += do_kexec.sh</div><div class='add'>+</div><div class='add'>+include ../lib.mk</div><div class='add'>+</div><div class='add'>+CFLAGS += $(KHDR_INCLUDES)</div><div class='add'>+CFLAGS += -Wall -O2 -Wno-unused-function</div><div class='add'>+CFLAGS += -MD</div><div class='add'>+</div><div class='add'>+LIB_O := $(patsubst %.c, $(OUTPUT)/%.o, $(LIB_C))</div><div class='add'>+TEST_O := $(patsubst %, %.o, $(TEST_GEN_PROGS))</div><div class='add'>+TEST_O += $(patsubst %, %.o, $(TEST_GEN_PROGS_EXTENDED))</div><div class='add'>+</div><div class='add'>+TEST_DEP_FILES := $(patsubst %.o, %.d, $(LIB_O))</div><div class='add'>+TEST_DEP_FILES += $(patsubst %.o, %.d, $(TEST_O))</div><div class='add'>+-include $(TEST_DEP_FILES)</div><div class='add'>+</div><div class='add'>+$(LIB_O): $(OUTPUT)/%.o: %.c</div><div class='add'>+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $&lt; -o $@</div><div class='add'>+</div><div class='add'>+$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(OUTPUT)/%: %.o $(LIB_O)</div><div class='add'>+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $&lt; $(LIB_O) $(LDLIBS) -o $@</div><div class='add'>+</div><div class='add'>+EXTRA_CLEAN += $(LIB_O)</div><div class='add'>+EXTRA_CLEAN += $(TEST_O)</div><div class='add'>+EXTRA_CLEAN += $(TEST_DEP_FILES)</div><div class='head'>diff --git a/tools/testing/selftests/liveupdate/config b/tools/testing/selftests/liveupdate/config<br/>new file mode 100644<br/>index 000000000000..91d03f9a6a39<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/liveupdate/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/liveupdate/config</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_KEXEC_FILE=y</div><div class='add'>+CONFIG_KEXEC_HANDOVER=y</div><div class='add'>+CONFIG_KEXEC_HANDOVER_ENABLE_DEFAULT=y</div><div class='add'>+CONFIG_KEXEC_HANDOVER_DEBUGFS=y</div><div class='add'>+CONFIG_KEXEC_HANDOVER_DEBUG=y</div><div class='add'>+CONFIG_LIVEUPDATE=y</div><div class='add'>+CONFIG_LIVEUPDATE_TEST=y</div><div class='add'>+CONFIG_MEMFD_CREATE=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='head'>diff --git a/tools/testing/selftests/liveupdate/do_kexec.sh b/tools/testing/selftests/liveupdate/do_kexec.sh<br/>new file mode 100755<br/>index 000000000000..3c7c6cafbef8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/liveupdate/do_kexec.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/liveupdate/do_kexec.sh</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+set -e</div><div class='add'>+</div><div class='add'>+# Use $KERNEL and $INITRAMFS to pass custom Kernel and optional initramfs</div><div class='add'>+</div><div class='add'>+KERNEL="${KERNEL:-/boot/bzImage}"</div><div class='add'>+set -- -l -s --reuse-cmdline "$KERNEL"</div><div class='add'>+</div><div class='add'>+INITRAMFS="${INITRAMFS:-/boot/initramfs}"</div><div class='add'>+if [ -f "$INITRAMFS" ]; then</div><div class='add'>+    set -- "$@" --initrd="$INITRAMFS"</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+kexec "$@"</div><div class='add'>+kexec -e</div><div class='head'>diff --git a/tools/testing/selftests/liveupdate/liveupdate.c b/tools/testing/selftests/liveupdate/liveupdate.c<br/>new file mode 100644<br/>index 000000000000..c2878e3d5ef9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/liveupdate/liveupdate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/liveupdate/liveupdate.c</a></div><div class='hunk'>@@ -0,0 +1,348 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025, Google LLC.</div><div class='add'>+ * Pasha Tatashin &lt;pasha.tatashin@soleen.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Selftests for the Live Update Orchestrator.</div><div class='add'>+ * This test suite verifies the functionality and behavior of the</div><div class='add'>+ * /dev/liveupdate character device and its session management capabilities.</div><div class='add'>+ *</div><div class='add'>+ * Tests include:</div><div class='add'>+ * - Device access: basic open/close, and enforcement of exclusive access.</div><div class='add'>+ * - Session management: creation of unique sessions, and duplicate name detection.</div><div class='add'>+ * - Resource preservation: successfully preserving individual and multiple memfds,</div><div class='add'>+ *   verifying contents remain accessible.</div><div class='add'>+ * - Complex multi-session scenarios involving mixed empty and populated files.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/liveupdate.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../kselftest.h"</div><div class='add'>+#include "../kselftest_harness.h"</div><div class='add'>+</div><div class='add'>+#define LIVEUPDATE_DEV "/dev/liveupdate"</div><div class='add'>+</div><div class='add'>+FIXTURE(liveupdate_device) {</div><div class='add'>+	int fd1;</div><div class='add'>+	int fd2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(liveupdate_device)</div><div class='add'>+{</div><div class='add'>+	self-&gt;fd1 = -1;</div><div class='add'>+	self-&gt;fd2 = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN(liveupdate_device)</div><div class='add'>+{</div><div class='add'>+	if (self-&gt;fd1 &gt;= 0)</div><div class='add'>+		close(self-&gt;fd1);</div><div class='add'>+	if (self-&gt;fd2 &gt;= 0)</div><div class='add'>+		close(self-&gt;fd2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test Case: Basic Open and Close</div><div class='add'>+ *</div><div class='add'>+ * Verifies that the /dev/liveupdate device can be opened and subsequently</div><div class='add'>+ * closed without errors. Skips if the device does not exist.</div><div class='add'>+ */</div><div class='add'>+TEST_F(liveupdate_device, basic_open_close)</div><div class='add'>+{</div><div class='add'>+	self-&gt;fd1 = open(LIVEUPDATE_DEV, O_RDWR);</div><div class='add'>+</div><div class='add'>+	if (self-&gt;fd1 &lt; 0 &amp;&amp; errno == ENOENT)</div><div class='add'>+		SKIP(return, "%s does not exist.", LIVEUPDATE_DEV);</div><div class='add'>+</div><div class='add'>+	ASSERT_GE(self-&gt;fd1, 0);</div><div class='add'>+	ASSERT_EQ(close(self-&gt;fd1), 0);</div><div class='add'>+	self-&gt;fd1 = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test Case: Exclusive Open Enforcement</div><div class='add'>+ *</div><div class='add'>+ * Verifies that the /dev/liveupdate device can only be opened by one process</div><div class='add'>+ * at a time. It checks that a second attempt to open the device fails with</div><div class='add'>+ * the EBUSY error code.</div><div class='add'>+ */</div><div class='add'>+TEST_F(liveupdate_device, exclusive_open)</div><div class='add'>+{</div><div class='add'>+	self-&gt;fd1 = open(LIVEUPDATE_DEV, O_RDWR);</div><div class='add'>+</div><div class='add'>+	if (self-&gt;fd1 &lt; 0 &amp;&amp; errno == ENOENT)</div><div class='add'>+		SKIP(return, "%s does not exist.", LIVEUPDATE_DEV);</div><div class='add'>+</div><div class='add'>+	ASSERT_GE(self-&gt;fd1, 0);</div><div class='add'>+	self-&gt;fd2 = open(LIVEUPDATE_DEV, O_RDWR);</div><div class='add'>+	EXPECT_LT(self-&gt;fd2, 0);</div><div class='add'>+	EXPECT_EQ(errno, EBUSY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Helper function to create a LUO session via ioctl. */</div><div class='add'>+static int create_session(int lu_fd, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct liveupdate_ioctl_create_session args = {};</div><div class='add'>+</div><div class='add'>+	args.size = sizeof(args);</div><div class='add'>+	strncpy((char *)args.name, name, sizeof(args.name) - 1);</div><div class='add'>+</div><div class='add'>+	if (ioctl(lu_fd, LIVEUPDATE_IOCTL_CREATE_SESSION, &amp;args))</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	return args.fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test Case: Create Duplicate Session</div><div class='add'>+ *</div><div class='add'>+ * Verifies that attempting to create two sessions with the same name fails</div><div class='add'>+ * on the second attempt with EEXIST.</div><div class='add'>+ */</div><div class='add'>+TEST_F(liveupdate_device, create_duplicate_session)</div><div class='add'>+{</div><div class='add'>+	int session_fd1, session_fd2;</div><div class='add'>+</div><div class='add'>+	self-&gt;fd1 = open(LIVEUPDATE_DEV, O_RDWR);</div><div class='add'>+	if (self-&gt;fd1 &lt; 0 &amp;&amp; errno == ENOENT)</div><div class='add'>+		SKIP(return, "%s does not exist", LIVEUPDATE_DEV);</div><div class='add'>+</div><div class='add'>+	ASSERT_GE(self-&gt;fd1, 0);</div><div class='add'>+</div><div class='add'>+	session_fd1 = create_session(self-&gt;fd1, "duplicate-session-test");</div><div class='add'>+	ASSERT_GE(session_fd1, 0);</div><div class='add'>+</div><div class='add'>+	session_fd2 = create_session(self-&gt;fd1, "duplicate-session-test");</div><div class='add'>+	EXPECT_LT(session_fd2, 0);</div><div class='add'>+	EXPECT_EQ(-session_fd2, EEXIST);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(session_fd1), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test Case: Create Distinct Sessions</div><div class='add'>+ *</div><div class='add'>+ * Verifies that creating two sessions with different names succeeds.</div><div class='add'>+ */</div><div class='add'>+TEST_F(liveupdate_device, create_distinct_sessions)</div><div class='add'>+{</div><div class='add'>+	int session_fd1, session_fd2;</div><div class='add'>+</div><div class='add'>+	self-&gt;fd1 = open(LIVEUPDATE_DEV, O_RDWR);</div><div class='add'>+	if (self-&gt;fd1 &lt; 0 &amp;&amp; errno == ENOENT)</div><div class='add'>+		SKIP(return, "%s does not exist", LIVEUPDATE_DEV);</div><div class='add'>+</div><div class='add'>+	ASSERT_GE(self-&gt;fd1, 0);</div><div class='add'>+</div><div class='add'>+	session_fd1 = create_session(self-&gt;fd1, "distinct-session-1");</div><div class='add'>+	ASSERT_GE(session_fd1, 0);</div><div class='add'>+</div><div class='add'>+	session_fd2 = create_session(self-&gt;fd1, "distinct-session-2");</div><div class='add'>+	ASSERT_GE(session_fd2, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(session_fd1), 0);</div><div class='add'>+	ASSERT_EQ(close(session_fd2), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int preserve_fd(int session_fd, int fd_to_preserve, __u64 token)</div><div class='add'>+{</div><div class='add'>+	struct liveupdate_session_preserve_fd args = {};</div><div class='add'>+</div><div class='add'>+	args.size = sizeof(args);</div><div class='add'>+	args.fd = fd_to_preserve;</div><div class='add'>+	args.token = token;</div><div class='add'>+</div><div class='add'>+	if (ioctl(session_fd, LIVEUPDATE_SESSION_PRESERVE_FD, &amp;args))</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test Case: Preserve MemFD</div><div class='add'>+ *</div><div class='add'>+ * Verifies that a valid memfd can be successfully preserved in a session and</div><div class='add'>+ * that its contents remain intact after the preservation call.</div><div class='add'>+ */</div><div class='add'>+TEST_F(liveupdate_device, preserve_memfd)</div><div class='add'>+{</div><div class='add'>+	const char *test_str = "hello liveupdate";</div><div class='add'>+	char read_buf[64] = {};</div><div class='add'>+	int session_fd, mem_fd;</div><div class='add'>+</div><div class='add'>+	self-&gt;fd1 = open(LIVEUPDATE_DEV, O_RDWR);</div><div class='add'>+	if (self-&gt;fd1 &lt; 0 &amp;&amp; errno == ENOENT)</div><div class='add'>+		SKIP(return, "%s does not exist", LIVEUPDATE_DEV);</div><div class='add'>+	ASSERT_GE(self-&gt;fd1, 0);</div><div class='add'>+</div><div class='add'>+	session_fd = create_session(self-&gt;fd1, "preserve-memfd-test");</div><div class='add'>+	ASSERT_GE(session_fd, 0);</div><div class='add'>+</div><div class='add'>+	mem_fd = memfd_create("test-memfd", 0);</div><div class='add'>+	ASSERT_GE(mem_fd, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(write(mem_fd, test_str, strlen(test_str)), strlen(test_str));</div><div class='add'>+	ASSERT_EQ(preserve_fd(session_fd, mem_fd, 0x1234), 0);</div><div class='add'>+	ASSERT_EQ(close(session_fd), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(lseek(mem_fd, 0, SEEK_SET), 0);</div><div class='add'>+	ASSERT_EQ(read(mem_fd, read_buf, sizeof(read_buf)), strlen(test_str));</div><div class='add'>+	ASSERT_STREQ(read_buf, test_str);</div><div class='add'>+	ASSERT_EQ(close(mem_fd), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test Case: Preserve Multiple MemFDs</div><div class='add'>+ *</div><div class='add'>+ * Verifies that multiple memfds can be preserved in a single session,</div><div class='add'>+ * each with a unique token, and that their contents remain distinct and</div><div class='add'>+ * correct after preservation.</div><div class='add'>+ */</div><div class='add'>+TEST_F(liveupdate_device, preserve_multiple_memfds)</div><div class='add'>+{</div><div class='add'>+	const char *test_str1 = "data for memfd one";</div><div class='add'>+	const char *test_str2 = "data for memfd two";</div><div class='add'>+	char read_buf[64] = {};</div><div class='add'>+	int session_fd, mem_fd1, mem_fd2;</div><div class='add'>+</div><div class='add'>+	self-&gt;fd1 = open(LIVEUPDATE_DEV, O_RDWR);</div><div class='add'>+	if (self-&gt;fd1 &lt; 0 &amp;&amp; errno == ENOENT)</div><div class='add'>+		SKIP(return, "%s does not exist", LIVEUPDATE_DEV);</div><div class='add'>+	ASSERT_GE(self-&gt;fd1, 0);</div><div class='add'>+</div><div class='add'>+	session_fd = create_session(self-&gt;fd1, "preserve-multi-memfd-test");</div><div class='add'>+	ASSERT_GE(session_fd, 0);</div><div class='add'>+</div><div class='add'>+	mem_fd1 = memfd_create("test-memfd-1", 0);</div><div class='add'>+	ASSERT_GE(mem_fd1, 0);</div><div class='add'>+	mem_fd2 = memfd_create("test-memfd-2", 0);</div><div class='add'>+	ASSERT_GE(mem_fd2, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(write(mem_fd1, test_str1, strlen(test_str1)), strlen(test_str1));</div><div class='add'>+	ASSERT_EQ(write(mem_fd2, test_str2, strlen(test_str2)), strlen(test_str2));</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(preserve_fd(session_fd, mem_fd1, 0xAAAA), 0);</div><div class='add'>+	ASSERT_EQ(preserve_fd(session_fd, mem_fd2, 0xBBBB), 0);</div><div class='add'>+</div><div class='add'>+	memset(read_buf, 0, sizeof(read_buf));</div><div class='add'>+	ASSERT_EQ(lseek(mem_fd1, 0, SEEK_SET), 0);</div><div class='add'>+	ASSERT_EQ(read(mem_fd1, read_buf, sizeof(read_buf)), strlen(test_str1));</div><div class='add'>+	ASSERT_STREQ(read_buf, test_str1);</div><div class='add'>+</div><div class='add'>+	memset(read_buf, 0, sizeof(read_buf));</div><div class='add'>+	ASSERT_EQ(lseek(mem_fd2, 0, SEEK_SET), 0);</div><div class='add'>+	ASSERT_EQ(read(mem_fd2, read_buf, sizeof(read_buf)), strlen(test_str2));</div><div class='add'>+	ASSERT_STREQ(read_buf, test_str2);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(mem_fd1), 0);</div><div class='add'>+	ASSERT_EQ(close(mem_fd2), 0);</div><div class='add'>+	ASSERT_EQ(close(session_fd), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test Case: Preserve Complex Scenario</div><div class='add'>+ *</div><div class='add'>+ * Verifies a more complex scenario with multiple sessions and a mix of empty</div><div class='add'>+ * and non-empty memfds distributed across them.</div><div class='add'>+ */</div><div class='add'>+TEST_F(liveupdate_device, preserve_complex_scenario)</div><div class='add'>+{</div><div class='add'>+	const char *data1 = "data for session 1";</div><div class='add'>+	const char *data2 = "data for session 2";</div><div class='add'>+	char read_buf[64] = {};</div><div class='add'>+	int session_fd1, session_fd2;</div><div class='add'>+	int mem_fd_data1, mem_fd_empty1, mem_fd_data2, mem_fd_empty2;</div><div class='add'>+</div><div class='add'>+	self-&gt;fd1 = open(LIVEUPDATE_DEV, O_RDWR);</div><div class='add'>+	if (self-&gt;fd1 &lt; 0 &amp;&amp; errno == ENOENT)</div><div class='add'>+		SKIP(return, "%s does not exist", LIVEUPDATE_DEV);</div><div class='add'>+	ASSERT_GE(self-&gt;fd1, 0);</div><div class='add'>+</div><div class='add'>+	session_fd1 = create_session(self-&gt;fd1, "complex-session-1");</div><div class='add'>+	ASSERT_GE(session_fd1, 0);</div><div class='add'>+	session_fd2 = create_session(self-&gt;fd1, "complex-session-2");</div><div class='add'>+	ASSERT_GE(session_fd2, 0);</div><div class='add'>+</div><div class='add'>+	mem_fd_data1 = memfd_create("data1", 0);</div><div class='add'>+	ASSERT_GE(mem_fd_data1, 0);</div><div class='add'>+	ASSERT_EQ(write(mem_fd_data1, data1, strlen(data1)), strlen(data1));</div><div class='add'>+</div><div class='add'>+	mem_fd_empty1 = memfd_create("empty1", 0);</div><div class='add'>+	ASSERT_GE(mem_fd_empty1, 0);</div><div class='add'>+</div><div class='add'>+	mem_fd_data2 = memfd_create("data2", 0);</div><div class='add'>+	ASSERT_GE(mem_fd_data2, 0);</div><div class='add'>+	ASSERT_EQ(write(mem_fd_data2, data2, strlen(data2)), strlen(data2));</div><div class='add'>+</div><div class='add'>+	mem_fd_empty2 = memfd_create("empty2", 0);</div><div class='add'>+	ASSERT_GE(mem_fd_empty2, 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(preserve_fd(session_fd1, mem_fd_data1, 0x1111), 0);</div><div class='add'>+	ASSERT_EQ(preserve_fd(session_fd1, mem_fd_empty1, 0x2222), 0);</div><div class='add'>+	ASSERT_EQ(preserve_fd(session_fd2, mem_fd_data2, 0x3333), 0);</div><div class='add'>+	ASSERT_EQ(preserve_fd(session_fd2, mem_fd_empty2, 0x4444), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(lseek(mem_fd_data1, 0, SEEK_SET), 0);</div><div class='add'>+	ASSERT_EQ(read(mem_fd_data1, read_buf, sizeof(read_buf)), strlen(data1));</div><div class='add'>+	ASSERT_STREQ(read_buf, data1);</div><div class='add'>+</div><div class='add'>+	memset(read_buf, 0, sizeof(read_buf));</div><div class='add'>+	ASSERT_EQ(lseek(mem_fd_data2, 0, SEEK_SET), 0);</div><div class='add'>+	ASSERT_EQ(read(mem_fd_data2, read_buf, sizeof(read_buf)), strlen(data2));</div><div class='add'>+	ASSERT_STREQ(read_buf, data2);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(lseek(mem_fd_empty1, 0, SEEK_SET), 0);</div><div class='add'>+	ASSERT_EQ(read(mem_fd_empty1, read_buf, sizeof(read_buf)), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(lseek(mem_fd_empty2, 0, SEEK_SET), 0);</div><div class='add'>+	ASSERT_EQ(read(mem_fd_empty2, read_buf, sizeof(read_buf)), 0);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(mem_fd_data1), 0);</div><div class='add'>+	ASSERT_EQ(close(mem_fd_empty1), 0);</div><div class='add'>+	ASSERT_EQ(close(mem_fd_data2), 0);</div><div class='add'>+	ASSERT_EQ(close(mem_fd_empty2), 0);</div><div class='add'>+	ASSERT_EQ(close(session_fd1), 0);</div><div class='add'>+	ASSERT_EQ(close(session_fd2), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Test Case: Preserve Unsupported File Descriptor</div><div class='add'>+ *</div><div class='add'>+ * Verifies that attempting to preserve a file descriptor that does not have</div><div class='add'>+ * a registered Live Update handler fails gracefully.</div><div class='add'>+ * Uses /dev/null as a representative of a file type (character device)</div><div class='add'>+ * that is not supported by the orchestrator.</div><div class='add'>+ */</div><div class='add'>+TEST_F(liveupdate_device, preserve_unsupported_fd)</div><div class='add'>+{</div><div class='add'>+	int session_fd, unsupported_fd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	self-&gt;fd1 = open(LIVEUPDATE_DEV, O_RDWR);</div><div class='add'>+	if (self-&gt;fd1 &lt; 0 &amp;&amp; errno == ENOENT)</div><div class='add'>+		SKIP(return, "%s does not exist", LIVEUPDATE_DEV);</div><div class='add'>+	ASSERT_GE(self-&gt;fd1, 0);</div><div class='add'>+</div><div class='add'>+	session_fd = create_session(self-&gt;fd1, "unsupported-fd-test");</div><div class='add'>+	ASSERT_GE(session_fd, 0);</div><div class='add'>+</div><div class='add'>+	unsupported_fd = open("/dev/null", O_RDWR);</div><div class='add'>+	ASSERT_GE(unsupported_fd, 0);</div><div class='add'>+</div><div class='add'>+	ret = preserve_fd(session_fd, unsupported_fd, 0xDEAD);</div><div class='add'>+	EXPECT_EQ(ret, -ENOENT);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(unsupported_fd), 0);</div><div class='add'>+	ASSERT_EQ(close(session_fd), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/liveupdate/luo_kexec_simple.c b/tools/testing/selftests/liveupdate/luo_kexec_simple.c<br/>new file mode 100644<br/>index 000000000000..d7ac1f3dc4cb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/liveupdate/luo_kexec_simple.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/liveupdate/luo_kexec_simple.c</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025, Google LLC.</div><div class='add'>+ * Pasha Tatashin &lt;pasha.tatashin@soleen.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * A simple selftest to validate the end-to-end lifecycle of a LUO session</div><div class='add'>+ * across a single kexec reboot.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "luo_test_utils.h"</div><div class='add'>+</div><div class='add'>+#define TEST_SESSION_NAME "test-session"</div><div class='add'>+#define TEST_MEMFD_TOKEN 0x1A</div><div class='add'>+#define TEST_MEMFD_DATA "hello kexec world"</div><div class='add'>+</div><div class='add'>+/* Constants for the state-tracking mechanism, specific to this test file. */</div><div class='add'>+#define STATE_SESSION_NAME "kexec_simple_state"</div><div class='add'>+#define STATE_MEMFD_TOKEN 999</div><div class='add'>+</div><div class='add'>+/* Stage 1: Executed before the kexec reboot. */</div><div class='add'>+static void run_stage_1(int luo_fd)</div><div class='add'>+{</div><div class='add'>+	int session_fd;</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 1] Starting pre-kexec setup...\n");</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 1] Creating state file for next stage (2)...\n");</div><div class='add'>+	create_state_file(luo_fd, STATE_SESSION_NAME, STATE_MEMFD_TOKEN, 2);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 1] Creating session '%s' and preserving memfd...\n",</div><div class='add'>+		       TEST_SESSION_NAME);</div><div class='add'>+	session_fd = luo_create_session(luo_fd, TEST_SESSION_NAME);</div><div class='add'>+	if (session_fd &lt; 0)</div><div class='add'>+		fail_exit("luo_create_session for '%s'", TEST_SESSION_NAME);</div><div class='add'>+</div><div class='add'>+	if (create_and_preserve_memfd(session_fd, TEST_MEMFD_TOKEN,</div><div class='add'>+				      TEST_MEMFD_DATA) &lt; 0) {</div><div class='add'>+		fail_exit("create_and_preserve_memfd for token %#x",</div><div class='add'>+			  TEST_MEMFD_TOKEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	close(luo_fd);</div><div class='add'>+	daemonize_and_wait();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Stage 2: Executed after the kexec reboot. */</div><div class='add'>+static void run_stage_2(int luo_fd, int state_session_fd)</div><div class='add'>+{</div><div class='add'>+	int session_fd, mfd, stage;</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Starting post-kexec verification...\n");</div><div class='add'>+</div><div class='add'>+	restore_and_read_stage(state_session_fd, STATE_MEMFD_TOKEN, &amp;stage);</div><div class='add'>+	if (stage != 2)</div><div class='add'>+		fail_exit("Expected stage 2, but state file contains %d", stage);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Retrieving session '%s'...\n", TEST_SESSION_NAME);</div><div class='add'>+	session_fd = luo_retrieve_session(luo_fd, TEST_SESSION_NAME);</div><div class='add'>+	if (session_fd &lt; 0)</div><div class='add'>+		fail_exit("luo_retrieve_session for '%s'", TEST_SESSION_NAME);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Restoring and verifying memfd (token %#x)...\n",</div><div class='add'>+		       TEST_MEMFD_TOKEN);</div><div class='add'>+	mfd = restore_and_verify_memfd(session_fd, TEST_MEMFD_TOKEN,</div><div class='add'>+				       TEST_MEMFD_DATA);</div><div class='add'>+	if (mfd &lt; 0)</div><div class='add'>+		fail_exit("restore_and_verify_memfd for token %#x", TEST_MEMFD_TOKEN);</div><div class='add'>+	close(mfd);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Test data verified successfully.\n");</div><div class='add'>+	ksft_print_msg("[STAGE 2] Finalizing test session...\n");</div><div class='add'>+	if (luo_session_finish(session_fd) &lt; 0)</div><div class='add'>+		fail_exit("luo_session_finish for test session");</div><div class='add'>+	close(session_fd);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Finalizing state session...\n");</div><div class='add'>+	if (luo_session_finish(state_session_fd) &lt; 0)</div><div class='add'>+		fail_exit("luo_session_finish for state session");</div><div class='add'>+	close(state_session_fd);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("\n--- SIMPLE KEXEC TEST PASSED ---\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	return luo_test(argc, argv, STATE_SESSION_NAME,</div><div class='add'>+			run_stage_1, run_stage_2);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/liveupdate/luo_multi_session.c b/tools/testing/selftests/liveupdate/luo_multi_session.c<br/>new file mode 100644<br/>index 000000000000..0ee2d795beef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/liveupdate/luo_multi_session.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/liveupdate/luo_multi_session.c</a></div><div class='hunk'>@@ -0,0 +1,162 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025, Google LLC.</div><div class='add'>+ * Pasha Tatashin &lt;pasha.tatashin@soleen.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * A selftest to validate the end-to-end lifecycle of multiple LUO sessions</div><div class='add'>+ * across a kexec reboot, including empty sessions and sessions with multiple</div><div class='add'>+ * files.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "luo_test_utils.h"</div><div class='add'>+</div><div class='add'>+#define SESSION_EMPTY_1 "multi-test-empty-1"</div><div class='add'>+#define SESSION_EMPTY_2 "multi-test-empty-2"</div><div class='add'>+#define SESSION_FILES_1 "multi-test-files-1"</div><div class='add'>+#define SESSION_FILES_2 "multi-test-files-2"</div><div class='add'>+</div><div class='add'>+#define MFD1_TOKEN 0x1001</div><div class='add'>+#define MFD2_TOKEN 0x2002</div><div class='add'>+#define MFD3_TOKEN 0x3003</div><div class='add'>+</div><div class='add'>+#define MFD1_DATA "Data for session files 1"</div><div class='add'>+#define MFD2_DATA "First file for session files 2"</div><div class='add'>+#define MFD3_DATA "Second file for session files 2"</div><div class='add'>+</div><div class='add'>+#define STATE_SESSION_NAME "kexec_multi_state"</div><div class='add'>+#define STATE_MEMFD_TOKEN 998</div><div class='add'>+</div><div class='add'>+/* Stage 1: Executed before the kexec reboot. */</div><div class='add'>+static void run_stage_1(int luo_fd)</div><div class='add'>+{</div><div class='add'>+	int s_empty1_fd, s_empty2_fd, s_files1_fd, s_files2_fd;</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 1] Starting pre-kexec setup for multi-session test...\n");</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 1] Creating state file for next stage (2)...\n");</div><div class='add'>+	create_state_file(luo_fd, STATE_SESSION_NAME, STATE_MEMFD_TOKEN, 2);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 1] Creating empty sessions '%s' and '%s'...\n",</div><div class='add'>+		       SESSION_EMPTY_1, SESSION_EMPTY_2);</div><div class='add'>+	s_empty1_fd = luo_create_session(luo_fd, SESSION_EMPTY_1);</div><div class='add'>+	if (s_empty1_fd &lt; 0)</div><div class='add'>+		fail_exit("luo_create_session for '%s'", SESSION_EMPTY_1);</div><div class='add'>+</div><div class='add'>+	s_empty2_fd = luo_create_session(luo_fd, SESSION_EMPTY_2);</div><div class='add'>+	if (s_empty2_fd &lt; 0)</div><div class='add'>+		fail_exit("luo_create_session for '%s'", SESSION_EMPTY_2);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 1] Creating session '%s' with one memfd...\n",</div><div class='add'>+		       SESSION_FILES_1);</div><div class='add'>+</div><div class='add'>+	s_files1_fd = luo_create_session(luo_fd, SESSION_FILES_1);</div><div class='add'>+	if (s_files1_fd &lt; 0)</div><div class='add'>+		fail_exit("luo_create_session for '%s'", SESSION_FILES_1);</div><div class='add'>+	if (create_and_preserve_memfd(s_files1_fd, MFD1_TOKEN, MFD1_DATA) &lt; 0) {</div><div class='add'>+		fail_exit("create_and_preserve_memfd for token %#x",</div><div class='add'>+			  MFD1_TOKEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 1] Creating session '%s' with two memfds...\n",</div><div class='add'>+		       SESSION_FILES_2);</div><div class='add'>+</div><div class='add'>+	s_files2_fd = luo_create_session(luo_fd, SESSION_FILES_2);</div><div class='add'>+	if (s_files2_fd &lt; 0)</div><div class='add'>+		fail_exit("luo_create_session for '%s'", SESSION_FILES_2);</div><div class='add'>+	if (create_and_preserve_memfd(s_files2_fd, MFD2_TOKEN, MFD2_DATA) &lt; 0) {</div><div class='add'>+		fail_exit("create_and_preserve_memfd for token %#x",</div><div class='add'>+			  MFD2_TOKEN);</div><div class='add'>+	}</div><div class='add'>+	if (create_and_preserve_memfd(s_files2_fd, MFD3_TOKEN, MFD3_DATA) &lt; 0) {</div><div class='add'>+		fail_exit("create_and_preserve_memfd for token %#x",</div><div class='add'>+			  MFD3_TOKEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	close(luo_fd);</div><div class='add'>+	daemonize_and_wait();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Stage 2: Executed after the kexec reboot. */</div><div class='add'>+static void run_stage_2(int luo_fd, int state_session_fd)</div><div class='add'>+{</div><div class='add'>+	int s_empty1_fd, s_empty2_fd, s_files1_fd, s_files2_fd;</div><div class='add'>+	int mfd1, mfd2, mfd3, stage;</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Starting post-kexec verification...\n");</div><div class='add'>+</div><div class='add'>+	restore_and_read_stage(state_session_fd, STATE_MEMFD_TOKEN, &amp;stage);</div><div class='add'>+	if (stage != 2) {</div><div class='add'>+		fail_exit("Expected stage 2, but state file contains %d",</div><div class='add'>+			  stage);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Retrieving all sessions...\n");</div><div class='add'>+	s_empty1_fd = luo_retrieve_session(luo_fd, SESSION_EMPTY_1);</div><div class='add'>+	if (s_empty1_fd &lt; 0)</div><div class='add'>+		fail_exit("luo_retrieve_session for '%s'", SESSION_EMPTY_1);</div><div class='add'>+</div><div class='add'>+	s_empty2_fd = luo_retrieve_session(luo_fd, SESSION_EMPTY_2);</div><div class='add'>+	if (s_empty2_fd &lt; 0)</div><div class='add'>+		fail_exit("luo_retrieve_session for '%s'", SESSION_EMPTY_2);</div><div class='add'>+</div><div class='add'>+	s_files1_fd = luo_retrieve_session(luo_fd, SESSION_FILES_1);</div><div class='add'>+	if (s_files1_fd &lt; 0)</div><div class='add'>+		fail_exit("luo_retrieve_session for '%s'", SESSION_FILES_1);</div><div class='add'>+</div><div class='add'>+	s_files2_fd = luo_retrieve_session(luo_fd, SESSION_FILES_2);</div><div class='add'>+	if (s_files2_fd &lt; 0)</div><div class='add'>+		fail_exit("luo_retrieve_session for '%s'", SESSION_FILES_2);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Verifying contents of session '%s'...\n",</div><div class='add'>+		       SESSION_FILES_1);</div><div class='add'>+	mfd1 = restore_and_verify_memfd(s_files1_fd, MFD1_TOKEN, MFD1_DATA);</div><div class='add'>+	if (mfd1 &lt; 0)</div><div class='add'>+		fail_exit("restore_and_verify_memfd for token %#x", MFD1_TOKEN);</div><div class='add'>+	close(mfd1);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Verifying contents of session '%s'...\n",</div><div class='add'>+		       SESSION_FILES_2);</div><div class='add'>+</div><div class='add'>+	mfd2 = restore_and_verify_memfd(s_files2_fd, MFD2_TOKEN, MFD2_DATA);</div><div class='add'>+	if (mfd2 &lt; 0)</div><div class='add'>+		fail_exit("restore_and_verify_memfd for token %#x", MFD2_TOKEN);</div><div class='add'>+	close(mfd2);</div><div class='add'>+</div><div class='add'>+	mfd3 = restore_and_verify_memfd(s_files2_fd, MFD3_TOKEN, MFD3_DATA);</div><div class='add'>+	if (mfd3 &lt; 0)</div><div class='add'>+		fail_exit("restore_and_verify_memfd for token %#x", MFD3_TOKEN);</div><div class='add'>+	close(mfd3);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Test data verified successfully.\n");</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Finalizing all test sessions...\n");</div><div class='add'>+	if (luo_session_finish(s_empty1_fd) &lt; 0)</div><div class='add'>+		fail_exit("luo_session_finish for '%s'", SESSION_EMPTY_1);</div><div class='add'>+	close(s_empty1_fd);</div><div class='add'>+</div><div class='add'>+	if (luo_session_finish(s_empty2_fd) &lt; 0)</div><div class='add'>+		fail_exit("luo_session_finish for '%s'", SESSION_EMPTY_2);</div><div class='add'>+	close(s_empty2_fd);</div><div class='add'>+</div><div class='add'>+	if (luo_session_finish(s_files1_fd) &lt; 0)</div><div class='add'>+		fail_exit("luo_session_finish for '%s'", SESSION_FILES_1);</div><div class='add'>+	close(s_files1_fd);</div><div class='add'>+</div><div class='add'>+	if (luo_session_finish(s_files2_fd) &lt; 0)</div><div class='add'>+		fail_exit("luo_session_finish for '%s'", SESSION_FILES_2);</div><div class='add'>+	close(s_files2_fd);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 2] Finalizing state session...\n");</div><div class='add'>+	if (luo_session_finish(state_session_fd) &lt; 0)</div><div class='add'>+		fail_exit("luo_session_finish for state session");</div><div class='add'>+	close(state_session_fd);</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("\n--- MULTI-SESSION KEXEC TEST PASSED ---\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	return luo_test(argc, argv, STATE_SESSION_NAME,</div><div class='add'>+			run_stage_1, run_stage_2);</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/liveupdate/luo_test_utils.c b/tools/testing/selftests/liveupdate/luo_test_utils.c<br/>new file mode 100644<br/>index 000000000000..3c8721c505df<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/liveupdate/luo_test_utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/liveupdate/luo_test_utils.c</a></div><div class='hunk'>@@ -0,0 +1,266 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025, Google LLC.</div><div class='add'>+ * Pasha Tatashin &lt;pasha.tatashin@soleen.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;getopt.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;stdarg.h&gt;</div><div class='add'>+</div><div class='add'>+#include "luo_test_utils.h"</div><div class='add'>+</div><div class='add'>+int luo_open_device(void)</div><div class='add'>+{</div><div class='add'>+	return open(LUO_DEVICE, O_RDWR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int luo_create_session(int luo_fd, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct liveupdate_ioctl_create_session arg = { .size = sizeof(arg) };</div><div class='add'>+</div><div class='add'>+	snprintf((char *)arg.name, LIVEUPDATE_SESSION_NAME_LENGTH, "%.*s",</div><div class='add'>+		 LIVEUPDATE_SESSION_NAME_LENGTH - 1, name);</div><div class='add'>+</div><div class='add'>+	if (ioctl(luo_fd, LIVEUPDATE_IOCTL_CREATE_SESSION, &amp;arg) &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	return arg.fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int luo_retrieve_session(int luo_fd, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct liveupdate_ioctl_retrieve_session arg = { .size = sizeof(arg) };</div><div class='add'>+</div><div class='add'>+	snprintf((char *)arg.name, LIVEUPDATE_SESSION_NAME_LENGTH, "%.*s",</div><div class='add'>+		 LIVEUPDATE_SESSION_NAME_LENGTH - 1, name);</div><div class='add'>+</div><div class='add'>+	if (ioctl(luo_fd, LIVEUPDATE_IOCTL_RETRIEVE_SESSION, &amp;arg) &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	return arg.fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int create_and_preserve_memfd(int session_fd, int token, const char *data)</div><div class='add'>+{</div><div class='add'>+	struct liveupdate_session_preserve_fd arg = { .size = sizeof(arg) };</div><div class='add'>+	long page_size = sysconf(_SC_PAGE_SIZE);</div><div class='add'>+	void *map = MAP_FAILED;</div><div class='add'>+	int mfd = -1, ret = -1;</div><div class='add'>+</div><div class='add'>+	mfd = memfd_create("test_mfd", 0);</div><div class='add'>+	if (mfd &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	if (ftruncate(mfd, page_size) != 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	map = mmap(NULL, page_size, PROT_WRITE, MAP_SHARED, mfd, 0);</div><div class='add'>+	if (map == MAP_FAILED)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	snprintf(map, page_size, "%s", data);</div><div class='add'>+	munmap(map, page_size);</div><div class='add'>+</div><div class='add'>+	arg.fd = mfd;</div><div class='add'>+	arg.token = token;</div><div class='add'>+	if (ioctl(session_fd, LIVEUPDATE_SESSION_PRESERVE_FD, &amp;arg) &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	if (ret != 0 &amp;&amp; errno != 0)</div><div class='add'>+		ret = -errno;</div><div class='add'>+	if (mfd &gt;= 0)</div><div class='add'>+		close(mfd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int restore_and_verify_memfd(int session_fd, int token,</div><div class='add'>+			     const char *expected_data)</div><div class='add'>+{</div><div class='add'>+	struct liveupdate_session_retrieve_fd arg = { .size = sizeof(arg) };</div><div class='add'>+	long page_size = sysconf(_SC_PAGE_SIZE);</div><div class='add'>+	void *map = MAP_FAILED;</div><div class='add'>+	int mfd = -1, ret = -1;</div><div class='add'>+</div><div class='add'>+	arg.token = token;</div><div class='add'>+	if (ioctl(session_fd, LIVEUPDATE_SESSION_RETRIEVE_FD, &amp;arg) &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+	mfd = arg.fd;</div><div class='add'>+</div><div class='add'>+	map = mmap(NULL, page_size, PROT_READ, MAP_SHARED, mfd, 0);</div><div class='add'>+	if (map == MAP_FAILED)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (expected_data &amp;&amp; strcmp(expected_data, map) != 0) {</div><div class='add'>+		ksft_print_msg("Data mismatch! Expected '%s', Got '%s'\n",</div><div class='add'>+			       expected_data, (char *)map);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_munmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mfd;</div><div class='add'>+out_munmap:</div><div class='add'>+	munmap(map, page_size);</div><div class='add'>+out:</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; errno != 0)</div><div class='add'>+		ret = -errno;</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; mfd &gt;= 0)</div><div class='add'>+		close(mfd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int luo_session_finish(int session_fd)</div><div class='add'>+{</div><div class='add'>+	struct liveupdate_session_finish arg = { .size = sizeof(arg) };</div><div class='add'>+</div><div class='add'>+	if (ioctl(session_fd, LIVEUPDATE_SESSION_FINISH, &amp;arg) &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void create_state_file(int luo_fd, const char *session_name, int token,</div><div class='add'>+		       int next_stage)</div><div class='add'>+{</div><div class='add'>+	char buf[32];</div><div class='add'>+	int state_session_fd;</div><div class='add'>+</div><div class='add'>+	state_session_fd = luo_create_session(luo_fd, session_name);</div><div class='add'>+	if (state_session_fd &lt; 0)</div><div class='add'>+		fail_exit("luo_create_session for state tracking");</div><div class='add'>+</div><div class='add'>+	snprintf(buf, sizeof(buf), "%d", next_stage);</div><div class='add'>+	if (create_and_preserve_memfd(state_session_fd, token, buf) &lt; 0)</div><div class='add'>+		fail_exit("create_and_preserve_memfd for state tracking");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * DO NOT close session FD, otherwise it is going to be unpreserved</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void restore_and_read_stage(int state_session_fd, int token, int *stage)</div><div class='add'>+{</div><div class='add'>+	char buf[32] = {0};</div><div class='add'>+	int mfd;</div><div class='add'>+</div><div class='add'>+	mfd = restore_and_verify_memfd(state_session_fd, token, NULL);</div><div class='add'>+	if (mfd &lt; 0)</div><div class='add'>+		fail_exit("failed to restore state memfd");</div><div class='add'>+</div><div class='add'>+	if (read(mfd, buf, sizeof(buf) - 1) &lt; 0)</div><div class='add'>+		fail_exit("failed to read state mfd");</div><div class='add'>+</div><div class='add'>+	*stage = atoi(buf);</div><div class='add'>+</div><div class='add'>+	close(mfd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void daemonize_and_wait(void)</div><div class='add'>+{</div><div class='add'>+	pid_t pid;</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[STAGE 1] Forking persistent child to hold sessions...\n");</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	if (pid &lt; 0)</div><div class='add'>+		fail_exit("fork failed");</div><div class='add'>+</div><div class='add'>+	if (pid &gt; 0) {</div><div class='add'>+		ksft_print_msg("[STAGE 1] Child PID: %d. Resources are pinned.\n", pid);</div><div class='add'>+		ksft_print_msg("[STAGE 1] You may now perform kexec reboot.\n");</div><div class='add'>+		exit(EXIT_SUCCESS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Detach from terminal so closing the window doesn't kill us */</div><div class='add'>+	if (setsid() &lt; 0)</div><div class='add'>+		fail_exit("setsid failed");</div><div class='add'>+</div><div class='add'>+	close(STDIN_FILENO);</div><div class='add'>+	close(STDOUT_FILENO);</div><div class='add'>+	close(STDERR_FILENO);</div><div class='add'>+</div><div class='add'>+	/* Change dir to root to avoid locking filesystems */</div><div class='add'>+	if (chdir("/") &lt; 0)</div><div class='add'>+		exit(EXIT_FAILURE);</div><div class='add'>+</div><div class='add'>+	while (1)</div><div class='add'>+		sleep(60);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_stage_args(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	static struct option long_options[] = {</div><div class='add'>+		{"stage", required_argument, 0, 's'},</div><div class='add'>+		{0, 0, 0, 0}</div><div class='add'>+	};</div><div class='add'>+	int option_index = 0;</div><div class='add'>+	int stage = 1;</div><div class='add'>+	int opt;</div><div class='add'>+</div><div class='add'>+	optind = 1;</div><div class='add'>+	while ((opt = getopt_long(argc, argv, "s:", long_options, &amp;option_index)) != -1) {</div><div class='add'>+		switch (opt) {</div><div class='add'>+		case 's':</div><div class='add'>+			stage = atoi(optarg);</div><div class='add'>+			if (stage != 1 &amp;&amp; stage != 2)</div><div class='add'>+				fail_exit("Invalid stage argument");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			fail_exit("Unknown argument");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return stage;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int luo_test(int argc, char *argv[],</div><div class='add'>+	     const char *state_session_name,</div><div class='add'>+	     luo_test_stage1_fn stage1,</div><div class='add'>+	     luo_test_stage2_fn stage2)</div><div class='add'>+{</div><div class='add'>+	int target_stage = parse_stage_args(argc, argv);</div><div class='add'>+	int luo_fd = luo_open_device();</div><div class='add'>+	int state_session_fd;</div><div class='add'>+	int detected_stage;</div><div class='add'>+</div><div class='add'>+	if (luo_fd &lt; 0) {</div><div class='add'>+		ksft_exit_skip("Failed to open %s. Is the luo module loaded?\n",</div><div class='add'>+			       LUO_DEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state_session_fd = luo_retrieve_session(luo_fd, state_session_name);</div><div class='add'>+	if (state_session_fd == -ENOENT)</div><div class='add'>+		detected_stage = 1;</div><div class='add'>+	else if (state_session_fd &gt;= 0)</div><div class='add'>+		detected_stage = 2;</div><div class='add'>+	else</div><div class='add'>+		fail_exit("Failed to check for state session");</div><div class='add'>+</div><div class='add'>+	if (target_stage != detected_stage) {</div><div class='add'>+		ksft_exit_fail_msg("Stage mismatch Requested --stage %d, but system is in stage %d.\n"</div><div class='add'>+				   "(State session %s: %s)\n",</div><div class='add'>+				   target_stage, detected_stage, state_session_name,</div><div class='add'>+				   (detected_stage == 2) ? "EXISTS" : "MISSING");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (target_stage == 1)</div><div class='add'>+		stage1(luo_fd);</div><div class='add'>+	else</div><div class='add'>+		stage2(luo_fd, state_session_fd);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/tools/testing/selftests/liveupdate/luo_test_utils.h b/tools/testing/selftests/liveupdate/luo_test_utils.h<br/>new file mode 100644<br/>index 000000000000..90099bf49577<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/liveupdate/luo_test_utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/liveupdate/luo_test_utils.h</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025, Google LLC.</div><div class='add'>+ * Pasha Tatashin &lt;pasha.tatashin@soleen.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Utility functions for LUO kselftests.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef LUO_TEST_UTILS_H</div><div class='add'>+#define LUO_TEST_UTILS_H</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;linux/liveupdate.h&gt;</div><div class='add'>+#include "../kselftest.h"</div><div class='add'>+</div><div class='add'>+#define LUO_DEVICE "/dev/liveupdate"</div><div class='add'>+</div><div class='add'>+#define fail_exit(fmt, ...)						\</div><div class='add'>+	ksft_exit_fail_msg("[%s:%d] " fmt " (errno: %s)\n",	\</div><div class='add'>+			   __func__, __LINE__, ##__VA_ARGS__, strerror(errno))</div><div class='add'>+</div><div class='add'>+int luo_open_device(void);</div><div class='add'>+int luo_create_session(int luo_fd, const char *name);</div><div class='add'>+int luo_retrieve_session(int luo_fd, const char *name);</div><div class='add'>+int luo_session_finish(int session_fd);</div><div class='add'>+</div><div class='add'>+int create_and_preserve_memfd(int session_fd, int token, const char *data);</div><div class='add'>+int restore_and_verify_memfd(int session_fd, int token, const char *expected_data);</div><div class='add'>+</div><div class='add'>+void create_state_file(int luo_fd, const char *session_name, int token,</div><div class='add'>+		       int next_stage);</div><div class='add'>+void restore_and_read_stage(int state_session_fd, int token, int *stage);</div><div class='add'>+</div><div class='add'>+void daemonize_and_wait(void);</div><div class='add'>+</div><div class='add'>+typedef void (*luo_test_stage1_fn)(int luo_fd);</div><div class='add'>+typedef void (*luo_test_stage2_fn)(int luo_fd, int state_session_fd);</div><div class='add'>+</div><div class='add'>+int luo_test(int argc, char *argv[], const char *state_session_name,</div><div class='add'>+	     luo_test_stage1_fn stage1, luo_test_stage2_fn stage2);</div><div class='add'>+</div><div class='add'>+#endif /* LUO_TEST_UTILS_H */</div><div class='head'>diff --git a/tools/testing/selftests/lkdtm/config b/tools/testing/selftests/lkdtm/config<br/>index 7afe05e8c4d7..bd09fdaf53e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lkdtm/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lkdtm/config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lkdtm/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/lkdtm/config</a></div><div class='hunk'>@@ -2,7 +2,7 @@ CONFIG_LKDTM=y</div><div class='ctx'> CONFIG_DEBUG_LIST=y</div><div class='ctx'> CONFIG_SLAB_FREELIST_HARDENED=y</div><div class='ctx'> CONFIG_FORTIFY_SOURCE=y</div><div class='del'>-CONFIG_GCC_PLUGIN_STACKLEAK=y</div><div class='add'>+CONFIG_KSTACK_ERASE=y</div><div class='ctx'> CONFIG_HARDENED_USERCOPY=y</div><div class='ctx'> CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y</div><div class='ctx'> CONFIG_INIT_ON_FREE_DEFAULT_ON=y</div><div class='head'>diff --git a/tools/testing/selftests/lsm/lsm_get_self_attr_test.c b/tools/testing/selftests/lsm/lsm_get_self_attr_test.c<br/>index df215e4aa63f..60caf8528f81 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lsm/lsm_get_self_attr_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lsm/lsm_get_self_attr_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lsm/lsm_get_self_attr_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/lsm/lsm_get_self_attr_test.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> static struct lsm_ctx *next_ctx(struct lsm_ctx *ctxp)</div><div class='head'>diff --git a/tools/testing/selftests/lsm/lsm_list_modules_test.c b/tools/testing/selftests/lsm/lsm_list_modules_test.c<br/>index 1cc8a977c711..54d59044ace1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lsm/lsm_list_modules_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lsm/lsm_list_modules_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lsm/lsm_list_modules_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/lsm/lsm_list_modules_test.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> TEST(size_null_lsm_list_modules)</div><div class='head'>diff --git a/tools/testing/selftests/lsm/lsm_set_self_attr_test.c b/tools/testing/selftests/lsm/lsm_set_self_attr_test.c<br/>index 732e89fe99c0..dcb6f8aa772e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lsm/lsm_set_self_attr_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/lsm/lsm_set_self_attr_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/lsm/lsm_set_self_attr_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/lsm/lsm_set_self_attr_test.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='ctx'> TEST(ctx_null_lsm_set_self_attr)</div><div class='head'>diff --git a/tools/testing/selftests/media_tests/media_device_open.c b/tools/testing/selftests/media_tests/media_device_open.c<br/>index 93183a37b133..4396bf2273a4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/media_tests/media_device_open.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/media_tests/media_device_open.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/media_tests/media_device_open.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/media_tests/media_device_open.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;sys/stat.h&gt;</div><div class='ctx'> #include &lt;linux/media.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/media_tests/media_device_test.c b/tools/testing/selftests/media_tests/media_device_test.c<br/>index 4b9953359e40..6e4a8090a0eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/media_tests/media_device_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/media_tests/media_device_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/media_tests/media_device_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/media_tests/media_device_test.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> #include &lt;time.h&gt;</div><div class='ctx'> #include &lt;linux/media.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/membarrier/membarrier_test_impl.h b/tools/testing/selftests/membarrier/membarrier_test_impl.h<br/>index af89855adb7b..f6d7c44b2288 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/membarrier/membarrier_test_impl.h?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/membarrier/membarrier_test_impl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/membarrier/membarrier_test_impl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/membarrier/membarrier_test_impl.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;pthread.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> static int registrations;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/mincore/mincore_selftest.c b/tools/testing/selftests/mincore/mincore_selftest.c<br/>index e949a43a6145..cdd022c1c497 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mincore/mincore_selftest.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mincore/mincore_selftest.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mincore/mincore_selftest.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mincore/mincore_selftest.c</a></div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> /* Default test file size: 4MB */</div><div class='ctx'> #define MB (1UL &lt;&lt; 20)</div><div class='hunk'>@@ -261,9 +261,6 @@ TEST(check_file_mmap)</div><div class='ctx'> 		TH_LOG("No read-ahead pages found in memory");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	EXPECT_LT(i, vec_size) {</div><div class='del'>-		TH_LOG("Read-ahead pages reached the end of the file");</div><div class='del'>-	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * End of the readahead window. The rest of the pages shouldn't</div><div class='ctx'> 	 * be in memory.</div><div class='hunk'>@@ -286,8 +283,7 @@ out_free:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Test mincore() behavior on a page backed by a tmpfs file.  This test</div><div class='del'>- * performs the same steps as the previous one. However, we don't expect</div><div class='del'>- * any readahead in this case.</div><div class='add'>+ * performs the same steps as the previous one.</div><div class='ctx'>  */</div><div class='ctx'> TEST(check_tmpfs_mmap)</div><div class='ctx'> {</div><div class='hunk'>@@ -298,7 +294,6 @@ TEST(check_tmpfs_mmap)</div><div class='ctx'> 	int page_size;</div><div class='ctx'> 	int fd;</div><div class='ctx'> 	int i;</div><div class='del'>-	int ra_pages = 0;</div><div class='ctx'> </div><div class='ctx'> 	page_size = sysconf(_SC_PAGESIZE);</div><div class='ctx'> 	vec_size = FILE_SIZE / page_size;</div><div class='hunk'>@@ -341,8 +336,7 @@ TEST(check_tmpfs_mmap)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Touch a page in the middle of the mapping. We expect only</div><div class='del'>-	 * that page to be fetched into memory.</div><div class='add'>+	 * Touch a page in the middle of the mapping.</div><div class='ctx'> 	 */</div><div class='ctx'> 	addr[FILE_SIZE / 2] = 1;</div><div class='ctx'> 	retval = mincore(addr, FILE_SIZE, vec);</div><div class='hunk'>@@ -351,15 +345,6 @@ TEST(check_tmpfs_mmap)</div><div class='ctx'> 		TH_LOG("Page not found in memory after use");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	i = FILE_SIZE / 2 / page_size + 1;</div><div class='del'>-	while (i &lt; vec_size &amp;&amp; vec[i]) {</div><div class='del'>-		ra_pages++;</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-	ASSERT_EQ(ra_pages, 0) {</div><div class='del'>-		TH_LOG("Read-ahead pages found in memory");</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	munmap(addr, FILE_SIZE);</div><div class='ctx'> 	close(fd);</div><div class='ctx'> 	free(vec);</div><div class='head'>diff --git a/tools/testing/selftests/mm/.gitignore b/tools/testing/selftests/mm/.gitignore<br/>index 121000c28c10..c2a8586e51a1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/.gitignore?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/.gitignore</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/.gitignore</a></div><div class='hunk'>@@ -20,6 +20,8 @@ mremap_test</div><div class='ctx'> on-fault-limit</div><div class='ctx'> transhuge-stress</div><div class='ctx'> pagemap_ioctl</div><div class='add'>+pfnmap</div><div class='add'>+process_madv</div><div class='ctx'> *.tmp*</div><div class='ctx'> protection_keys</div><div class='ctx'> protection_keys_32</div><div class='hunk'>@@ -37,9 +39,6 @@ map_fixed_noreplace</div><div class='ctx'> write_to_hugetlbfs</div><div class='ctx'> hmm-tests</div><div class='ctx'> memfd_secret</div><div class='del'>-hugetlb_dio</div><div class='del'>-pkey_sighandler_tests_32</div><div class='del'>-pkey_sighandler_tests_64</div><div class='ctx'> soft-dirty</div><div class='ctx'> split_huge_page_test</div><div class='ctx'> ksm_tests</div><div class='hunk'>@@ -57,4 +56,7 @@ droppable</div><div class='ctx'> hugetlb_dio</div><div class='ctx'> pkey_sighandler_tests_32</div><div class='ctx'> pkey_sighandler_tests_64</div><div class='del'>-guard-pages</div><div class='add'>+guard-regions</div><div class='add'>+merge</div><div class='add'>+prctl_thp_disable</div><div class='add'>+rmap</div><div class='head'>diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile<br/>index 63ce39d024bb..eaf9312097f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/Makefile?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/Makefile</a></div><div class='hunk'>@@ -34,6 +34,7 @@ endif</div><div class='ctx'> MAKEFLAGS += --no-builtin-rules</div><div class='ctx'> </div><div class='ctx'> CFLAGS = -Wall -O2 -I $(top_srcdir) $(EXTRA_CFLAGS) $(KHDR_INCLUDES) $(TOOLS_INCLUDES)</div><div class='add'>+CFLAGS += -Wunreachable-code</div><div class='ctx'> LDLIBS = -lrt -lpthread -lm</div><div class='ctx'> </div><div class='ctx'> # Some distributions (such as Ubuntu) configure GCC so that _FORTIFY_SOURCE is</div><div class='hunk'>@@ -84,6 +85,9 @@ TEST_GEN_FILES += mremap_test</div><div class='ctx'> TEST_GEN_FILES += mseal_test</div><div class='ctx'> TEST_GEN_FILES += on-fault-limit</div><div class='ctx'> TEST_GEN_FILES += pagemap_ioctl</div><div class='add'>+TEST_GEN_FILES += pfnmap</div><div class='add'>+TEST_GEN_FILES += process_madv</div><div class='add'>+TEST_GEN_FILES += prctl_thp_disable</div><div class='ctx'> TEST_GEN_FILES += thuge-gen</div><div class='ctx'> TEST_GEN_FILES += transhuge-stress</div><div class='ctx'> TEST_GEN_FILES += uffd-stress</div><div class='hunk'>@@ -97,7 +101,9 @@ TEST_GEN_FILES += hugetlb_fault_after_madv</div><div class='ctx'> TEST_GEN_FILES += hugetlb_madv_vs_map</div><div class='ctx'> TEST_GEN_FILES += hugetlb_dio</div><div class='ctx'> TEST_GEN_FILES += droppable</div><div class='del'>-TEST_GEN_FILES += guard-pages</div><div class='add'>+TEST_GEN_FILES += guard-regions</div><div class='add'>+TEST_GEN_FILES += merge</div><div class='add'>+TEST_GEN_FILES += rmap</div><div class='ctx'> </div><div class='ctx'> ifneq ($(ARCH),arm64)</div><div class='ctx'> TEST_GEN_FILES += soft-dirty</div><div class='hunk'>@@ -225,6 +231,8 @@ $(OUTPUT)/ksm_tests: LDLIBS += -lnuma</div><div class='ctx'> </div><div class='ctx'> $(OUTPUT)/migration: LDLIBS += -lnuma</div><div class='ctx'> </div><div class='add'>+$(OUTPUT)/rmap: LDLIBS += -lnuma</div><div class='add'>+</div><div class='ctx'> local_config.mk local_config.h: check_config.sh</div><div class='ctx'> 	/bin/sh ./check_config.sh $(CC)</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/mm/charge_reserved_hugetlb.sh b/tools/testing/selftests/mm/charge_reserved_hugetlb.sh<br/>index 67df7b47087f..e1fe16bcbbe8 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/charge_reserved_hugetlb.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/charge_reserved_hugetlb.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/charge_reserved_hugetlb.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/charge_reserved_hugetlb.sh</a></div><div class='hunk'>@@ -29,7 +29,7 @@ fi</div><div class='ctx'> if [[ $cgroup2 ]]; then</div><div class='ctx'>   cgroup_path=$(mount -t cgroup2 | head -1 | awk '{print $3}')</div><div class='ctx'>   if [[ -z "$cgroup_path" ]]; then</div><div class='del'>-    cgroup_path=/dev/cgroup/memory</div><div class='add'>+    cgroup_path=$(mktemp -d)</div><div class='ctx'>     mount -t cgroup2 none $cgroup_path</div><div class='ctx'>     do_umount=1</div><div class='ctx'>   fi</div><div class='hunk'>@@ -37,7 +37,7 @@ if [[ $cgroup2 ]]; then</div><div class='ctx'> else</div><div class='ctx'>   cgroup_path=$(mount -t cgroup | grep ",hugetlb" | awk '{print $3}')</div><div class='ctx'>   if [[ -z "$cgroup_path" ]]; then</div><div class='del'>-    cgroup_path=/dev/cgroup/memory</div><div class='add'>+    cgroup_path=$(mktemp -d)</div><div class='ctx'>     mount -t cgroup memory,hugetlb $cgroup_path</div><div class='ctx'>     do_umount=1</div><div class='ctx'>   fi</div><div class='head'>diff --git a/tools/testing/selftests/mm/compaction_test.c b/tools/testing/selftests/mm/compaction_test.c<br/>index 2c3a0eb6b22d..30209c40b697 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/compaction_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/compaction_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/compaction_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/compaction_test.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define MAP_SIZE_MB	100</div><div class='ctx'> #define MAP_SIZE	(MAP_SIZE_MB * 1024 * 1024)</div><div class='hunk'>@@ -90,6 +90,8 @@ int check_compaction(unsigned long mem_free, unsigned long hugepage_size,</div><div class='ctx'> 	int compaction_index = 0;</div><div class='ctx'> 	char nr_hugepages[20] = {0};</div><div class='ctx'> 	char init_nr_hugepages[24] = {0};</div><div class='add'>+	char target_nr_hugepages[24] = {0};</div><div class='add'>+	int slen;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(init_nr_hugepages, sizeof(init_nr_hugepages),</div><div class='ctx'> 		 "%lu", initial_nr_hugepages);</div><div class='hunk'>@@ -106,11 +108,18 @@ int check_compaction(unsigned long mem_free, unsigned long hugepage_size,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Request a large number of huge pages. The Kernel will allocate</div><div class='del'>-	   as much as it can */</div><div class='del'>-	if (write(fd, "100000", (6*sizeof(char))) != (6*sizeof(char))) {</div><div class='del'>-		ksft_print_msg("Failed to write 100000 to /proc/sys/vm/nr_hugepages: %s\n",</div><div class='del'>-			       strerror(errno));</div><div class='add'>+	/*</div><div class='add'>+	 * Request huge pages for about half of the free memory. The Kernel</div><div class='add'>+	 * will allocate as much as it can, and we expect it will get at least 1/3</div><div class='add'>+	 */</div><div class='add'>+	nr_hugepages_ul = mem_free / hugepage_size / 2;</div><div class='add'>+	snprintf(target_nr_hugepages, sizeof(target_nr_hugepages),</div><div class='add'>+		 "%lu", nr_hugepages_ul);</div><div class='add'>+</div><div class='add'>+	slen = strlen(target_nr_hugepages);</div><div class='add'>+	if (write(fd, target_nr_hugepages, slen) != slen) {</div><div class='add'>+		ksft_print_msg("Failed to write %lu to /proc/sys/vm/nr_hugepages: %s\n",</div><div class='add'>+			       nr_hugepages_ul, strerror(errno));</div><div class='ctx'> 		goto close_fd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/mm/config b/tools/testing/selftests/mm/config<br/>index a28baa536332..deba93379c80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/config?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/config</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/config?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/config</a></div><div class='hunk'>@@ -8,3 +8,6 @@ CONFIG_GUP_TEST=y</div><div class='ctx'> CONFIG_TRANSPARENT_HUGEPAGE=y</div><div class='ctx'> CONFIG_MEM_SOFT_DIRTY=y</div><div class='ctx'> CONFIG_ANON_VMA_NAME=y</div><div class='add'>+CONFIG_FTRACE=y</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+CONFIG_UPROBES=y</div><div class='head'>diff --git a/tools/testing/selftests/mm/cow.c b/tools/testing/selftests/mm/cow.c<br/>index 9446673645eb..accfd198dbda 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/cow.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/cow.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/cow.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/cow.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #endif /* LOCAL_CONFIG_HAVE_LIBURING */</div><div class='ctx'> </div><div class='ctx'> #include "../../../../mm/gup_test.h"</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "vm_util.h"</div><div class='ctx'> #include "thp_settings.h"</div><div class='ctx'> </div><div class='hunk'>@@ -41,11 +41,6 @@ static size_t hugetlbsizes[10];</div><div class='ctx'> static int gup_fd;</div><div class='ctx'> static bool has_huge_zeropage;</div><div class='ctx'> </div><div class='del'>-static int sz2ord(size_t size)</div><div class='del'>-{</div><div class='del'>-	return __builtin_ctzll(size / pagesize);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int detect_thp_sizes(size_t sizes[], int max)</div><div class='ctx'> {</div><div class='ctx'> 	int count = 0;</div><div class='hunk'>@@ -57,7 +52,7 @@ static int detect_thp_sizes(size_t sizes[], int max)</div><div class='ctx'> 	if (!pmdsize)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	orders = 1UL &lt;&lt; sz2ord(pmdsize);</div><div class='add'>+	orders = 1UL &lt;&lt; sz2ord(pmdsize, pagesize);</div><div class='ctx'> 	orders |= thp_supported_orders();</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; orders &amp;&amp; count &lt; max; i++) {</div><div class='hunk'>@@ -72,31 +67,6 @@ static int detect_thp_sizes(size_t sizes[], int max)</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void detect_huge_zeropage(void)</div><div class='del'>-{</div><div class='del'>-	int fd = open("/sys/kernel/mm/transparent_hugepage/use_zero_page",</div><div class='del'>-		      O_RDONLY);</div><div class='del'>-	size_t enabled = 0;</div><div class='del'>-	char buf[15];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (fd &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ret = pread(fd, buf, sizeof(buf), 0);</div><div class='del'>-	if (ret &gt; 0 &amp;&amp; ret &lt; sizeof(buf)) {</div><div class='del'>-		buf[ret] = 0;</div><div class='del'>-</div><div class='del'>-		enabled = strtoul(buf, NULL, 10);</div><div class='del'>-		if (enabled == 1) {</div><div class='del'>-			has_huge_zeropage = true;</div><div class='del'>-			ksft_print_msg("[INFO] huge zeropage is enabled\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	close(fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool range_is_swapped(void *addr, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	for (; size; addr += pagesize, size -= pagesize)</div><div class='hunk'>@@ -112,9 +82,12 @@ struct comm_pipes {</div><div class='ctx'> </div><div class='ctx'> static int setup_comm_pipes(struct comm_pipes *comm_pipes)</div><div class='ctx'> {</div><div class='del'>-	if (pipe(comm_pipes-&gt;child_ready) &lt; 0)</div><div class='add'>+	if (pipe(comm_pipes-&gt;child_ready) &lt; 0) {</div><div class='add'>+		ksft_perror("pipe() failed");</div><div class='ctx'> 		return -errno;</div><div class='add'>+	}</div><div class='ctx'> 	if (pipe(comm_pipes-&gt;parent_ready) &lt; 0) {</div><div class='add'>+		ksft_perror("pipe() failed");</div><div class='ctx'> 		close(comm_pipes-&gt;child_ready[0]);</div><div class='ctx'> 		close(comm_pipes-&gt;child_ready[1]);</div><div class='ctx'> 		return -errno;</div><div class='hunk'>@@ -207,13 +180,14 @@ static void do_test_cow_in_parent(char *mem, size_t size, bool do_mprotect,</div><div class='ctx'> </div><div class='ctx'> 	ret = setup_comm_pipes(&amp;comm_pipes);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ksft_test_result_fail("pipe() failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = fork();</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("fork() failed\n");</div><div class='add'>+		ksft_perror("fork() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close_comm_pipes;</div><div class='ctx'> 	} else if (!ret) {</div><div class='ctx'> 		exit(fn(mem, size, &amp;comm_pipes));</div><div class='hunk'>@@ -228,9 +202,18 @@ static void do_test_cow_in_parent(char *mem, size_t size, bool do_mprotect,</div><div class='ctx'> 		 * write-faults by directly mapping pages writable.</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = mprotect(mem, size, PROT_READ);</div><div class='del'>-		ret |= mprotect(mem, size, PROT_READ|PROT_WRITE);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("mprotect() failed\n");</div><div class='add'>+			ksft_perror("mprotect() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='add'>+			write(comm_pipes.parent_ready[1], "0", 1);</div><div class='add'>+			wait(&amp;ret);</div><div class='add'>+			goto close_comm_pipes;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = mprotect(mem, size, PROT_READ|PROT_WRITE);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ksft_perror("mprotect() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			write(comm_pipes.parent_ready[1], "0", 1);</div><div class='ctx'> 			wait(&amp;ret);</div><div class='ctx'> 			goto close_comm_pipes;</div><div class='hunk'>@@ -248,16 +231,18 @@ static void do_test_cow_in_parent(char *mem, size_t size, bool do_mprotect,</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		ksft_test_result_pass("No leak from parent into child\n");</div><div class='add'>+		log_test_result(KSFT_PASS);</div><div class='ctx'> 	} else if (xfail) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * With hugetlb, some vmsplice() tests are currently expected to</div><div class='ctx'> 		 * fail because (a) harder to fix and (b) nobody really cares.</div><div class='ctx'> 		 * Flag them as expected failure for now.</div><div class='ctx'> 		 */</div><div class='del'>-		ksft_test_result_xfail("Leak from parent into child\n");</div><div class='add'>+		ksft_print_msg("Leak from parent into child\n");</div><div class='add'>+		log_test_result(KSFT_XFAIL);</div><div class='ctx'> 	} else {</div><div class='del'>-		ksft_test_result_fail("Leak from parent into child\n");</div><div class='add'>+		ksft_print_msg("Leak from parent into child\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 	}</div><div class='ctx'> close_comm_pipes:</div><div class='ctx'> 	close_comm_pipes(&amp;comm_pipes);</div><div class='hunk'>@@ -293,7 +278,7 @@ static void do_test_vmsplice_in_parent(char *mem, size_t size,</div><div class='ctx'> 		.iov_base = mem,</div><div class='ctx'> 		.iov_len = size,</div><div class='ctx'> 	};</div><div class='del'>-	ssize_t cur, total, transferred;</div><div class='add'>+	ssize_t cur, total, transferred = 0;</div><div class='ctx'> 	struct comm_pipes comm_pipes;</div><div class='ctx'> 	char *old, *new;</div><div class='ctx'> 	int ret, fds[2];</div><div class='hunk'>@@ -306,26 +291,29 @@ static void do_test_vmsplice_in_parent(char *mem, size_t size,</div><div class='ctx'> </div><div class='ctx'> 	ret = setup_comm_pipes(&amp;comm_pipes);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ksft_test_result_fail("pipe() failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pipe(fds) &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("pipe() failed\n");</div><div class='add'>+		ksft_perror("pipe() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close_comm_pipes;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (before_fork) {</div><div class='ctx'> 		transferred = vmsplice(fds[1], &amp;iov, 1, 0);</div><div class='ctx'> 		if (transferred &lt;= 0) {</div><div class='del'>-			ksft_test_result_fail("vmsplice() failed\n");</div><div class='add'>+			ksft_perror("vmsplice() failed\n");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto close_pipe;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = fork();</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("fork() failed\n");</div><div class='add'>+		ksft_perror("fork() failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close_pipe;</div><div class='ctx'> 	} else if (!ret) {</div><div class='ctx'> 		write(comm_pipes.child_ready[1], "0", 1);</div><div class='hunk'>@@ -339,7 +327,8 @@ static void do_test_vmsplice_in_parent(char *mem, size_t size,</div><div class='ctx'> 	if (!before_fork) {</div><div class='ctx'> 		transferred = vmsplice(fds[1], &amp;iov, 1, 0);</div><div class='ctx'> 		if (transferred &lt;= 0) {</div><div class='del'>-			ksft_test_result_fail("vmsplice() failed\n");</div><div class='add'>+			ksft_perror("vmsplice() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			wait(&amp;ret);</div><div class='ctx'> 			goto close_pipe;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -348,7 +337,8 @@ static void do_test_vmsplice_in_parent(char *mem, size_t size,</div><div class='ctx'> 	while (read(comm_pipes.child_ready[0], &amp;buf, 1) != 1)</div><div class='ctx'> 		;</div><div class='ctx'> 	if (munmap(mem, size) &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("munmap() failed\n");</div><div class='add'>+		ksft_perror("munmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close_pipe;</div><div class='ctx'> 	}</div><div class='ctx'> 	write(comm_pipes.parent_ready[1], "0", 1);</div><div class='hunk'>@@ -356,7 +346,8 @@ static void do_test_vmsplice_in_parent(char *mem, size_t size,</div><div class='ctx'> 	/* Wait until the child is done writing. */</div><div class='ctx'> 	wait(&amp;ret);</div><div class='ctx'> 	if (!WIFEXITED(ret)) {</div><div class='del'>-		ksft_test_result_fail("wait() failed\n");</div><div class='add'>+		ksft_perror("wait() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close_pipe;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -364,22 +355,25 @@ static void do_test_vmsplice_in_parent(char *mem, size_t size,</div><div class='ctx'> 	for (total = 0; total &lt; transferred; total += cur) {</div><div class='ctx'> 		cur = read(fds[0], new + total, transferred - total);</div><div class='ctx'> 		if (cur &lt; 0) {</div><div class='del'>-			ksft_test_result_fail("read() failed\n");</div><div class='add'>+			ksft_perror("read() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto close_pipe;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!memcmp(old, new, transferred)) {</div><div class='del'>-		ksft_test_result_pass("No leak from child into parent\n");</div><div class='add'>+		log_test_result(KSFT_PASS);</div><div class='ctx'> 	} else if (xfail) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * With hugetlb, some vmsplice() tests are currently expected to</div><div class='ctx'> 		 * fail because (a) harder to fix and (b) nobody really cares.</div><div class='ctx'> 		 * Flag them as expected failure for now.</div><div class='ctx'> 		 */</div><div class='del'>-		ksft_test_result_xfail("Leak from child into parent\n");</div><div class='add'>+		ksft_print_msg("Leak from child into parent\n");</div><div class='add'>+		log_test_result(KSFT_XFAIL);</div><div class='ctx'> 	} else {</div><div class='del'>-		ksft_test_result_fail("Leak from child into parent\n");</div><div class='add'>+		ksft_print_msg("Leak from child into parent\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 	}</div><div class='ctx'> close_pipe:</div><div class='ctx'> 	close(fds[0]);</div><div class='hunk'>@@ -416,13 +410,14 @@ static void do_test_iouring(char *mem, size_t size, bool use_fork)</div><div class='ctx'> </div><div class='ctx'> 	ret = setup_comm_pipes(&amp;comm_pipes);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ksft_test_result_fail("pipe() failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	file = tmpfile();</div><div class='ctx'> 	if (!file) {</div><div class='del'>-		ksft_test_result_fail("tmpfile() failed\n");</div><div class='add'>+		ksft_perror("tmpfile() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close_comm_pipes;</div><div class='ctx'> 	}</div><div class='ctx'> 	fd = fileno(file);</div><div class='hunk'>@@ -430,14 +425,16 @@ static void do_test_iouring(char *mem, size_t size, bool use_fork)</div><div class='ctx'> </div><div class='ctx'> 	tmp = malloc(size);</div><div class='ctx'> 	if (!tmp) {</div><div class='del'>-		ksft_test_result_fail("malloc() failed\n");</div><div class='add'>+		ksft_print_msg("malloc() failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close_file;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Skip on errors, as we might just lack kernel support. */</div><div class='ctx'> 	ret = io_uring_queue_init(1, &amp;ring, 0);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		ksft_test_result_skip("io_uring_queue_init() failed\n");</div><div class='add'>+		ksft_print_msg("io_uring_queue_init() failed\n");</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		goto free_tmp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -452,7 +449,8 @@ static void do_test_iouring(char *mem, size_t size, bool use_fork)</div><div class='ctx'> 	iov.iov_len = size;</div><div class='ctx'> 	ret = io_uring_register_buffers(&amp;ring, &amp;iov, 1);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ksft_test_result_skip("io_uring_register_buffers() failed\n");</div><div class='add'>+		ksft_print_msg("io_uring_register_buffers() failed\n");</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		goto queue_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -463,7 +461,8 @@ static void do_test_iouring(char *mem, size_t size, bool use_fork)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = fork();</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			ksft_test_result_fail("fork() failed\n");</div><div class='add'>+			ksft_perror("fork() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto unregister_buffers;</div><div class='ctx'> 		} else if (!ret) {</div><div class='ctx'> 			write(comm_pipes.child_ready[1], "0", 1);</div><div class='hunk'>@@ -483,10 +482,17 @@ static void do_test_iouring(char *mem, size_t size, bool use_fork)</div><div class='ctx'> 		 * if the page is mapped R/O vs. R/W).</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = mprotect(mem, size, PROT_READ);</div><div class='add'>+		if (ret) {</div><div class='add'>+			ksft_perror("mprotect() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='add'>+			goto unregister_buffers;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		clear_softdirty();</div><div class='del'>-		ret |= mprotect(mem, size, PROT_READ | PROT_WRITE);</div><div class='add'>+		ret = mprotect(mem, size, PROT_READ | PROT_WRITE);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("mprotect() failed\n");</div><div class='add'>+			ksft_perror("mprotect() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto unregister_buffers;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -498,25 +504,29 @@ static void do_test_iouring(char *mem, size_t size, bool use_fork)</div><div class='ctx'> 	memset(mem, 0xff, size);</div><div class='ctx'> 	sqe = io_uring_get_sqe(&amp;ring);</div><div class='ctx'> 	if (!sqe) {</div><div class='del'>-		ksft_test_result_fail("io_uring_get_sqe() failed\n");</div><div class='add'>+		ksft_print_msg("io_uring_get_sqe() failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto quit_child;</div><div class='ctx'> 	}</div><div class='ctx'> 	io_uring_prep_write_fixed(sqe, fd, mem, size, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	ret = io_uring_submit(&amp;ring);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("io_uring_submit() failed\n");</div><div class='add'>+		ksft_print_msg("io_uring_submit() failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto quit_child;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = io_uring_wait_cqe(&amp;ring, &amp;cqe);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("io_uring_wait_cqe() failed\n");</div><div class='add'>+		ksft_print_msg("io_uring_wait_cqe() failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto quit_child;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cqe-&gt;res != size) {</div><div class='del'>-		ksft_test_result_fail("write_fixed failed\n");</div><div class='add'>+		ksft_print_msg("write_fixed failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto quit_child;</div><div class='ctx'> 	}</div><div class='ctx'> 	io_uring_cqe_seen(&amp;ring, cqe);</div><div class='hunk'>@@ -526,15 +536,20 @@ static void do_test_iouring(char *mem, size_t size, bool use_fork)</div><div class='ctx'> 	while (total &lt; size) {</div><div class='ctx'> 		cur = pread(fd, tmp + total, size - total, total);</div><div class='ctx'> 		if (cur &lt; 0) {</div><div class='del'>-			ksft_test_result_fail("pread() failed\n");</div><div class='add'>+			ksft_perror("pread() failed\n");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto quit_child;</div><div class='ctx'> 		}</div><div class='ctx'> 		total += cur;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Finally, check if we read what we expected. */</div><div class='del'>-	ksft_test_result(!memcmp(mem, tmp, size),</div><div class='del'>-			 "Longterm R/W pin is reliable\n");</div><div class='add'>+	if (!memcmp(mem, tmp, size)) {</div><div class='add'>+		log_test_result(KSFT_PASS);</div><div class='add'>+	} else {</div><div class='add'>+		ksft_print_msg("Longtom R/W pin is not reliable\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> quit_child:</div><div class='ctx'> 	if (use_fork) {</div><div class='hunk'>@@ -582,19 +597,21 @@ static void do_test_ro_pin(char *mem, size_t size, enum ro_pin_test test,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (gup_fd &lt; 0) {</div><div class='del'>-		ksft_test_result_skip("gup_test not available\n");</div><div class='add'>+		ksft_print_msg("gup_test not available\n");</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tmp = malloc(size);</div><div class='ctx'> 	if (!tmp) {</div><div class='del'>-		ksft_test_result_fail("malloc() failed\n");</div><div class='add'>+		ksft_perror("malloc() failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = setup_comm_pipes(&amp;comm_pipes);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ksft_test_result_fail("pipe() failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto free_tmp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -609,7 +626,8 @@ static void do_test_ro_pin(char *mem, size_t size, enum ro_pin_test test,</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = fork();</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			ksft_test_result_fail("fork() failed\n");</div><div class='add'>+			ksft_perror("fork() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto close_comm_pipes;</div><div class='ctx'> 		} else if (!ret) {</div><div class='ctx'> 			write(comm_pipes.child_ready[1], "0", 1);</div><div class='hunk'>@@ -646,7 +664,8 @@ static void do_test_ro_pin(char *mem, size_t size, enum ro_pin_test test,</div><div class='ctx'> 		clear_softdirty();</div><div class='ctx'> 		ret |= mprotect(mem, size, PROT_READ | PROT_WRITE);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("mprotect() failed\n");</div><div class='add'>+			ksft_perror("mprotect() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto close_comm_pipes;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -661,9 +680,11 @@ static void do_test_ro_pin(char *mem, size_t size, enum ro_pin_test test,</div><div class='ctx'> 	ret = ioctl(gup_fd, PIN_LONGTERM_TEST_START, &amp;args);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		if (errno == EINVAL)</div><div class='del'>-			ksft_test_result_skip("PIN_LONGTERM_TEST_START failed\n");</div><div class='add'>+			ret = KSFT_SKIP;</div><div class='ctx'> 		else</div><div class='del'>-			ksft_test_result_fail("PIN_LONGTERM_TEST_START failed\n");</div><div class='add'>+			ret = KSFT_FAIL;</div><div class='add'>+		ksft_perror("PIN_LONGTERM_TEST_START failed");</div><div class='add'>+		log_test_result(ret);</div><div class='ctx'> 		goto wait;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -676,22 +697,28 @@ static void do_test_ro_pin(char *mem, size_t size, enum ro_pin_test test,</div><div class='ctx'> 	 */</div><div class='ctx'> 	tmp_val = (__u64)(uintptr_t)tmp;</div><div class='ctx'> 	ret = ioctl(gup_fd, PIN_LONGTERM_TEST_READ, &amp;tmp_val);</div><div class='del'>-	if (ret)</div><div class='del'>-		ksft_test_result_fail("PIN_LONGTERM_TEST_READ failed\n");</div><div class='del'>-	else</div><div class='del'>-		ksft_test_result(!memcmp(mem, tmp, size),</div><div class='del'>-				 "Longterm R/O pin is reliable\n");</div><div class='add'>+	if (ret) {</div><div class='add'>+		ksft_perror("PIN_LONGTERM_TEST_READ failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='add'>+	} else {</div><div class='add'>+		if (!memcmp(mem, tmp, size)) {</div><div class='add'>+			log_test_result(KSFT_PASS);</div><div class='add'>+		} else {</div><div class='add'>+			ksft_print_msg("Longterm R/O pin is not reliable\n");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ioctl(gup_fd, PIN_LONGTERM_TEST_STOP);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		ksft_print_msg("[INFO] PIN_LONGTERM_TEST_STOP failed\n");</div><div class='add'>+		ksft_perror("PIN_LONGTERM_TEST_STOP failed");</div><div class='ctx'> wait:</div><div class='ctx'> 	switch (test) {</div><div class='ctx'> 	case RO_PIN_TEST_SHARED:</div><div class='ctx'> 		write(comm_pipes.parent_ready[1], "0", 1);</div><div class='ctx'> 		wait(&amp;ret);</div><div class='ctx'> 		if (!WIFEXITED(ret))</div><div class='del'>-			ksft_print_msg("[INFO] wait() failed\n");</div><div class='add'>+			ksft_perror("wait() failed");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -746,14 +773,16 @@ static void do_run_with_base_page(test_fn fn, bool swapout)</div><div class='ctx'> 	mem = mmap(NULL, pagesize, PROT_READ | PROT_WRITE,</div><div class='ctx'> 		   MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);</div><div class='ctx'> 	if (mem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		ksft_perror("mmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = madvise(mem, pagesize, MADV_NOHUGEPAGE);</div><div class='ctx'> 	/* Ignore if not around on a kernel. */</div><div class='ctx'> 	if (ret &amp;&amp; errno != EINVAL) {</div><div class='del'>-		ksft_test_result_fail("MADV_NOHUGEPAGE failed\n");</div><div class='add'>+		ksft_perror("MADV_NOHUGEPAGE failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto munmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -763,7 +792,8 @@ static void do_run_with_base_page(test_fn fn, bool swapout)</div><div class='ctx'> 	if (swapout) {</div><div class='ctx'> 		madvise(mem, pagesize, MADV_PAGEOUT);</div><div class='ctx'> 		if (!pagemap_is_swapped(pagemap_fd, mem)) {</div><div class='del'>-			ksft_test_result_skip("MADV_PAGEOUT did not work, is swap enabled?\n");</div><div class='add'>+			ksft_print_msg("MADV_PAGEOUT did not work, is swap enabled?\n");</div><div class='add'>+			log_test_result(KSFT_SKIP);</div><div class='ctx'> 			goto munmap;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -775,13 +805,13 @@ munmap:</div><div class='ctx'> </div><div class='ctx'> static void run_with_base_page(test_fn fn, const char *desc)</div><div class='ctx'> {</div><div class='del'>-	ksft_print_msg("[RUN] %s ... with base page\n", desc);</div><div class='add'>+	log_test_start("%s ... with base page", desc);</div><div class='ctx'> 	do_run_with_base_page(fn, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_with_base_page_swap(test_fn fn, const char *desc)</div><div class='ctx'> {</div><div class='del'>-	ksft_print_msg("[RUN] %s ... with swapped out base page\n", desc);</div><div class='add'>+	log_test_start("%s ... with swapped out base page", desc);</div><div class='ctx'> 	do_run_with_base_page(fn, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -807,7 +837,8 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run, size_t thpsize)</div><div class='ctx'> 	mmap_mem = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE,</div><div class='ctx'> 			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);</div><div class='ctx'> 	if (mmap_mem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		ksft_perror("mmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -816,7 +847,8 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run, size_t thpsize)</div><div class='ctx'> </div><div class='ctx'> 	ret = madvise(mem, thpsize, MADV_HUGEPAGE);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ksft_test_result_fail("MADV_HUGEPAGE failed\n");</div><div class='add'>+		ksft_perror("MADV_HUGEPAGE failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto munmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -826,7 +858,8 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run, size_t thpsize)</div><div class='ctx'> 	 */</div><div class='ctx'> 	mem[0] = 1;</div><div class='ctx'> 	if (!pagemap_is_populated(pagemap_fd, mem + thpsize - pagesize)) {</div><div class='del'>-		ksft_test_result_skip("Did not get a THP populated\n");</div><div class='add'>+		ksft_print_msg("Did not get a THP populated\n");</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		goto munmap;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(mem, 1, thpsize);</div><div class='hunk'>@@ -846,12 +879,14 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run, size_t thpsize)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = mprotect(mem + pagesize, pagesize, PROT_READ);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("mprotect() failed\n");</div><div class='add'>+			ksft_perror("mprotect() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto munmap;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = mprotect(mem + pagesize, pagesize, PROT_READ | PROT_WRITE);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("mprotect() failed\n");</div><div class='add'>+			ksft_perror("mprotect() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto munmap;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -863,7 +898,8 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run, size_t thpsize)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = madvise(mem + pagesize, thpsize - pagesize, MADV_DONTNEED);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("MADV_DONTNEED failed\n");</div><div class='add'>+			ksft_perror("MADV_DONTNEED failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto munmap;</div><div class='ctx'> 		}</div><div class='ctx'> 		size = pagesize;</div><div class='hunk'>@@ -876,14 +912,16 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run, size_t thpsize)</div><div class='ctx'> 		mremap_size = thpsize / 2;</div><div class='ctx'> 		mremap_mem = mmap(NULL, mremap_size, PROT_NONE,</div><div class='ctx'> 				  MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);</div><div class='del'>-		if (mem == MAP_FAILED) {</div><div class='del'>-			ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		if (mremap_mem == MAP_FAILED) {</div><div class='add'>+			ksft_perror("mmap() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto munmap;</div><div class='ctx'> 		}</div><div class='ctx'> 		tmp = mremap(mem + mremap_size, mremap_size, mremap_size,</div><div class='ctx'> 			     MREMAP_MAYMOVE | MREMAP_FIXED, mremap_mem);</div><div class='ctx'> 		if (tmp != mremap_mem) {</div><div class='del'>-			ksft_test_result_fail("mremap() failed\n");</div><div class='add'>+			ksft_perror("mremap() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto munmap;</div><div class='ctx'> 		}</div><div class='ctx'> 		size = mremap_size;</div><div class='hunk'>@@ -896,12 +934,14 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run, size_t thpsize)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = madvise(mem + pagesize, thpsize - pagesize, MADV_DONTFORK);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("MADV_DONTFORK failed\n");</div><div class='add'>+			ksft_perror("MADV_DONTFORK failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto munmap;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = fork();</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			ksft_test_result_fail("fork() failed\n");</div><div class='add'>+			ksft_perror("fork() failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto munmap;</div><div class='ctx'> 		} else if (!ret) {</div><div class='ctx'> 			exit(0);</div><div class='hunk'>@@ -910,7 +950,8 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run, size_t thpsize)</div><div class='ctx'> 		/* Allow for sharing all pages again. */</div><div class='ctx'> 		ret = madvise(mem + pagesize, thpsize - pagesize, MADV_DOFORK);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("MADV_DOFORK failed\n");</div><div class='add'>+			ksft_perror("MADV_DOFORK failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto munmap;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -924,7 +965,8 @@ static void do_run_with_thp(test_fn fn, enum thp_run thp_run, size_t thpsize)</div><div class='ctx'> 	case THP_RUN_SINGLE_PTE_SWAPOUT:</div><div class='ctx'> 		madvise(mem, size, MADV_PAGEOUT);</div><div class='ctx'> 		if (!range_is_swapped(mem, size)) {</div><div class='del'>-			ksft_test_result_skip("MADV_PAGEOUT did not work, is swap enabled?\n");</div><div class='add'>+			ksft_print_msg("MADV_PAGEOUT did not work, is swap enabled?\n");</div><div class='add'>+			log_test_result(KSFT_SKIP);</div><div class='ctx'> 			goto munmap;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -941,56 +983,56 @@ munmap:</div><div class='ctx'> </div><div class='ctx'> static void run_with_thp(test_fn fn, const char *desc, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ksft_print_msg("[RUN] %s ... with THP (%zu kB)\n",</div><div class='add'>+	log_test_start("%s ... with THP (%zu kB)",</div><div class='ctx'> 		desc, size / 1024);</div><div class='ctx'> 	do_run_with_thp(fn, THP_RUN_PMD, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_with_thp_swap(test_fn fn, const char *desc, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ksft_print_msg("[RUN] %s ... with swapped-out THP (%zu kB)\n",</div><div class='add'>+	log_test_start("%s ... with swapped-out THP (%zu kB)",</div><div class='ctx'> 		desc, size / 1024);</div><div class='ctx'> 	do_run_with_thp(fn, THP_RUN_PMD_SWAPOUT, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_with_pte_mapped_thp(test_fn fn, const char *desc, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ksft_print_msg("[RUN] %s ... with PTE-mapped THP (%zu kB)\n",</div><div class='add'>+	log_test_start("%s ... with PTE-mapped THP (%zu kB)",</div><div class='ctx'> 		desc, size / 1024);</div><div class='ctx'> 	do_run_with_thp(fn, THP_RUN_PTE, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_with_pte_mapped_thp_swap(test_fn fn, const char *desc, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ksft_print_msg("[RUN] %s ... with swapped-out, PTE-mapped THP (%zu kB)\n",</div><div class='add'>+	log_test_start("%s ... with swapped-out, PTE-mapped THP (%zu kB)",</div><div class='ctx'> 		desc, size / 1024);</div><div class='ctx'> 	do_run_with_thp(fn, THP_RUN_PTE_SWAPOUT, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_with_single_pte_of_thp(test_fn fn, const char *desc, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ksft_print_msg("[RUN] %s ... with single PTE of THP (%zu kB)\n",</div><div class='add'>+	log_test_start("%s ... with single PTE of THP (%zu kB)",</div><div class='ctx'> 		desc, size / 1024);</div><div class='ctx'> 	do_run_with_thp(fn, THP_RUN_SINGLE_PTE, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_with_single_pte_of_thp_swap(test_fn fn, const char *desc, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ksft_print_msg("[RUN] %s ... with single PTE of swapped-out THP (%zu kB)\n",</div><div class='add'>+	log_test_start("%s ... with single PTE of swapped-out THP (%zu kB)",</div><div class='ctx'> 		desc, size / 1024);</div><div class='ctx'> 	do_run_with_thp(fn, THP_RUN_SINGLE_PTE_SWAPOUT, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_with_partial_mremap_thp(test_fn fn, const char *desc, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ksft_print_msg("[RUN] %s ... with partially mremap()'ed THP (%zu kB)\n",</div><div class='add'>+	log_test_start("%s ... with partially mremap()'ed THP (%zu kB)",</div><div class='ctx'> 		desc, size / 1024);</div><div class='ctx'> 	do_run_with_thp(fn, THP_RUN_PARTIAL_MREMAP, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_with_partial_shared_thp(test_fn fn, const char *desc, size_t size)</div><div class='ctx'> {</div><div class='del'>-	ksft_print_msg("[RUN] %s ... with partially shared THP (%zu kB)\n",</div><div class='add'>+	log_test_start("%s ... with partially shared THP (%zu kB)",</div><div class='ctx'> 		desc, size / 1024);</div><div class='ctx'> 	do_run_with_thp(fn, THP_RUN_PARTIAL_SHARED, size);</div><div class='ctx'> }</div><div class='hunk'>@@ -1000,14 +1042,15 @@ static void run_with_hugetlb(test_fn fn, const char *desc, size_t hugetlbsize)</div><div class='ctx'> 	int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB;</div><div class='ctx'> 	char *mem, *dummy;</div><div class='ctx'> </div><div class='del'>-	ksft_print_msg("[RUN] %s ... with hugetlb (%zu kB)\n", desc,</div><div class='add'>+	log_test_start("%s ... with hugetlb (%zu kB)", desc,</div><div class='ctx'> 		       hugetlbsize / 1024);</div><div class='ctx'> </div><div class='ctx'> 	flags |= __builtin_ctzll(hugetlbsize) &lt;&lt; MAP_HUGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	mem = mmap(NULL, hugetlbsize, PROT_READ | PROT_WRITE, flags, -1, 0);</div><div class='ctx'> 	if (mem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_skip("need more free huge pages\n");</div><div class='add'>+		ksft_perror("need more free huge pages");</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1020,7 +1063,8 @@ static void run_with_hugetlb(test_fn fn, const char *desc, size_t hugetlbsize)</div><div class='ctx'> 	 */</div><div class='ctx'> 	dummy = mmap(NULL, hugetlbsize, PROT_READ | PROT_WRITE, flags, -1, 0);</div><div class='ctx'> 	if (dummy == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_skip("need more free huge pages\n");</div><div class='add'>+		ksft_perror("need more free huge pages");</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		goto munmap;</div><div class='ctx'> 	}</div><div class='ctx'> 	munmap(dummy, hugetlbsize);</div><div class='hunk'>@@ -1167,8 +1211,8 @@ static void run_anon_test_case(struct test_case const *test_case)</div><div class='ctx'> 		size_t size = thpsizes[i];</div><div class='ctx'> 		struct thp_settings settings = *thp_current_settings();</div><div class='ctx'> </div><div class='del'>-		settings.hugepages[sz2ord(pmdsize)].enabled = THP_NEVER;</div><div class='del'>-		settings.hugepages[sz2ord(size)].enabled = THP_ALWAYS;</div><div class='add'>+		settings.hugepages[sz2ord(pmdsize, pagesize)].enabled = THP_NEVER;</div><div class='add'>+		settings.hugepages[sz2ord(size, pagesize)].enabled = THP_ALWAYS;</div><div class='ctx'> 		thp_push_settings(&amp;settings);</div><div class='ctx'> </div><div class='ctx'> 		if (size == pmdsize) {</div><div class='hunk'>@@ -1226,7 +1270,7 @@ static void do_test_anon_thp_collapse(char *mem, size_t size,</div><div class='ctx'> </div><div class='ctx'> 	ret = setup_comm_pipes(&amp;comm_pipes);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ksft_test_result_fail("pipe() failed\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1236,12 +1280,14 @@ static void do_test_anon_thp_collapse(char *mem, size_t size,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = mprotect(mem + pagesize, pagesize, PROT_READ);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ksft_test_result_fail("mprotect() failed\n");</div><div class='add'>+		ksft_perror("mprotect() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close_comm_pipes;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = mprotect(mem + pagesize, pagesize, PROT_READ | PROT_WRITE);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ksft_test_result_fail("mprotect() failed\n");</div><div class='add'>+		ksft_perror("mprotect() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close_comm_pipes;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1250,8 +1296,8 @@ static void do_test_anon_thp_collapse(char *mem, size_t size,</div><div class='ctx'> 		/* Collapse before actually COW-sharing the page. */</div><div class='ctx'> 		ret = madvise(mem, size, MADV_COLLAPSE);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_skip("MADV_COLLAPSE failed: %s\n",</div><div class='del'>-					      strerror(errno));</div><div class='add'>+			ksft_perror("MADV_COLLAPSE failed");</div><div class='add'>+			log_test_result(KSFT_SKIP);</div><div class='ctx'> 			goto close_comm_pipes;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1262,7 +1308,8 @@ static void do_test_anon_thp_collapse(char *mem, size_t size,</div><div class='ctx'> 		/* Don't COW-share the upper part of the THP. */</div><div class='ctx'> 		ret = madvise(mem + size / 2, size / 2, MADV_DONTFORK);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("MADV_DONTFORK failed\n");</div><div class='add'>+			ksft_perror("MADV_DONTFORK failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto close_comm_pipes;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1270,7 +1317,8 @@ static void do_test_anon_thp_collapse(char *mem, size_t size,</div><div class='ctx'> 		/* Don't COW-share the lower part of the THP. */</div><div class='ctx'> 		ret = madvise(mem, size / 2, MADV_DONTFORK);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("MADV_DONTFORK failed\n");</div><div class='add'>+			ksft_perror("MADV_DONTFORK failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			goto close_comm_pipes;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1280,7 +1328,8 @@ static void do_test_anon_thp_collapse(char *mem, size_t size,</div><div class='ctx'> </div><div class='ctx'> 	ret = fork();</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("fork() failed\n");</div><div class='add'>+		ksft_perror("fork() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close_comm_pipes;</div><div class='ctx'> 	} else if (!ret) {</div><div class='ctx'> 		switch (test) {</div><div class='hunk'>@@ -1314,7 +1363,8 @@ static void do_test_anon_thp_collapse(char *mem, size_t size,</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = madvise(mem, size, MADV_DOFORK);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("MADV_DOFORK failed\n");</div><div class='add'>+			ksft_perror("MADV_DOFORK failed");</div><div class='add'>+			log_test_result(KSFT_FAIL);</div><div class='ctx'> 			write(comm_pipes.parent_ready[1], "0", 1);</div><div class='ctx'> 			wait(&amp;ret);</div><div class='ctx'> 			goto close_comm_pipes;</div><div class='hunk'>@@ -1324,8 +1374,8 @@ static void do_test_anon_thp_collapse(char *mem, size_t size,</div><div class='ctx'> 		/* Collapse before anyone modified the COW-shared page. */</div><div class='ctx'> 		ret = madvise(mem, size, MADV_COLLAPSE);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_skip("MADV_COLLAPSE failed: %s\n",</div><div class='del'>-					      strerror(errno));</div><div class='add'>+			ksft_perror("MADV_COLLAPSE failed");</div><div class='add'>+			log_test_result(KSFT_SKIP);</div><div class='ctx'> 			write(comm_pipes.parent_ready[1], "0", 1);</div><div class='ctx'> 			wait(&amp;ret);</div><div class='ctx'> 			goto close_comm_pipes;</div><div class='hunk'>@@ -1345,7 +1395,12 @@ static void do_test_anon_thp_collapse(char *mem, size_t size,</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	ksft_test_result(!ret, "No leak from parent into child\n");</div><div class='add'>+	if (!ret) {</div><div class='add'>+		log_test_result(KSFT_PASS);</div><div class='add'>+	} else {</div><div class='add'>+		ksft_print_msg("Leak from parent into child\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='add'>+	}</div><div class='ctx'> close_comm_pipes:</div><div class='ctx'> 	close_comm_pipes(&amp;comm_pipes);</div><div class='ctx'> }</div><div class='hunk'>@@ -1430,7 +1485,7 @@ static void run_anon_thp_test_cases(void)</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(anon_thp_test_cases); i++) {</div><div class='ctx'> 		struct test_case const *test_case = &amp;anon_thp_test_cases[i];</div><div class='ctx'> </div><div class='del'>-		ksft_print_msg("[RUN] %s\n", test_case-&gt;desc);</div><div class='add'>+		log_test_start("%s", test_case-&gt;desc);</div><div class='ctx'> 		do_run_with_thp(test_case-&gt;fn, THP_RUN_PMD, pmdsize);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1453,8 +1508,12 @@ static void test_cow(char *mem, const char *smem, size_t size)</div><div class='ctx'> 	memset(mem, 0xff, size);</div><div class='ctx'> </div><div class='ctx'> 	/* See if we still read the old values via the other mapping. */</div><div class='del'>-	ksft_test_result(!memcmp(smem, old, size),</div><div class='del'>-			 "Other mapping not modified\n");</div><div class='add'>+	if (!memcmp(smem, old, size)) {</div><div class='add'>+		log_test_result(KSFT_PASS);</div><div class='add'>+	} else {</div><div class='add'>+		ksft_print_msg("Other mapping modified\n");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='add'>+	}</div><div class='ctx'> 	free(old);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1470,26 +1529,28 @@ static void test_ro_fast_pin(char *mem, const char *smem, size_t size)</div><div class='ctx'> </div><div class='ctx'> static void run_with_zeropage(non_anon_test_fn fn, const char *desc)</div><div class='ctx'> {</div><div class='del'>-	char *mem, *smem, tmp;</div><div class='add'>+	char *mem, *smem;</div><div class='ctx'> </div><div class='del'>-	ksft_print_msg("[RUN] %s ... with shared zeropage\n", desc);</div><div class='add'>+	log_test_start("%s ... with shared zeropage", desc);</div><div class='ctx'> </div><div class='ctx'> 	mem = mmap(NULL, pagesize, PROT_READ | PROT_WRITE,</div><div class='ctx'> 		   MAP_PRIVATE | MAP_ANON, -1, 0);</div><div class='ctx'> 	if (mem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		ksft_perror("mmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	smem = mmap(NULL, pagesize, PROT_READ, MAP_PRIVATE | MAP_ANON, -1, 0);</div><div class='ctx'> 	if (smem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		ksft_perror("mmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto munmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read from the page to populate the shared zeropage. */</div><div class='del'>-	tmp = *mem + *smem;</div><div class='del'>-	asm volatile("" : "+r" (tmp));</div><div class='add'>+	FORCE_READ(*mem);</div><div class='add'>+	FORCE_READ(*smem);</div><div class='ctx'> </div><div class='ctx'> 	fn(mem, smem, pagesize);</div><div class='ctx'> munmap:</div><div class='hunk'>@@ -1500,14 +1561,15 @@ munmap:</div><div class='ctx'> </div><div class='ctx'> static void run_with_huge_zeropage(non_anon_test_fn fn, const char *desc)</div><div class='ctx'> {</div><div class='del'>-	char *mem, *smem, *mmap_mem, *mmap_smem, tmp;</div><div class='add'>+	char *mem, *smem, *mmap_mem, *mmap_smem;</div><div class='ctx'> 	size_t mmap_size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ksft_print_msg("[RUN] %s ... with huge zeropage\n", desc);</div><div class='add'>+	log_test_start("%s ... with huge zeropage", desc);</div><div class='ctx'> </div><div class='ctx'> 	if (!has_huge_zeropage) {</div><div class='del'>-		ksft_test_result_skip("Huge zeropage not enabled\n");</div><div class='add'>+		ksft_print_msg("Huge zeropage not enabled\n");</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1516,13 +1578,15 @@ static void run_with_huge_zeropage(non_anon_test_fn fn, const char *desc)</div><div class='ctx'> 	mmap_mem = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE,</div><div class='ctx'> 			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);</div><div class='ctx'> 	if (mmap_mem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		ksft_perror("mmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	mmap_smem = mmap(NULL, mmap_size, PROT_READ,</div><div class='ctx'> 			 MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);</div><div class='ctx'> 	if (mmap_smem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		ksft_perror("mmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto munmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1531,9 +1595,15 @@ static void run_with_huge_zeropage(non_anon_test_fn fn, const char *desc)</div><div class='ctx'> 	smem = (char *)(((uintptr_t)mmap_smem + pmdsize) &amp; ~(pmdsize - 1));</div><div class='ctx'> </div><div class='ctx'> 	ret = madvise(mem, pmdsize, MADV_HUGEPAGE);</div><div class='del'>-	ret |= madvise(smem, pmdsize, MADV_HUGEPAGE);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ksft_test_result_fail("MADV_HUGEPAGE failed\n");</div><div class='add'>+		ksft_perror("madvise()");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='add'>+		goto munmap;</div><div class='add'>+	}</div><div class='add'>+	ret = madvise(smem, pmdsize, MADV_HUGEPAGE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ksft_perror("madvise()");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto munmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1542,8 +1612,8 @@ static void run_with_huge_zeropage(non_anon_test_fn fn, const char *desc)</div><div class='ctx'> 	 * the first sub-page and test if we get another sub-page populated</div><div class='ctx'> 	 * automatically.</div><div class='ctx'> 	 */</div><div class='del'>-	tmp = *mem + *smem;</div><div class='del'>-	asm volatile("" : "+r" (tmp));</div><div class='add'>+	FORCE_READ(mem);</div><div class='add'>+	FORCE_READ(smem);</div><div class='ctx'> 	if (!pagemap_is_populated(pagemap_fd, mem + pagesize) ||</div><div class='ctx'> 	    !pagemap_is_populated(pagemap_fd, smem + pagesize)) {</div><div class='ctx'> 		ksft_test_result_skip("Did not get THPs populated\n");</div><div class='hunk'>@@ -1559,38 +1629,42 @@ munmap:</div><div class='ctx'> </div><div class='ctx'> static void run_with_memfd(non_anon_test_fn fn, const char *desc)</div><div class='ctx'> {</div><div class='del'>-	char *mem, *smem, tmp;</div><div class='add'>+	char *mem, *smem;</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='del'>-	ksft_print_msg("[RUN] %s ... with memfd\n", desc);</div><div class='add'>+	log_test_start("%s ... with memfd", desc);</div><div class='ctx'> </div><div class='ctx'> 	fd = memfd_create("test", 0);</div><div class='ctx'> 	if (fd &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("memfd_create() failed\n");</div><div class='add'>+		ksft_perror("memfd_create() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* File consists of a single page filled with zeroes. */</div><div class='ctx'> 	if (fallocate(fd, 0, 0, pagesize)) {</div><div class='del'>-		ksft_test_result_fail("fallocate() failed\n");</div><div class='add'>+		ksft_perror("fallocate() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create a private mapping of the memfd. */</div><div class='ctx'> 	mem = mmap(NULL, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);</div><div class='ctx'> 	if (mem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		ksft_perror("mmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close;</div><div class='ctx'> 	}</div><div class='ctx'> 	smem = mmap(NULL, pagesize, PROT_READ, MAP_SHARED, fd, 0);</div><div class='ctx'> 	if (smem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		ksft_perror("mmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto munmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fault the page in. */</div><div class='del'>-	tmp = *mem + *smem;</div><div class='del'>-	asm volatile("" : "+r" (tmp));</div><div class='add'>+	FORCE_READ(mem);</div><div class='add'>+	FORCE_READ(smem);</div><div class='ctx'> </div><div class='ctx'> 	fn(mem, smem, pagesize);</div><div class='ctx'> munmap:</div><div class='hunk'>@@ -1603,45 +1677,50 @@ close:</div><div class='ctx'> </div><div class='ctx'> static void run_with_tmpfile(non_anon_test_fn fn, const char *desc)</div><div class='ctx'> {</div><div class='del'>-	char *mem, *smem, tmp;</div><div class='add'>+	char *mem, *smem;</div><div class='ctx'> 	FILE *file;</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='del'>-	ksft_print_msg("[RUN] %s ... with tmpfile\n", desc);</div><div class='add'>+	log_test_start("%s ... with tmpfile", desc);</div><div class='ctx'> </div><div class='ctx'> 	file = tmpfile();</div><div class='ctx'> 	if (!file) {</div><div class='del'>-		ksft_test_result_fail("tmpfile() failed\n");</div><div class='add'>+		ksft_perror("tmpfile() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fd = fileno(file);</div><div class='ctx'> 	if (fd &lt; 0) {</div><div class='del'>-		ksft_test_result_skip("fileno() failed\n");</div><div class='add'>+		ksft_perror("fileno() failed");</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* File consists of a single page filled with zeroes. */</div><div class='ctx'> 	if (fallocate(fd, 0, 0, pagesize)) {</div><div class='del'>-		ksft_test_result_fail("fallocate() failed\n");</div><div class='add'>+		ksft_perror("fallocate() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create a private mapping of the memfd. */</div><div class='ctx'> 	mem = mmap(NULL, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);</div><div class='ctx'> 	if (mem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		ksft_perror("mmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto close;</div><div class='ctx'> 	}</div><div class='ctx'> 	smem = mmap(NULL, pagesize, PROT_READ, MAP_SHARED, fd, 0);</div><div class='ctx'> 	if (smem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		ksft_perror("mmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto munmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fault the page in. */</div><div class='del'>-	tmp = *mem + *smem;</div><div class='del'>-	asm volatile("" : "+r" (tmp));</div><div class='add'>+	FORCE_READ(mem);</div><div class='add'>+	FORCE_READ(smem);</div><div class='ctx'> </div><div class='ctx'> 	fn(mem, smem, pagesize);</div><div class='ctx'> munmap:</div><div class='hunk'>@@ -1656,23 +1735,25 @@ static void run_with_memfd_hugetlb(non_anon_test_fn fn, const char *desc,</div><div class='ctx'> 				   size_t hugetlbsize)</div><div class='ctx'> {</div><div class='ctx'> 	int flags = MFD_HUGETLB;</div><div class='del'>-	char *mem, *smem, tmp;</div><div class='add'>+	char *mem, *smem;</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='del'>-	ksft_print_msg("[RUN] %s ... with memfd hugetlb (%zu kB)\n", desc,</div><div class='add'>+	log_test_start("%s ... with memfd hugetlb (%zu kB)", desc,</div><div class='ctx'> 		       hugetlbsize / 1024);</div><div class='ctx'> </div><div class='ctx'> 	flags |= __builtin_ctzll(hugetlbsize) &lt;&lt; MFD_HUGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	fd = memfd_create("test", flags);</div><div class='ctx'> 	if (fd &lt; 0) {</div><div class='del'>-		ksft_test_result_skip("memfd_create() failed\n");</div><div class='add'>+		ksft_perror("memfd_create() failed");</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* File consists of a single page filled with zeroes. */</div><div class='ctx'> 	if (fallocate(fd, 0, 0, hugetlbsize)) {</div><div class='del'>-		ksft_test_result_skip("need more free huge pages\n");</div><div class='add'>+		ksft_perror("need more free huge pages");</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		goto close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1680,18 +1761,20 @@ static void run_with_memfd_hugetlb(non_anon_test_fn fn, const char *desc,</div><div class='ctx'> 	mem = mmap(NULL, hugetlbsize, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,</div><div class='ctx'> 		   0);</div><div class='ctx'> 	if (mem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_skip("need more free huge pages\n");</div><div class='add'>+		ksft_perror("need more free huge pages");</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		goto close;</div><div class='ctx'> 	}</div><div class='ctx'> 	smem = mmap(NULL, hugetlbsize, PROT_READ, MAP_SHARED, fd, 0);</div><div class='ctx'> 	if (smem == MAP_FAILED) {</div><div class='del'>-		ksft_test_result_fail("mmap() failed\n");</div><div class='add'>+		ksft_perror("mmap() failed");</div><div class='add'>+		log_test_result(KSFT_FAIL);</div><div class='ctx'> 		goto munmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fault the page in. */</div><div class='del'>-	tmp = *mem + *smem;</div><div class='del'>-	asm volatile("" : "+r" (tmp));</div><div class='add'>+	FORCE_READ(mem);</div><div class='add'>+	FORCE_READ(smem);</div><div class='ctx'> </div><div class='ctx'> 	fn(mem, smem, hugetlbsize);</div><div class='ctx'> munmap:</div><div class='hunk'>@@ -1771,7 +1854,6 @@ static int tests_per_non_anon_test_case(void)</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	struct thp_settings default_settings;</div><div class='ctx'> </div><div class='ctx'> 	ksft_print_header();</div><div class='hunk'>@@ -1781,7 +1863,7 @@ int main(int argc, char **argv)</div><div class='ctx'> 	if (pmdsize) {</div><div class='ctx'> 		/* Only if THP is supported. */</div><div class='ctx'> 		thp_read_settings(&amp;default_settings);</div><div class='del'>-		default_settings.hugepages[sz2ord(pmdsize)].enabled = THP_INHERIT;</div><div class='add'>+		default_settings.hugepages[sz2ord(pmdsize, pagesize)].enabled = THP_INHERIT;</div><div class='ctx'> 		thp_save_settings();</div><div class='ctx'> 		thp_push_settings(&amp;default_settings);</div><div class='ctx'> </div><div class='hunk'>@@ -1791,7 +1873,7 @@ int main(int argc, char **argv)</div><div class='ctx'> 	}</div><div class='ctx'> 	nr_hugetlbsizes = detect_hugetlb_page_sizes(hugetlbsizes,</div><div class='ctx'> 						    ARRAY_SIZE(hugetlbsizes));</div><div class='del'>-	detect_huge_zeropage();</div><div class='add'>+	has_huge_zeropage = detect_huge_zeropage();</div><div class='ctx'> </div><div class='ctx'> 	ksft_set_plan(ARRAY_SIZE(anon_test_cases) * tests_per_anon_test_case() +</div><div class='ctx'> 		      ARRAY_SIZE(anon_thp_test_cases) * tests_per_anon_thp_test_case() +</div><div class='hunk'>@@ -1811,9 +1893,5 @@ int main(int argc, char **argv)</div><div class='ctx'> 		thp_restore_settings();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ksft_get_fail_cnt();</div><div class='del'>-	if (err)</div><div class='del'>-		ksft_exit_fail_msg("%d out of %d tests failed\n",</div><div class='del'>-				   err, ksft_test_num());</div><div class='del'>-	ksft_exit_pass();</div><div class='add'>+	ksft_finished();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/mm/droppable.c b/tools/testing/selftests/mm/droppable.c<br/>index f3d9ecf96890..44940f75c461 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/droppable.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/droppable.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/droppable.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/droppable.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char *argv[])</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/mm/guard-pages.c b/tools/testing/selftests/mm/guard-pages.c<br/>deleted file mode 100644<br/>index ece37212a8a2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/guard-pages.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/guard-pages.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1320 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-</div><div class='del'>-#define _GNU_SOURCE</div><div class='del'>-#include "../kselftest_harness.h"</div><div class='del'>-#include &lt;asm-generic/mman.h&gt; /* Force the import of the tools version. */</div><div class='del'>-#include &lt;assert.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;linux/userfaultfd.h&gt;</div><div class='del'>-#include &lt;setjmp.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;stdbool.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;sys/mman.h&gt;</div><div class='del'>-#include &lt;sys/syscall.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Ignore the checkpatch warning, as per the C99 standard, section 7.14.1.1:</div><div class='del'>- *</div><div class='del'>- * "If the signal occurs other than as the result of calling the abort or raise</div><div class='del'>- *  function, the behavior is undefined if the signal handler refers to any</div><div class='del'>- *  object with static storage duration other than by assigning a value to an</div><div class='del'>- *  object declared as volatile sig_atomic_t"</div><div class='del'>- */</div><div class='del'>-static volatile sig_atomic_t signal_jump_set;</div><div class='del'>-static sigjmp_buf signal_jmp_buf;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Ignore the checkpatch warning, we must read from x but don't want to do</div><div class='del'>- * anything with it in order to trigger a read page fault. We therefore must use</div><div class='del'>- * volatile to stop the compiler from optimising this away.</div><div class='del'>- */</div><div class='del'>-#define FORCE_READ(x) (*(volatile typeof(x) *)x)</div><div class='del'>-</div><div class='del'>-static int userfaultfd(int flags)</div><div class='del'>-{</div><div class='del'>-	return syscall(SYS_userfaultfd, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void handle_fatal(int c)</div><div class='del'>-{</div><div class='del'>-	if (!signal_jump_set)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	siglongjmp(signal_jmp_buf, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pidfd_open(pid_t pid, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	return syscall(SYS_pidfd_open, pid, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t sys_process_madvise(int pidfd, const struct iovec *iovec,</div><div class='del'>-				   size_t n, int advice, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	return syscall(__NR_process_madvise, pidfd, iovec, n, advice, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Enable our signal catcher and try to read/write the specified buffer. The</div><div class='del'>- * return value indicates whether the read/write succeeds without a fatal</div><div class='del'>- * signal.</div><div class='del'>- */</div><div class='del'>-static bool try_access_buf(char *ptr, bool write)</div><div class='del'>-{</div><div class='del'>-	bool failed;</div><div class='del'>-</div><div class='del'>-	/* Tell signal handler to jump back here on fatal signal. */</div><div class='del'>-	signal_jump_set = true;</div><div class='del'>-	/* If a fatal signal arose, we will jump back here and failed is set. */</div><div class='del'>-	failed = sigsetjmp(signal_jmp_buf, 0) != 0;</div><div class='del'>-</div><div class='del'>-	if (!failed) {</div><div class='del'>-		if (write)</div><div class='del'>-			*ptr = 'x';</div><div class='del'>-		else</div><div class='del'>-			FORCE_READ(ptr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	signal_jump_set = false;</div><div class='del'>-	return !failed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Try and read from a buffer, return true if no fatal signal. */</div><div class='del'>-static bool try_read_buf(char *ptr)</div><div class='del'>-{</div><div class='del'>-	return try_access_buf(ptr, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Try and write to a buffer, return true if no fatal signal. */</div><div class='del'>-static bool try_write_buf(char *ptr)</div><div class='del'>-{</div><div class='del'>-	return try_access_buf(ptr, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Try and BOTH read from AND write to a buffer, return true if BOTH operations</div><div class='del'>- * succeed.</div><div class='del'>- */</div><div class='del'>-static bool try_read_write_buf(char *ptr)</div><div class='del'>-{</div><div class='del'>-	return try_read_buf(ptr) &amp;&amp; try_write_buf(ptr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FIXTURE(guard_pages)</div><div class='del'>-{</div><div class='del'>-	unsigned long page_size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-FIXTURE_SETUP(guard_pages)</div><div class='del'>-{</div><div class='del'>-	struct sigaction act = {</div><div class='del'>-		.sa_handler = &amp;handle_fatal,</div><div class='del'>-		.sa_flags = SA_NODEFER,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sigemptyset(&amp;act.sa_mask);</div><div class='del'>-	if (sigaction(SIGSEGV, &amp;act, NULL))</div><div class='del'>-		ksft_exit_fail_perror("sigaction");</div><div class='del'>-</div><div class='del'>-	self-&gt;page_size = (unsigned long)sysconf(_SC_PAGESIZE);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-FIXTURE_TEARDOWN(guard_pages)</div><div class='del'>-{</div><div class='del'>-	struct sigaction act = {</div><div class='del'>-		.sa_handler = SIG_DFL,</div><div class='del'>-		.sa_flags = SA_NODEFER,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	sigemptyset(&amp;act.sa_mask);</div><div class='del'>-	sigaction(SIGSEGV, &amp;act, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-TEST_F(guard_pages, basic)</div><div class='del'>-{</div><div class='del'>-	const unsigned long NUM_PAGES = 10;</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ptr = mmap(NULL, NUM_PAGES * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_PRIVATE | MAP_ANON, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Trivially assert we can touch the first page. */</div><div class='del'>-	ASSERT_TRUE(try_read_write_buf(ptr));</div><div class='del'>-</div><div class='del'>-	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Establish that 1st page SIGSEGV's. */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='del'>-</div><div class='del'>-	/* Ensure we can touch everything else.*/</div><div class='del'>-	for (i = 1; i &lt; NUM_PAGES; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Establish a guard page at the end of the mapping. */</div><div class='del'>-	ASSERT_EQ(madvise(&amp;ptr[(NUM_PAGES - 1) * page_size], page_size,</div><div class='del'>-			  MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Check that both guard pages result in SIGSEGV. */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr[(NUM_PAGES - 1) * page_size]));</div><div class='del'>-</div><div class='del'>-	/* Remove the first guard page. */</div><div class='del'>-	ASSERT_FALSE(madvise(ptr, page_size, MADV_GUARD_REMOVE));</div><div class='del'>-</div><div class='del'>-	/* Make sure we can touch it. */</div><div class='del'>-	ASSERT_TRUE(try_read_write_buf(ptr));</div><div class='del'>-</div><div class='del'>-	/* Remove the last guard page. */</div><div class='del'>-	ASSERT_FALSE(madvise(&amp;ptr[(NUM_PAGES - 1) * page_size], page_size,</div><div class='del'>-			     MADV_GUARD_REMOVE));</div><div class='del'>-</div><div class='del'>-	/* Make sure we can touch it. */</div><div class='del'>-	ASSERT_TRUE(try_read_write_buf(&amp;ptr[(NUM_PAGES - 1) * page_size]));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Test setting a _range_ of pages, namely the first 3. The first of</div><div class='del'>-	 *  these be faulted in, so this also tests that we can install guard</div><div class='del'>-	 *  pages over backed pages.</div><div class='del'>-	 */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 3 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure they are all guard pages. */</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make sure the rest are not. */</div><div class='del'>-	for (i = 3; i &lt; NUM_PAGES; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Remove guard pages. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, NUM_PAGES * page_size, MADV_GUARD_REMOVE), 0);</div><div class='del'>-</div><div class='del'>-	/* Now make sure we can touch everything. */</div><div class='del'>-	for (i = 0; i &lt; NUM_PAGES; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now remove all guard pages, make sure we don't remove existing</div><div class='del'>-	 * entries.</div><div class='del'>-	 */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, NUM_PAGES * page_size, MADV_GUARD_REMOVE), 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_PAGES * page_size; i += page_size) {</div><div class='del'>-		char chr = ptr[i];</div><div class='del'>-</div><div class='del'>-		ASSERT_EQ(chr, 'x');</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ASSERT_EQ(munmap(ptr, NUM_PAGES * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Assert that operations applied across multiple VMAs work as expected. */</div><div class='del'>-TEST_F(guard_pages, multi_vma)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr_region, *ptr, *ptr1, *ptr2, *ptr3;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Reserve a 100 page region over which we can install VMAs. */</div><div class='del'>-	ptr_region = mmap(NULL, 100 * page_size, PROT_NONE,</div><div class='del'>-			  MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr_region, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Place a VMA of 10 pages size at the start of the region. */</div><div class='del'>-	ptr1 = mmap(ptr_region, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		    MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr1, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Place a VMA of 5 pages size 50 pages into the region. */</div><div class='del'>-	ptr2 = mmap(&amp;ptr_region[50 * page_size], 5 * page_size,</div><div class='del'>-		    PROT_READ | PROT_WRITE,</div><div class='del'>-		    MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr2, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Place a VMA of 20 pages size at the end of the region. */</div><div class='del'>-	ptr3 = mmap(&amp;ptr_region[80 * page_size], 20 * page_size,</div><div class='del'>-		    PROT_READ | PROT_WRITE,</div><div class='del'>-		    MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr3, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Unmap gaps. */</div><div class='del'>-	ASSERT_EQ(munmap(&amp;ptr_region[10 * page_size], 40 * page_size), 0);</div><div class='del'>-	ASSERT_EQ(munmap(&amp;ptr_region[55 * page_size], 25 * page_size), 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We end up with VMAs like this:</div><div class='del'>-	 *</div><div class='del'>-	 * 0    10 .. 50   55 .. 80   100</div><div class='del'>-	 * [---]      [---]      [---]</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now mark the whole range as guard pages and make sure all VMAs are as</div><div class='del'>-	 * such.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * madvise() is certifiable and lets you perform operations over gaps,</div><div class='del'>-	 * everything works, but it indicates an error and errno is set to</div><div class='del'>-	 * -ENOMEM. Also if anything runs out of memory it is set to</div><div class='del'>-	 * -ENOMEM. You are meant to guess which is which.</div><div class='del'>-	 */</div><div class='del'>-	ASSERT_EQ(madvise(ptr_region, 100 * page_size, MADV_GUARD_INSTALL), -1);</div><div class='del'>-	ASSERT_EQ(errno, ENOMEM);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr1[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		char *curr = &amp;ptr2[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 20; i++) {</div><div class='del'>-		char *curr = &amp;ptr3[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now remove guar pages over range and assert the opposite. */</div><div class='del'>-</div><div class='del'>-	ASSERT_EQ(madvise(ptr_region, 100 * page_size, MADV_GUARD_REMOVE), -1);</div><div class='del'>-	ASSERT_EQ(errno, ENOMEM);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr1[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		char *curr = &amp;ptr2[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 20; i++) {</div><div class='del'>-		char *curr = &amp;ptr3[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now map incompatible VMAs in the gaps. */</div><div class='del'>-	ptr = mmap(&amp;ptr_region[10 * page_size], 40 * page_size,</div><div class='del'>-		   PROT_READ | PROT_WRITE | PROT_EXEC,</div><div class='del'>-		   MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-	ptr = mmap(&amp;ptr_region[55 * page_size], 25 * page_size,</div><div class='del'>-		   PROT_READ | PROT_WRITE | PROT_EXEC,</div><div class='del'>-		   MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We end up with VMAs like this:</div><div class='del'>-	 *</div><div class='del'>-	 * 0    10 .. 50   55 .. 80   100</div><div class='del'>-	 * [---][xxxx][---][xxxx][---]</div><div class='del'>-	 *</div><div class='del'>-	 * Where 'x' signifies VMAs that cannot be merged with those adjacent to</div><div class='del'>-	 * them.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Multiple VMAs adjacent to one another should result in no error. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr_region, 100 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-	for (i = 0; i &lt; 100; i++) {</div><div class='del'>-		char *curr = &amp;ptr_region[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-	ASSERT_EQ(madvise(ptr_region, 100 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='del'>-	for (i = 0; i &lt; 100; i++) {</div><div class='del'>-		char *curr = &amp;ptr_region[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr_region, 100 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Assert that batched operations performed using process_madvise() work as</div><div class='del'>- * expected.</div><div class='del'>- */</div><div class='del'>-TEST_F(guard_pages, process_madvise)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	pid_t pid = getpid();</div><div class='del'>-	int pidfd = pidfd_open(pid, 0);</div><div class='del'>-	char *ptr_region, *ptr1, *ptr2, *ptr3;</div><div class='del'>-	ssize_t count;</div><div class='del'>-	struct iovec vec[6];</div><div class='del'>-</div><div class='del'>-	ASSERT_NE(pidfd, -1);</div><div class='del'>-</div><div class='del'>-	/* Reserve region to map over. */</div><div class='del'>-	ptr_region = mmap(NULL, 100 * page_size, PROT_NONE,</div><div class='del'>-			  MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr_region, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 10 pages offset 1 page into reserve region. We MAP_POPULATE so we</div><div class='del'>-	 * overwrite existing entries and test this code path against</div><div class='del'>-	 * overwriting existing entries.</div><div class='del'>-	 */</div><div class='del'>-	ptr1 = mmap(&amp;ptr_region[page_size], 10 * page_size,</div><div class='del'>-		    PROT_READ | PROT_WRITE,</div><div class='del'>-		    MAP_FIXED | MAP_ANON | MAP_PRIVATE | MAP_POPULATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr1, MAP_FAILED);</div><div class='del'>-	/* We want guard markers at start/end of each VMA. */</div><div class='del'>-	vec[0].iov_base = ptr1;</div><div class='del'>-	vec[0].iov_len = page_size;</div><div class='del'>-	vec[1].iov_base = &amp;ptr1[9 * page_size];</div><div class='del'>-	vec[1].iov_len = page_size;</div><div class='del'>-</div><div class='del'>-	/* 5 pages offset 50 pages into reserve region. */</div><div class='del'>-	ptr2 = mmap(&amp;ptr_region[50 * page_size], 5 * page_size,</div><div class='del'>-		    PROT_READ | PROT_WRITE,</div><div class='del'>-		    MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr2, MAP_FAILED);</div><div class='del'>-	vec[2].iov_base = ptr2;</div><div class='del'>-	vec[2].iov_len = page_size;</div><div class='del'>-	vec[3].iov_base = &amp;ptr2[4 * page_size];</div><div class='del'>-	vec[3].iov_len = page_size;</div><div class='del'>-</div><div class='del'>-	/* 20 pages offset 79 pages into reserve region. */</div><div class='del'>-	ptr3 = mmap(&amp;ptr_region[79 * page_size], 20 * page_size,</div><div class='del'>-		    PROT_READ | PROT_WRITE,</div><div class='del'>-		    MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr3, MAP_FAILED);</div><div class='del'>-	vec[4].iov_base = ptr3;</div><div class='del'>-	vec[4].iov_len = page_size;</div><div class='del'>-	vec[5].iov_base = &amp;ptr3[19 * page_size];</div><div class='del'>-	vec[5].iov_len = page_size;</div><div class='del'>-</div><div class='del'>-	/* Free surrounding VMAs. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr_region, page_size), 0);</div><div class='del'>-	ASSERT_EQ(munmap(&amp;ptr_region[11 * page_size], 39 * page_size), 0);</div><div class='del'>-	ASSERT_EQ(munmap(&amp;ptr_region[55 * page_size], 24 * page_size), 0);</div><div class='del'>-	ASSERT_EQ(munmap(&amp;ptr_region[99 * page_size], page_size), 0);</div><div class='del'>-</div><div class='del'>-	/* Now guard in one step. */</div><div class='del'>-	count = sys_process_madvise(pidfd, vec, 6, MADV_GUARD_INSTALL, 0);</div><div class='del'>-</div><div class='del'>-	/* OK we don't have permission to do this, skip. */</div><div class='del'>-	if (count == -1 &amp;&amp; errno == EPERM)</div><div class='del'>-		ksft_exit_skip("No process_madvise() permissions, try running as root.\n");</div><div class='del'>-</div><div class='del'>-	/* Returns the number of bytes advised. */</div><div class='del'>-	ASSERT_EQ(count, 6 * page_size);</div><div class='del'>-</div><div class='del'>-	/* Now make sure the guarding was applied. */</div><div class='del'>-</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr1));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr1[9 * page_size]));</div><div class='del'>-</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr2));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr2[4 * page_size]));</div><div class='del'>-</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr3));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr3[19 * page_size]));</div><div class='del'>-</div><div class='del'>-	/* Now do the same with unguard... */</div><div class='del'>-	count = sys_process_madvise(pidfd, vec, 6, MADV_GUARD_REMOVE, 0);</div><div class='del'>-</div><div class='del'>-	/* ...and everything should now succeed. */</div><div class='del'>-</div><div class='del'>-	ASSERT_TRUE(try_read_write_buf(ptr1));</div><div class='del'>-	ASSERT_TRUE(try_read_write_buf(&amp;ptr1[9 * page_size]));</div><div class='del'>-</div><div class='del'>-	ASSERT_TRUE(try_read_write_buf(ptr2));</div><div class='del'>-	ASSERT_TRUE(try_read_write_buf(&amp;ptr2[4 * page_size]));</div><div class='del'>-</div><div class='del'>-	ASSERT_TRUE(try_read_write_buf(ptr3));</div><div class='del'>-	ASSERT_TRUE(try_read_write_buf(&amp;ptr3[19 * page_size]));</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr1, 10 * page_size), 0);</div><div class='del'>-	ASSERT_EQ(munmap(ptr2, 5 * page_size), 0);</div><div class='del'>-	ASSERT_EQ(munmap(ptr3, 20 * page_size), 0);</div><div class='del'>-	close(pidfd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Assert that unmapping ranges does not leave guard markers behind. */</div><div class='del'>-TEST_F(guard_pages, munmap)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr, *ptr_new1, *ptr_new2;</div><div class='del'>-</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Guard first and last pages. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-	ASSERT_EQ(madvise(&amp;ptr[9 * page_size], page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Assert that they are guarded. */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr[9 * page_size]));</div><div class='del'>-</div><div class='del'>-	/* Unmap them. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, page_size), 0);</div><div class='del'>-	ASSERT_EQ(munmap(&amp;ptr[9 * page_size], page_size), 0);</div><div class='del'>-</div><div class='del'>-	/* Map over them.*/</div><div class='del'>-	ptr_new1 = mmap(ptr, page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-			MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr_new1, MAP_FAILED);</div><div class='del'>-	ptr_new2 = mmap(&amp;ptr[9 * page_size], page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-			MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr_new2, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Assert that they are now not guarded. */</div><div class='del'>-	ASSERT_TRUE(try_read_write_buf(ptr_new1));</div><div class='del'>-	ASSERT_TRUE(try_read_write_buf(ptr_new2));</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Assert that mprotect() operations have no bearing on guard markers. */</div><div class='del'>-TEST_F(guard_pages, mprotect)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Guard the middle of the range. */</div><div class='del'>-	ASSERT_EQ(madvise(&amp;ptr[5 * page_size], 2 * page_size,</div><div class='del'>-			  MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Assert that it is indeed guarded. */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr[5 * page_size]));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr[6 * page_size]));</div><div class='del'>-</div><div class='del'>-	/* Now make these pages read-only. */</div><div class='del'>-	ASSERT_EQ(mprotect(&amp;ptr[5 * page_size], 2 * page_size, PROT_READ), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the range is still guarded. */</div><div class='del'>-	ASSERT_FALSE(try_read_buf(&amp;ptr[5 * page_size]));</div><div class='del'>-	ASSERT_FALSE(try_read_buf(&amp;ptr[6 * page_size]));</div><div class='del'>-</div><div class='del'>-	/* Make sure we can guard again without issue.*/</div><div class='del'>-	ASSERT_EQ(madvise(&amp;ptr[5 * page_size], 2 * page_size,</div><div class='del'>-			  MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the range is, yet again, still guarded. */</div><div class='del'>-	ASSERT_FALSE(try_read_buf(&amp;ptr[5 * page_size]));</div><div class='del'>-	ASSERT_FALSE(try_read_buf(&amp;ptr[6 * page_size]));</div><div class='del'>-</div><div class='del'>-	/* Now unguard the whole range. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the whole range is readable. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Split and merge VMAs and make sure guard pages still behave. */</div><div class='del'>-TEST_F(guard_pages, split_merge)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr, *ptr_new;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Guard the whole range. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the whole range is guarded. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now unmap some pages in the range so we split. */</div><div class='del'>-	ASSERT_EQ(munmap(&amp;ptr[2 * page_size], page_size), 0);</div><div class='del'>-	ASSERT_EQ(munmap(&amp;ptr[5 * page_size], page_size), 0);</div><div class='del'>-	ASSERT_EQ(munmap(&amp;ptr[8 * page_size], page_size), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the remaining ranges are guarded post-split. */</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-	for (i = 2; i &lt; 5; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-	for (i = 6; i &lt; 8; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-	for (i = 9; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now map them again - the unmap will have cleared the guards. */</div><div class='del'>-	ptr_new = mmap(&amp;ptr[2 * page_size], page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		       MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr_new, MAP_FAILED);</div><div class='del'>-	ptr_new = mmap(&amp;ptr[5 * page_size], page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		       MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr_new, MAP_FAILED);</div><div class='del'>-	ptr_new = mmap(&amp;ptr[8 * page_size], page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		       MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr_new, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Now make sure guard pages are established. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-		bool result = try_read_write_buf(curr);</div><div class='del'>-		bool expect_true = i == 2 || i == 5 || i == 8;</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(expect_true ? result : !result);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now guard everything again. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the whole range is guarded. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now split the range into three. */</div><div class='del'>-	ASSERT_EQ(mprotect(ptr, 3 * page_size, PROT_READ), 0);</div><div class='del'>-	ASSERT_EQ(mprotect(&amp;ptr[7 * page_size], 3 * page_size, PROT_READ), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the whole range is guarded for read. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now reset protection bits so we merge the whole thing. */</div><div class='del'>-	ASSERT_EQ(mprotect(ptr, 3 * page_size, PROT_READ | PROT_WRITE), 0);</div><div class='del'>-	ASSERT_EQ(mprotect(&amp;ptr[7 * page_size], 3 * page_size,</div><div class='del'>-			   PROT_READ | PROT_WRITE), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the whole range is still guarded. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Split range into 3 again... */</div><div class='del'>-	ASSERT_EQ(mprotect(ptr, 3 * page_size, PROT_READ), 0);</div><div class='del'>-	ASSERT_EQ(mprotect(&amp;ptr[7 * page_size], 3 * page_size, PROT_READ), 0);</div><div class='del'>-</div><div class='del'>-	/* ...and unguard the whole range. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the whole range is remedied for read. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Merge them again. */</div><div class='del'>-	ASSERT_EQ(mprotect(ptr, 3 * page_size, PROT_READ | PROT_WRITE), 0);</div><div class='del'>-	ASSERT_EQ(mprotect(&amp;ptr[7 * page_size], 3 * page_size,</div><div class='del'>-			   PROT_READ | PROT_WRITE), 0);</div><div class='del'>-</div><div class='del'>-	/* Now ensure the merged range is remedied for read/write. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Assert that MADV_DONTNEED does not remove guard markers. */</div><div class='del'>-TEST_F(guard_pages, dontneed)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Back the whole range. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		*curr = 'y';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Guard every other page. */</div><div class='del'>-	for (i = 0; i &lt; 10; i += 2) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-		int res = madvise(curr, page_size, MADV_GUARD_INSTALL);</div><div class='del'>-</div><div class='del'>-		ASSERT_EQ(res, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Indicate that we don't need any of the range. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_DONTNEED), 0);</div><div class='del'>-</div><div class='del'>-	/* Check to ensure guard markers are still in place. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-		bool result = try_read_buf(curr);</div><div class='del'>-</div><div class='del'>-		if (i % 2 == 0) {</div><div class='del'>-			ASSERT_FALSE(result);</div><div class='del'>-		} else {</div><div class='del'>-			ASSERT_TRUE(result);</div><div class='del'>-			/* Make sure we really did get reset to zero page. */</div><div class='del'>-			ASSERT_EQ(*curr, '\0');</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Now write... */</div><div class='del'>-		result = try_write_buf(&amp;ptr[i * page_size]);</div><div class='del'>-</div><div class='del'>-		/* ...and make sure same result. */</div><div class='del'>-		ASSERT_TRUE(i % 2 != 0 ? result : !result);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Assert that mlock()'ed pages work correctly with guard markers. */</div><div class='del'>-TEST_F(guard_pages, mlock)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Populate. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		*curr = 'y';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Lock. */</div><div class='del'>-	ASSERT_EQ(mlock(ptr, 10 * page_size), 0);</div><div class='del'>-</div><div class='del'>-	/* Now try to guard, should fail with EINVAL. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), -1);</div><div class='del'>-	ASSERT_EQ(errno, EINVAL);</div><div class='del'>-</div><div class='del'>-	/* OK unlock. */</div><div class='del'>-	ASSERT_EQ(munlock(ptr, 10 * page_size), 0);</div><div class='del'>-</div><div class='del'>-	/* Guard first half of range, should now succeed. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 5 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure guard works. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-		bool result = try_read_write_buf(curr);</div><div class='del'>-</div><div class='del'>-		if (i &lt; 5) {</div><div class='del'>-			ASSERT_FALSE(result);</div><div class='del'>-		} else {</div><div class='del'>-			ASSERT_TRUE(result);</div><div class='del'>-			ASSERT_EQ(*curr, 'x');</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now lock the latter part of the range. We can't lock the guard pages,</div><div class='del'>-	 * as this would result in the pages being populated and the guarding</div><div class='del'>-	 * would cause this to error out.</div><div class='del'>-	 */</div><div class='del'>-	ASSERT_EQ(mlock(&amp;ptr[5 * page_size], 5 * page_size), 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now remove guard pages, we permit mlock()'d ranges to have guard</div><div class='del'>-	 * pages removed as it is a non-destructive operation.</div><div class='del'>-	 */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='del'>-</div><div class='del'>-	/* Now check that no guard pages remain. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Assert that moving, extending and shrinking memory via mremap() retains</div><div class='del'>- * guard markers where possible.</div><div class='del'>- *</div><div class='del'>- * - Moving a mapping alone should retain markers as they are.</div><div class='del'>- */</div><div class='del'>-TEST_F(guard_pages, mremap_move)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr, *ptr_new;</div><div class='del'>-</div><div class='del'>-	/* Map 5 pages. */</div><div class='del'>-	ptr = mmap(NULL, 5 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Place guard markers at both ends of the 5 page span. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-	ASSERT_EQ(madvise(&amp;ptr[4 * page_size], page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the guard pages are in effect. */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr[4 * page_size]));</div><div class='del'>-</div><div class='del'>-	/* Map a new region we will move this range into. Doing this ensures</div><div class='del'>-	 * that we have reserved a range to map into.</div><div class='del'>-	 */</div><div class='del'>-	ptr_new = mmap(NULL, 5 * page_size, PROT_NONE, MAP_ANON | MAP_PRIVATE,</div><div class='del'>-		       -1, 0);</div><div class='del'>-	ASSERT_NE(ptr_new, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	ASSERT_EQ(mremap(ptr, 5 * page_size, 5 * page_size,</div><div class='del'>-			 MREMAP_MAYMOVE | MREMAP_FIXED, ptr_new), ptr_new);</div><div class='del'>-</div><div class='del'>-	/* Make sure the guard markers are retained. */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr_new));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr_new[4 * page_size]));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clean up - we only need reference the new pointer as we overwrote the</div><div class='del'>-	 * PROT_NONE range and moved the existing one.</div><div class='del'>-	 */</div><div class='del'>-	munmap(ptr_new, 5 * page_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Assert that moving, extending and shrinking memory via mremap() retains</div><div class='del'>- * guard markers where possible.</div><div class='del'>- *</div><div class='del'>- * Expanding should retain guard pages, only now in different position. The user</div><div class='del'>- * will have to remove guard pages manually to fix up (they'd have to do the</div><div class='del'>- * same if it were a PROT_NONE mapping).</div><div class='del'>- */</div><div class='del'>-TEST_F(guard_pages, mremap_expand)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr, *ptr_new;</div><div class='del'>-</div><div class='del'>-	/* Map 10 pages... */</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-	/* ...But unmap the last 5 so we can ensure we can expand into them. */</div><div class='del'>-	ASSERT_EQ(munmap(&amp;ptr[5 * page_size], 5 * page_size), 0);</div><div class='del'>-</div><div class='del'>-	/* Place guard markers at both ends of the 5 page span. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-	ASSERT_EQ(madvise(&amp;ptr[4 * page_size], page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the guarding is in effect. */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr[4 * page_size]));</div><div class='del'>-</div><div class='del'>-	/* Now expand to 10 pages. */</div><div class='del'>-	ptr = mremap(ptr, 5 * page_size, 10 * page_size, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure the guard markers are retained in their original positions.</div><div class='del'>-	 */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr[4 * page_size]));</div><div class='del'>-</div><div class='del'>-	/* Reserve a region which we can move to and expand into. */</div><div class='del'>-	ptr_new = mmap(NULL, 20 * page_size, PROT_NONE,</div><div class='del'>-		       MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr_new, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Now move and expand into it. */</div><div class='del'>-	ptr = mremap(ptr, 10 * page_size, 20 * page_size,</div><div class='del'>-		     MREMAP_MAYMOVE | MREMAP_FIXED, ptr_new);</div><div class='del'>-	ASSERT_EQ(ptr, ptr_new);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Again, make sure the guard markers are retained in their original positions.</div><div class='del'>-	 */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr[4 * page_size]));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * A real user would have to remove guard markers, but would reasonably</div><div class='del'>-	 * expect all characteristics of the mapping to be retained, including</div><div class='del'>-	 * guard markers.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	munmap(ptr, 20 * page_size);</div><div class='del'>-}</div><div class='del'>-/*</div><div class='del'>- * Assert that moving, extending and shrinking memory via mremap() retains</div><div class='del'>- * guard markers where possible.</div><div class='del'>- *</div><div class='del'>- * Shrinking will result in markers that are shrunk over being removed. Again,</div><div class='del'>- * if the user were using a PROT_NONE mapping they'd have to manually fix this</div><div class='del'>- * up also so this is OK.</div><div class='del'>- */</div><div class='del'>-TEST_F(guard_pages, mremap_shrink)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Map 5 pages. */</div><div class='del'>-	ptr = mmap(NULL, 5 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Place guard markers at both ends of the 5 page span. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-	ASSERT_EQ(madvise(&amp;ptr[4 * page_size], page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Make sure the guarding is in effect. */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(&amp;ptr[4 * page_size]));</div><div class='del'>-</div><div class='del'>-	/* Now shrink to 3 pages. */</div><div class='del'>-	ptr = mremap(ptr, 5 * page_size, 3 * page_size, MREMAP_MAYMOVE);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* We expect the guard marker at the start to be retained... */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='del'>-</div><div class='del'>-	/* ...But remaining pages will not have guard markers. */</div><div class='del'>-	for (i = 1; i &lt; 3; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * As with expansion, a real user would have to remove guard pages and</div><div class='del'>-	 * fixup. But you'd have to do similar manual things with PROT_NONE</div><div class='del'>-	 * mappings too.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we expand back to the original size, the end marker will, of</div><div class='del'>-	 * course, no longer be present.</div><div class='del'>-	 */</div><div class='del'>-	ptr = mremap(ptr, 3 * page_size, 5 * page_size, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Again, we expect the guard marker at the start to be retained... */</div><div class='del'>-	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='del'>-</div><div class='del'>-	/* ...But remaining pages will not have guard markers. */</div><div class='del'>-	for (i = 1; i &lt; 5; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	munmap(ptr, 5 * page_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Assert that forking a process with VMAs that do not have VM_WIPEONFORK set</div><div class='del'>- * retain guard pages.</div><div class='del'>- */</div><div class='del'>-TEST_F(guard_pages, fork)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr;</div><div class='del'>-	pid_t pid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Map 10 pages. */</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Establish guard pages in the first 5 pages. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 5 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	pid = fork();</div><div class='del'>-	ASSERT_NE(pid, -1);</div><div class='del'>-	if (!pid) {</div><div class='del'>-		/* This is the child process now. */</div><div class='del'>-</div><div class='del'>-		/* Assert that the guarding is in effect. */</div><div class='del'>-		for (i = 0; i &lt; 10; i++) {</div><div class='del'>-			char *curr = &amp;ptr[i * page_size];</div><div class='del'>-			bool result = try_read_write_buf(curr);</div><div class='del'>-</div><div class='del'>-			ASSERT_TRUE(i &gt;= 5 ? result : !result);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Now unguard the range.*/</div><div class='del'>-		ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='del'>-</div><div class='del'>-		exit(0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Parent process. */</div><div class='del'>-</div><div class='del'>-	/* Parent simply waits on child. */</div><div class='del'>-	waitpid(pid, NULL, 0);</div><div class='del'>-</div><div class='del'>-	/* Child unguard does not impact parent page table state. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-		bool result = try_read_write_buf(curr);</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(i &gt;= 5 ? result : !result);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Assert expected behaviour after we fork populated ranges of anonymous memory</div><div class='del'>- * and then guard and unguard the range.</div><div class='del'>- */</div><div class='del'>-TEST_F(guard_pages, fork_cow)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr;</div><div class='del'>-	pid_t pid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Map 10 pages. */</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Populate range. */</div><div class='del'>-	for (i = 0; i &lt; 10 * page_size; i++) {</div><div class='del'>-		char chr = 'a' + (i % 26);</div><div class='del'>-</div><div class='del'>-		ptr[i] = chr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pid = fork();</div><div class='del'>-	ASSERT_NE(pid, -1);</div><div class='del'>-	if (!pid) {</div><div class='del'>-		/* This is the child process now. */</div><div class='del'>-</div><div class='del'>-		/* Ensure the range is as expected. */</div><div class='del'>-		for (i = 0; i &lt; 10 * page_size; i++) {</div><div class='del'>-			char expected = 'a' + (i % 26);</div><div class='del'>-			char actual = ptr[i];</div><div class='del'>-</div><div class='del'>-			ASSERT_EQ(actual, expected);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Establish guard pages across the whole range. */</div><div class='del'>-		ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-		/* Remove it. */</div><div class='del'>-		ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * By removing the guard pages, the page tables will be</div><div class='del'>-		 * cleared. Assert that we are looking at the zero page now.</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; 10 * page_size; i++) {</div><div class='del'>-			char actual = ptr[i];</div><div class='del'>-</div><div class='del'>-			ASSERT_EQ(actual, '\0');</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		exit(0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Parent process. */</div><div class='del'>-</div><div class='del'>-	/* Parent simply waits on child. */</div><div class='del'>-	waitpid(pid, NULL, 0);</div><div class='del'>-</div><div class='del'>-	/* Ensure the range is unchanged in parent anon range. */</div><div class='del'>-	for (i = 0; i &lt; 10 * page_size; i++) {</div><div class='del'>-		char expected = 'a' + (i % 26);</div><div class='del'>-		char actual = ptr[i];</div><div class='del'>-</div><div class='del'>-		ASSERT_EQ(actual, expected);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Assert that forking a process with VMAs that do have VM_WIPEONFORK set</div><div class='del'>- * behave as expected.</div><div class='del'>- */</div><div class='del'>-TEST_F(guard_pages, fork_wipeonfork)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr;</div><div class='del'>-	pid_t pid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Map 10 pages. */</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Mark wipe on fork. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_WIPEONFORK), 0);</div><div class='del'>-</div><div class='del'>-	/* Guard the first 5 pages. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 5 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	pid = fork();</div><div class='del'>-	ASSERT_NE(pid, -1);</div><div class='del'>-	if (!pid) {</div><div class='del'>-		/* This is the child process now. */</div><div class='del'>-</div><div class='del'>-		/* Guard will have been wiped. */</div><div class='del'>-		for (i = 0; i &lt; 10; i++) {</div><div class='del'>-			char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-			ASSERT_TRUE(try_read_write_buf(curr));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		exit(0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Parent process. */</div><div class='del'>-</div><div class='del'>-	waitpid(pid, NULL, 0);</div><div class='del'>-</div><div class='del'>-	/* Guard markers should be in effect.*/</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-		bool result = try_read_write_buf(curr);</div><div class='del'>-</div><div class='del'>-		ASSERT_TRUE(i &gt;= 5 ? result : !result);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensure that MADV_FREE retains guard entries as expected. */</div><div class='del'>-TEST_F(guard_pages, lazyfree)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Map 10 pages. */</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Guard range. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Ensure guarded. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Lazyfree range. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_FREE), 0);</div><div class='del'>-</div><div class='del'>-	/* This should leave the guard markers in place. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensure that MADV_POPULATE_READ, MADV_POPULATE_WRITE behave as expected. */</div><div class='del'>-TEST_F(guard_pages, populate)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr;</div><div class='del'>-</div><div class='del'>-	/* Map 10 pages. */</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Guard range. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Populate read should error out... */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_POPULATE_READ), -1);</div><div class='del'>-	ASSERT_EQ(errno, EFAULT);</div><div class='del'>-</div><div class='del'>-	/* ...as should populate write. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_POPULATE_WRITE), -1);</div><div class='del'>-	ASSERT_EQ(errno, EFAULT);</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensure that MADV_COLD, MADV_PAGEOUT do not remove guard markers. */</div><div class='del'>-TEST_F(guard_pages, cold_pageout)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	char *ptr;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Map 10 pages. */</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Guard range. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* Ensured guarded. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now mark cold. This should have no impact on guard markers. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_COLD), 0);</div><div class='del'>-</div><div class='del'>-	/* Should remain guarded. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* OK, now page out. This should equally, have no effect on markers. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_PAGEOUT), 0);</div><div class='del'>-</div><div class='del'>-	/* Should remain guarded. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensure that guard pages do not break userfaultd. */</div><div class='del'>-TEST_F(guard_pages, uffd)</div><div class='del'>-{</div><div class='del'>-	const unsigned long page_size = self-&gt;page_size;</div><div class='del'>-	int uffd;</div><div class='del'>-	char *ptr;</div><div class='del'>-	int i;</div><div class='del'>-	struct uffdio_api api = {</div><div class='del'>-		.api = UFFD_API,</div><div class='del'>-		.features = 0,</div><div class='del'>-	};</div><div class='del'>-	struct uffdio_register reg;</div><div class='del'>-	struct uffdio_range range;</div><div class='del'>-</div><div class='del'>-	/* Set up uffd. */</div><div class='del'>-	uffd = userfaultfd(0);</div><div class='del'>-	if (uffd == -1 &amp;&amp; errno == EPERM)</div><div class='del'>-		ksft_exit_skip("No userfaultfd permissions, try running as root.\n");</div><div class='del'>-	ASSERT_NE(uffd, -1);</div><div class='del'>-</div><div class='del'>-	ASSERT_EQ(ioctl(uffd, UFFDIO_API, &amp;api), 0);</div><div class='del'>-</div><div class='del'>-	/* Map 10 pages. */</div><div class='del'>-	ptr = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE,</div><div class='del'>-		   MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='del'>-	ASSERT_NE(ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Register the range with uffd. */</div><div class='del'>-	range.start = (unsigned long)ptr;</div><div class='del'>-	range.len = 10 * page_size;</div><div class='del'>-	reg.range = range;</div><div class='del'>-	reg.mode = UFFDIO_REGISTER_MODE_MISSING;</div><div class='del'>-	ASSERT_EQ(ioctl(uffd, UFFDIO_REGISTER, &amp;reg), 0);</div><div class='del'>-</div><div class='del'>-	/* Guard the range. This should not trigger the uffd. */</div><div class='del'>-	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='del'>-</div><div class='del'>-	/* The guarding should behave as usual with no uffd intervention. */</div><div class='del'>-	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		char *curr = &amp;ptr[i * page_size];</div><div class='del'>-</div><div class='del'>-		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cleanup. */</div><div class='del'>-	ASSERT_EQ(ioctl(uffd, UFFDIO_UNREGISTER, &amp;range), 0);</div><div class='del'>-	close(uffd);</div><div class='del'>-	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/mm/guard-regions.c b/tools/testing/selftests/mm/guard-regions.c<br/>new file mode 100644<br/>index 000000000000..dbd21d66d383<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/guard-regions.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/guard-regions.c</a></div><div class='hunk'>@@ -0,0 +1,2326 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+#include &lt;asm-generic/mman.h&gt; /* Force the import of the tools version. */</div><div class='add'>+#include &lt;assert.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;linux/limits.h&gt;</div><div class='add'>+#include &lt;linux/userfaultfd.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;setjmp.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#include &lt;stdbool.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;sys/uio.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include "vm_util.h"</div><div class='add'>+</div><div class='add'>+#include "../pidfd/pidfd.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Ignore the checkpatch warning, as per the C99 standard, section 7.14.1.1:</div><div class='add'>+ *</div><div class='add'>+ * "If the signal occurs other than as the result of calling the abort or raise</div><div class='add'>+ *  function, the behavior is undefined if the signal handler refers to any</div><div class='add'>+ *  object with static storage duration other than by assigning a value to an</div><div class='add'>+ *  object declared as volatile sig_atomic_t"</div><div class='add'>+ */</div><div class='add'>+static volatile sig_atomic_t signal_jump_set;</div><div class='add'>+static sigjmp_buf signal_jmp_buf;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * How is the test backing the mapping being tested?</div><div class='add'>+ */</div><div class='add'>+enum backing_type {</div><div class='add'>+	ANON_BACKED,</div><div class='add'>+	SHMEM_BACKED,</div><div class='add'>+	LOCAL_FILE_BACKED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE(guard_regions)</div><div class='add'>+{</div><div class='add'>+	unsigned long page_size;</div><div class='add'>+	char path[PATH_MAX];</div><div class='add'>+	int fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT(guard_regions)</div><div class='add'>+{</div><div class='add'>+	enum backing_type backing;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT_ADD(guard_regions, anon)</div><div class='add'>+{</div><div class='add'>+	.backing = ANON_BACKED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT_ADD(guard_regions, shmem)</div><div class='add'>+{</div><div class='add'>+	.backing = SHMEM_BACKED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_VARIANT_ADD(guard_regions, file)</div><div class='add'>+{</div><div class='add'>+	.backing = LOCAL_FILE_BACKED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool is_anon_backed(const FIXTURE_VARIANT(guard_regions) * variant)</div><div class='add'>+{</div><div class='add'>+	switch (variant-&gt;backing) {</div><div class='add'>+	case  ANON_BACKED:</div><div class='add'>+	case  SHMEM_BACKED:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *mmap_(FIXTURE_DATA(guard_regions) * self,</div><div class='add'>+		   const FIXTURE_VARIANT(guard_regions) * variant,</div><div class='add'>+		   void *addr, size_t length, int prot, int extra_flags,</div><div class='add'>+		   off_t offset)</div><div class='add'>+{</div><div class='add'>+	int fd;</div><div class='add'>+	int flags = extra_flags;</div><div class='add'>+</div><div class='add'>+	switch (variant-&gt;backing) {</div><div class='add'>+	case ANON_BACKED:</div><div class='add'>+		flags |= MAP_PRIVATE | MAP_ANON;</div><div class='add'>+		fd = -1;</div><div class='add'>+		offset = 0;</div><div class='add'>+		break;</div><div class='add'>+	case SHMEM_BACKED:</div><div class='add'>+	case LOCAL_FILE_BACKED:</div><div class='add'>+		flags |= MAP_SHARED;</div><div class='add'>+		fd = self-&gt;fd;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ksft_exit_fail();</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mmap(addr, length, prot, flags, fd, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int userfaultfd(int flags)</div><div class='add'>+{</div><div class='add'>+	return syscall(SYS_userfaultfd, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_fatal(int c)</div><div class='add'>+{</div><div class='add'>+	if (!signal_jump_set)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	siglongjmp(signal_jmp_buf, c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t sys_process_madvise(int pidfd, const struct iovec *iovec,</div><div class='add'>+				   size_t n, int advice, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	return syscall(__NR_process_madvise, pidfd, iovec, n, advice, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable our signal catcher and try to read/write the specified buffer. The</div><div class='add'>+ * return value indicates whether the read/write succeeds without a fatal</div><div class='add'>+ * signal.</div><div class='add'>+ */</div><div class='add'>+static bool try_access_buf(char *ptr, bool write)</div><div class='add'>+{</div><div class='add'>+	bool failed;</div><div class='add'>+</div><div class='add'>+	/* Tell signal handler to jump back here on fatal signal. */</div><div class='add'>+	signal_jump_set = true;</div><div class='add'>+	/* If a fatal signal arose, we will jump back here and failed is set. */</div><div class='add'>+	failed = sigsetjmp(signal_jmp_buf, 0) != 0;</div><div class='add'>+</div><div class='add'>+	if (!failed) {</div><div class='add'>+		if (write)</div><div class='add'>+			*ptr = 'x';</div><div class='add'>+		else</div><div class='add'>+			FORCE_READ(*ptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	signal_jump_set = false;</div><div class='add'>+	return !failed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Try and read from a buffer, return true if no fatal signal. */</div><div class='add'>+static bool try_read_buf(char *ptr)</div><div class='add'>+{</div><div class='add'>+	return try_access_buf(ptr, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Try and write to a buffer, return true if no fatal signal. */</div><div class='add'>+static bool try_write_buf(char *ptr)</div><div class='add'>+{</div><div class='add'>+	return try_access_buf(ptr, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Try and BOTH read from AND write to a buffer, return true if BOTH operations</div><div class='add'>+ * succeed.</div><div class='add'>+ */</div><div class='add'>+static bool try_read_write_buf(char *ptr)</div><div class='add'>+{</div><div class='add'>+	return try_read_buf(ptr) &amp;&amp; try_write_buf(ptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_sighandler(void)</div><div class='add'>+{</div><div class='add'>+	struct sigaction act = {</div><div class='add'>+		.sa_handler = &amp;handle_fatal,</div><div class='add'>+		.sa_flags = SA_NODEFER,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sigemptyset(&amp;act.sa_mask);</div><div class='add'>+	if (sigaction(SIGSEGV, &amp;act, NULL))</div><div class='add'>+		ksft_exit_fail_perror("sigaction");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void teardown_sighandler(void)</div><div class='add'>+{</div><div class='add'>+	struct sigaction act = {</div><div class='add'>+		.sa_handler = SIG_DFL,</div><div class='add'>+		.sa_flags = SA_NODEFER,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	sigemptyset(&amp;act.sa_mask);</div><div class='add'>+	sigaction(SIGSEGV, &amp;act, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int open_file(const char *prefix, char *path)</div><div class='add'>+{</div><div class='add'>+	int fd;</div><div class='add'>+</div><div class='add'>+	snprintf(path, PATH_MAX, "%sguard_regions_test_file_XXXXXX", prefix);</div><div class='add'>+	fd = mkstemp(path);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		ksft_exit_fail_perror("mkstemp");</div><div class='add'>+</div><div class='add'>+	return fd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Establish a varying pattern in a buffer. */</div><div class='add'>+static void set_pattern(char *ptr, size_t num_pages, size_t page_size)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pages; i++) {</div><div class='add'>+		char *ptr2 = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		memset(ptr2, 'a' + (i % 26), page_size);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check that a buffer contains the pattern set by set_pattern(), starting at a</div><div class='add'>+ * page offset of pgoff within the buffer.</div><div class='add'>+ */</div><div class='add'>+static bool check_pattern_offset(char *ptr, size_t num_pages, size_t page_size,</div><div class='add'>+				 size_t pgoff)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pages * page_size; i++) {</div><div class='add'>+		size_t offset = pgoff * page_size + i;</div><div class='add'>+		char actual = ptr[offset];</div><div class='add'>+		char expected = 'a' + ((offset / page_size) % 26);</div><div class='add'>+</div><div class='add'>+		if (actual != expected)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check that a buffer contains the pattern set by set_pattern(). */</div><div class='add'>+static bool check_pattern(char *ptr, size_t num_pages, size_t page_size)</div><div class='add'>+{</div><div class='add'>+	return check_pattern_offset(ptr, num_pages, page_size, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Determine if a buffer contains only repetitions of a specified char. */</div><div class='add'>+static bool is_buf_eq(char *buf, size_t size, char chr)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size; i++) {</div><div class='add'>+		if (buf[i] != chr)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some file systems have issues with merging due to changing merge-sensitive</div><div class='add'>+ * parameters in the .mmap callback, and prior to .mmap_prepare being</div><div class='add'>+ * implemented everywhere this will now result in an unexpected failure to</div><div class='add'>+ * merge (e.g. - overlayfs).</div><div class='add'>+ *</div><div class='add'>+ * Perform a simple test to see if the local file system suffers from this, if</div><div class='add'>+ * it does then we can skip test logic that assumes local file system merging is</div><div class='add'>+ * sane.</div><div class='add'>+ */</div><div class='add'>+static bool local_fs_has_sane_mmap(FIXTURE_DATA(guard_regions) * self,</div><div class='add'>+				   const FIXTURE_VARIANT(guard_regions) * variant)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr, *ptr2;</div><div class='add'>+	struct procmap_fd procmap;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing != LOCAL_FILE_BACKED)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Map 10 pages. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size, PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	if (ptr == MAP_FAILED)</div><div class='add'>+		return false;</div><div class='add'>+	/* Unmap the middle. */</div><div class='add'>+	munmap(&amp;ptr[5 * page_size], page_size);</div><div class='add'>+</div><div class='add'>+	/* Map again. */</div><div class='add'>+	ptr2 = mmap_(self, variant, &amp;ptr[5 * page_size], page_size, PROT_READ | PROT_WRITE,</div><div class='add'>+		     MAP_FIXED, 5 * page_size);</div><div class='add'>+</div><div class='add'>+	if (ptr2 == MAP_FAILED)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Now make sure they all merged. */</div><div class='add'>+	if (open_self_procmap(&amp;procmap) != 0)</div><div class='add'>+		return false;</div><div class='add'>+	if (!find_vma_procmap(&amp;procmap, ptr))</div><div class='add'>+		return false;</div><div class='add'>+	if (procmap.query.vma_start != (unsigned long)ptr)</div><div class='add'>+		return false;</div><div class='add'>+	if (procmap.query.vma_end != (unsigned long)ptr + 10 * page_size)</div><div class='add'>+		return false;</div><div class='add'>+	close_procmap(&amp;procmap);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(guard_regions)</div><div class='add'>+{</div><div class='add'>+	self-&gt;page_size = (unsigned long)sysconf(_SC_PAGESIZE);</div><div class='add'>+	setup_sighandler();</div><div class='add'>+</div><div class='add'>+	switch (variant-&gt;backing) {</div><div class='add'>+	case ANON_BACKED:</div><div class='add'>+		return;</div><div class='add'>+	case LOCAL_FILE_BACKED:</div><div class='add'>+		self-&gt;fd = open_file("", self-&gt;path);</div><div class='add'>+		break;</div><div class='add'>+	case SHMEM_BACKED:</div><div class='add'>+		self-&gt;fd = memfd_create(self-&gt;path, 0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We truncate file to at least 100 pages, tests can modify as needed. */</div><div class='add'>+	ASSERT_EQ(ftruncate(self-&gt;fd, 100 * self-&gt;page_size), 0);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_TEARDOWN_PARENT(guard_regions)</div><div class='add'>+{</div><div class='add'>+	teardown_sighandler();</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing == ANON_BACKED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (self-&gt;fd &gt;= 0)</div><div class='add'>+		close(self-&gt;fd);</div><div class='add'>+</div><div class='add'>+	if (self-&gt;path[0] != '\0')</div><div class='add'>+		unlink(self-&gt;path);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(guard_regions, basic)</div><div class='add'>+{</div><div class='add'>+	const unsigned long NUM_PAGES = 10;</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, NUM_PAGES * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Trivially assert we can touch the first page. */</div><div class='add'>+	ASSERT_TRUE(try_read_write_buf(ptr));</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Establish that 1st page SIGSEGV's. */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='add'>+</div><div class='add'>+	/* Ensure we can touch everything else.*/</div><div class='add'>+	for (i = 1; i &lt; NUM_PAGES; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Establish a guard page at the end of the mapping. */</div><div class='add'>+	ASSERT_EQ(madvise(&amp;ptr[(NUM_PAGES - 1) * page_size], page_size,</div><div class='add'>+			  MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Check that both guard pages result in SIGSEGV. */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr[(NUM_PAGES - 1) * page_size]));</div><div class='add'>+</div><div class='add'>+	/* Remove the first guard page. */</div><div class='add'>+	ASSERT_FALSE(madvise(ptr, page_size, MADV_GUARD_REMOVE));</div><div class='add'>+</div><div class='add'>+	/* Make sure we can touch it. */</div><div class='add'>+	ASSERT_TRUE(try_read_write_buf(ptr));</div><div class='add'>+</div><div class='add'>+	/* Remove the last guard page. */</div><div class='add'>+	ASSERT_FALSE(madvise(&amp;ptr[(NUM_PAGES - 1) * page_size], page_size,</div><div class='add'>+			     MADV_GUARD_REMOVE));</div><div class='add'>+</div><div class='add'>+	/* Make sure we can touch it. */</div><div class='add'>+	ASSERT_TRUE(try_read_write_buf(&amp;ptr[(NUM_PAGES - 1) * page_size]));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *  Test setting a _range_ of pages, namely the first 3. The first of</div><div class='add'>+	 *  these be faulted in, so this also tests that we can install guard</div><div class='add'>+	 *  pages over backed pages.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 3 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure they are all guard pages. */</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure the rest are not. */</div><div class='add'>+	for (i = 3; i &lt; NUM_PAGES; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove guard pages. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, NUM_PAGES * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	/* Now make sure we can touch everything. */</div><div class='add'>+	for (i = 0; i &lt; NUM_PAGES; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now remove all guard pages, make sure we don't remove existing</div><div class='add'>+	 * entries.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, NUM_PAGES * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_PAGES * page_size; i += page_size) {</div><div class='add'>+		char chr = ptr[i];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(chr, 'x');</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(munmap(ptr, NUM_PAGES * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assert that operations applied across multiple VMAs work as expected. */</div><div class='add'>+TEST_F(guard_regions, multi_vma)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr_region, *ptr, *ptr1, *ptr2, *ptr3;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Reserve a 100 page region over which we can install VMAs. */</div><div class='add'>+	ptr_region = mmap_(self, variant, NULL, 100 * page_size,</div><div class='add'>+			   PROT_NONE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr_region, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Place a VMA of 10 pages size at the start of the region. */</div><div class='add'>+	ptr1 = mmap_(self, variant, ptr_region, 10 * page_size,</div><div class='add'>+		     PROT_READ | PROT_WRITE, MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr1, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Place a VMA of 5 pages size 50 pages into the region. */</div><div class='add'>+	ptr2 = mmap_(self, variant, &amp;ptr_region[50 * page_size], 5 * page_size,</div><div class='add'>+		     PROT_READ | PROT_WRITE, MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr2, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Place a VMA of 20 pages size at the end of the region. */</div><div class='add'>+	ptr3 = mmap_(self, variant, &amp;ptr_region[80 * page_size], 20 * page_size,</div><div class='add'>+		     PROT_READ | PROT_WRITE, MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr3, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Unmap gaps. */</div><div class='add'>+	ASSERT_EQ(munmap(&amp;ptr_region[10 * page_size], 40 * page_size), 0);</div><div class='add'>+	ASSERT_EQ(munmap(&amp;ptr_region[55 * page_size], 25 * page_size), 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We end up with VMAs like this:</div><div class='add'>+	 *</div><div class='add'>+	 * 0    10 .. 50   55 .. 80   100</div><div class='add'>+	 * [---]      [---]      [---]</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now mark the whole range as guard pages and make sure all VMAs are as</div><div class='add'>+	 * such.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * madvise() is certifiable and lets you perform operations over gaps,</div><div class='add'>+	 * everything works, but it indicates an error and errno is set to</div><div class='add'>+	 * -ENOMEM. Also if anything runs out of memory it is set to</div><div class='add'>+	 * -ENOMEM. You are meant to guess which is which.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(madvise(ptr_region, 100 * page_size, MADV_GUARD_INSTALL), -1);</div><div class='add'>+	ASSERT_EQ(errno, ENOMEM);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr1[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		char *curr = &amp;ptr2[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 20; i++) {</div><div class='add'>+		char *curr = &amp;ptr3[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now remove guar pages over range and assert the opposite. */</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(madvise(ptr_region, 100 * page_size, MADV_GUARD_REMOVE), -1);</div><div class='add'>+	ASSERT_EQ(errno, ENOMEM);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr1[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		char *curr = &amp;ptr2[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 20; i++) {</div><div class='add'>+		char *curr = &amp;ptr3[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now map incompatible VMAs in the gaps. */</div><div class='add'>+	ptr = mmap_(self, variant, &amp;ptr_region[10 * page_size], 40 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE | PROT_EXEC, MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+	ptr = mmap_(self, variant, &amp;ptr_region[55 * page_size], 25 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE | PROT_EXEC, MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We end up with VMAs like this:</div><div class='add'>+	 *</div><div class='add'>+	 * 0    10 .. 50   55 .. 80   100</div><div class='add'>+	 * [---][xxxx][---][xxxx][---]</div><div class='add'>+	 *</div><div class='add'>+	 * Where 'x' signifies VMAs that cannot be merged with those adjacent to</div><div class='add'>+	 * them.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Multiple VMAs adjacent to one another should result in no error. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr_region, 100 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	for (i = 0; i &lt; 100; i++) {</div><div class='add'>+		char *curr = &amp;ptr_region[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+	ASSERT_EQ(madvise(ptr_region, 100 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+	for (i = 0; i &lt; 100; i++) {</div><div class='add'>+		char *curr = &amp;ptr_region[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr_region, 100 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Assert that batched operations performed using process_madvise() work as</div><div class='add'>+ * expected.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, process_madvise)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr_region, *ptr1, *ptr2, *ptr3;</div><div class='add'>+	ssize_t count;</div><div class='add'>+	struct iovec vec[6];</div><div class='add'>+</div><div class='add'>+	/* Reserve region to map over. */</div><div class='add'>+	ptr_region = mmap_(self, variant, NULL, 100 * page_size,</div><div class='add'>+			   PROT_NONE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr_region, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 10 pages offset 1 page into reserve region. We MAP_POPULATE so we</div><div class='add'>+	 * overwrite existing entries and test this code path against</div><div class='add'>+	 * overwriting existing entries.</div><div class='add'>+	 */</div><div class='add'>+	ptr1 = mmap_(self, variant, &amp;ptr_region[page_size], 10 * page_size,</div><div class='add'>+		     PROT_READ | PROT_WRITE, MAP_FIXED | MAP_POPULATE, 0);</div><div class='add'>+	ASSERT_NE(ptr1, MAP_FAILED);</div><div class='add'>+	/* We want guard markers at start/end of each VMA. */</div><div class='add'>+	vec[0].iov_base = ptr1;</div><div class='add'>+	vec[0].iov_len = page_size;</div><div class='add'>+	vec[1].iov_base = &amp;ptr1[9 * page_size];</div><div class='add'>+	vec[1].iov_len = page_size;</div><div class='add'>+</div><div class='add'>+	/* 5 pages offset 50 pages into reserve region. */</div><div class='add'>+	ptr2 = mmap_(self, variant, &amp;ptr_region[50 * page_size], 5 * page_size,</div><div class='add'>+		     PROT_READ | PROT_WRITE, MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr2, MAP_FAILED);</div><div class='add'>+	vec[2].iov_base = ptr2;</div><div class='add'>+	vec[2].iov_len = page_size;</div><div class='add'>+	vec[3].iov_base = &amp;ptr2[4 * page_size];</div><div class='add'>+	vec[3].iov_len = page_size;</div><div class='add'>+</div><div class='add'>+	/* 20 pages offset 79 pages into reserve region. */</div><div class='add'>+	ptr3 = mmap_(self, variant, &amp;ptr_region[79 * page_size], 20 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr3, MAP_FAILED);</div><div class='add'>+	vec[4].iov_base = ptr3;</div><div class='add'>+	vec[4].iov_len = page_size;</div><div class='add'>+	vec[5].iov_base = &amp;ptr3[19 * page_size];</div><div class='add'>+	vec[5].iov_len = page_size;</div><div class='add'>+</div><div class='add'>+	/* Free surrounding VMAs. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr_region, page_size), 0);</div><div class='add'>+	ASSERT_EQ(munmap(&amp;ptr_region[11 * page_size], 39 * page_size), 0);</div><div class='add'>+	ASSERT_EQ(munmap(&amp;ptr_region[55 * page_size], 24 * page_size), 0);</div><div class='add'>+	ASSERT_EQ(munmap(&amp;ptr_region[99 * page_size], page_size), 0);</div><div class='add'>+</div><div class='add'>+	/* Now guard in one step. */</div><div class='add'>+	count = sys_process_madvise(PIDFD_SELF, vec, 6, MADV_GUARD_INSTALL, 0);</div><div class='add'>+</div><div class='add'>+	/* OK we don't have permission to do this, skip. */</div><div class='add'>+	if (count == -1 &amp;&amp; errno == EPERM)</div><div class='add'>+		SKIP(return, "No process_madvise() permissions, try running as root.\n");</div><div class='add'>+</div><div class='add'>+	/* Returns the number of bytes advised. */</div><div class='add'>+	ASSERT_EQ(count, 6 * page_size);</div><div class='add'>+</div><div class='add'>+	/* Now make sure the guarding was applied. */</div><div class='add'>+</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr1));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr1[9 * page_size]));</div><div class='add'>+</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr2));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr2[4 * page_size]));</div><div class='add'>+</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr3));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr3[19 * page_size]));</div><div class='add'>+</div><div class='add'>+	/* Now do the same with unguard... */</div><div class='add'>+	count = sys_process_madvise(PIDFD_SELF, vec, 6, MADV_GUARD_REMOVE, 0);</div><div class='add'>+</div><div class='add'>+	/* ...and everything should now succeed. */</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(try_read_write_buf(ptr1));</div><div class='add'>+	ASSERT_TRUE(try_read_write_buf(&amp;ptr1[9 * page_size]));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(try_read_write_buf(ptr2));</div><div class='add'>+	ASSERT_TRUE(try_read_write_buf(&amp;ptr2[4 * page_size]));</div><div class='add'>+</div><div class='add'>+	ASSERT_TRUE(try_read_write_buf(ptr3));</div><div class='add'>+	ASSERT_TRUE(try_read_write_buf(&amp;ptr3[19 * page_size]));</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr1, 10 * page_size), 0);</div><div class='add'>+	ASSERT_EQ(munmap(ptr2, 5 * page_size), 0);</div><div class='add'>+	ASSERT_EQ(munmap(ptr3, 20 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assert that unmapping ranges does not leave guard markers behind. */</div><div class='add'>+TEST_F(guard_regions, munmap)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr, *ptr_new1, *ptr_new2;</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Guard first and last pages. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	ASSERT_EQ(madvise(&amp;ptr[9 * page_size], page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Assert that they are guarded. */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr[9 * page_size]));</div><div class='add'>+</div><div class='add'>+	/* Unmap them. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, page_size), 0);</div><div class='add'>+	ASSERT_EQ(munmap(&amp;ptr[9 * page_size], page_size), 0);</div><div class='add'>+</div><div class='add'>+	/* Map over them.*/</div><div class='add'>+	ptr_new1 = mmap_(self, variant, ptr, page_size, PROT_READ | PROT_WRITE,</div><div class='add'>+			 MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr_new1, MAP_FAILED);</div><div class='add'>+	ptr_new2 = mmap_(self, variant, &amp;ptr[9 * page_size], page_size,</div><div class='add'>+			 PROT_READ | PROT_WRITE, MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr_new2, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Assert that they are now not guarded. */</div><div class='add'>+	ASSERT_TRUE(try_read_write_buf(ptr_new1));</div><div class='add'>+	ASSERT_TRUE(try_read_write_buf(ptr_new2));</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assert that mprotect() operations have no bearing on guard markers. */</div><div class='add'>+TEST_F(guard_regions, mprotect)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Guard the middle of the range. */</div><div class='add'>+	ASSERT_EQ(madvise(&amp;ptr[5 * page_size], 2 * page_size,</div><div class='add'>+			  MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Assert that it is indeed guarded. */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr[5 * page_size]));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr[6 * page_size]));</div><div class='add'>+</div><div class='add'>+	/* Now make these pages read-only. */</div><div class='add'>+	ASSERT_EQ(mprotect(&amp;ptr[5 * page_size], 2 * page_size, PROT_READ), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the range is still guarded. */</div><div class='add'>+	ASSERT_FALSE(try_read_buf(&amp;ptr[5 * page_size]));</div><div class='add'>+	ASSERT_FALSE(try_read_buf(&amp;ptr[6 * page_size]));</div><div class='add'>+</div><div class='add'>+	/* Make sure we can guard again without issue.*/</div><div class='add'>+	ASSERT_EQ(madvise(&amp;ptr[5 * page_size], 2 * page_size,</div><div class='add'>+			  MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the range is, yet again, still guarded. */</div><div class='add'>+	ASSERT_FALSE(try_read_buf(&amp;ptr[5 * page_size]));</div><div class='add'>+	ASSERT_FALSE(try_read_buf(&amp;ptr[6 * page_size]));</div><div class='add'>+</div><div class='add'>+	/* Now unguard the whole range. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the whole range is readable. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Split and merge VMAs and make sure guard pages still behave. */</div><div class='add'>+TEST_F(guard_regions, split_merge)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr, *ptr_new;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Guard the whole range. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the whole range is guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now unmap some pages in the range so we split. */</div><div class='add'>+	ASSERT_EQ(munmap(&amp;ptr[2 * page_size], page_size), 0);</div><div class='add'>+	ASSERT_EQ(munmap(&amp;ptr[5 * page_size], page_size), 0);</div><div class='add'>+	ASSERT_EQ(munmap(&amp;ptr[8 * page_size], page_size), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the remaining ranges are guarded post-split. */</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+	for (i = 2; i &lt; 5; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+	for (i = 6; i &lt; 8; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+	for (i = 9; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now map them again - the unmap will have cleared the guards. */</div><div class='add'>+	ptr_new = mmap_(self, variant, &amp;ptr[2 * page_size], page_size,</div><div class='add'>+			PROT_READ | PROT_WRITE, MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr_new, MAP_FAILED);</div><div class='add'>+	ptr_new = mmap_(self, variant, &amp;ptr[5 * page_size], page_size,</div><div class='add'>+			PROT_READ | PROT_WRITE, MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr_new, MAP_FAILED);</div><div class='add'>+	ptr_new = mmap_(self, variant, &amp;ptr[8 * page_size], page_size,</div><div class='add'>+			PROT_READ | PROT_WRITE, MAP_FIXED, 0);</div><div class='add'>+	ASSERT_NE(ptr_new, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Now make sure guard pages are established. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+		bool result = try_read_write_buf(curr);</div><div class='add'>+		bool expect_true = i == 2 || i == 5 || i == 8;</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(expect_true ? result : !result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now guard everything again. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the whole range is guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now split the range into three. */</div><div class='add'>+	ASSERT_EQ(mprotect(ptr, 3 * page_size, PROT_READ), 0);</div><div class='add'>+	ASSERT_EQ(mprotect(&amp;ptr[7 * page_size], 3 * page_size, PROT_READ), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the whole range is guarded for read. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now reset protection bits so we merge the whole thing. */</div><div class='add'>+	ASSERT_EQ(mprotect(ptr, 3 * page_size, PROT_READ | PROT_WRITE), 0);</div><div class='add'>+	ASSERT_EQ(mprotect(&amp;ptr[7 * page_size], 3 * page_size,</div><div class='add'>+			   PROT_READ | PROT_WRITE), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the whole range is still guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Split range into 3 again... */</div><div class='add'>+	ASSERT_EQ(mprotect(ptr, 3 * page_size, PROT_READ), 0);</div><div class='add'>+	ASSERT_EQ(mprotect(&amp;ptr[7 * page_size], 3 * page_size, PROT_READ), 0);</div><div class='add'>+</div><div class='add'>+	/* ...and unguard the whole range. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the whole range is remedied for read. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Merge them again. */</div><div class='add'>+	ASSERT_EQ(mprotect(ptr, 3 * page_size, PROT_READ | PROT_WRITE), 0);</div><div class='add'>+	ASSERT_EQ(mprotect(&amp;ptr[7 * page_size], 3 * page_size,</div><div class='add'>+			   PROT_READ | PROT_WRITE), 0);</div><div class='add'>+</div><div class='add'>+	/* Now ensure the merged range is remedied for read/write. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assert that MADV_DONTNEED does not remove guard markers. */</div><div class='add'>+TEST_F(guard_regions, dontneed)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Back the whole range. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		*curr = 'y';</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Guard every other page. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+		int res = madvise(curr, page_size, MADV_GUARD_INSTALL);</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(res, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Indicate that we don't need any of the range. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_DONTNEED), 0);</div><div class='add'>+</div><div class='add'>+	/* Check to ensure guard markers are still in place. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+		bool result = try_read_buf(curr);</div><div class='add'>+</div><div class='add'>+		if (i % 2 == 0) {</div><div class='add'>+			ASSERT_FALSE(result);</div><div class='add'>+		} else {</div><div class='add'>+			ASSERT_TRUE(result);</div><div class='add'>+			switch (variant-&gt;backing) {</div><div class='add'>+			case ANON_BACKED:</div><div class='add'>+				/* If anon, then we get a zero page. */</div><div class='add'>+				ASSERT_EQ(*curr, '\0');</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				/* Otherwise, we get the file data. */</div><div class='add'>+				ASSERT_EQ(*curr, 'y');</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Now write... */</div><div class='add'>+		result = try_write_buf(&amp;ptr[i * page_size]);</div><div class='add'>+</div><div class='add'>+		/* ...and make sure same result. */</div><div class='add'>+		ASSERT_TRUE(i % 2 != 0 ? result : !result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assert that mlock()'ed pages work correctly with guard markers. */</div><div class='add'>+TEST_F(guard_regions, mlock)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Populate. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		*curr = 'y';</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Lock. */</div><div class='add'>+	ASSERT_EQ(mlock(ptr, 10 * page_size), 0);</div><div class='add'>+</div><div class='add'>+	/* Now try to guard, should fail with EINVAL. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), -1);</div><div class='add'>+	ASSERT_EQ(errno, EINVAL);</div><div class='add'>+</div><div class='add'>+	/* OK unlock. */</div><div class='add'>+	ASSERT_EQ(munlock(ptr, 10 * page_size), 0);</div><div class='add'>+</div><div class='add'>+	/* Guard first half of range, should now succeed. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 5 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure guard works. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+		bool result = try_read_write_buf(curr);</div><div class='add'>+</div><div class='add'>+		if (i &lt; 5) {</div><div class='add'>+			ASSERT_FALSE(result);</div><div class='add'>+		} else {</div><div class='add'>+			ASSERT_TRUE(result);</div><div class='add'>+			ASSERT_EQ(*curr, 'x');</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now lock the latter part of the range. We can't lock the guard pages,</div><div class='add'>+	 * as this would result in the pages being populated and the guarding</div><div class='add'>+	 * would cause this to error out.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(mlock(&amp;ptr[5 * page_size], 5 * page_size), 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now remove guard pages, we permit mlock()'d ranges to have guard</div><div class='add'>+	 * pages removed as it is a non-destructive operation.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	/* Now check that no guard pages remain. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Assert that moving, extending and shrinking memory via mremap() retains</div><div class='add'>+ * guard markers where possible.</div><div class='add'>+ *</div><div class='add'>+ * - Moving a mapping alone should retain markers as they are.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, mremap_move)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr, *ptr_new;</div><div class='add'>+</div><div class='add'>+	/* Map 5 pages. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 5 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Place guard markers at both ends of the 5 page span. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	ASSERT_EQ(madvise(&amp;ptr[4 * page_size], page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the guard pages are in effect. */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr[4 * page_size]));</div><div class='add'>+</div><div class='add'>+	/* Map a new region we will move this range into. Doing this ensures</div><div class='add'>+	 * that we have reserved a range to map into.</div><div class='add'>+	 */</div><div class='add'>+	ptr_new = mmap_(self, variant, NULL, 5 * page_size, PROT_NONE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr_new, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(mremap(ptr, 5 * page_size, 5 * page_size,</div><div class='add'>+			 MREMAP_MAYMOVE | MREMAP_FIXED, ptr_new), ptr_new);</div><div class='add'>+</div><div class='add'>+	/* Make sure the guard markers are retained. */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr_new));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr_new[4 * page_size]));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Clean up - we only need reference the new pointer as we overwrote the</div><div class='add'>+	 * PROT_NONE range and moved the existing one.</div><div class='add'>+	 */</div><div class='add'>+	munmap(ptr_new, 5 * page_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Assert that moving, extending and shrinking memory via mremap() retains</div><div class='add'>+ * guard markers where possible.</div><div class='add'>+ *</div><div class='add'>+ * Expanding should retain guard pages, only now in different position. The user</div><div class='add'>+ * will have to remove guard pages manually to fix up (they'd have to do the</div><div class='add'>+ * same if it were a PROT_NONE mapping).</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, mremap_expand)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr, *ptr_new;</div><div class='add'>+</div><div class='add'>+	/* Map 10 pages... */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+	/* ...But unmap the last 5 so we can ensure we can expand into them. */</div><div class='add'>+	ASSERT_EQ(munmap(&amp;ptr[5 * page_size], 5 * page_size), 0);</div><div class='add'>+</div><div class='add'>+	/* Place guard markers at both ends of the 5 page span. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	ASSERT_EQ(madvise(&amp;ptr[4 * page_size], page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the guarding is in effect. */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr[4 * page_size]));</div><div class='add'>+</div><div class='add'>+	/* Now expand to 10 pages. */</div><div class='add'>+	ptr = mremap(ptr, 5 * page_size, 10 * page_size, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure the guard markers are retained in their original positions.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr[4 * page_size]));</div><div class='add'>+</div><div class='add'>+	/* Reserve a region which we can move to and expand into. */</div><div class='add'>+	ptr_new = mmap_(self, variant, NULL, 20 * page_size, PROT_NONE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr_new, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Now move and expand into it. */</div><div class='add'>+	ptr = mremap(ptr, 10 * page_size, 20 * page_size,</div><div class='add'>+		     MREMAP_MAYMOVE | MREMAP_FIXED, ptr_new);</div><div class='add'>+	ASSERT_EQ(ptr, ptr_new);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Again, make sure the guard markers are retained in their original positions.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr[4 * page_size]));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * A real user would have to remove guard markers, but would reasonably</div><div class='add'>+	 * expect all characteristics of the mapping to be retained, including</div><div class='add'>+	 * guard markers.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	munmap(ptr, 20 * page_size);</div><div class='add'>+}</div><div class='add'>+/*</div><div class='add'>+ * Assert that moving, extending and shrinking memory via mremap() retains</div><div class='add'>+ * guard markers where possible.</div><div class='add'>+ *</div><div class='add'>+ * Shrinking will result in markers that are shrunk over being removed. Again,</div><div class='add'>+ * if the user were using a PROT_NONE mapping they'd have to manually fix this</div><div class='add'>+ * up also so this is OK.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, mremap_shrink)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Map 5 pages. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 5 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Place guard markers at both ends of the 5 page span. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	ASSERT_EQ(madvise(&amp;ptr[4 * page_size], page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Make sure the guarding is in effect. */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(&amp;ptr[4 * page_size]));</div><div class='add'>+</div><div class='add'>+	/* Now shrink to 3 pages. */</div><div class='add'>+	ptr = mremap(ptr, 5 * page_size, 3 * page_size, MREMAP_MAYMOVE);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* We expect the guard marker at the start to be retained... */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='add'>+</div><div class='add'>+	/* ...But remaining pages will not have guard markers. */</div><div class='add'>+	for (i = 1; i &lt; 3; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * As with expansion, a real user would have to remove guard pages and</div><div class='add'>+	 * fixup. But you'd have to do similar manual things with PROT_NONE</div><div class='add'>+	 * mappings too.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we expand back to the original size, the end marker will, of</div><div class='add'>+	 * course, no longer be present.</div><div class='add'>+	 */</div><div class='add'>+	ptr = mremap(ptr, 3 * page_size, 5 * page_size, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Again, we expect the guard marker at the start to be retained... */</div><div class='add'>+	ASSERT_FALSE(try_read_write_buf(ptr));</div><div class='add'>+</div><div class='add'>+	/* ...But remaining pages will not have guard markers. */</div><div class='add'>+	for (i = 1; i &lt; 5; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	munmap(ptr, 5 * page_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Assert that forking a process with VMAs that do not have VM_WIPEONFORK set</div><div class='add'>+ * retain guard pages.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, fork)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	pid_t pid;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Map 10 pages. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Establish guard pages in the first 5 pages. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 5 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_NE(pid, -1);</div><div class='add'>+	if (!pid) {</div><div class='add'>+		/* This is the child process now. */</div><div class='add'>+</div><div class='add'>+		/* Assert that the guarding is in effect. */</div><div class='add'>+		for (i = 0; i &lt; 10; i++) {</div><div class='add'>+			char *curr = &amp;ptr[i * page_size];</div><div class='add'>+			bool result = try_read_write_buf(curr);</div><div class='add'>+</div><div class='add'>+			ASSERT_TRUE(i &gt;= 5 ? result : !result);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Now unguard the range.*/</div><div class='add'>+		ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+		exit(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Parent process. */</div><div class='add'>+</div><div class='add'>+	/* Parent simply waits on child. */</div><div class='add'>+	waitpid(pid, NULL, 0);</div><div class='add'>+</div><div class='add'>+	/* Child unguard does not impact parent page table state. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+		bool result = try_read_write_buf(curr);</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(i &gt;= 5 ? result : !result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Assert expected behaviour after we fork populated ranges of anonymous memory</div><div class='add'>+ * and then guard and unguard the range.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, fork_cow)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	pid_t pid;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing != ANON_BACKED)</div><div class='add'>+		SKIP(return, "CoW only supported on anon mappings");</div><div class='add'>+</div><div class='add'>+	/* Map 10 pages. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Populate range. */</div><div class='add'>+	for (i = 0; i &lt; 10 * page_size; i++) {</div><div class='add'>+		char chr = 'a' + (i % 26);</div><div class='add'>+</div><div class='add'>+		ptr[i] = chr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_NE(pid, -1);</div><div class='add'>+	if (!pid) {</div><div class='add'>+		/* This is the child process now. */</div><div class='add'>+</div><div class='add'>+		/* Ensure the range is as expected. */</div><div class='add'>+		for (i = 0; i &lt; 10 * page_size; i++) {</div><div class='add'>+			char expected = 'a' + (i % 26);</div><div class='add'>+			char actual = ptr[i];</div><div class='add'>+</div><div class='add'>+			ASSERT_EQ(actual, expected);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Establish guard pages across the whole range. */</div><div class='add'>+		ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+		/* Remove it. */</div><div class='add'>+		ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * By removing the guard pages, the page tables will be</div><div class='add'>+		 * cleared. Assert that we are looking at the zero page now.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; 10 * page_size; i++) {</div><div class='add'>+			char actual = ptr[i];</div><div class='add'>+</div><div class='add'>+			ASSERT_EQ(actual, '\0');</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Parent process. */</div><div class='add'>+</div><div class='add'>+	/* Parent simply waits on child. */</div><div class='add'>+	waitpid(pid, NULL, 0);</div><div class='add'>+</div><div class='add'>+	/* Ensure the range is unchanged in parent anon range. */</div><div class='add'>+	for (i = 0; i &lt; 10 * page_size; i++) {</div><div class='add'>+		char expected = 'a' + (i % 26);</div><div class='add'>+		char actual = ptr[i];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(actual, expected);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Assert that forking a process with VMAs that do have VM_WIPEONFORK set</div><div class='add'>+ * behave as expected.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, fork_wipeonfork)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	pid_t pid;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing != ANON_BACKED)</div><div class='add'>+		SKIP(return, "Wipe on fork only supported on anon mappings");</div><div class='add'>+</div><div class='add'>+	/* Map 10 pages. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Mark wipe on fork. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_WIPEONFORK), 0);</div><div class='add'>+</div><div class='add'>+	/* Guard the first 5 pages. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 5 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	pid = fork();</div><div class='add'>+	ASSERT_NE(pid, -1);</div><div class='add'>+	if (!pid) {</div><div class='add'>+		/* This is the child process now. */</div><div class='add'>+</div><div class='add'>+		/* Guard will have been wiped. */</div><div class='add'>+		for (i = 0; i &lt; 10; i++) {</div><div class='add'>+			char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+			ASSERT_TRUE(try_read_write_buf(curr));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		exit(0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Parent process. */</div><div class='add'>+</div><div class='add'>+	waitpid(pid, NULL, 0);</div><div class='add'>+</div><div class='add'>+	/* Guard markers should be in effect.*/</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+		bool result = try_read_write_buf(curr);</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(i &gt;= 5 ? result : !result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Ensure that MADV_FREE retains guard entries as expected. */</div><div class='add'>+TEST_F(guard_regions, lazyfree)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing != ANON_BACKED)</div><div class='add'>+		SKIP(return, "MADV_FREE only supported on anon mappings");</div><div class='add'>+</div><div class='add'>+	/* Map 10 pages. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Guard range. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Ensure guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Lazyfree range. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_FREE), 0);</div><div class='add'>+</div><div class='add'>+	/* This should leave the guard markers in place. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Ensure that MADV_POPULATE_READ, MADV_POPULATE_WRITE behave as expected. */</div><div class='add'>+TEST_F(guard_regions, populate)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+</div><div class='add'>+	/* Map 10 pages. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Guard range. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Populate read should error out... */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_POPULATE_READ), -1);</div><div class='add'>+	ASSERT_EQ(errno, EFAULT);</div><div class='add'>+</div><div class='add'>+	/* ...as should populate write. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_POPULATE_WRITE), -1);</div><div class='add'>+	ASSERT_EQ(errno, EFAULT);</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Ensure that MADV_COLD, MADV_PAGEOUT do not remove guard markers. */</div><div class='add'>+TEST_F(guard_regions, cold_pageout)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Map 10 pages. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Guard range. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Ensured guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now mark cold. This should have no impact on guard markers. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_COLD), 0);</div><div class='add'>+</div><div class='add'>+	/* Should remain guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* OK, now page out. This should equally, have no effect on markers. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_PAGEOUT), 0);</div><div class='add'>+</div><div class='add'>+	/* Should remain guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Ensure that guard pages do not break userfaultd. */</div><div class='add'>+TEST_F(guard_regions, uffd)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	int uffd;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+	struct uffdio_api api = {</div><div class='add'>+		.api = UFFD_API,</div><div class='add'>+		.features = 0,</div><div class='add'>+	};</div><div class='add'>+	struct uffdio_register reg;</div><div class='add'>+	struct uffdio_range range;</div><div class='add'>+</div><div class='add'>+	if (!is_anon_backed(variant))</div><div class='add'>+		SKIP(return, "uffd only works on anon backing");</div><div class='add'>+</div><div class='add'>+	/* Set up uffd. */</div><div class='add'>+	uffd = userfaultfd(0);</div><div class='add'>+	if (uffd == -1) {</div><div class='add'>+		switch (errno) {</div><div class='add'>+		case EPERM:</div><div class='add'>+			SKIP(return, "No userfaultfd permissions, try running as root.");</div><div class='add'>+			break;</div><div class='add'>+		case ENOSYS:</div><div class='add'>+			SKIP(return, "userfaultfd is not supported/not enabled.");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ksft_exit_fail_msg("userfaultfd failed with %s\n",</div><div class='add'>+					   strerror(errno));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_NE(uffd, -1);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(ioctl(uffd, UFFDIO_API, &amp;api), 0);</div><div class='add'>+</div><div class='add'>+	/* Map 10 pages. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Register the range with uffd. */</div><div class='add'>+	range.start = (unsigned long)ptr;</div><div class='add'>+	range.len = 10 * page_size;</div><div class='add'>+	reg.range = range;</div><div class='add'>+	reg.mode = UFFDIO_REGISTER_MODE_MISSING;</div><div class='add'>+	ASSERT_EQ(ioctl(uffd, UFFDIO_REGISTER, &amp;reg), 0);</div><div class='add'>+</div><div class='add'>+	/* Guard the range. This should not trigger the uffd. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* The guarding should behave as usual with no uffd intervention. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *curr = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_read_write_buf(curr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cleanup. */</div><div class='add'>+	ASSERT_EQ(ioctl(uffd, UFFDIO_UNREGISTER, &amp;range), 0);</div><div class='add'>+	close(uffd);</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mark a region within a file-backed mapping using MADV_SEQUENTIAL so we</div><div class='add'>+ * aggressively read-ahead, then install guard regions and assert that it</div><div class='add'>+ * behaves correctly.</div><div class='add'>+ *</div><div class='add'>+ * We page out using MADV_PAGEOUT before checking guard regions so we drop page</div><div class='add'>+ * cache folios, meaning we maximise the possibility of some broken readahead.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, madvise_sequential)</div><div class='add'>+{</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing == ANON_BACKED)</div><div class='add'>+		SKIP(return, "MADV_SEQUENTIAL meaningful only for file-backed");</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Establish a pattern of data in the file. */</div><div class='add'>+	set_pattern(ptr, 10, page_size);</div><div class='add'>+	ASSERT_TRUE(check_pattern(ptr, 10, page_size));</div><div class='add'>+</div><div class='add'>+	/* Mark it as being accessed sequentially. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_SEQUENTIAL), 0);</div><div class='add'>+</div><div class='add'>+	/* Mark every other page a guard page. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr2 = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(madvise(ptr2, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now page it out. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_PAGEOUT), 0);</div><div class='add'>+</div><div class='add'>+	/* Now make sure pages are as expected. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *chrp = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		if (i % 2 == 0) {</div><div class='add'>+			bool result = try_read_write_buf(chrp);</div><div class='add'>+</div><div class='add'>+			ASSERT_FALSE(result);</div><div class='add'>+		} else {</div><div class='add'>+			ASSERT_EQ(*chrp, 'a' + i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now remove guard pages. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	/* Now make sure all data is as expected. */</div><div class='add'>+	if (!check_pattern(ptr, 10, page_size))</div><div class='add'>+		ASSERT_TRUE(false);</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check that file-backed mappings implement guard regions with MAP_PRIVATE</div><div class='add'>+ * correctly.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, map_private)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr_shared, *ptr_private;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing == ANON_BACKED)</div><div class='add'>+		SKIP(return, "MAP_PRIVATE test specific to file-backed");</div><div class='add'>+</div><div class='add'>+	ptr_shared = mmap_(self, variant, NULL, 10 * page_size, PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr_shared, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Manually mmap(), do not use mmap_() wrapper so we can force MAP_PRIVATE. */</div><div class='add'>+	ptr_private = mmap(NULL, 10 * page_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, self-&gt;fd, 0);</div><div class='add'>+	ASSERT_NE(ptr_private, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Set pattern in shared mapping. */</div><div class='add'>+	set_pattern(ptr_shared, 10, page_size);</div><div class='add'>+</div><div class='add'>+	/* Install guard regions in every other page in the shared mapping. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr = &amp;ptr_shared[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		/* Every even shared page should be guarded. */</div><div class='add'>+		ASSERT_EQ(try_read_buf(&amp;ptr_shared[i * page_size]), i % 2 != 0);</div><div class='add'>+		/* Private mappings should always be readable. */</div><div class='add'>+		ASSERT_TRUE(try_read_buf(&amp;ptr_private[i * page_size]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Install guard regions in every other page in the private mapping. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr = &amp;ptr_private[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		/* Every even shared page should be guarded. */</div><div class='add'>+		ASSERT_EQ(try_read_buf(&amp;ptr_shared[i * page_size]), i % 2 != 0);</div><div class='add'>+		/* Every odd private page should be guarded. */</div><div class='add'>+		ASSERT_EQ(try_read_buf(&amp;ptr_private[i * page_size]), i % 2 != 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove guard regions from shared mapping. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr_shared, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		/* Shared mappings should always be readable. */</div><div class='add'>+		ASSERT_TRUE(try_read_buf(&amp;ptr_shared[i * page_size]));</div><div class='add'>+		/* Every even private page should be guarded. */</div><div class='add'>+		ASSERT_EQ(try_read_buf(&amp;ptr_private[i * page_size]), i % 2 != 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove guard regions from private mapping. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr_private, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		/* Shared mappings should always be readable. */</div><div class='add'>+		ASSERT_TRUE(try_read_buf(&amp;ptr_shared[i * page_size]));</div><div class='add'>+		/* Private mappings should always be readable. */</div><div class='add'>+		ASSERT_TRUE(try_read_buf(&amp;ptr_private[i * page_size]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure patterns are intact. */</div><div class='add'>+	ASSERT_TRUE(check_pattern(ptr_shared, 10, page_size));</div><div class='add'>+	ASSERT_TRUE(check_pattern(ptr_private, 10, page_size));</div><div class='add'>+</div><div class='add'>+	/* Now write out every other page to MAP_PRIVATE. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr = &amp;ptr_private[i * page_size];</div><div class='add'>+</div><div class='add'>+		memset(ptr, 'a' + i, page_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * At this point the mapping is:</div><div class='add'>+	 *</div><div class='add'>+	 * 0123456789</div><div class='add'>+	 * SPSPSPSPSP</div><div class='add'>+	 *</div><div class='add'>+	 * Where S = shared, P = private mappings.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Now mark the beginning of the mapping guarded. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr_private, 5 * page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This renders the mapping:</div><div class='add'>+	 *</div><div class='add'>+	 * 0123456789</div><div class='add'>+	 * xxxxxPSPSP</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr = &amp;ptr_private[i * page_size];</div><div class='add'>+</div><div class='add'>+		/* Ensure guard regions as expected. */</div><div class='add'>+		ASSERT_EQ(try_read_buf(ptr), i &gt;= 5);</div><div class='add'>+		/* The shared mapping should always succeed. */</div><div class='add'>+		ASSERT_TRUE(try_read_buf(&amp;ptr_shared[i * page_size]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove the guard regions altogether. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr_private, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *</div><div class='add'>+	 * We now expect the mapping to be:</div><div class='add'>+	 *</div><div class='add'>+	 * 0123456789</div><div class='add'>+	 * SSSSSPSPSP</div><div class='add'>+	 *</div><div class='add'>+	 * As we removed guard regions, the private pages from the first 5 will</div><div class='add'>+	 * have been zapped, so on fault will reestablish the shared mapping.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr = &amp;ptr_private[i * page_size];</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Assert that shared mappings in the MAP_PRIVATE mapping match</div><div class='add'>+		 * the shared mapping.</div><div class='add'>+		 */</div><div class='add'>+		if (i &lt; 5 || i % 2 == 0) {</div><div class='add'>+			char *ptr_s = &amp;ptr_shared[i * page_size];</div><div class='add'>+</div><div class='add'>+			ASSERT_EQ(memcmp(ptr, ptr_s, page_size), 0);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Everything else is a private mapping. */</div><div class='add'>+		ASSERT_TRUE(is_buf_eq(ptr, page_size, 'a' + i));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(munmap(ptr_shared, 10 * page_size), 0);</div><div class='add'>+	ASSERT_EQ(munmap(ptr_private, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Test that guard regions established over a read-only mapping function correctly. */</div><div class='add'>+TEST_F(guard_regions, readonly_file)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing != LOCAL_FILE_BACKED)</div><div class='add'>+		SKIP(return, "Read-only test specific to file-backed");</div><div class='add'>+</div><div class='add'>+	/* Map shared so we can populate with pattern, populate it, unmap. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+	set_pattern(ptr, 10, page_size);</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+	/* Close the fd so we can re-open read-only. */</div><div class='add'>+	ASSERT_EQ(close(self-&gt;fd), 0);</div><div class='add'>+</div><div class='add'>+	/* Re-open read-only. */</div><div class='add'>+	self-&gt;fd = open(self-&gt;path, O_RDONLY);</div><div class='add'>+	ASSERT_NE(self-&gt;fd, -1);</div><div class='add'>+	/* Re-map read-only. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size, PROT_READ, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Mark every other page guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr_pg = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(madvise(ptr_pg, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Assert that the guard regions are in place.*/</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_pg = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(try_read_buf(ptr_pg), i % 2 != 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove guard regions. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	/* Ensure the data is as expected. */</div><div class='add'>+	ASSERT_TRUE(check_pattern(ptr, 10, page_size));</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(guard_regions, fault_around)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing == ANON_BACKED)</div><div class='add'>+		SKIP(return, "Fault-around test specific to file-backed");</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Establish a pattern in the backing file. */</div><div class='add'>+	set_pattern(ptr, 10, page_size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now drop it from the page cache so we get major faults when next we</div><div class='add'>+	 * map it.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_PAGEOUT), 0);</div><div class='add'>+</div><div class='add'>+	/* Unmap and remap 'to be sure'. */</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Now make every even page guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(madvise(ptr_p, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now fault in every odd page. This should trigger fault-around. */</div><div class='add'>+	for (i = 1; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_buf(ptr_p));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Finally, ensure that guard regions are intact as expected. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(try_read_buf(ptr_p), i % 2 != 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(guard_regions, truncation)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing == ANON_BACKED)</div><div class='add'>+		SKIP(return, "Truncation test specific to file-backed");</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Establish a pattern in the backing file, just so there is data</div><div class='add'>+	 * there.</div><div class='add'>+	 */</div><div class='add'>+	set_pattern(ptr, 10, page_size);</div><div class='add'>+</div><div class='add'>+	/* Now make every even page guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(madvise(ptr_p, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now assert things are as expected. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(try_read_write_buf(ptr_p), i % 2 != 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now truncate to actually used size (initialised to 100). */</div><div class='add'>+	ASSERT_EQ(ftruncate(self-&gt;fd, 10 * page_size), 0);</div><div class='add'>+</div><div class='add'>+	/* Here the guard regions will remain intact. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(try_read_write_buf(ptr_p), i % 2 != 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now truncate to half the size, then truncate again to the full size. */</div><div class='add'>+	ASSERT_EQ(ftruncate(self-&gt;fd, 5 * page_size), 0);</div><div class='add'>+	ASSERT_EQ(ftruncate(self-&gt;fd, 10 * page_size), 0);</div><div class='add'>+</div><div class='add'>+	/* Again, guard pages will remain intact. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(try_read_write_buf(ptr_p), i % 2 != 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(guard_regions, hole_punch)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing == ANON_BACKED)</div><div class='add'>+		SKIP(return, "Truncation test specific to file-backed");</div><div class='add'>+</div><div class='add'>+	/* Establish pattern in mapping. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+	set_pattern(ptr, 10, page_size);</div><div class='add'>+</div><div class='add'>+	/* Install a guard region in the middle of the mapping. */</div><div class='add'>+	ASSERT_EQ(madvise(&amp;ptr[3 * page_size], 4 * page_size,</div><div class='add'>+			  MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The buffer will now be:</div><div class='add'>+	 *</div><div class='add'>+	 * 0123456789</div><div class='add'>+	 * ***xxxx***</div><div class='add'>+	 *</div><div class='add'>+	 * Where * is data and x is the guard region.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Ensure established. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(try_read_buf(ptr_p), i &lt; 3 || i &gt;= 7);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now hole punch the guarded region. */</div><div class='add'>+	ASSERT_EQ(madvise(&amp;ptr[3 * page_size], 4 * page_size,</div><div class='add'>+			  MADV_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	/* Ensure guard regions remain. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(try_read_buf(ptr_p), i &lt; 3 || i &gt;= 7);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now remove guard region throughout. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	/* Check that the pattern exists in non-hole punched region. */</div><div class='add'>+	ASSERT_TRUE(check_pattern(ptr, 3, page_size));</div><div class='add'>+	/* Check that hole punched region is zeroed. */</div><div class='add'>+	ASSERT_TRUE(is_buf_eq(&amp;ptr[3 * page_size], 4 * page_size, '\0'));</div><div class='add'>+	/* Check that the pattern exists in the remainder of the file. */</div><div class='add'>+	ASSERT_TRUE(check_pattern_offset(ptr, 3, page_size, 7));</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Ensure that a memfd works correctly with guard regions, that we can write</div><div class='add'>+ * seal it then open the mapping read-only and still establish guard regions</div><div class='add'>+ * within, remove those guard regions and have everything work correctly.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, memfd_write_seal)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (variant-&gt;backing != SHMEM_BACKED)</div><div class='add'>+		SKIP(return, "memfd write seal test specific to shmem");</div><div class='add'>+</div><div class='add'>+	/* OK, we need a memfd, so close existing one. */</div><div class='add'>+	ASSERT_EQ(close(self-&gt;fd), 0);</div><div class='add'>+</div><div class='add'>+	/* Create and truncate memfd. */</div><div class='add'>+	self-&gt;fd = memfd_create("guard_regions_memfd_seals_test",</div><div class='add'>+				MFD_ALLOW_SEALING);</div><div class='add'>+	ASSERT_NE(self-&gt;fd, -1);</div><div class='add'>+	ASSERT_EQ(ftruncate(self-&gt;fd, 10 * page_size), 0);</div><div class='add'>+</div><div class='add'>+	/* Map, set pattern, unmap. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size, PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+	set_pattern(ptr, 10, page_size);</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+</div><div class='add'>+	/* Write-seal the memfd. */</div><div class='add'>+	ASSERT_EQ(fcntl(self-&gt;fd, F_ADD_SEALS, F_SEAL_WRITE), 0);</div><div class='add'>+</div><div class='add'>+	/* Now map the memfd readonly. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size, PROT_READ, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Ensure pattern is as expected. */</div><div class='add'>+	ASSERT_TRUE(check_pattern(ptr, 10, page_size));</div><div class='add'>+</div><div class='add'>+	/* Now make every even page guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(madvise(ptr_p, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now assert things are as expected. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(try_read_buf(ptr_p), i % 2 != 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now remove guard regions. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	/* Ensure pattern is as expected. */</div><div class='add'>+	ASSERT_TRUE(check_pattern(ptr, 10, page_size));</div><div class='add'>+</div><div class='add'>+	/* Ensure write seal intact. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_FALSE(try_write_buf(ptr_p));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Since we are now permitted to establish guard regions in read-only anonymous</div><div class='add'>+ * mappings, for the sake of thoroughness, though it probably has no practical</div><div class='add'>+ * use, test that guard regions function with a mapping to the anonymous zero</div><div class='add'>+ * page.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, anon_zeropage)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!is_anon_backed(variant))</div><div class='add'>+		SKIP(return, "anon zero page test specific to anon/shmem");</div><div class='add'>+</div><div class='add'>+	/* Obtain a read-only i.e. anon zero page mapping. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size, PROT_READ, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Now make every even page guarded. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(madvise(ptr_p, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now assert things are as expected. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(try_read_buf(ptr_p), i % 2 != 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now remove all guard regions. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, 10 * page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+</div><div class='add'>+	/* Now assert things are as expected. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_TRUE(try_read_buf(ptr_p));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure zero page...*/</div><div class='add'>+	ASSERT_TRUE(is_buf_eq(ptr, 10 * page_size, '\0'));</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Assert that /proc/$pid/pagemap correctly identifies guard region ranges.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, pagemap)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	int proc_fd;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	proc_fd = open("/proc/self/pagemap", O_RDONLY);</div><div class='add'>+	ASSERT_NE(proc_fd, -1);</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Read from pagemap, and assert no guard regions are detected. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+		unsigned long entry = pagemap_get_entry(proc_fd, ptr_p);</div><div class='add'>+		unsigned long masked = entry &amp; PM_GUARD_REGION;</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(masked, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Install a guard region in every other page. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(madvise(ptr_p, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Re-read from pagemap, and assert guard regions are detected. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+		unsigned long entry = pagemap_get_entry(proc_fd, ptr_p);</div><div class='add'>+		unsigned long masked = entry &amp; PM_GUARD_REGION;</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(masked, i % 2 == 0 ? PM_GUARD_REGION : 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(proc_fd), 0);</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Assert that PAGEMAP_SCAN correctly reports guard region ranges.</div><div class='add'>+ */</div><div class='add'>+TEST_F(guard_regions, pagemap_scan)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	struct page_region pm_regs[10];</div><div class='add'>+	struct pm_scan_arg pm_scan_args = {</div><div class='add'>+		.size = sizeof(struct pm_scan_arg),</div><div class='add'>+		.category_anyof_mask = PAGE_IS_GUARD,</div><div class='add'>+		.return_mask = PAGE_IS_GUARD,</div><div class='add'>+		.vec = (long)&amp;pm_regs,</div><div class='add'>+		.vec_len = ARRAY_SIZE(pm_regs),</div><div class='add'>+	};</div><div class='add'>+	int proc_fd, i;</div><div class='add'>+	char *ptr;</div><div class='add'>+</div><div class='add'>+	proc_fd = open("/proc/self/pagemap", O_RDONLY);</div><div class='add'>+	ASSERT_NE(proc_fd, -1);</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size,</div><div class='add'>+		    PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	pm_scan_args.start = (long)ptr;</div><div class='add'>+	pm_scan_args.end = (long)ptr + 10 * page_size;</div><div class='add'>+	ASSERT_EQ(ioctl(proc_fd, PAGEMAP_SCAN, &amp;pm_scan_args), 0);</div><div class='add'>+	ASSERT_EQ(pm_scan_args.walk_end, (long)ptr + 10 * page_size);</div><div class='add'>+</div><div class='add'>+	/* Install a guard region in every other page. */</div><div class='add'>+	for (i = 0; i &lt; 10; i += 2) {</div><div class='add'>+		char *ptr_p = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(syscall(__NR_madvise, ptr_p, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Assert ioctl() returns the count of located regions, where each</div><div class='add'>+	 * region spans every other page within the range of 10 pages.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(ioctl(proc_fd, PAGEMAP_SCAN, &amp;pm_scan_args), 5);</div><div class='add'>+	ASSERT_EQ(pm_scan_args.walk_end, (long)ptr + 10 * page_size);</div><div class='add'>+</div><div class='add'>+	/* Re-read from pagemap, and assert guard regions are detected. */</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		long ptr_p = (long)&amp;ptr[2 * i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(pm_regs[i].start, ptr_p);</div><div class='add'>+		ASSERT_EQ(pm_regs[i].end, ptr_p + page_size);</div><div class='add'>+		ASSERT_EQ(pm_regs[i].categories, PAGE_IS_GUARD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ASSERT_EQ(close(proc_fd), 0);</div><div class='add'>+	ASSERT_EQ(munmap(ptr, 10 * page_size), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(guard_regions, collapse)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	const unsigned long size = 2 * HPAGE_SIZE;</div><div class='add'>+	const unsigned long num_pages = size / page_size;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Need file to be correct size for tests for non-anon. */</div><div class='add'>+	if (variant-&gt;backing != ANON_BACKED)</div><div class='add'>+		ASSERT_EQ(ftruncate(self-&gt;fd, size), 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We must close and re-open local-file backed as read-only for</div><div class='add'>+	 * CONFIG_READ_ONLY_THP_FOR_FS to work.</div><div class='add'>+	 */</div><div class='add'>+	if (variant-&gt;backing == LOCAL_FILE_BACKED) {</div><div class='add'>+		ASSERT_EQ(close(self-&gt;fd), 0);</div><div class='add'>+</div><div class='add'>+		self-&gt;fd = open(self-&gt;path, O_RDONLY);</div><div class='add'>+		ASSERT_GE(self-&gt;fd, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptr = mmap_(self, variant, NULL, size, PROT_READ, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Prevent being faulted-in as huge. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, size, MADV_NOHUGEPAGE), 0);</div><div class='add'>+	/* Fault in. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, size, MADV_POPULATE_READ), 0);</div><div class='add'>+</div><div class='add'>+	/* Install guard regions in ever other page. */</div><div class='add'>+	for (i = 0; i &lt; num_pages; i += 2) {</div><div class='add'>+		char *ptr_page = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		ASSERT_EQ(madvise(ptr_page, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+		/* Accesses should now fail. */</div><div class='add'>+		ASSERT_FALSE(try_read_buf(ptr_page));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allow huge page throughout region. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, size, MADV_HUGEPAGE), 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now collapse the entire region. This should fail in all cases.</div><div class='add'>+	 *</div><div class='add'>+	 * The madvise() call will also fail if CONFIG_READ_ONLY_THP_FOR_FS is</div><div class='add'>+	 * not set for the local file case, but we can't differentiate whether</div><div class='add'>+	 * this occurred or if the collapse was rightly rejected.</div><div class='add'>+	 */</div><div class='add'>+	EXPECT_NE(madvise(ptr, size, MADV_COLLAPSE), 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we introduce a bug that causes the collapse to succeed, gather</div><div class='add'>+	 * data on whether guard regions are at least preserved. The test will</div><div class='add'>+	 * fail at this point in any case.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; num_pages; i += 2) {</div><div class='add'>+		char *ptr_page = &amp;ptr[i * page_size];</div><div class='add'>+</div><div class='add'>+		/* Accesses should still fail. */</div><div class='add'>+		ASSERT_FALSE(try_read_buf(ptr_page));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(guard_regions, smaps)</div><div class='add'>+{</div><div class='add'>+	const unsigned long page_size = self-&gt;page_size;</div><div class='add'>+	struct procmap_fd procmap;</div><div class='add'>+	char *ptr, *ptr2;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Map a region. */</div><div class='add'>+	ptr = mmap_(self, variant, NULL, 10 * page_size, PROT_READ | PROT_WRITE, 0, 0);</div><div class='add'>+	ASSERT_NE(ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/* We shouldn't yet see a guard flag. */</div><div class='add'>+	ASSERT_FALSE(check_vmflag_guard(ptr));</div><div class='add'>+</div><div class='add'>+	/* Install a single guard region. */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+</div><div class='add'>+	/* Now we should see a guard flag. */</div><div class='add'>+	ASSERT_TRUE(check_vmflag_guard(ptr));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Removing the guard region should not change things because we simply</div><div class='add'>+	 * cannot accurately track whether a given VMA has had all of its guard</div><div class='add'>+	 * regions removed.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(madvise(ptr, page_size, MADV_GUARD_REMOVE), 0);</div><div class='add'>+	ASSERT_TRUE(check_vmflag_guard(ptr));</div><div class='add'>+</div><div class='add'>+	/* Install guard regions throughout. */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		ASSERT_EQ(madvise(&amp;ptr[i * page_size], page_size, MADV_GUARD_INSTALL), 0);</div><div class='add'>+		/* We should always see the guard region flag. */</div><div class='add'>+		ASSERT_TRUE(check_vmflag_guard(ptr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Split into two VMAs. */</div><div class='add'>+	ASSERT_EQ(munmap(&amp;ptr[4 * page_size], page_size), 0);</div><div class='add'>+</div><div class='add'>+	/* Both VMAs should have the guard flag set. */</div><div class='add'>+	ASSERT_TRUE(check_vmflag_guard(ptr));</div><div class='add'>+	ASSERT_TRUE(check_vmflag_guard(&amp;ptr[5 * page_size]));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the local file system is unable to merge VMAs due to having</div><div class='add'>+	 * unusual characteristics, there is no point in asserting merge</div><div class='add'>+	 * behaviour.</div><div class='add'>+	 */</div><div class='add'>+	if (!local_fs_has_sane_mmap(self, variant)) {</div><div class='add'>+		TH_LOG("local filesystem does not support sane merging skipping merge test");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Map a fresh VMA between the two split VMAs. */</div><div class='add'>+	ptr2 = mmap_(self, variant, &amp;ptr[4 * page_size], page_size,</div><div class='add'>+		     PROT_READ | PROT_WRITE, MAP_FIXED, 4 * page_size);</div><div class='add'>+	ASSERT_NE(ptr2, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check the procmap to ensure that this VMA merged with the adjacent</div><div class='add'>+	 * two. The guard region flag is 'sticky' so should not preclude</div><div class='add'>+	 * merging.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_EQ(open_self_procmap(&amp;procmap), 0);</div><div class='add'>+	ASSERT_TRUE(find_vma_procmap(&amp;procmap, ptr));</div><div class='add'>+	ASSERT_EQ(procmap.query.vma_start, (unsigned long)ptr);</div><div class='add'>+	ASSERT_EQ(procmap.query.vma_end, (unsigned long)ptr + 10 * page_size);</div><div class='add'>+	ASSERT_EQ(close_procmap(&amp;procmap), 0);</div><div class='add'>+	/* And, of course, this VMA should have the guard flag set. */</div><div class='add'>+	ASSERT_TRUE(check_vmflag_guard(ptr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/mm/gup_longterm.c b/tools/testing/selftests/mm/gup_longterm.c<br/>index 9423ad439a61..6279893a0adc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/gup_longterm.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/gup_longterm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/gup_longterm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/gup_longterm.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #endif /* LOCAL_CONFIG_HAVE_LIBURING */</div><div class='ctx'> </div><div class='ctx'> #include "../../../../mm/gup_test.h"</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "vm_util.h"</div><div class='ctx'> </div><div class='ctx'> static size_t pagesize;</div><div class='hunk'>@@ -93,29 +93,56 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared)</div><div class='ctx'> 	__fsword_t fs_type = get_fs_type(fd);</div><div class='ctx'> 	bool should_work;</div><div class='ctx'> 	char *mem;</div><div class='add'>+	int result = KSFT_PASS;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (fd &lt; 0) {</div><div class='add'>+		result = KSFT_FAIL;</div><div class='add'>+		goto report;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ftruncate(fd, size)) {</div><div class='del'>-		ksft_test_result_fail("ftruncate() failed\n");</div><div class='add'>+		if (errno == ENOENT) {</div><div class='add'>+			skip_test_dodgy_fs("ftruncate()");</div><div class='add'>+		} else {</div><div class='add'>+			ksft_print_msg("ftruncate() failed (%s)\n",</div><div class='add'>+				       strerror(errno));</div><div class='add'>+			result = KSFT_FAIL;</div><div class='add'>+			goto report;</div><div class='add'>+		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fallocate(fd, 0, 0, size)) {</div><div class='del'>-		if (size == pagesize)</div><div class='del'>-			ksft_test_result_fail("fallocate() failed\n");</div><div class='del'>-		else</div><div class='del'>-			ksft_test_result_skip("need more free huge pages\n");</div><div class='del'>-		return;</div><div class='add'>+		/*</div><div class='add'>+		 * Some filesystems (eg, NFSv3) don't support</div><div class='add'>+		 * fallocate(), report this as a skip rather than a</div><div class='add'>+		 * test failure.</div><div class='add'>+		 */</div><div class='add'>+		if (errno == EOPNOTSUPP) {</div><div class='add'>+			ksft_print_msg("fallocate() not supported by filesystem\n");</div><div class='add'>+			result = KSFT_SKIP;</div><div class='add'>+		} else if (size == pagesize) {</div><div class='add'>+			ksft_print_msg("fallocate() failed (%s)\n", strerror(errno));</div><div class='add'>+			result = KSFT_FAIL;</div><div class='add'>+		} else {</div><div class='add'>+			ksft_print_msg("need more free huge pages\n");</div><div class='add'>+			result = KSFT_SKIP;</div><div class='add'>+		}</div><div class='add'>+		goto report;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mem = mmap(NULL, size, PROT_READ | PROT_WRITE,</div><div class='ctx'> 		   shared ? MAP_SHARED : MAP_PRIVATE, fd, 0);</div><div class='ctx'> 	if (mem == MAP_FAILED) {</div><div class='del'>-		if (size == pagesize || shared)</div><div class='del'>-			ksft_test_result_fail("mmap() failed\n");</div><div class='del'>-		else</div><div class='del'>-			ksft_test_result_skip("need more free huge pages\n");</div><div class='del'>-		return;</div><div class='add'>+		if (size == pagesize || shared) {</div><div class='add'>+			ksft_print_msg("mmap() failed (%s)\n", strerror(errno));</div><div class='add'>+			result = KSFT_FAIL;</div><div class='add'>+		} else {</div><div class='add'>+			ksft_print_msg("need more free huge pages\n");</div><div class='add'>+			result = KSFT_SKIP;</div><div class='add'>+		}</div><div class='add'>+		goto report;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fault in the page such that GUP-fast can pin it directly. */</div><div class='hunk'>@@ -130,7 +157,8 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = mprotect(mem, size, PROT_READ);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ksft_test_result_fail("mprotect() failed\n");</div><div class='add'>+			ksft_print_msg("mprotect() failed (%s)\n", strerror(errno));</div><div class='add'>+			result = KSFT_FAIL;</div><div class='ctx'> 			goto munmap;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* FALLTHROUGH */</div><div class='hunk'>@@ -143,18 +171,20 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared)</div><div class='ctx'> 				type == TEST_TYPE_RW_FAST;</div><div class='ctx'> </div><div class='ctx'> 		if (gup_fd &lt; 0) {</div><div class='del'>-			ksft_test_result_skip("gup_test not available\n");</div><div class='add'>+			ksft_print_msg("gup_test not available\n");</div><div class='add'>+			result = KSFT_SKIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (rw &amp;&amp; shared &amp;&amp; fs_is_unknown(fs_type)) {</div><div class='del'>-			ksft_test_result_skip("Unknown filesystem\n");</div><div class='add'>+			ksft_print_msg("Unknown filesystem\n");</div><div class='add'>+			result = KSFT_SKIP;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * R/O pinning or pinning in a private mapping is always</div><div class='ctx'> 		 * expected to work. Otherwise, we expect long-term R/W pinning</div><div class='del'>-		 * to only succeed for special fielesystems.</div><div class='add'>+		 * to only succeed for special filesystems.</div><div class='ctx'> 		 */</div><div class='ctx'> 		should_work = !shared || !rw ||</div><div class='ctx'> 			      fs_supports_writable_longterm_pinning(fs_type);</div><div class='hunk'>@@ -165,25 +195,35 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared)</div><div class='ctx'> 		args.flags |= rw ? PIN_LONGTERM_TEST_FLAG_USE_WRITE : 0;</div><div class='ctx'> 		ret = ioctl(gup_fd, PIN_LONGTERM_TEST_START, &amp;args);</div><div class='ctx'> 		if (ret &amp;&amp; errno == EINVAL) {</div><div class='del'>-			ksft_test_result_skip("PIN_LONGTERM_TEST_START failed\n");</div><div class='add'>+			ksft_print_msg("PIN_LONGTERM_TEST_START failed (EINVAL)n");</div><div class='add'>+			result = KSFT_SKIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else if (ret &amp;&amp; errno == EFAULT) {</div><div class='del'>-			ksft_test_result(!should_work, "Should have failed\n");</div><div class='add'>+			if (should_work)</div><div class='add'>+				result = KSFT_FAIL;</div><div class='add'>+			else</div><div class='add'>+				result = KSFT_PASS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else if (ret) {</div><div class='del'>-			ksft_test_result_fail("PIN_LONGTERM_TEST_START failed\n");</div><div class='add'>+			ksft_print_msg("PIN_LONGTERM_TEST_START failed (%s)\n",</div><div class='add'>+				       strerror(errno));</div><div class='add'>+			result = KSFT_FAIL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ioctl(gup_fd, PIN_LONGTERM_TEST_STOP))</div><div class='del'>-			ksft_print_msg("[INFO] PIN_LONGTERM_TEST_STOP failed\n");</div><div class='add'>+			ksft_print_msg("[INFO] PIN_LONGTERM_TEST_STOP failed (%s)\n",</div><div class='add'>+				       strerror(errno));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * TODO: if the kernel ever supports long-term R/W pinning on</div><div class='ctx'> 		 * some previously unsupported filesystems, we might want to</div><div class='ctx'> 		 * perform some additional tests for possible data corruptions.</div><div class='ctx'> 		 */</div><div class='del'>-		ksft_test_result(should_work, "Should have worked\n");</div><div class='add'>+		if (should_work)</div><div class='add'>+			result = KSFT_PASS;</div><div class='add'>+		else</div><div class='add'>+			result = KSFT_FAIL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef LOCAL_CONFIG_HAVE_LIBURING</div><div class='hunk'>@@ -193,8 +233,9 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared)</div><div class='ctx'> </div><div class='ctx'> 		/* io_uring always pins pages writable. */</div><div class='ctx'> 		if (shared &amp;&amp; fs_is_unknown(fs_type)) {</div><div class='del'>-			ksft_test_result_skip("Unknown filesystem\n");</div><div class='del'>-			return;</div><div class='add'>+			ksft_print_msg("Unknown filesystem\n");</div><div class='add'>+			result = KSFT_SKIP;</div><div class='add'>+			goto report;</div><div class='ctx'> 		}</div><div class='ctx'> 		should_work = !shared ||</div><div class='ctx'> 			      fs_supports_writable_longterm_pinning(fs_type);</div><div class='hunk'>@@ -202,7 +243,9 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared)</div><div class='ctx'> 		/* Skip on errors, as we might just lack kernel support. */</div><div class='ctx'> 		ret = io_uring_queue_init(1, &amp;ring, 0);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='del'>-			ksft_test_result_skip("io_uring_queue_init() failed\n");</div><div class='add'>+			ksft_print_msg("io_uring_queue_init() failed (%s)\n",</div><div class='add'>+				       strerror(-ret));</div><div class='add'>+			result = KSFT_SKIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -215,15 +258,28 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared)</div><div class='ctx'> 		/* Only new kernels return EFAULT. */</div><div class='ctx'> 		if (ret &amp;&amp; (errno == ENOSPC || errno == EOPNOTSUPP ||</div><div class='ctx'> 			    errno == EFAULT)) {</div><div class='del'>-			ksft_test_result(!should_work, "Should have failed\n");</div><div class='add'>+			if (should_work) {</div><div class='add'>+				ksft_print_msg("Should have failed (%s)\n",</div><div class='add'>+					       strerror(errno));</div><div class='add'>+				result = KSFT_FAIL;</div><div class='add'>+			} else {</div><div class='add'>+				result = KSFT_PASS;</div><div class='add'>+			}</div><div class='ctx'> 		} else if (ret) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We might just lack support or have insufficient</div><div class='ctx'> 			 * MEMLOCK limits.</div><div class='ctx'> 			 */</div><div class='del'>-			ksft_test_result_skip("io_uring_register_buffers() failed\n");</div><div class='add'>+			ksft_print_msg("io_uring_register_buffers() failed (%s)\n",</div><div class='add'>+				       strerror(-ret));</div><div class='add'>+			result = KSFT_SKIP;</div><div class='ctx'> 		} else {</div><div class='del'>-			ksft_test_result(should_work, "Should have worked\n");</div><div class='add'>+			if (should_work) {</div><div class='add'>+				result = KSFT_PASS;</div><div class='add'>+			} else {</div><div class='add'>+				ksft_print_msg("Should have worked\n");</div><div class='add'>+				result = KSFT_FAIL;</div><div class='add'>+			}</div><div class='ctx'> 			io_uring_unregister_buffers(&amp;ring);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -237,6 +293,8 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared)</div><div class='ctx'> </div><div class='ctx'> munmap:</div><div class='ctx'> 	munmap(mem, size);</div><div class='add'>+report:</div><div class='add'>+	log_test_result(result);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> typedef void (*test_fn)(int fd, size_t size);</div><div class='hunk'>@@ -245,11 +303,12 @@ static void run_with_memfd(test_fn fn, const char *desc)</div><div class='ctx'> {</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='del'>-	ksft_print_msg("[RUN] %s ... with memfd\n", desc);</div><div class='add'>+	log_test_start("%s ... with memfd", desc);</div><div class='ctx'> </div><div class='ctx'> 	fd = memfd_create("test", 0);</div><div class='ctx'> 	if (fd &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("memfd_create() failed\n");</div><div class='add'>+		ksft_print_msg("memfd_create() failed (%s)\n", strerror(errno));</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -262,23 +321,23 @@ static void run_with_tmpfile(test_fn fn, const char *desc)</div><div class='ctx'> 	FILE *file;</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='del'>-	ksft_print_msg("[RUN] %s ... with tmpfile\n", desc);</div><div class='add'>+	log_test_start("%s ... with tmpfile", desc);</div><div class='ctx'> </div><div class='ctx'> 	file = tmpfile();</div><div class='ctx'> 	if (!file) {</div><div class='del'>-		ksft_test_result_fail("tmpfile() failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fd = fileno(file);</div><div class='del'>-	if (fd &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("fileno() failed\n");</div><div class='del'>-		goto close;</div><div class='add'>+		ksft_print_msg("tmpfile() failed (%s)\n", strerror(errno));</div><div class='add'>+		fd = -1;</div><div class='add'>+	} else {</div><div class='add'>+		fd = fileno(file);</div><div class='add'>+		if (fd &lt; 0) {</div><div class='add'>+			ksft_print_msg("fileno() failed (%s)\n", strerror(errno));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fn(fd, pagesize);</div><div class='del'>-close:</div><div class='del'>-	fclose(file);</div><div class='add'>+</div><div class='add'>+	if (file)</div><div class='add'>+		fclose(file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_with_local_tmpfile(test_fn fn, const char *desc)</div><div class='hunk'>@@ -286,22 +345,22 @@ static void run_with_local_tmpfile(test_fn fn, const char *desc)</div><div class='ctx'> 	char filename[] = __FILE__"_tmpfile_XXXXXX";</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='del'>-	ksft_print_msg("[RUN] %s ... with local tmpfile\n", desc);</div><div class='add'>+	log_test_start("%s ... with local tmpfile", desc);</div><div class='ctx'> </div><div class='ctx'> 	fd = mkstemp(filename);</div><div class='del'>-	if (fd &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("mkstemp() failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		ksft_print_msg("mkstemp() failed (%s)\n", strerror(errno));</div><div class='ctx'> </div><div class='ctx'> 	if (unlink(filename)) {</div><div class='del'>-		ksft_test_result_fail("unlink() failed\n");</div><div class='del'>-		goto close;</div><div class='add'>+		ksft_print_msg("unlink() failed (%s)\n", strerror(errno));</div><div class='add'>+		close(fd);</div><div class='add'>+		fd = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fn(fd, pagesize);</div><div class='del'>-close:</div><div class='del'>-	close(fd);</div><div class='add'>+</div><div class='add'>+	if (fd &gt;= 0)</div><div class='add'>+		close(fd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void run_with_memfd_hugetlb(test_fn fn, const char *desc,</div><div class='hunk'>@@ -310,14 +369,15 @@ static void run_with_memfd_hugetlb(test_fn fn, const char *desc,</div><div class='ctx'> 	int flags = MFD_HUGETLB;</div><div class='ctx'> 	int fd;</div><div class='ctx'> </div><div class='del'>-	ksft_print_msg("[RUN] %s ... with memfd hugetlb (%zu kB)\n", desc,</div><div class='add'>+	log_test_start("%s ... with memfd hugetlb (%zu kB)", desc,</div><div class='ctx'> 		       hugetlbsize / 1024);</div><div class='ctx'> </div><div class='ctx'> 	flags |= __builtin_ctzll(hugetlbsize) &lt;&lt; MFD_HUGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	fd = memfd_create("test", flags);</div><div class='ctx'> 	if (fd &lt; 0) {</div><div class='del'>-		ksft_test_result_skip("memfd_create() failed\n");</div><div class='add'>+		ksft_print_msg("memfd_create() failed (%s)\n", strerror(errno));</div><div class='add'>+		log_test_result(KSFT_SKIP);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -446,7 +506,7 @@ static int tests_per_test_case(void)</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='del'>-	int i, err;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	pagesize = getpagesize();</div><div class='ctx'> 	nr_hugetlbsizes = detect_hugetlb_page_sizes(hugetlbsizes,</div><div class='hunk'>@@ -460,9 +520,5 @@ int main(int argc, char **argv)</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(test_cases); i++)</div><div class='ctx'> 		run_test_case(&amp;test_cases[i]);</div><div class='ctx'> </div><div class='del'>-	err = ksft_get_fail_cnt();</div><div class='del'>-	if (err)</div><div class='del'>-		ksft_exit_fail_msg("%d out of %d tests failed\n",</div><div class='del'>-				   err, ksft_test_num());</div><div class='del'>-	ksft_exit_pass();</div><div class='add'>+	ksft_finished();</div><div class='ctx'> }</div><div class='head'>diff --git a/tools/testing/selftests/mm/gup_test.c b/tools/testing/selftests/mm/gup_test.c<br/>index bdeaac67ff9a..fb8f9ae49efa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/gup_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/gup_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/gup_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/gup_test.c</a></div><div class='hunk'>@@ -12,14 +12,13 @@</div><div class='ctx'> #include &lt;pthread.h&gt;</div><div class='ctx'> #include &lt;assert.h&gt;</div><div class='ctx'> #include &lt;mm/gup_test.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "vm_util.h"</div><div class='ctx'> </div><div class='ctx'> #define MB (1UL &lt;&lt; 20)</div><div class='ctx'> </div><div class='del'>-/* Just the flags we need, copied from mm.h: */</div><div class='add'>+/* Just the flags we need, copied from the kernel internals. */</div><div class='ctx'> #define FOLL_WRITE	0x01	/* check pte is writable */</div><div class='del'>-#define FOLL_TOUCH	0x02	/* mark page accessed */</div><div class='ctx'> </div><div class='ctx'> #define GUP_TEST_FILE "/sys/kernel/debug/gup_test"</div><div class='ctx'> </div><div class='hunk'>@@ -93,7 +92,7 @@ int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	struct gup_test gup = { 0 };</div><div class='ctx'> 	int filed, i, opt, nr_pages = 1, thp = -1, write = 1, nthreads = 1, ret;</div><div class='del'>-	int flags = MAP_PRIVATE, touch = 0;</div><div class='add'>+	int flags = MAP_PRIVATE;</div><div class='ctx'> 	char *file = "/dev/zero";</div><div class='ctx'> 	pthread_t *tid;</div><div class='ctx'> 	char *p;</div><div class='hunk'>@@ -139,6 +138,8 @@ int main(int argc, char **argv)</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 'n':</div><div class='ctx'> 			nr_pages = atoi(optarg);</div><div class='add'>+			if (nr_pages &lt; 0)</div><div class='add'>+				nr_pages = size / psize();</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 't':</div><div class='ctx'> 			thp = 1;</div><div class='hunk'>@@ -168,10 +169,6 @@ int main(int argc, char **argv)</div><div class='ctx'> 		case 'H':</div><div class='ctx'> 			flags |= (MAP_HUGETLB | MAP_ANONYMOUS);</div><div class='ctx'> 			break;</div><div class='del'>-		case 'z':</div><div class='del'>-			/* fault pages in gup, do not fault in userland */</div><div class='del'>-			touch = 1;</div><div class='del'>-			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			ksft_exit_fail_msg("Wrong argument\n");</div><div class='ctx'> 		}</div><div class='hunk'>@@ -242,18 +239,9 @@ int main(int argc, char **argv)</div><div class='ctx'> 	else if (thp == 0)</div><div class='ctx'> 		madvise(p, size, MADV_NOHUGEPAGE);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * FOLL_TOUCH, in gup_test, is used as an either/or case: either</div><div class='del'>-	 * fault pages in from the kernel via FOLL_TOUCH, or fault them</div><div class='del'>-	 * in here, from user space. This allows comparison of performance</div><div class='del'>-	 * between those two cases.</div><div class='del'>-	 */</div><div class='del'>-	if (touch) {</div><div class='del'>-		gup.gup_flags |= FOLL_TOUCH;</div><div class='del'>-	} else {</div><div class='del'>-		for (; (unsigned long)p &lt; gup.addr + size; p += psize())</div><div class='del'>-			p[0] = 0;</div><div class='del'>-	}</div><div class='add'>+	/* Fault them in here, from user space. */</div><div class='add'>+	for (; (unsigned long)p &lt; gup.addr + size; p += psize())</div><div class='add'>+		p[0] = 0;</div><div class='ctx'> </div><div class='ctx'> 	tid = malloc(sizeof(pthread_t) * nthreads);</div><div class='ctx'> 	assert(tid);</div><div class='head'>diff --git a/tools/testing/selftests/mm/hmm-tests.c b/tools/testing/selftests/mm/hmm-tests.c<br/>index 141bf63cbe05..e8328c89d855 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hmm-tests.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hmm-tests.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hmm-tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/hmm-tests.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  * bugs.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;sys/stat.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -50,6 +51,8 @@ enum {</div><div class='ctx'> 	HMM_COHERENCE_DEVICE_TWO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define ONEKB		(1 &lt;&lt; 10)</div><div class='add'>+#define ONEMEG		(1 &lt;&lt; 20)</div><div class='ctx'> #define TWOMEG		(1 &lt;&lt; 21)</div><div class='ctx'> #define HMM_BUFFER_SIZE (1024 &lt;&lt; 12)</div><div class='ctx'> #define HMM_PATH_MAX    64</div><div class='hunk'>@@ -207,8 +210,10 @@ static void hmm_buffer_free(struct hmm_buffer *buffer)</div><div class='ctx'> 	if (buffer == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (buffer-&gt;ptr)</div><div class='add'>+	if (buffer-&gt;ptr) {</div><div class='ctx'> 		munmap(buffer-&gt;ptr, buffer-&gt;size);</div><div class='add'>+		buffer-&gt;ptr = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	free(buffer-&gt;mirror);</div><div class='ctx'> 	free(buffer);</div><div class='ctx'> }</div><div class='hunk'>@@ -525,6 +530,8 @@ TEST_F(hmm, anon_write_prot)</div><div class='ctx'> /*</div><div class='ctx'>  * Check that a device writing an anonymous private mapping</div><div class='ctx'>  * will copy-on-write if a child process inherits the mapping.</div><div class='add'>+ *</div><div class='add'>+ * Also verifies after fork() memory the device can be read by child.</div><div class='ctx'>  */</div><div class='ctx'> TEST_F(hmm, anon_write_child)</div><div class='ctx'> {</div><div class='hunk'>@@ -532,72 +539,101 @@ TEST_F(hmm, anon_write_child)</div><div class='ctx'> 	unsigned long npages;</div><div class='ctx'> 	unsigned long size;</div><div class='ctx'> 	unsigned long i;</div><div class='add'>+	void *old_ptr;</div><div class='add'>+	void *map;</div><div class='ctx'> 	int *ptr;</div><div class='ctx'> 	pid_t pid;</div><div class='ctx'> 	int child_fd;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	npages = ALIGN(HMM_BUFFER_SIZE, self-&gt;page_size) &gt;&gt; self-&gt;page_shift;</div><div class='del'>-	ASSERT_NE(npages, 0);</div><div class='del'>-	size = npages &lt;&lt; self-&gt;page_shift;</div><div class='del'>-</div><div class='del'>-	buffer = malloc(sizeof(*buffer));</div><div class='del'>-	ASSERT_NE(buffer, NULL);</div><div class='del'>-</div><div class='del'>-	buffer-&gt;fd = -1;</div><div class='del'>-	buffer-&gt;size = size;</div><div class='del'>-	buffer-&gt;mirror = malloc(size);</div><div class='del'>-	ASSERT_NE(buffer-&gt;mirror, NULL);</div><div class='del'>-</div><div class='del'>-	buffer-&gt;ptr = mmap(NULL, size,</div><div class='del'>-			   PROT_READ | PROT_WRITE,</div><div class='del'>-			   MAP_PRIVATE | MAP_ANONYMOUS,</div><div class='del'>-			   buffer-&gt;fd, 0);</div><div class='del'>-	ASSERT_NE(buffer-&gt;ptr, MAP_FAILED);</div><div class='del'>-</div><div class='del'>-	/* Initialize buffer-&gt;ptr so we can tell if it is written. */</div><div class='del'>-	for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='del'>-		ptr[i] = i;</div><div class='del'>-</div><div class='del'>-	/* Initialize data that the device will write to buffer-&gt;ptr. */</div><div class='del'>-	for (i = 0, ptr = buffer-&gt;mirror; i &lt; size / sizeof(*ptr); ++i)</div><div class='del'>-		ptr[i] = -i;</div><div class='add'>+	int ret, use_thp, migrate;</div><div class='add'>+</div><div class='add'>+	for (migrate = 0; migrate &lt; 2; ++migrate) {</div><div class='add'>+		for (use_thp = 0; use_thp &lt; 2; ++use_thp) {</div><div class='add'>+			npages = ALIGN(use_thp ? TWOMEG : HMM_BUFFER_SIZE,</div><div class='add'>+				       self-&gt;page_size) &gt;&gt; self-&gt;page_shift;</div><div class='add'>+			ASSERT_NE(npages, 0);</div><div class='add'>+			size = npages &lt;&lt; self-&gt;page_shift;</div><div class='add'>+</div><div class='add'>+			buffer = malloc(sizeof(*buffer));</div><div class='add'>+			ASSERT_NE(buffer, NULL);</div><div class='add'>+</div><div class='add'>+			buffer-&gt;fd = -1;</div><div class='add'>+			buffer-&gt;size = size * 2;</div><div class='add'>+			buffer-&gt;mirror = malloc(size);</div><div class='add'>+			ASSERT_NE(buffer-&gt;mirror, NULL);</div><div class='add'>+</div><div class='add'>+			buffer-&gt;ptr = mmap(NULL, size * 2,</div><div class='add'>+					   PROT_READ | PROT_WRITE,</div><div class='add'>+					   MAP_PRIVATE | MAP_ANONYMOUS,</div><div class='add'>+					   buffer-&gt;fd, 0);</div><div class='add'>+			ASSERT_NE(buffer-&gt;ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+			old_ptr = buffer-&gt;ptr;</div><div class='add'>+			if (use_thp) {</div><div class='add'>+				map = (void *)ALIGN((uintptr_t)buffer-&gt;ptr, size);</div><div class='add'>+				ret = madvise(map, size, MADV_HUGEPAGE);</div><div class='add'>+				ASSERT_EQ(ret, 0);</div><div class='add'>+				buffer-&gt;ptr = map;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Initialize buffer-&gt;ptr so we can tell if it is written. */</div><div class='add'>+			for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+				ptr[i] = i;</div><div class='add'>+</div><div class='add'>+			/* Initialize data that the device will write to buffer-&gt;ptr. */</div><div class='add'>+			for (i = 0, ptr = buffer-&gt;mirror; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+				ptr[i] = -i;</div><div class='add'>+</div><div class='add'>+			if (migrate) {</div><div class='add'>+				ret = hmm_migrate_sys_to_dev(self-&gt;fd, buffer, npages);</div><div class='add'>+				ASSERT_EQ(ret, 0);</div><div class='add'>+				ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pid = fork();</div><div class='add'>+			if (pid == -1)</div><div class='add'>+				ASSERT_EQ(pid, 0);</div><div class='add'>+			if (pid != 0) {</div><div class='add'>+				waitpid(pid, &amp;ret, 0);</div><div class='add'>+				ASSERT_EQ(WIFEXITED(ret), 1);</div><div class='add'>+</div><div class='add'>+				/* Check that the parent's buffer did not change. */</div><div class='add'>+				for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+					ASSERT_EQ(ptr[i], i);</div><div class='add'>+</div><div class='add'>+				buffer-&gt;ptr = old_ptr;</div><div class='add'>+				hmm_buffer_free(buffer);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Check that we see the parent's values. */</div><div class='add'>+			for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+				ASSERT_EQ(ptr[i], i);</div><div class='add'>+			if (!migrate) {</div><div class='add'>+				for (i = 0, ptr = buffer-&gt;mirror; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+					ASSERT_EQ(ptr[i], -i);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* The child process needs its own mirror to its own mm. */</div><div class='add'>+			child_fd = hmm_open(0);</div><div class='add'>+			ASSERT_GE(child_fd, 0);</div><div class='add'>+</div><div class='add'>+			/* Simulate a device writing system memory. */</div><div class='add'>+			ret = hmm_dmirror_cmd(child_fd, HMM_DMIRROR_WRITE, buffer, npages);</div><div class='add'>+			ASSERT_EQ(ret, 0);</div><div class='add'>+			ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+			ASSERT_EQ(buffer-&gt;faults, 1);</div><div class='ctx'> </div><div class='del'>-	pid = fork();</div><div class='del'>-	if (pid == -1)</div><div class='del'>-		ASSERT_EQ(pid, 0);</div><div class='del'>-	if (pid != 0) {</div><div class='del'>-		waitpid(pid, &amp;ret, 0);</div><div class='del'>-		ASSERT_EQ(WIFEXITED(ret), 1);</div><div class='add'>+			/* Check what the device wrote. */</div><div class='add'>+			if (!migrate) {</div><div class='add'>+				for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+					ASSERT_EQ(ptr[i], -i);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		/* Check that the parent's buffer did not change. */</div><div class='del'>-		for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='del'>-			ASSERT_EQ(ptr[i], i);</div><div class='del'>-		return;</div><div class='add'>+			close(child_fd);</div><div class='add'>+			exit(0);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Check that we see the parent's values. */</div><div class='del'>-	for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='del'>-		ASSERT_EQ(ptr[i], i);</div><div class='del'>-	for (i = 0, ptr = buffer-&gt;mirror; i &lt; size / sizeof(*ptr); ++i)</div><div class='del'>-		ASSERT_EQ(ptr[i], -i);</div><div class='del'>-</div><div class='del'>-	/* The child process needs its own mirror to its own mm. */</div><div class='del'>-	child_fd = hmm_open(0);</div><div class='del'>-	ASSERT_GE(child_fd, 0);</div><div class='del'>-</div><div class='del'>-	/* Simulate a device writing system memory. */</div><div class='del'>-	ret = hmm_dmirror_cmd(child_fd, HMM_DMIRROR_WRITE, buffer, npages);</div><div class='del'>-	ASSERT_EQ(ret, 0);</div><div class='del'>-	ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='del'>-	ASSERT_EQ(buffer-&gt;faults, 1);</div><div class='del'>-</div><div class='del'>-	/* Check what the device wrote. */</div><div class='del'>-	for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='del'>-		ASSERT_EQ(ptr[i], -i);</div><div class='del'>-</div><div class='del'>-	close(child_fd);</div><div class='del'>-	exit(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2027,11 +2063,10 @@ TEST_F(hmm, hmm_cow_in_device)</div><div class='ctx'> 	if (pid == -1)</div><div class='ctx'> 		ASSERT_EQ(pid, 0);</div><div class='ctx'> 	if (!pid) {</div><div class='del'>-		/* Child process waitd for SIGTERM from the parent. */</div><div class='add'>+		/* Child process waits for SIGTERM from the parent. */</div><div class='ctx'> 		while (1) {</div><div class='ctx'> 		}</div><div class='del'>-		perror("Should not reach this\n");</div><div class='del'>-		exit(0);</div><div class='add'>+		/* Should not reach this */</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Parent process writes to COW pages(s) and gets a</div><div class='ctx'> 	 * new copy in system. In case of device private pages,</div><div class='hunk'>@@ -2056,4 +2091,765 @@ TEST_F(hmm, hmm_cow_in_device)</div><div class='ctx'> </div><div class='ctx'> 	hmm_buffer_free(buffer);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Migrate private anonymous huge empty page.</div><div class='add'>+ */</div><div class='add'>+TEST_F(hmm, migrate_anon_huge_empty)</div><div class='add'>+{</div><div class='add'>+	struct hmm_buffer *buffer;</div><div class='add'>+	unsigned long npages;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	unsigned long i;</div><div class='add'>+	void *old_ptr;</div><div class='add'>+	void *map;</div><div class='add'>+	int *ptr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	size = TWOMEG;</div><div class='add'>+</div><div class='add'>+	buffer = malloc(sizeof(*buffer));</div><div class='add'>+	ASSERT_NE(buffer, NULL);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;fd = -1;</div><div class='add'>+	buffer-&gt;size = 2 * size;</div><div class='add'>+	buffer-&gt;mirror = malloc(size);</div><div class='add'>+	ASSERT_NE(buffer-&gt;mirror, NULL);</div><div class='add'>+	memset(buffer-&gt;mirror, 0xFF, size);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;ptr = mmap(NULL, 2 * size,</div><div class='add'>+			   PROT_READ,</div><div class='add'>+			   MAP_PRIVATE | MAP_ANONYMOUS,</div><div class='add'>+			   buffer-&gt;fd, 0);</div><div class='add'>+	ASSERT_NE(buffer-&gt;ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	npages = size &gt;&gt; self-&gt;page_shift;</div><div class='add'>+	map = (void *)ALIGN((uintptr_t)buffer-&gt;ptr, size);</div><div class='add'>+	ret = madvise(map, size, MADV_HUGEPAGE);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	old_ptr = buffer-&gt;ptr;</div><div class='add'>+	buffer-&gt;ptr = map;</div><div class='add'>+</div><div class='add'>+	/* Migrate memory to device. */</div><div class='add'>+	ret = hmm_migrate_sys_to_dev(self-&gt;fd, buffer, npages);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+</div><div class='add'>+	/* Check what the device read. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;mirror; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+		ASSERT_EQ(ptr[i], 0);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;ptr = old_ptr;</div><div class='add'>+	hmm_buffer_free(buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Migrate private anonymous huge zero page.</div><div class='add'>+ */</div><div class='add'>+TEST_F(hmm, migrate_anon_huge_zero)</div><div class='add'>+{</div><div class='add'>+	struct hmm_buffer *buffer;</div><div class='add'>+	unsigned long npages;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	unsigned long i;</div><div class='add'>+	void *old_ptr;</div><div class='add'>+	void *map;</div><div class='add'>+	int *ptr;</div><div class='add'>+	int ret;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	size = TWOMEG;</div><div class='add'>+</div><div class='add'>+	buffer = malloc(sizeof(*buffer));</div><div class='add'>+	ASSERT_NE(buffer, NULL);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;fd = -1;</div><div class='add'>+	buffer-&gt;size = 2 * size;</div><div class='add'>+	buffer-&gt;mirror = malloc(size);</div><div class='add'>+	ASSERT_NE(buffer-&gt;mirror, NULL);</div><div class='add'>+	memset(buffer-&gt;mirror, 0xFF, size);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;ptr = mmap(NULL, 2 * size,</div><div class='add'>+			   PROT_READ,</div><div class='add'>+			   MAP_PRIVATE | MAP_ANONYMOUS,</div><div class='add'>+			   buffer-&gt;fd, 0);</div><div class='add'>+	ASSERT_NE(buffer-&gt;ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	npages = size &gt;&gt; self-&gt;page_shift;</div><div class='add'>+	map = (void *)ALIGN((uintptr_t)buffer-&gt;ptr, size);</div><div class='add'>+	ret = madvise(map, size, MADV_HUGEPAGE);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	old_ptr = buffer-&gt;ptr;</div><div class='add'>+	buffer-&gt;ptr = map;</div><div class='add'>+</div><div class='add'>+	/* Initialize a read-only zero huge page. */</div><div class='add'>+	val = *(int *)buffer-&gt;ptr;</div><div class='add'>+	ASSERT_EQ(val, 0);</div><div class='add'>+</div><div class='add'>+	/* Migrate memory to device. */</div><div class='add'>+	ret = hmm_migrate_sys_to_dev(self-&gt;fd, buffer, npages);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+</div><div class='add'>+	/* Check what the device read. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;mirror; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+		ASSERT_EQ(ptr[i], 0);</div><div class='add'>+</div><div class='add'>+	/* Fault pages back to system memory and check them. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i) {</div><div class='add'>+		ASSERT_EQ(ptr[i], 0);</div><div class='add'>+		/* If it asserts once, it probably will 500,000 times */</div><div class='add'>+		if (ptr[i] != 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buffer-&gt;ptr = old_ptr;</div><div class='add'>+	hmm_buffer_free(buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Migrate private anonymous huge page and free.</div><div class='add'>+ */</div><div class='add'>+TEST_F(hmm, migrate_anon_huge_free)</div><div class='add'>+{</div><div class='add'>+	struct hmm_buffer *buffer;</div><div class='add'>+	unsigned long npages;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	unsigned long i;</div><div class='add'>+	void *old_ptr;</div><div class='add'>+	void *map;</div><div class='add'>+	int *ptr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	size = TWOMEG;</div><div class='add'>+</div><div class='add'>+	buffer = malloc(sizeof(*buffer));</div><div class='add'>+	ASSERT_NE(buffer, NULL);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;fd = -1;</div><div class='add'>+	buffer-&gt;size = 2 * size;</div><div class='add'>+	buffer-&gt;mirror = malloc(size);</div><div class='add'>+	ASSERT_NE(buffer-&gt;mirror, NULL);</div><div class='add'>+	memset(buffer-&gt;mirror, 0xFF, size);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;ptr = mmap(NULL, 2 * size,</div><div class='add'>+			   PROT_READ | PROT_WRITE,</div><div class='add'>+			   MAP_PRIVATE | MAP_ANONYMOUS,</div><div class='add'>+			   buffer-&gt;fd, 0);</div><div class='add'>+	ASSERT_NE(buffer-&gt;ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	npages = size &gt;&gt; self-&gt;page_shift;</div><div class='add'>+	map = (void *)ALIGN((uintptr_t)buffer-&gt;ptr, size);</div><div class='add'>+	ret = madvise(map, size, MADV_HUGEPAGE);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	old_ptr = buffer-&gt;ptr;</div><div class='add'>+	buffer-&gt;ptr = map;</div><div class='add'>+</div><div class='add'>+	/* Initialize buffer in system memory. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+		ptr[i] = i;</div><div class='add'>+</div><div class='add'>+	/* Migrate memory to device. */</div><div class='add'>+	ret = hmm_migrate_sys_to_dev(self-&gt;fd, buffer, npages);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+</div><div class='add'>+	/* Check what the device read. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;mirror; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+		ASSERT_EQ(ptr[i], i);</div><div class='add'>+</div><div class='add'>+	/* Try freeing it. */</div><div class='add'>+	ret = madvise(map, size, MADV_FREE);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;ptr = old_ptr;</div><div class='add'>+	hmm_buffer_free(buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Migrate private anonymous huge page and fault back to sysmem.</div><div class='add'>+ */</div><div class='add'>+TEST_F(hmm, migrate_anon_huge_fault)</div><div class='add'>+{</div><div class='add'>+	struct hmm_buffer *buffer;</div><div class='add'>+	unsigned long npages;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	unsigned long i;</div><div class='add'>+	void *old_ptr;</div><div class='add'>+	void *map;</div><div class='add'>+	int *ptr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	size = TWOMEG;</div><div class='add'>+</div><div class='add'>+	buffer = malloc(sizeof(*buffer));</div><div class='add'>+	ASSERT_NE(buffer, NULL);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;fd = -1;</div><div class='add'>+	buffer-&gt;size = 2 * size;</div><div class='add'>+	buffer-&gt;mirror = malloc(size);</div><div class='add'>+	ASSERT_NE(buffer-&gt;mirror, NULL);</div><div class='add'>+	memset(buffer-&gt;mirror, 0xFF, size);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;ptr = mmap(NULL, 2 * size,</div><div class='add'>+			   PROT_READ | PROT_WRITE,</div><div class='add'>+			   MAP_PRIVATE | MAP_ANONYMOUS,</div><div class='add'>+			   buffer-&gt;fd, 0);</div><div class='add'>+	ASSERT_NE(buffer-&gt;ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	npages = size &gt;&gt; self-&gt;page_shift;</div><div class='add'>+	map = (void *)ALIGN((uintptr_t)buffer-&gt;ptr, size);</div><div class='add'>+	ret = madvise(map, size, MADV_HUGEPAGE);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	old_ptr = buffer-&gt;ptr;</div><div class='add'>+	buffer-&gt;ptr = map;</div><div class='add'>+</div><div class='add'>+	/* Initialize buffer in system memory. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+		ptr[i] = i;</div><div class='add'>+</div><div class='add'>+	/* Migrate memory to device. */</div><div class='add'>+	ret = hmm_migrate_sys_to_dev(self-&gt;fd, buffer, npages);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+</div><div class='add'>+	/* Check what the device read. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;mirror; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+		ASSERT_EQ(ptr[i], i);</div><div class='add'>+</div><div class='add'>+	/* Fault pages back to system memory and check them. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+		ASSERT_EQ(ptr[i], i);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;ptr = old_ptr;</div><div class='add'>+	hmm_buffer_free(buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Migrate memory and fault back to sysmem after partially unmapping.</div><div class='add'>+ */</div><div class='add'>+TEST_F(hmm, migrate_partial_unmap_fault)</div><div class='add'>+{</div><div class='add'>+	struct hmm_buffer *buffer;</div><div class='add'>+	unsigned long npages;</div><div class='add'>+	unsigned long size = TWOMEG;</div><div class='add'>+	unsigned long i;</div><div class='add'>+	void *old_ptr;</div><div class='add'>+	void *map;</div><div class='add'>+	int *ptr;</div><div class='add'>+	int ret, j, use_thp;</div><div class='add'>+	int offsets[] = { 0, 512 * ONEKB, ONEMEG };</div><div class='add'>+</div><div class='add'>+	for (use_thp = 0; use_thp &lt; 2; ++use_thp) {</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(offsets); ++j) {</div><div class='add'>+			buffer = malloc(sizeof(*buffer));</div><div class='add'>+			ASSERT_NE(buffer, NULL);</div><div class='add'>+</div><div class='add'>+			buffer-&gt;fd = -1;</div><div class='add'>+			buffer-&gt;size = 2 * size;</div><div class='add'>+			buffer-&gt;mirror = malloc(size);</div><div class='add'>+			ASSERT_NE(buffer-&gt;mirror, NULL);</div><div class='add'>+			memset(buffer-&gt;mirror, 0xFF, size);</div><div class='add'>+</div><div class='add'>+			buffer-&gt;ptr = mmap(NULL, 2 * size,</div><div class='add'>+					   PROT_READ | PROT_WRITE,</div><div class='add'>+					   MAP_PRIVATE | MAP_ANONYMOUS,</div><div class='add'>+					   buffer-&gt;fd, 0);</div><div class='add'>+			ASSERT_NE(buffer-&gt;ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+			npages = size &gt;&gt; self-&gt;page_shift;</div><div class='add'>+			map = (void *)ALIGN((uintptr_t)buffer-&gt;ptr, size);</div><div class='add'>+			if (use_thp)</div><div class='add'>+				ret = madvise(map, size, MADV_HUGEPAGE);</div><div class='add'>+			else</div><div class='add'>+				ret = madvise(map, size, MADV_NOHUGEPAGE);</div><div class='add'>+			ASSERT_EQ(ret, 0);</div><div class='add'>+			old_ptr = buffer-&gt;ptr;</div><div class='add'>+			buffer-&gt;ptr = map;</div><div class='add'>+</div><div class='add'>+			/* Initialize buffer in system memory. */</div><div class='add'>+			for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+				ptr[i] = i;</div><div class='add'>+</div><div class='add'>+			/* Migrate memory to device. */</div><div class='add'>+			ret = hmm_migrate_sys_to_dev(self-&gt;fd, buffer, npages);</div><div class='add'>+			ASSERT_EQ(ret, 0);</div><div class='add'>+			ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+</div><div class='add'>+			/* Check what the device read. */</div><div class='add'>+			for (i = 0, ptr = buffer-&gt;mirror; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+				ASSERT_EQ(ptr[i], i);</div><div class='add'>+</div><div class='add'>+			munmap(buffer-&gt;ptr + offsets[j], ONEMEG);</div><div class='add'>+</div><div class='add'>+			/* Fault pages back to system memory and check them. */</div><div class='add'>+			for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+				if (i * sizeof(int) &lt; offsets[j] ||</div><div class='add'>+				    i * sizeof(int) &gt;= offsets[j] + ONEMEG)</div><div class='add'>+					ASSERT_EQ(ptr[i], i);</div><div class='add'>+</div><div class='add'>+			buffer-&gt;ptr = old_ptr;</div><div class='add'>+			hmm_buffer_free(buffer);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TEST_F(hmm, migrate_remap_fault)</div><div class='add'>+{</div><div class='add'>+	struct hmm_buffer *buffer;</div><div class='add'>+	unsigned long npages;</div><div class='add'>+	unsigned long size = TWOMEG;</div><div class='add'>+	unsigned long i;</div><div class='add'>+	void *old_ptr, *new_ptr = NULL;</div><div class='add'>+	void *map;</div><div class='add'>+	int *ptr;</div><div class='add'>+	int ret, j, use_thp, dont_unmap, before;</div><div class='add'>+	int offsets[] = { 0, 512 * ONEKB, ONEMEG };</div><div class='add'>+</div><div class='add'>+	for (before = 0; before &lt; 2; ++before) {</div><div class='add'>+		for (dont_unmap = 0; dont_unmap &lt; 2; ++dont_unmap) {</div><div class='add'>+			for (use_thp = 0; use_thp &lt; 2; ++use_thp) {</div><div class='add'>+				for (j = 0; j &lt; ARRAY_SIZE(offsets); ++j) {</div><div class='add'>+					int flags = MREMAP_MAYMOVE | MREMAP_FIXED;</div><div class='add'>+</div><div class='add'>+					if (dont_unmap)</div><div class='add'>+						flags |= MREMAP_DONTUNMAP;</div><div class='add'>+</div><div class='add'>+					buffer = malloc(sizeof(*buffer));</div><div class='add'>+					ASSERT_NE(buffer, NULL);</div><div class='add'>+</div><div class='add'>+					buffer-&gt;fd = -1;</div><div class='add'>+					buffer-&gt;size = 8 * size;</div><div class='add'>+					buffer-&gt;mirror = malloc(size);</div><div class='add'>+					ASSERT_NE(buffer-&gt;mirror, NULL);</div><div class='add'>+					memset(buffer-&gt;mirror, 0xFF, size);</div><div class='add'>+</div><div class='add'>+					buffer-&gt;ptr = mmap(NULL, buffer-&gt;size,</div><div class='add'>+							   PROT_READ | PROT_WRITE,</div><div class='add'>+							   MAP_PRIVATE | MAP_ANONYMOUS,</div><div class='add'>+							   buffer-&gt;fd, 0);</div><div class='add'>+					ASSERT_NE(buffer-&gt;ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+					npages = size &gt;&gt; self-&gt;page_shift;</div><div class='add'>+					map = (void *)ALIGN((uintptr_t)buffer-&gt;ptr, size);</div><div class='add'>+					if (use_thp)</div><div class='add'>+						ret = madvise(map, size, MADV_HUGEPAGE);</div><div class='add'>+					else</div><div class='add'>+						ret = madvise(map, size, MADV_NOHUGEPAGE);</div><div class='add'>+					ASSERT_EQ(ret, 0);</div><div class='add'>+					old_ptr = buffer-&gt;ptr;</div><div class='add'>+					munmap(map + size, size * 2);</div><div class='add'>+					buffer-&gt;ptr = map;</div><div class='add'>+</div><div class='add'>+					/* Initialize buffer in system memory. */</div><div class='add'>+					for (i = 0, ptr = buffer-&gt;ptr;</div><div class='add'>+					     i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+						ptr[i] = i;</div><div class='add'>+</div><div class='add'>+					if (before) {</div><div class='add'>+						new_ptr = mremap((void *)map, size, size, flags,</div><div class='add'>+								 map + size + offsets[j]);</div><div class='add'>+						ASSERT_NE(new_ptr, MAP_FAILED);</div><div class='add'>+						buffer-&gt;ptr = new_ptr;</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					/* Migrate memory to device. */</div><div class='add'>+					ret = hmm_migrate_sys_to_dev(self-&gt;fd, buffer, npages);</div><div class='add'>+					ASSERT_EQ(ret, 0);</div><div class='add'>+					ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+</div><div class='add'>+					/* Check what the device read. */</div><div class='add'>+					for (i = 0, ptr = buffer-&gt;mirror;</div><div class='add'>+					     i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+						ASSERT_EQ(ptr[i], i);</div><div class='add'>+</div><div class='add'>+					if (!before) {</div><div class='add'>+						new_ptr = mremap((void *)map, size, size, flags,</div><div class='add'>+								 map + size + offsets[j]);</div><div class='add'>+						ASSERT_NE(new_ptr, MAP_FAILED);</div><div class='add'>+						buffer-&gt;ptr = new_ptr;</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					/* Fault pages back to system memory and check them. */</div><div class='add'>+					for (i = 0, ptr = buffer-&gt;ptr;</div><div class='add'>+					     i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+						ASSERT_EQ(ptr[i], i);</div><div class='add'>+</div><div class='add'>+					munmap(new_ptr, size);</div><div class='add'>+					buffer-&gt;ptr = old_ptr;</div><div class='add'>+					hmm_buffer_free(buffer);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Migrate private anonymous huge page with allocation errors.</div><div class='add'>+ */</div><div class='add'>+TEST_F(hmm, migrate_anon_huge_err)</div><div class='add'>+{</div><div class='add'>+	struct hmm_buffer *buffer;</div><div class='add'>+	unsigned long npages;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	unsigned long i;</div><div class='add'>+	void *old_ptr;</div><div class='add'>+	void *map;</div><div class='add'>+	int *ptr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	size = TWOMEG;</div><div class='add'>+</div><div class='add'>+	buffer = malloc(sizeof(*buffer));</div><div class='add'>+	ASSERT_NE(buffer, NULL);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;fd = -1;</div><div class='add'>+	buffer-&gt;size = 2 * size;</div><div class='add'>+	buffer-&gt;mirror = malloc(2 * size);</div><div class='add'>+	ASSERT_NE(buffer-&gt;mirror, NULL);</div><div class='add'>+	memset(buffer-&gt;mirror, 0xFF, 2 * size);</div><div class='add'>+</div><div class='add'>+	old_ptr = mmap(NULL, 2 * size, PROT_READ | PROT_WRITE,</div><div class='add'>+			MAP_PRIVATE | MAP_ANONYMOUS, buffer-&gt;fd, 0);</div><div class='add'>+	ASSERT_NE(old_ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	npages = size &gt;&gt; self-&gt;page_shift;</div><div class='add'>+	map = (void *)ALIGN((uintptr_t)old_ptr, size);</div><div class='add'>+	ret = madvise(map, size, MADV_HUGEPAGE);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	buffer-&gt;ptr = map;</div><div class='add'>+</div><div class='add'>+	/* Initialize buffer in system memory. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+		ptr[i] = i;</div><div class='add'>+</div><div class='add'>+	/* Migrate memory to device but force a THP allocation error. */</div><div class='add'>+	ret = hmm_dmirror_cmd(self-&gt;fd, HMM_DMIRROR_FLAGS, buffer,</div><div class='add'>+			      HMM_DMIRROR_FLAG_FAIL_ALLOC);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ret = hmm_migrate_sys_to_dev(self-&gt;fd, buffer, npages);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+</div><div class='add'>+	/* Check what the device read. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;mirror; i &lt; size / sizeof(*ptr); ++i) {</div><div class='add'>+		ASSERT_EQ(ptr[i], i);</div><div class='add'>+		if (ptr[i] != i)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Try faulting back a single (PAGE_SIZE) page. */</div><div class='add'>+	ptr = buffer-&gt;ptr;</div><div class='add'>+	ASSERT_EQ(ptr[2048], 2048);</div><div class='add'>+</div><div class='add'>+	/* unmap and remap the region to reset things. */</div><div class='add'>+	ret = munmap(old_ptr, 2 * size);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	old_ptr = mmap(NULL, 2 * size, PROT_READ | PROT_WRITE,</div><div class='add'>+			MAP_PRIVATE | MAP_ANONYMOUS, buffer-&gt;fd, 0);</div><div class='add'>+	ASSERT_NE(old_ptr, MAP_FAILED);</div><div class='add'>+	map = (void *)ALIGN((uintptr_t)old_ptr, size);</div><div class='add'>+	ret = madvise(map, size, MADV_HUGEPAGE);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	buffer-&gt;ptr = map;</div><div class='add'>+</div><div class='add'>+	/* Initialize buffer in system memory. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+		ptr[i] = i;</div><div class='add'>+</div><div class='add'>+	/* Migrate THP to device. */</div><div class='add'>+	ret = hmm_migrate_sys_to_dev(self-&gt;fd, buffer, npages);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Force an allocation error when faulting back a THP resident in the</div><div class='add'>+	 * device.</div><div class='add'>+	 */</div><div class='add'>+	ret = hmm_dmirror_cmd(self-&gt;fd, HMM_DMIRROR_FLAGS, buffer,</div><div class='add'>+			      HMM_DMIRROR_FLAG_FAIL_ALLOC);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	ret = hmm_migrate_dev_to_sys(self-&gt;fd, buffer, npages);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ptr = buffer-&gt;ptr;</div><div class='add'>+	ASSERT_EQ(ptr[2048], 2048);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;ptr = old_ptr;</div><div class='add'>+	hmm_buffer_free(buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Migrate private anonymous huge zero page with allocation errors.</div><div class='add'>+ */</div><div class='add'>+TEST_F(hmm, migrate_anon_huge_zero_err)</div><div class='add'>+{</div><div class='add'>+	struct hmm_buffer *buffer;</div><div class='add'>+	unsigned long npages;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	unsigned long i;</div><div class='add'>+	void *old_ptr;</div><div class='add'>+	void *map;</div><div class='add'>+	int *ptr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	size = TWOMEG;</div><div class='add'>+</div><div class='add'>+	buffer = malloc(sizeof(*buffer));</div><div class='add'>+	ASSERT_NE(buffer, NULL);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;fd = -1;</div><div class='add'>+	buffer-&gt;size = 2 * size;</div><div class='add'>+	buffer-&gt;mirror = malloc(2 * size);</div><div class='add'>+	ASSERT_NE(buffer-&gt;mirror, NULL);</div><div class='add'>+	memset(buffer-&gt;mirror, 0xFF, 2 * size);</div><div class='add'>+</div><div class='add'>+	old_ptr = mmap(NULL, 2 * size, PROT_READ,</div><div class='add'>+			MAP_PRIVATE | MAP_ANONYMOUS, buffer-&gt;fd, 0);</div><div class='add'>+	ASSERT_NE(old_ptr, MAP_FAILED);</div><div class='add'>+</div><div class='add'>+	npages = size &gt;&gt; self-&gt;page_shift;</div><div class='add'>+	map = (void *)ALIGN((uintptr_t)old_ptr, size);</div><div class='add'>+	ret = madvise(map, size, MADV_HUGEPAGE);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	buffer-&gt;ptr = map;</div><div class='add'>+</div><div class='add'>+	/* Migrate memory to device but force a THP allocation error. */</div><div class='add'>+	ret = hmm_dmirror_cmd(self-&gt;fd, HMM_DMIRROR_FLAGS, buffer,</div><div class='add'>+			      HMM_DMIRROR_FLAG_FAIL_ALLOC);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ret = hmm_migrate_sys_to_dev(self-&gt;fd, buffer, npages);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+</div><div class='add'>+	/* Check what the device read. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;mirror; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+		ASSERT_EQ(ptr[i], 0);</div><div class='add'>+</div><div class='add'>+	/* Try faulting back a single (PAGE_SIZE) page. */</div><div class='add'>+	ptr = buffer-&gt;ptr;</div><div class='add'>+	ASSERT_EQ(ptr[2048], 0);</div><div class='add'>+</div><div class='add'>+	/* unmap and remap the region to reset things. */</div><div class='add'>+	ret = munmap(old_ptr, 2 * size);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	old_ptr = mmap(NULL, 2 * size, PROT_READ,</div><div class='add'>+			MAP_PRIVATE | MAP_ANONYMOUS, buffer-&gt;fd, 0);</div><div class='add'>+	ASSERT_NE(old_ptr, MAP_FAILED);</div><div class='add'>+	map = (void *)ALIGN((uintptr_t)old_ptr, size);</div><div class='add'>+	ret = madvise(map, size, MADV_HUGEPAGE);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	buffer-&gt;ptr = map;</div><div class='add'>+</div><div class='add'>+	/* Initialize buffer in system memory (zero THP page). */</div><div class='add'>+	ret = ptr[0];</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+</div><div class='add'>+	/* Migrate memory to device but force a THP allocation error. */</div><div class='add'>+	ret = hmm_dmirror_cmd(self-&gt;fd, HMM_DMIRROR_FLAGS, buffer,</div><div class='add'>+			      HMM_DMIRROR_FLAG_FAIL_ALLOC);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ret = hmm_migrate_sys_to_dev(self-&gt;fd, buffer, npages);</div><div class='add'>+	ASSERT_EQ(ret, 0);</div><div class='add'>+	ASSERT_EQ(buffer-&gt;cpages, npages);</div><div class='add'>+</div><div class='add'>+	/* Fault the device memory back and check it. */</div><div class='add'>+	for (i = 0, ptr = buffer-&gt;ptr; i &lt; size / sizeof(*ptr); ++i)</div><div class='add'>+		ASSERT_EQ(ptr[i], 0);</div><div class='add'>+</div><div class='add'>+	buffer-&gt;ptr = old_ptr;</div><div class='add'>+	hmm_buffer_free(buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct benchmark_results {</div><div class='add'>+	double sys_to_dev_time;</div><div class='add'>+	double dev_to_sys_time;</div><div class='add'>+	double throughput_s2d;</div><div class='add'>+	double throughput_d2s;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static double get_time_ms(void)</div><div class='add'>+{</div><div class='add'>+	struct timeval tv;</div><div class='add'>+</div><div class='add'>+	gettimeofday(&amp;tv, NULL);</div><div class='add'>+	return (tv.tv_sec * 1000.0) + (tv.tv_usec / 1000.0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct hmm_buffer *hmm_buffer_alloc(unsigned long size)</div><div class='add'>+{</div><div class='add'>+	struct hmm_buffer *buffer;</div><div class='add'>+</div><div class='add'>+	buffer = malloc(sizeof(*buffer));</div><div class='add'>+</div><div class='add'>+	buffer-&gt;fd = -1;</div><div class='add'>+	buffer-&gt;size = size;</div><div class='add'>+	buffer-&gt;mirror = malloc(size);</div><div class='add'>+	memset(buffer-&gt;mirror, 0xFF, size);</div><div class='add'>+	return buffer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_benchmark_results(const char *test_name, size_t buffer_size,</div><div class='add'>+				     struct benchmark_results *thp,</div><div class='add'>+				     struct benchmark_results *regular)</div><div class='add'>+{</div><div class='add'>+	double s2d_improvement = ((regular-&gt;sys_to_dev_time - thp-&gt;sys_to_dev_time) /</div><div class='add'>+				 regular-&gt;sys_to_dev_time) * 100.0;</div><div class='add'>+	double d2s_improvement = ((regular-&gt;dev_to_sys_time - thp-&gt;dev_to_sys_time) /</div><div class='add'>+				 regular-&gt;dev_to_sys_time) * 100.0;</div><div class='add'>+	double throughput_s2d_improvement = ((thp-&gt;throughput_s2d - regular-&gt;throughput_s2d) /</div><div class='add'>+					    regular-&gt;throughput_s2d) * 100.0;</div><div class='add'>+	double throughput_d2s_improvement = ((thp-&gt;throughput_d2s - regular-&gt;throughput_d2s) /</div><div class='add'>+					    regular-&gt;throughput_d2s) * 100.0;</div><div class='add'>+</div><div class='add'>+	printf("\n=== %s (%.1f MB) ===\n", test_name, buffer_size / (1024.0 * 1024.0));</div><div class='add'>+	printf("                     | With THP        | Without THP     | Improvement\n");</div><div class='add'>+	printf("---------------------------------------------------------------------\n");</div><div class='add'>+	printf("Sys-&gt;Dev Migration   | %.3f ms        | %.3f ms        | %.1f%%\n",</div><div class='add'>+	       thp-&gt;sys_to_dev_time, regular-&gt;sys_to_dev_time, s2d_improvement);</div><div class='add'>+	printf("Dev-&gt;Sys Migration   | %.3f ms        | %.3f ms        | %.1f%%\n",</div><div class='add'>+	       thp-&gt;dev_to_sys_time, regular-&gt;dev_to_sys_time, d2s_improvement);</div><div class='add'>+	printf("S-&gt;D Throughput      | %.2f GB/s      | %.2f GB/s      | %.1f%%\n",</div><div class='add'>+	       thp-&gt;throughput_s2d, regular-&gt;throughput_s2d, throughput_s2d_improvement);</div><div class='add'>+	printf("D-&gt;S Throughput      | %.2f GB/s      | %.2f GB/s      | %.1f%%\n",</div><div class='add'>+	       thp-&gt;throughput_d2s, regular-&gt;throughput_d2s, throughput_d2s_improvement);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Run a single migration benchmark</div><div class='add'>+ * fd: file descriptor for hmm device</div><div class='add'>+ * use_thp: whether to use THP</div><div class='add'>+ * buffer_size: size of buffer to allocate</div><div class='add'>+ * iterations: number of iterations</div><div class='add'>+ * results: where to store results</div><div class='add'>+ */</div><div class='add'>+static inline int run_migration_benchmark(int fd, int use_thp, size_t buffer_size,</div><div class='add'>+					   int iterations, struct benchmark_results *results)</div><div class='add'>+{</div><div class='add'>+	struct hmm_buffer *buffer;</div><div class='add'>+	unsigned long npages = buffer_size / sysconf(_SC_PAGESIZE);</div><div class='add'>+	double start, end;</div><div class='add'>+	double s2d_total = 0, d2s_total = 0;</div><div class='add'>+	int ret, i;</div><div class='add'>+	int *ptr;</div><div class='add'>+</div><div class='add'>+	buffer = hmm_buffer_alloc(buffer_size);</div><div class='add'>+</div><div class='add'>+	/* Map memory */</div><div class='add'>+	buffer-&gt;ptr = mmap(NULL, buffer_size, PROT_READ | PROT_WRITE,</div><div class='add'>+			  MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);</div><div class='add'>+</div><div class='add'>+	if (!buffer-&gt;ptr)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* Apply THP hint if requested */</div><div class='add'>+	if (use_thp)</div><div class='add'>+		ret = madvise(buffer-&gt;ptr, buffer_size, MADV_HUGEPAGE);</div><div class='add'>+	else</div><div class='add'>+		ret = madvise(buffer-&gt;ptr, buffer_size, MADV_NOHUGEPAGE);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Initialize memory to make sure pages are allocated */</div><div class='add'>+	ptr = (int *)buffer-&gt;ptr;</div><div class='add'>+	for (i = 0; i &lt; buffer_size / sizeof(int); i++)</div><div class='add'>+		ptr[i] = i &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	/* Warmup iteration */</div><div class='add'>+	ret = hmm_migrate_sys_to_dev(fd, buffer, npages);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = hmm_migrate_dev_to_sys(fd, buffer, npages);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Benchmark iterations */</div><div class='add'>+	for (i = 0; i &lt; iterations; i++) {</div><div class='add'>+		/* System to device migration */</div><div class='add'>+		start = get_time_ms();</div><div class='add'>+</div><div class='add'>+		ret = hmm_migrate_sys_to_dev(fd, buffer, npages);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		end = get_time_ms();</div><div class='add'>+		s2d_total += (end - start);</div><div class='add'>+</div><div class='add'>+		/* Device to system migration */</div><div class='add'>+		start = get_time_ms();</div><div class='add'>+</div><div class='add'>+		ret = hmm_migrate_dev_to_sys(fd, buffer, npages);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		end = get_time_ms();</div><div class='add'>+		d2s_total += (end - start);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate average times and throughput */</div><div class='add'>+	results-&gt;sys_to_dev_time = s2d_total / iterations;</div><div class='add'>+	results-&gt;dev_to_sys_time = d2s_total / iterations;</div><div class='add'>+	results-&gt;throughput_s2d = (buffer_size / (1024.0 * 1024.0 * 1024.0)) /</div><div class='add'>+				 (results-&gt;sys_to_dev_time / 1000.0);</div><div class='add'>+	results-&gt;throughput_d2s = (buffer_size / (1024.0 * 1024.0 * 1024.0)) /</div><div class='add'>+				 (results-&gt;dev_to_sys_time / 1000.0);</div><div class='add'>+</div><div class='add'>+	/* Cleanup */</div><div class='add'>+	hmm_buffer_free(buffer);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Benchmark THP migration with different buffer sizes</div><div class='add'>+ */</div><div class='add'>+TEST_F_TIMEOUT(hmm, benchmark_thp_migration, 120)</div><div class='add'>+{</div><div class='add'>+	struct benchmark_results thp_results, regular_results;</div><div class='add'>+	size_t thp_size = 2 * 1024 * 1024; /* 2MB - typical THP size */</div><div class='add'>+	int iterations = 5;</div><div class='add'>+</div><div class='add'>+	printf("\nHMM THP Migration Benchmark\n");</div><div class='add'>+	printf("---------------------------\n");</div><div class='add'>+	printf("System page size: %ld bytes\n", sysconf(_SC_PAGESIZE));</div><div class='add'>+</div><div class='add'>+	/* Test different buffer sizes */</div><div class='add'>+	size_t test_sizes[] = {</div><div class='add'>+		thp_size / 4,      /* 512KB - smaller than THP */</div><div class='add'>+		thp_size / 2,      /* 1MB - half THP */</div><div class='add'>+		thp_size,          /* 2MB - single THP */</div><div class='add'>+		thp_size * 2,      /* 4MB - two THPs */</div><div class='add'>+		thp_size * 4,      /* 8MB - four THPs */</div><div class='add'>+		thp_size * 8,       /* 16MB - eight THPs */</div><div class='add'>+		thp_size * 128,       /* 256MB - one twenty eight THPs */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const char *const test_names[] = {</div><div class='add'>+		"Small Buffer (512KB)",</div><div class='add'>+		"Half THP Size (1MB)",</div><div class='add'>+		"Single THP Size (2MB)",</div><div class='add'>+		"Two THP Size (4MB)",</div><div class='add'>+		"Four THP Size (8MB)",</div><div class='add'>+		"Eight THP Size (16MB)",</div><div class='add'>+		"One twenty eight THP Size (256MB)"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int num_tests = ARRAY_SIZE(test_sizes);</div><div class='add'>+</div><div class='add'>+	/* Run all tests */</div><div class='add'>+	for (int i = 0; i &lt; num_tests; i++) {</div><div class='add'>+		/* Test with THP */</div><div class='add'>+		ASSERT_EQ(run_migration_benchmark(self-&gt;fd, 1, test_sizes[i],</div><div class='add'>+					iterations, &amp;thp_results), 0);</div><div class='add'>+</div><div class='add'>+		/* Test without THP */</div><div class='add'>+		ASSERT_EQ(run_migration_benchmark(self-&gt;fd, 0, test_sizes[i],</div><div class='add'>+					iterations, &amp;regular_results), 0);</div><div class='add'>+</div><div class='add'>+		/* Print results */</div><div class='add'>+		print_benchmark_results(test_names[i], test_sizes[i],</div><div class='add'>+					&amp;thp_results, &amp;regular_results);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> TEST_HARNESS_MAIN</div><div class='head'>diff --git a/tools/testing/selftests/mm/hugepage-mmap.c b/tools/testing/selftests/mm/hugepage-mmap.c<br/>index 3b1b532f1cbb..d543419de040 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugepage-mmap.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugepage-mmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugepage-mmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/hugepage-mmap.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define LENGTH (256UL*1024*1024)</div><div class='ctx'> #define PROTECTION (PROT_READ | PROT_WRITE)</div><div class='head'>diff --git a/tools/testing/selftests/mm/hugepage-mremap.c b/tools/testing/selftests/mm/hugepage-mremap.c<br/>index ada9156cc497..b8f7d92e5a35 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugepage-mremap.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugepage-mremap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugepage-mremap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/hugepage-mremap.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #define _GNU_SOURCE</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;asm-generic/unistd.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt; /* Definition of O_* constants */</div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;sys/ioctl.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;stdbool.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "vm_util.h"</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_LENGTH_MB 10UL</div><div class='hunk'>@@ -65,10 +65,20 @@ static void register_region_with_uffd(char *addr, size_t len)</div><div class='ctx'> 	struct uffdio_api uffdio_api;</div><div class='ctx'> </div><div class='ctx'> 	/* Create and enable userfaultfd object. */</div><div class='del'>-</div><div class='ctx'> 	uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);</div><div class='del'>-	if (uffd == -1)</div><div class='del'>-		ksft_exit_fail_msg("userfaultfd: %s\n", strerror(errno));</div><div class='add'>+	if (uffd == -1) {</div><div class='add'>+		switch (errno) {</div><div class='add'>+		case EPERM:</div><div class='add'>+			ksft_exit_skip("Insufficient permissions, try running as root.\n");</div><div class='add'>+			break;</div><div class='add'>+		case ENOSYS:</div><div class='add'>+			ksft_exit_skip("userfaultfd is not supported/not enabled.\n");</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ksft_exit_fail_msg("userfaultfd failed with %s\n", strerror(errno));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	uffdio_api.api = UFFD_API;</div><div class='ctx'> 	uffdio_api.features = 0;</div><div class='head'>diff --git a/tools/testing/selftests/mm/hugetlb-madvise.c b/tools/testing/selftests/mm/hugetlb-madvise.c<br/>index e74107185324..05d9d2805ae4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb-madvise.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb-madvise.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb-madvise.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/hugetlb-madvise.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> #include "vm_util.h"</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define MIN_FREE_PAGES	20</div><div class='ctx'> #define NR_HUGE_PAGES	10	/* common number of pages to map/allocate */</div><div class='hunk'>@@ -47,14 +47,13 @@ void write_fault_pages(void *addr, unsigned long nr_pages)</div><div class='ctx'> </div><div class='ctx'> void read_fault_pages(void *addr, unsigned long nr_pages)</div><div class='ctx'> {</div><div class='del'>-	volatile unsigned long dummy = 0;</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_pages; i++) {</div><div class='del'>-		dummy += *((unsigned long *)(addr + (i * huge_page_size)));</div><div class='del'>-</div><div class='add'>+		unsigned long *addr2 =</div><div class='add'>+			((unsigned long *)(addr + (i * huge_page_size)));</div><div class='ctx'> 		/* Prevent the compiler from optimizing out the entire loop: */</div><div class='del'>-		asm volatile("" : "+r" (dummy));</div><div class='add'>+		FORCE_READ(*addr2);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/mm/hugetlb-read-hwpoison.c b/tools/testing/selftests/mm/hugetlb-read-hwpoison.c<br/>index ba6cc6f9cabc..46230462ad48 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb-read-hwpoison.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb-read-hwpoison.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb-read-hwpoison.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/hugetlb-read-hwpoison.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;stdbool.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define PREFIX " ... "</div><div class='ctx'> #define ERROR_PREFIX " !!! "</div><div class='head'>diff --git a/tools/testing/selftests/mm/hugetlb-soft-offline.c b/tools/testing/selftests/mm/hugetlb-soft-offline.c<br/>index f086f0e04756..a8bc02688085 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb-soft-offline.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb-soft-offline.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb-soft-offline.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/hugetlb-soft-offline.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include &lt;sys/statfs.h&gt;</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef MADV_SOFT_OFFLINE</div><div class='ctx'> #define MADV_SOFT_OFFLINE 101</div><div class='head'>diff --git a/tools/testing/selftests/mm/hugetlb_dio.c b/tools/testing/selftests/mm/hugetlb_dio.c<br/>index db63abe5ee5e..9ac62eb4c97d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb_dio.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb_dio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb_dio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/hugetlb_dio.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include "vm_util.h"</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> void run_dio_using_hugetlb(unsigned int start_off, unsigned int end_off)</div><div class='ctx'> {</div><div class='head'>diff --git a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c b/tools/testing/selftests/mm/hugetlb_fault_after_madv.c<br/>index e2640529dbb2..b4b257775b74 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb_fault_after_madv.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb_fault_after_madv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb_fault_after_madv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/hugetlb_fault_after_madv.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #include &lt;signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "vm_util.h"</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define INLOOP_ITER 100</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/mm/hugetlb_madv_vs_map.c b/tools/testing/selftests/mm/hugetlb_madv_vs_map.c<br/>index 8f122a0f0828..efd774b41389 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb_madv_vs_map.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb_madv_vs_map.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb_madv_vs_map.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/hugetlb_madv_vs_map.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "vm_util.h"</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define INLOOP_ITER 100</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/mm/hugetlb_reparenting_test.sh b/tools/testing/selftests/mm/hugetlb_reparenting_test.sh<br/>index 11f9bbe7dc22..0dd31892ff67 100755<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb_reparenting_test.sh?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/hugetlb_reparenting_test.sh</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/hugetlb_reparenting_test.sh?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/hugetlb_reparenting_test.sh</a></div><div class='hunk'>@@ -23,7 +23,7 @@ fi</div><div class='ctx'> if [[ $cgroup2 ]]; then</div><div class='ctx'>   CGROUP_ROOT=$(mount -t cgroup2 | head -1 | awk '{print $3}')</div><div class='ctx'>   if [[ -z "$CGROUP_ROOT" ]]; then</div><div class='del'>-    CGROUP_ROOT=/dev/cgroup/memory</div><div class='add'>+    CGROUP_ROOT=$(mktemp -d)</div><div class='ctx'>     mount -t cgroup2 none $CGROUP_ROOT</div><div class='ctx'>     do_umount=1</div><div class='ctx'>   fi</div><div class='hunk'>@@ -36,7 +36,7 @@ else</div><div class='ctx'>     do_umount=1</div><div class='ctx'>   fi</div><div class='ctx'> fi</div><div class='del'>-MNT='/mnt/huge/'</div><div class='add'>+MNT='/mnt/huge'</div><div class='ctx'> </div><div class='ctx'> function get_machine_hugepage_size() {</div><div class='ctx'>   hpz=$(grep -i hugepagesize /proc/meminfo)</div><div class='hunk'>@@ -56,10 +56,45 @@ function cleanup() {</div><div class='ctx'>   rmdir "$CGROUP_ROOT"/a/b 2&gt;/dev/null</div><div class='ctx'>   rmdir "$CGROUP_ROOT"/a 2&gt;/dev/null</div><div class='ctx'>   rmdir "$CGROUP_ROOT"/test1 2&gt;/dev/null</div><div class='del'>-  echo 0 &gt;/proc/sys/vm/nr_hugepages</div><div class='add'>+  echo $nr_hugepgs &gt;/proc/sys/vm/nr_hugepages</div><div class='ctx'>   set -e</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+function assert_with_retry() {</div><div class='add'>+  local actual_path="$1"</div><div class='add'>+  local expected="$2"</div><div class='add'>+  local tolerance=$((7 * 1024 * 1024))</div><div class='add'>+  local timeout=20</div><div class='add'>+  local interval=1</div><div class='add'>+  local start_time</div><div class='add'>+  local now</div><div class='add'>+  local elapsed</div><div class='add'>+  local actual</div><div class='add'>+</div><div class='add'>+  start_time=$(date +%s)</div><div class='add'>+</div><div class='add'>+  while true; do</div><div class='add'>+    actual="$(cat "$actual_path")"</div><div class='add'>+</div><div class='add'>+    if [[ $actual -ge $(($expected - $tolerance)) ]] &amp;&amp;</div><div class='add'>+        [[ $actual -le $(($expected + $tolerance)) ]]; then</div><div class='add'>+      return 0</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+    now=$(date +%s)</div><div class='add'>+    elapsed=$((now - start_time))</div><div class='add'>+</div><div class='add'>+    if [[ $elapsed -ge $timeout ]]; then</div><div class='add'>+      echo "actual = $((${actual%% *} / 1024 / 1024)) MB"</div><div class='add'>+      echo "expected = $((${expected%% *} / 1024 / 1024)) MB"</div><div class='add'>+      cleanup</div><div class='add'>+      exit 1</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+    sleep $interval</div><div class='add'>+  done</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> function assert_state() {</div><div class='ctx'>   local expected_a="$1"</div><div class='ctx'>   local expected_a_hugetlb="$2"</div><div class='hunk'>@@ -70,58 +105,13 @@ function assert_state() {</div><div class='ctx'>     expected_b="$3"</div><div class='ctx'>     expected_b_hugetlb="$4"</div><div class='ctx'>   fi</div><div class='del'>-  local tolerance=$((5 * 1024 * 1024))</div><div class='del'>-</div><div class='del'>-  local actual_a</div><div class='del'>-  actual_a="$(cat "$CGROUP_ROOT"/a/memory.$usage_file)"</div><div class='del'>-  if [[ $actual_a -lt $(($expected_a - $tolerance)) ]] ||</div><div class='del'>-    [[ $actual_a -gt $(($expected_a + $tolerance)) ]]; then</div><div class='del'>-    echo actual a = $((${actual_a%% *} / 1024 / 1024)) MB</div><div class='del'>-    echo expected a = $((${expected_a%% *} / 1024 / 1024)) MB</div><div class='del'>-    echo fail</div><div class='del'>-</div><div class='del'>-    cleanup</div><div class='del'>-    exit 1</div><div class='del'>-  fi</div><div class='ctx'> </div><div class='del'>-  local actual_a_hugetlb</div><div class='del'>-  actual_a_hugetlb="$(cat "$CGROUP_ROOT"/a/hugetlb.${MB}MB.$usage_file)"</div><div class='del'>-  if [[ $actual_a_hugetlb -lt $(($expected_a_hugetlb - $tolerance)) ]] ||</div><div class='del'>-    [[ $actual_a_hugetlb -gt $(($expected_a_hugetlb + $tolerance)) ]]; then</div><div class='del'>-    echo actual a hugetlb = $((${actual_a_hugetlb%% *} / 1024 / 1024)) MB</div><div class='del'>-    echo expected a hugetlb = $((${expected_a_hugetlb%% *} / 1024 / 1024)) MB</div><div class='del'>-    echo fail</div><div class='add'>+  assert_with_retry "$CGROUP_ROOT/a/memory.$usage_file" "$expected_a"</div><div class='add'>+  assert_with_retry "$CGROUP_ROOT/a/hugetlb.${MB}MB.$usage_file" "$expected_a_hugetlb"</div><div class='ctx'> </div><div class='del'>-    cleanup</div><div class='del'>-    exit 1</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  if [[ -z "$expected_b" || -z "$expected_b_hugetlb" ]]; then</div><div class='del'>-    return</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  local actual_b</div><div class='del'>-  actual_b="$(cat "$CGROUP_ROOT"/a/b/memory.$usage_file)"</div><div class='del'>-  if [[ $actual_b -lt $(($expected_b - $tolerance)) ]] ||</div><div class='del'>-    [[ $actual_b -gt $(($expected_b + $tolerance)) ]]; then</div><div class='del'>-    echo actual b = $((${actual_b%% *} / 1024 / 1024)) MB</div><div class='del'>-    echo expected b = $((${expected_b%% *} / 1024 / 1024)) MB</div><div class='del'>-    echo fail</div><div class='del'>-</div><div class='del'>-    cleanup</div><div class='del'>-    exit 1</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  local actual_b_hugetlb</div><div class='del'>-  actual_b_hugetlb="$(cat "$CGROUP_ROOT"/a/b/hugetlb.${MB}MB.$usage_file)"</div><div class='del'>-  if [[ $actual_b_hugetlb -lt $(($expected_b_hugetlb - $tolerance)) ]] ||</div><div class='del'>-    [[ $actual_b_hugetlb -gt $(($expected_b_hugetlb + $tolerance)) ]]; then</div><div class='del'>-    echo actual b hugetlb = $((${actual_b_hugetlb%% *} / 1024 / 1024)) MB</div><div class='del'>-    echo expected b hugetlb = $((${expected_b_hugetlb%% *} / 1024 / 1024)) MB</div><div class='del'>-    echo fail</div><div class='del'>-</div><div class='del'>-    cleanup</div><div class='del'>-    exit 1</div><div class='add'>+  if [[ -n "$expected_b" &amp;&amp; -n "$expected_b_hugetlb" ]]; then</div><div class='add'>+    assert_with_retry "$CGROUP_ROOT/a/b/memory.$usage_file" "$expected_b"</div><div class='add'>+    assert_with_retry "$CGROUP_ROOT/a/b/hugetlb.${MB}MB.$usage_file" "$expected_b_hugetlb"</div><div class='ctx'>   fi</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -175,7 +165,6 @@ size=$((${MB} * 1024 * 1024 * 25)) # 50MB = 25 * 2MB hugepages.</div><div class='ctx'> cleanup</div><div class='ctx'> </div><div class='ctx'> echo</div><div class='del'>-echo</div><div class='ctx'> echo Test charge, rmdir, uncharge</div><div class='ctx'> setup</div><div class='ctx'> echo mkdir</div><div class='hunk'>@@ -195,7 +184,6 @@ cleanup</div><div class='ctx'> </div><div class='ctx'> echo done</div><div class='ctx'> echo</div><div class='del'>-echo</div><div class='ctx'> if [[ ! $cgroup2 ]]; then</div><div class='ctx'>   echo "Test parent and child hugetlb usage"</div><div class='ctx'>   setup</div><div class='hunk'>@@ -212,7 +200,6 @@ if [[ ! $cgroup2 ]]; then</div><div class='ctx'>   assert_state 0 $(($size * 2)) 0 $size</div><div class='ctx'> </div><div class='ctx'>   rmdir "$CGROUP_ROOT"/a/b</div><div class='del'>-  sleep 5</div><div class='ctx'>   echo Assert memory reparent correctly.</div><div class='ctx'>   assert_state 0 $(($size * 2))</div><div class='ctx'> </div><div class='hunk'>@@ -225,7 +212,6 @@ if [[ ! $cgroup2 ]]; then</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='ctx'> echo</div><div class='del'>-echo</div><div class='ctx'> echo "Test child only hugetlb usage"</div><div class='ctx'> echo setup</div><div class='ctx'> setup</div><div class='head'>diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selftests/mm/khugepaged.c<br/>index 8a4d34cce36b..3fe7ef04ac62 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/khugepaged.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/khugepaged.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/khugepaged.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/khugepaged.c</a></div><div class='hunk'>@@ -394,7 +394,7 @@ static void *file_setup_area(int nr_hpages)</div><div class='ctx'> 		perror("open()");</div><div class='ctx'> 		exit(EXIT_FAILURE);</div><div class='ctx'> 	}</div><div class='del'>-	p = mmap(BASE_ADDR, size, PROT_READ | PROT_EXEC,</div><div class='add'>+	p = mmap(BASE_ADDR, size, PROT_READ,</div><div class='ctx'> 		 MAP_PRIVATE, finfo.fd, 0);</div><div class='ctx'> 	if (p == MAP_FAILED || p != BASE_ADDR) {</div><div class='ctx'> 		perror("mmap()");</div><div class='hunk'>@@ -561,8 +561,6 @@ static bool wait_for_scan(const char *msg, char *p, int nr_hpages,</div><div class='ctx'> 		usleep(TICK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	madvise(p, nr_hpages * hpage_pmd_size, MADV_NOHUGEPAGE);</div><div class='del'>-</div><div class='ctx'> 	return timeout == -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1190,6 +1188,11 @@ int main(int argc, char **argv)</div><div class='ctx'> 		.read_ahead_kb = 0,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	if (!thp_is_enabled()) {</div><div class='add'>+		printf("Transparent Hugepages not available\n");</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	parse_test_type(argc, argv);</div><div class='ctx'> </div><div class='ctx'> 	setbuf(stdout, NULL);</div><div class='head'>diff --git a/tools/testing/selftests/mm/ksm_functional_tests.c b/tools/testing/selftests/mm/ksm_functional_tests.c<br/>index 66b4e111b5a2..8d874c4754f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/ksm_functional_tests.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/ksm_functional_tests.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/ksm_functional_tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/ksm_functional_tests.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;stdbool.h&gt;</div><div class='ctx'> #include &lt;stdint.h&gt;</div><div class='del'>-#include &lt;asm-generic/unistd.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;linux/userfaultfd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "vm_util.h"</div><div class='ctx'> </div><div class='ctx'> #define KiB 1024u</div><div class='hunk'>@@ -38,14 +38,13 @@ enum ksm_merge_mode {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mem_fd;</div><div class='del'>-static int ksm_fd;</div><div class='del'>-static int ksm_full_scans_fd;</div><div class='del'>-static int proc_self_ksm_stat_fd;</div><div class='del'>-static int proc_self_ksm_merging_pages_fd;</div><div class='del'>-static int ksm_use_zero_pages_fd;</div><div class='add'>+static int pages_to_scan_fd;</div><div class='add'>+static int sleep_millisecs_fd;</div><div class='ctx'> static int pagemap_fd;</div><div class='ctx'> static size_t pagesize;</div><div class='ctx'> </div><div class='add'>+static void init_global_file_handles(void);</div><div class='add'>+</div><div class='ctx'> static bool range_maps_duplicates(char *addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long offs_a, offs_b, pfn_a, pfn_b;</div><div class='hunk'>@@ -73,88 +72,6 @@ static bool range_maps_duplicates(char *addr, unsigned long size)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long get_my_ksm_zero_pages(void)</div><div class='del'>-{</div><div class='del'>-	char buf[200];</div><div class='del'>-	char *substr_ksm_zero;</div><div class='del'>-	size_t value_pos;</div><div class='del'>-	ssize_t read_size;</div><div class='del'>-	unsigned long my_ksm_zero_pages;</div><div class='del'>-</div><div class='del'>-	if (!proc_self_ksm_stat_fd)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	read_size = pread(proc_self_ksm_stat_fd, buf, sizeof(buf) - 1, 0);</div><div class='del'>-	if (read_size &lt; 0)</div><div class='del'>-		return -errno;</div><div class='del'>-</div><div class='del'>-	buf[read_size] = 0;</div><div class='del'>-</div><div class='del'>-	substr_ksm_zero = strstr(buf, "ksm_zero_pages");</div><div class='del'>-	if (!substr_ksm_zero)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	value_pos = strcspn(substr_ksm_zero, "0123456789");</div><div class='del'>-	my_ksm_zero_pages = strtol(substr_ksm_zero + value_pos, NULL, 10);</div><div class='del'>-</div><div class='del'>-	return my_ksm_zero_pages;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long get_my_merging_pages(void)</div><div class='del'>-{</div><div class='del'>-	char buf[10];</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	if (proc_self_ksm_merging_pages_fd &lt; 0)</div><div class='del'>-		return proc_self_ksm_merging_pages_fd;</div><div class='del'>-</div><div class='del'>-	ret = pread(proc_self_ksm_merging_pages_fd, buf, sizeof(buf) - 1, 0);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		return -errno;</div><div class='del'>-	buf[ret] = 0;</div><div class='del'>-</div><div class='del'>-	return strtol(buf, NULL, 10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long ksm_get_full_scans(void)</div><div class='del'>-{</div><div class='del'>-	char buf[10];</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	ret = pread(ksm_full_scans_fd, buf, sizeof(buf) - 1, 0);</div><div class='del'>-	if (ret &lt;= 0)</div><div class='del'>-		return -errno;</div><div class='del'>-	buf[ret] = 0;</div><div class='del'>-</div><div class='del'>-	return strtol(buf, NULL, 10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksm_merge(void)</div><div class='del'>-{</div><div class='del'>-	long start_scans, end_scans;</div><div class='del'>-</div><div class='del'>-	/* Wait for two full scans such that any possible merging happened. */</div><div class='del'>-	start_scans = ksm_get_full_scans();</div><div class='del'>-	if (start_scans &lt; 0)</div><div class='del'>-		return start_scans;</div><div class='del'>-	if (write(ksm_fd, "1", 1) != 1)</div><div class='del'>-		return -errno;</div><div class='del'>-	do {</div><div class='del'>-		end_scans = ksm_get_full_scans();</div><div class='del'>-		if (end_scans &lt; 0)</div><div class='del'>-			return end_scans;</div><div class='del'>-	} while (end_scans &lt; start_scans + 2);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksm_unmerge(void)</div><div class='del'>-{</div><div class='del'>-	if (write(ksm_fd, "2", 1) != 1)</div><div class='del'>-		return -errno;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static char *__mmap_and_merge_range(char val, unsigned long size, int prot,</div><div class='ctx'> 				  enum ksm_merge_mode mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -163,12 +80,12 @@ static char *__mmap_and_merge_range(char val, unsigned long size, int prot,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Stabilize accounting by disabling KSM completely. */</div><div class='del'>-	if (ksm_unmerge()) {</div><div class='add'>+	if (ksm_stop() &lt; 0) {</div><div class='ctx'> 		ksft_print_msg("Disabling (unmerging) KSM failed\n");</div><div class='ctx'> 		return err_map;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (get_my_merging_pages() &gt; 0) {</div><div class='add'>+	if (ksm_get_self_merging_pages() &gt; 0) {</div><div class='ctx'> 		ksft_print_msg("Still pages merged\n");</div><div class='ctx'> 		return err_map;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -218,7 +135,7 @@ static char *__mmap_and_merge_range(char val, unsigned long size, int prot,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Run KSM to trigger merging and wait. */</div><div class='del'>-	if (ksm_merge()) {</div><div class='add'>+	if (ksm_start() &lt; 0) {</div><div class='ctx'> 		ksft_print_msg("Running KSM failed\n");</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -227,7 +144,7 @@ static char *__mmap_and_merge_range(char val, unsigned long size, int prot,</div><div class='ctx'> 	 * Check if anything was merged at all. Ignore the zero page that is</div><div class='ctx'> 	 * accounted differently (depending on kernel support).</div><div class='ctx'> 	 */</div><div class='del'>-	if (val &amp;&amp; !get_my_merging_pages()) {</div><div class='add'>+	if (val &amp;&amp; !ksm_get_self_merging_pages()) {</div><div class='ctx'> 		ksft_print_msg("No pages got merged\n");</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -274,6 +191,7 @@ static void test_unmerge(void)</div><div class='ctx'> 	ksft_test_result(!range_maps_duplicates(map, size),</div><div class='ctx'> 			 "Pages were unmerged\n");</div><div class='ctx'> unmap:</div><div class='add'>+	ksm_stop();</div><div class='ctx'> 	munmap(map, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -286,15 +204,12 @@ static void test_unmerge_zero_pages(void)</div><div class='ctx'> </div><div class='ctx'> 	ksft_print_msg("[RUN] %s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (proc_self_ksm_stat_fd &lt; 0) {</div><div class='del'>-		ksft_test_result_skip("open(\"/proc/self/ksm_stat\") failed\n");</div><div class='add'>+	if (ksm_get_self_zero_pages() &lt; 0) {</div><div class='add'>+		ksft_test_result_skip("accessing \"/proc/self/ksm_stat\" failed\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (ksm_use_zero_pages_fd &lt; 0) {</div><div class='del'>-		ksft_test_result_skip("open \"/sys/kernel/mm/ksm/use_zero_pages\" failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (write(ksm_use_zero_pages_fd, "1", 1) != 1) {</div><div class='add'>+</div><div class='add'>+	if (ksm_use_zero_pages() &lt; 0) {</div><div class='ctx'> 		ksft_test_result_skip("write \"/sys/kernel/mm/ksm/use_zero_pages\" failed\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -306,7 +221,7 @@ static void test_unmerge_zero_pages(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Check if ksm_zero_pages is updated correctly after KSM merging */</div><div class='ctx'> 	pages_expected = size / pagesize;</div><div class='del'>-	if (pages_expected != get_my_ksm_zero_pages()) {</div><div class='add'>+	if (pages_expected != ksm_get_self_zero_pages()) {</div><div class='ctx'> 		ksft_test_result_fail("'ksm_zero_pages' updated after merging\n");</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -319,7 +234,7 @@ static void test_unmerge_zero_pages(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Check if ksm_zero_pages is updated correctly after unmerging */</div><div class='ctx'> 	pages_expected /= 2;</div><div class='del'>-	if (pages_expected != get_my_ksm_zero_pages()) {</div><div class='add'>+	if (pages_expected != ksm_get_self_zero_pages()) {</div><div class='ctx'> 		ksft_test_result_fail("'ksm_zero_pages' updated after unmerging\n");</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -329,7 +244,7 @@ static void test_unmerge_zero_pages(void)</div><div class='ctx'> 		*((unsigned int *)&amp;map[offs]) = offs;</div><div class='ctx'> </div><div class='ctx'> 	/* Now we should have no zeropages remaining. */</div><div class='del'>-	if (get_my_ksm_zero_pages()) {</div><div class='add'>+	if (ksm_get_self_zero_pages()) {</div><div class='ctx'> 		ksft_test_result_fail("'ksm_zero_pages' updated after write fault\n");</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -338,6 +253,7 @@ static void test_unmerge_zero_pages(void)</div><div class='ctx'> 	ksft_test_result(!range_maps_duplicates(map, size),</div><div class='ctx'> 			"KSM zero pages were unmerged\n");</div><div class='ctx'> unmap:</div><div class='add'>+	ksm_stop();</div><div class='ctx'> 	munmap(map, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -366,9 +282,11 @@ static void test_unmerge_discarded(void)</div><div class='ctx'> 	ksft_test_result(!range_maps_duplicates(map, size),</div><div class='ctx'> 			 "Pages were unmerged\n");</div><div class='ctx'> unmap:</div><div class='add'>+	ksm_stop();</div><div class='ctx'> 	munmap(map, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef __NR_userfaultfd</div><div class='ctx'> static void test_unmerge_uffd_wp(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct uffdio_writeprotect uffd_writeprotect;</div><div class='hunk'>@@ -392,9 +310,13 @@ static void test_unmerge_uffd_wp(void)</div><div class='ctx'> </div><div class='ctx'> 	/* See if UFFD-WP is around. */</div><div class='ctx'> 	uffdio_api.api = UFFD_API;</div><div class='del'>-	uffdio_api.features = UFFD_FEATURE_PAGEFAULT_FLAG_WP;</div><div class='add'>+	uffdio_api.features = 0;</div><div class='ctx'> 	if (ioctl(uffd, UFFDIO_API, &amp;uffdio_api) &lt; 0) {</div><div class='del'>-		ksft_test_result_fail("UFFDIO_API failed\n");</div><div class='add'>+		if (errno == EINVAL)</div><div class='add'>+			ksft_test_result_skip("The API version requested is not supported\n");</div><div class='add'>+		else</div><div class='add'>+			ksft_test_result_fail("UFFDIO_API failed: %s\n", strerror(errno));</div><div class='add'>+</div><div class='ctx'> 		goto close_uffd;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(uffdio_api.features &amp; UFFD_FEATURE_PAGEFAULT_FLAG_WP)) {</div><div class='hunk'>@@ -402,6 +324,26 @@ static void test_unmerge_uffd_wp(void)</div><div class='ctx'> 		goto close_uffd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * UFFDIO_API must only be called once to enable features.</div><div class='add'>+	 * So we close the old userfaultfd and create a new one to</div><div class='add'>+	 * actually enable UFFD_FEATURE_PAGEFAULT_FLAG_WP.</div><div class='add'>+	 */</div><div class='add'>+	close(uffd);</div><div class='add'>+	uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);</div><div class='add'>+	if (uffd &lt; 0) {</div><div class='add'>+		ksft_test_result_fail("__NR_userfaultfd failed\n");</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now, enable it ("two-step handshake") */</div><div class='add'>+	uffdio_api.api = UFFD_API;</div><div class='add'>+	uffdio_api.features = UFFD_FEATURE_PAGEFAULT_FLAG_WP;</div><div class='add'>+	if (ioctl(uffd, UFFDIO_API, &amp;uffdio_api) &lt; 0) {</div><div class='add'>+		ksft_test_result_fail("UFFDIO_API failed: %s\n", strerror(errno));</div><div class='add'>+		goto close_uffd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Register UFFD-WP, no need for an actual handler. */</div><div class='ctx'> 	if (uffd_register(uffd, map, size, false, true, false)) {</div><div class='ctx'> 		ksft_test_result_fail("UFFDIO_REGISTER_MODE_WP failed\n");</div><div class='hunk'>@@ -427,8 +369,10 @@ static void test_unmerge_uffd_wp(void)</div><div class='ctx'> close_uffd:</div><div class='ctx'> 	close(uffd);</div><div class='ctx'> unmap:</div><div class='add'>+	ksm_stop();</div><div class='ctx'> 	munmap(map, size);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* Verify that KSM can be enabled / queried with prctl. */</div><div class='ctx'> static void test_prctl(void)</div><div class='hunk'>@@ -480,27 +424,30 @@ static int test_child_ksm(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Test if KSM is enabled for the process. */</div><div class='ctx'> 	if (prctl(PR_GET_MEMORY_MERGE, 0, 0, 0, 0) != 1)</div><div class='del'>-		return -1;</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Test if merge could really happen. */</div><div class='ctx'> 	map = __mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, KSM_MERGE_NONE);</div><div class='ctx'> 	if (map == MAP_MERGE_FAIL)</div><div class='del'>-		return -2;</div><div class='add'>+		return 2;</div><div class='ctx'> 	else if (map == MAP_MERGE_SKIP)</div><div class='del'>-		return -3;</div><div class='add'>+		return 3;</div><div class='ctx'> </div><div class='add'>+	ksm_stop();</div><div class='ctx'> 	munmap(map, size);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void test_child_ksm_err(int status)</div><div class='ctx'> {</div><div class='del'>-	if (status == -1)</div><div class='add'>+	if (status == 1)</div><div class='ctx'> 		ksft_test_result_fail("unexpected PR_GET_MEMORY_MERGE result in child\n");</div><div class='del'>-	else if (status == -2)</div><div class='add'>+	else if (status == 2)</div><div class='ctx'> 		ksft_test_result_fail("Merge in child failed\n");</div><div class='del'>-	else if (status == -3)</div><div class='add'>+	else if (status == 3)</div><div class='ctx'> 		ksft_test_result_skip("Merge in child skipped\n");</div><div class='add'>+	else if (status == 4)</div><div class='add'>+		ksft_test_result_fail("Binary not found\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Verify that prctl ksm flag is inherited. */</div><div class='hunk'>@@ -522,6 +469,7 @@ static void test_prctl_fork(void)</div><div class='ctx'> </div><div class='ctx'> 	child_pid = fork();</div><div class='ctx'> 	if (!child_pid) {</div><div class='add'>+		init_global_file_handles();</div><div class='ctx'> 		exit(test_child_ksm());</div><div class='ctx'> 	} else if (child_pid &lt; 0) {</div><div class='ctx'> 		ksft_test_result_fail("fork() failed\n");</div><div class='hunk'>@@ -547,6 +495,46 @@ static void test_prctl_fork(void)</div><div class='ctx'> 	ksft_test_result_pass("PR_SET_MEMORY_MERGE value is inherited\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int start_ksmd_and_set_frequency(char *pages_to_scan, char *sleep_ms)</div><div class='add'>+{</div><div class='add'>+	int ksm_fd;</div><div class='add'>+</div><div class='add'>+	ksm_fd = open("/sys/kernel/mm/ksm/run", O_RDWR);</div><div class='add'>+	if (ksm_fd &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	if (write(ksm_fd, "1", 1) != 1)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	if (write(pages_to_scan_fd, pages_to_scan, strlen(pages_to_scan)) &lt;= 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	if (write(sleep_millisecs_fd, sleep_ms, strlen(sleep_ms)) &lt;= 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stop_ksmd_and_restore_frequency(void)</div><div class='add'>+{</div><div class='add'>+	int ksm_fd;</div><div class='add'>+</div><div class='add'>+	ksm_fd = open("/sys/kernel/mm/ksm/run", O_RDWR);</div><div class='add'>+	if (ksm_fd &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	if (write(ksm_fd, "2", 1) != 1)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	if (write(pages_to_scan_fd, "100", 3) &lt;= 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	if (write(sleep_millisecs_fd, "20", 2) &lt;= 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void test_prctl_fork_exec(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, status;</div><div class='hunk'>@@ -554,6 +542,9 @@ static void test_prctl_fork_exec(void)</div><div class='ctx'> </div><div class='ctx'> 	ksft_print_msg("[RUN] %s\n", __func__);</div><div class='ctx'> </div><div class='add'>+	if (start_ksmd_and_set_frequency("2000", "0"))</div><div class='add'>+		ksft_test_result_fail("set ksmd's scanning frequency failed\n");</div><div class='add'>+</div><div class='ctx'> 	ret = prctl(PR_SET_MEMORY_MERGE, 1, 0, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0 &amp;&amp; errno == EINVAL) {</div><div class='ctx'> 		ksft_test_result_skip("PR_SET_MEMORY_MERGE not supported\n");</div><div class='hunk'>@@ -569,10 +560,10 @@ static void test_prctl_fork_exec(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	} else if (child_pid == 0) {</div><div class='ctx'> 		char *prg_name = "./ksm_functional_tests";</div><div class='del'>-		char *argv_for_program[] = { prg_name, FORK_EXEC_CHILD_PRG_NAME };</div><div class='add'>+		char *argv_for_program[] = { prg_name, FORK_EXEC_CHILD_PRG_NAME, NULL };</div><div class='ctx'> </div><div class='ctx'> 		execv(prg_name, argv_for_program);</div><div class='del'>-		return;</div><div class='add'>+		exit(4);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (waitpid(child_pid, &amp;status, 0) &gt; 0) {</div><div class='hunk'>@@ -596,6 +587,11 @@ static void test_prctl_fork_exec(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (stop_ksmd_and_restore_frequency()) {</div><div class='add'>+		ksft_test_result_fail("restore ksmd frequency failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ksft_test_result_pass("PR_SET_MEMORY_MERGE value is inherited\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -618,6 +614,7 @@ static void test_prctl_unmerge(void)</div><div class='ctx'> 	ksft_test_result(!range_maps_duplicates(map, size),</div><div class='ctx'> 			 "Pages were unmerged\n");</div><div class='ctx'> unmap:</div><div class='add'>+	ksm_stop();</div><div class='ctx'> 	munmap(map, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -651,6 +648,47 @@ static void test_prot_none(void)</div><div class='ctx'> 	ksft_test_result(!range_maps_duplicates(map, size),</div><div class='ctx'> 			 "Pages were unmerged\n");</div><div class='ctx'> unmap:</div><div class='add'>+	ksm_stop();</div><div class='add'>+	munmap(map, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_fork_ksm_merging_page_count(void)</div><div class='add'>+{</div><div class='add'>+	const unsigned int size = 2 * MiB;</div><div class='add'>+	char *map;</div><div class='add'>+	pid_t child_pid;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	ksft_print_msg("[RUN] %s\n", __func__);</div><div class='add'>+</div><div class='add'>+	map = mmap_and_merge_range(0xcf, size, PROT_READ | PROT_WRITE, KSM_MERGE_MADVISE);</div><div class='add'>+	if (map == MAP_FAILED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	child_pid = fork();</div><div class='add'>+	if (!child_pid) {</div><div class='add'>+		init_global_file_handles();</div><div class='add'>+		exit(ksm_get_self_merging_pages());</div><div class='add'>+	} else if (child_pid &lt; 0) {</div><div class='add'>+		ksft_test_result_fail("fork() failed\n");</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (waitpid(child_pid, &amp;status, 0) &lt; 0) {</div><div class='add'>+		ksft_test_result_fail("waitpid() failed\n");</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = WEXITSTATUS(status);</div><div class='add'>+	if (status) {</div><div class='add'>+		ksft_test_result_fail("ksm_merging_page in child: %d\n", status);</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksft_test_result_pass("ksm_merging_pages is not inherited after fork\n");</div><div class='add'>+</div><div class='add'>+unmap:</div><div class='add'>+	ksm_stop();</div><div class='ctx'> 	munmap(map, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -659,24 +697,27 @@ static void init_global_file_handles(void)</div><div class='ctx'> 	mem_fd = open("/proc/self/mem", O_RDWR);</div><div class='ctx'> 	if (mem_fd &lt; 0)</div><div class='ctx'> 		ksft_exit_fail_msg("opening /proc/self/mem failed\n");</div><div class='del'>-	ksm_fd = open("/sys/kernel/mm/ksm/run", O_RDWR);</div><div class='del'>-	if (ksm_fd &lt; 0)</div><div class='del'>-		ksft_exit_skip("open(\"/sys/kernel/mm/ksm/run\") failed\n");</div><div class='del'>-	ksm_full_scans_fd = open("/sys/kernel/mm/ksm/full_scans", O_RDONLY);</div><div class='del'>-	if (ksm_full_scans_fd &lt; 0)</div><div class='del'>-		ksft_exit_skip("open(\"/sys/kernel/mm/ksm/full_scans\") failed\n");</div><div class='add'>+	if (ksm_stop() &lt; 0)</div><div class='add'>+		ksft_exit_skip("accessing \"/sys/kernel/mm/ksm/run\") failed\n");</div><div class='add'>+	if (ksm_get_full_scans() &lt; 0)</div><div class='add'>+		ksft_exit_skip("accessing \"/sys/kernel/mm/ksm/full_scans\") failed\n");</div><div class='ctx'> 	pagemap_fd = open("/proc/self/pagemap", O_RDONLY);</div><div class='ctx'> 	if (pagemap_fd &lt; 0)</div><div class='ctx'> 		ksft_exit_skip("open(\"/proc/self/pagemap\") failed\n");</div><div class='del'>-	proc_self_ksm_stat_fd = open("/proc/self/ksm_stat", O_RDONLY);</div><div class='del'>-	proc_self_ksm_merging_pages_fd = open("/proc/self/ksm_merging_pages",</div><div class='del'>-						O_RDONLY);</div><div class='del'>-	ksm_use_zero_pages_fd = open("/sys/kernel/mm/ksm/use_zero_pages", O_RDWR);</div><div class='add'>+	if (ksm_get_self_merging_pages() &lt; 0)</div><div class='add'>+		ksft_exit_skip("accessing \"/proc/self/ksm_merging_pages\") failed\n");</div><div class='add'>+</div><div class='add'>+	pages_to_scan_fd = open("/sys/kernel/mm/ksm/pages_to_scan", O_RDWR);</div><div class='add'>+	if (pages_to_scan_fd &lt; 0)</div><div class='add'>+		ksft_exit_fail_msg("opening /sys/kernel/mm/ksm/pages_to_scan failed\n");</div><div class='add'>+	sleep_millisecs_fd = open("/sys/kernel/mm/ksm/sleep_millisecs", O_RDWR);</div><div class='add'>+	if (sleep_millisecs_fd &lt; 0)</div><div class='add'>+		ksft_exit_fail_msg("opening /sys/kernel/mm/ksm/sleep_millisecs failed\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='del'>-	unsigned int tests = 8;</div><div class='add'>+	unsigned int tests = 9;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (argc &gt; 1 &amp;&amp; !strcmp(argv[1], FORK_EXEC_CHILD_PRG_NAME)) {</div><div class='hunk'>@@ -684,7 +725,9 @@ int main(int argc, char **argv)</div><div class='ctx'> 		exit(test_child_ksm());</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef __NR_userfaultfd</div><div class='ctx'> 	tests++;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	ksft_print_header();</div><div class='ctx'> 	ksft_set_plan(tests);</div><div class='hunk'>@@ -696,7 +739,9 @@ int main(int argc, char **argv)</div><div class='ctx'> 	test_unmerge();</div><div class='ctx'> 	test_unmerge_zero_pages();</div><div class='ctx'> 	test_unmerge_discarded();</div><div class='add'>+#ifdef __NR_userfaultfd</div><div class='ctx'> 	test_unmerge_uffd_wp();</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	test_prot_none();</div><div class='ctx'> </div><div class='hunk'>@@ -704,6 +749,7 @@ int main(int argc, char **argv)</div><div class='ctx'> 	test_prctl_fork();</div><div class='ctx'> 	test_prctl_fork_exec();</div><div class='ctx'> 	test_prctl_unmerge();</div><div class='add'>+	test_fork_ksm_merging_page_count();</div><div class='ctx'> </div><div class='ctx'> 	err = ksft_get_fail_cnt();</div><div class='ctx'> 	if (err)</div><div class='head'>diff --git a/tools/testing/selftests/mm/ksm_tests.c b/tools/testing/selftests/mm/ksm_tests.c<br/>index dcdd5bb20f3d..a0b48b839d54 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/ksm_tests.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/ksm_tests.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/ksm_tests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/ksm_tests.c</a></div><div class='hunk'>@@ -12,9 +12,10 @@</div><div class='ctx'> #include &lt;stdint.h&gt;</div><div class='ctx'> #include &lt;err.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include &lt;include/vdso/time64.h&gt;</div><div class='ctx'> #include "vm_util.h"</div><div class='add'>+#include "thp_settings.h"</div><div class='ctx'> </div><div class='ctx'> #define KSM_SYSFS_PATH "/sys/kernel/mm/ksm/"</div><div class='ctx'> #define KSM_FP(s) (KSM_SYSFS_PATH s)</div><div class='hunk'>@@ -58,40 +59,12 @@ int debug;</div><div class='ctx'> </div><div class='ctx'> static int ksm_write_sysfs(const char *file_path, unsigned long val)</div><div class='ctx'> {</div><div class='del'>-	FILE *f = fopen(file_path, "w");</div><div class='del'>-</div><div class='del'>-	if (!f) {</div><div class='del'>-		fprintf(stderr, "f %s\n", file_path);</div><div class='del'>-		perror("fopen");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (fprintf(f, "%lu", val) &lt; 0) {</div><div class='del'>-		perror("fprintf");</div><div class='del'>-		fclose(f);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	fclose(f);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return write_sysfs(file_path, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ksm_read_sysfs(const char *file_path, unsigned long *val)</div><div class='ctx'> {</div><div class='del'>-	FILE *f = fopen(file_path, "r");</div><div class='del'>-</div><div class='del'>-	if (!f) {</div><div class='del'>-		fprintf(stderr, "f %s\n", file_path);</div><div class='del'>-		perror("fopen");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (fscanf(f, "%lu", val) != 1) {</div><div class='del'>-		perror("fscanf");</div><div class='del'>-		fclose(f);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	fclose(f);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return read_sysfs(file_path, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ksm_print_sysfs(void)</div><div class='hunk'>@@ -555,6 +528,11 @@ static int ksm_merge_hugepages_time(int merge_type, int mapping, int prot,</div><div class='ctx'> 	unsigned long scan_time_ns;</div><div class='ctx'> 	int pagemap_fd, n_normal_pages, n_huge_pages;</div><div class='ctx'> </div><div class='add'>+	if (!thp_is_enabled()) {</div><div class='add'>+		printf("Transparent Hugepages not available\n");</div><div class='add'>+		return KSFT_SKIP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	map_size *= MB;</div><div class='ctx'> 	size_t len = map_size;</div><div class='ctx'> </div><div class='head'>diff --git a/tools/testing/selftests/mm/madv_populate.c b/tools/testing/selftests/mm/madv_populate.c<br/>index ef7d911da13e..88050e0f829a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/madv_populate.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/madv_populate.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/madv_populate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/madv_populate.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> #include "vm_util.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -172,12 +172,12 @@ static void test_populate_read(void)</div><div class='ctx'> 	if (addr == MAP_FAILED)</div><div class='ctx'> 		ksft_exit_fail_msg("mmap failed\n");</div><div class='ctx'> 	ksft_test_result(range_is_not_populated(addr, SIZE),</div><div class='del'>-			 "range initially not populated\n");</div><div class='add'>+			 "read range initially not populated\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = madvise(addr, SIZE, MADV_POPULATE_READ);</div><div class='ctx'> 	ksft_test_result(!ret, "MADV_POPULATE_READ\n");</div><div class='ctx'> 	ksft_test_result(range_is_populated(addr, SIZE),</div><div class='del'>-			 "range is populated\n");</div><div class='add'>+			 "read range is populated\n");</div><div class='ctx'> </div><div class='ctx'> 	munmap(addr, SIZE);</div><div class='ctx'> }</div><div class='hunk'>@@ -194,12 +194,12 @@ static void test_populate_write(void)</div><div class='ctx'> 	if (addr == MAP_FAILED)</div><div class='ctx'> 		ksft_exit_fail_msg("mmap failed\n");</div><div class='ctx'> 	ksft_test_result(range_is_not_populated(addr, SIZE),</div><div class='del'>-			 "range initially not populated\n");</div><div class='add'>+			 "write range initially not populated\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = madvise(addr, SIZE, MADV_POPULATE_WRITE);</div><div class='ctx'> 	ksft_test_result(!ret, "MADV_POPULATE_WRITE\n");</div><div class='ctx'> 	ksft_test_result(range_is_populated(addr, SIZE),</div><div class='del'>-			 "range is populated\n");</div><div class='add'>+			 "write range is populated\n");</div><div class='ctx'> </div><div class='ctx'> 	munmap(addr, SIZE);</div><div class='ctx'> }</div><div class='hunk'>@@ -247,40 +247,23 @@ static void test_softdirty(void)</div><div class='ctx'> 	/* Clear any softdirty bits. */</div><div class='ctx'> 	clear_softdirty();</div><div class='ctx'> 	ksft_test_result(range_is_not_softdirty(addr, SIZE),</div><div class='del'>-			 "range is not softdirty\n");</div><div class='add'>+			 "cleared range is not softdirty\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Populating READ should set softdirty. */</div><div class='ctx'> 	ret = madvise(addr, SIZE, MADV_POPULATE_READ);</div><div class='del'>-	ksft_test_result(!ret, "MADV_POPULATE_READ\n");</div><div class='add'>+	ksft_test_result(!ret, "softdirty MADV_POPULATE_READ\n");</div><div class='ctx'> 	ksft_test_result(range_is_not_softdirty(addr, SIZE),</div><div class='del'>-			 "range is not softdirty\n");</div><div class='add'>+			 "range is not softdirty after MADV_POPULATE_READ\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Populating WRITE should set softdirty. */</div><div class='ctx'> 	ret = madvise(addr, SIZE, MADV_POPULATE_WRITE);</div><div class='del'>-	ksft_test_result(!ret, "MADV_POPULATE_WRITE\n");</div><div class='add'>+	ksft_test_result(!ret, "softdirty MADV_POPULATE_WRITE\n");</div><div class='ctx'> 	ksft_test_result(range_is_softdirty(addr, SIZE),</div><div class='del'>-			 "range is softdirty\n");</div><div class='add'>+			 "range is softdirty after MADV_POPULATE_WRITE \n");</div><div class='ctx'> </div><div class='ctx'> 	munmap(addr, SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int system_has_softdirty(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * There is no way to check if the kernel supports soft-dirty, other</div><div class='del'>-	 * than by writing to a page and seeing if the bit was set. But the</div><div class='del'>-	 * tests are intended to check that the bit gets set when it should, so</div><div class='del'>-	 * doing that check would turn a potentially legitimate fail into a</div><div class='del'>-	 * skip. Fortunately, we know for sure that arm64 does not support</div><div class='del'>-	 * soft-dirty. So for now, let's just use the arch as a corse guide.</div><div class='del'>-	 */</div><div class='del'>-#if defined(__aarch64__)</div><div class='del'>-	return 0;</div><div class='del'>-#else</div><div class='del'>-	return 1;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int main(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	int nr_tests = 16;</div><div class='hunk'>@@ -288,7 +271,7 @@ int main(int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> 	pagesize = getpagesize();</div><div class='ctx'> </div><div class='del'>-	if (system_has_softdirty())</div><div class='add'>+	if (softdirty_supported())</div><div class='ctx'> 		nr_tests += 5;</div><div class='ctx'> </div><div class='ctx'> 	ksft_print_header();</div><div class='hunk'>@@ -300,7 +283,7 @@ int main(int argc, char **argv)</div><div class='ctx'> 	test_holes();</div><div class='ctx'> 	test_populate_read();</div><div class='ctx'> 	test_populate_write();</div><div class='del'>-	if (system_has_softdirty())</div><div class='add'>+	if (softdirty_supported())</div><div class='ctx'> 		test_softdirty();</div><div class='ctx'> </div><div class='ctx'> 	err = ksft_get_fail_cnt();</div><div class='head'>diff --git a/tools/testing/selftests/mm/map_fixed_noreplace.c b/tools/testing/selftests/mm/map_fixed_noreplace.c<br/>index d53de2486080..11241edde7fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/map_fixed_noreplace.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/map_fixed_noreplace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/map_fixed_noreplace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/map_fixed_noreplace.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> static void dump_maps(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -96,7 +96,7 @@ int main(void)</div><div class='ctx'> 		ksft_exit_fail_msg("Error:1: mmap() succeeded when it shouldn't have\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	ksft_print_msg("mmap() @ 0x%lx-0x%lx p=%p result=%m\n", addr, addr + size, p);</div><div class='del'>-	ksft_test_result_pass("mmap() 5*PAGE_SIZE at base\n");</div><div class='add'>+	ksft_test_result_pass("Second mmap() 5*PAGE_SIZE at base\n");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Second mapping contained within first:</div><div class='head'>diff --git a/tools/testing/selftests/mm/map_hugetlb.c b/tools/testing/selftests/mm/map_hugetlb.c<br/>index b47399feab53..aa409107611b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/map_hugetlb.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/map_hugetlb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/map_hugetlb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/map_hugetlb.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #include &lt;sys/mman.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> #include "vm_util.h"</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define LENGTH (256UL*1024*1024)</div><div class='ctx'> #define PROTECTION (PROT_READ | PROT_WRITE)</div><div class='head'>diff --git a/tools/testing/selftests/mm/map_populate.c b/tools/testing/selftests/mm/map_populate.c<br/>index 5c8a53869b1b..712327f4e932 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/map_populate.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/map_populate.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/map_populate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/map_populate.c</a></div><div class='hunk'>@@ -16,7 +16,9 @@</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='add'>+</div><div class='add'>+#include "vm_util.h"</div><div class='ctx'> </div><div class='ctx'> #define MMAP_SZ		4096</div><div class='ctx'> </div><div class='hunk'>@@ -87,6 +89,9 @@ int main(int argc, char **argv)</div><div class='ctx'> 	BUG_ON(!ftmp, "tmpfile()");</div><div class='ctx'> </div><div class='ctx'> 	ret = ftruncate(fileno(ftmp), MMAP_SZ);</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; errno == ENOENT) {</div><div class='add'>+		skip_test_dodgy_fs("ftruncate()");</div><div class='add'>+	}</div><div class='ctx'> 	BUG_ON(ret, "ftruncate()");</div><div class='ctx'> </div><div class='ctx'> 	smap = mmap(0, MMAP_SZ, PROT_READ | PROT_WRITE,</div><div class='head'>diff --git a/tools/testing/selftests/mm/mdwe_test.c b/tools/testing/selftests/mm/mdwe_test.c<br/>index 200bedcdc32e..647779653da0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/mdwe_test.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/mdwe_test.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/mdwe_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/mdwe_test.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;sys/wait.h&gt;</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest_harness.h"</div><div class='add'>+#include "kselftest_harness.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef __aarch64__</div><div class='ctx'> # define PROT_BTI	0</div><div class='head'>diff --git a/tools/testing/selftests/mm/memfd_secret.c b/tools/testing/selftests/mm/memfd_secret.c<br/>index 74c911aa3aea..aac4f795c327 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/memfd_secret.c?id=bfb1d2b9021c21891427acc86eb848ccedeb274e'>tools/testing/selftests/mm/memfd_secret.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/memfd_secret.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/memfd_secret.c</a></div><div class='hunk'>@@ -17,17 +17,19 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='del'>-#include &lt;asm-generic/unistd.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "../kselftest.h"</div><div class='add'>+#include "kselftest.h"</div><div class='ctx'> </div><div class='ctx'> #define fail(fmt, ...) ksft_test_result_fail(fmt, ##__VA_ARGS__)</div><div class='ctx'> #define pass(fmt, ...) ksft_test_result_pass(fmt, ##__VA_ARGS__)</div><div class='ctx'> #define skip(fmt, ...) ksft_test_result_skip(fmt, ##__VA_ARGS__)</div><div class='ctx'> </div><div class='add'>+#ifdef __NR_memfd_secret</div><div class='add'>+</div><div class='ctx'> #define PATTERN	0x55</div><div class='ctx'> </div><div class='ctx'> static const int prot = PROT_READ | PROT_WRITE;</div><div class='hunk'>@@ -332,3 +334,13 @@ int main(int argc, char *argv[])</div><div class='ctx'> </div><div class='ctx'> 	ksft_finished();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#else /* __NR_memfd_secret */</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	printf("skip: skipping memfd_secret test (missing __NR_memfd_secret)\n");</div><div class='add'>+	return KSFT_SKIP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __NR_memfd_secret */</div><div class='head'>diff --git a/tools/testing/selftests/mm/merge.c b/tools/testing/selftests/mm/merge.c<br/>new file mode 100644<br/>index 000000000000..363c1033cc7d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/tools/testing/selftests/mm/merge.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>tools/testing/selftests/mm/merge.c</a></div><div class='hunk'>@@ -0,0 +1,1174 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#define _GNU_SOURCE</div><div class='add'>+#include "kselftest_harness.h"</div><div class='add'>+#include &lt;linux/prctl.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;sys/mman.h&gt;</div><div class='add'>+#include &lt;sys/prctl.h&gt;</div><div class='add'>+#include &lt;sys/syscall.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;linux/perf_event.h&gt;</div><div class='add'>+#include "vm_util.h"</div><div class='add'>+#include &lt;linux/mman.h&gt;</div><div class='add'>+</div><div class='add'>+FIXTURE(merge)</div><div class='add'>+{</div><div class='add'>+	unsigned int page_size;</div><div class='add'>+	char *carveout;</div><div class='add'>+	struct procmap_fd procmap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+FIXTURE_SETUP(merge)</div><div class='add'>+{</div><div class='add'>+	self-&gt;page_size = psize();</div><div class='add'>+	/* Carve out PROT_NONE region to map over. */</div><div class='add'>+	self-&gt;carveout = mmap(NULL, 30 * self-&gt;page_size, PROT_NONE,</div><div class='add'>+			      MAP_ANON | MAP_PRIVATE, -1, 0);</div><div class='add'>+	ASSERT_NE(self-&gt;carveout, MAP_FAILED);</div><div class='add'>+	/* Setup PROCMAP_QUERY interface. */</div><div class='add'>+	ASSERT_EQ(open_self_procmap(&amp;self-&gt;procmap), 0);</div><div class='add'>+}