January 2021 - Linux-stable-mirror

FAILED: patch "[PATCH] x86/resctrl: Use an IPI instead of task_work_add() to update" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ae28d1aae48a1258bd09a6f707ebb4231d79a761 Mon Sep 17 00:00:00 2001 From: Fenghua Yu <fenghua.yu(a)intel.com> Date: Thu, 17 Dec 2020 14:31:18 -0800 Subject: [PATCH] x86/resctrl: Use an IPI instead of task_work_add() to update PQR_ASSOC MSR Currently, when moving a task to a resource group the PQR_ASSOC MSR is updated with the new closid and rmid in an added task callback. If the task is running, the work is run as soon as possible. If the task is not running, the work is executed later in the kernel exit path when the kernel returns to the task again. Updating the PQR_ASSOC MSR as soon as possible on the CPU a moved task is running is the right thing to do. Queueing work for a task that is not running is unnecessary (the PQR_ASSOC MSR is already updated when the task is scheduled in) and causing system resource waste with the way in which it is implemented: Work to update the PQR_ASSOC register is queued every time the user writes a task id to the "tasks" file, even if the task already belongs to the resource group. This could result in multiple pending work items associated with a single task even if they are all identical and even though only a single update with most recent values is needed. Specifically, even if a task is moved between different resource groups while it is sleeping then it is only the last move that is relevant but yet a work item is queued during each move. This unnecessary queueing of work items could result in significant system resource waste, especially on tasks sleeping for a long time. For example, as demonstrated by Shakeel Butt in [1] writing the same task id to the "tasks" file can quickly consume significant memory. The same problem (wasted system resources) occurs when moving a task between different resource groups. As pointed out by Valentin Schneider in [2] there is an additional issue with the way in which the queueing of work is done in that the task_struct update is currently done after the work is queued, resulting in a race with the register update possibly done before the data needed by the update is available. To solve these issues, update the PQR_ASSOC MSR in a synchronous way right after the new closid and rmid are ready during the task movement, only if the task is running. If a moved task is not running nothing is done since the PQR_ASSOC MSR will be updated next time the task is scheduled. This is the same way used to update the register when tasks are moved as part of resource group removal. [1] https://lore.kernel.org/lkml/CALvZod7E9zzHwenzf7objzGKsdBmVwTgEJ0nPgs0LUFU3… [2] https://lore.kernel.org/lkml/20201123022433.17905-1-valentin.schneider@arm.… [ bp: Massage commit message and drop the two update_task_closid_rmid() variants. ] Fixes: e02737d5b826 ("x86/intel_rdt: Add tasks files") Reported-by: Shakeel Butt <shakeelb(a)google.com> Reported-by: Valentin Schneider <valentin.schneider(a)arm.com> Signed-off-by: Fenghua Yu <fenghua.yu(a)intel.com> Signed-off-by: Reinette Chatre <reinette.chatre(a)intel.com> Signed-off-by: Borislav Petkov <bp(a)suse.de> Reviewed-by: Tony Luck <tony.luck(a)intel.com> Reviewed-by: James Morse <james.morse(a)arm.com> Reviewed-by: Valentin Schneider <valentin.schneider(a)arm.com> Cc: stable(a)vger.kernel.org Link: https://lkml.kernel.org/r/17aa2fb38fc12ce7bb710106b3e7c7b45acb9e94.16082431… diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 29ffb95b25ff..1c6f8a60ac52 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -525,89 +525,63 @@ static void rdtgroup_remove(struct rdtgroup *rdtgrp) kfree(rdtgrp); } -struct task_move_callback { - struct callback_head work; - struct rdtgroup *rdtgrp; -}; - -static void move_myself(struct callback_head *head) +static void _update_task_closid_rmid(void *task) { - struct task_move_callback *callback; - struct rdtgroup *rdtgrp; - - callback = container_of(head, struct task_move_callback, work); - rdtgrp = callback->rdtgrp; - /* - * If resource group was deleted before this task work callback - * was invoked, then assign the task to root group and free the - * resource group. + * If the task is still current on this CPU, update PQR_ASSOC MSR. + * Otherwise, the MSR is updated when the task is scheduled in. */ - if (atomic_dec_and_test(&rdtgrp->waitcount) && - (rdtgrp->flags & RDT_DELETED)) { - current->closid = 0; - current->rmid = 0; - rdtgroup_remove(rdtgrp); - } - - if (unlikely(current->flags & PF_EXITING)) - goto out; - - preempt_disable(); - /* update PQR_ASSOC MSR to make resource group go into effect */ - resctrl_sched_in(); - preempt_enable(); + if (task == current) + resctrl_sched_in(); +} -out: - kfree(callback); +static void update_task_closid_rmid(struct task_struct *t) +{ + if (IS_ENABLED(CONFIG_SMP) && task_curr(t)) + smp_call_function_single(task_cpu(t), _update_task_closid_rmid, t, 1); + else + _update_task_closid_rmid(t); } static int __rdtgroup_move_task(struct task_struct *tsk, struct rdtgroup *rdtgrp) { - struct task_move_callback *callback; - int ret; - - callback = kzalloc(sizeof(*callback), GFP_KERNEL); - if (!callback) - return -ENOMEM; - callback->work.func = move_myself; - callback->rdtgrp = rdtgrp; - /* - * Take a refcount, so rdtgrp cannot be freed before the - * callback has been invoked. + * Set the task's closid/rmid before the PQR_ASSOC MSR can be + * updated by them. + * + * For ctrl_mon groups, move both closid and rmid. + * For monitor groups, can move the tasks only from + * their parent CTRL group. */ - atomic_inc(&rdtgrp->waitcount); - ret = task_work_add(tsk, &callback->work, TWA_RESUME); - if (ret) { - /* - * Task is exiting. Drop the refcount and free the callback. - * No need to check the refcount as the group cannot be - * deleted before the write function unlocks rdtgroup_mutex. - */ - atomic_dec(&rdtgrp->waitcount); - kfree(callback); - rdt_last_cmd_puts("Task exited\n"); - } else { - /* - * For ctrl_mon groups move both closid and rmid. - * For monitor groups, can move the tasks only from - * their parent CTRL group. - */ - if (rdtgrp->type == RDTCTRL_GROUP) { - tsk->closid = rdtgrp->closid; + + if (rdtgrp->type == RDTCTRL_GROUP) { + tsk->closid = rdtgrp->closid; + tsk->rmid = rdtgrp->mon.rmid; + } else if (rdtgrp->type == RDTMON_GROUP) { + if (rdtgrp->mon.parent->closid == tsk->closid) { tsk->rmid = rdtgrp->mon.rmid; - } else if (rdtgrp->type == RDTMON_GROUP) { - if (rdtgrp->mon.parent->closid == tsk->closid) { - tsk->rmid = rdtgrp->mon.rmid; - } else { - rdt_last_cmd_puts("Can't move task to different control group\n"); - ret = -EINVAL; - } + } else { + rdt_last_cmd_puts("Can't move task to different control group\n"); + return -EINVAL; } } - return ret; + + /* + * Ensure the task's closid and rmid are written before determining if + * the task is current that will decide if it will be interrupted. + */ + barrier(); + + /* + * By now, the task's closid and rmid are set. If the task is current + * on a CPU, the PQR_ASSOC MSR needs to be updated to make the resource + * group go into effect. If the task is not current, the MSR will be + * updated when the task is scheduled in. + */ + update_task_closid_rmid(tsk); + + return 0; } static bool is_closid_match(struct task_struct *t, struct rdtgroup *r)

4 years, 3 months

2
2
0 0

FAILED: patch "[PATCH] x86/resctrl: Use an IPI instead of task_work_add() to update" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ae28d1aae48a1258bd09a6f707ebb4231d79a761 Mon Sep 17 00:00:00 2001 From: Fenghua Yu <fenghua.yu(a)intel.com> Date: Thu, 17 Dec 2020 14:31:18 -0800 Subject: [PATCH] x86/resctrl: Use an IPI instead of task_work_add() to update PQR_ASSOC MSR Currently, when moving a task to a resource group the PQR_ASSOC MSR is updated with the new closid and rmid in an added task callback. If the task is running, the work is run as soon as possible. If the task is not running, the work is executed later in the kernel exit path when the kernel returns to the task again. Updating the PQR_ASSOC MSR as soon as possible on the CPU a moved task is running is the right thing to do. Queueing work for a task that is not running is unnecessary (the PQR_ASSOC MSR is already updated when the task is scheduled in) and causing system resource waste with the way in which it is implemented: Work to update the PQR_ASSOC register is queued every time the user writes a task id to the "tasks" file, even if the task already belongs to the resource group. This could result in multiple pending work items associated with a single task even if they are all identical and even though only a single update with most recent values is needed. Specifically, even if a task is moved between different resource groups while it is sleeping then it is only the last move that is relevant but yet a work item is queued during each move. This unnecessary queueing of work items could result in significant system resource waste, especially on tasks sleeping for a long time. For example, as demonstrated by Shakeel Butt in [1] writing the same task id to the "tasks" file can quickly consume significant memory. The same problem (wasted system resources) occurs when moving a task between different resource groups. As pointed out by Valentin Schneider in [2] there is an additional issue with the way in which the queueing of work is done in that the task_struct update is currently done after the work is queued, resulting in a race with the register update possibly done before the data needed by the update is available. To solve these issues, update the PQR_ASSOC MSR in a synchronous way right after the new closid and rmid are ready during the task movement, only if the task is running. If a moved task is not running nothing is done since the PQR_ASSOC MSR will be updated next time the task is scheduled. This is the same way used to update the register when tasks are moved as part of resource group removal. [1] https://lore.kernel.org/lkml/CALvZod7E9zzHwenzf7objzGKsdBmVwTgEJ0nPgs0LUFU3… [2] https://lore.kernel.org/lkml/20201123022433.17905-1-valentin.schneider@arm.… [ bp: Massage commit message and drop the two update_task_closid_rmid() variants. ] Fixes: e02737d5b826 ("x86/intel_rdt: Add tasks files") Reported-by: Shakeel Butt <shakeelb(a)google.com> Reported-by: Valentin Schneider <valentin.schneider(a)arm.com> Signed-off-by: Fenghua Yu <fenghua.yu(a)intel.com> Signed-off-by: Reinette Chatre <reinette.chatre(a)intel.com> Signed-off-by: Borislav Petkov <bp(a)suse.de> Reviewed-by: Tony Luck <tony.luck(a)intel.com> Reviewed-by: James Morse <james.morse(a)arm.com> Reviewed-by: Valentin Schneider <valentin.schneider(a)arm.com> Cc: stable(a)vger.kernel.org Link: https://lkml.kernel.org/r/17aa2fb38fc12ce7bb710106b3e7c7b45acb9e94.16082431… diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 29ffb95b25ff..1c6f8a60ac52 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -525,89 +525,63 @@ static void rdtgroup_remove(struct rdtgroup *rdtgrp) kfree(rdtgrp); } -struct task_move_callback { - struct callback_head work; - struct rdtgroup *rdtgrp; -}; - -static void move_myself(struct callback_head *head) +static void _update_task_closid_rmid(void *task) { - struct task_move_callback *callback; - struct rdtgroup *rdtgrp; - - callback = container_of(head, struct task_move_callback, work); - rdtgrp = callback->rdtgrp; - /* - * If resource group was deleted before this task work callback - * was invoked, then assign the task to root group and free the - * resource group. + * If the task is still current on this CPU, update PQR_ASSOC MSR. + * Otherwise, the MSR is updated when the task is scheduled in. */ - if (atomic_dec_and_test(&rdtgrp->waitcount) && - (rdtgrp->flags & RDT_DELETED)) { - current->closid = 0; - current->rmid = 0; - rdtgroup_remove(rdtgrp); - } - - if (unlikely(current->flags & PF_EXITING)) - goto out; - - preempt_disable(); - /* update PQR_ASSOC MSR to make resource group go into effect */ - resctrl_sched_in(); - preempt_enable(); + if (task == current) + resctrl_sched_in(); +} -out: - kfree(callback); +static void update_task_closid_rmid(struct task_struct *t) +{ + if (IS_ENABLED(CONFIG_SMP) && task_curr(t)) + smp_call_function_single(task_cpu(t), _update_task_closid_rmid, t, 1); + else + _update_task_closid_rmid(t); } static int __rdtgroup_move_task(struct task_struct *tsk, struct rdtgroup *rdtgrp) { - struct task_move_callback *callback; - int ret; - - callback = kzalloc(sizeof(*callback), GFP_KERNEL); - if (!callback) - return -ENOMEM; - callback->work.func = move_myself; - callback->rdtgrp = rdtgrp; - /* - * Take a refcount, so rdtgrp cannot be freed before the - * callback has been invoked. + * Set the task's closid/rmid before the PQR_ASSOC MSR can be + * updated by them. + * + * For ctrl_mon groups, move both closid and rmid. + * For monitor groups, can move the tasks only from + * their parent CTRL group. */ - atomic_inc(&rdtgrp->waitcount); - ret = task_work_add(tsk, &callback->work, TWA_RESUME); - if (ret) { - /* - * Task is exiting. Drop the refcount and free the callback. - * No need to check the refcount as the group cannot be - * deleted before the write function unlocks rdtgroup_mutex. - */ - atomic_dec(&rdtgrp->waitcount); - kfree(callback); - rdt_last_cmd_puts("Task exited\n"); - } else { - /* - * For ctrl_mon groups move both closid and rmid. - * For monitor groups, can move the tasks only from - * their parent CTRL group. - */ - if (rdtgrp->type == RDTCTRL_GROUP) { - tsk->closid = rdtgrp->closid; + + if (rdtgrp->type == RDTCTRL_GROUP) { + tsk->closid = rdtgrp->closid; + tsk->rmid = rdtgrp->mon.rmid; + } else if (rdtgrp->type == RDTMON_GROUP) { + if (rdtgrp->mon.parent->closid == tsk->closid) { tsk->rmid = rdtgrp->mon.rmid; - } else if (rdtgrp->type == RDTMON_GROUP) { - if (rdtgrp->mon.parent->closid == tsk->closid) { - tsk->rmid = rdtgrp->mon.rmid; - } else { - rdt_last_cmd_puts("Can't move task to different control group\n"); - ret = -EINVAL; - } + } else { + rdt_last_cmd_puts("Can't move task to different control group\n"); + return -EINVAL; } } - return ret; + + /* + * Ensure the task's closid and rmid are written before determining if + * the task is current that will decide if it will be interrupted. + */ + barrier(); + + /* + * By now, the task's closid and rmid are set. If the task is current + * on a CPU, the PQR_ASSOC MSR needs to be updated to make the resource + * group go into effect. If the task is not current, the MSR will be + * updated when the task is scheduled in. + */ + update_task_closid_rmid(tsk); + + return 0; } static bool is_closid_match(struct task_struct *t, struct rdtgroup *r)

4 years, 3 months

2
2
0 0

FAILED: patch "[PATCH] x86/resctrl: Use an IPI instead of task_work_add() to update" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ae28d1aae48a1258bd09a6f707ebb4231d79a761 Mon Sep 17 00:00:00 2001 From: Fenghua Yu <fenghua.yu(a)intel.com> Date: Thu, 17 Dec 2020 14:31:18 -0800 Subject: [PATCH] x86/resctrl: Use an IPI instead of task_work_add() to update PQR_ASSOC MSR Currently, when moving a task to a resource group the PQR_ASSOC MSR is updated with the new closid and rmid in an added task callback. If the task is running, the work is run as soon as possible. If the task is not running, the work is executed later in the kernel exit path when the kernel returns to the task again. Updating the PQR_ASSOC MSR as soon as possible on the CPU a moved task is running is the right thing to do. Queueing work for a task that is not running is unnecessary (the PQR_ASSOC MSR is already updated when the task is scheduled in) and causing system resource waste with the way in which it is implemented: Work to update the PQR_ASSOC register is queued every time the user writes a task id to the "tasks" file, even if the task already belongs to the resource group. This could result in multiple pending work items associated with a single task even if they are all identical and even though only a single update with most recent values is needed. Specifically, even if a task is moved between different resource groups while it is sleeping then it is only the last move that is relevant but yet a work item is queued during each move. This unnecessary queueing of work items could result in significant system resource waste, especially on tasks sleeping for a long time. For example, as demonstrated by Shakeel Butt in [1] writing the same task id to the "tasks" file can quickly consume significant memory. The same problem (wasted system resources) occurs when moving a task between different resource groups. As pointed out by Valentin Schneider in [2] there is an additional issue with the way in which the queueing of work is done in that the task_struct update is currently done after the work is queued, resulting in a race with the register update possibly done before the data needed by the update is available. To solve these issues, update the PQR_ASSOC MSR in a synchronous way right after the new closid and rmid are ready during the task movement, only if the task is running. If a moved task is not running nothing is done since the PQR_ASSOC MSR will be updated next time the task is scheduled. This is the same way used to update the register when tasks are moved as part of resource group removal. [1] https://lore.kernel.org/lkml/CALvZod7E9zzHwenzf7objzGKsdBmVwTgEJ0nPgs0LUFU3… [2] https://lore.kernel.org/lkml/20201123022433.17905-1-valentin.schneider@arm.… [ bp: Massage commit message and drop the two update_task_closid_rmid() variants. ] Fixes: e02737d5b826 ("x86/intel_rdt: Add tasks files") Reported-by: Shakeel Butt <shakeelb(a)google.com> Reported-by: Valentin Schneider <valentin.schneider(a)arm.com> Signed-off-by: Fenghua Yu <fenghua.yu(a)intel.com> Signed-off-by: Reinette Chatre <reinette.chatre(a)intel.com> Signed-off-by: Borislav Petkov <bp(a)suse.de> Reviewed-by: Tony Luck <tony.luck(a)intel.com> Reviewed-by: James Morse <james.morse(a)arm.com> Reviewed-by: Valentin Schneider <valentin.schneider(a)arm.com> Cc: stable(a)vger.kernel.org Link: https://lkml.kernel.org/r/17aa2fb38fc12ce7bb710106b3e7c7b45acb9e94.16082431… diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 29ffb95b25ff..1c6f8a60ac52 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -525,89 +525,63 @@ static void rdtgroup_remove(struct rdtgroup *rdtgrp) kfree(rdtgrp); } -struct task_move_callback { - struct callback_head work; - struct rdtgroup *rdtgrp; -}; - -static void move_myself(struct callback_head *head) +static void _update_task_closid_rmid(void *task) { - struct task_move_callback *callback; - struct rdtgroup *rdtgrp; - - callback = container_of(head, struct task_move_callback, work); - rdtgrp = callback->rdtgrp; - /* - * If resource group was deleted before this task work callback - * was invoked, then assign the task to root group and free the - * resource group. + * If the task is still current on this CPU, update PQR_ASSOC MSR. + * Otherwise, the MSR is updated when the task is scheduled in. */ - if (atomic_dec_and_test(&rdtgrp->waitcount) && - (rdtgrp->flags & RDT_DELETED)) { - current->closid = 0; - current->rmid = 0; - rdtgroup_remove(rdtgrp); - } - - if (unlikely(current->flags & PF_EXITING)) - goto out; - - preempt_disable(); - /* update PQR_ASSOC MSR to make resource group go into effect */ - resctrl_sched_in(); - preempt_enable(); + if (task == current) + resctrl_sched_in(); +} -out: - kfree(callback); +static void update_task_closid_rmid(struct task_struct *t) +{ + if (IS_ENABLED(CONFIG_SMP) && task_curr(t)) + smp_call_function_single(task_cpu(t), _update_task_closid_rmid, t, 1); + else + _update_task_closid_rmid(t); } static int __rdtgroup_move_task(struct task_struct *tsk, struct rdtgroup *rdtgrp) { - struct task_move_callback *callback; - int ret; - - callback = kzalloc(sizeof(*callback), GFP_KERNEL); - if (!callback) - return -ENOMEM; - callback->work.func = move_myself; - callback->rdtgrp = rdtgrp; - /* - * Take a refcount, so rdtgrp cannot be freed before the - * callback has been invoked. + * Set the task's closid/rmid before the PQR_ASSOC MSR can be + * updated by them. + * + * For ctrl_mon groups, move both closid and rmid. + * For monitor groups, can move the tasks only from + * their parent CTRL group. */ - atomic_inc(&rdtgrp->waitcount); - ret = task_work_add(tsk, &callback->work, TWA_RESUME); - if (ret) { - /* - * Task is exiting. Drop the refcount and free the callback. - * No need to check the refcount as the group cannot be - * deleted before the write function unlocks rdtgroup_mutex. - */ - atomic_dec(&rdtgrp->waitcount); - kfree(callback); - rdt_last_cmd_puts("Task exited\n"); - } else { - /* - * For ctrl_mon groups move both closid and rmid. - * For monitor groups, can move the tasks only from - * their parent CTRL group. - */ - if (rdtgrp->type == RDTCTRL_GROUP) { - tsk->closid = rdtgrp->closid; + + if (rdtgrp->type == RDTCTRL_GROUP) { + tsk->closid = rdtgrp->closid; + tsk->rmid = rdtgrp->mon.rmid; + } else if (rdtgrp->type == RDTMON_GROUP) { + if (rdtgrp->mon.parent->closid == tsk->closid) { tsk->rmid = rdtgrp->mon.rmid; - } else if (rdtgrp->type == RDTMON_GROUP) { - if (rdtgrp->mon.parent->closid == tsk->closid) { - tsk->rmid = rdtgrp->mon.rmid; - } else { - rdt_last_cmd_puts("Can't move task to different control group\n"); - ret = -EINVAL; - } + } else { + rdt_last_cmd_puts("Can't move task to different control group\n"); + return -EINVAL; } } - return ret; + + /* + * Ensure the task's closid and rmid are written before determining if + * the task is current that will decide if it will be interrupted. + */ + barrier(); + + /* + * By now, the task's closid and rmid are set. If the task is current + * on a CPU, the PQR_ASSOC MSR needs to be updated to make the resource + * group go into effect. If the task is not current, the MSR will be + * updated when the task is scheduled in. + */ + update_task_closid_rmid(tsk); + + return 0; } static bool is_closid_match(struct task_struct *t, struct rdtgroup *r)

