December 2021 - Linux-stable-mirror

FAILED: patch "[PATCH] shm: extend forced shm destroy to support objects from" 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 85b6d24646e4125c591639841169baa98a2da503 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn <alexander.mikhalitsyn(a)virtuozzo.com> Date: Fri, 19 Nov 2021 16:43:21 -0800 Subject: [PATCH] shm: extend forced shm destroy to support objects from several IPC nses Currently, the exit_shm() function not designed to work properly when task->sysvshm.shm_clist holds shm objects from different IPC namespaces. This is a real pain when sysctl kernel.shm_rmid_forced = 1, because it leads to use-after-free (reproducer exists). This is an attempt to fix the problem by extending exit_shm mechanism to handle shm's destroy from several IPC ns'es. To achieve that we do several things: 1. add a namespace (non-refcounted) pointer to the struct shmid_kernel 2. during new shm object creation (newseg()/shmget syscall) we initialize this pointer by current task IPC ns 3. exit_shm() fully reworked such that it traverses over all shp's in task->sysvshm.shm_clist and gets IPC namespace not from current task as it was before but from shp's object itself, then call shm_destroy(shp, ns). Note: We need to be really careful here, because as it was said before (1), our pointer to IPC ns non-refcnt'ed. To be on the safe side we using special helper get_ipc_ns_not_zero() which allows to get IPC ns refcounter only if IPC ns not in the "state of destruction". Q/A Q: Why can we access shp->ns memory using non-refcounted pointer? A: Because shp object lifetime is always shorther than IPC namespace lifetime, so, if we get shp object from the task->sysvshm.shm_clist while holding task_lock(task) nobody can steal our namespace. Q: Does this patch change semantics of unshare/setns/clone syscalls? A: No. It's just fixes non-covered case when process may leave IPC namespace without getting task->sysvshm.shm_clist list cleaned up. Link: https://lkml.kernel.org/r/67bb03e5-f79c-1815-e2bf-949c67047418@colorfullife… Link: https://lkml.kernel.org/r/20211109151501.4921-1-manfred@colorfullife.com Fixes: ab602f79915 ("shm: make exit_shm work proportional to task activity") Co-developed-by: Manfred Spraul <manfred(a)colorfullife.com> Signed-off-by: Manfred Spraul <manfred(a)colorfullife.com> Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn(a)virtuozzo.com> Cc: "Eric W. Biederman" <ebiederm(a)xmission.com> Cc: Davidlohr Bueso <dave(a)stgolabs.net> Cc: Greg KH <gregkh(a)linuxfoundation.org> Cc: Andrei Vagin <avagin(a)gmail.com> Cc: Pavel Tikhomirov <ptikhomirov(a)virtuozzo.com> Cc: Vasily Averin <vvs(a)virtuozzo.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index 05e22770af51..b75395ec8d52 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h @@ -131,6 +131,16 @@ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) return ns; } +static inline struct ipc_namespace *get_ipc_ns_not_zero(struct ipc_namespace *ns) +{ + if (ns) { + if (refcount_inc_not_zero(&ns->ns.count)) + return ns; + } + + return NULL; +} + extern void put_ipc_ns(struct ipc_namespace *ns); #else static inline struct ipc_namespace *copy_ipcs(unsigned long flags, @@ -147,6 +157,11 @@ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) return ns; } +static inline struct ipc_namespace *get_ipc_ns_not_zero(struct ipc_namespace *ns) +{ + return ns; +} + static inline void put_ipc_ns(struct ipc_namespace *ns) { } diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h index ba88a6987400..058d7f371e25 100644 --- a/include/linux/sched/task.h +++ b/include/linux/sched/task.h @@ -158,7 +158,7 @@ static inline struct vm_struct *task_stack_vm_area(const struct task_struct *t) * Protects ->fs, ->files, ->mm, ->group_info, ->comm, keyring * subscriptions and synchronises with wait4(). Also used in procfs. Also * pins the final release of task.io_context. Also protects ->cpuset and - * ->cgroup.subsys[]. And ->vfork_done. + * ->cgroup.subsys[]. And ->vfork_done. And ->sysvshm.shm_clist. * * Nests both inside and outside of read_lock(&tasklist_lock). * It must not be nested with write_lock_irq(&tasklist_lock), diff --git a/ipc/shm.c b/ipc/shm.c index 4942bdd65748..b3048ebd5c31 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -62,9 +62,18 @@ struct shmid_kernel /* private to the kernel */ struct pid *shm_lprid; struct ucounts *mlock_ucounts; - /* The task created the shm object. NULL if the task is dead. */ + /* + * The task created the shm object, for + * task_lock(shp->shm_creator) + */ struct task_struct *shm_creator; - struct list_head shm_clist; /* list by creator */ + + /* + * List by creator. task_lock(->shm_creator) required for read/write. + * If list_empty(), then the creator is dead already. + */ + struct list_head shm_clist; + struct ipc_namespace *ns; } __randomize_layout; /* shm_mode upper byte flags */ @@ -115,6 +124,7 @@ static void do_shm_rmid(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp) struct shmid_kernel *shp; shp = container_of(ipcp, struct shmid_kernel, shm_perm); + WARN_ON(ns != shp->ns); if (shp->shm_nattch) { shp->shm_perm.mode |= SHM_DEST; @@ -225,10 +235,43 @@ static void shm_rcu_free(struct rcu_head *head) kfree(shp); } -static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s) +/* + * It has to be called with shp locked. + * It must be called before ipc_rmid() + */ +static inline void shm_clist_rm(struct shmid_kernel *shp) { - list_del(&s->shm_clist); - ipc_rmid(&shm_ids(ns), &s->shm_perm); + struct task_struct *creator; + + /* ensure that shm_creator does not disappear */ + rcu_read_lock(); + + /* + * A concurrent exit_shm may do a list_del_init() as well. + * Just do nothing if exit_shm already did the work + */ + if (!list_empty(&shp->shm_clist)) { + /* + * shp->shm_creator is guaranteed to be valid *only* + * if shp->shm_clist is not empty. + */ + creator = shp->shm_creator; + + task_lock(creator); + /* + * list_del_init() is a nop if the entry was already removed + * from the list. + */ + list_del_init(&shp->shm_clist); + task_unlock(creator); + } + rcu_read_unlock(); +} + +static inline void shm_rmid(struct shmid_kernel *s) +{ + shm_clist_rm(s); + ipc_rmid(&shm_ids(s->ns), &s->shm_perm); } @@ -283,7 +326,7 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp) shm_file = shp->shm_file; shp->shm_file = NULL; ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; - shm_rmid(ns, shp); + shm_rmid(shp); shm_unlock(shp); if (!is_file_hugepages(shm_file)) shmem_lock(shm_file, 0, shp->mlock_ucounts); @@ -303,10 +346,10 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp) * * 2) sysctl kernel.shm_rmid_forced is set to 1. */ -static bool shm_may_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp) +static bool shm_may_destroy(struct shmid_kernel *shp) { return (shp->shm_nattch == 0) && - (ns->shm_rmid_forced || + (shp->ns->shm_rmid_forced || (shp->shm_perm.mode & SHM_DEST)); } @@ -337,7 +380,7 @@ static void shm_close(struct vm_area_struct *vma) ipc_update_pid(&shp->shm_lprid, task_tgid(current)); shp->shm_dtim = ktime_get_real_seconds(); shp->shm_nattch--; - if (shm_may_destroy(ns, shp)) + if (shm_may_destroy(shp)) shm_destroy(ns, shp); else shm_unlock(shp); @@ -358,10 +401,10 @@ static int shm_try_destroy_orphaned(int id, void *p, void *data) * * As shp->* are changed under rwsem, it's safe to skip shp locking. */ - if (shp->shm_creator != NULL) + if (!list_empty(&shp->shm_clist)) return 0; - if (shm_may_destroy(ns, shp)) { + if (shm_may_destroy(shp)) { shm_lock_by_ptr(shp); shm_destroy(ns, shp); } @@ -379,48 +422,97 @@ void shm_destroy_orphaned(struct ipc_namespace *ns) /* Locking assumes this will only be called with task == current */ void exit_shm(struct task_struct *task) { - struct ipc_namespace *ns = task->nsproxy->ipc_ns; - struct shmid_kernel *shp, *n; + for (;;) { + struct shmid_kernel *shp; + struct ipc_namespace *ns; - if (list_empty(&task->sysvshm.shm_clist)) - return; + task_lock(task); + + if (list_empty(&task->sysvshm.shm_clist)) { + task_unlock(task); + break; + } + + shp = list_first_entry(&task->sysvshm.shm_clist, struct shmid_kernel, + shm_clist); - /* - * If kernel.shm_rmid_forced is not set then only keep track of - * which shmids are orphaned, so that a later set of the sysctl - * can clean them up. - */ - if (!ns->shm_rmid_forced) { - down_read(&shm_ids(ns).rwsem); - list_for_each_entry(shp, &task->sysvshm.shm_clist, shm_clist) - shp->shm_creator = NULL; /* - * Only under read lock but we are only called on current - * so no entry on the list will be shared. + * 1) Get pointer to the ipc namespace. It is worth to say + * that this pointer is guaranteed to be valid because + * shp lifetime is always shorter than namespace lifetime + * in which shp lives. + * We taken task_lock it means that shp won't be freed. */ - list_del(&task->sysvshm.shm_clist); - up_read(&shm_ids(ns).rwsem); - return; - } + ns = shp->ns; - /* - * Destroy all already created segments, that were not yet mapped, - * and mark any mapped as orphan to cover the sysctl toggling. - * Destroy is skipped if shm_may_destroy() returns false. - */ - down_write(&shm_ids(ns).rwsem); - list_for_each_entry_safe(shp, n, &task->sysvshm.shm_clist, shm_clist) { - shp->shm_creator = NULL; + /* + * 2) If kernel.shm_rmid_forced is not set then only keep track of + * which shmids are orphaned, so that a later set of the sysctl + * can clean them up. + */ + if (!ns->shm_rmid_forced) + goto unlink_continue; - if (shm_may_destroy(ns, shp)) { - shm_lock_by_ptr(shp); - shm_destroy(ns, shp); + /* + * 3) get a reference to the namespace. + * The refcount could be already 0. If it is 0, then + * the shm objects will be free by free_ipc_work(). + */ + ns = get_ipc_ns_not_zero(ns); + if (!ns) { +unlink_continue: + list_del_init(&shp->shm_clist); + task_unlock(task); + continue; } - } - /* Remove the list head from any segments still attached. */ - list_del(&task->sysvshm.shm_clist); - up_write(&shm_ids(ns).rwsem); + /* + * 4) get a reference to shp. + * This cannot fail: shm_clist_rm() is called before + * ipc_rmid(), thus the refcount cannot be 0. + */ + WARN_ON(!ipc_rcu_getref(&shp->shm_perm)); + + /* + * 5) unlink the shm segment from the list of segments + * created by current. + * This must be done last. After unlinking, + * only the refcounts obtained above prevent IPC_RMID + * from destroying the segment or the namespace. + */ + list_del_init(&shp->shm_clist); + + task_unlock(task); + + /* + * 6) we have all references + * Thus lock & if needed destroy shp. + */ + down_write(&shm_ids(ns).rwsem); + shm_lock_by_ptr(shp); + /* + * rcu_read_lock was implicitly taken in shm_lock_by_ptr, it's + * safe to call ipc_rcu_putref here + */ + ipc_rcu_putref(&shp->shm_perm, shm_rcu_free); + + if (ipc_valid_object(&shp->shm_perm)) { + if (shm_may_destroy(shp)) + shm_destroy(ns, shp); + else + shm_unlock(shp); + } else { + /* + * Someone else deleted the shp from namespace + * idr/kht while we have waited. + * Just unlock and continue. + */ + shm_unlock(shp); + } + + up_write(&shm_ids(ns).rwsem); + put_ipc_ns(ns); /* paired with get_ipc_ns_not_zero */ + } } static vm_fault_t shm_fault(struct vm_fault *vmf) @@ -676,7 +768,11 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) if (error < 0) goto no_id; + shp->ns = ns; + + task_lock(current); list_add(&shp->shm_clist, &current->sysvshm.shm_clist); + task_unlock(current); /* * shmid gets reported as "inode#" in /proc/pid/maps. @@ -1567,7 +1663,8 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, down_write(&shm_ids(ns).rwsem); shp = shm_lock(ns, shmid); shp->shm_nattch--; - if (shm_may_destroy(ns, shp)) + + if (shm_may_destroy(shp)) shm_destroy(ns, shp); else shm_unlock(shp);

