Unverified Commit 3019c879 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1694 linux-4.19.y bugfixes backport 

Merge Pull Request from: @LiuYongQiang0816 
 
4 patches from cgroup ,net and x86 subsystem 
 
Link:https://gitee.com/openeuler/kernel/pulls/1694

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 111c6eca dc98bfdc

arch/x86/kernel/apic/x2apic_phys.c

+4 −1
Original line number Diff line number Diff line
@@ -94,7 +94,10 @@ static void init_x2apic_ldr(void) 


static int x2apic_phys_probe(void)

{

	if (x2apic_mode && (x2apic_phys || x2apic_fadt_phys()))

	if (!x2apic_mode)

		return 0;



	if (x2apic_phys || x2apic_fadt_phys())

		return 1;



	return apic == &apic_x2apic_phys;

kernel/cgroup/cgroup.c

+17 −3
Original line number Diff line number Diff line
@@ -1657,7 +1657,7 @@ int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask) 
{

	struct cgroup *dcgrp = &dst_root->cgrp;

	struct cgroup_subsys *ss;

	int ssid, i, ret;

	int ssid, ret;

	u16 dfl_disable_ss_mask = 0;



	lockdep_assert_held(&cgroup_mutex);
@@ -1701,7 +1701,8 @@ int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask) 
		struct cgroup_root *src_root = ss->root;

		struct cgroup *scgrp = &src_root->cgrp;

		struct cgroup_subsys_state *css = cgroup_css(scgrp, ss);

		struct css_set *cset;

		struct css_set *cset, *cset_pos;

		struct css_task_iter *it;



		WARN_ON(!css || cgroup_css(dcgrp, ss));
@@ -1719,9 +1720,22 @@ int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask) 
		css->cgroup = dcgrp;



		spin_lock_irq(&css_set_lock);

		hash_for_each(css_set_table, i, cset, hlist)

		WARN_ON(!list_empty(&dcgrp->e_csets[ss->id]));

		list_for_each_entry_safe(cset, cset_pos, &scgrp->e_csets[ss->id],

					 e_cset_node[ss->id]) {

			list_move_tail(&cset->e_cset_node[ss->id],

				       &dcgrp->e_csets[ss->id]);

			/*

			 * all css_sets of scgrp together in same order to dcgrp,

			 * patch in-flight iterators to preserve correct iteration.

			 * since the iterator is always advanced right away and

			 * finished when it->cset_pos meets it->cset_head, so only

			 * update it->cset_head is enough here.

			 */

			list_for_each_entry(it, &cset->task_iters, iters_node)

				if (it->cset_head == &scgrp->e_csets[ss->id])

					it->cset_head = &dcgrp->e_csets[ss->id];

		}

		spin_unlock_irq(&css_set_lock);



		/* default hierarchy doesn't enable controllers by default */

net/sched/sch_netem.c

+28 −33
Original line number Diff line number Diff line
@@ -748,12 +748,10 @@ static void dist_free(struct disttable *d) 
 * signed 16 bit values.

 */



static int get_dist_table(struct Qdisc *sch, struct disttable **tbl,

			  const struct nlattr *attr)

static int get_dist_table(struct disttable **tbl, const struct nlattr *attr)

{

	size_t n = nla_len(attr)/sizeof(__s16);

	const __s16 *data = nla_data(attr);

	spinlock_t *root_lock;

	struct disttable *d;

	int i;
@@ -768,13 +766,7 @@ static int get_dist_table(struct Qdisc *sch, struct disttable **tbl, 
	for (i = 0; i < n; i++)

		d->table[i] = data[i];



	root_lock = qdisc_root_sleeping_lock(sch);



	spin_lock_bh(root_lock);

	swap(*tbl, d);

	spin_unlock_bh(root_lock);



	dist_free(d);

	*tbl = d;

	return 0;

}
@@ -930,6 +922,8 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, 
{

	struct netem_sched_data *q = qdisc_priv(sch);

	struct nlattr *tb[TCA_NETEM_MAX + 1];

	struct disttable *delay_dist = NULL;

	struct disttable *slot_dist = NULL;

	struct tc_netem_qopt *qopt;

	struct clgstate old_clg;

	int old_loss_model = CLG_RANDOM;
@@ -943,6 +937,19 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, 
	if (ret < 0)

		return ret;



	if (tb[TCA_NETEM_DELAY_DIST]) {

		ret = get_dist_table(&delay_dist, tb[TCA_NETEM_DELAY_DIST]);

		if (ret)

			goto table_free;

	}



	if (tb[TCA_NETEM_SLOT_DIST]) {

		ret = get_dist_table(&slot_dist, tb[TCA_NETEM_SLOT_DIST]);

		if (ret)

			goto table_free;

	}



	sch_tree_lock(sch);

	/* backup q->clg and q->loss_model */

	old_clg = q->clg;

	old_loss_model = q->loss_model;
@@ -951,26 +958,17 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, 
		ret = get_loss_clg(q, tb[TCA_NETEM_LOSS]);

		if (ret) {

			q->loss_model = old_loss_model;

			return ret;

			q->clg = old_clg;

			goto unlock;

		}

	} else {

		q->loss_model = CLG_RANDOM;

	}



	if (tb[TCA_NETEM_DELAY_DIST]) {

		ret = get_dist_table(sch, &q->delay_dist,

				     tb[TCA_NETEM_DELAY_DIST]);

		if (ret)

			goto get_table_failure;

	}



	if (tb[TCA_NETEM_SLOT_DIST]) {

		ret = get_dist_table(sch, &q->slot_dist,

				     tb[TCA_NETEM_SLOT_DIST]);

		if (ret)

			goto get_table_failure;

	}



	if (delay_dist)

		swap(q->delay_dist, delay_dist);

	if (slot_dist)

		swap(q->slot_dist, slot_dist);

	sch->limit = qopt->limit;



	q->latency = PSCHED_TICKS2NS(qopt->latency);
@@ -1018,15 +1016,12 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, 
	/* capping jitter to the range acceptable by tabledist() */

	q->jitter = min_t(s64, abs(q->jitter), INT_MAX);



	return ret;

unlock:

	sch_tree_unlock(sch);



get_table_failure:

	/* recover clg and loss_model, in case of

	 * q->clg and q->loss_model were modified

	 * in get_loss_clg()

	 */

	q->clg = old_clg;

	q->loss_model = old_loss_model;

table_free:

	dist_free(delay_dist);

	dist_free(slot_dist);

	return ret;

}