4 years, 3 months

2
2
0 0

[PATCH 01/11] drm/i915/gt: Limit VFE threads based on GT

by Chris Wilson

MEDIA_STATE_VFE only accepts the 'maximum number of threads' in the range [0, n-1] where n is #EU * (#threads/EU) with the number of threads based on plaform and the number of EU based on the number of slices and subslices. This is a fixed number per platform/gt, so appropriately limit the number of threads we spawn to match the device. v2: Oversaturate the system with tasks to force execution on every HW thread; if the thread idles it is returned to the pool and may be reused again before an unused thread. v3: Fix more state commands, which was causing Baytrail to barf. v4: STATE_CACHE_INVALIDATE requires a stall on Ivybridge Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2024 Fixes: 47f8253d2b89 ("drm/i915/gen7: Clear all EU/L3 residual contexts") Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala(a)linux.intel.com> Cc: Prathap Kumar Valsan <prathap.kumar.valsan(a)intel.com> Cc: Akeem G Abodunrin <akeem.g.abodunrin(a)intel.com> Cc: Jon Bloomfield <jon.bloomfield(a)intel.com> Cc: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Cc: Randy Wright <rwright(a)hpe.com> Cc: stable(a)vger.kernel.org # v5.7+ --- drivers/gpu/drm/i915/gt/gen7_renderclear.c | 157 ++++++++++++--------- 1 file changed, 94 insertions(+), 63 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/gen7_renderclear.c b/drivers/gpu/drm/i915/gt/gen7_renderclear.c index d93d85cd3027..f32a8e8040b2 100644 --- a/drivers/gpu/drm/i915/gt/gen7_renderclear.c +++ b/drivers/gpu/drm/i915/gt/gen7_renderclear.c @@ -7,8 +7,6 @@ #include "i915_drv.h" #include "intel_gpu_commands.h" -#define MAX_URB_ENTRIES 64 -#define STATE_SIZE (4 * 1024) #define GT3_INLINE_DATA_DELAYS 0x1E00 #define batch_advance(Y, CS) GEM_BUG_ON((Y)->end != (CS)) @@ -34,38 +32,59 @@ struct batch_chunk { }; struct batch_vals { - u32 max_primitives; - u32 max_urb_entries; - u32 cmd_size; - u32 state_size; + u32 max_threads; u32 state_start; - u32 batch_size; + u32 surface_start; u32 surface_height; u32 surface_width; - u32 scratch_size; - u32 max_size; + u32 size; }; +static inline int num_primitives(const struct batch_vals *bv) +{ + /* + * We need to saturate the GPU with work in order to dispatch + * a shader on every HW thread, and clear the thread-local registers. + * In short, we have to dispatch work faster than the shaders can + * run in order to fill occupy each HW thread. + */ + return bv->max_threads; +} + static void batch_get_defaults(struct drm_i915_private *i915, struct batch_vals *bv) { if (IS_HASWELL(i915)) { - bv->max_primitives = 280; - bv->max_urb_entries = MAX_URB_ENTRIES; + switch (INTEL_INFO(i915)->gt) { + default: + case 1: + bv->max_threads = 70; + break; + case 2: + bv->max_threads = 140; + break; + case 3: + bv->max_threads = 280; + break; + } bv->surface_height = 16 * 16; bv->surface_width = 32 * 2 * 16; } else { - bv->max_primitives = 128; - bv->max_urb_entries = MAX_URB_ENTRIES / 2; + switch (INTEL_INFO(i915)->gt) { + default: + case 1: /* including vlv */ + bv->max_threads = 36; + break; + case 2: + bv->max_threads = 128; + break; + } bv->surface_height = 16 * 8; bv->surface_width = 32 * 16; } - bv->cmd_size = bv->max_primitives * 4096; - bv->state_size = STATE_SIZE; - bv->state_start = bv->cmd_size; - bv->batch_size = bv->cmd_size + bv->state_size; - bv->scratch_size = bv->surface_height * bv->surface_width; - bv->max_size = bv->batch_size + bv->scratch_size; + bv->state_start = round_up(SZ_1K + num_primitives(bv) * 64, SZ_4K); + bv->surface_start = bv->state_start + SZ_4K; + bv->size = bv->surface_start + bv->surface_height * bv->surface_width; } static void batch_init(struct batch_chunk *bc, @@ -155,7 +174,8 @@ static u32 gen7_fill_binding_table(struct batch_chunk *state, const struct batch_vals *bv) { - u32 surface_start = gen7_fill_surface_state(state, bv->batch_size, bv); + u32 surface_start = + gen7_fill_surface_state(state, bv->surface_start, bv); u32 *cs = batch_alloc_items(state, 32, 8); u32 offset = batch_offset(state, cs); @@ -214,9 +234,9 @@ static void gen7_emit_state_base_address(struct batch_chunk *batch, u32 surface_state_base) { - u32 *cs = batch_alloc_items(batch, 0, 12); + u32 *cs = batch_alloc_items(batch, 0, 10); - *cs++ = STATE_BASE_ADDRESS | (12 - 2); + *cs++ = STATE_BASE_ADDRESS | (10 - 2); /* general */ *cs++ = batch_addr(batch) | BASE_ADDRESS_MODIFY; /* surface */ @@ -233,8 +253,6 @@ gen7_emit_state_base_address(struct batch_chunk *batch, *cs++ = BASE_ADDRESS_MODIFY; *cs++ = 0; *cs++ = BASE_ADDRESS_MODIFY; - *cs++ = 0; - *cs++ = 0; batch_advance(batch, cs); } @@ -244,8 +262,7 @@ gen7_emit_vfe_state(struct batch_chunk *batch, u32 urb_size, u32 curbe_size, u32 mode) { - u32 urb_entries = bv->max_urb_entries; - u32 threads = bv->max_primitives - 1; + u32 threads = bv->max_threads - 1; u32 *cs = batch_alloc_items(batch, 32, 8); *cs++ = MEDIA_VFE_STATE | (8 - 2); @@ -254,7 +271,7 @@ gen7_emit_vfe_state(struct batch_chunk *batch, *cs++ = 0; /* number of threads & urb entries for GPGPU vs Media Mode */ - *cs++ = threads << 16 | urb_entries << 8 | mode << 2; + *cs++ = threads << 16 | 1 << 8 | mode << 2; *cs++ = 0; @@ -293,17 +310,12 @@ gen7_emit_media_object(struct batch_chunk *batch, { unsigned int x_offset = (media_object_index % 16) * 64; unsigned int y_offset = (media_object_index / 16) * 16; - unsigned int inline_data_size; - unsigned int media_batch_size; - unsigned int i; + unsigned int pkt = 6 + 3; u32 *cs; - inline_data_size = 112 * 8; - media_batch_size = inline_data_size + 6; + cs = batch_alloc_items(batch, 8, pkt); - cs = batch_alloc_items(batch, 8, media_batch_size); - - *cs++ = MEDIA_OBJECT | (media_batch_size - 2); + *cs++ = MEDIA_OBJECT | (pkt - 2); /* interface descriptor offset */ *cs++ = 0; @@ -317,25 +329,44 @@ gen7_emit_media_object(struct batch_chunk *batch, *cs++ = 0; /* inline */ - *cs++ = (y_offset << 16) | (x_offset); + *cs++ = y_offset << 16 | x_offset; *cs++ = 0; *cs++ = GT3_INLINE_DATA_DELAYS; - for (i = 3; i < inline_data_size; i++) - *cs++ = 0; batch_advance(batch, cs); } static void gen7_emit_pipeline_flush(struct batch_chunk *batch) { - u32 *cs = batch_alloc_items(batch, 0, 5); + u32 *cs = batch_alloc_items(batch, 0, 4); - *cs++ = GFX_OP_PIPE_CONTROL(5); - *cs++ = PIPE_CONTROL_STATE_CACHE_INVALIDATE | - PIPE_CONTROL_GLOBAL_GTT_IVB; + *cs++ = GFX_OP_PIPE_CONTROL(4); + *cs++ = PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH | + PIPE_CONTROL_DEPTH_CACHE_FLUSH | + PIPE_CONTROL_DC_FLUSH_ENABLE | + PIPE_CONTROL_CS_STALL; *cs++ = 0; *cs++ = 0; + + batch_advance(batch, cs); +} + +static void gen7_emit_pipeline_invalidate(struct batch_chunk *batch) +{ + u32 *cs = batch_alloc_items(batch, 0, 8); + + /* ivb: Stall before STATE_CACHE_INVALIDATE */ + *cs++ = GFX_OP_PIPE_CONTROL(4); + *cs++ = PIPE_CONTROL_STALL_AT_SCOREBOARD | + PIPE_CONTROL_CS_STALL; *cs++ = 0; + *cs++ = 0; + + *cs++ = GFX_OP_PIPE_CONTROL(4); + *cs++ = PIPE_CONTROL_STATE_CACHE_INVALIDATE; + *cs++ = 0; + *cs++ = 0; + batch_advance(batch, cs); } @@ -344,34 +375,34 @@ static void emit_batch(struct i915_vma * const vma, const struct batch_vals *bv) { struct drm_i915_private *i915 = vma->vm->i915; - unsigned int desc_count = 64; - const u32 urb_size = 112; + const unsigned int desc_count = 1; + const unsigned int urb_size = 1; struct batch_chunk cmds, state; - u32 interface_descriptor; + u32 descriptors; unsigned int i; - batch_init(&cmds, vma, start, 0, bv->cmd_size); - batch_init(&state, vma, start, bv->state_start, bv->state_size); + batch_init(&cmds, vma, start, 0, bv->state_start); + batch_init(&state, vma, start, bv->state_start, SZ_4K); - interface_descriptor = - gen7_fill_interface_descriptor(&state, bv, - IS_HASWELL(i915) ? - &cb_kernel_hsw : - &cb_kernel_ivb, - desc_count); - gen7_emit_pipeline_flush(&cmds); + descriptors = gen7_fill_interface_descriptor(&state, bv, + IS_HASWELL(i915) ? + &cb_kernel_hsw : + &cb_kernel_ivb, + desc_count); + + gen7_emit_pipeline_invalidate(&cmds); batch_add(&cmds, PIPELINE_SELECT | PIPELINE_SELECT_MEDIA); batch_add(&cmds, MI_NOOP); - gen7_emit_state_base_address(&cmds, interface_descriptor); + gen7_emit_pipeline_invalidate(&cmds); + gen7_emit_pipeline_flush(&cmds); + gen7_emit_state_base_address(&cmds, descriptors); + gen7_emit_pipeline_invalidate(&cmds); gen7_emit_vfe_state(&cmds, bv, urb_size - 1, 0, 0); + gen7_emit_interface_descriptor_load(&cmds, descriptors, desc_count); - gen7_emit_interface_descriptor_load(&cmds, - interface_descriptor, - desc_count); - - for (i = 0; i < bv->max_primitives; i++) + for (i = 0; i < num_primitives(bv); i++) gen7_emit_media_object(&cmds, i); batch_add(&cmds, MI_BATCH_BUFFER_END); @@ -385,15 +416,15 @@ int gen7_setup_clear_gpr_bb(struct intel_engine_cs * const engine, batch_get_defaults(engine->i915, &bv); if (!vma) - return bv.max_size; + return bv.size; - GEM_BUG_ON(vma->obj->base.size < bv.max_size); + GEM_BUG_ON(vma->obj->base.size < bv.size); batch = i915_gem_object_pin_map(vma->obj, I915_MAP_WC); if (IS_ERR(batch)) return PTR_ERR(batch); - emit_batch(vma, memset(batch, 0, bv.max_size), &bv); + emit_batch(vma, memset(batch, 0, bv.size), &bv); i915_gem_object_flush_map(vma->obj); __i915_gem_object_release_map(vma->obj); -- 2.20.1

