[Patch for staging 1/2] docs: remove a special character to avoid html creation error.

[Patch for staging 1/2] docs: remove a special character to avoid html creation error.

[Yi Sun]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 1626 bytes --]

The '®' (a special character) may cause html document creation
failure. So remove it from the feature document.

Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
---
 docs/features/intel_psr_cat_cdp.pandoc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/features/intel_psr_cat_cdp.pandoc b/docs/features/intel_psr_cat_cdp.pandoc
index acf877b..04fb256 100644
--- a/docs/features/intel_psr_cat_cdp.pandoc
+++ b/docs/features/intel_psr_cat_cdp.pandoc
@@ -1,5 +1,5 @@
 % Intel Cache Allocation Technology and Code and Data Prioritization Features
-% Revision 1.15
+% Revision 1.16
 
 \clearpage
 
@@ -438,7 +438,7 @@ N/A
 
 # References
 
-"INTEL® RESOURCE DIRECTOR TECHNOLOGY (INTEL® RDT) ALLOCATION FEATURES" [Intel® 64 and IA-32 Architectures Software Developer Manuals, vol3](http://www.intel.com/content/www/us/en/processors/architectures-software-developer-manuals.html)
+"INTEL RESOURCE DIRECTOR TECHNOLOGY (INTEL RDT) ALLOCATION FEATURES" [Intel 64 and IA-32 Architectures Software Developer Manuals, vol3](http://www.intel.com/content/www/us/en/processors/architectures-software-developer-manuals.html)
 
 # History
 
@@ -468,4 +468,7 @@ Date       Revision Version  Notes
                              1. Fix a typo.
 2017-08-01 1.15     Xen 4.10 Changes:
                              1. Add 'alt_type' in 'feat_props' structure.
+2017-08-04 1.16     Xen 4.10 Changes:
+                             1. Remove special character which may cause
+                                html creation failure.
 ---------- -------- -------- -------------------------------------------
-- 
1.9.1



[-- Attachment #2: Type: text/plain, Size: 127 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[Patch for staging 2/2] x86: remove an ASSERT to avoid crash when destroy a domain.

[Yi Sun]

In 'psr_free_cos', we should not use 'ASSERT(socket_info)' because
the 'socket_info' is allocated only if 'psr' boot parameter is set.
So remove it and use 'psr_alloc_feat_enabled' to check if 'socket_info'
is valid or not to avoid crash.

Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
---
 xen/arch/x86/psr.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
index 7d9fa26..13c0daa 100644
--- a/xen/arch/x86/psr.c
+++ b/xen/arch/x86/psr.c
@@ -1294,9 +1294,7 @@ static void psr_free_cos(struct domain *d)
 {
     unsigned int socket, cos;
 
-    ASSERT(socket_info);
-
-    if ( !d->arch.psr_cos_ids )
+    if ( !d->arch.psr_cos_ids || !psr_alloc_feat_enabled() )
         return;
 
     /* Domain is destroyed so its cos_ref should be decreased. */
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [Patch for staging 1/2] docs: remove a special character to avoid html creation error.

[Wei Liu]

On Fri, Aug 04, 2017 at 05:29:36PM +0800, Yi Sun wrote:
> The '®' (a special character) may cause html document creation
> failure. So remove it from the feature document.

Not sure how you tested it but the original error was found by pandoc.

> 
> Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>

Change looks good:

Tested-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [Patch for staging 2/2] x86: remove an ASSERT to avoid crash when destroy a domain.

[Jan Beulich]

>>> Yi Sun <yi.y.sun@linux.intel.com> 08/04/17 11:45 AM >>>
>--- a/xen/arch/x86/psr.c
>+++ b/xen/arch/x86/psr.c
>@@ -1294,9 +1294,7 @@ static void psr_free_cos(struct domain *d)
>{
>unsigned int socket, cos;
 >
>- ASSERT(socket_info);
>-
>-    if ( !d->arch.psr_cos_ids )
>+    if ( !d->arch.psr_cos_ids || !psr_alloc_feat_enabled() )
>return;
 
Isn't it rather that you want to move the ASSERT() past this check? I don't see
why you need both checks, as d->arch.psr_cos_ids is only being allocated if
psr_alloc_feat_enabled() returns true.

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[PATCH] x86: remove an ASSERT to avoid crash when destroy a domain.

[Yi Sun]

In 'psr_free_cos', we should not use 'ASSERT(socket_info)' because
the 'socket_info' is allocated only if 'psr' boot parameter is set.
So remove it and use 'psr_alloc_feat_enabled' to check if 'socket_info'
is valid or not to avoid crash.

Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
---
 xen/arch/x86/psr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
index 7d9fa26..9ce8f17 100644
--- a/xen/arch/x86/psr.c
+++ b/xen/arch/x86/psr.c
@@ -1294,11 +1294,11 @@ static void psr_free_cos(struct domain *d)
 {
     unsigned int socket, cos;
 
-    ASSERT(socket_info);
-
     if ( !d->arch.psr_cos_ids )
         return;
 
+    ASSERT(socket_info);
+
     /* Domain is destroyed so its cos_ref should be decreased. */
     for ( socket = 0; socket < nr_sockets; socket++ )
     {
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] x86: remove an ASSERT to avoid crash when destroy a domain.

[Jan Beulich]

>>> Yi Sun <yi.y.sun@linux.intel.com> 08/05/17 3:42 AM >>>
>In 'psr_free_cos', we should not use 'ASSERT(socket_info)' because
>the 'socket_info' is allocated only if 'psr' boot parameter is set.
>So remove it and use 'psr_alloc_feat_enabled' to check if 'socket_info'
>is valid or not to avoid crash.

Title and description are no longer in line with the actual change.

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH] x86: remove an ASSERT to avoid crash when destroy a domain.

[Yi Sun]

On 17-08-06 03:34:20, Jan Beulich wrote:
> >>> Yi Sun <yi.y.sun@linux.intel.com> 08/05/17 3:42 AM >>>
> >In 'psr_free_cos', we should not use 'ASSERT(socket_info)' because
> >the 'socket_info' is allocated only if 'psr' boot parameter is set.
> >So remove it and use 'psr_alloc_feat_enabled' to check if 'socket_info'
> >is valid or not to avoid crash.
> 
> Title and description are no longer in line with the actual change.
> 
Oh, sorry, my fault, too hurried to change these.

> Jan

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[Patch for staging 2/2] x86: adjust place of an ASSERT to avoid crash when destroy a domain.

[Yi Sun]

In 'psr_free_cos', we should not use 'ASSERT(socket_info)' at the beginning
because the 'socket_info' is allocated only if 'psr' boot parameter is set.
So adjust its place to avoid crash.

Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
---
 xen/arch/x86/psr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
index 7d9fa26..9ce8f17 100644
--- a/xen/arch/x86/psr.c
+++ b/xen/arch/x86/psr.c
@@ -1294,11 +1294,11 @@ static void psr_free_cos(struct domain *d)
 {
     unsigned int socket, cos;
 
-    ASSERT(socket_info);
-
     if ( !d->arch.psr_cos_ids )
         return;
 
+    ASSERT(socket_info);
+
     /* Domain is destroyed so its cos_ref should be decreased. */
     for ( socket = 0; socket < nr_sockets; socket++ )
     {
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [Patch for staging 2/2] x86: adjust place of an ASSERT to avoid crash when destroy a domain.

[Jan Beulich]

>>> Yi Sun <yi.y.sun@linux.intel.com> 08/07/17 4:07 AM >>>
>In 'psr_free_cos', we should not use 'ASSERT(socket_info)' at the beginning
>because the 'socket_info' is allocated only if 'psr' boot parameter is set.
>So adjust its place to avoid crash.
>
>Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>

Reviewed-by: Jan Beulich <jbeulich@suse.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [Patch for staging 2/2] x86: adjust place of an ASSERT to avoid crash when destroy a domain.

[Wei Liu]

Can we see about committing this patch as soon as possible? This is
blocking osstest pushgate.

On Mon, Aug 07, 2017 at 09:50:49AM +0800, Yi Sun wrote:
> In 'psr_free_cos', we should not use 'ASSERT(socket_info)' at the beginning
> because the 'socket_info' is allocated only if 'psr' boot parameter is set.
> So adjust its place to avoid crash.
> 
> Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
> ---
>  xen/arch/x86/psr.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
> index 7d9fa26..9ce8f17 100644
> --- a/xen/arch/x86/psr.c
> +++ b/xen/arch/x86/psr.c
> @@ -1294,11 +1294,11 @@ static void psr_free_cos(struct domain *d)
>  {
>      unsigned int socket, cos;
>  
> -    ASSERT(socket_info);
> -
>      if ( !d->arch.psr_cos_ids )
>          return;
>  
> +    ASSERT(socket_info);
> +
>      /* Domain is destroyed so its cos_ref should be decreased. */
>      for ( socket = 0; socket < nr_sockets; socket++ )
>      {
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> https://lists.xen.org/xen-devel

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [Patch for staging 2/2] x86: adjust place of an ASSERT to avoid crash when destroy a domain.

[Wei Liu]

On Mon, Aug 07, 2017 at 11:19:09AM +0100, Wei Liu wrote:
> Can we see about committing this patch as soon as possible? This is
> blocking osstest pushgate.

Andrew prodded me on irc to commit this patch. I have done so, along
with the doc patch.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel