Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp6139853ybl; Mon, 23 Dec 2019 00:21:53 -0800 (PST) X-Google-Smtp-Source: APXvYqwRbR1ByD6OENM0ITtdhZ6MlZv6MKGt8q/ZCHjnObNQjieFmNq7TBZMbp/CEahQ8sjG0rUw X-Received: by 2002:a05:6830:1257:: with SMTP id s23mr31436808otp.241.1577089313788; Mon, 23 Dec 2019 00:21:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577089313; cv=none; d=google.com; s=arc-20160816; b=tyy+djF5aqFtNahho3dtYmvRK9wjufqaktjtag8kslXBUm7f2IWmRCfqByPsXrmyNW jXOw/wo0FXhsm+FeeZaiiM6zaIhYAUxlXecIum7fZsk42n/0kpDDb2cujTYN6iGW06UF j1DhhYlPMV9g/utO3bhsjEeEmBpQ+MgS8mgVmei5XelK73wRvqJs2PQVm+PncBMdfDpw Jie3K0BVAsFrxeSfHetzRfbJZ2b0NaK6Fb+XgFIyREEV7Gcyn1e56d9tiNq8w4mXo1so 9PMAz3haEzz1xd3V9gWz67RIB7i6aQYDflWsR361bxJtNPT8eD6Zg5I0ECBdkTa9X3Od G1eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wPngxUfK3HxHhTOTeL/LoVZX5V4WPBQvUw5smvGFFT8=; b=P9kJ+kHgAt0OO+3w4c/QyPxCBTWcBO616DuuJZ1iiXJ5CTXa1XdrxlQ5MQs+H7R0Um TKSw3j5ap6hEUuGBslQMTpE2KvpnhpIfaRZiKGeilrI7+i+IGEcr92McA1DoH+kIVA6W 8XOmDcGw4nkGHrXE6klKS4BXgZUQdVWcOItmEBPBw0SGViGoARBAuAWquA1xmJxHq459 DKdryrteNY4/2+L3X2DRGTka5if6ZS5R2FyFoowfYhSehs7K8jzSUVZhCN1su1g+yX08 sLp/UR8d0x8EIC5rJGjqy6jgG6Egun/oyhke/eQ4J1fiXubYcfsThtk4fzUzJNIVobj5 eZ6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MRMHerIt; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s1si5025634oic.234.2019.12.23.00.21.44; Mon, 23 Dec 2019 00:21:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MRMHerIt; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726948AbfLWIV1 (ORCPT + 99 others); Mon, 23 Dec 2019 03:21:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:39252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726198AbfLWIV0 (ORCPT ); Mon, 23 Dec 2019 03:21:26 -0500 Received: from localhost (36-236-5-169.dynamic-ip.hinet.net [36.236.5.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 455C520709; Mon, 23 Dec 2019 08:21:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577089285; bh=CI4damfoVOqesRhxTqcMsarysNXofJvnDHFVbybcD04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MRMHerIt/URp/OzCxUrh2EDmUXemsUcaWIUOiiLH1WpdG/7lAOapzpbXBzzY4aYtS MOyp2ktirqjyJhppwNO9pcU185y5CBgikxH83s5ZFqV22jH7Lw22EZEEbQeFT2+h3t Y+uVEnCc3byuX6CRprvEp0rJykeo6zISXtRdFXeg= From: Andy Lutomirski To: Ted Ts'o Cc: LKML , Linux API , Kees Cook , "Jason A. Donenfeld" , "Ahmed S. Darwish" , Lennart Poettering , "Eric W. Biederman" , "Alexander E. Patrakov" , Michael Kerrisk , Willy Tarreau , Matthew Garrett , Ext4 Developers List , linux-man , Stephan Mueller , Andy Lutomirski Subject: [PATCH v3 8/8] random: Remove kernel.random.read_wakeup_threshold Date: Mon, 23 Dec 2019 00:20:51 -0800 Message-Id: X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org It has no effect any more, so remove it. We can revert this if there is some user code that expects to be able to set this sysctl. Signed-off-by: Andy Lutomirski --- drivers/char/random.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index 920bf771e3e1..2a6818cae2d6 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -369,12 +369,6 @@ #define ENTROPY_SHIFT 3 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT) -/* - * The minimum number of bits of entropy before we wake up a read on - * /dev/random. Should be enough to do a significant reseed. - */ -static int random_read_wakeup_bits = 64; - /* * If the entropy count falls under this number of bits, then we * should wake up processes which are selecting or polling on write @@ -2053,8 +2047,7 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, #include -static int min_read_thresh = 8, min_write_thresh; -static int max_read_thresh = OUTPUT_POOL_WORDS * 32; +static int min_write_thresh; static int max_write_thresh = INPUT_POOL_WORDS * 32; static int random_min_urandom_seed = 60; static char sysctl_bootid[16]; @@ -2129,15 +2122,6 @@ struct ctl_table random_table[] = { .proc_handler = proc_do_entropy, .data = &input_pool.entropy_count, }, - { - .procname = "read_wakeup_threshold", - .data = &random_read_wakeup_bits, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = &min_read_thresh, - .extra2 = &max_read_thresh, - }, { .procname = "write_wakeup_threshold", .data = &random_write_wakeup_bits, -- 2.23.0