Re: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower extended-context-table

2015-08-25 Thread j...@8bytes.org 
On Tue, Aug 25, 2015 at 09:15:39AM +, Xiao, Nan (Nan@HPservers-Core-OE-PSC) 
wrote:
> In commit message:
> 
> > There is a bug in iommu_context_addr() which will always use the lower 
> > context table, event when the upper context table needs to be used. Fix 
> > this issue.
> 
> I think it should be " even when the upper context table ", not "event".

Right, fixed that. Thanks for noticing.


Joerg

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

RE: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower extended-context-table

2015-08-25 Thread Xiao, Nan (Nan@HPservers-Core-OE-PSC) 
Hi Joerg,

In commit message:

> There is a bug in iommu_context_addr() which will always use the lower 
> context table, event when the upper context table needs to be used. Fix this 
> issue.

I think it should be " even when the upper context table ", not "event".

Thanks!

Best Regards
Nan Xiao

-Original Message-
From: j...@8bytes.org [mailto:j...@8bytes.org] 
Sent: Tuesday, August 25, 2015 5:00 PM
To: Xiao, Nan (Nan@HPservers-Core-OE-PSC)
Cc: dw...@infradead.org; io...@lists.linux-foundation.org; 
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower 
extended-context-table

On Tue, Aug 25, 2015 at 08:46:27AM +, Xiao, Nan (Nan@HPservers-Core-OE-PSC) 
wrote:
> Yes, your patch is simple and better!

Okay, I queued this patch to my x86/vt-d branch:

>From 03932776424a799c3f065a69e98076a78530288b Mon Sep 17 00:00:00 2001
From: Joerg Roedel 
Date: Tue, 25 Aug 2015 10:54:28 +0200
Subject: [PATCH] iommu/vt-d: Really use upper context table when necessary

There is a bug in iommu_context_addr() which will always use the lower context 
table, event when the upper context table needs to be used. Fix this issue.

Fixes: 03ecc32c5274 ("iommu/vt-d: support extended root and context entries")
Reported-by: Xiao, Nan 
Signed-off-by: Joerg Roedel 
---
 drivers/iommu/intel-iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 
a85077d..63daf1b 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -803,6 +803,7 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
struct context_entry *context;
u64 *entry;
 
