Commit 0529ef8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-urgent-2025-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Thomas Gleixner:
 "A small set of x86 fixes:

   - Cure IO bitmap inconsistencies

     A failed fork cleans up all resources of the newly created thread
     via exit_thread(). exit_thread() invokes io_bitmap_exit() which
     does the IO bitmap cleanups, which unfortunately assume that the
     cleanup is related to the current task, which is obviously bogus.

     Make it work correctly

   - A lockdep fix in the resctrl code removed the clearing of the
     command buffer in two places, which keeps stale error messages
     around. Bring them back.

   - Remove unused trace events"

* tag 'x86-urgent-2025-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  fs/resctrl: Restore the rdt_last_cmd_clear() calls after acquiring rdtgroup_mutex
  x86/iopl: Cure TIF_IO_BITMAP inconsistencies
  x86/fpu: Remove unused trace events
parents 4710eacf dd2922dc

arch/x86/include/asm/trace/fpu.h

+0 −15
Original line number Diff line number Diff line
@@ -44,16 +44,6 @@ DEFINE_EVENT(x86_fpu, x86_fpu_after_save, 
	TP_ARGS(fpu)

);



DEFINE_EVENT(x86_fpu, x86_fpu_before_restore,

	TP_PROTO(struct fpu *fpu),

	TP_ARGS(fpu)

);



DEFINE_EVENT(x86_fpu, x86_fpu_after_restore,

	TP_PROTO(struct fpu *fpu),

	TP_ARGS(fpu)

);



DEFINE_EVENT(x86_fpu, x86_fpu_regs_activated,

	TP_PROTO(struct fpu *fpu),

	TP_ARGS(fpu)
@@ -64,11 +54,6 @@ DEFINE_EVENT(x86_fpu, x86_fpu_regs_deactivated, 
	TP_ARGS(fpu)

);



DEFINE_EVENT(x86_fpu, x86_fpu_init_state,

	TP_PROTO(struct fpu *fpu),

	TP_ARGS(fpu)

);



DEFINE_EVENT(x86_fpu, x86_fpu_dropped,

	TP_PROTO(struct fpu *fpu),

	TP_ARGS(fpu)

arch/x86/kernel/ioport.c

+9 −4
Original line number Diff line number Diff line
@@ -33,8 +33,9 @@ void io_bitmap_share(struct task_struct *tsk) 
	set_tsk_thread_flag(tsk, TIF_IO_BITMAP);

}



static void task_update_io_bitmap(struct task_struct *tsk)

static void task_update_io_bitmap(void)

{

	struct task_struct *tsk = current;

	struct thread_struct *t = &tsk->thread;



	if (t->iopl_emul == 3 || t->io_bitmap) {
@@ -54,7 +55,12 @@ void io_bitmap_exit(struct task_struct *tsk) 
	struct io_bitmap *iobm = tsk->thread.io_bitmap;



	tsk->thread.io_bitmap = NULL;

	task_update_io_bitmap(tsk);

	/*

	 * Don't touch the TSS when invoked on a failed fork(). TSS

	 * reflects the state of @current and not the state of @tsk.

	 */

	if (tsk == current)

		task_update_io_bitmap();

	if (iobm && refcount_dec_and_test(&iobm->refcnt))

		kfree(iobm);

}
@@ -192,8 +198,7 @@ SYSCALL_DEFINE1(iopl, unsigned int, level) 
	}



	t->iopl_emul = level;

	task_update_io_bitmap(current);



	task_update_io_bitmap();

	return 0;

}

arch/x86/kernel/process.c

+6 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) 
	frame->ret_addr = (unsigned long) ret_from_fork_asm;

	p->thread.sp = (unsigned long) fork_frame;

	p->thread.io_bitmap = NULL;

	clear_tsk_thread_flag(p, TIF_IO_BITMAP);

	p->thread.iopl_warn = 0;

	memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
@@ -464,6 +465,11 @@ void native_tss_update_io_bitmap(void) 
	} else {

		struct io_bitmap *iobm = t->io_bitmap;



		if (WARN_ON_ONCE(!iobm)) {

			clear_thread_flag(TIF_IO_BITMAP);

			native_tss_invalidate_io_bitmap();

		}



		/*

		 * Only copy bitmap data when the sequence number differs. The

		 * update time is accounted to the incoming task.

fs/resctrl/rdtgroup.c

+4 −0
Original line number Diff line number Diff line
@@ -536,6 +536,8 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of, 
		goto unlock;

	}



	rdt_last_cmd_clear();



	if (rdtgrp->mode == RDT_MODE_PSEUDO_LOCKED ||

	    rdtgrp->mode == RDT_MODE_PSEUDO_LOCKSETUP) {

		ret = -EINVAL;
@@ -3472,6 +3474,8 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, 
		goto out_unlock;

	}



	rdt_last_cmd_clear();



	/*

	 * Check that the parent directory for a monitor group is a "mon_groups"

	 * directory.