2 years, 10 months

3
2
0 0

FAILED: patch "[PATCH] ipc: WARN if trying to remove ipc object which is absent" 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 126e8bee943e9926238c891e2df5b5573aee76bc Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn <alexander.mikhalitsyn(a)virtuozzo.com> Date: Fri, 19 Nov 2021 16:43:18 -0800 Subject: [PATCH] ipc: WARN if trying to remove ipc object which is absent Patch series "shm: shm_rmid_forced feature fixes". Some time ago I met kernel crash after CRIU restore procedure, fortunately, it was CRIU restore, so, I had dump files and could do restore many times and crash reproduced easily. After some investigation I've constructed the minimal reproducer. It was found that it's use-after-free and it happens only if sysctl kernel.shm_rmid_forced = 1. The key of the problem is that the exit_shm() function not handles shp's object destroy when task->sysvshm.shm_clist contains items from different IPC namespaces. In most cases this list will contain only items from one IPC namespace. How can this list contain object from different namespaces? The exit_shm() function is designed to clean up this list always when process leaves IPC namespace. But we made a mistake a long time ago and did not add a exit_shm() call into the setns() syscall procedures. The first idea was just to add this call to setns() syscall but it obviously changes semantics of setns() syscall and that's userspace-visible change. So, I gave up on this idea. The first real attempt to address the issue was just to omit forced destroy if we meet shp object not from current task IPC namespace [1]. But that was not the best idea because task->sysvshm.shm_clist was protected by rwsem which belongs to current task IPC namespace. It means that list corruption may occur. Second approach is just extend exit_shm() to properly handle shp's from different IPC namespaces [2]. This is really non-trivial thing, I've put a lot of effort into that but not believed that it's possible to make it fully safe, clean and clear. Thanks to the efforts of Manfred Spraul working an elegant solution was designed. Thanks a lot, Manfred! Eric also suggested the way to address the issue in ("[RFC][PATCH] shm: In shm_exit destroy all created and never attached segments") Eric's idea was to maintain a list of shm_clists one per IPC namespace, use lock-less lists. But there is some extra memory consumption-related concerns. An alternative solution which was suggested by me was implemented in ("shm: reset shm_clist on setns but omit forced shm destroy"). The idea is pretty simple, we add exit_shm() syscall to setns() but DO NOT destroy shm segments even if sysctl kernel.shm_rmid_forced = 1, we just clean up the task->sysvshm.shm_clist list. This chages semantics of setns() syscall a little bit but in comparision to the "naive" solution when we just add exit_shm() without any special exclusions this looks like a safer option. [1] https://lkml.org/lkml/2021/7/6/1108 [2] https://lkml.org/lkml/2021/7/14/736 This patch (of 2): Let's produce a warning if we trying to remove non-existing IPC object from IPC namespace kht/idr structures. This allows us to catch possible bugs when the ipc_rmid() function was called with inconsistent struct ipc_ids*, struct kern_ipc_perm* arguments. Link: https://lkml.kernel.org/r/20211027224348.611025-1-alexander.mikhalitsyn@vir… Link: https://lkml.kernel.org/r/20211027224348.611025-2-alexander.mikhalitsyn@vir… Co-developed-by: Manfred Spraul <manfred(a)colorfullife.com> Signed-off-by: Manfred Spraul <manfred(a)colorfullife.com> Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn(a)virtuozzo.com> Cc: "Eric W. Biederman" <ebiederm(a)xmission.com> Cc: Davidlohr Bueso <dave(a)stgolabs.net> Cc: Greg KH <gregkh(a)linuxfoundation.org> Cc: Andrei Vagin <avagin(a)gmail.com> Cc: Pavel Tikhomirov <ptikhomirov(a)virtuozzo.com> Cc: Vasily Averin <vvs(a)virtuozzo.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/ipc/util.c b/ipc/util.c index d48d8cfa1f3f..fa2d86ef3fb8 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -447,8 +447,8 @@ static int ipcget_public(struct ipc_namespace *ns, struct ipc_ids *ids, static void ipc_kht_remove(struct ipc_ids *ids, struct kern_ipc_perm *ipcp) { if (ipcp->key != IPC_PRIVATE) - rhashtable_remove_fast(&ids->key_ht, &ipcp->khtnode, - ipc_kht_params); + WARN_ON_ONCE(rhashtable_remove_fast(&ids->key_ht, &ipcp->khtnode, + ipc_kht_params)); } /** @@ -498,7 +498,7 @@ void ipc_rmid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp) { int idx = ipcid_to_idx(ipcp->id); - idr_remove(&ids->ipcs_idr, idx); + WARN_ON_ONCE(idr_remove(&ids->ipcs_idr, idx) != ipcp); ipc_kht_remove(ids, ipcp); ids->in_use--; ipcp->deleted = true;

2 years, 10 months

4
3
0 0

Request for cherry-picking USB-audio fixes to 5.15.x stable

by Takashi Iwai

Hi Greg, it seems that many reported issues for 5.15 and 5.14 kernels are fixed by the recent development on 5.16-rc, and it's worth to backport those to 5.15.x stable. Below is the list of commits from the mainline. Could you cherry-pick them to 5.15.x stable? Applying from top to bottom. I confirmed that they can be applied and built cleanly on 5.15.5. 4e7cf1fbb34ecb472c073980458cbe413afd4d64 9c9a3b9da891cc70405a544da6855700eddcbb71 e581f1cec4f899f788f6c9477f805b1d5fef25e2 bceee75387554f682638e719d1ea60125ea78cea d215f63d49da9a8803af3e81acd6cad743686573 0ef74366bc150dda4f53c546dfa6e8f7c707e087 d5f871f89e21bb71827ea57bd484eedea85839a0 813a17cab9b708bbb1e0db8902e19857b57196ec 23939115be181bc5dbc33aa8471adcdbffa28910 53451b6da8271905941eb1eb369db152c4bd92f2 eee5d6f1356a016105a974fb176b491288439efa 83de8f83816e8e15227dac985163e3d433a2bf9d The diffstat of those are like below: sound/usb/card.h | 10 ++- sound/usb/endpoint.c | 223 +++++++++++++++++++++++++++++++++++++-------------- sound/usb/endpoint.h | 13 ++- sound/usb/pcm.c | 165 +++++++++++++++++++++++++++++-------- 4 files changed, 306 insertions(+), 105 deletions(-) If you prefer, I can submit the patches, too. Thanks! Takashi

2 years, 10 months

2
1
0 0

[PATCH v2] drm/i915/dp: Perform 30ms delay after source OUI write

by Lyude Paul

While working on supporting the Intel HDR backlight interface, I noticed that there's a couple of laptops that will very rarely manage to boot up without detecting Intel HDR backlight support - even though it's supported on the system. One example of such a laptop is the Lenovo P17 1st generation. Following some investigation Ville Syrjälä did through the docs they have available to them, they discovered that there's actually supposed to be a 30ms wait after writing the source OUI before we begin setting up the rest of the backlight interface. This seems to be correct, as adding this 30ms delay seems to have completely fixed the probing issues I was previously seeing. So - let's start performing a 30ms wait after writing the OUI, which we do in a manner similar to how we keep track of PPS delays (e.g. record the timestamp of the OUI write, and then wait for however many ms are left since that timestamp right before we interact with the backlight) in order to avoid waiting any longer then we need to. As well, this also avoids us performing this delay on systems where we don't end up using the HDR backlight interface. V2: * Move panel delays into intel_pps Signed-off-by: Lyude Paul <lyude(a)redhat.com> Fixes: 4a8d79901d5b ("drm/i915/dp: Enable Intel's HDR backlight interface (only SDR for now)") Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> # v5.12+ --- drivers/gpu/drm/i915/display/intel_display_types.h | 4 ++++ drivers/gpu/drm/i915/display/intel_dp.c | 11 +++++++++++ drivers/gpu/drm/i915/display/intel_dp.h | 2 ++ drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 5 +++++ 4 files changed, 22 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index ea1e8a6e10b0..ad64f9caa7ff 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1485,6 +1485,7 @@ struct intel_pps { bool want_panel_vdd; unsigned long last_power_on; unsigned long last_backlight_off; + unsigned long last_oui_write; ktime_t panel_power_off_time; intel_wakeref_t vdd_wakeref; @@ -1653,6 +1654,9 @@ struct intel_dp { struct intel_dp_pcon_frl frl; struct intel_psr psr; + + /* When we last wrote the OUI for eDP */ + unsigned long last_oui_write; }; enum lspcon_vendor { diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 0a424bf69396..45318891ba07 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -29,6 +29,7 @@ #include <linux/i2c.h> #include <linux/notifier.h> #include <linux/slab.h> +#include <linux/timekeeping.h> #include <linux/types.h> #include <asm/byteorder.h> @@ -2010,6 +2011,16 @@ intel_edp_init_source_oui(struct intel_dp *intel_dp, bool careful) if (drm_dp_dpcd_write(&intel_dp->aux, DP_SOURCE_OUI, oui, sizeof(oui)) < 0) drm_err(&i915->drm, "Failed to write source OUI\n"); + + intel_dp->pps.last_oui_write = jiffies; +} + +void intel_dp_wait_source_oui(struct intel_dp *intel_dp) +{ + struct drm_i915_private *i915 = dp_to_i915(intel_dp); + + drm_dbg_kms(&i915->drm, "Performing OUI wait\n"); + wait_remaining_ms_from_jiffies(intel_dp->last_oui_write, 30); } /* If the device supports it, try to set the power state appropriately */ diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h index ce229026dc91..b64145a3869a 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.h +++ b/drivers/gpu/drm/i915/display/intel_dp.h @@ -119,4 +119,6 @@ void intel_dp_pcon_dsc_configure(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state); void intel_dp_phy_test(struct intel_encoder *encoder); +void intel_dp_wait_source_oui(struct intel_dp *intel_dp); + #endif /* __INTEL_DP_H__ */ diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c index 8b9c925c4c16..62c112daacf2 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c @@ -36,6 +36,7 @@ #include "intel_backlight.h" #include "intel_display_types.h" +#include "intel_dp.h" #include "intel_dp_aux_backlight.h" /* TODO: @@ -106,6 +107,8 @@ intel_dp_aux_supports_hdr_backlight(struct intel_connector *connector) int ret; u8 tcon_cap[4]; + intel_dp_wait_source_oui(intel_dp); + ret = drm_dp_dpcd_read(aux, INTEL_EDP_HDR_TCON_CAP0, tcon_cap, sizeof(tcon_cap)); if (ret != sizeof(tcon_cap)) return false; @@ -204,6 +207,8 @@ intel_dp_aux_hdr_enable_backlight(const struct intel_crtc_state *crtc_state, int ret; u8 old_ctrl, ctrl; + intel_dp_wait_source_oui(intel_dp); + ret = drm_dp_dpcd_readb(&intel_dp->aux, INTEL_EDP_HDR_GETSET_CTRL_PARAMS, &old_ctrl); if (ret != 1) { drm_err(&i915->drm, "Failed to read current backlight control mode: %d\n", ret); -- 2.33.1

