* [PATCH rc] iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
@ 2024-05-09 17:45 Jason Gunthorpe
2024-05-09 18:51 ` Jerry Snitselaar
2024-05-10 7:11 ` Joerg Roedel
0 siblings, 2 replies; 6+ messages in thread
From: Jason Gunthorpe @ 2024-05-09 17:45 UTC (permalink / raw)
To: iommu, Joerg Roedel, linux-arm-kernel, linux-tegra, Robin Murphy,
Thierry Reding, Krishna Reddy
Cc: Jerry Snitselaar, patches, Will Deacon
This was missed because of the function pointer indirection.
nvidia_smmu_context_fault() is also installed as a irq function, and the
'void *' was changed to a struct arm_smmu_domain. Since the iommu_domain
is embedded at a non-zero offset this causes nvidia_smmu_context_fault()
to miscompute the offset. Fixup the types.
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000120
Mem abort info:
ESR = 0x0000000096000004
EC = 0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC = 0x04: level 0 translation fault
Data abort info:
ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
CM = 0, WnR = 0, TnD = 0, TagAccess = 0
GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
user pgtable: 4k pages, 48-bit VAs, pgdp=0000000107c9f000
[0000000000000120] pgd=0000000000000000, p4d=0000000000000000
Internal error: Oops: 0000000096000004 [#1] SMP
Modules linked in:
CPU: 1 PID: 47 Comm: kworker/u25:0 Not tainted 6.9.0-0.rc7.58.eln136.aarch64 #1
Hardware name: Unknown NVIDIA Jetson Orin NX/NVIDIA Jetson Orin NX, BIOS 3.1-32827747 03/19/2023
Workqueue: events_unbound deferred_probe_work_func
pstate: 604000c9 (nZCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : nvidia_smmu_context_fault+0x1c/0x158
lr : __free_irq+0x1d4/0x2e8
sp : ffff80008044b6f0
x29: ffff80008044b6f0 x28: ffff000080a60b18 x27: ffffd32b5172e970
x26: 0000000000000000 x25: ffff0000802f5aac x24: ffff0000802f5a30
x23: ffff0000802f5b60 x22: 0000000000000057 x21: 0000000000000000
x20: ffff0000802f5a00 x19: ffff000087d4cd80 x18: ffffffffffffffff
x17: 6234362066666666 x16: 6630303078302d30 x15: ffff00008156d888
x14: 0000000000000000 x13: ffff0000801db910 x12: ffff00008156d6d0
x11: 0000000000000003 x10: ffff0000801db918 x9 : ffffd32b50f94d9c
x8 : 1fffe0001032fda1 x7 : ffff00008197ed00 x6 : 000000000000000f
x5 : 000000000000010e x4 : 000000000000010e x3 : 0000000000000000
x2 : ffffd32b51720cd8 x1 : ffff000087e6f700 x0 : 0000000000000057
Call trace:
nvidia_smmu_context_fault+0x1c/0x158
__free_irq+0x1d4/0x2e8
free_irq+0x3c/0x80
devm_free_irq+0x64/0xa8
arm_smmu_domain_free+0xc4/0x158
iommu_domain_free+0x44/0xa0
iommu_deinit_device+0xd0/0xf8
__iommu_group_remove_device+0xcc/0xe0
iommu_bus_notifier+0x64/0xa8
notifier_call_chain+0x78/0x148
blocking_notifier_call_chain+0x4c/0x90
bus_notify+0x44/0x70
device_del+0x264/0x3e8
pci_remove_bus_device+0x84/0x120
pci_remove_root_bus+0x5c/0xc0
dw_pcie_host_deinit+0x38/0xe0
tegra_pcie_config_rp+0xc0/0x1f0
tegra_pcie_dw_probe+0x34c/0x700
platform_probe+0x70/0xe8
really_probe+0xc8/0x3a0
__driver_probe_device+0x84/0x160
driver_probe_device+0x44/0x130
__device_attach_driver+0xc4/0x170
bus_for_each_drv+0x90/0x100
__device_attach+0xa8/0x1c8
device_initial_probe+0x1c/0x30
bus_probe_device+0xb0/0xc0
deferred_probe_work_func+0xbc/0x120
process_one_work+0x194/0x490
worker_thread+0x284/0x3b0
kthread+0xf4/0x108
ret_from_fork+0x10/0x20
Code: a9b97bfd 910003fd a9025bf5 f85a0035 (b94122a1)
Cc: stable@vger.kernel.org
Fixes: e0976331ad11 ("iommu/arm-smmu: Pass arm_smmu_domain to internal functions")
Reported-by: Jerry Snitselaar <jsnitsel@redhat.com>
Closes: https://lore.kernel.org/all/jto5e3ili4auk6sbzpnojdvhppgwuegir7mpd755anfhwcbkfz@2u5gh7bxb4iv
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Joerg, once Jerry ack's this you should grab it for this cycle.
Thanks,
Jason
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c b/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
index 87bf522b9d2eec..957d988b6d832f 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
@@ -221,11 +221,9 @@ static irqreturn_t nvidia_smmu_context_fault(int irq, void *dev)
unsigned int inst;
irqreturn_t ret = IRQ_NONE;
struct arm_smmu_device *smmu;
- struct iommu_domain *domain = dev;
- struct arm_smmu_domain *smmu_domain;
+ struct arm_smmu_domain *smmu_domain = dev;
struct nvidia_smmu *nvidia;
- smmu_domain = container_of(domain, struct arm_smmu_domain, domain);
smmu = smmu_domain->smmu;
nvidia = to_nvidia_smmu(smmu);
base-commit: dff9180946cc45d90a77e1c8645989cdcfd31437
--
2.43.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH rc] iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
2024-05-09 17:45 [PATCH rc] iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault() Jason Gunthorpe
@ 2024-05-09 18:51 ` Jerry Snitselaar
2024-05-09 19:26 ` Jerry Snitselaar
2024-05-10 7:11 ` Joerg Roedel
1 sibling, 1 reply; 6+ messages in thread
From: Jerry Snitselaar @ 2024-05-09 18:51 UTC (permalink / raw)
To: Jason Gunthorpe
Cc: iommu, Joerg Roedel, linux-arm-kernel, linux-tegra, Robin Murphy,
Thierry Reding, Krishna Reddy, patches, Will Deacon
On Thu, May 09, 2024 at 02:45:51PM GMT, Jason Gunthorpe wrote:
> This was missed because of the function pointer indirection.
>
> nvidia_smmu_context_fault() is also installed as a irq function, and the
> 'void *' was changed to a struct arm_smmu_domain. Since the iommu_domain
> is embedded at a non-zero offset this causes nvidia_smmu_context_fault()
> to miscompute the offset. Fixup the types.
>
> Unable to handle kernel NULL pointer dereference at virtual address 0000000000000120
> Mem abort info:
> ESR = 0x0000000096000004
> EC = 0x25: DABT (current EL), IL = 32 bits
> SET = 0, FnV = 0
> EA = 0, S1PTW = 0
> FSC = 0x04: level 0 translation fault
> Data abort info:
> ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
> CM = 0, WnR = 0, TnD = 0, TagAccess = 0
> GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
> user pgtable: 4k pages, 48-bit VAs, pgdp=0000000107c9f000
> [0000000000000120] pgd=0000000000000000, p4d=0000000000000000
> Internal error: Oops: 0000000096000004 [#1] SMP
> Modules linked in:
> CPU: 1 PID: 47 Comm: kworker/u25:0 Not tainted 6.9.0-0.rc7.58.eln136.aarch64 #1
> Hardware name: Unknown NVIDIA Jetson Orin NX/NVIDIA Jetson Orin NX, BIOS 3.1-32827747 03/19/2023
> Workqueue: events_unbound deferred_probe_work_func
> pstate: 604000c9 (nZCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
> pc : nvidia_smmu_context_fault+0x1c/0x158
> lr : __free_irq+0x1d4/0x2e8
> sp : ffff80008044b6f0
> x29: ffff80008044b6f0 x28: ffff000080a60b18 x27: ffffd32b5172e970
> x26: 0000000000000000 x25: ffff0000802f5aac x24: ffff0000802f5a30
> x23: ffff0000802f5b60 x22: 0000000000000057 x21: 0000000000000000
> x20: ffff0000802f5a00 x19: ffff000087d4cd80 x18: ffffffffffffffff
> x17: 6234362066666666 x16: 6630303078302d30 x15: ffff00008156d888
> x14: 0000000000000000 x13: ffff0000801db910 x12: ffff00008156d6d0
> x11: 0000000000000003 x10: ffff0000801db918 x9 : ffffd32b50f94d9c
> x8 : 1fffe0001032fda1 x7 : ffff00008197ed00 x6 : 000000000000000f
> x5 : 000000000000010e x4 : 000000000000010e x3 : 0000000000000000
> x2 : ffffd32b51720cd8 x1 : ffff000087e6f700 x0 : 0000000000000057
> Call trace:
> nvidia_smmu_context_fault+0x1c/0x158
> __free_irq+0x1d4/0x2e8
> free_irq+0x3c/0x80
> devm_free_irq+0x64/0xa8
> arm_smmu_domain_free+0xc4/0x158
> iommu_domain_free+0x44/0xa0
> iommu_deinit_device+0xd0/0xf8
> __iommu_group_remove_device+0xcc/0xe0
> iommu_bus_notifier+0x64/0xa8
> notifier_call_chain+0x78/0x148
> blocking_notifier_call_chain+0x4c/0x90
> bus_notify+0x44/0x70
> device_del+0x264/0x3e8
> pci_remove_bus_device+0x84/0x120
> pci_remove_root_bus+0x5c/0xc0
> dw_pcie_host_deinit+0x38/0xe0
> tegra_pcie_config_rp+0xc0/0x1f0
> tegra_pcie_dw_probe+0x34c/0x700
> platform_probe+0x70/0xe8
> really_probe+0xc8/0x3a0
> __driver_probe_device+0x84/0x160
> driver_probe_device+0x44/0x130
> __device_attach_driver+0xc4/0x170
> bus_for_each_drv+0x90/0x100
> __device_attach+0xa8/0x1c8
> device_initial_probe+0x1c/0x30
> bus_probe_device+0xb0/0xc0
> deferred_probe_work_func+0xbc/0x120
> process_one_work+0x194/0x490
> worker_thread+0x284/0x3b0
> kthread+0xf4/0x108
> ret_from_fork+0x10/0x20
> Code: a9b97bfd 910003fd a9025bf5 f85a0035 (b94122a1)
>
> Cc: stable@vger.kernel.org
> Fixes: e0976331ad11 ("iommu/arm-smmu: Pass arm_smmu_domain to internal functions")
> Reported-by: Jerry Snitselaar <jsnitsel@redhat.com>
> Closes: https://lore.kernel.org/all/jto5e3ili4auk6sbzpnojdvhppgwuegir7mpd755anfhwcbkfz@2u5gh7bxb4iv
> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Tested-by: Jerry Snitselaar <jsnitsel@redhat.com>
Acked-by: Jerry Snitselaar <jsnitsel@redhat.com>
> ---
> drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> Joerg, once Jerry ack's this you should grab it for this cycle.
>
> Thanks,
> Jason
>
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c b/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
> index 87bf522b9d2eec..957d988b6d832f 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
> @@ -221,11 +221,9 @@ static irqreturn_t nvidia_smmu_context_fault(int irq, void *dev)
> unsigned int inst;
> irqreturn_t ret = IRQ_NONE;
> struct arm_smmu_device *smmu;
> - struct iommu_domain *domain = dev;
> - struct arm_smmu_domain *smmu_domain;
> + struct arm_smmu_domain *smmu_domain = dev;
> struct nvidia_smmu *nvidia;
>
> - smmu_domain = container_of(domain, struct arm_smmu_domain, domain);
> smmu = smmu_domain->smmu;
> nvidia = to_nvidia_smmu(smmu);
>
>
> base-commit: dff9180946cc45d90a77e1c8645989cdcfd31437
> --
> 2.43.2
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH rc] iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
2024-05-09 18:51 ` Jerry Snitselaar
@ 2024-05-09 19:26 ` Jerry Snitselaar
2024-05-09 19:30 ` Jerry Snitselaar
0 siblings, 1 reply; 6+ messages in thread
From: Jerry Snitselaar @ 2024-05-09 19:26 UTC (permalink / raw)
To: Jason Gunthorpe
Cc: iommu, Joerg Roedel, linux-arm-kernel, linux-tegra, Robin Murphy,
Thierry Reding, Krishna Reddy, patches, Will Deacon
On Thu, May 09, 2024 at 11:51:55AM GMT, Jerry Snitselaar wrote:
> On Thu, May 09, 2024 at 02:45:51PM GMT, Jason Gunthorpe wrote:
> > This was missed because of the function pointer indirection.
> >
> > nvidia_smmu_context_fault() is also installed as a irq function, and the
> > 'void *' was changed to a struct arm_smmu_domain. Since the iommu_domain
> > is embedded at a non-zero offset this causes nvidia_smmu_context_fault()
> > to miscompute the offset. Fixup the types.
> >
> > Unable to handle kernel NULL pointer dereference at virtual address 0000000000000120
> > Mem abort info:
> > ESR = 0x0000000096000004
> > EC = 0x25: DABT (current EL), IL = 32 bits
> > SET = 0, FnV = 0
> > EA = 0, S1PTW = 0
> > FSC = 0x04: level 0 translation fault
> > Data abort info:
> > ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
> > CM = 0, WnR = 0, TnD = 0, TagAccess = 0
> > GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
> > user pgtable: 4k pages, 48-bit VAs, pgdp=0000000107c9f000
> > [0000000000000120] pgd=0000000000000000, p4d=0000000000000000
> > Internal error: Oops: 0000000096000004 [#1] SMP
> > Modules linked in:
> > CPU: 1 PID: 47 Comm: kworker/u25:0 Not tainted 6.9.0-0.rc7.58.eln136.aarch64 #1
> > Hardware name: Unknown NVIDIA Jetson Orin NX/NVIDIA Jetson Orin NX, BIOS 3.1-32827747 03/19/2023
> > Workqueue: events_unbound deferred_probe_work_func
> > pstate: 604000c9 (nZCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
> > pc : nvidia_smmu_context_fault+0x1c/0x158
> > lr : __free_irq+0x1d4/0x2e8
> > sp : ffff80008044b6f0
> > x29: ffff80008044b6f0 x28: ffff000080a60b18 x27: ffffd32b5172e970
> > x26: 0000000000000000 x25: ffff0000802f5aac x24: ffff0000802f5a30
> > x23: ffff0000802f5b60 x22: 0000000000000057 x21: 0000000000000000
> > x20: ffff0000802f5a00 x19: ffff000087d4cd80 x18: ffffffffffffffff
> > x17: 6234362066666666 x16: 6630303078302d30 x15: ffff00008156d888
> > x14: 0000000000000000 x13: ffff0000801db910 x12: ffff00008156d6d0
> > x11: 0000000000000003 x10: ffff0000801db918 x9 : ffffd32b50f94d9c
> > x8 : 1fffe0001032fda1 x7 : ffff00008197ed00 x6 : 000000000000000f
> > x5 : 000000000000010e x4 : 000000000000010e x3 : 0000000000000000
> > x2 : ffffd32b51720cd8 x1 : ffff000087e6f700 x0 : 0000000000000057
> > Call trace:
> > nvidia_smmu_context_fault+0x1c/0x158
> > __free_irq+0x1d4/0x2e8
> > free_irq+0x3c/0x80
> > devm_free_irq+0x64/0xa8
> > arm_smmu_domain_free+0xc4/0x158
> > iommu_domain_free+0x44/0xa0
> > iommu_deinit_device+0xd0/0xf8
> > __iommu_group_remove_device+0xcc/0xe0
> > iommu_bus_notifier+0x64/0xa8
> > notifier_call_chain+0x78/0x148
> > blocking_notifier_call_chain+0x4c/0x90
> > bus_notify+0x44/0x70
> > device_del+0x264/0x3e8
> > pci_remove_bus_device+0x84/0x120
> > pci_remove_root_bus+0x5c/0xc0
> > dw_pcie_host_deinit+0x38/0xe0
> > tegra_pcie_config_rp+0xc0/0x1f0
> > tegra_pcie_dw_probe+0x34c/0x700
> > platform_probe+0x70/0xe8
> > really_probe+0xc8/0x3a0
> > __driver_probe_device+0x84/0x160
> > driver_probe_device+0x44/0x130
> > __device_attach_driver+0xc4/0x170
> > bus_for_each_drv+0x90/0x100
> > __device_attach+0xa8/0x1c8
> > device_initial_probe+0x1c/0x30
> > bus_probe_device+0xb0/0xc0
> > deferred_probe_work_func+0xbc/0x120
> > process_one_work+0x194/0x490
> > worker_thread+0x284/0x3b0
> > kthread+0xf4/0x108
> > ret_from_fork+0x10/0x20
> > Code: a9b97bfd 910003fd a9025bf5 f85a0035 (b94122a1)
> >
> > Cc: stable@vger.kernel.org
> > Fixes: e0976331ad11 ("iommu/arm-smmu: Pass arm_smmu_domain to internal functions")
> > Reported-by: Jerry Snitselaar <jsnitsel@redhat.com>
> > Closes: https://lore.kernel.org/all/jto5e3ili4auk6sbzpnojdvhppgwuegir7mpd755anfhwcbkfz@2u5gh7bxb4iv
> > Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
>
> Tested-by: Jerry Snitselaar <jsnitsel@redhat.com>
> Acked-by: Jerry Snitselaar <jsnitsel@redhat.com>
Actually looking at it again, does arm_smmu_context_fault need to be
updated as well? The devm_request_irq call is getting passed the
smmu_domain whether context_fault is arm_smmu_context_fault or
nvidia_smmu_context_fault.
>
> > ---
> > drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > Joerg, once Jerry ack's this you should grab it for this cycle.
> >
> > Thanks,
> > Jason
> >
> > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c b/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
> > index 87bf522b9d2eec..957d988b6d832f 100644
> > --- a/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
> > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
> > @@ -221,11 +221,9 @@ static irqreturn_t nvidia_smmu_context_fault(int irq, void *dev)
> > unsigned int inst;
> > irqreturn_t ret = IRQ_NONE;
> > struct arm_smmu_device *smmu;
> > - struct iommu_domain *domain = dev;
> > - struct arm_smmu_domain *smmu_domain;
> > + struct arm_smmu_domain *smmu_domain = dev;
> > struct nvidia_smmu *nvidia;
> >
> > - smmu_domain = container_of(domain, struct arm_smmu_domain, domain);
> > smmu = smmu_domain->smmu;
> > nvidia = to_nvidia_smmu(smmu);
> >
> >
> > base-commit: dff9180946cc45d90a77e1c8645989cdcfd31437
> > --
> > 2.43.2
> >
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH rc] iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
2024-05-09 19:26 ` Jerry Snitselaar
@ 2024-05-09 19:30 ` Jerry Snitselaar
0 siblings, 0 replies; 6+ messages in thread
From: Jerry Snitselaar @ 2024-05-09 19:30 UTC (permalink / raw)
To: Jason Gunthorpe
Cc: iommu, Joerg Roedel, linux-arm-kernel, linux-tegra, Robin Murphy,
Thierry Reding, Krishna Reddy, patches, Will Deacon
On Thu, May 09, 2024 at 12:26:36PM GMT, Jerry Snitselaar wrote:
> On Thu, May 09, 2024 at 11:51:55AM GMT, Jerry Snitselaar wrote:
> > On Thu, May 09, 2024 at 02:45:51PM GMT, Jason Gunthorpe wrote:
> > > This was missed because of the function pointer indirection.
> > >
> > > nvidia_smmu_context_fault() is also installed as a irq function, and the
> > > 'void *' was changed to a struct arm_smmu_domain. Since the iommu_domain
> > > is embedded at a non-zero offset this causes nvidia_smmu_context_fault()
> > > to miscompute the offset. Fixup the types.
> > >
> > > Unable to handle kernel NULL pointer dereference at virtual address 0000000000000120
> > > Mem abort info:
> > > ESR = 0x0000000096000004
> > > EC = 0x25: DABT (current EL), IL = 32 bits
> > > SET = 0, FnV = 0
> > > EA = 0, S1PTW = 0
> > > FSC = 0x04: level 0 translation fault
> > > Data abort info:
> > > ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
> > > CM = 0, WnR = 0, TnD = 0, TagAccess = 0
> > > GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
> > > user pgtable: 4k pages, 48-bit VAs, pgdp=0000000107c9f000
> > > [0000000000000120] pgd=0000000000000000, p4d=0000000000000000
> > > Internal error: Oops: 0000000096000004 [#1] SMP
> > > Modules linked in:
> > > CPU: 1 PID: 47 Comm: kworker/u25:0 Not tainted 6.9.0-0.rc7.58.eln136.aarch64 #1
> > > Hardware name: Unknown NVIDIA Jetson Orin NX/NVIDIA Jetson Orin NX, BIOS 3.1-32827747 03/19/2023
> > > Workqueue: events_unbound deferred_probe_work_func
> > > pstate: 604000c9 (nZCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
> > > pc : nvidia_smmu_context_fault+0x1c/0x158
> > > lr : __free_irq+0x1d4/0x2e8
> > > sp : ffff80008044b6f0
> > > x29: ffff80008044b6f0 x28: ffff000080a60b18 x27: ffffd32b5172e970
> > > x26: 0000000000000000 x25: ffff0000802f5aac x24: ffff0000802f5a30
> > > x23: ffff0000802f5b60 x22: 0000000000000057 x21: 0000000000000000
> > > x20: ffff0000802f5a00 x19: ffff000087d4cd80 x18: ffffffffffffffff
> > > x17: 6234362066666666 x16: 6630303078302d30 x15: ffff00008156d888
> > > x14: 0000000000000000 x13: ffff0000801db910 x12: ffff00008156d6d0
> > > x11: 0000000000000003 x10: ffff0000801db918 x9 : ffffd32b50f94d9c
> > > x8 : 1fffe0001032fda1 x7 : ffff00008197ed00 x6 : 000000000000000f
> > > x5 : 000000000000010e x4 : 000000000000010e x3 : 0000000000000000
> > > x2 : ffffd32b51720cd8 x1 : ffff000087e6f700 x0 : 0000000000000057
> > > Call trace:
> > > nvidia_smmu_context_fault+0x1c/0x158
> > > __free_irq+0x1d4/0x2e8
> > > free_irq+0x3c/0x80
> > > devm_free_irq+0x64/0xa8
> > > arm_smmu_domain_free+0xc4/0x158
> > > iommu_domain_free+0x44/0xa0
> > > iommu_deinit_device+0xd0/0xf8
> > > __iommu_group_remove_device+0xcc/0xe0
> > > iommu_bus_notifier+0x64/0xa8
> > > notifier_call_chain+0x78/0x148
> > > blocking_notifier_call_chain+0x4c/0x90
> > > bus_notify+0x44/0x70
> > > device_del+0x264/0x3e8
> > > pci_remove_bus_device+0x84/0x120
> > > pci_remove_root_bus+0x5c/0xc0
> > > dw_pcie_host_deinit+0x38/0xe0
> > > tegra_pcie_config_rp+0xc0/0x1f0
> > > tegra_pcie_dw_probe+0x34c/0x700
> > > platform_probe+0x70/0xe8
> > > really_probe+0xc8/0x3a0
> > > __driver_probe_device+0x84/0x160
> > > driver_probe_device+0x44/0x130
> > > __device_attach_driver+0xc4/0x170
> > > bus_for_each_drv+0x90/0x100
> > > __device_attach+0xa8/0x1c8
> > > device_initial_probe+0x1c/0x30
> > > bus_probe_device+0xb0/0xc0
> > > deferred_probe_work_func+0xbc/0x120
> > > process_one_work+0x194/0x490
> > > worker_thread+0x284/0x3b0
> > > kthread+0xf4/0x108
> > > ret_from_fork+0x10/0x20
> > > Code: a9b97bfd 910003fd a9025bf5 f85a0035 (b94122a1)
> > >
> > > Cc: stable@vger.kernel.org
> > > Fixes: e0976331ad11 ("iommu/arm-smmu: Pass arm_smmu_domain to internal functions")
> > > Reported-by: Jerry Snitselaar <jsnitsel@redhat.com>
> > > Closes: https://lore.kernel.org/all/jto5e3ili4auk6sbzpnojdvhppgwuegir7mpd755anfhwcbkfz@2u5gh7bxb4iv
> > > Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
> >
> > Tested-by: Jerry Snitselaar <jsnitsel@redhat.com>
> > Acked-by: Jerry Snitselaar <jsnitsel@redhat.com>
>
> Actually looking at it again, does arm_smmu_context_fault need to be
> updated as well? The devm_request_irq call is getting passed the
> smmu_domain whether context_fault is arm_smmu_context_fault or
> nvidia_smmu_context_fault.
>
Never mind. I can't read today.
> >
> > > ---
> > > drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 4 +---
> > > 1 file changed, 1 insertion(+), 3 deletions(-)
> > >
> > > Joerg, once Jerry ack's this you should grab it for this cycle.
> > >
> > > Thanks,
> > > Jason
> > >
> > > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c b/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
> > > index 87bf522b9d2eec..957d988b6d832f 100644
> > > --- a/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
> > > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
> > > @@ -221,11 +221,9 @@ static irqreturn_t nvidia_smmu_context_fault(int irq, void *dev)
> > > unsigned int inst;
> > > irqreturn_t ret = IRQ_NONE;
> > > struct arm_smmu_device *smmu;
> > > - struct iommu_domain *domain = dev;
> > > - struct arm_smmu_domain *smmu_domain;
> > > + struct arm_smmu_domain *smmu_domain = dev;
> > > struct nvidia_smmu *nvidia;
> > >
> > > - smmu_domain = container_of(domain, struct arm_smmu_domain, domain);
> > > smmu = smmu_domain->smmu;
> > > nvidia = to_nvidia_smmu(smmu);
> > >
> > >
> > > base-commit: dff9180946cc45d90a77e1c8645989cdcfd31437
> > > --
> > > 2.43.2
> > >
> >
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH rc] iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
2024-05-09 17:45 [PATCH rc] iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault() Jason Gunthorpe
2024-05-09 18:51 ` Jerry Snitselaar
@ 2024-05-10 7:11 ` Joerg Roedel
2024-05-10 11:07 ` Will Deacon
1 sibling, 1 reply; 6+ messages in thread
From: Joerg Roedel @ 2024-05-10 7:11 UTC (permalink / raw)
To: Jason Gunthorpe
Cc: iommu, linux-arm-kernel, linux-tegra, Robin Murphy,
Thierry Reding, Krishna Reddy, Jerry Snitselaar, patches,
Will Deacon
On Thu, May 09, 2024 at 02:45:51PM -0300, Jason Gunthorpe wrote:
> drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
Applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH rc] iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
2024-05-10 7:11 ` Joerg Roedel
@ 2024-05-10 11:07 ` Will Deacon
0 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2024-05-10 11:07 UTC (permalink / raw)
To: Joerg Roedel
Cc: Jason Gunthorpe, iommu, linux-arm-kernel, linux-tegra,
Robin Murphy, Thierry Reding, Krishna Reddy, Jerry Snitselaar,
patches
On Fri, May 10, 2024 at 09:11:28AM +0200, Joerg Roedel wrote:
> On Thu, May 09, 2024 at 02:45:51PM -0300, Jason Gunthorpe wrote:
> > drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
>
> Applied, thanks.
Cheers, Joerg. I just acked the kunit test build fix over at:
https://lore.kernel.org/r/0-v1-24cba6c0f404+2ae-smmu_kunit_module_jgg@nvidia.com
so you can grab that one as well.
Will
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-10 11:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-09 17:45 [PATCH rc] iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault() Jason Gunthorpe
2024-05-09 18:51 ` Jerry Snitselaar
2024-05-09 19:26 ` Jerry Snitselaar
2024-05-09 19:30 ` Jerry Snitselaar
2024-05-10 7:11 ` Joerg Roedel
2024-05-10 11:07 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).