4 years, 3 months

4
7
0 0

FAILED: patch "[PATCH] spi: pxa2xx: Fix use-after-free on unbind" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5626308bb94d9f930aa5f7c77327df4c6daa7759 Mon Sep 17 00:00:00 2001 From: Lukas Wunner <lukas(a)wunner.de> Date: Mon, 7 Dec 2020 09:17:05 +0100 Subject: [PATCH] spi: pxa2xx: Fix use-after-free on unbind pxa2xx_spi_remove() accesses the driver's private data after calling spi_unregister_controller() even though that function releases the last reference on the spi_controller and thereby frees the private data. Fix by switching over to the new devm_spi_alloc_master/slave() helper which keeps the private data accessible until the driver has unbound. Fixes: 32e5b57232c0 ("spi: pxa2xx: Fix controller unregister order") Signed-off-by: Lukas Wunner <lukas(a)wunner.de> Cc: <stable(a)vger.kernel.org> # v2.6.17+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation Cc: <stable(a)vger.kernel.org> # v2.6.17+: 32e5b57232c0: spi: pxa2xx: Fix controller unregister order Cc: <stable(a)vger.kernel.org> # v2.6.17+ Link: https://lore.kernel.org/r/5764b04d4a6e43069ebb7808f64c2f774ac6f193.16072868… Signed-off-by: Mark Brown <broonie(a)kernel.org> diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 62a0f0f86553..bd2354fd438d 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1691,9 +1691,9 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) } if (platform_info->is_slave) - controller = spi_alloc_slave(dev, sizeof(struct driver_data)); + controller = devm_spi_alloc_slave(dev, sizeof(*drv_data)); else - controller = spi_alloc_master(dev, sizeof(struct driver_data)); + controller = devm_spi_alloc_master(dev, sizeof(*drv_data)); if (!controller) { dev_err(&pdev->dev, "cannot alloc spi_controller\n"); @@ -1916,7 +1916,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) free_irq(ssp->irq, drv_data); out_error_controller_alloc: - spi_controller_put(controller); pxa_ssp_free(ssp); return status; }

4 years, 3 months

2
1
0 0

[PATCH 1/3] drm/i915/gt: Limit VFE threads based on GT

by Chris Wilson

