Received: by 2002:a05:7412:b101:b0:e2:908c:2ebd with SMTP id az1csp2498553rdb; Wed, 15 Nov 2023 02:29:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IHywEIyjNx/5HI7vMVtqtg9YLVdvaJX6LbyNo4mmH2WbQhMASePqWjQ0N5rcLuPwcoPIKMp X-Received: by 2002:a05:6a00:6c96:b0:6b2:69c:346a with SMTP id jc22-20020a056a006c9600b006b2069c346amr14419904pfb.19.1700044180170; Wed, 15 Nov 2023 02:29:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700044180; cv=none; d=google.com; s=arc-20160816; b=pnFukYUefAKW7R4I8MXqtxxKEWZcMglOxvDaoCdaZPBNu4hCaDNjB1gnn7Ct/U2zVX Ofm3NbGv/f/54DVikdSzJCquo5gWpJdElfHl/HZpjfOEx8eAHSToee+Cd73L3g26DR2/ gWGzZycLPlgXPeUd9TgqV7Vz+VUA/4hGqF00ipW7C6beZsZy2LIZNUlA2YOrZutHbPT8 uHFkNVaax48P/CE9NfYN/rdoCBwfKOusZQ63PjTi/JwSVPgJiTciVMHwylYUokhHTYeq p5mvy7ATaPqEcFwMnS/76m9ES9MSFN5XfYP/XG8nyR/z5jd7I7tpDOD2nPIJ7tpxuSMm d4uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=w6hUE3IZOzuzOBjPDrbfaCSDLRI27t3xi2RfhpR9nQ8=; fh=6j36m1jHKU7KTFZCDlX/JQDgr7Jf8Wr470TB4VSI5uk=; b=L27PLgfPH0mxuAgBM6eaOe2UwaXLWdF5+ubNvZD2WRLyI+pBs9u+HtL5KEljbPCqvm bfep0qFvoii7QtPUW6/p4PyUSBemCW18KLwS53KfjBXydX/v4YUAmERcT2dJqCm8vJw8 Pv0CLI6+BECnQoe+sumId+9QTaKc/XMn2kcGbBZ80QcZPRRlDsVemKcwpeMpTcTQD7yr ymD5y4fPCPbGn53gBRl/J8RrzzlswlzsiUw8I1Pj9AoZ+vdU6ch0HdUEFnEaFZDgr+jF nF1MUG66PM4sxPvLMz+UBk67dxv84w/22wdmQqaJzGBT9Vlux1VNbp1uLAscbFZ7KhZ5 nqrA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id u24-20020a656718000000b005a9e4c3d350si9495543pgf.743.2023.11.15.02.29.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 02:29:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id ECE9A81444FC; Wed, 15 Nov 2023 02:29:38 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234422AbjKOK3i (ORCPT + 99 others); Wed, 15 Nov 2023 05:29:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234116AbjKOK3h (ORCPT ); Wed, 15 Nov 2023 05:29:37 -0500 Received: from harvie.cz (harvie.cz [77.87.242.242]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 23D12C2; Wed, 15 Nov 2023 02:29:34 -0800 (PST) Received: from anemophobia.amit.cz (unknown [31.30.84.130]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by harvie.cz (Postfix) with ESMTPSA id 513B7180354; Wed, 15 Nov 2023 11:29:33 +0100 (CET) From: Tomas Mudrunka To: jirislaby@kernel.org Cc: corbet@lwn.net, gregkh@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, rdunlap@infradead.org, tomas.mudrunka@gmail.com Subject: [PATCH v8] /proc/sysrq-trigger: accept multiple keys at once Date: Wed, 15 Nov 2023 11:29:27 +0100 Message-ID: <20231115102927.192841-1-tomas.mudrunka@gmail.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <670993bf-a8ef-4561-8213-6a37d0598d83@kernel.org> References: <670993bf-a8ef-4561-8213-6a37d0598d83@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=0.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FORGED_GMAIL_RCVD,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED,SPF_HELO_PASS, SPF_SOFTFAIL,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 15 Nov 2023 02:29:39 -0800 (PST) Just for convenience. This way we can do: `echo _reisub > /proc/sysrq-trigger` Instead of: `for i in r e i s u b; do echo "$i" > /proc/sysrq-trigger; done;` This can be very useful when trying to execute sysrq combo remotely or from userspace. When sending keys in multiple separate writes, userspace can be killed before whole combo is completed. Therefore putting all keys in single write is more robust approach. Signed-off-by: Tomas Mudrunka --- V7 -> V8: Added this list of changes V6 -> V7: Fixed english in documentation V5 -> V6: Documentation now has notice about undefined behavior V4 -> V5: Added this list of changes V3 -> V4: Bulk is now bool instead of char (and fixed typo) V2 -> V3: Fixed code styling (and introduced typo) V1 -> V2: Bulk mode only activated by underscore now, added docs Documentation/admin-guide/sysrq.rst | 11 ++++++++++- drivers/tty/sysrq.c | 18 +++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/Documentation/admin-guide/sysrq.rst b/Documentation/admin-guide/sysrq.rst index 51906e473..fbe79d314 100644 --- a/Documentation/admin-guide/sysrq.rst +++ b/Documentation/admin-guide/sysrq.rst @@ -75,10 +75,19 @@ On other submit a patch to be included in this section. On all - Write a character to /proc/sysrq-trigger. e.g.:: + Write single character to /proc/sysrq-trigger. + Only the first character is processed, the rest of string is ignored. + However, it is not recommended to write any extra characters + as the behavior is undefined and might change in the future versions. + E.g.:: echo t > /proc/sysrq-trigger + Alternatively, write multiple characters prepended by underscore. + This way, all characters will be processed. E.g.:: + + echo _reisub > /proc/sysrq-trigger + The :kbd:`` is case sensitive. What are the 'command' keys? diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 6b4a28bcf..5411351e4 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -1150,16 +1150,28 @@ EXPORT_SYMBOL(unregister_sysrq_key); #ifdef CONFIG_PROC_FS /* * writing 'C' to /proc/sysrq-trigger is like sysrq-C + * Normally only the first character written is processed. + * If first character is underscore, all characters are processed. */ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { - if (count) { + bool bulk = false; + size_t i; + + for (i = 0; i < count; i++) { char c; - if (get_user(c, buf)) + if (get_user(c, buf + i)) return -EFAULT; - __handle_sysrq(c, false); + + if (c == '_') + bulk = true; + else + __handle_sysrq(c, false); + + if (!bulk) + break; } return count; -- 2.42.1