--- /dev/null
+From 8eeddc0d4200762063e1c66b9cc63afa7b24ebf0 Mon Sep 17 00:00:00 2001
+From: Xiaogang Chen <xiaogang.chen@amd.com>
+Date: Thu, 9 Mar 2023 17:44:55 -0600
+Subject: drm/amdkfd: Get prange->offset after svm_range_vram_node_new
+
+From: Xiaogang Chen <xiaogang.chen@amd.com>
+
+commit 8eeddc0d4200762063e1c66b9cc63afa7b24ebf0 upstream.
+
+During miration to vram prange->offset is valid after vram buffer is located,
+either use old one or allocate a new one. Move svm_range_vram_node_new before
+migrate for each vma to get valid prange->offset.
+
+v2: squash in warning fix
+
+Fixes: b4ee9606378b ("drm/amdkfd: Fix BO offset for multi-VMA page migration")
+Signed-off-by: Xiaogang Chen <Xiaogang.Chen@amd.com>
+Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
+@@ -305,12 +305,6 @@ svm_migrate_copy_to_vram(struct amdgpu_d
+ src = scratch;
+ dst = (uint64_t *)(scratch + npages);
+
+- r = svm_range_vram_node_new(adev, prange, true);
+- if (r) {
+- dev_dbg(adev->dev, "fail %d to alloc vram\n", r);
+- goto out;
+- }
+-
+ amdgpu_res_first(prange->ttm_res, ttm_res_offset,
+ npages << PAGE_SHIFT, &cursor);
+ for (i = j = 0; i < npages; i++) {
+@@ -391,7 +385,7 @@ out_free_vram_pages:
+ migrate->dst[i + 3] = 0;
+ }
+ #endif
+-out:
++
+ return r;
+ }
+
+@@ -520,6 +514,12 @@ svm_migrate_ram_to_vram(struct svm_range
+
+ start = prange->start << PAGE_SHIFT;
+ end = (prange->last + 1) << PAGE_SHIFT;
++
++ r = svm_range_vram_node_new(adev, prange, true);
++ if (r) {
++ dev_dbg(adev->dev, "fail %ld to alloc vram\n", r);
++ return r;
++ }
+ ttm_res_offset = prange->offset << PAGE_SHIFT;
+
+ for (addr = start; addr < end;) {
+@@ -543,6 +543,8 @@ svm_migrate_ram_to_vram(struct svm_range
+
+ if (cpages)
+ prange->actual_loc = best_loc;
++ else
++ svm_range_vram_node_free(prange);
+
+ return r < 0 ? r : 0;
+ }
--- /dev/null
+From 1b0120e4db0bf2838d1ce741195ce4b7cc100b91 Mon Sep 17 00:00:00 2001
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+Date: Wed, 15 Mar 2023 21:25:17 +0100
+Subject: hsr: ratelimit only when errors are printed
+
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+
+commit 1b0120e4db0bf2838d1ce741195ce4b7cc100b91 upstream.
+
+Recently, when automatically merging -net and net-next in MPTCP devel
+tree, our CI reported [1] a conflict in hsr, the same as the one
+reported by Stephen in netdev [2].
+
+When looking at the conflict, I noticed it is in fact the v1 [3] that
+has been applied in -net and the v2 [4] in net-next. Maybe the v1 was
+applied by accident.
+
+As mentioned by Jakub Kicinski [5], the new condition makes more sense
+before the net_ratelimit(), not to update net_ratelimit's state which is
+unnecessary if we're not going to print either way.
+
+Here, this modification applies the v2 but in -net.
+
+Link: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/4423171069 [1]
+Link: https://lore.kernel.org/netdev/20230315100914.53fc1760@canb.auug.org.au/ [2]
+Link: https://lore.kernel.org/netdev/20230307133229.127442-1-koverskeid@gmail.com/ [3]
+Link: https://lore.kernel.org/netdev/20230309092302.179586-1-koverskeid@gmail.com/ [4]
+Link: https://lore.kernel.org/netdev/20230308232001.2fb62013@kernel.org/ [5]
+Fixes: 28e8cabe80f3 ("net: hsr: Don't log netdev_err message on unknown prp dst node")
+Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
+Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
+Link: https://lore.kernel.org/r/20230315-net-20230315-hsr_framereg-ratelimit-v1-1-61d2ef176d11@tessares.net
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/hsr/hsr_framereg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/hsr/hsr_framereg.c
++++ b/net/hsr/hsr_framereg.c
+@@ -415,7 +415,7 @@ void hsr_addr_subst_dest(struct hsr_node
+ node_dst = find_node_by_addr_A(&port->hsr->node_db,
+ eth_hdr(skb)->h_dest);
+ if (!node_dst) {
+- if (net_ratelimit() && port->hsr->prot_version != PRP_V1)
++ if (port->hsr->prot_version != PRP_V1 && net_ratelimit())
+ netdev_err(skb->dev, "%s: Unknown node\n", __func__);
+ return;
+ }
libbpf-fix-btf-to-c-converter-s-padding-logic.patch
selftests-bpf-add-few-corner-cases-to-test-padding-h.patch
libbpf-fix-btf_dump-s-packed-struct-determination.patch
+drm-amdkfd-get-prange-offset-after-svm_range_vram_node_new.patch
+hsr-ratelimit-only-when-errors-are-printed.patch
+x86-pvh-avoid-32-bit-build-warning-when-obtaining-vga-console-info.patch
--- /dev/null
+From aadbd07ff8a75ed342388846da78dfaddb8b106a Mon Sep 17 00:00:00 2001
+From: Jan Beulich <jbeulich@suse.com>
+Date: Tue, 21 Mar 2023 09:03:26 +0100
+Subject: x86/PVH: avoid 32-bit build warning when obtaining VGA console info
+
+From: Jan Beulich <jbeulich@suse.com>
+
+commit aadbd07ff8a75ed342388846da78dfaddb8b106a upstream.
+
+In the commit referenced below I failed to pay attention to this code
+also being buildable as 32-bit. Adjust the type of "ret" - there's no
+real need for it to be wider than 32 bits.
+
+Fixes: 934ef33ee75c ("x86/PVH: obtain VGA console info in Dom0")
+Reported-by: kernel test robot <lkp@intel.com>
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+Link: https://lore.kernel.org/r/2d2193ff-670b-0a27-e12d-2c5c4c121c79@suse.com
+Signed-off-by: Juergen Gross <jgross@suse.com>
+---
+ arch/x86/xen/enlighten_pvh.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/xen/enlighten_pvh.c
++++ b/arch/x86/xen/enlighten_pvh.c
+@@ -48,7 +48,7 @@ void __init xen_pvh_init(struct boot_par
+ struct xen_platform_op op = {
+ .cmd = XENPF_get_dom0_console,
+ };
+- long ret = HYPERVISOR_platform_op(&op);
++ int ret = HYPERVISOR_platform_op(&op);
+
+ if (ret > 0)
+ xen_init_vga(&op.u.dom0_console,
projects / thirdparty / kernel / stable-queue.git / commitdiff