MEDIA_STATE_VFE only accepts the 'maximum number of threads' in the range [0, n-1] where n is #EU * (#threads/EU) with the number of threads based on plaform and the number of EU based on the number of slices and subslices. This is a fixed number per platform/gt, so appropriately limit the number of threads we spawn to match the device. v2: Oversaturate the system with tasks to force execution on every HW thread; if the thread idles it is returned to the pool and may be reused again before an unused thread. Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2024 Fixes: 47f8253d2b89 ("drm/i915/gen7: Clear all EU/L3 residual contexts") Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala(a)linux.intel.com> Cc: Prathap Kumar Valsan <prathap.kumar.valsan(a)intel.com> Cc: Akeem G Abodunrin <akeem.g.abodunrin(a)intel.com> Cc: Jon Bloomfield <jon.bloomfield(a)intel.com> Cc: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Cc: Randy Wright <rwright(a)hpe.com> Cc: stable(a)vger.kernel.org # v5.7+ --- drivers/gpu/drm/i915/gt/gen7_renderclear.c | 91 ++++++++++++---------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/gen7_renderclear.c b/drivers/gpu/drm/i915/gt/gen7_renderclear.c index d93d85cd3027..3ea7c9cc0f3d 100644 --- a/drivers/gpu/drm/i915/gt/gen7_renderclear.c +++ b/drivers/gpu/drm/i915/gt/gen7_renderclear.c @@ -7,8 +7,6 @@ #include "i915_drv.h" #include "intel_gpu_commands.h" -#define MAX_URB_ENTRIES 64 -#define STATE_SIZE (4 * 1024) #define GT3_INLINE_DATA_DELAYS 0x1E00 #define batch_advance(Y, CS) GEM_BUG_ON((Y)->end != (CS)) @@ -34,38 +32,57 @@ struct batch_chunk { }; struct batch_vals { - u32 max_primitives; - u32 max_urb_entries; - u32 cmd_size; - u32 state_size; + u32 max_threads; u32 state_start; - u32 batch_size; + u32 surface_start; u32 surface_height; u32 surface_width; - u32 scratch_size; - u32 max_size; + u32 size; }; +static inline int num_primitives(const struct batch_vals *bv) +{ + /* + * We need to oversaturate the GPU with work in order to dispatch + * a shader on every HW thread. + */ + return bv->max_threads + 2; +} + static void batch_get_defaults(struct drm_i915_private *i915, struct batch_vals *bv) { if (IS_HASWELL(i915)) { - bv->max_primitives = 280; - bv->max_urb_entries = MAX_URB_ENTRIES; + switch (INTEL_INFO(i915)->gt) { + default: + case 1: + bv->max_threads = 70; + break; + case 2: + bv->max_threads = 140; + break; + case 3: + bv->max_threads = 280; + break; + } bv->surface_height = 16 * 16; bv->surface_width = 32 * 2 * 16; } else { - bv->max_primitives = 128; - bv->max_urb_entries = MAX_URB_ENTRIES / 2; + switch (INTEL_INFO(i915)->gt) { + default: + case 1: /* including vlv */ + bv->max_threads = 36; + break; + case 2: + bv->max_threads = 128; + break; + } bv->surface_height = 16 * 8; bv->surface_width = 32 * 16; } - bv->cmd_size = bv->max_primitives * 4096; - bv->state_size = STATE_SIZE; - bv->state_start = bv->cmd_size; - bv->batch_size = bv->cmd_size + bv->state_size; - bv->scratch_size = bv->surface_height * bv->surface_width; - bv->max_size = bv->batch_size + bv->scratch_size; + bv->state_start = round_up(SZ_1K + num_primitives(bv) * 64, SZ_4K); + bv->surface_start = bv->state_start + SZ_4K; + bv->size = bv->surface_start + bv->surface_height * bv->surface_width; } static void batch_init(struct batch_chunk *bc, @@ -155,7 +172,8 @@ static u32 gen7_fill_binding_table(struct batch_chunk *state, const struct batch_vals *bv) { - u32 surface_start = gen7_fill_surface_state(state, bv->batch_size, bv); + u32 surface_start = + gen7_fill_surface_state(state, bv->surface_start, bv); u32 *cs = batch_alloc_items(state, 32, 8); u32 offset = batch_offset(state, cs); @@ -244,8 +262,7 @@ gen7_emit_vfe_state(struct batch_chunk *batch, u32 urb_size, u32 curbe_size, u32 mode) { - u32 urb_entries = bv->max_urb_entries; - u32 threads = bv->max_primitives - 1; + u32 threads = bv->max_threads - 1; u32 *cs = batch_alloc_items(batch, 32, 8); *cs++ = MEDIA_VFE_STATE | (8 - 2); @@ -254,7 +271,7 @@ gen7_emit_vfe_state(struct batch_chunk *batch, *cs++ = 0; /* number of threads & urb entries for GPGPU vs Media Mode */ - *cs++ = threads << 16 | urb_entries << 8 | mode << 2; + *cs++ = threads << 16 | 1 << 8 | mode << 2; *cs++ = 0; @@ -293,17 +310,12 @@ gen7_emit_media_object(struct batch_chunk *batch, { unsigned int x_offset = (media_object_index % 16) * 64; unsigned int y_offset = (media_object_index / 16) * 16; - unsigned int inline_data_size; - unsigned int media_batch_size; - unsigned int i; + unsigned int pkt = 6 + 3; u32 *cs; - inline_data_size = 112 * 8; - media_batch_size = inline_data_size + 6; + cs = batch_alloc_items(batch, 8, pkt); - cs = batch_alloc_items(batch, 8, media_batch_size); - - *cs++ = MEDIA_OBJECT | (media_batch_size - 2); + *cs++ = MEDIA_OBJECT | (pkt - 2); /* interface descriptor offset */ *cs++ = 0; @@ -320,8 +332,6 @@ gen7_emit_media_object(struct batch_chunk *batch, *cs++ = (y_offset << 16) | (x_offset); *cs++ = 0; *cs++ = GT3_INLINE_DATA_DELAYS; - for (i = 3; i < inline_data_size; i++) - *cs++ = 0; batch_advance(batch, cs); } @@ -350,8 +360,8 @@ static void emit_batch(struct i915_vma * const vma, u32 interface_descriptor; unsigned int i; - batch_init(&cmds, vma, start, 0, bv->cmd_size); - batch_init(&state, vma, start, bv->state_start, bv->state_size); + batch_init(&cmds, vma, start, 0, bv->state_start); + batch_init(&state, vma, start, bv->state_start, SZ_4K); interface_descriptor = gen7_fill_interface_descriptor(&state, bv, @@ -359,19 +369,16 @@ static void emit_batch(struct i915_vma * const vma, &cb_kernel_hsw : &cb_kernel_ivb, desc_count); - gen7_emit_pipeline_flush(&cmds); batch_add(&cmds, PIPELINE_SELECT | PIPELINE_SELECT_MEDIA); - batch_add(&cmds, MI_NOOP); gen7_emit_state_base_address(&cmds, interface_descriptor); gen7_emit_pipeline_flush(&cmds); gen7_emit_vfe_state(&cmds, bv, urb_size - 1, 0, 0); - gen7_emit_interface_descriptor_load(&cmds, interface_descriptor, desc_count); - for (i = 0; i < bv->max_primitives; i++) + for (i = 0; i < num_primitives(bv); i++) gen7_emit_media_object(&cmds, i); batch_add(&cmds, MI_BATCH_BUFFER_END); @@ -385,15 +392,15 @@ int gen7_setup_clear_gpr_bb(struct intel_engine_cs * const engine, batch_get_defaults(engine->i915, &bv); if (!vma) - return bv.max_size; + return bv.size; - GEM_BUG_ON(vma->obj->base.size < bv.max_size); + GEM_BUG_ON(vma->obj->base.size < bv.size); batch = i915_gem_object_pin_map(vma->obj, I915_MAP_WC); if (IS_ERR(batch)) return PTR_ERR(batch); - emit_batch(vma, memset(batch, 0, bv.max_size), &bv); + emit_batch(vma, memset(batch, 0, bv.size), &bv); i915_gem_object_flush_map(vma->obj); __i915_gem_object_release_map(vma->obj); -- 2.20.1

4 years, 3 months

2
3
0 0

[PATCH] seccomp: Add missing return in non-void function

by Paul Cercueil

We don't actually care about the value, since the kernel will panic before that; but a value should nonetheless be returned, otherwise the compiler will complain. Fixes: 8112c4f140fa ("seccomp: remove 2-phase API") Cc: stable(a)vger.kernel.org # 4.7+ Signed-off-by: Paul Cercueil <paul(a)crapouillou.net> --- kernel/seccomp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 952dc1c90229..63b40d12896b 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -1284,6 +1284,8 @@ static int __seccomp_filter(int this_syscall, const struct seccomp_data *sd, const bool recheck_after_trace) { BUG(); + + return -1; } #endif -- 2.29.2

4 years, 3 months

2
3
0 0

