From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759419AbbA0S4J (ORCPT ); Tue, 27 Jan 2015 13:56:09 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:55462 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752692AbbA0S4H (ORCPT ); Tue, 27 Jan 2015 13:56:07 -0500 Message-ID: <54C7DF13.20402@ti.com> Date: Tue, 27 Jan 2015 13:55:15 -0500 From: Murali Karicheri User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Robin Murphy CC: "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" , "devicetree@vger.kernel.org" , "iommu@lists.linux-foundation.org" , Russell King , Arnd Bergmann , Joerg Roedel , Will Deacon , Rob Herring , Bjorn Helgaas , "suravee.suthikulpanit@amd.com" , "grant.likely@linaro.org" Subject: Re: [PATCH v4 3/6] of: fix size when dma-range is not used References: <1422052359-12384-1-git-send-email-m-karicheri2@ti.com> <1422052359-12384-4-git-send-email-m-karicheri2@ti.com> <54C77616.80301@arm.com> In-Reply-To: <54C77616.80301@arm.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/27/2015 06:27 AM, Robin Murphy wrote: > Hi Murali, > > On 23/01/15 22:32, Murali Karicheri wrote: >> Fix the dma-range size when the DT attribute is missing. i.e set size to >> dev->coherent_dma_mask + 1 instead of dev->coherent_dma_mask. To detect >> overflow when mask is set to max of u64, add a check, log error and >> return. >> Some platform use mask format for size in DTS. So add a work around to >> catch this and fix. >> >> Cc: Joerg Roedel >> Cc: Grant Likely >> Cc: Rob Herring >> Cc: Bjorn Helgaas >> Cc: Will Deacon >> Cc: Russell King >> Cc: Arnd Bergmann >> Cc: Suravee Suthikulpanit >> >> Signed-off-by: Murali Karicheri >> --- >> drivers/of/device.c | 14 +++++++++++++- >> 1 file changed, 13 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/of/device.c b/drivers/of/device.c >> index 2de320d..0a5ff54 100644 >> --- a/drivers/of/device.c >> +++ b/drivers/of/device.c >> @@ -105,12 +105,24 @@ void of_dma_configure(struct device *dev, struct >> device_node *np) >> ret = of_dma_get_range(np, &dma_addr, &paddr, &size); >> if (ret < 0) { >> dma_addr = offset = 0; >> - size = dev->coherent_dma_mask; >> + size = dev->coherent_dma_mask + 1; >> } else { >> offset = PFN_DOWN(paddr - dma_addr); >> + /* >> + * Add a work around to treat the size as mask + 1 in case >> + * it is defined in DT as a mask. >> + */ >> + if (size & 1) >> + size = size + 1; >> dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); >> } >> >> + /* if size is 0, we have an overflow of u64 */ >> + if (!size) { >> + dev_err(dev, "invalid size\n"); >> + return; >> + } >> + > > This seems potentially fragile to dodgy DTs given that we might also be > using size to make a mask later. Would it make sense to double-up a > sanity check as mask-format detection? Something like: > > if is_power_of_2(size) > // use size > else if is_power_of_2(size + 1) > // use size + 1 > else > // cry Robin, How about having the logic like this? ret = of_dma_get_range(np, &dma_addr, &paddr, &size); if (ret < 0) { dma_addr = offset = 0; size = dev->coherent_dma_mask + 1; } else { offset = PFN_DOWN(paddr - dma_addr); dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); } if (is_power_of_2(size + 1)) size = size + 1; else if (!is_power_of_2(size)) { dev_err(dev, "invalid size\n"); return; } Murali > > > Robin. > >> dev->dma_pfn_offset = offset; >> >> coherent = of_dma_is_coherent(np); >> > > -- Murali Karicheri Linux Kernel, Texas Instruments From mboxrd@z Thu Jan 1 00:00:00 1970 From: Murali Karicheri Subject: Re: [PATCH v4 3/6] of: fix size when dma-range is not used Date: Tue, 27 Jan 2015 13:55:15 -0500 Message-ID: <54C7DF13.20402@ti.com> References: <1422052359-12384-1-git-send-email-m-karicheri2@ti.com> <1422052359-12384-4-git-send-email-m-karicheri2@ti.com> <54C77616.80301@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <54C77616.80301-5wv7dgnIgG8@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Robin Murphy Cc: "devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Russell King , Arnd Bergmann , "linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Will Deacon , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org" , "iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org" , Rob Herring , Bjorn Helgaas , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" List-Id: devicetree@vger.kernel.org On 01/27/2015 06:27 AM, Robin Murphy wrote: > Hi Murali, > > On 23/01/15 22:32, Murali Karicheri wrote: >> Fix the dma-range size when the DT attribute is missing. i.e set size to >> dev->coherent_dma_mask + 1 instead of dev->coherent_dma_mask. To detect >> overflow when mask is set to max of u64, add a check, log error and >> return. >> Some platform use mask format for size in DTS. So add a work around to >> catch this and fix. >> >> Cc: Joerg Roedel >> Cc: Grant Likely >> Cc: Rob Herring >> Cc: Bjorn Helgaas >> Cc: Will Deacon >> Cc: Russell King >> Cc: Arnd Bergmann >> Cc: Suravee Suthikulpanit >> >> Signed-off-by: Murali Karicheri >> --- >> drivers/of/device.c | 14 +++++++++++++- >> 1 file changed, 13 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/of/device.c b/drivers/of/device.c >> index 2de320d..0a5ff54 100644 >> --- a/drivers/of/device.c >> +++ b/drivers/of/device.c >> @@ -105,12 +105,24 @@ void of_dma_configure(struct device *dev, struct >> device_node *np) >> ret = of_dma_get_range(np, &dma_addr, &paddr, &size); >> if (ret < 0) { >> dma_addr = offset = 0; >> - size = dev->coherent_dma_mask; >> + size = dev->coherent_dma_mask + 1; >> } else { >> offset = PFN_DOWN(paddr - dma_addr); >> + /* >> + * Add a work around to treat the size as mask + 1 in case >> + * it is defined in DT as a mask. >> + */ >> + if (size & 1) >> + size = size + 1; >> dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); >> } >> >> + /* if size is 0, we have an overflow of u64 */ >> + if (!size) { >> + dev_err(dev, "invalid size\n"); >> + return; >> + } >> + > > This seems potentially fragile to dodgy DTs given that we might also be > using size to make a mask later. Would it make sense to double-up a > sanity check as mask-format detection? Something like: > > if is_power_of_2(size) > // use size > else if is_power_of_2(size + 1) > // use size + 1 > else > // cry Robin, How about having the logic like this? ret = of_dma_get_range(np, &dma_addr, &paddr, &size); if (ret < 0) { dma_addr = offset = 0; size = dev->coherent_dma_mask + 1; } else { offset = PFN_DOWN(paddr - dma_addr); dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); } if (is_power_of_2(size + 1)) size = size + 1; else if (!is_power_of_2(size)) { dev_err(dev, "invalid size\n"); return; } Murali > > > Robin. > >> dev->dma_pfn_offset = offset; >> >> coherent = of_dma_is_coherent(np); >> > > -- Murali Karicheri Linux Kernel, Texas Instruments From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bear.ext.ti.com ([192.94.94.41]:55462 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752692AbbA0S4H (ORCPT ); Tue, 27 Jan 2015 13:56:07 -0500 Message-ID: <54C7DF13.20402@ti.com> Date: Tue, 27 Jan 2015 13:55:15 -0500 From: Murali Karicheri MIME-Version: 1.0 To: Robin Murphy CC: "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" , "devicetree@vger.kernel.org" , "iommu@lists.linux-foundation.org" , Russell King , Arnd Bergmann , Joerg Roedel , Will Deacon , Rob Herring , Bjorn Helgaas , "suravee.suthikulpanit@amd.com" , "grant.likely@linaro.org" Subject: Re: [PATCH v4 3/6] of: fix size when dma-range is not used References: <1422052359-12384-1-git-send-email-m-karicheri2@ti.com> <1422052359-12384-4-git-send-email-m-karicheri2@ti.com> <54C77616.80301@arm.com> In-Reply-To: <54C77616.80301@arm.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Sender: linux-pci-owner@vger.kernel.org List-ID: On 01/27/2015 06:27 AM, Robin Murphy wrote: > Hi Murali, > > On 23/01/15 22:32, Murali Karicheri wrote: >> Fix the dma-range size when the DT attribute is missing. i.e set size to >> dev->coherent_dma_mask + 1 instead of dev->coherent_dma_mask. To detect >> overflow when mask is set to max of u64, add a check, log error and >> return. >> Some platform use mask format for size in DTS. So add a work around to >> catch this and fix. >> >> Cc: Joerg Roedel >> Cc: Grant Likely >> Cc: Rob Herring >> Cc: Bjorn Helgaas >> Cc: Will Deacon >> Cc: Russell King >> Cc: Arnd Bergmann >> Cc: Suravee Suthikulpanit >> >> Signed-off-by: Murali Karicheri >> --- >> drivers/of/device.c | 14 +++++++++++++- >> 1 file changed, 13 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/of/device.c b/drivers/of/device.c >> index 2de320d..0a5ff54 100644 >> --- a/drivers/of/device.c >> +++ b/drivers/of/device.c >> @@ -105,12 +105,24 @@ void of_dma_configure(struct device *dev, struct >> device_node *np) >> ret = of_dma_get_range(np, &dma_addr, &paddr, &size); >> if (ret < 0) { >> dma_addr = offset = 0; >> - size = dev->coherent_dma_mask; >> + size = dev->coherent_dma_mask + 1; >> } else { >> offset = PFN_DOWN(paddr - dma_addr); >> + /* >> + * Add a work around to treat the size as mask + 1 in case >> + * it is defined in DT as a mask. >> + */ >> + if (size & 1) >> + size = size + 1; >> dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); >> } >> >> + /* if size is 0, we have an overflow of u64 */ >> + if (!size) { >> + dev_err(dev, "invalid size\n"); >> + return; >> + } >> + > > This seems potentially fragile to dodgy DTs given that we might also be > using size to make a mask later. Would it make sense to double-up a > sanity check as mask-format detection? Something like: > > if is_power_of_2(size) > // use size > else if is_power_of_2(size + 1) > // use size + 1 > else > // cry Robin, How about having the logic like this? ret = of_dma_get_range(np, &dma_addr, &paddr, &size); if (ret < 0) { dma_addr = offset = 0; size = dev->coherent_dma_mask + 1; } else { offset = PFN_DOWN(paddr - dma_addr); dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); } if (is_power_of_2(size + 1)) size = size + 1; else if (!is_power_of_2(size)) { dev_err(dev, "invalid size\n"); return; } Murali > > > Robin. > >> dev->dma_pfn_offset = offset; >> >> coherent = of_dma_is_coherent(np); >> > > -- Murali Karicheri Linux Kernel, Texas Instruments From mboxrd@z Thu Jan 1 00:00:00 1970 From: m-karicheri2@ti.com (Murali Karicheri) Date: Tue, 27 Jan 2015 13:55:15 -0500 Subject: [PATCH v4 3/6] of: fix size when dma-range is not used In-Reply-To: <54C77616.80301@arm.com> References: <1422052359-12384-1-git-send-email-m-karicheri2@ti.com> <1422052359-12384-4-git-send-email-m-karicheri2@ti.com> <54C77616.80301@arm.com> Message-ID: <54C7DF13.20402@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 01/27/2015 06:27 AM, Robin Murphy wrote: > Hi Murali, > > On 23/01/15 22:32, Murali Karicheri wrote: >> Fix the dma-range size when the DT attribute is missing. i.e set size to >> dev->coherent_dma_mask + 1 instead of dev->coherent_dma_mask. To detect >> overflow when mask is set to max of u64, add a check, log error and >> return. >> Some platform use mask format for size in DTS. So add a work around to >> catch this and fix. >> >> Cc: Joerg Roedel >> Cc: Grant Likely >> Cc: Rob Herring >> Cc: Bjorn Helgaas >> Cc: Will Deacon >> Cc: Russell King >> Cc: Arnd Bergmann >> Cc: Suravee Suthikulpanit >> >> Signed-off-by: Murali Karicheri >> --- >> drivers/of/device.c | 14 +++++++++++++- >> 1 file changed, 13 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/of/device.c b/drivers/of/device.c >> index 2de320d..0a5ff54 100644 >> --- a/drivers/of/device.c >> +++ b/drivers/of/device.c >> @@ -105,12 +105,24 @@ void of_dma_configure(struct device *dev, struct >> device_node *np) >> ret = of_dma_get_range(np, &dma_addr, &paddr, &size); >> if (ret < 0) { >> dma_addr = offset = 0; >> - size = dev->coherent_dma_mask; >> + size = dev->coherent_dma_mask + 1; >> } else { >> offset = PFN_DOWN(paddr - dma_addr); >> + /* >> + * Add a work around to treat the size as mask + 1 in case >> + * it is defined in DT as a mask. >> + */ >> + if (size & 1) >> + size = size + 1; >> dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); >> } >> >> + /* if size is 0, we have an overflow of u64 */ >> + if (!size) { >> + dev_err(dev, "invalid size\n"); >> + return; >> + } >> + > > This seems potentially fragile to dodgy DTs given that we might also be > using size to make a mask later. Would it make sense to double-up a > sanity check as mask-format detection? Something like: > > if is_power_of_2(size) > // use size > else if is_power_of_2(size + 1) > // use size + 1 > else > // cry Robin, How about having the logic like this? ret = of_dma_get_range(np, &dma_addr, &paddr, &size); if (ret < 0) { dma_addr = offset = 0; size = dev->coherent_dma_mask + 1; } else { offset = PFN_DOWN(paddr - dma_addr); dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); } if (is_power_of_2(size + 1)) size = size + 1; else if (!is_power_of_2(size)) { dev_err(dev, "invalid size\n"); return; } Murali > > > Robin. > >> dev->dma_pfn_offset = offset; >> >> coherent = of_dma_is_coherent(np); >> > > -- Murali Karicheri Linux Kernel, Texas Instruments