2 years, 10 months

3
4
0 0

Linux 4.19.219

by Greg Kroah-Hartman

I'm announcing the release of the 4.19.219 kernel. All users of the 4.19 kernel series must upgrade. The updated 4.19.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/devicetree/bindings/pinctrl/marvell,armada-37xx-pinctrl.txt | 26 Documentation/networking/ipvs-sysctl.txt | 3 Makefile | 2 arch/arm/boot/dts/bcm5301x.dtsi | 4 arch/arm/include/asm/tlb.h | 8 arch/arm/mach-socfpga/core.h | 2 arch/arm/mach-socfpga/platsmp.c | 8 arch/arm64/boot/dts/marvell/armada-3720-db.dts | 3 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 3 arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 9 arch/ia64/include/asm/tlb.h | 10 arch/mips/Kconfig | 2 arch/s390/include/asm/tlb.h | 16 arch/s390/mm/pgtable.c | 13 arch/sh/include/asm/tlb.h | 10 arch/um/include/asm/tlb.h | 12 arch/xtensa/include/asm/vectors.h | 2 arch/xtensa/kernel/setup.c | 12 arch/xtensa/mm/mmu.c | 2 drivers/android/binder.c | 2 drivers/block/xen-blkfront.c | 126 +- drivers/firmware/arm_scmi/scmi_pm_domain.c | 4 drivers/gpu/drm/vc4/vc4_bo.c | 2 drivers/hid/wacom_wac.c | 8 drivers/hid/wacom_wac.h | 1 drivers/media/cec/cec-adap.c | 1 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 drivers/net/xen-netfront.c | 257 +++-- drivers/pci/controller/pci-aardvark.c | 436 ++++++++-- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 28 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 drivers/tty/hvc/hvc_xen.c | 17 drivers/usb/core/hub.c | 23 drivers/usb/dwc2/hcd_queue.c | 2 drivers/usb/serial/option.c | 5 drivers/vhost/vsock.c | 2 drivers/xen/xenbus/xenbus_probe.c | 27 fs/fuse/dev.c | 14 fs/nfs/nfs42xdr.c | 3 fs/proc/vmcore.c | 15 include/asm-generic/tlb.h | 2 include/net/nfc/nci_core.h | 1 include/net/nl802154.h | 7 include/xen/interface/io/ring.h | 293 +++--- kernel/power/hibernate.c | 6 kernel/trace/trace.h | 24 kernel/trace/trace_events.c | 7 mm/hugetlb.c | 23 mm/memory.c | 10 net/ipv4/tcp_cubic.c | 5 net/ipv6/ip6_output.c | 2 net/netfilter/ipvs/ip_vs_core.c | 8 net/nfc/nci/core.c | 19 net/smc/af_smc.c | 8 net/smc/smc_close.c | 6 sound/pci/ctxfi/ctamixer.c | 14 sound/pci/ctxfi/ctdaio.c | 16 sound/pci/ctxfi/ctresource.c | 7 sound/pci/ctxfi/ctresource.h | 4 sound/pci/ctxfi/ctsrc.c | 7 sound/soc/qcom/qdsp6/q6routing.c | 6 sound/soc/soc-topology.c | 3 63 files changed, 1156 insertions(+), 451 deletions(-) Alexander Aring (1): net: ieee802154: handle iftypes as u32 Dan Carpenter (2): staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect() drm/vc4: fix error code in vc4_create_object() Daniele Palmas (1): USB: serial: option: add Telit LE910S1 0x9200 composition David Hildenbrand (2): proc/vmcore: fix clearing user buffer by properly using clear_user() s390/mm: validate VMA in PGSTE manipulation functions Eric Dumazet (2): ipv6: fix typos in __ip6_finish_output() tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows Florian Fainelli (2): ARM: dts: BCM5301X: Fix I2C controller interrupt ARM: dts: BCM5301X: Add interrupt properties to GPIO node Greg Kroah-Hartman (1): Linux 4.19.219 Gregory CLEMENT (1): pinctrl: armada-37xx: add missing pin: PCIe1 Wakeup Guangbin Huang (1): net: hns3: fix VF RSS failed problem after PF enable multi-TCs Hans Verkuil (1): media: cec: copy sequence field for the reply Huang Pei (1): MIPS: use 3-level pgtable for 64KB page size on MIPS_VA_BITS_48 Jason Gerecke (1): HID: wacom: Use "Confidence" flag to prevent reporting invalid contacts Juergen Gross (9): xen: sync include/xen/interface/io/ring.h with Xen's newest version xen/blkfront: read response from backend only once xen/blkfront: don't take local copy of a request from the ring page xen/blkfront: don't trust the backend response data blindly xen/netfront: read response from backend only once xen/netfront: don't read data from request on the ring page xen/netfront: disentangle tx_skb_freelist xen/netfront: don't trust the backend response data blindly tty: hvc: replace BUG_ON() with negative return value Lin Ma (1): NFC: add NCI_UNREG flag to eliminate the race Marek Behún (4): PCI: aardvark: Improve link training pinctrl: armada-37xx: Correct mpp definitions pinctrl: armada-37xx: Correct PWM pins definitions arm64: dts: marvell: armada-37xx: Set pcie_reset_pin to gpio function Mathias Nyman (2): usb: hub: Fix usb enumeration issue due to address0 race usb: hub: Fix locking issues with address0_mutex Miklos Szeredi (2): fuse: fix page stealing fuse: release pipe buf after last use Mingjie Zhang (1): USB: serial: option: add Fibocom FM101-GL variants Miquel Raynal (1): arm64: dts: marvell: armada-37xx: declare PCIe reset pin Nadav Amit (1): hugetlbfs: flush TLBs correctly after huge_pmd_unshare Nathan Chancellor (1): usb: dwc2: hcd_queue: Fix use of floating point literal Pali Rohár (12): PCI: aardvark: Train link immediately after enabling training PCI: aardvark: Issue PERST via GPIO PCI: aardvark: Replace custom macros by standard linux/pci_regs.h macros PCI: aardvark: Indicate error in 'val' when config read fails PCI: aardvark: Don't touch PCIe registers if no card connected PCI: aardvark: Fix compilation on s390 PCI: aardvark: Move PCIe reset card code to advk_pcie_train_link() PCI: aardvark: Update comment about disabling link training PCI: aardvark: Configure PCIe resources from 'ranges' DT property PCI: aardvark: Fix PCIe Max Payload Size setting PCI: aardvark: Fix link training PCI: aardvark: Fix checking for link up via LTSSM state Peng Fan (1): firmware: arm_scmi: pm: Propagate return value to caller Randy Dunlap (1): xtensa: use CONFIG_USE_OF instead of CONFIG_OF Remi Pommarel (1): PCI: aardvark: Wait for endpoint to be ready before training link Sreekanth Reddy (1): scsi: mpt3sas: Fix kernel panic during drive powercycle test Srinivas Kandagatla (1): ASoC: qdsp6: q6routing: Conditionally reset FrontEnd Mixer Stefano Garzarella (1): vhost/vsock: fix incorrect used length reported to the guest Stefano Stabellini (2): xen: don't continue xenstore initialization in case of errors xen: detect uninitialized xenbus in xenbus_init Steven Rostedt (VMware) (2): tracing: Fix pid filtering when triggers are attached tracing: Check pid filtering when creating events Takashi Iwai (3): ALSA: ctxfi: Fix out-of-range access ASoC: topology: Add missing rwsem around snd_ctl_remove() calls ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE Thomas Zeitlhofer (1): PM: hibernate: use correct mode for swsusp_close() Todd Kjos (1): binder: fix test regression due to sender_euid change Tony Lu (2): net/smc: Ensure the active closing peer first closes clcsock net/smc: Don't call clcsock shutdown twice when smc shutdown Trond Myklebust (1): NFSv42: Don't fail clone() unless the OP_CLONE operation failed Wen Yang (1): PCI: aardvark: Fix a leaked reference by adding missing of_node_put() yangxingwu (1): netfilter: ipvs: Fix reuse connection if RS weight is 0

2 years, 10 months

1
1
0 0

Linux 5.4.163

by Greg Kroah-Hartman