[PATCH 5.10 000/145] 5.10.7-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.10.7 release. There are 145 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 13 Jan 2021 13:00:19 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.7-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.10.7-rc1 Ping-Ke Shih <pkshih(a)realtek.com> rtlwifi: rise completion at the last step of firmware callback Magnus Karlsson <magnus.karlsson(a)intel.com> xsk: Fix memory leak for failed bind Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: fix shift out of bounds reported by UBSAN Ying-Tsun Huang <ying-tsun.huang(a)amd.com> x86/mtrr: Correct the range check before performing MTRR type lookups Dan Carpenter <dan.carpenter(a)oracle.com> dmaengine: idxd: off by one in cleanup code Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_dynset: report EOPNOTSUPP on missing set feature Florian Westphal <fw(a)strlen.de> netfilter: xt_RATEEST: reject non-null terminated string from userspace Vasily Averin <vvs(a)virtuozzo.com> netfilter: ipset: fix shift-out-of-bounds in htable_bits() Subash Abhinov Kasiviswanathan <subashab(a)codeaurora.org> netfilter: x_tables: Update remaining dereference to RCU Aaro Koskinen <aaro.koskinen(a)iki.fi> ARM: dts: OMAP3: disable AES on N950/N9 Moshe Shemesh <moshe(a)mellanox.com> net/mlx5e: Fix SWP offsets when vlan inserted by driver Coly Li <colyli(a)suse.de> bcache: introduce BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE for large bucket Coly Li <colyli(a)suse.de> bcache: check unsupported feature sets for bcache register Coly Li <colyli(a)suse.de> bcache: fix typo from SUUP to SUPP in features.h Matthew Auld <matthew.auld(a)intel.com> drm/i915: clear the gpu reloc batch Matthew Auld <matthew.auld(a)intel.com> drm/i915: clear the shadow batch Nick Desaulniers <ndesaulniers(a)google.com> arm64: link with -z norelro for LLD or aarch64-elf Charan Teja Reddy <charante(a)codeaurora.org> dmabuf: fix use-after-free of dmabuf's file->f_inode Bard Liao <yung-chuan.liao(a)linux.intel.com> Revert "device property: Keep secondary firmware node secondary by type" Filipe Manana <fdmanana(a)suse.com> btrfs: send: fix wrong file path when there is an inode with a pending rmdir Qu Wenruo <wqu(a)suse.com> btrfs: qgroup: don't try to wait flushing if we're already holding a transaction Liu Yi L <yi.l.liu(a)intel.com> iommu/vt-d: Move intel_iommu info from struct intel_svm to struct intel_svm_dev PeiSen Hou <pshou(a)realtek.com> ALSA: hda/realtek: Add two "Intel Reference board" SSID in the ALC256. Kai-Heng Feng <kai.heng.feng(a)canonical.com> ALSA: hda/realtek: Enable mute and micmute LED on HP EliteBook 850 G7 Manuel Jiménez <mjbfm99(a)me.com> ALSA: hda/realtek: Add mute LED quirk for more HP laptops Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - Fix speaker volume control on Lenovo C940 bo liu <bo.liu(a)senarytech.com> ALSA: hda/conexant: add a new hda codec CX11970 Takashi Iwai <tiwai(a)suse.de> ALSA: hda/via: Fix runtime PM for Clevo W35xSS Tejun Heo <tj(a)kernel.org> blk-iocost: fix NULL iocg deref from racing against initialization Fenghua Yu <fenghua.yu(a)intel.com> x86/resctrl: Don't move a task to the same resource group Fenghua Yu <fenghua.yu(a)intel.com> x86/resctrl: Use an IPI instead of task_work_add() to update PQR_ASSOC MSR Ben Gardon <bgardon(a)google.com> KVM: x86/mmu: Ensure TDP MMU roots are freed after yield Lai Jiangshan <laijs(a)linux.alibaba.com> kvm: check tlbs_dirty directly Sean Christopherson <seanjc(a)google.com> KVM: x86/mmu: Get root level from walkers when retrieving MMIO SPTE Sean Christopherson <seanjc(a)google.com> KVM: x86/mmu: Use -1 to flag an undefined spte in get_mmio_spte() Dan Williams <dan.j.williams(a)intel.com> x86/mm: Fix leak of pmd ptlock Linus Torvalds <torvalds(a)linux-foundation.org> mm: make wait_on_page_writeback() wait for multiple pending writebacks David Arcari <darcari(a)redhat.com> hwmon: (amd_energy) fix allocation of hwmon_channel_info config Johan Hovold <johan(a)kernel.org> USB: serial: keyspan_pda: remove unused variable Eddie Hung <eddie.hung(a)mediatek.com> usb: gadget: configfs: Fix use-after-free issue with udc_name Chandana Kishori Chiluveru <cchiluve(a)codeaurora.org> usb: gadget: configfs: Preserve function ordering after bind failure Sriharsha Allenki <sallenki(a)codeaurora.org> usb: gadget: Fix spinlock lockup on usb_function_deactivate Yang Yingliang <yangyingliang(a)huawei.com> USB: gadget: legacy: fix return error code in acm_ms_bind() Manish Narani <manish.narani(a)xilinx.com> usb: gadget: u_ether: Fix MTU size mismatch with RX packet size Zqiang <qiang.zhang(a)windriver.com> usb: gadget: function: printer: Fix a memory leak for interface descriptor Jerome Brunet <jbrunet(a)baylibre.com> usb: gadget: f_uac2: reset wMaxPacketSize Alan Stern <stern(a)rowland.harvard.edu> USB: Gadget: dummy-hcd: Fix shift-out-of-bounds bug Arnd Bergmann <arnd(a)arndb.de> usb: gadget: select CONFIG_CRC32 Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix UBSAN warnings for MIDI jacks Johan Hovold <johan(a)kernel.org> USB: usblp: fix DMA to stack Johan Hovold <johan(a)kernel.org> USB: yurex: fix control-URB timeout handling Bjørn Mork <bjorn(a)mork.no> USB: serial: option: add Quectel EM160R-GL Daniel Palmer <daniel(a)0x0f.com> USB: serial: option: add LongSung M5710 module support Johan Hovold <johan(a)kernel.org> USB: serial: iuu_phoenix: fix DMA from stack Thinh Nguyen <Thinh.Nguyen(a)synopsys.com> usb: uas: Add PNY USB Portable SSD to unusual_uas Randy Dunlap <rdunlap(a)infradead.org> usb: usbip: vhci_hcd: protect shift size Michael Grzeschik <m.grzeschik(a)pengutronix.de> USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set Yu Kuai <yukuai3(a)huawei.com> usb: chipidea: ci_hdrc_imx: add missing put_device() call in usbmisc_get_init_data() Serge Semin <Sergey.Semin(a)baikalelectronics.ru> usb: dwc3: ulpi: Fix USB2.0 HS/FS/LS PHY suspend regression Serge Semin <Sergey.Semin(a)baikalelectronics.ru> usb: dwc3: ulpi: Replace CPU-based busyloop with Protocol-based one Serge Semin <Sergey.Semin(a)baikalelectronics.ru> usb: dwc3: ulpi: Use VStsDone to detect PHY regs access completion Thinh Nguyen <Thinh.Nguyen(a)synopsys.com> usb: dwc3: gadget: Clear wait flag on dequeue Wesley Cheng <wcheng(a)codeaurora.org> usb: dwc3: gadget: Restart DWC3 gadget when enabling pullup Zheng Zengkai <zhengzengkai(a)huawei.com> usb: dwc3: meson-g12a: disable clk on error handling path in probe Madhusudanarao Amara <madhusudanarao.amara(a)intel.com> usb: typec: intel_pmc_mux: Configure HPD first for HPD+IRQ request Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> USB: cdc-wdm: Fix use after free in service_outstanding_interrupt(). Sean Young <sean(a)mess.org> USB: cdc-acm: blacklist another IR Droid device taehyun.cho <taehyun.cho(a)samsung.com> usb: gadget: enable super speed plus Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> staging: mt7621-dma: Fix a resource leak in an error handling path Dan Carpenter <dan.carpenter(a)oracle.com> Staging: comedi: Return -EFAULT if copy_to_user() fails Nathan Chancellor <natechancellor(a)gmail.com> powerpc: Handle .text.{hot,unlikely}.* in linker script Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/32s: Fix RTAS machine check with VMAP stack Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> crypto: asym_tpm: correct zero out potential secrets Ard Biesheuvel <ardb(a)kernel.org> crypto: ecdh - avoid buffer overflow in ecdh_set_secret() Alan Stern <stern(a)rowland.harvard.edu> scsi: block: Do not accept any requests while suspended Bart Van Assche <bvanassche(a)acm.org> scsi: block: Remove RQF_PREEMPT and BLK_MQ_REQ_PREEMPT Hans de Goede <hdegoede(a)redhat.com> Bluetooth: revert: hci_h5: close serdev device and free hu in h5_close Dominique Martinet <asmadeus(a)codewreck.org> kbuild: don't hardcode depmod path Jaegeuk Kim <jaegeuk(a)kernel.org> scsi: ufs: Clear UAC for FFU and RPMB LUNs Linus Torvalds <torvalds(a)linux-foundation.org> depmod: handle the case of /sbin/depmod without /sbin in PATH Huang Shijie <sjhuang(a)iluvatar.ai> lib/genalloc: fix the overflow when size is too big Randy Dunlap <rdunlap(a)infradead.org> local64.h: make <asm/local64.h> mandatory Bart Van Assche <bvanassche(a)acm.org> scsi: core: Only process PM requests if rpm_status != RPM_ACTIVE Bart Van Assche <bvanassche(a)acm.org> scsi: scsi_transport_spi: Set RQF_PM for domain validation commands Bart Van Assche <bvanassche(a)acm.org> scsi: ide: Mark power management requests with RQF_PM instead of RQF_PREEMPT Bart Van Assche <bvanassche(a)acm.org> scsi: ide: Do not set the RQF_PREEMPT flag for sense requests Bart Van Assche <bvanassche(a)acm.org> scsi: block: Introduce BLK_MQ_REQ_PM Adrian Hunter <adrian.hunter(a)intel.com> scsi: ufs-pci: Enable UFSHCD_CAP_RPM_AUTOSUSPEND for Intel controllers Adrian Hunter <adrian.hunter(a)intel.com> scsi: ufs-pci: Fix recovery from hibernate exit errors for Intel controllers Adrian Hunter <adrian.hunter(a)intel.com> scsi: ufs-pci: Ensure UFS device is in PowerDown mode for suspend-to-disk ->poweroff() Adrian Hunter <adrian.hunter(a)intel.com> scsi: ufs-pci: Fix restore from S4 for Intel controllers Randall Huang <huangrandall(a)google.com> scsi: ufs: Clear UAC for RPMB after ufshcd resets Bean Huo <beanhuo(a)micron.com> scsi: ufs: Fix wrong print message in dev_err() Yunfeng Ye <yeyunfeng(a)huawei.com> workqueue: Kick a worker based on the actual activation of delayed works Andres Freund <andres(a)anarazel.de> block: add debugfs stanza for QUEUE_FLAG_NOWAIT Harish <harish(a)linux.ibm.com> selftests/vm: fix building protection keys test Noor Azura Ahmad Tarmizi <noor.azura.ahmad.tarmizi(a)intel.com> stmmac: intel: Add PCI IDs for TGL-H platform Ido Schimmel <idosch(a)nvidia.com> selftests: mlxsw: Set headroom size of correct port Bjørn Mork <bjorn(a)mork.no> net: usb: qmi_wwan: add Quectel EM160R-GL YANG LI <abaci-bugfix(a)linux.alibaba.com> ibmvnic: fix: NULL pointer dereference. Roland Dreier <roland(a)kernel.org> CDC-NCM: remove "connected" log message Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: dsa: lantiq_gswip: Fix GSWIP_MII_CFG(p) register access Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: dsa: lantiq_gswip: Enable GSWIP_MII_CFG_EN also for internal PHYs Heiner Kallweit <hkallweit1(a)gmail.com> r8169: work around power-saving bug on some chip versions Yunjian Wang <wangyunjian(a)huawei.com> vhost_net: fix ubuf refcount incorrectly when sendmsg fails Taehee Yoo <ap420073(a)gmail.com> bareudp: Fix use of incorrect min_headroom size Taehee Yoo <ap420073(a)gmail.com> bareudp: set NETIF_F_LLTX flag Xie He <xie.he.0141(a)gmail.com> net: hdlc_ppp: Fix issues when mod_timer is called while timer is running Cong Wang <cong.wang(a)bytedance.com> erspan: fix version 1 check in gre_parse_header() Yunjian Wang <wangyunjian(a)huawei.com> net: hns: fix return value check in __lb_other_process() Randy Dunlap <rdunlap(a)infradead.org> net: sched: prevent invalid Scell_log shift count Guillaume Nault <gnault(a)redhat.com> ipv4: Ignore ECN bits for fib lookups in fib_compute_spec_dst() Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Fix AER recovery. Stefan Chulski <stefanc(a)marvell.com> net: mvpp2: fix pkt coalescing int-threshold configuration Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Check TQM rings for maximum supported value. Mario Limonciello <mario.limonciello(a)dell.com> e1000e: Export S0ix flags to ethtool Mario Limonciello <mario.limonciello(a)dell.com> Revert "e1000e: disable s0ix entry and exit flows for ME systems" Mario Limonciello <mario.limonciello(a)dell.com> e1000e: bump up timeout to wait when ME un-configures ULP mode Mario Limonciello <mario.limonciello(a)dell.com> e1000e: Only run S0ix flows if shutdown succeeded Yunjian Wang <wangyunjian(a)huawei.com> tun: fix return value when the number of iovs exceeds MAX_SKB_FRAGS Grygorii Strashko <grygorii.strashko(a)ti.com> net: ethernet: ti: cpts: fix ethtool output when no ptp_clock registered Antoine Tenart <atenart(a)kernel.org> net-sysfs: take the rtnl lock when accessing xps_rxqs_map and num_tc Antoine Tenart <atenart(a)kernel.org> net-sysfs: take the rtnl lock when storing xps_rxqs Antoine Tenart <atenart(a)kernel.org> net-sysfs: take the rtnl lock when accessing xps_cpus_map and num_tc Antoine Tenart <atenart(a)kernel.org> net-sysfs: take the rtnl lock when storing xps_cpus Dinghao Liu <dinghao.liu(a)zju.edu.cn> net: ethernet: Fix memleak in ethoc_probe John Wang <wangzhiqiang.bj(a)bytedance.com> net/ncsi: Use real net-device for response handler Petr Machata <me(a)pmachata.org> net: dcb: Validate netlink message in DCB handler Jeff Dike <jdike(a)akamai.com> virtio_net: Fix recursive call to cpus_read_lock() Manish Chopra <manishc(a)marvell.com> qede: fix offload for IPIP tunnel packets Dinghao Liu <dinghao.liu(a)zju.edu.cn> net: ethernet: mvneta: Fix error handling in mvneta_probe Lijun Pan <ljp(a)linux.ibm.com> ibmvnic: continue fatal error reset after passive init Lijun Pan <ljp(a)linux.ibm.com> ibmvnic: fix login buffer memory leak Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: stmmac: dwmac-meson8b: ignore the second clock input Stefan Chulski <stefanc(a)marvell.com> net: mvpp2: Fix GoP port 3 Networking Complex Control configurations Dan Carpenter <dan.carpenter(a)oracle.com> atm: idt77252: call pci_disable_device() on error path Shannon Nelson <snelson(a)pensando.io> ionic: account for vlan tag len in rx buffer len Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> ethernet: ucc_geth: set dev->max_mtu to 1518 Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> ethernet: ucc_geth: fix use-after-free in ucc_geth_remove() Florian Fainelli <f.fainelli(a)gmail.com> net: systemport: set dev->max_mtu to UMAC_MAX_MTU_SIZE Stefan Chulski <stefanc(a)marvell.com> net: mvpp2: prs: fix PPPoE with ipv6 packet parse Stefan Chulski <stefanc(a)marvell.com> net: mvpp2: Add TCAM entry to drop flow control pause frames Davide Caratti <dcaratti(a)redhat.com> net/sched: sch_taprio: ensure to reset/destroy all child qdiscs Jakub Kicinski <kuba(a)kernel.org> iavf: fix double-release of rtnl_lock Sylwester Dziedziuch <sylwesterx.dziedziuch(a)intel.com> i40e: Fix Error I40E_AQ_RC_EINVAL when removing VFs ------------- Diffstat: Makefile | 6 +- arch/alpha/include/asm/local64.h | 1 - arch/arc/include/asm/Kbuild | 1 - arch/arm/boot/dts/omap3-n950-n9.dtsi | 8 ++ arch/arm/include/asm/Kbuild | 1 - arch/arm64/Makefile | 10 +- arch/arm64/include/asm/Kbuild | 1 - arch/csky/include/asm/Kbuild | 1 - arch/h8300/include/asm/Kbuild | 1 - arch/hexagon/include/asm/Kbuild | 1 - arch/ia64/include/asm/local64.h | 1 - arch/m68k/include/asm/Kbuild | 1 - arch/microblaze/include/asm/Kbuild | 1 - arch/mips/include/asm/Kbuild | 1 - arch/nds32/include/asm/Kbuild | 1 - arch/parisc/include/asm/Kbuild | 1 - arch/powerpc/include/asm/Kbuild | 1 - arch/powerpc/kernel/head_book3s_32.S | 9 ++ arch/powerpc/kernel/vmlinux.lds.S | 2 +- arch/riscv/include/asm/Kbuild | 1 - arch/s390/include/asm/Kbuild | 1 - arch/sh/include/asm/Kbuild | 1 - arch/sparc/include/asm/Kbuild | 1 - arch/x86/include/asm/local64.h | 1 - arch/x86/kernel/cpu/mtrr/generic.c | 6 +- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 117 +++++++++------------ arch/x86/kvm/mmu.h | 2 +- arch/x86/kvm/mmu/mmu.c | 22 ++-- arch/x86/kvm/mmu/tdp_mmu.c | 111 ++++++++++--------- arch/x86/kvm/mmu/tdp_mmu.h | 4 +- arch/x86/mm/pgtable.c | 2 + arch/xtensa/include/asm/Kbuild | 1 - block/blk-core.c | 13 +-- block/blk-iocost.c | 16 ++- block/blk-mq-debugfs.c | 2 +- block/blk-mq.c | 4 +- block/blk-pm.h | 14 ++- crypto/asymmetric_keys/asym_tpm.c | 2 +- crypto/ecdh.c | 3 +- drivers/atm/idt77252.c | 2 +- drivers/base/core.c | 2 +- drivers/bluetooth/hci_h5.c | 8 +- drivers/dma-buf/dma-buf.c | 21 +++- drivers/dma/idxd/sysfs.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 27 ++--- drivers/hwmon/amd_energy.c | 3 +- drivers/ide/ide-atapi.c | 1 - drivers/ide/ide-io.c | 7 +- drivers/ide/ide-pm.c | 2 +- drivers/iommu/intel/svm.c | 9 +- drivers/md/bcache/features.c | 2 +- drivers/md/bcache/features.h | 30 +++++- drivers/md/bcache/super.c | 36 ++++++- drivers/net/bareudp.c | 3 +- drivers/net/dsa/lantiq_gswip.c | 27 ++--- drivers/net/ethernet/broadcom/bcmsysport.c | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 38 +++---- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 7 +- drivers/net/ethernet/ethoc.c | 3 +- drivers/net/ethernet/freescale/ucc_geth.c | 3 +- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 + drivers/net/ethernet/ibm/ibmvnic.c | 10 +- drivers/net/ethernet/intel/e1000e/e1000.h | 1 + drivers/net/ethernet/intel/e1000e/ethtool.c | 46 ++++++++ drivers/net/ethernet/intel/e1000e/ich8lan.c | 17 ++- drivers/net/ethernet/intel/e1000e/netdev.c | 59 ++--------- drivers/net/ethernet/intel/i40e/i40e.h | 3 + drivers/net/ethernet/intel/i40e/i40e_main.c | 10 ++ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 4 +- drivers/net/ethernet/marvell/mvneta.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 13 +-- drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 38 ++++++- drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 9 ++ .../mellanox/mlx5/core/en_accel/en_accel.h | 8 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 9 +- drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 2 +- drivers/net/ethernet/qlogic/qede/qede_fp.c | 5 + drivers/net/ethernet/realtek/r8169_main.c | 6 +- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 4 + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- drivers/net/ethernet/ti/cpts.c | 2 + drivers/net/tun.c | 2 +- drivers/net/usb/cdc_ncm.c | 3 - drivers/net/usb/qmi_wwan.c | 1 + drivers/net/virtio_net.c | 12 ++- drivers/net/wan/hdlc_ppp.c | 7 ++ drivers/net/wireless/realtek/rtlwifi/core.c | 8 +- drivers/scsi/scsi_lib.c | 27 ++--- drivers/scsi/scsi_transport_spi.c | 27 +++-- drivers/scsi/ufs/ufshcd-pci.c | 73 ++++++++++++- drivers/scsi/ufs/ufshcd.c | 86 ++++++++++++--- drivers/scsi/ufs/ufshcd.h | 1 + drivers/staging/comedi/comedi_fops.c | 4 +- drivers/staging/mt7621-dma/mtk-hsdma.c | 4 +- drivers/usb/chipidea/ci_hdrc_imx.c | 6 +- drivers/usb/class/cdc-acm.c | 4 + drivers/usb/class/cdc-wdm.c | 16 ++- drivers/usb/class/usblp.c | 21 +++- drivers/usb/dwc3/core.h | 1 + drivers/usb/dwc3/dwc3-meson-g12a.c | 2 +- drivers/usb/dwc3/gadget.c | 16 +-- drivers/usb/dwc3/ulpi.c | 38 ++++--- drivers/usb/gadget/Kconfig | 2 + drivers/usb/gadget/composite.c | 10 +- drivers/usb/gadget/configfs.c | 19 ++-- drivers/usb/gadget/function/f_printer.c | 1 + drivers/usb/gadget/function/f_uac2.c | 69 +++++++++--- drivers/usb/gadget/function/u_ether.c | 9 +- drivers/usb/gadget/legacy/acm_ms.c | 4 +- drivers/usb/gadget/udc/dummy_hcd.c | 35 +++--- drivers/usb/host/xhci.c | 24 ++--- drivers/usb/misc/yurex.c | 3 + drivers/usb/serial/iuu_phoenix.c | 20 +++- drivers/usb/serial/keyspan_pda.c | 2 - drivers/usb/serial/option.c | 3 + drivers/usb/storage/unusual_uas.h | 7 ++ drivers/usb/typec/mux/intel_pmc_mux.c | 11 ++ drivers/usb/usbip/vhci_hcd.c | 2 + drivers/vhost/net.c | 6 +- fs/btrfs/qgroup.c | 30 ++++-- fs/btrfs/send.c | 49 +++++---- include/asm-generic/Kbuild | 1 + include/linux/blk-mq.h | 4 +- include/linux/blkdev.h | 18 +++- include/linux/intel-iommu.h | 2 +- include/net/red.h | 4 +- include/uapi/linux/bcache.h | 2 +- kernel/workqueue.c | 13 ++- lib/genalloc.c | 25 ++--- mm/page-writeback.c | 2 +- net/core/net-sysfs.c | 65 +++++++++--- net/dcb/dcbnl.c | 2 + net/ipv4/fib_frontend.c | 2 +- net/ipv4/gre_demux.c | 2 +- net/ipv4/netfilter/arp_tables.c | 2 +- net/ipv4/netfilter/ip_tables.c | 2 +- net/ipv6/netfilter/ip6_tables.c | 2 +- net/ncsi/ncsi-rsp.c | 2 +- net/netfilter/ipset/ip_set_hash_gen.h | 20 +--- net/netfilter/nft_dynset.c | 6 +- net/netfilter/xt_RATEEST.c | 3 + net/sched/sch_choke.c | 2 +- net/sched/sch_gred.c | 2 +- net/sched/sch_red.c | 2 +- net/sched/sch_sfq.c | 2 +- net/sched/sch_taprio.c | 7 +- net/xdp/xsk.c | 4 + net/xdp/xsk_buff_pool.c | 2 - scripts/depmod.sh | 2 + sound/pci/hda/hda_intel.c | 2 - sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 10 ++ sound/pci/hda/patch_via.c | 13 +++ sound/usb/midi.c | 4 + .../testing/selftests/drivers/net/mlxsw/qos_pfc.sh | 2 +- tools/testing/selftests/vm/Makefile | 10 +- virt/kvm/kvm_main.c | 3 +- 160 files changed, 1157 insertions(+), 628 deletions(-)

