From patchwork Wed Dec 21 00:52:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 35230 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp3270170wrn; Tue, 20 Dec 2022 17:08:52 -0800 (PST) X-Google-Smtp-Source: AMrXdXsQo5fuYEJ9crRboNokqoXJanyVts/vB84+wwtUse/OjBPLtghQClGz/rGgk1GkCWBErgGX X-Received: by 2002:a17:906:c9ca:b0:7c0:e0d9:c1df with SMTP id hk10-20020a170906c9ca00b007c0e0d9c1dfmr3466949ejb.10.1671584932738; Tue, 20 Dec 2022 17:08:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671584932; cv=none; d=google.com; s=arc-20160816; b=GkFJXBNTGBXEx6v55ZuTpA/FRm0wjbruZLqkQ17XLiPjVBmTABmkvABDsvyy1lsU/f W5T1GI9GZ4PukdrqA+25Lz9KQAxzfH5WgDbS5A5SzjitjoYZ2wtucTvTGQy/4T2v7Ue8 t/9hCqWioKY4iyUqRnjjeiygjM2ZM928Htd0KwwLN7rqJdMhgoyLMs6Z7upYFLL6yTkn S5mij+2+DjqHtKXdoPcFagOLvfF/bUeBYUqZAbaHNQFNo7u9ww5XbWsdeH9eIqKdAq/l fH2mW22lC6SlHoSlDHtwY9msLB26soqX8WNrDrAwGWK7vEhU08ZfysyYZ23+fAGGKDy4 PRxA== 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:subject:cc:to:from:date; bh=hLEhszQAXIFOKa3ArKDnglcchLTQruWXisGtCR6nR/U=; b=BJjI+01yWd3DsOitVsukrNk2ithLbAEtXkbvGwsbdI3Xnspsxycix6FJQ8PTXdKUWB +lOtTygYVzQh/SLcJi9sIO7+P8w2hzldQQMn7i0WTy8bXh5+cgbtSMS9lUPrfNhbdUfk p8Rgg+MgCRRD3OO1ZyqwxM6r5nYY7GVaIxlHWqszHShyVp9yWXnmjKVdhZAKJRU7k6VL qHOkcW3foiZre6CF/F8KcFJBY6d1rgMpb2HWN3aK5SaO9QepAZz1gs8+R5QwkHPdvMmj j1xEgfPLH7yFr5vcO1k2Sun8OhT7MktxvUCY9ZAHUnpVHl+rgQ8xeLosi83r7O3mlze9 z8bQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bf3-20020a170907098300b0078dce2b1985si13951789ejc.134.2022.12.20.17.08.27; Tue, 20 Dec 2022 17:08:52 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229750AbiLUAwf (ORCPT + 99 others); Tue, 20 Dec 2022 19:52:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234260AbiLUAwe (ORCPT ); Tue, 20 Dec 2022 19:52:34 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D7771D66C for ; Tue, 20 Dec 2022 16:52:30 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D22126162C for ; Wed, 21 Dec 2022 00:52:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E65FC433F0; Wed, 21 Dec 2022 00:52:28 +0000 (UTC) Date: Tue, 20 Dec 2022 19:52:26 -0500 From: Steven Rostedt To: LKML Cc: Daniel Bristot de Oliveira , Masami Hiramatsu , Alessandro Carminati Subject: [for-linus][PATCH] rv/monitors: Move monitor structure in rodata Message-ID: <20221220195226.13f244cc@gandalf.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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?1752783842199889807?= X-GMAIL-MSGID: =?utf-8?q?1752783842199889807?= Missed this patch in pulling in my queue for 6.2. commit bfa87ac86ce9ff879c5ac49bf09c3999859a8968 Author: Alessandro Carminati Date: Tue Nov 22 18:36:48 2022 +0100 rv/monitors: Move monitor structure in rodata It makes sense to move the important monitor structure into rodata to prevent accidental structure modification. Link: https://lkml.kernel.org/r/20221122173648.4732-1-acarmina@redhat.com Signed-off-by: Alessandro Carminati Acked-by: Daniel Bristot de Oliveira Signed-off-by: Steven Rostedt (Google) diff --git a/kernel/trace/rv/monitors/wip/wip.h b/kernel/trace/rv/monitors/wip/wip.h index dacc37b62a2c..2e373f2c65ed 100644 --- a/kernel/trace/rv/monitors/wip/wip.h +++ b/kernel/trace/rv/monitors/wip/wip.h @@ -27,7 +27,7 @@ struct automaton_wip { bool final_states[state_max_wip]; }; -static struct automaton_wip automaton_wip = { +static const struct automaton_wip automaton_wip = { .state_names = { "preemptive", "non_preemptive" diff --git a/kernel/trace/rv/monitors/wwnr/wwnr.h b/kernel/trace/rv/monitors/wwnr/wwnr.h index 118e576b91b4..d0d9c4b8121b 100644 --- a/kernel/trace/rv/monitors/wwnr/wwnr.h +++ b/kernel/trace/rv/monitors/wwnr/wwnr.h @@ -27,7 +27,7 @@ struct automaton_wwnr { bool final_states[state_max_wwnr]; }; -static struct automaton_wwnr automaton_wwnr = { +static const struct automaton_wwnr automaton_wwnr = { .state_names = { "not_running", "running" diff --git a/tools/verification/dot2/dot2c.py b/tools/verification/dot2/dot2c.py index be8a364a469b..87d8a1e1470c 100644 --- a/tools/verification/dot2/dot2c.py +++ b/tools/verification/dot2/dot2c.py @@ -111,7 +111,7 @@ class Dot2c(Automata): def format_aut_init_header(self): buff = [] - buff.append("static struct %s %s = {" % (self.struct_automaton_def, self.var_automaton_def)) + buff.append("static const struct %s %s = {" % (self.struct_automaton_def, self.var_automaton_def)) return buff def __get_string_vector_per_line_content(self, buff):