I'm announcing the release of the 5.4.163 kernel. All users of the 5.4 kernel series must upgrade. The updated 5.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/devicetree/bindings/pinctrl/marvell,armada-37xx-pinctrl.txt | 8 Documentation/networking/ipvs-sysctl.txt | 3 Makefile | 2 arch/arm/boot/dts/bcm5301x.dtsi | 4 arch/arm/mach-socfpga/core.h | 2 arch/arm/mach-socfpga/platsmp.c | 8 arch/arm64/boot/dts/marvell/armada-3720-db.dts | 3 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 1 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 4 arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 arch/mips/Kconfig | 2 arch/parisc/kernel/vmlinux.lds.S | 3 arch/powerpc/kvm/book3s_hv_builtin.c | 5 arch/s390/mm/pgtable.c | 13 drivers/android/binder.c | 2 drivers/block/xen-blkfront.c | 126 +- drivers/firmware/arm_scmi/scmi_pm_domain.c | 4 drivers/gpu/drm/vc4/vc4_bo.c | 2 drivers/hid/wacom_wac.c | 8 drivers/hid/wacom_wac.h | 1 drivers/media/cec/cec-adap.c | 1 drivers/mmc/host/sdhci.c | 21 drivers/mmc/host/sdhci.h | 4 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 30 drivers/net/ethernet/intel/igb/igb_main.c | 2 drivers/net/ethernet/mscc/ocelot.c | 11 drivers/net/ethernet/netronome/nfp/nfp_net.h | 3 drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 drivers/net/phy/mdio-aspeed.c | 7 drivers/net/xen-netfront.c | 255 ++-- drivers/nvme/target/io-cmd-file.c | 4 drivers/nvme/target/tcp.c | 7 drivers/pci/controller/pci-aardvark.c | 576 ++++++++-- drivers/pci/pci-bridge-emul.c | 11 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 17 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 drivers/scsi/scsi_sysfs.c | 2 drivers/staging/fbtft/fb_ssd1351.c | 4 drivers/staging/fbtft/fbtft-core.c | 9 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 drivers/tty/hvc/hvc_xen.c | 17 drivers/usb/core/hub.c | 23 drivers/usb/dwc2/gadget.c | 17 drivers/usb/dwc2/hcd_queue.c | 2 drivers/usb/serial/option.c | 5 drivers/usb/typec/tcpm/fusb302.c | 6 drivers/vhost/vsock.c | 2 drivers/xen/xenbus/xenbus_probe.c | 27 fs/cifs/file.c | 35 fs/f2fs/node.c | 1 fs/fuse/dev.c | 10 fs/nfs/nfs42xdr.c | 3 fs/proc/vmcore.c | 16 include/linux/ipc_namespace.h | 15 include/linux/sched/task.h | 2 include/net/ip6_fib.h | 1 include/net/ipv6_stubs.h | 1 include/net/nfc/nci_core.h | 1 include/net/nl802154.h | 7 include/xen/interface/io/ring.h | 293 ++--- ipc/shm.c | 189 ++- kernel/power/hibernate.c | 6 kernel/trace/trace.h | 24 kernel/trace/trace_events.c | 7 kernel/trace/trace_uprobe.c | 1 net/8021q/vlan.c | 3 net/8021q/vlan_dev.c | 3 net/ipv4/nexthop.c | 35 net/ipv4/tcp_cubic.c | 5 net/ipv6/af_inet6.c | 1 net/ipv6/ip6_output.c | 2 net/ipv6/route.c | 19 net/ncsi/ncsi-cmd.c | 24 net/netfilter/ipvs/ip_vs_core.c | 8 net/nfc/nci/core.c | 19 net/smc/af_smc.c | 8 net/smc/smc_close.c | 6 sound/pci/ctxfi/ctamixer.c | 14 sound/pci/ctxfi/ctdaio.c | 16 sound/pci/ctxfi/ctresource.c | 7 sound/pci/ctxfi/ctresource.h | 4 sound/pci/ctxfi/ctsrc.c | 7 sound/soc/qcom/qdsp6/q6routing.c | 6 sound/soc/soc-topology.c | 3 85 files changed, 1463 insertions(+), 616 deletions(-) Adrian Hunter (1): mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB Alexander Aring (1): net: ieee802154: handle iftypes as u32 Alexander Mikhalitsyn (1): shm: extend forced shm destroy to support objects from several IPC nses Dan Carpenter (2): staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect() drm/vc4: fix error code in vc4_create_object() Daniele Palmas (1): USB: serial: option: add Telit LE910S1 0x9200 composition David Hildenbrand (2): proc/vmcore: fix clearing user buffer by properly using clear_user() s390/mm: validate VMA in PGSTE manipulation functions Diana Wang (1): nfp: checking parameter process for rx-usecs/tx-usecs is invalid Dylan Hung (1): mdio: aspeed: Fix "Link is Down" issue Eric Dumazet (2): ipv6: fix typos in __ip6_finish_output() tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows Florian Fainelli (2): ARM: dts: BCM5301X: Fix I2C controller interrupt ARM: dts: BCM5301X: Add interrupt properties to GPIO node Greg Kroah-Hartman (1): Linux 5.4.163 Grzegorz Jaszczyk (1): PCI: aardvark: Fix big endian support Guangbin Huang (1): net: hns3: fix VF RSS failed problem after PF enable multi-TCs Hans Verkuil (1): media: cec: copy sequence field for the reply Helge Deller (1): Revert "parisc: Fix backtrace to always include init funtion names" Huang Pei (1): MIPS: use 3-level pgtable for 64KB page size on MIPS_VA_BITS_48 Jason Gerecke (1): HID: wacom: Use "Confidence" flag to prevent reporting invalid contacts Jesse Brandeburg (1): igb: fix netpoll exit with traffic Jiri Olsa (1): tracing/uprobe: Fix uprobe_perf_open probes iteration Juergen Gross (9): xen: sync include/xen/interface/io/ring.h with Xen's newest version xen/blkfront: read response from backend only once xen/blkfront: don't take local copy of a request from the ring page xen/blkfront: don't trust the backend response data blindly xen/netfront: read response from backend only once xen/netfront: don't read data from request on the ring page xen/netfront: disentangle tx_skb_freelist xen/netfront: don't trust the backend response data blindly tty: hvc: replace BUG_ON() with negative return value Kumar Thangavel (1): net/ncsi : Add payload to be 32-bit aligned to fix dropped packets Lin Ma (1): NFC: add NCI_UNREG flag to eliminate the race Marek Behún (4): PCI: aardvark: Deduplicate code in advk_pcie_rd_conf() PCI: aardvark: Improve link training pinctrl: armada-37xx: Correct PWM pins definitions arm64: dts: marvell: armada-37xx: Set pcie_reset_pin to gpio function Mathias Nyman (2): usb: hub: Fix usb enumeration issue due to address0 race usb: hub: Fix locking issues with address0_mutex Maurizio Lombardi (1): nvmet: use IOCB_NOWAIT only if the filesystem supports it Mike Christie (1): scsi: core: sysfs: Fix setting device state to SDEV_RUNNING Miklos Szeredi (1): fuse: release pipe buf after last use Minas Harutyunyan (1): usb: dwc2: gadget: Fix ISOC flow for elapsed frames Mingjie Zhang (1): USB: serial: option: add Fibocom FM101-GL variants Nathan Chancellor (1): usb: dwc2: hcd_queue: Fix use of floating point literal Nicholas Piggin (1): KVM: PPC: Book3S HV: Prevent POWER7/8 TLB flush flushing SLB Nikolay Aleksandrov (3): net: nexthop: fix null pointer dereference when IPv6 is not enabled net: ipv6: add fib6_nh_release_dsts stub net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group Nitesh B Venkatesh (1): iavf: Prevent changing static ITR values if adaptive moderation is on Noralf Trønnes (1): staging/fbtft: Fix backlight Ondrej Jirman (1): usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts Pali Rohár (15): PCI: aardvark: Train link immediately after enabling training PCI: aardvark: Issue PERST via GPIO PCI: aardvark: Replace custom macros by standard linux/pci_regs.h macros PCI: aardvark: Don't touch PCIe registers if no card connected PCI: aardvark: Fix compilation on s390 PCI: aardvark: Move PCIe reset card code to advk_pcie_train_link() PCI: aardvark: Update comment about disabling link training PCI: aardvark: Configure PCIe resources from 'ranges' DT property PCI: aardvark: Fix PCIe Max Payload Size setting PCI: aardvark: Implement re-issuing config requests on CRS response PCI: aardvark: Simplify initialization of rootcap on virtual bridge PCI: aardvark: Fix link training PCI: aardvark: Fix support for bus mastering and PCI_COMMAND on emulated bridge PCI: aardvark: Set PCI Bridge Class Code to PCI Bridge PCI: aardvark: Fix support for PCI_BRIDGE_CTL_BUS_RESET on emulated bridge Peng Fan (1): firmware: arm_scmi: pm: Propagate return value to caller Remi Pommarel (1): PCI: aardvark: Wait for endpoint to be ready before training link Russell King (1): PCI: pci-bridge-emul: Fix array overruns, improve safety Sreekanth Reddy (1): scsi: mpt3sas: Fix kernel panic during drive powercycle test Srinivas Kandagatla (1): ASoC: qdsp6: q6routing: Conditionally reset FrontEnd Mixer Stefano Garzarella (1): vhost/vsock: fix incorrect used length reported to the guest Stefano Stabellini (2): xen: don't continue xenstore initialization in case of errors xen: detect uninitialized xenbus in xenbus_init Steve French (1): smb3: do not error on fsync when readonly Steven Rostedt (VMware) (2): tracing: Fix pid filtering when triggers are attached tracing: Check pid filtering when creating events Takashi Iwai (3): ALSA: ctxfi: Fix out-of-range access ASoC: topology: Add missing rwsem around snd_ctl_remove() calls ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE Thomas Zeitlhofer (1): PM: hibernate: use correct mode for swsusp_close() Todd Kjos (1): binder: fix test regression due to sender_euid change Tony Lu (2): net/smc: Ensure the active closing peer first closes clcsock net/smc: Don't call clcsock shutdown twice when smc shutdown Trond Myklebust (1): NFSv42: Don't fail clone() unless the OP_CLONE operation failed Varun Prakash (1): nvmet-tcp: fix incomplete data digest send Vladimir Oltean (2): net: mscc: ocelot: don't downgrade timestamping RX filters in SIOCSHWTSTAMP net: mscc: ocelot: correctly report the timestamping RX filters in ethtool Weichao Guo (1): f2fs: set SBI_NEED_FSCK flag when inconsistent node block found Ziyang Xuan (1): net: vlan: fix underflow for the real_dev refcnt yangxingwu (1): netfilter: ipvs: Fix reuse connection if RS weight is 0

2 years, 10 months

1
1
0 0

Linux 5.10.83

by Greg Kroah-Hartman

