| Message ID | 1504791597-15151-1-git-send-email-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 07.09.17 at 15:39, <andrew.cooper3@citrix.com> wrote: > --- a/xen/include/asm-x86/x86_64/page.h > +++ b/xen/include/asm-x86/x86_64/page.h > @@ -121,8 +121,16 @@ typedef l4_pgentry_t root_pgentry_t; > */ > > /* Extract flags into 24-bit integer, or turn 24-bit flags into a pte mask. */ > -#define get_pte_flags(x) (((int)((x) >> 40) & ~0xFFF) | ((int)(x) & 0xFFF)) > -#define put_pte_flags(x) (((intpte_t)((x) & ~0xFFF) << 40) | ((x) & 0xFFF)) > +#ifndef __ASSEMBLY__ > +static inline unsigned int get_pte_flags(intpte_t x) > +{ > + return ((x >> 40) & ~0xfff) | (x & 0xfff); > +} > +static inline intpte_t put_pte_flags(unsigned int x) > +{ > + return (((intpte_t)x & ~0xfff) << 40) | (x & 0xfff); > +} > +#endif With ideally a blank line added between the two Reviewed-by: Jan Beulich <jbeulich@suse.com> Jan
On Thu, Sep 07, 2017 at 02:39:57PM +0100, Andrew Cooper wrote: > This resolves 11 Coverity issues along the lines of the following: > > 1600 for ( i = 0; i < NR_RESERVED_GDT_PAGES; i++ ) > > CID: Operands don't affect result > (CONSTANT_EXPRESSION_RESULT)result_independent_of_operands: ((33U /* 1U | > 0x20U */) | (({...}) ? 8388608U /* 1U << 23 */ : 0) | 0x40U | 2U) & 4095 > is always 0x63 regardless of the values of its operands. This occurs as > the bitwise second operand of "|". > > 1601 l1e_write(pl1e + FIRST_RESERVED_GDT_PAGE + i, > 1602 l1e_from_pfn(mfn + i, __PAGE_HYPERVISOR_RW)); > > This is presumably because once preprocessed, the association of joint logic > inside {get,set}_pte_flags() is lost. > > No functional change. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Wei Liu <wei.liu2@citrix.com>
diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index 1151ce9..1fe4531 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -121,8 +121,16 @@ typedef l4_pgentry_t root_pgentry_t; */ /* Extract flags into 24-bit integer, or turn 24-bit flags into a pte mask. */ -#define get_pte_flags(x) (((int)((x) >> 40) & ~0xFFF) | ((int)(x) & 0xFFF)) -#define put_pte_flags(x) (((intpte_t)((x) & ~0xFFF) << 40) | ((x) & 0xFFF)) +#ifndef __ASSEMBLY__ +static inline unsigned int get_pte_flags(intpte_t x) +{ + return ((x >> 40) & ~0xfff) | (x & 0xfff); +} +static inline intpte_t put_pte_flags(unsigned int x) +{ + return (((intpte_t)x & ~0xfff) << 40) | (x & 0xfff); +} +#endif /* * Protection keys define a new 4-bit protection key field
This resolves 11 Coverity issues along the lines of the following: 1600 for ( i = 0; i < NR_RESERVED_GDT_PAGES; i++ ) CID: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)result_independent_of_operands: ((33U /* 1U | 0x20U */) | (({...}) ? 8388608U /* 1U << 23 */ : 0) | 0x40U | 2U) & 4095 is always 0x63 regardless of the values of its operands. This occurs as the bitwise second operand of "|". 1601 l1e_write(pl1e + FIRST_RESERVED_GDT_PAGE + i, 1602 l1e_from_pfn(mfn + i, __PAGE_HYPERVISOR_RW)); This is presumably because once preprocessed, the association of joint logic inside {get,set}_pte_flags() is lost. No functional change. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Jan Beulich <JBeulich@suse.com> CC: Wei Liu <wei.liu2@citrix.com> --- xen/include/asm-x86/x86_64/page.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)