lkml.org 
[lkml]   [2020]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 77/85] random32: Restore __latent_entropy attribute on net_rand_state
    Date
    From: Thibaut Sautereau <thibaut.sautereau@ssi.gouv.fr>

    [ Upstream commit 09a6b0bc3be793ca8cba580b7992d73e9f68f15d ]

    Commit f227e3ec3b5c ("random32: update the net random state on interrupt
    and activity") broke compilation and was temporarily fixed by Linus in
    83bdc7275e62 ("random32: remove net_rand_state from the latent entropy
    gcc plugin") by entirely moving net_rand_state out of the things handled
    by the latent_entropy GCC plugin.

    >From what I understand when reading the plugin code, using the
    __latent_entropy attribute on a declaration was the wrong part and
    simply keeping the __latent_entropy attribute on the variable definition
    was the correct fix.

    Fixes: 83bdc7275e62 ("random32: remove net_rand_state from the latent entropy gcc plugin")
    Acked-by: Willy Tarreau <w@1wt.eu>
    Cc: Emese Revfy <re.emese@gmail.com>
    Signed-off-by: Thibaut Sautereau <thibaut.sautereau@ssi.gouv.fr>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    lib/random32.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/lib/random32.c b/lib/random32.c
    index 3d749abb9e80d..1786f78bf4c53 100644
    --- a/lib/random32.c
    +++ b/lib/random32.c
    @@ -48,7 +48,7 @@ static inline void prandom_state_selftest(void)
    }
    #endif

    -DEFINE_PER_CPU(struct rnd_state, net_rand_state);
    +DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;

    /**
    * prandom_u32_state - seeded pseudo-random number generator.
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-05 17:35    [W:4.108 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site