I'm announcing the release of the 5.10.83 kernel. All users of the 5.10 kernel series must upgrade. The updated 5.10.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/networking/ipvs-sysctl.rst | 3 Makefile | 2 arch/arm/boot/dts/bcm2711.dtsi | 8 arch/arm/boot/dts/bcm5301x.dtsi | 4 arch/arm/mach-socfpga/core.h | 2 arch/arm/mach-socfpga/platsmp.c | 8 arch/mips/Kconfig | 2 arch/mips/kernel/cpu-probe.c | 4 arch/parisc/kernel/vmlinux.lds.S | 3 arch/powerpc/kernel/head_32.h | 6 arch/powerpc/kvm/book3s_hv_builtin.c | 5 arch/s390/mm/pgtable.c | 13 drivers/acpi/property.c | 11 drivers/android/binder.c | 2 drivers/block/xen-blkfront.c | 126 +++-- drivers/firmware/arm_scmi/scmi_pm_domain.c | 4 drivers/firmware/smccc/soc_id.c | 2 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 46 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c | 6 drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c | 6 drivers/gpu/drm/vc4/vc4_bo.c | 2 drivers/hid/wacom_wac.c | 8 drivers/hid/wacom_wac.h | 1 drivers/iommu/amd/iommu_v2.c | 6 drivers/media/cec/core/cec-adap.c | 1 drivers/mmc/host/sdhci-esdhc-imx.c | 2 drivers/mmc/host/sdhci.c | 21 drivers/mmc/host/sdhci.h | 4 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 30 + drivers/net/ethernet/intel/ice/ice_lib.c | 9 drivers/net/ethernet/intel/ice/ice_main.c | 18 drivers/net/ethernet/intel/igb/igb_main.c | 2 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 drivers/net/ethernet/marvell/prestera/prestera_switchdev.c | 6 drivers/net/ethernet/mellanox/mlxsw/minimal.c | 4 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 5 drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 3 drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 4 drivers/net/ethernet/microchip/lan743x_main.c | 12 drivers/net/ethernet/mscc/ocelot.c | 11 drivers/net/ethernet/netronome/nfp/nfp_net.h | 3 drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 139 +++--- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 44 ++ drivers/net/mdio/mdio-aspeed.c | 7 drivers/net/phy/phylink.c | 26 + drivers/net/xen-netfront.c | 272 +++++++----- drivers/nvme/target/io-cmd-file.c | 4 drivers/nvme/target/tcp.c | 7 drivers/pci/controller/pci-aardvark.c | 235 ++++------ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 drivers/scsi/scsi_debug.c | 5 drivers/scsi/scsi_sysfs.c | 2 drivers/staging/fbtft/fb_ssd1351.c | 4 drivers/staging/fbtft/fbtft-core.c | 9 drivers/staging/greybus/audio_helper.c | 8 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 drivers/tty/hvc/hvc_xen.c | 17 drivers/usb/chipidea/ci_hdrc_imx.c | 18 drivers/usb/core/hub.c | 24 - drivers/usb/dwc2/gadget.c | 17 drivers/usb/dwc2/hcd_queue.c | 2 drivers/usb/dwc3/gadget.c | 39 + drivers/usb/serial/option.c | 5 drivers/usb/typec/tcpm/fusb302.c | 6 drivers/vhost/vsock.c | 2 drivers/xen/xenbus/xenbus_probe.c | 27 + fs/ceph/super.c | 11 fs/cifs/file.c | 35 + fs/erofs/utils.c | 8 fs/f2fs/node.c | 1 fs/fuse/dev.c | 10 fs/nfs/nfs42xdr.c | 3 fs/proc/vmcore.c | 16 include/linux/bpf.h | 3 include/linux/ipc_namespace.h | 15 include/linux/sched/task.h | 2 include/net/ip6_fib.h | 1 include/net/ipv6_stubs.h | 1 include/net/nl802154.h | 7 include/xen/interface/io/ring.h | 278 +++++++------ ipc/shm.c | 189 ++++++-- kernel/bpf/syscall.c | 57 +- kernel/bpf/verifier.c | 17 kernel/cpu.c | 7 kernel/power/hibernate.c | 6 kernel/sched/core.c | 4 kernel/trace/trace.h | 24 - kernel/trace/trace_events.c | 10 kernel/trace/trace_uprobe.c | 1 net/8021q/vlan.c | 3 net/8021q/vlan_dev.c | 3 net/ipv4/nexthop.c | 35 + net/ipv4/tcp.c | 4 net/ipv4/tcp_cubic.c | 5 net/ipv6/af_inet6.c | 1 net/ipv6/ip6_output.c | 2 net/ipv6/route.c | 19 net/mptcp/options.c | 3 net/ncsi/ncsi-cmd.c | 24 - net/netfilter/ipvs/ip_vs_core.c | 8 net/netfilter/nf_conntrack_netlink.c | 6 net/netfilter/nf_flow_table_offload.c | 4 net/sched/sch_ets.c | 8 net/smc/af_smc.c | 12 net/smc/smc_close.c | 6 net/smc/smc_core.c | 35 - net/tls/tls_main.c | 47 +- net/tls/tls_sw.c | 23 - sound/hda/intel-dsp-config.c | 9 sound/pci/ctxfi/ctamixer.c | 14 sound/pci/ctxfi/ctdaio.c | 16 sound/pci/ctxfi/ctresource.c | 7 sound/pci/ctxfi/ctresource.h | 4 sound/pci/ctxfi/ctsrc.c | 7 sound/pci/hda/patch_realtek.c | 28 + sound/soc/codecs/wcd934x.c | 3 sound/soc/qcom/qdsp6/q6asm-dai.c | 19 sound/soc/qcom/qdsp6/q6routing.c | 6 sound/soc/soc-topology.c | 3 124 files changed, 1596 insertions(+), 841 deletions(-) Adrian Hunter (1): mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB Albert Wang (1): usb: dwc3: gadget: Fix null pointer exception Alex Deucher (1): drm/amdgpu/gfx9: switch to golden tsc registers for renoir+ Alexander Aring (1): net: ieee802154: handle iftypes as u32 Alexander Mikhalitsyn (1): shm: extend forced shm destroy to support objects from several IPC nses Amit Cohen (1): mlxsw: spectrum: Protect driver from buggy firmware Arjun Roy (1): tcp: correctly handle increased zerocopy args struct size Christophe Leroy (1): powerpc/32: Fix hardlockup on vmap stack overflow Dan Carpenter (4): usb: chipidea: ci_hdrc_imx: fix potential error pointer dereference in probe staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect() drm/nouveau/acr: fix a couple NULL vs IS_ERR() checks drm/vc4: fix error code in vc4_create_object() Daniel Borkmann (1): bpf: Fix toctou on read-only map's constant scalar tracking Daniele Palmas (1): USB: serial: option: add Telit LE910S1 0x9200 composition Danielle Ratson (1): mlxsw: Verify the accessed index doesn't exceed the array length David Hildenbrand (2): proc/vmcore: fix clearing user buffer by properly using clear_user() s390/mm: validate VMA in PGSTE manipulation functions Davide Caratti (1): net/sched: sch_ets: don't peek at classes beyond 'nbands' Diana Wang (1): nfp: checking parameter process for rx-usecs/tx-usecs is invalid Dylan Hung (1): mdio: aspeed: Fix "Link is Down" issue Eric Dumazet (3): mptcp: fix delack timer ipv6: fix typos in __ip6_finish_output() tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows Florent Fourcot (2): netfilter: ctnetlink: fix filtering with CTA_TUPLE_REPLY netfilter: ctnetlink: do not erase error code with EINVAL Florian Fainelli (3): ARM: dts: BCM5301X: Fix I2C controller interrupt ARM: dts: BCM5301X: Add interrupt properties to GPIO node ARM: dts: bcm2711: Fix PCIe interrupts Greg Kroah-Hartman (1): Linux 5.10.83 Guangbin Huang (1): net: hns3: fix VF RSS failed problem after PF enable multi-TCs Guo DaXing (1): net/smc: Fix loop in smc_listen Hans Verkuil (1): media: cec: copy sequence field for the reply Heiner Kallweit (1): lan743x: fix deadlock in lan743x_phy_link_status_change() Helge Deller (1): Revert "parisc: Fix backtrace to always include init funtion names" Holger Assmann (1): net: stmmac: retain PTP clock time during SIOCSHWTSTAMP ioctls Huang Jianan (1): erofs: fix deadlock when shrink erofs slab Huang Pei (2): MIPS: loongson64: fix FTLB configuration MIPS: use 3-level pgtable for 64KB page size on MIPS_VA_BITS_48 Jakub Kicinski (2): tls: splice_read: fix record type check tls: fix replacing proto_ops Jason Gerecke (1): HID: wacom: Use "Confidence" flag to prevent reporting invalid contacts Jeff Layton (1): ceph: properly handle statfs on multifs setups Jesse Brandeburg (1): igb: fix netpoll exit with traffic Jiri Olsa (1): tracing/uprobe: Fix uprobe_perf_open probes iteration Joakim Zhang (2): net: stmmac: fix system hang caused by eee_ctrl_timer during suspend/resume net: stmmac: platform: fix build warning when with !CONFIG_PM_SLEEP Joerg Roedel (1): iommu/amd: Clarify AMD IOMMUv2 initialization messages Juergen Gross (9): xen: sync include/xen/interface/io/ring.h with Xen's newest version xen/blkfront: read response from backend only once xen/blkfront: don't take local copy of a request from the ring page xen/blkfront: don't trust the backend response data blindly xen/netfront: read response from backend only once xen/netfront: don't read data from request on the ring page xen/netfront: disentangle tx_skb_freelist xen/netfront: don't trust the backend response data blindly tty: hvc: replace BUG_ON() with negative return value Karsten Graul (1): net/smc: Fix NULL pointer dereferencing in smc_vlan_by_tcpsk() Kumar Thangavel (1): net/ncsi : Add payload to be 32-bit aligned to fix dropped packets Maciej Fijalkowski (1): ice: fix vsi->txq_map sizing Marek Behún (2): PCI: aardvark: Deduplicate code in advk_pcie_rd_conf() net: marvell: mvpp2: increase MTU limit when XDP enabled Mark Rutland (1): sched/scs: Reset task stack state in bringup_cpu() Marta Plantykow (1): ice: avoid bpf_prog refcount underflow Mathias Nyman (2): usb: hub: Fix usb enumeration issue due to address0 race usb: hub: Fix locking issues with address0_mutex Maurizio Lombardi (1): nvmet: use IOCB_NOWAIT only if the filesystem supports it Michael Kelley (1): firmware: smccc: Fix check for ARCH_SOC_ID not implemented Mike Christie (1): scsi: core: sysfs: Fix setting device state to SDEV_RUNNING Miklos Szeredi (1): fuse: release pipe buf after last use Minas Harutyunyan (1): usb: dwc2: gadget: Fix ISOC flow for elapsed frames Mingjie Zhang (1): USB: serial: option: add Fibocom FM101-GL variants Nathan Chancellor (1): usb: dwc2: hcd_queue: Fix use of floating point literal Nicholas Kazlauskas (1): drm/amd/display: Set plane update flags for all planes in reset Nicholas Piggin (1): KVM: PPC: Book3S HV: Prevent POWER7/8 TLB flush flushing SLB Nikolay Aleksandrov (3): net: nexthop: fix null pointer dereference when IPv6 is not enabled net: ipv6: add fib6_nh_release_dsts stub net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group Nitesh B Venkatesh (1): iavf: Prevent changing static ITR values if adaptive moderation is on Noralf Trønnes (1): staging/fbtft: Fix backlight Ondrej Jirman (1): usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts Pali Rohár (4): PCI: aardvark: Update comment about disabling link training PCI: aardvark: Implement re-issuing config requests on CRS response PCI: aardvark: Simplify initialization of rootcap on virtual bridge PCI: aardvark: Fix link training Peng Fan (1): firmware: arm_scmi: pm: Propagate return value to caller Pierre-Louis Bossart (1): ALSA: intel-dsp-config: add quirk for JSL devices based on ES8336 codec Russell King (Oracle) (2): net: phylink: Force link down and retrigger resolve on interface change net: phylink: Force retrigger in case of latched link-fail indicator Sakari Ailus (1): ACPI: Get acpi_device's parent from the parent field Shin'ichiro Kawasaki (1): scsi: scsi_debug: Zero clear zones at reset write pointer Sreekanth Reddy (1): scsi: mpt3sas: Fix kernel panic during drive powercycle test Srinivas Kandagatla (3): ASoC: qdsp6: q6routing: Conditionally reset FrontEnd Mixer ASoC: qdsp6: q6asm: fix q6asm_dai_prepare error handling ASoC: codecs: wcd934x: return error code correctly from hw_params Stefano Garzarella (1): vhost/vsock: fix incorrect used length reported to the guest Stefano Stabellini (2): xen: don't continue xenstore initialization in case of errors xen: detect uninitialized xenbus in xenbus_init Steve French (1): smb3: do not error on fsync when readonly Steven Rostedt (VMware) (2): tracing: Fix pid filtering when triggers are attached tracing: Check pid filtering when creating events Takashi Iwai (5): ALSA: ctxfi: Fix out-of-range access ALSA: hda/realtek: Fix LED on HP ProBook 435 G7 staging: greybus: Add missing rwsem around snd_ctl_remove() calls ASoC: topology: Add missing rwsem around snd_ctl_remove() calls ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE Thinh Nguyen (2): usb: dwc3: gadget: Ignore NoStream after End Transfer usb: dwc3: gadget: Check for L1/L2/U3 for Start Transfer Thomas Zeitlhofer (1): PM: hibernate: use correct mode for swsusp_close() Tim Harvey (1): mmc: sdhci-esdhc-imx: disable CMDQ support Todd Kjos (1): binder: fix test regression due to sender_euid change Tony Lu (2): net/smc: Ensure the active closing peer first closes clcsock net/smc: Don't call clcsock shutdown twice when smc shutdown Trond Myklebust (1): NFSv42: Don't fail clone() unless the OP_CLONE operation failed Varun Prakash (1): nvmet-tcp: fix incomplete data digest send Vladimir Oltean (2): net: mscc: ocelot: don't downgrade timestamping RX filters in SIOCSHWTSTAMP net: mscc: ocelot: correctly report the timestamping RX filters in ethtool Volodymyr Mytnyk (1): net: marvell: prestera: fix double free issue on err path Weichao Guo (1): f2fs: set SBI_NEED_FSCK flag when inconsistent node block found Werner Sembach (1): ALSA: hda/realtek: Add quirk for ASRock NUC Box 1100 Will Mortensen (1): netfilter: flowtable: fix IPv6 tunnel addr match Ziyang Xuan (1): net: vlan: fix underflow for the real_dev refcnt yangxingwu (1): netfilter: ipvs: Fix reuse connection if RS weight is 0

