[PATCH 12/23] x86/fpu: Make __raw_xsave_addr() use feature number instead of mask

[Sebastian Andrzej Siewior]

Most users of __raw_xsave_addr() use a feature number, shift it to a
mask and then __raw_xsave_addr() shifts it back to the feature number.

Make __raw_xsave_addr() use the feature number as argument.

Signed-off-by: Sebastian Andrzej Siewior <bige...@linutronix.de>
---
 arch/x86/kernel/fpu/xstate.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index a2041961f3008..3dfe3627deaf6 100644
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -805,22 +805,20 @@ void fpu__resume_cpu(void)
 }
 
 /*
- * Given an xstate feature mask, calculate where in the xsave
+ * Given an xstate feature nr, calculate where in the xsave
  * buffer the state is.  Callers should ensure that the buffer
  * is valid.
  *
  * Note: does not work for compacted buffers.
  */
-void *__raw_xsave_addr(struct xregs_state *xsave, int xstate_feature_mask)
+static void *__raw_xsave_addr(struct xregs_state *xsave, int xfeature_nr)
 {
-       int feature_nr = fls64(xstate_feature_mask) - 1;
-
-       if (!xfeature_enabled(feature_nr)) {
+       if (!xfeature_enabled(xfeature_nr)) {
                WARN_ON_FPU(1);
                return NULL;
        }
 
-       return (void *)xsave + xstate_comp_offsets[feature_nr];
+       return (void *)xsave + xstate_comp_offsets[xfeature_nr];
 }
 /*
  * Given the xsave area and a state inside, this function returns the
@@ -842,6 +840,7 @@ void *__raw_xsave_addr(struct xregs_state *xsave, int 
xstate_feature_mask)
  */
 void *get_xsave_addr(struct xregs_state *xsave, int xstate_feature)
 {
+       int xfeature_nr;
        /*
         * Do we even *have* xsave state?
         */
@@ -869,7 +868,8 @@ void *get_xsave_addr(struct xregs_state *xsave, int 
xstate_feature)
        if (!(xsave->header.xfeatures & xstate_feature))
                return NULL;
 
-       return __raw_xsave_addr(xsave, xstate_feature);
+       xfeature_nr = fls64(xstate_feature) - 1;
+       return __raw_xsave_addr(xsave, xfeature_nr);
 }
 EXPORT_SYMBOL_GPL(get_xsave_addr);
 
@@ -1016,7 +1016,7 @@ int copy_xstate_to_kernel(void *kbuf, struct xregs_state 
*xsave, unsigned int of
                 * Copy only in-use xstates:
                 */
                if ((header.xfeatures >> i) & 1) {
-                       void *src = __raw_xsave_addr(xsave, 1 << i);
+                       void *src = __raw_xsave_addr(xsave, i);
 
                        offset = xstate_offsets[i];
                        size = xstate_sizes[i];
@@ -1102,7 +1102,7 @@ int copy_xstate_to_user(void __user *ubuf, struct 
xregs_state *xsave, unsigned i
                 * Copy only in-use xstates:
                 */
                if ((header.xfeatures >> i) & 1) {
-                       void *src = __raw_xsave_addr(xsave, 1 << i);
+                       void *src = __raw_xsave_addr(xsave, i);
 
                        offset = xstate_offsets[i];
                        size = xstate_sizes[i];
@@ -1159,7 +1159,7 @@ int copy_kernel_to_xstate(struct xregs_state *xsave, 
const void *kbuf)
                u64 mask = ((u64)1 << i);
 
                if (hdr.xfeatures & mask) {
-                       void *dst = __raw_xsave_addr(xsave, 1 << i);
+                       void *dst = __raw_xsave_addr(xsave, i);
 
                        offset = xstate_offsets[i];
                        size = xstate_sizes[i];
@@ -1213,7 +1213,7 @@ int copy_user_to_xstate(struct xregs_state *xsave, const 
void __user *ubuf)
                u64 mask = ((u64)1 << i);
 
                if (hdr.xfeatures & mask) {
-                       void *dst = __raw_xsave_addr(xsave, 1 << i);
+                       void *dst = __raw_xsave_addr(xsave, i);
 
                        offset = xstate_offsets[i];
                        size = xstate_sizes[i];
-- 
2.19.1