4 years, 3 months

6
152
0 0

FAILED: patch "[PATCH] iio: imu: st_lsm6dsx: fix edge-trigger interrupts" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3f9bce7a22a3f8ac9d885c9d75bc45569f24ac8b Mon Sep 17 00:00:00 2001 From: Lorenzo Bianconi <lorenzo(a)kernel.org> Date: Sat, 14 Nov 2020 19:39:05 +0100 Subject: [PATCH] iio: imu: st_lsm6dsx: fix edge-trigger interrupts If we are using edge IRQs, new samples can arrive while processing current interrupt since there are no hw guarantees the irq line stays "low" long enough to properly detect the new interrupt. In this case the new sample will be missed. Polling FIFO status register in st_lsm6dsx_handler_thread routine allow us to read new samples even if the interrupt arrives while processing previous data and the timeslot where the line is "low" is too short to be properly detected. Fixes: 89ca88a7cdf2 ("iio: imu: st_lsm6dsx: support active-low interrupts") Fixes: 290a6ce11d93 ("iio: imu: add support to lsm6dsx driver") Signed-off-by: Lorenzo Bianconi <lorenzo(a)kernel.org> Link: https://lore.kernel.org/r/5e93cda7dc1e665f5685c53ad8e9ea71dbae782d.16053788… Cc: <Stable(a)vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c index 467214e2e77c..7cedaab096a7 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c @@ -2069,19 +2069,35 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw) static irqreturn_t st_lsm6dsx_handler_thread(int irq, void *private) { struct st_lsm6dsx_hw *hw = private; + int fifo_len = 0, len; bool event; - int count; event = st_lsm6dsx_report_motion_event(hw); if (!hw->settings->fifo_ops.read_fifo) return event ? IRQ_HANDLED : IRQ_NONE; - mutex_lock(&hw->fifo_lock); - count = hw->settings->fifo_ops.read_fifo(hw); - mutex_unlock(&hw->fifo_lock); + /* + * If we are using edge IRQs, new samples can arrive while + * processing current interrupt since there are no hw + * guarantees the irq line stays "low" long enough to properly + * detect the new interrupt. In this case the new sample will + * be missed. + * Polling FIFO status register allow us to read new + * samples even if the interrupt arrives while processing + * previous data and the timeslot where the line is "low" is + * too short to be properly detected. + */ + do { + mutex_lock(&hw->fifo_lock); + len = hw->settings->fifo_ops.read_fifo(hw); + mutex_unlock(&hw->fifo_lock); + + if (len > 0) + fifo_len += len; + } while (len > 0); - return count || event ? IRQ_HANDLED : IRQ_NONE; + return fifo_len || event ? IRQ_HANDLED : IRQ_NONE; } static int st_lsm6dsx_irq_setup(struct st_lsm6dsx_hw *hw)

