Commit b045b8cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v5.14_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:
 "Two fixes:

   - An objdump checker fix to ignore parenthesized strings in the
     objdump version

   - Fix resctrl default monitoring groups reporting when new subgroups
     get created"

* tag 'x86_urgent_for_v5.14_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Fix default monitoring groups reporting
  x86/tools: Fix objdump version check again
parents 3e763ec7 064855a6

arch/x86/kernel/cpu/resctrl/monitor.c

+13 −14
Original line number Diff line number Diff line
@@ -285,15 +285,14 @@ static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width) 
	return chunks >>= shift;

}



static int __mon_event_count(u32 rmid, struct rmid_read *rr)

static u64 __mon_event_count(u32 rmid, struct rmid_read *rr)

{

	struct mbm_state *m;

	u64 chunks, tval;



	tval = __rmid_read(rmid, rr->evtid);

	if (tval & (RMID_VAL_ERROR | RMID_VAL_UNAVAIL)) {

		rr->val = tval;

		return -EINVAL;

		return tval;

	}

	switch (rr->evtid) {

	case QOS_L3_OCCUP_EVENT_ID:
@@ -305,12 +304,6 @@ static int __mon_event_count(u32 rmid, struct rmid_read *rr) 
	case QOS_L3_MBM_LOCAL_EVENT_ID:

		m = &rr->d->mbm_local[rmid];

		break;

	default:

		/*

		 * Code would never reach here because

		 * an invalid event id would fail the __rmid_read.

		 */

		return -EINVAL;

	}



	if (rr->first) {
@@ -361,23 +354,29 @@ void mon_event_count(void *info) 
	struct rdtgroup *rdtgrp, *entry;

	struct rmid_read *rr = info;

	struct list_head *head;

	u64 ret_val;



	rdtgrp = rr->rgrp;



	if (__mon_event_count(rdtgrp->mon.rmid, rr))

		return;

	ret_val = __mon_event_count(rdtgrp->mon.rmid, rr);



	/*

	 * For Ctrl groups read data from child monitor groups.

	 * For Ctrl groups read data from child monitor groups and

	 * add them together. Count events which are read successfully.

	 * Discard the rmid_read's reporting errors.

	 */

	head = &rdtgrp->mon.crdtgrp_list;



	if (rdtgrp->type == RDTCTRL_GROUP) {

		list_for_each_entry(entry, head, mon.crdtgrp_list) {

			if (__mon_event_count(entry->mon.rmid, rr))

				return;

			if (__mon_event_count(entry->mon.rmid, rr) == 0)

				ret_val = 0;

		}

	}



	/* Report error if none of rmid_reads are successful */

	if (ret_val)

		rr->val = ret_val;

}



/*

arch/x86/tools/chkobjdump.awk

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ BEGIN { 


/^GNU objdump/ {

	verstr = ""

	gsub(/\(.*\)/, "");

	for (i = 3; i <= NF; i++)

		if (match($(i), "^[0-9]")) {

			verstr = $(i);