Commit 24f4db1f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sched_urgent_for_v5.17_rc2_p2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fix from Borislav Petkov:
 "Make sure the membarrier-rseq fence commands are part of the reported
  set when querying membarrier(2) commands through MEMBARRIER_CMD_QUERY"

* tag 'sched_urgent_for_v5.17_rc2_p2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/membarrier: Fix membarrier-rseq fence command missing from query bitmask
parents a96d3a5b 80923261

kernel/sched/membarrier.c

+5 −4
Original line number Diff line number Diff line
@@ -147,11 +147,11 @@ 
#endif



#ifdef CONFIG_RSEQ

#define MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ_BITMASK		\

#define MEMBARRIER_PRIVATE_EXPEDITED_RSEQ_BITMASK		\

	(MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ			\

	| MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ_BITMASK)

	| MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ)

#else

#define MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ_BITMASK	0

#define MEMBARRIER_PRIVATE_EXPEDITED_RSEQ_BITMASK	0

#endif



#define MEMBARRIER_CMD_BITMASK						\
@@ -159,7 +159,8 @@ 
	| MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED			\

	| MEMBARRIER_CMD_PRIVATE_EXPEDITED				\

	| MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED			\

	| MEMBARRIER_PRIVATE_EXPEDITED_SYNC_CORE_BITMASK)

	| MEMBARRIER_PRIVATE_EXPEDITED_SYNC_CORE_BITMASK		\

	| MEMBARRIER_PRIVATE_EXPEDITED_RSEQ_BITMASK)



static void ipi_mb(void *info)

{