habanalabs: remove access to kernel memory using debugfs
PATCH 1/2 habanalabs: remove access to kernel memory using debugfs
From: Ofir Bitton <[email protected]>
Accessing kernel allocated memory through debugfs should not be allowed as it introduces a security vulnerability. We remove the option to read/write kernel memory for all asics.
--- drivers/misc/habanalabs/gaudi/gaudi.c | 8 -------- drivers/misc/habanalabs/goya/goya.c | 12 ------------ 2 files changed, 20 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +0 -8
@@ -5733,8 +5733,6 @@ static int gaudi_debugfs_read32(struct hl_device *hdev, u64 addr, u32 *val) }if (hbm_bar_addr ==U64_MAX ) rc = -EIO ; - }else if (addr >=HOST_PHYS_BASE && !iommu_present (&pci_bus_type)) { - *val = *(u32 *)phys_to_virt (addr -HOST_PHYS_BASE ); }else { rc = -EFAULT ; }
@@ -5780,8 +5778,6 @@ static int gaudi_debugfs_write32(struct hl_device *hdev, u64 addr, u32 val) }if (hbm_bar_addr ==U64_MAX ) rc = -EIO ; - }else if (addr >=HOST_PHYS_BASE && !iommu_present (&pci_bus_type)) { - *(u32 *)phys_to_virt (addr -HOST_PHYS_BASE ) = val; }else { rc = -EFAULT ; }
@@ -5831,8 +5827,6 @@ static int gaudi_debugfs_read64(struct hl_device *hdev, u64 addr, u64 *val) }if (hbm_bar_addr ==U64_MAX ) rc = -EIO ; - }else if (addr >=HOST_PHYS_BASE && !iommu_present (&pci_bus_type)) { - *val = *(u64 *)phys_to_virt (addr -HOST_PHYS_BASE ); }else { rc = -EFAULT ; }
@@ -5881,8 +5875,6 @@ static int gaudi_debugfs_write64(struct hl_device *hdev, u64 addr, u64 val) }if (hbm_bar_addr ==U64_MAX ) rc = -EIO ; - }else if (addr >=HOST_PHYS_BASE && !iommu_present (&pci_bus_type)) { - *(u64 *)phys_to_virt (addr -HOST_PHYS_BASE ) = val; }else { rc = -EFAULT ; }
drivers/misc/habanalabs/goya/goya.c +0 -12
@@ -4121,9 +4121,6 @@ static int goya_debugfs_read32(struct hl_device *hdev, u64 addr, u32 *val)if (ddr_bar_addr ==U64_MAX ) rc = -EIO ; - }else if (addr >=HOST_PHYS_BASE && !iommu_present (&pci_bus_type)) { - *val = *(u32 *)phys_to_virt (addr -HOST_PHYS_BASE ); - }else { rc = -EFAULT ; }
@@ -4177,9 +4174,6 @@ static int goya_debugfs_write32(struct hl_device *hdev, u64 addr, u32 val)if (ddr_bar_addr ==U64_MAX ) rc = -EIO ; - }else if (addr >=HOST_PHYS_BASE && !iommu_present (&pci_bus_type)) { - *(u32 *)phys_to_virt (addr -HOST_PHYS_BASE ) = val; - }else { rc = -EFAULT ; }
@@ -4222,9 +4216,6 @@ static int goya_debugfs_read64(struct hl_device *hdev, u64 addr, u64 *val)if (ddr_bar_addr ==U64_MAX ) rc = -EIO ; - }else if (addr >=HOST_PHYS_BASE && !iommu_present (&pci_bus_type)) { - *val = *(u64 *)phys_to_virt (addr -HOST_PHYS_BASE ); - }else { rc = -EFAULT ; }
@@ -4265,9 +4256,6 @@ static int goya_debugfs_write64(struct hl_device *hdev, u64 addr, u64 val)if (ddr_bar_addr ==U64_MAX ) rc = -EIO ; - }else if (addr >=HOST_PHYS_BASE && !iommu_present (&pci_bus_type)) { - *(u64 *)phys_to_virt (addr -HOST_PHYS_BASE ) = val; - }else { rc = -EFAULT ; }
Signature · 1 line
2.25.1
PATCH 2/2 habanalabs: support non power-of-2 DRAM phys page sizes
From: Moti Haimovski <[email protected]>
DRAM physical page sizes depend of the amount of HBMs available in the device. this number is device-dependent and may also be subject to binning when one or more of the DRAM controllers are found to to be faulty. Such a configuration may lead to partitioning the DRAM to non-power-of-2 pages.
To support this feature we also need to add infrastructure of address scarmbling.
--- drivers/misc/habanalabs/common/debugfs.c | 6 +- drivers/misc/habanalabs/common/habanalabs.h | 8 + drivers/misc/habanalabs/common/memory.c | 176 ++++++++++++++++---- drivers/misc/habanalabs/common/mmu.c | 61 ++++++- drivers/misc/habanalabs/gaudi/gaudi.c | 3 +- drivers/misc/habanalabs/goya/goya.c | 3 +- 6 files changed, 213 insertions(+), 44 deletions(-)
drivers/misc/habanalabs/common/debugfs.c +4 -2
@@ -333,8 +333,10 @@ static int mmu_show(struct seq_file *s, void *data)return 0 ; } -seq_printf (s,"asid: %u, virt_addr: 0x%llx\n" , - dev_entry->mmu_asid, dev_entry->mmu_addr); +seq_printf (s, +"asid: %u, virt_addr: 0x%llx, scrambled virt_addr: 0x%llx\n" , + dev_entry->mmu_asid, dev_entry->mmu_addr, + hops_info.scrambled_vaddr);for (i =0 ; i < hops_info.used_hops ; i++) { seq_printf(s, "hop%d_addr: 0x%llx\n",
drivers/misc/habanalabs/common/habanalabs.h +8 -0
@@ -848,6 +848,8 @@ enum div_select_defs {* @collective_wait_init_cs: Generate collective master/slave packets * and place them in the relevant cs jobs * @collective_wait_create_jobs: allocate collective wait cs jobs +* @scramble_vaddr: Routine to scramble the virtual address prior of mapping it +* in the MMU. */ struct hl_asic_funcs {int (*early_init)(struct hl_device *hdev);
@@ -957,6 +959,7 @@ struct hl_asic_funcs {int (*collective_wait_create_jobs)(struct hl_device *hdev,struct hl_ctx *ctx,struct hl_cs *cs,u32 wait_queue_id,u32 collective_engine_id); +u64 (*scramble_vaddr)(struct hl_device *hdev,u64 virt_addr); };
@@ -1690,10 +1693,14 @@ struct hl_mmu_per_hop_info {* struct hl_mmu_hop_info - A structure describing the TLB hops and their * hop-entries that were created in order to translate a virtual address to a * physical one. +* @scrambled_vaddr: The value of the virtual address after scrambling. This +* address replaces the original virtual-address when mapped +* in the MMU tables. * @hop_info: Array holding the per-hop information used for the translation. * @used_hops: The number of hops used for the translation. */ struct hl_mmu_hop_info { +u64 scrambled_vaddr;struct hl_mmu_per_hop_info hop_info[MMU_ARCH_5_HOPS ];u32 used_hops; };
@@ -2184,6 +2191,7 @@ void hl_mmu_v1_set_funcs(struct hl_device *hdev, struct hl_mmu_funcs *mmu);int hl_mmu_va_to_pa (struct hl_ctx *ctx,u64 virt_addr,u64 *phys_addr);int hl_mmu_get_tlb_info (struct hl_ctx *ctx,u64 virt_addr,struct hl_mmu_hop_info *hops); +u64 hl_mmu_scramble_vaddr (struct hl_device *hdev,u64 virt_addr);int hl_fw_load_fw_to_device (struct hl_device *hdev,const char *fw_name,void __iomem *dst,u32 src_offset,u32 size);
drivers/misc/habanalabs/common/memory.c +144 -32
278 lines not on this page · raw message
drivers/misc/habanalabs/common/mmu.c +53 -8
96 lines not on this page · raw message
drivers/misc/habanalabs/gaudi/gaudi.c +2 -1
@@ -8307,7 +8307,8 @@ static const struct hl_asic_funcs gaudi_funcs = { .set_dma_mask_from_fw = gaudi_set_dma_mask_from_fw, .get_device_time = gaudi_get_device_time, .collective_wait_init_cs = gaudi_collective_wait_init_cs, - .collective_wait_create_jobs = gaudi_collective_wait_create_jobs + .collective_wait_create_jobs = gaudi_collective_wait_create_jobs, + .scramble_vaddr = hl_mmu_scramble_vaddr };/**
drivers/misc/habanalabs/goya/goya.c +2 -1
@@ -5455,7 +5455,8 @@ static const struct hl_asic_funcs goya_funcs = { .set_dma_mask_from_fw = goya_set_dma_mask_from_fw, .get_device_time = goya_get_device_time, .collective_wait_init_cs = goya_collective_wait_init_cs, - .collective_wait_create_jobs = goya_collective_wait_create_jobs + .collective_wait_create_jobs = goya_collective_wait_create_jobs, + .scramble_vaddr = hl_mmu_scramble_vaddr };/*
Signature · 1 line
2.25.1