Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp843425ybk; Wed, 13 May 2020 14:48:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxViVCEEM9rhxv39plSDrAQy8QlVvQn3u3fVUKuNvdE+n6GN0SZqxUj0mT3cGthfie4hats X-Received: by 2002:a17:906:19d2:: with SMTP id h18mr1057329ejd.147.1589406504644; Wed, 13 May 2020 14:48:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589406504; cv=none; d=google.com; s=arc-20160816; b=Ex4lLAVy/WAYMHOiq/YbGL0Cs17avy5KZFFr8NFricNNiTItD9DIsb16am2byPxlX3 lDpfqY9nvmampoBMZeWNVu9uRJ1qhf+cm5/75MiapM6R2RuuFA2FUsgGHbQhhEyYrdVA RYqkvCqGHaYuZAdKMIpWdClJeEoNDJapbmCSo752dVQp7KRYQ4x1uCCAJEgkkaLjB7ns QbtVV3xkX6dX9ipPe5vn/wvLIhlfAU0N9TycDbE5B7BUXhzs6opWFvSWtAd0Dr0t3ev/ 4hKzqdi/bVokfkFNcbJ5KZgK5h7WTHs0+4JQx+03KukfTj1nmKM14n0KaLwqBspgHmGL 5/+A== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=jW05YIYcf1GNolkjiyr0mICfCVmFkBpfqxOEcp+jfSE=; b=wCjvjgf8ps/Os/Cp8b5rbGJBxjgBsLKBIGp0Wx+DqcpWZCWe1rfsDxG7CVntM7r0n7 mhTRjicpjU2hQc4tn4dixJUVAItOI5wguYZ8pRrD4TNBunOt4qJ0s20K2N0Vtx+DTeKf SKkeoo2e8yRtZRT5uJvfUx3d7uEe24izjMCiCp6hg54Yn5fytYgBe1u7UD6z1PzIjtHp fmfcJN2mbg3J98u19Ylrq+WFf/UJjpy4fw2VK9kRcbXlpdSOKhrwlDn3IabG2cpmap1k mZFUC9bcbZ1q5S0ZRI1oVwFWOTv9eMp8VpYxz4xNMkmf+a2E0/L0jL6n7xmJcVWpWOfb vJ5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=B6ufszp7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i5si651616ejr.71.2020.05.13.14.48.01; Wed, 13 May 2020 14:48:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=B6ufszp7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729742AbgEMVqk (ORCPT + 99 others); Wed, 13 May 2020 17:46:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1729627AbgEMVqk (ORCPT ); Wed, 13 May 2020 17:46:40 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD1E3C061A0C; Wed, 13 May 2020 14:46:39 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id h17so1306051wrc.8; Wed, 13 May 2020 14:46:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jW05YIYcf1GNolkjiyr0mICfCVmFkBpfqxOEcp+jfSE=; b=B6ufszp741BrL+8jST20P2NOnKbKE/LNB0r5wtKJFYTRDlckV/y9gXmjPYv7DSytm5 N3AMbtHVrYFTCSwCiaDlyXrW9z+p7l1w7/eCeTbBxTMtWGRX/SMolhOP8VQuYczT9DkW CHxeTsCHlwc5lCyzBPRZ+M31ujfjBfGSgHqx/27EQC1XXYkWNnbps5HfIjw+hKDNFXxN vWzEDj7eVxbdYYTapTC0qlRtAKivLG64U/FR6pXzZpuchoBxHQ3c4SiBUSL+C8ypStQB 5zCBc5kn2VvrXWVcZpwx3hfjvSfAo0EhObsX7ynqyraCai9yJALEmKdL3D464SExMah7 6OvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jW05YIYcf1GNolkjiyr0mICfCVmFkBpfqxOEcp+jfSE=; b=VXudyQwTO717oUQA2hMHTnnlXhYQUlVbF6ELZkoq7wXIZWurbppl5KzzAolA9NuaSm ZAzVnDAAIG/I36xDcW2L2/b46JS/MDdeMgmNSk4fbxOHiu5503ikT7q3vl/9ENiTuTxe Fa0TTIoHM2HVgd8CgWe/aYfTpHpmt9BmqMeSVL+iwT5DmnfYRN6eZduc1i15GYR1Atqf TnMmFVNakAPMGLe5/J78J8YSvMVU5B3LqDfq4/KPgC8Yp4knnxAeVWDs6k+sUeqF2AEH jxbLJOpO7hTpqH3ClpLw2ewA4Dwc4W5xQIuhHVfhV45/jQH/guXGPaixCqU8xvFELBLo HMIw== X-Gm-Message-State: AOAM531ptTe78VNcGTl+vGMbq/3kxTOAe2oRbH86lY407vdKHQ4zeKtK RM1WRNqDexvhdzb7UxfCu1c= X-Received: by 2002:adf:f605:: with SMTP id t5mr1519029wrp.354.1589406398407; Wed, 13 May 2020 14:46:38 -0700 (PDT) Received: from localhost.localdomain (cpc91192-cmbg18-2-0-cust374.5-4.cable.virginm.net. [80.6.113.119]) by smtp.gmail.com with ESMTPSA id m23sm1699734wmg.45.2020.05.13.14.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 14:46:37 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Cc: emil.l.velikov@gmail.com, Greg Kroah-Hartman , Jiri Slaby , linux-kernel@vger.kernel.org, Richard Henderson , Ivan Kokshaysky , Matt Turner , linux-alpha@vger.kernel.org Subject: [PATCH 01/11] tty/sysrq: alpha: export and use __sysrq_get_key_op() Date: Wed, 13 May 2020 22:43:41 +0100 Message-Id: <20200513214351.2138580-1-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Export a pointer to the sysrq_get_key_op(). This way we can cleanly unregister it, instead of the current solutions of modifuing it inplace. Since __sysrq_get_key_op() is no longer used externally, let's make it a static function. This patch will allow us to limit access to each and every sysrq op and constify the sysrq handling. Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: linux-kernel@vger.kernel.org Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: linux-alpha@vger.kernel.org Signed-off-by: Emil Velikov --- Please keep me in the CC list, as I'm not subscribed to the list. IMHO it would be better if this gets merged this via the tty tree. --- arch/alpha/kernel/setup.c | 13 +++++++++++-- drivers/tty/sysrq.c | 4 +++- include/linux/sysrq.h | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index f19aa577354b..dd7f770f23cf 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -430,6 +430,15 @@ register_cpus(void) arch_initcall(register_cpus); +#ifdef CONFIG_MAGIC_SYSRQ +static struct sysrq_key_op srm_sysrq_reboot_op = { + .handler = machine_halt, + .help_msg = "reboot(b)", + .action_msg = "Resetting", + .enable_mask = SYSRQ_ENABLE_BOOT, +}; +#endif + void __init setup_arch(char **cmdline_p) { @@ -550,8 +559,8 @@ setup_arch(char **cmdline_p) /* If we're using SRM, make sysrq-b halt back to the prom, not auto-reboot. */ if (alpha_using_srm) { - struct sysrq_key_op *op = __sysrq_get_key_op('b'); - op->handler = (void *) machine_halt; + unregister_sysrq_key('b', __sysrq_reboot_op); + register_sysrq_key('b', &srm_sysrq_reboot_op); } #endif diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 0dc3878794fd..1741134cabca 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -172,6 +172,8 @@ static struct sysrq_key_op sysrq_reboot_op = { .enable_mask = SYSRQ_ENABLE_BOOT, }; +struct sysrq_key_op *__sysrq_reboot_op = &sysrq_reboot_op; + static void sysrq_handle_sync(int key) { emergency_sync(); @@ -516,7 +518,7 @@ static int sysrq_key_table_key2index(int key) /* * get and put functions for the table, exposed to modules. */ -struct sysrq_key_op *__sysrq_get_key_op(int key) +static struct sysrq_key_op *__sysrq_get_key_op(int key) { struct sysrq_key_op *op_p = NULL; int i; diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h index 8e159e16850f..9b51f98e5f60 100644 --- a/include/linux/sysrq.h +++ b/include/linux/sysrq.h @@ -47,7 +47,7 @@ void handle_sysrq(int key); void __handle_sysrq(int key, bool check_mask); int register_sysrq_key(int key, struct sysrq_key_op *op); int unregister_sysrq_key(int key, struct sysrq_key_op *op); -struct sysrq_key_op *__sysrq_get_key_op(int key); +extern struct sysrq_key_op *__sysrq_reboot_op; int sysrq_toggle_support(int enable_mask); int sysrq_mask(void); -- 2.25.1