lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 049/496] powerpc/pseries: Use the security flags in pseries_setup_rfi_flush()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Michael Ellerman <mpe@ellerman.id.au>

    commit 2e4a16161fcd324b1f9bf6cb6856529f7eaf0689 upstream.

    Now that we have the security flags we can simplify the code in
    pseries_setup_rfi_flush() because the security flags have pessimistic
    defaults.

    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/powerpc/platforms/pseries/setup.c | 27 ++++++++++++---------------
    1 file changed, 12 insertions(+), 15 deletions(-)

    --- a/arch/powerpc/platforms/pseries/setup.c
    +++ b/arch/powerpc/platforms/pseries/setup.c
    @@ -501,30 +501,27 @@ void pseries_setup_rfi_flush(void)
    bool enable;
    long rc;

    - /* Enable by default */
    - enable = true;
    - types = L1D_FLUSH_FALLBACK;
    -
    rc = plpar_get_cpu_characteristics(&result);
    - if (rc == H_SUCCESS) {
    + if (rc == H_SUCCESS)
    init_cpu_char_feature_flags(&result);

    - if (result.character & H_CPU_CHAR_L1D_FLUSH_TRIG2)
    - types |= L1D_FLUSH_MTTRIG;
    - if (result.character & H_CPU_CHAR_L1D_FLUSH_ORI30)
    - types |= L1D_FLUSH_ORI;
    -
    - if ((!(result.behaviour & H_CPU_BEHAV_L1D_FLUSH_PR)) ||
    - (!(result.behaviour & H_CPU_BEHAV_FAVOUR_SECURITY)))
    - enable = false;
    - }
    -
    /*
    * We're the guest so this doesn't apply to us, clear it to simplify
    * handling of it elsewhere.
    */
    security_ftr_clear(SEC_FTR_L1D_FLUSH_HV);

    + types = L1D_FLUSH_FALLBACK;
    +
    + if (security_ftr_enabled(SEC_FTR_L1D_FLUSH_TRIG2))
    + types |= L1D_FLUSH_MTTRIG;
    +
    + if (security_ftr_enabled(SEC_FTR_L1D_FLUSH_ORI30))
    + types |= L1D_FLUSH_ORI;
    +
    + enable = security_ftr_enabled(SEC_FTR_FAVOUR_SECURITY) && \
    + security_ftr_enabled(SEC_FTR_L1D_FLUSH_PR);
    +
    setup_rfi_flush(types, enable);
    }


    \
     
     \ /
      Last update: 2018-05-28 15:47    [W:2.820 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site