+   entry = >lo;
if (ecs_enabled(iommu)) {
if (devfn >= 0x80) {
devfn -= 0x80;
@@ -810,7 +811,6 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
}
devfn *= 2;
}
-   entry = >lo;
if (*entry & 1)
context = phys_to_virt(*entry & VTD_PAGE_MASK);
else {
--
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower extended-context-table

2015-08-25 Thread j...@8bytes.org 
On Tue, Aug 25, 2015 at 08:46:27AM +, Xiao, Nan (Nan@HPservers-Core-OE-PSC) 
wrote:
> Yes, your patch is simple and better!

Okay, I queued this patch to my x86/vt-d branch:

>From 03932776424a799c3f065a69e98076a78530288b Mon Sep 17 00:00:00 2001
From: Joerg Roedel 
Date: Tue, 25 Aug 2015 10:54:28 +0200
Subject: [PATCH] iommu/vt-d: Really use upper context table when necessary

There is a bug in iommu_context_addr() which will always use
the lower context table, event when the upper context table
needs to be used. Fix this issue.

Fixes: 03ecc32c5274 ("iommu/vt-d: support extended root and context entries")
Reported-by: Xiao, Nan 
Signed-off-by: Joerg Roedel 
---
 drivers/iommu/intel-iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index a85077d..63daf1b 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -803,6 +803,7 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
struct context_entry *context;
u64 *entry;
 
+   entry = >lo;
if (ecs_enabled(iommu)) {
if (devfn >= 0x80) {
devfn -= 0x80;
@@ -810,7 +811,6 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
}
devfn *= 2;
}
-   entry = >lo;
if (*entry & 1)
context = phys_to_virt(*entry & VTD_PAGE_MASK);
else {
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

RE: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower extended-context-table

2015-08-25 Thread Xiao, Nan (Nan@HPservers-Core-OE-PSC) 
Hi Joerg,

Yes, your patch is simple and better!

Best Regards
Nan Xiao

-Original Message-
From: j...@8bytes.org [mailto:j...@8bytes.org] 
Sent: Tuesday, August 25, 2015 4:42 PM
To: Xiao, Nan (Nan@HPservers-Core-OE-PSC)
Cc: dw...@infradead.org; io...@lists.linux-foundation.org; 
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower 
extended-context-table

Hi Nan,

On Mon, Aug 24, 2015 at 06:26:33AM +, Xiao, Nan (Nan@HPS Performance, 
Beijing) wrote:
>  drivers/iommu/intel-iommu.c | 7 ---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c 
> index 0649b94..4213598 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -759,10 +759,11 @@ static inline struct context_entry 
> *iommu_context_addr(struct intel_iommu *iommu
>   if (devfn >= 0x80) {
>   devfn -= 0x80;
>   entry = >hi;
> - }
> + } else
> + entry = >lo;
>   devfn *= 2;
> - }
> - entry = >lo;
> + } else
> + entry = >lo;
>   if (*entry & 1)
>   context = phys_to_virt(*entry & VTD_PAGE_MASK);
>   else {

Shouldn't this diff have the same effect?

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 
0649b94..7553cb9 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -755,6 +755,7 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
struct context_entry *context;
u64 *entry;
 
+   entry = >lo;
if (ecs_enabled(iommu)) {
if (devfn >= 0x80) {
devfn -= 0x80;
@@ -762,7 +763,6 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
}
devfn *= 2;
}
-   entry = >lo;
if (*entry & 1)
context = phys_to_virt(*entry & VTD_PAGE_MASK);
else {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower extended-context-table

2015-08-25 Thread j...@8bytes.org 
Hi Nan,

On Mon, Aug 24, 2015 at 06:26:33AM +, Xiao, Nan (Nan@HPS Performance, 
Beijing) wrote:
>  drivers/iommu/intel-iommu.c | 7 ---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
> index 0649b94..4213598 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -759,10 +759,11 @@ static inline struct context_entry 
> *iommu_context_addr(struct intel_iommu *iommu
>   if (devfn >= 0x80) {
>   devfn -= 0x80;
>   entry = >hi;
> - }
> + } else
> + entry = >lo;
>   devfn *= 2;
> - }
> - entry = >lo;
> + } else
> + entry = >lo;
>   if (*entry & 1)
>   context = phys_to_virt(*entry & VTD_PAGE_MASK);
>   else {

Shouldn't this diff have the same effect?

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 0649b94..7553cb9 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -755,6 +755,7 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
struct context_entry *context;
u64 *entry;
 
+   entry = >lo;
if (ecs_enabled(iommu)) {
if (devfn >= 0x80) {
devfn -= 0x80;
@@ -762,7 +763,6 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
}
devfn *= 2;
}
-   entry = >lo;
if (*entry & 1)
context = phys_to_virt(*entry & VTD_PAGE_MASK);
else {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower extended-context-table

2015-08-25 Thread j...@8bytes.org 
Hi Nan,

On Mon, Aug 24, 2015 at 06:26:33AM +, Xiao, Nan (Nan@HPS Performance, 
Beijing) wrote:
  drivers/iommu/intel-iommu.c | 7 ---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
 index 0649b94..4213598 100644
 --- a/drivers/iommu/intel-iommu.c
 +++ b/drivers/iommu/intel-iommu.c
 @@ -759,10 +759,11 @@ static inline struct context_entry 
 *iommu_context_addr(struct intel_iommu *iommu
   if (devfn = 0x80) {
   devfn -= 0x80;
   entry = root-hi;
 - }
 + } else
 + entry = root-lo;
   devfn *= 2;
 - }
 - entry = root-lo;
 + } else
 + entry = root-lo;
   if (*entry  1)
   context = phys_to_virt(*entry  VTD_PAGE_MASK);
   else {

Shouldn't this diff have the same effect?

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 0649b94..7553cb9 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -755,6 +755,7 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
struct context_entry *context;
u64 *entry;
 
+   entry = root-lo;
if (ecs_enabled(iommu)) {
if (devfn = 0x80) {
devfn -= 0x80;
@@ -762,7 +763,6 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
}
devfn *= 2;
}
-   entry = root-lo;
if (*entry  1)
context = phys_to_virt(*entry  VTD_PAGE_MASK);
else {
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower extended-context-table

2015-08-25 Thread j...@8bytes.org 
On Tue, Aug 25, 2015 at 08:46:27AM +, Xiao, Nan (Nan@HPservers-Core-OE-PSC) 
wrote:
 Yes, your patch is simple and better!

Okay, I queued this patch to my x86/vt-d branch:

From 03932776424a799c3f065a69e98076a78530288b Mon Sep 17 00:00:00 2001
From: Joerg Roedel jroe...@suse.de
Date: Tue, 25 Aug 2015 10:54:28 +0200
Subject: [PATCH] iommu/vt-d: Really use upper context table when necessary

There is a bug in iommu_context_addr() which will always use
the lower context table, event when the upper context table
needs to be used. Fix this issue.

Fixes: 03ecc32c5274 (iommu/vt-d: support extended root and context entries)
Reported-by: Xiao, Nan nan.x...@hp.com
Signed-off-by: Joerg Roedel jroe...@suse.de
---
 drivers/iommu/intel-iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index a85077d..63daf1b 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -803,6 +803,7 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
struct context_entry *context;
u64 *entry;
 
+   entry = root-lo;
if (ecs_enabled(iommu)) {
if (devfn = 0x80) {
devfn -= 0x80;
@@ -810,7 +811,6 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
}
devfn *= 2;
}
-   entry = root-lo;
if (*entry  1)
context = phys_to_virt(*entry  VTD_PAGE_MASK);
else {
-- 
1.8.4.5

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

RE: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower extended-context-table

2015-08-25 Thread Xiao, Nan (Nan@HPservers-Core-OE-PSC) 
Hi Joerg,

Yes, your patch is simple and better!

Best Regards
Nan Xiao

-Original Message-
From: j...@8bytes.org [mailto:j...@8bytes.org] 
Sent: Tuesday, August 25, 2015 4:42 PM
To: Xiao, Nan (Nan@HPservers-Core-OE-PSC)
Cc: dw...@infradead.org; io...@lists.linux-foundation.org; 
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower 
extended-context-table

Hi Nan,

On Mon, Aug 24, 2015 at 06:26:33AM +, Xiao, Nan (Nan@HPS Performance, 
Beijing) wrote:
  drivers/iommu/intel-iommu.c | 7 ---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c 
 index 0649b94..4213598 100644
 --- a/drivers/iommu/intel-iommu.c
 +++ b/drivers/iommu/intel-iommu.c
 @@ -759,10 +759,11 @@ static inline struct context_entry 
 *iommu_context_addr(struct intel_iommu *iommu
   if (devfn = 0x80) {
   devfn -= 0x80;
   entry = root-hi;
 - }
 + } else
 + entry = root-lo;
   devfn *= 2;
 - }
 - entry = root-lo;
 + } else
 + entry = root-lo;
   if (*entry  1)
   context = phys_to_virt(*entry  VTD_PAGE_MASK);
   else {

Shouldn't this diff have the same effect?

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 
0649b94..7553cb9 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -755,6 +755,7 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
struct context_entry *context;
u64 *entry;
 
+   entry = root-lo;
if (ecs_enabled(iommu)) {
if (devfn = 0x80) {
devfn -= 0x80;
@@ -762,7 +763,6 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
}
devfn *= 2;
}
-   entry = root-lo;
if (*entry  1)
context = phys_to_virt(*entry  VTD_PAGE_MASK);
else {
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower extended-context-table

2015-08-25 Thread j...@8bytes.org 
On Tue, Aug 25, 2015 at 09:15:39AM +, Xiao, Nan (Nan@HPservers-Core-OE-PSC) 
wrote:
 In commit message:
 
  There is a bug in iommu_context_addr() which will always use the lower 
  context table, event when the upper context table needs to be used. Fix 
  this issue.
 
 I think it should be  even when the upper context table , not event.

Right, fixed that. Thanks for noticing.


Joerg

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

RE: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower extended-context-table

2015-08-25 Thread Xiao, Nan (Nan@HPservers-Core-OE-PSC) 
Hi Joerg,

In commit message:

 There is a bug in iommu_context_addr() which will always use the lower 
 context table, event when the upper context table needs to be used. Fix this 
 issue.

I think it should be  even when the upper context table , not event.

Thanks!

Best Regards
Nan Xiao

-Original Message-
From: j...@8bytes.org [mailto:j...@8bytes.org] 
Sent: Tuesday, August 25, 2015 5:00 PM
To: Xiao, Nan (Nan@HPservers-Core-OE-PSC)
Cc: dw...@infradead.org; io...@lists.linux-foundation.org; 
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Fix bug in iommu_context_addr: Always get pointer to lower 
extended-context-table

On Tue, Aug 25, 2015 at 08:46:27AM +, Xiao, Nan (Nan@HPservers-Core-OE-PSC) 
wrote:
 Yes, your patch is simple and better!

Okay, I queued this patch to my x86/vt-d branch:

From 03932776424a799c3f065a69e98076a78530288b Mon Sep 17 00:00:00 2001
From: Joerg Roedel jroe...@suse.de
Date: Tue, 25 Aug 2015 10:54:28 +0200
Subject: [PATCH] iommu/vt-d: Really use upper context table when necessary

There is a bug in iommu_context_addr() which will always use the lower context 
table, event when the upper context table needs to be used. Fix this issue.

Fixes: 03ecc32c5274 (iommu/vt-d: support extended root and context entries)
Reported-by: Xiao, Nan nan.x...@hp.com
Signed-off-by: Joerg Roedel jroe...@suse.de
---
 drivers/iommu/intel-iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 
a85077d..63daf1b 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -803,6 +803,7 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
struct context_entry *context;
u64 *entry;
 
+   entry = root-lo;
if (ecs_enabled(iommu)) {
if (devfn = 0x80) {
devfn -= 0x80;
@@ -810,7 +811,6 @@ static inline struct context_entry 
*iommu_context_addr(struct intel_iommu *iommu
}
devfn *= 2;
}
-   entry = root-lo;
if (*entry  1)
context = phys_to_virt(*entry  VTD_PAGE_MASK);
else {
--
1.8.4.5

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/