4 years, 3 months

2
1
0 0

FAILED: patch "[PATCH] iio: imu: st_lsm6dsx: fix edge-trigger interrupts" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3f9bce7a22a3f8ac9d885c9d75bc45569f24ac8b Mon Sep 17 00:00:00 2001 From: Lorenzo Bianconi <lorenzo(a)kernel.org> Date: Sat, 14 Nov 2020 19:39:05 +0100 Subject: [PATCH] iio: imu: st_lsm6dsx: fix edge-trigger interrupts If we are using edge IRQs, new samples can arrive while processing current interrupt since there are no hw guarantees the irq line stays "low" long enough to properly detect the new interrupt. In this case the new sample will be missed. Polling FIFO status register in st_lsm6dsx_handler_thread routine allow us to read new samples even if the interrupt arrives while processing previous data and the timeslot where the line is "low" is too short to be properly detected. Fixes: 89ca88a7cdf2 ("iio: imu: st_lsm6dsx: support active-low interrupts") Fixes: 290a6ce11d93 ("iio: imu: add support to lsm6dsx driver") Signed-off-by: Lorenzo Bianconi <lorenzo(a)kernel.org> Link: https://lore.kernel.org/r/5e93cda7dc1e665f5685c53ad8e9ea71dbae782d.16053788… Cc: <Stable(a)vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c index 467214e2e77c..7cedaab096a7 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c @@ -2069,19 +2069,35 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw) static irqreturn_t st_lsm6dsx_handler_thread(int irq, void *private) { struct st_lsm6dsx_hw *hw = private; + int fifo_len = 0, len; bool event; - int count; event = st_lsm6dsx_report_motion_event(hw); if (!hw->settings->fifo_ops.read_fifo) return event ? IRQ_HANDLED : IRQ_NONE; - mutex_lock(&hw->fifo_lock); - count = hw->settings->fifo_ops.read_fifo(hw); - mutex_unlock(&hw->fifo_lock); + /* + * If we are using edge IRQs, new samples can arrive while + * processing current interrupt since there are no hw + * guarantees the irq line stays "low" long enough to properly + * detect the new interrupt. In this case the new sample will + * be missed. + * Polling FIFO status register allow us to read new + * samples even if the interrupt arrives while processing + * previous data and the timeslot where the line is "low" is + * too short to be properly detected. + */ + do { + mutex_lock(&hw->fifo_lock); + len = hw->settings->fifo_ops.read_fifo(hw); + mutex_unlock(&hw->fifo_lock); + + if (len > 0) + fifo_len += len; + } while (len > 0); - return count || event ? IRQ_HANDLED : IRQ_NONE; + return fifo_len || event ? IRQ_HANDLED : IRQ_NONE; } static int st_lsm6dsx_irq_setup(struct st_lsm6dsx_hw *hw)

4 years, 3 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror January 2021