From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F6EFC001B2 for ; Sun, 11 Dec 2022 22:16:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B018B8E0005; Sun, 11 Dec 2022 17:16:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A8B088E0002; Sun, 11 Dec 2022 17:16:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92B7E8E0005; Sun, 11 Dec 2022 17:16:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 83C9C8E0002 for ; Sun, 11 Dec 2022 17:16:29 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4CD2BC0552 for ; Sun, 11 Dec 2022 22:16:28 +0000 (UTC) X-FDA: 80231435256.19.8B7B704 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by imf29.hostedemail.com (Postfix) with ESMTP id 9347D120010 for ; Sun, 11 Dec 2022 22:16:26 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=mail.huji.ac.il header.s=mailhuji header.b=fWKZ9AyL; dmarc=pass (policy=none) header.from=huji.ac.il; spf=pass (imf29.hostedemail.com: domain of david.keisarschm@mail.huji.ac.il designates 209.85.221.44 as permitted sender) smtp.mailfrom=david.keisarschm@mail.huji.ac.il ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670796986; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=zM8KEovEBPpuDpU7J5nrYIVpuEqDseyeMIrsp4iQznI=; b=zaMQ4zPKPH7Mx7To8nHi8udGZGA6ZnNQspmJM7HfM8oFgli0rZZKxn1K4eb+v/V0ZfEKJ0 tVzwORtad/sx44cDkVr8xglMEv2fEZ086XLskQPKhWA5n9QIxMuJWXJqJf6mEIoooCSFQ4 akmCTuUAtbAcPU1eMjHnH2PicxIdYo4= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=mail.huji.ac.il header.s=mailhuji header.b=fWKZ9AyL; dmarc=pass (policy=none) header.from=huji.ac.il; spf=pass (imf29.hostedemail.com: domain of david.keisarschm@mail.huji.ac.il designates 209.85.221.44 as permitted sender) smtp.mailfrom=david.keisarschm@mail.huji.ac.il ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670796986; a=rsa-sha256; cv=none; b=4ZW4jdiGV98uUgAIXuR8qyLPwicLod9E7K/2pdEw8Bm3sYB3BQoevXMgMIxv1lARD4vdaL Lku8dGWMp4VoDKSrmXOGYikq4Tbv29UgTUB+VoC8/RANFmARAsEtqdSvqbWxWie8gdCdg6 DOknxa8vSxfwTV+8c5sQSw7GkM9pD1I= Received: by mail-wr1-f44.google.com with SMTP id w15so10288602wrl.9 for ; Sun, 11 Dec 2022 14:16:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.huji.ac.il; s=mailhuji; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zM8KEovEBPpuDpU7J5nrYIVpuEqDseyeMIrsp4iQznI=; b=fWKZ9AyL/cITc+iqt3VV5VKWgDaeRzwAk2ZBkHGdlAsfED8yw9QZsYVlvaF0m6MBrK WVS5xYAnIG/aiFcxxZayewGR0nVoRWNeAPy8fdwmVZKrovRizmZEv3AonkIYuwTR2VbR ipyYIpxN6IgV4M3EMaYlBX6qyfqYkyHcILUeU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zM8KEovEBPpuDpU7J5nrYIVpuEqDseyeMIrsp4iQznI=; b=WD3BgshmpJrtXUaSGRANqs3Ut4VBOn0VFfH9Yg5df1OnXZIW10HE+Uetb130rF2Zy0 tBgRkjZS7471rgPXASfOSg0qLjg4FMaH8QC2r4AhmlFwkKKu4xBrN0siwf1fw/Ag4q1H YIsDc8b9kDNEPTc7ttUShafbNce6ALvq24XCR7ufEVLi2IUP9T4TeTvMfsKbel6MDav4 lphQ/kQEPZR0qJThSZiVk+q4Csepb3Nz23BBnY7SYoHo2Ql/l3qZCvXwlGtDEpC2+jMo db0n6TrSXyvQiykewT6asMYeWRidSUmgU9IeDCIxzQXLiu32/PuhJifk3v0IgPV82bgI eePw== X-Gm-Message-State: ANoB5pltbKtNV6s/lOTiHS0Xops7AbKn0R5f61Oei3I/hfuncJP0Bu7r DZ8PVKCexEiCQJnZtUQP1WrwOQ== X-Google-Smtp-Source: AA0mqf5QscAKPqWC/oCh0m4RyFsDHTkAHL/kHN3AUFV3csBH/BHNtmhVewKthz4gV534opneQKsf0g== X-Received: by 2002:adf:f205:0:b0:242:1809:7e17 with SMTP id p5-20020adff205000000b0024218097e17mr8808872wro.6.1670796985307; Sun, 11 Dec 2022 14:16:25 -0800 (PST) Received: from MacBook-Pro-5.lan ([2a0d:6fc2:218c:1a00:a91c:f8bf:c26f:4f15]) by smtp.gmail.com with ESMTPSA id d7-20020adffd87000000b002422bc69111sm8605805wrr.9.2022.12.11.14.16.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 14:16:24 -0800 (PST) From: david.keisarschm@mail.huji.ac.il To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: David , aksecurity@gmail.com, ilay.bahat1@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] Replace invocation of weak PRNG in mm/slab.c Date: Mon, 12 Dec 2022 00:16:06 +0200 Message-Id: <18076e09f1062f38f5d02e8fefb73b810f437ca3.1670778652.git.david.keisarschm@mail.huji.ac.il> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9347D120010 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 75hcnu7nmrd8xzsscnferseejoaidutn X-HE-Tag: 1670796986-475289 X-HE-Meta: U2FsdGVkX1+2uFvGWvKgmlSMOrezvBmTrFxWM7r/v5GyHkJcEXv1vHUuWPOpyVyreS3BfMe+5Rp5gtsBjgGgyxMMD6uTJvn1ofuHv4usLDcIwb+n8ZLQVwsoWqxW1J4VN4u78Bq7D9JTDjS1XM3T0vTpBhRlR3UowGor3GEfeRuprUrDwz14+DwjZRoVBcy4IvlZwFAfa+G5AaQK93ezMs16CNrl4G1VW2NohKWl5z7OX6j8CNVsVYUeTDsLXpXV6BPW+8mOWPnGGDiKcGFLpmw7wVzxO7iHD0hnDfgUxR0bSC4odfCj4qmO2pD5z7C2WIgFXYS4c3ecVE86NbytAuVN+c1BYBhyxSf7SVE1tHQoF83dN0MvoUW6x1AQizV6lsqjXxKH2kJhy7/e8LfXj7q8EBwrccQwyLAMB48ZeN0TGc8ZS0ih+8OQiMw6zUSa1V8BjZ1DkNiXDbkkOfyQLToGvIEV2Hrpdf0LraK1I/O1M8KMQs34GV3hRj3hIzB6hlNpFF/jkfqm+ZV4L34FpRL2rKMHeeOzsS1BCOgu09PLEeiSMYn/e+xdYdwwxR7NA3C9Iv2KuEHFgIEyxA9PMQaplcOgNveigGHNg4bPgxQFaU5osJgmjoPaIOU0Aj4VqZfAuCheXM/UeItuOY5vFcwg6LBX98vilwXGwTuQ1M+YVxKWQQUeDFin3pUFsEm5Mm3eza6wp2G8JHCTOZRweqU5xUl5pXtBzHTlPoBrCyoIvtn2zAplj266FB899v8tAbliNXxm5SIsmvMl2JiBiE8MNtNTOBxRhljI9bVWkxI/mk2LSJLf5dRTZHeMNeQmupRoC98aU5wehh7UhWlWstnH/Idp6ntMH+G7cRepJ3Z/xZxCb7TO/ZLh9loho0ErQ+p6OlRDFqT5rNws+4y3yIgFiVxNRZsKX5a/PMeoO5Jm5bEWfj663r58VElWwm6Oc86FoDNstr7x/KSPyNq vpaJbYbY o/MYaY0ctCDD+jHkaGKx399haGGxi54eNvkf8xxxE0bzKkSySBO7LSL4TkpI7zZopi0LXR7HPxh+TmsDD3QE6IMzgC1YudBgj+td/17ouykD3ILO3sdoirtd5CWSRSQvaYiNaRum/5o+JeFU5/G0oRezFFN/qPQOxmiiC8s0+RStS6l8zuBn854/bPne9tOT96BiEZSHfuJaSQhRJVWGEcaTu/g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: David We changed the invocation of prandom_u32_state to get_random_u32. We also changed the freelist_init_state to struct instead of a union, since the rnd_state is not needed anymore - get_random_u32 maintains its own state. Signed-off-by: David --- mm/slab.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index ff71c5757..1476104f4 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2360,20 +2360,17 @@ static void cache_init_objs_debug(struct kmem_cache *cachep, struct slab *slab) #ifdef CONFIG_SLAB_FREELIST_RANDOM /* Hold information during a freelist initialization */ -union freelist_init_state { - struct { - unsigned int pos; - unsigned int *list; - unsigned int count; - }; - struct rnd_state rnd_state; +struct freelist_init_state { + unsigned int pos; + unsigned int *list; + unsigned int count; }; /* * Initialize the state based on the randomization method available. * return true if the pre-computed list is available, false otherwise. */ -static bool freelist_state_initialize(union freelist_init_state *state, +static bool freelist_state_initialize(struct freelist_init_state *state, struct kmem_cache *cachep, unsigned int count) { @@ -2385,7 +2382,6 @@ static bool freelist_state_initialize(union freelist_init_state *state, /* Use a random state if the pre-computed list is not available */ if (!cachep->random_seq) { - prandom_seed_state(&state->rnd_state, rand); ret = false; } else { state->list = cachep->random_seq; @@ -2397,7 +2393,7 @@ static bool freelist_state_initialize(union freelist_init_state *state, } /* Get the next entry on the list and randomize it using a random shift */ -static freelist_idx_t next_random_slot(union freelist_init_state *state) +static freelist_idx_t next_random_slot(struct freelist_init_state *state) { if (state->pos >= state->count) state->pos = 0; @@ -2418,7 +2414,7 @@ static void swap_free_obj(struct slab *slab, unsigned int a, unsigned int b) static bool shuffle_freelist(struct kmem_cache *cachep, struct slab *slab) { unsigned int objfreelist = 0, i, rand, count = cachep->num; - union freelist_init_state state; + struct freelist_init_state state; bool precomputed; if (count < 2) @@ -2447,7 +2443,7 @@ static bool shuffle_freelist(struct kmem_cache *cachep, struct slab *slab) /* Fisher-Yates shuffle */ for (i = count - 1; i > 0; i--) { - rand = predictable_rng_prandom_u32_state(&state.rnd_state); + rand = get_random_u32(); rand %= (i + 1); swap_free_obj(slab, i, rand); } -- 2.38.0