2 years, 10 months

1
1
0 0

Linux 5.15.6

by Greg Kroah-Hartman

I'm announcing the release of the 5.15.6 kernel. All users of the 5.15 kernel series must upgrade. The updated 5.15.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.15.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/admin-guide/sysctl/kernel.rst | 2 Documentation/networking/ipvs-sysctl.rst | 3 Makefile | 2 arch/arm/boot/dts/bcm2711.dtsi | 8 arch/arm/boot/dts/bcm5301x.dtsi | 4 arch/arm/mach-socfpga/core.h | 2 arch/arm/mach-socfpga/platsmp.c | 8 arch/arm64/include/asm/pgalloc.h | 2 arch/arm64/include/asm/uaccess.h | 48 ++ arch/mips/Kconfig | 2 arch/mips/kernel/cpu-probe.c | 4 arch/parisc/kernel/vmlinux.lds.S | 3 arch/powerpc/kernel/head_32.h | 6 arch/powerpc/kvm/book3s_hv_builtin.c | 5 arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts | 13 arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 33 - arch/x86/include/asm/xen/hypervisor.h | 5 block/blk-core.c | 4 block/blk-mq.c | 13 block/blk-mq.h | 2 block/blk-sysfs.c | 10 block/elevator.c | 10 block/genhd.c | 2 drivers/acpi/cppc_acpi.c | 9 drivers/acpi/property.c | 11 drivers/android/binder.c | 2 drivers/cpufreq/intel_pstate.c | 7 drivers/firmware/arm_scmi/base.c | 15 drivers/firmware/arm_scmi/scmi_pm_domain.c | 4 drivers/firmware/arm_scmi/sensors.c | 2 drivers/firmware/arm_scmi/virtio.c | 10 drivers/firmware/arm_scmi/voltage.c | 2 drivers/firmware/smccc/soc_id.c | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 3 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 15 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 46 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 20 drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 24 - drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 6 drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 28 - drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 10 drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 58 +- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 19 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 22 + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c | 6 drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c | 6 drivers/gpu/drm/vc4/vc4_bo.c | 2 drivers/hid/hid-input.c | 6 drivers/hid/hid-magicmouse.c | 7 drivers/hid/wacom_wac.c | 8 drivers/hid/wacom_wac.h | 1 drivers/i2c/busses/i2c-virtio.c | 14 drivers/iommu/amd/iommu_v2.c | 6 drivers/iommu/intel/iommu.c | 6 drivers/iommu/rockchip-iommu.c | 4 drivers/media/cec/core/cec-adap.c | 1 drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 41 -- drivers/mmc/host/sdhci-esdhc-imx.c | 2 drivers/mmc/host/sdhci.c | 21 - drivers/mmc/host/sdhci.h | 4 drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 drivers/net/ethernet/intel/iavf/iavf.h | 3 drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 33 + drivers/net/ethernet/intel/iavf/iavf_main.c | 51 +- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 47 ++ drivers/net/ethernet/intel/ice/ice_lib.c | 9 drivers/net/ethernet/intel/ice/ice_main.c | 18 drivers/net/ethernet/intel/igb/igb_main.c | 2 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 drivers/net/ethernet/marvell/prestera/prestera_switchdev.c | 8 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 drivers/net/ethernet/microchip/lan743x_main.c | 12 drivers/net/ethernet/mscc/ocelot.c | 11 drivers/net/ethernet/netronome/nfp/nfp_net.h | 3 drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 127 ++++-- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 drivers/net/ipa/ipa_cmd.c | 16 drivers/net/ipa/ipa_cmd.h | 6 drivers/net/ipa/ipa_endpoint.c | 2 drivers/net/ipa/ipa_main.c | 6 drivers/net/ipa/ipa_modem.c | 6 drivers/net/ipa/ipa_smp2p.c | 21 - drivers/net/ipa/ipa_smp2p.h | 7 drivers/net/mdio/mdio-aspeed.c | 7 drivers/net/phy/phylink.c | 26 + drivers/net/usb/smsc95xx.c | 55 +- drivers/nvme/target/io-cmd-file.c | 4 drivers/nvme/target/tcp.c | 7 drivers/pci/controller/pci-aardvark.c | 242 ++++-------- drivers/scsi/mpt3sas/mpt3sas_base.c | 4 drivers/scsi/mpt3sas/mpt3sas_base.h | 4 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 59 ++ drivers/scsi/qla2xxx/qla_edif.c | 2 drivers/scsi/scsi_debug.c | 5 drivers/scsi/scsi_sysfs.c | 2 drivers/scsi/sd.c | 7 drivers/staging/fbtft/fb_ssd1351.c | 4 drivers/staging/fbtft/fbtft-core.c | 9 drivers/staging/greybus/audio_helper.c | 8 drivers/staging/r8188eu/core/rtw_mlme_ext.c | 6 drivers/staging/r8188eu/os_dep/ioctl_linux.c | 8 drivers/staging/r8188eu/os_dep/mlme_linux.c | 2 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 drivers/usb/chipidea/ci_hdrc_imx.c | 18 drivers/usb/core/hub.c | 24 - drivers/usb/dwc2/gadget.c | 17 drivers/usb/dwc2/hcd_queue.c | 2 drivers/usb/dwc3/core.c | 8 drivers/usb/dwc3/core.h | 2 drivers/usb/dwc3/gadget.c | 39 + drivers/usb/host/xhci-tegra.c | 41 +- drivers/usb/serial/option.c | 5 drivers/usb/serial/pl2303.c | 1 drivers/usb/typec/tcpm/fusb302.c | 6 drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 drivers/vhost/vsock.c | 2 drivers/xen/xenbus/xenbus_probe.c | 27 + fs/ceph/super.c | 11 fs/cifs/cifs_debug.c | 2 fs/cifs/cifsglob.h | 1 fs/cifs/connect.c | 7 fs/erofs/utils.c | 8 fs/f2fs/checkpoint.c | 3 fs/f2fs/node.c | 1 fs/fuse/dev.c | 10 fs/io_uring.c | 70 ++- fs/iomap/buffered-io.c | 11 fs/ksmbd/smb2pdu.c | 30 - fs/nfs/nfs42proc.c | 4 fs/nfs/nfs42xdr.c | 3 fs/proc/vmcore.c | 16 include/net/ip6_fib.h | 1 include/net/ipv6_stubs.h | 1 include/net/nl802154.h | 7 kernel/cpu.c | 7 kernel/events/core.c | 3 kernel/locking/rwsem.c | 171 ++++---- kernel/power/hibernate.c | 6 kernel/sched/core.c | 4 kernel/trace/trace.h | 24 - kernel/trace/trace_events.c | 10 kernel/trace/trace_uprobe.c | 1 net/8021q/vlan.c | 3 net/8021q/vlan_dev.c | 3 net/ethtool/ioctl.c | 2 net/ipv4/nexthop.c | 35 + net/ipv4/tcp_cubic.c | 5 net/ipv6/af_inet6.c | 1 net/ipv6/ip6_output.c | 2 net/ipv6/route.c | 19 net/mptcp/options.c | 32 - net/mptcp/protocol.c | 51 ++ net/mptcp/protocol.h | 17 net/ncsi/ncsi-cmd.c | 24 - net/netfilter/ipvs/ip_vs_core.c | 8 net/netfilter/nf_conntrack_netlink.c | 6 net/netfilter/nf_flow_table_offload.c | 4 net/sched/sch_ets.c | 8 net/smc/af_smc.c | 12 net/smc/smc_close.c | 6 net/smc/smc_core.c | 35 - net/tls/tls_main.c | 47 +- net/tls/tls_sw.c | 40 + net/unix/af_unix.c | 3 sound/hda/intel-dsp-config.c | 9 sound/pci/ctxfi/ctamixer.c | 14 sound/pci/ctxfi/ctdaio.c | 16 sound/pci/ctxfi/ctresource.c | 7 sound/pci/ctxfi/ctresource.h | 4 sound/pci/ctxfi/ctsrc.c | 7 sound/pci/hda/patch_realtek.c | 28 + sound/soc/codecs/lpass-rx-macro.c | 2 sound/soc/codecs/wcd934x.c | 3 sound/soc/codecs/wcd938x.c | 3 sound/soc/qcom/qdsp6/q6asm-dai.c | 19 sound/soc/qcom/qdsp6/q6routing.c | 6 sound/soc/soc-topology.c | 3 sound/soc/sof/intel/hda-bus.c | 17 sound/soc/sof/intel/hda-dsp.c | 3 sound/soc/sof/intel/hda.c | 16 sound/soc/stm/stm32_i2s.c | 2 186 files changed, 1694 insertions(+), 972 deletions(-) Adamos Ttofari (1): cpufreq: intel_pstate: Add Ice Lake server to out-of-band IDs Adrian Hunter (1): mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB Albert Wang (1): usb: dwc3: gadget: Fix null pointer exception Alex Bee (1): iommu/rockchip: Fix PAGE_DESC_HI_MASKs for RK3568 Alex Deucher (3): drm/amdgpu/pm: fix powerplay OD interface drm/amdgpu/gfx10: add wraparound gpu counter check for APUs as well drm/amdgpu/gfx9: switch to golden tsc registers for renoir+ Alex Elder (3): net: ipa: directly disable ipa-setup-ready interrupt net: ipa: separate disabling setup from modem stop net: ipa: kill ipa_cmd_pipeline_clear() Alex Williamson (1): iommu/vt-d: Fix unmap_pages support Alexander Aring (1): net: ieee802154: handle iftypes as u32 Amit Cohen (1): mlxsw: spectrum: Protect driver from buggy firmware Andreas Gruenbacher (1): iomap: Fix inline extent handling in iomap_readpage Arnd Bergmann (1): media: v4l2-core: fix VIDIOC_DQEVENT handling on non-x86 Ben Skeggs (1): drm/nouveau: recognise GA106 Benjamin Coddington (1): NFSv42: Fix pagecache invalidation after COPY/CLONE Brett Creeley (1): iavf: Fix VLAN feature flags after VFR Chao Yu (1): f2fs: quota: fix potential deadlock Christophe JAILLET (1): ksmbd: Fix an error handling path in 'smb2_sess_setup()' Christophe Leroy (1): powerpc/32: Fix hardlockup on vmap stack overflow Claudia Pellegrino (1): HID: magicmouse: prevent division by 0 on scroll Cristian Marussi (3): firmware: arm_scmi: Fix null de-reference on error path firmware: arm_scmi: Fix type error assignment in voltage protocol firmware: arm_scmi: Fix type error in sensor protocol Damien Le Moal (1): scsi: sd: Fix sd_do_mode_sense() buffer length handling Dan Carpenter (6): usb: chipidea: ci_hdrc_imx: fix potential error pointer dereference in probe staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect() staging: r8188eu: fix a memory leak in rtw_wx_read32() drm/nouveau/acr: fix a couple NULL vs IS_ERR() checks scsi: qla2xxx: edif: Fix off by one bug in qla_edif_app_getfcinfo() drm/vc4: fix error code in vc4_create_object() Daniele Palmas (1): USB: serial: option: add Telit LE910S1 0x9200 composition David Hildenbrand (1): proc/vmcore: fix clearing user buffer by properly using clear_user() Davide Caratti (1): net/sched: sch_ets: don't peek at classes beyond 'nbands' Diana Wang (1): nfp: checking parameter process for rx-usecs/tx-usecs is invalid Dmitry Osipenko (1): usb: xhci: tegra: Check padctrl interrupt presence in device tree Dylan Hung (1): mdio: aspeed: Fix "Link is Down" issue Eric Dumazet (3): mptcp: fix delack timer ipv6: fix typos in __ip6_finish_output() tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows Fabio Aiuto (1): usb: dwc3: leave default DMA for PCI devices Fabio M. De Francesco (1): staging: r8188eu: Use kzalloc() with GFP_ATOMIC in atomic context Florent Fourcot (2): netfilter: ctnetlink: fix filtering with CTA_TUPLE_REPLY netfilter: ctnetlink: do not erase error code with EINVAL Florian Fainelli (3): ARM: dts: BCM5301X: Fix I2C controller interrupt ARM: dts: BCM5301X: Add interrupt properties to GPIO node ARM: dts: bcm2711: Fix PCIe interrupts Greg Kroah-Hartman (1): Linux 5.15.6 Guangbin Huang (1): net: hns3: fix VF RSS failed problem after PF enable multi-TCs Guo DaXing (1): net/smc: Fix loop in smc_listen Hans Verkuil (1): media: cec: copy sequence field for the reply Hans de Goede (1): HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields Heiner Kallweit (1): lan743x: fix deadlock in lan743x_phy_link_status_change() Helge Deller (1): Revert "parisc: Fix backtrace to always include init funtion names" Holger Assmann (1): net: stmmac: retain PTP clock time during SIOCSHWTSTAMP ioctls Huang Jianan (1): erofs: fix deadlock when shrink erofs slab Huang Pei (2): MIPS: loongson64: fix FTLB configuration MIPS: use 3-level pgtable for 64KB page size on MIPS_VA_BITS_48 Jakub Kicinski (3): tls: splice_read: fix record type check tls: splice_read: fix accessing pre-processed records tls: fix replacing proto_ops Jason Gerecke (1): HID: wacom: Use "Confidence" flag to prevent reporting invalid contacts Jedrzej Jagielski (1): iavf: Fix refreshing iavf adapter stats on ethtool request Jeff Layton (1): ceph: properly handle statfs on multifs setups Jesse Brandeburg (1): igb: fix netpoll exit with traffic Jie Wang (1): net: hns3: fix incorrect components info of ethtool --reset command Jiri Olsa (1): tracing/uprobe: Fix uprobe_perf_open probes iteration Joel Stanley (1): drm/aspeed: Fix vga_pw sysfs output Joerg Roedel (1): iommu/amd: Clarify AMD IOMMUv2 initialization messages Johan Hovold (1): USB: serial: pl2303: fix GC type detection Juergen Gross (2): x86/pvh: add prototype for xen_pvh_init() xen/pvh: add missing prototype to header Julian Wiedmann (1): ethtool: ioctl: fix potential NULL deref in ethtool_set_coalesce() Kai Vehmanen (1): ASoC: SOF: Intel: hda: fix hotplug when only codec is suspended Karsten Graul (1): net/smc: Fix NULL pointer dereferencing in smc_vlan_by_tcpsk() Krzysztof Kozlowski (2): riscv: dts: microchip: fix board compatible riscv: dts: microchip: drop duplicated MMC/SDHC node Kumar Thangavel (1): net/ncsi : Add payload to be 32-bit aligned to fix dropped packets Larry Finger (1): staging: r8188eu: Fix breakage introduced when 5G code was removed Longpeng (1): vdpa_sim: avoid putting an uninitialized iova_domain Maciej Fijalkowski (1): ice: fix vsi->txq_map sizing Marco Elver (1): perf: Ignore sigtrap for tracepoints destined for other tasks Marek Behún (2): PCI: aardvark: Deduplicate code in advk_pcie_rd_conf() net: marvell: mvpp2: increase MTU limit when XDP enabled Mark Rutland (2): arm64: uaccess: avoid blocking within critical sections sched/scs: Reset task stack state in bringup_cpu() Marta Plantykow (1): ice: avoid bpf_prog refcount underflow Martyn Welch (1): net: usb: Correct PHY handling of smsc95xx Mathias Nyman (2): usb: hub: Fix usb enumeration issue due to address0 race usb: hub: Fix locking issues with address0_mutex Maurizio Lombardi (1): nvmet: use IOCB_NOWAIT only if the filesystem supports it Mauro Carvalho Chehab (1): docs: accounting: update delay-accounting.rst reference Michael Kelley (1): firmware: smccc: Fix check for ARCH_SOC_ID not implemented Michael Straube (1): staging: r8188eu: use GFP_ATOMIC under spinlock Mike Christie (1): scsi: core: sysfs: Fix setting device state to SDEV_RUNNING Miklos Szeredi (1): fuse: release pipe buf after last use Minas Harutyunyan (1): usb: dwc2: gadget: Fix ISOC flow for elapsed frames Ming Lei (2): blk-mq: cancel blk-mq dispatch work in both blk_cleanup_queue and disk_release() block: avoid to quiesce queue in elevator_init_mq Mingjie Zhang (1): USB: serial: option: add Fibocom FM101-GL variants Mohammed Gamal (1): drm/hyperv: Fix device removal on Gen1 VMs Namjae Jeon (3): ksmbd: downgrade addition info error msg to debug in smb2_get_info_sec() ksmbd: contain default data stream even if xattr is empty ksmbd: fix memleak in get_file_stream_info() Nathan Chancellor (1): usb: dwc2: hcd_queue: Fix use of floating point literal Nicholas Kazlauskas (2): drm/amd/display: Fix DPIA outbox timeout after GPU reset drm/amd/display: Set plane update flags for all planes in reset Nicholas Piggin (1): KVM: PPC: Book3S HV: Prevent POWER7/8 TLB flush flushing SLB Nikolay Aleksandrov (3): net: nexthop: fix null pointer dereference when IPv6 is not enabled net: ipv6: add fib6_nh_release_dsts stub net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group Nitesh B Venkatesh (1): iavf: Prevent changing static ITR values if adaptive moderation is on Noralf Trønnes (1): staging/fbtft: Fix backlight Olivier Moysan (1): ASoC: stm32: i2s: fix 32 bits channel length without mclk Ondrej Jirman (1): usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts Pali Rohár (3): PCI: aardvark: Implement re-issuing config requests on CRS response PCI: aardvark: Simplify initialization of rootcap on virtual bridge PCI: aardvark: Fix link training Paolo Abeni (1): mptcp: use delegate action to schedule 3rd ack retrans Pavel Begunkov (3): io_uring: correct link-list traversal locking io_uring: fail cancellation for EXITING tasks io_uring: fix link traversal locking Peng Fan (1): firmware: arm_scmi: pm: Propagate return value to caller Philip Yang (1): drm/amdgpu: IH process reset count when restart Pierre-Louis Bossart (1): ALSA: intel-dsp-config: add quirk for JSL devices based on ES8336 codec Pingfan Liu (1): arm64: mm: Fix VM_BUG_ON(mm != &init_mm) for trans_pgd Rafael J. Wysocki (2): ACPI: CPPC: Add NULL pointer check to cppc_get_perf() cpufreq: intel_pstate: Fix active mode offline/online EPP handling Roman Li (1): drm/amd/display: Fix OLED brightness control on eDP Russell King (Oracle) (2): net: phylink: Force link down and retrigger resolve on interface change net: phylink: Force retrigger in case of latched link-fail indicator Sakari Ailus (1): ACPI: Get acpi_device's parent from the parent field Shin'ichiro Kawasaki (1): scsi: scsi_debug: Zero clear zones at reset write pointer Shyam Prasad N (2): cifs: nosharesock should not share socket with future sessions cifs: nosharesock should be set on new server Sreekanth Reddy (3): scsi: mpt3sas: Fix kernel panic during drive powercycle test scsi: mpt3sas: Fix system going into read-only mode scsi: mpt3sas: Fix incorrect system timestamp Srinivas Kandagatla (5): ASoC: qdsp6: q6routing: Conditionally reset FrontEnd Mixer ASoC: qdsp6: q6asm: fix q6asm_dai_prepare error handling ASoC: codecs: wcd938x: fix volatile register range ASoC: codecs: wcd934x: return error code correctly from hw_params ASoC: codecs: lpass-rx-macro: fix HPHR setting CLSH mask Stefano Garzarella (1): vhost/vsock: fix incorrect used length reported to the guest Stefano Stabellini (2): xen: don't continue xenstore initialization in case of errors xen: detect uninitialized xenbus in xenbus_init Steven Rostedt (VMware) (2): tracing: Fix pid filtering when triggers are attached tracing: Check pid filtering when creating events Takashi Iwai (5): ALSA: ctxfi: Fix out-of-range access ALSA: hda/realtek: Fix LED on HP ProBook 435 G7 staging: greybus: Add missing rwsem around snd_ctl_remove() calls ASoC: topology: Add missing rwsem around snd_ctl_remove() calls ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE Thinh Nguyen (3): usb: dwc3: core: Revise GHWPARAMS9 offset usb: dwc3: gadget: Ignore NoStream after End Transfer usb: dwc3: gadget: Check for L1/L2/U3 for Start Transfer Thomas Weißschuh (1): HID: input: set usage type to key on keycode remap Thomas Zeitlhofer (1): PM: hibernate: use correct mode for swsusp_close() Tim Harvey (1): mmc: sdhci-esdhc-imx: disable CMDQ support Todd Kjos (1): binder: fix test regression due to sender_euid change Tony Lu (2): net/smc: Ensure the active closing peer first closes clcsock net/smc: Don't call clcsock shutdown twice when smc shutdown Trond Myklebust (1): NFSv42: Don't fail clone() unless the OP_CLONE operation failed Varun Prakash (1): nvmet-tcp: fix incomplete data digest send Vincent Guittot (1): firmware: arm_scmi: Fix base agent discover response Vincent Whitchurch (2): af_unix: fix regression in read after shutdown i2c: virtio: disable timeout handling Vladimir Oltean (2): net: mscc: ocelot: don't downgrade timestamping RX filters in SIOCSHWTSTAMP net: mscc: ocelot: correctly report the timestamping RX filters in ethtool Volodymyr Mytnyk (2): net: marvell: prestera: fix brige port operation net: marvell: prestera: fix double free issue on err path Waiman Long (1): locking/rwsem: Make handoff bit handling more consistent Weichao Guo (1): f2fs: set SBI_NEED_FSCK flag when inconsistent node block found Werner Sembach (1): ALSA: hda/realtek: Add quirk for ASRock NUC Box 1100 Will Mortensen (1): netfilter: flowtable: fix IPv6 tunnel addr match Yannick Vignon (1): net: stmmac: Disable Tx queues when reconfiguring the interface Ye Bin (1): io_uring: fix soft lockup when call __io_remove_buffers Ziyang Xuan (1): net: vlan: fix underflow for the real_dev refcnt yangxingwu (1): netfilter: ipvs: Fix reuse connection if RS weight is 0

