From patchwork Fri Feb 24 16:21:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Povi=C5=A1er?= X-Patchwork-Id: 61393 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1010785wrd; Fri, 24 Feb 2023 08:35:15 -0800 (PST) X-Google-Smtp-Source: AK7set/x1AGYv777V8f7IVYxSYatTMWb1K56sxa4rLvf6cJw+SMneifhSUMnybzpxRxCBUyn9tCG X-Received: by 2002:a17:906:71c2:b0:8b1:3225:66f0 with SMTP id i2-20020a17090671c200b008b1322566f0mr23405921ejk.68.1677256515695; Fri, 24 Feb 2023 08:35:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677256515; cv=none; d=google.com; s=arc-20160816; b=HDGeMsFptP5hxmU4b/Dj1OQ7xeZAztsQB6JqtMZ1YCTX6RB3+EnakXXMd9ZfkBy4IF zQLedKoOAvJC0JO/GH95cU4lrXIBORHT/+RJmvOE9QPsUEeSsFW2N9D0F0flszOXCxiy qX9koaRfg5DGNPJhAKq3uZRlqyOFW2l9ptjwfmWXBm4cczTaQZkWNHkkgCWltNCoRQmr lIkc2X6UCsZ5Y5DlSIU+JiwU0B75CK7WhgT+KLqJQnTytE7ZdLKFgQOFD2vxzknFUMdg lSaMAFBDpucWi+cE555RcPkNiD3+xzgHmciQT7GzUhxWZGu1Jng3VwT2VfKCS8BxAE55 N/9w== 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 :message-id:date:subject:cc:to:dkim-signature:from; bh=5doeosS9EHjVo4INuIYpNqv+kkFiPbeHbMYZHjoGVWM=; b=JOXk+1IJx2+uW8DCI4b7Z65g8dS8BDrjSrQ0FPNH+j+uEpanJfCt1QW7a8vj1OyRR1 2hwoO9jbbDrfm5xX9DICfft0TOy1DK0Kh0hnb4xnUYdmJuMgWUreYEWAYzrxr/cl8+mQ Y4V2jY90i8WOTN4achBfb768Q0vj7uTQ1FFCwOWiMkQWucF+bL68Ijcd7qQoA9r+KzFY dkeCaho9UwB0xK9TQC0XRVMIZbDZS14tj1NwdWKF5qvun+sHqmUuF4MaEJ+wEYa8pWZq peOx1kt7tgw0xi2g6yjcWewAd/HKaqi1Ct7LMJoS9bB61PtyMtj6ZChda7/M4eY5WEnv jo8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cutebit.org header.s=mail header.b=G8ZShmzQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cutebit.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gk3-20020a17090790c300b008be6648db8asi20099188ejb.408.2023.02.24.08.34.51; Fri, 24 Feb 2023 08:35:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cutebit.org header.s=mail header.b=G8ZShmzQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cutebit.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229830AbjBXQWI (ORCPT + 99 others); Fri, 24 Feb 2023 11:22:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229636AbjBXQWG (ORCPT ); Fri, 24 Feb 2023 11:22:06 -0500 Received: from hutie.ust.cz (unknown [IPv6:2a03:3b40:fe:f0::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 276AF64D74 for ; Fri, 24 Feb 2023 08:22:04 -0800 (PST) From: =?utf-8?q?Martin_Povi=C5=A1er?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cutebit.org; s=mail; t=1677255722; bh=5doeosS9EHjVo4INuIYpNqv+kkFiPbeHbMYZHjoGVWM=; h=From:To:Cc:Subject:Date; b=G8ZShmzQ+zrOvl6A66hdsEM7QQBjCPXjk1zWtDJaDT8gF3BVhGVnR6C3HfcxhjbeJ AWCsjd7GvztCq8pMIfE5F5nN/EgBJgRDJfSBHW+ySkqU09iBnihIg6FlbjgFHmwtRN aHG1X9lB98Yeds3fsNOurHa40DgtwZ5ptNq7OKfA= To: Hector Martin , Sven Peter Cc: Alyssa Rosenzweig , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?Martin_Povi=C5=A1er?= Subject: [PATCH] soc: apple: rtkit: Crop syslog messages Date: Fri, 24 Feb 2023 17:21:59 +0100 Message-Id: <20230224162159.46348-1-povik+lin@cutebit.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_FAIL,SPF_HELO_NONE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758730928291821199?= X-GMAIL-MSGID: =?utf-8?q?1758730928291821199?= Crop trailing whitespace, null, and newline characters in syslog messages received from coprocessors. Notably DCP sends its messages including a trailing newline, so prior to this change we would end up cluttering the kernel log by repeated newlines at the end of messages. Signed-off-by: Martin PoviĊĦer Reviewed-by: Hector Martin --- drivers/soc/apple/rtkit.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/soc/apple/rtkit.c b/drivers/soc/apple/rtkit.c index 35ec35aa500d..639f5134d159 100644 --- a/drivers/soc/apple/rtkit.c +++ b/drivers/soc/apple/rtkit.c @@ -409,11 +409,17 @@ static void apple_rtkit_syslog_rx_init(struct apple_rtkit *rtk, u64 msg) rtk->syslog_n_entries, rtk->syslog_msg_size); } +static bool should_crop_syslog_char(char c) +{ + return c == '\n' || c == '\r' || c == ' ' || c == '\0'; +} + static void apple_rtkit_syslog_rx_log(struct apple_rtkit *rtk, u64 msg) { u8 idx = msg & 0xff; char log_context[24]; size_t entry_size = 0x20 + rtk->syslog_msg_size; + int msglen; if (!rtk->syslog_msg_buffer) { dev_warn( @@ -446,7 +452,13 @@ static void apple_rtkit_syslog_rx_log(struct apple_rtkit *rtk, u64 msg) rtk->syslog_msg_size); log_context[sizeof(log_context) - 1] = 0; - rtk->syslog_msg_buffer[rtk->syslog_msg_size - 1] = 0; + + msglen = rtk->syslog_msg_size - 1; + while (msglen > 0 && + should_crop_syslog_char(rtk->syslog_msg_buffer[msglen - 1])) + msglen--; + + rtk->syslog_msg_buffer[msglen] = 0; dev_info(rtk->dev, "RTKit: syslog message: %s: %s\n", log_context, rtk->syslog_msg_buffer);