2 years, 10 months

1
1
0 0

Re: [PATCH net] vrf: Reset IPCB/IP6CB when processing outbound pkts in vrf dev xmit

by Nicolas Dichtel

Le 30/11/2021 à 17:26, Stephen Suryaputra a écrit : > IPCB/IP6CB need to be initialized when processing outbound v4 or v6 pkts > in the codepath of vrf device xmit function so that leftover garbage > doesn't cause futher code that uses the CB to incorrectly process the > pkt. > > One occasion of the issue might occur when MPLS route uses the vrf > device as the outgoing device such as when the route is added using "ip > -f mpls route add <label> dev <vrf>" command. > > The problems seems to exist since day one. Hence I put the day one > commits on the Fixes tags. > > Fixes: 193125dbd8eb ("net: Introduce VRF device driver") > Fixes: 35402e313663 ("net: Add IPv6 support to VRF device") > Signed-off-by: Stephen Suryaputra <ssuryaextr(a)gmail.com> Cc: stable(a)vger.kernel.org Thanks, Nicolas

2 years, 10 months

1
0
0 0

[PATCH V2] ifcvf/vDPA: fix misuse virtio-net device config size for blk dev

by Zhu Lingshan

This commit fixes a misuse of virtio-net device config size issue for virtio-block devices. A new member config_size in struct ifcvf_hw is introduced and would be initialized through vdpa_dev_add() to record correct device config size. To be more generic, rename ifcvf_hw.net_config to ifcvf_hw.dev_config, the helpers ifcvf_read/write_net_config() to ifcvf_read/write_dev_config() Signed-off-by: Zhu Lingshan <lingshan.zhu(a)intel.com> Reported-and-suggested-by: Stefano Garzarella <sgarzare(a)redhat.com> Reviewed-by: Stefano Garzarella <sgarzare(a)redhat.com> Fixes: 6ad31d162a4e ("vDPA/ifcvf: enable Intel C5000X-PL virtio-block for vDPA") Cc: <stable(a)vger.kernel.org> --- drivers/vdpa/ifcvf/ifcvf_base.c | 41 +++++++++++++++++++++++++-------- drivers/vdpa/ifcvf/ifcvf_base.h | 9 +++++--- drivers/vdpa/ifcvf/ifcvf_main.c | 24 ++++--------------- 3 files changed, 41 insertions(+), 33 deletions(-) diff --git a/drivers/vdpa/ifcvf/ifcvf_base.c b/drivers/vdpa/ifcvf/ifcvf_base.c index 2808f1ba9f7b..7d41dfe48ade 100644 --- a/drivers/vdpa/ifcvf/ifcvf_base.c +++ b/drivers/vdpa/ifcvf/ifcvf_base.c @@ -143,8 +143,8 @@ int ifcvf_init_hw(struct ifcvf_hw *hw, struct pci_dev *pdev) IFCVF_DBG(pdev, "hw->isr = %p\n", hw->isr); break; case VIRTIO_PCI_CAP_DEVICE_CFG: - hw->net_cfg = get_cap_addr(hw, &cap); - IFCVF_DBG(pdev, "hw->net_cfg = %p\n", hw->net_cfg); + hw->dev_cfg = get_cap_addr(hw, &cap); + IFCVF_DBG(pdev, "hw->dev_cfg = %p\n", hw->dev_cfg); break; } @@ -153,7 +153,7 @@ int ifcvf_init_hw(struct ifcvf_hw *hw, struct pci_dev *pdev) } if (hw->common_cfg == NULL || hw->notify_base == NULL || - hw->isr == NULL || hw->net_cfg == NULL) { + hw->isr == NULL || hw->dev_cfg == NULL) { IFCVF_ERR(pdev, "Incomplete PCI capabilities\n"); return -EIO; } @@ -174,7 +174,7 @@ int ifcvf_init_hw(struct ifcvf_hw *hw, struct pci_dev *pdev) IFCVF_DBG(pdev, "PCI capability mapping: common cfg: %p, notify base: %p\n, isr cfg: %p, device cfg: %p, multiplier: %u\n", hw->common_cfg, hw->notify_base, hw->isr, - hw->net_cfg, hw->notify_off_multiplier); + hw->dev_cfg, hw->notify_off_multiplier); return 0; } @@ -242,33 +242,54 @@ int ifcvf_verify_min_features(struct ifcvf_hw *hw, u64 features) return 0; } -void ifcvf_read_net_config(struct ifcvf_hw *hw, u64 offset, +u32 ifcvf_get_config_size(struct ifcvf_hw *hw) +{ + struct ifcvf_adapter *adapter; + u32 config_size; + + adapter = vf_to_adapter(hw); + switch (hw->dev_type) { + case VIRTIO_ID_NET: + config_size = sizeof(struct virtio_net_config); + break; + case VIRTIO_ID_BLOCK: + config_size = sizeof(struct virtio_blk_config); + break; + default: + config_size = 0; + IFCVF_ERR(adapter->pdev, "VIRTIO ID %u not supported\n", hw->dev_type); + } + + return config_size; +} + +void ifcvf_read_dev_config(struct ifcvf_hw *hw, u64 offset, void *dst, int length) { u8 old_gen, new_gen, *p; int i; - WARN_ON(offset + length > sizeof(struct virtio_net_config)); + WARN_ON(offset + length > hw->config_size); do { old_gen = ifc_ioread8(&hw->common_cfg->config_generation); p = dst; for (i = 0; i < length; i++) - *p++ = ifc_ioread8(hw->net_cfg + offset + i); + *p++ = ifc_ioread8(hw->dev_cfg + offset + i); new_gen = ifc_ioread8(&hw->common_cfg->config_generation); } while (old_gen != new_gen); } -void ifcvf_write_net_config(struct ifcvf_hw *hw, u64 offset, +void ifcvf_write_dev_config(struct ifcvf_hw *hw, u64 offset, const void *src, int length) { const u8 *p; int i; p = src; - WARN_ON(offset + length > sizeof(struct virtio_net_config)); + WARN_ON(offset + length > hw->config_size); for (i = 0; i < length; i++) - ifc_iowrite8(*p++, hw->net_cfg + offset + i); + ifc_iowrite8(*p++, hw->dev_cfg + offset + i); } static void ifcvf_set_features(struct ifcvf_hw *hw, u64 features) diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h index 09918af3ecf8..c486873f370a 100644 --- a/drivers/vdpa/ifcvf/ifcvf_base.h +++ b/drivers/vdpa/ifcvf/ifcvf_base.h @@ -71,12 +71,14 @@ struct ifcvf_hw { u64 hw_features; u32 dev_type; struct virtio_pci_common_cfg __iomem *common_cfg; - void __iomem *net_cfg; + void __iomem *dev_cfg; struct vring_info vring[IFCVF_MAX_QUEUES]; void __iomem * const *base; char config_msix_name[256]; struct vdpa_callback config_cb; unsigned int config_irq; + /* virtio-net or virtio-blk device config size */ + u32 config_size; }; struct ifcvf_adapter { @@ -105,9 +107,9 @@ int ifcvf_init_hw(struct ifcvf_hw *hw, struct pci_dev *dev); int ifcvf_start_hw(struct ifcvf_hw *hw); void ifcvf_stop_hw(struct ifcvf_hw *hw); void ifcvf_notify_queue(struct ifcvf_hw *hw, u16 qid); -void ifcvf_read_net_config(struct ifcvf_hw *hw, u64 offset, +void ifcvf_read_dev_config(struct ifcvf_hw *hw, u64 offset, void *dst, int length); -void ifcvf_write_net_config(struct ifcvf_hw *hw, u64 offset, +void ifcvf_write_dev_config(struct ifcvf_hw *hw, u64 offset, const void *src, int length); u8 ifcvf_get_status(struct ifcvf_hw *hw); void ifcvf_set_status(struct ifcvf_hw *hw, u8 status); @@ -120,4 +122,5 @@ u16 ifcvf_get_vq_state(struct ifcvf_hw *hw, u16 qid); int ifcvf_set_vq_state(struct ifcvf_hw *hw, u16 qid, u16 num); struct ifcvf_adapter *vf_to_adapter(struct ifcvf_hw *hw); int ifcvf_probed_virtio_net(struct ifcvf_hw *hw); +u32 ifcvf_get_config_size(struct ifcvf_hw *hw); #endif /* _IFCVF_H_ */ diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c index 6dc75ca70b37..92ba7126e5d6 100644 --- a/drivers/vdpa/ifcvf/ifcvf_main.c +++ b/drivers/vdpa/ifcvf/ifcvf_main.c @@ -366,24 +366,9 @@ static u32 ifcvf_vdpa_get_vq_align(struct vdpa_device *vdpa_dev) static size_t ifcvf_vdpa_get_config_size(struct vdpa_device *vdpa_dev) { - struct ifcvf_adapter *adapter = vdpa_to_adapter(vdpa_dev); struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev); - struct pci_dev *pdev = adapter->pdev; - size_t size; - - switch (vf->dev_type) { - case VIRTIO_ID_NET: - size = sizeof(struct virtio_net_config); - break; - case VIRTIO_ID_BLOCK: - size = sizeof(struct virtio_blk_config); - break; - default: - size = 0; - IFCVF_ERR(pdev, "VIRTIO ID %u not supported\n", vf->dev_type); - } - return size; + return vf->config_size; } static void ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev, @@ -392,8 +377,7 @@ static void ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev, { struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev); - WARN_ON(offset + len > sizeof(struct virtio_net_config)); - ifcvf_read_net_config(vf, offset, buf, len); + ifcvf_read_dev_config(vf, offset, buf, len); } static void ifcvf_vdpa_set_config(struct vdpa_device *vdpa_dev, @@ -402,8 +386,7 @@ static void ifcvf_vdpa_set_config(struct vdpa_device *vdpa_dev, { struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev); - WARN_ON(offset + len > sizeof(struct virtio_net_config)); - ifcvf_write_net_config(vf, offset, buf, len); + ifcvf_write_dev_config(vf, offset, buf, len); } static void ifcvf_vdpa_set_config_cb(struct vdpa_device *vdpa_dev, @@ -542,6 +525,7 @@ static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name, vf->vring[i].irq = -EINVAL; vf->hw_features = ifcvf_get_hw_features(vf); + vf->config_size = ifcvf_get_config_size(vf); adapter->vdpa.mdev = &ifcvf_mgmt_dev->mdev; ret = _vdpa_register_device(&adapter->vdpa, vf->nr_vring); -- 2.27.0

2 years, 10 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror December 2021