From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id NHHwEczEh2fBABAAWB0awg (envelope-from ) for ; Wed, 15 Jan 2025 09:23:08 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=lists.lttng.org header.i=@lists.lttng.org header.a=rsa-sha256 header.s=default header.b=wAIb6SuK; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 35DA31E100; Wed, 15 Jan 2025 09:23:08 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=4.0.0 Received: from lists.lttng.org (lists.lttng.org [158.69.130.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id E378C1E08E for ; Wed, 15 Jan 2025 09:23:04 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.lttng.org; s=default; t=1736950984; bh=cssthcMLf0Gqb7n97ZvhB5rkuKWwfqjXKz2a1sW5/n0=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=wAIb6SuK4Wd1P+1mpopuABw5RrSqkfjsIFIiUL59QQUbCtTAOLbKZ14vjF14ZJ9m6 ANHWtdRuv7zMV6IkcJbbcqWpKzSnEi7iAITiFWGDioIPLQ38Rt7QUIuQANCge9iOTd dnDHg9krKX0nqtb3Ln3th8eQIImreMtytEaYF9eWyEqiz7W2wtF+obtDOqDlfn70FE 454UHZtkAAbdkKgqimSAcmrOgEARlROoAIdKLDv8W9Ej7CajD6KxcXT/nkfmgj6mV3 chP3Fsk2e0ZdOD47xppj8GzIPomK0bDmrh7bpcoMU1S+Go6YqC+nlPQ8aSyKRB8hYd 73URcLzrH0y9g== Received: from lists-lttng01.efficios.com (localhost [IPv6:::1]) by lists.lttng.org (Postfix) with ESMTP id 4YY7WX2qJhz1TcX; Wed, 15 Jan 2025 09:23:04 -0500 (EST) Received: from mail-qt1-x82a.google.com (mail-qt1-x82a.google.com [IPv6:2607:f8b0:4864:20::82a]) by lists.lttng.org (Postfix) with ESMTPS id 4YY7WW3lr3z1TcW for ; Wed, 15 Jan 2025 09:23:03 -0500 (EST) Received: by mail-qt1-x82a.google.com with SMTP id d75a77b69052e-467a17055e6so78744791cf.3 for ; Wed, 15 Jan 2025 06:23:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736950982; x=1737555782; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DUKlJumAoUt+mFJH1BiDNkxQLXm7BCoKWk8YJu/NPEo=; b=QaIZLsSlLPgQLzoj/2LnLcpNAhIqVeDaoXCE29dfUz4W4qCUuh7nJaHuW98+5CqykJ iKk8uCKL92Ag5mJuINbSyljTtP5dLXXfpKiFZLvVe9R/ZUGnDIXvs9pgJh26f07I9z6c W3RUMxDKQiUy5YY82jQN0HG/7FC/sHfLWme2uhfTrNk2iuAC1ydqfhM0G9lHbqatgP7/ aHWQn2BQYC8Mmjy6r2FUsBLThBU53vzUbJALL0viIV5vwTcMSq/14x4C3k7K3x3caP1D XXJyxhYpNONvQy1m2NQYAmnN7MqqArzXPzugobWUA32SgFJqRVbpA7LAwt5P3gB1iytK /QCw== X-Gm-Message-State: AOJu0Yw9+WgvzEwDR/09AgWMBsFiJvnoIjnMqRTa9Zlte5YPcTfcgzar RKlIXIe2ooizKID9NGpc173FA9uzrvIWFEjwgkowuKtDmf6x6zawzsMFgunAbHRKDO6j4pIB9mM 7 X-Gm-Gg: ASbGncvUNe2ZJTlFE2on3CclrMJZVdfjPJ4NDj9csjXcY4FINxvOg631JquhNL8Ux4+ UcPbdaqc8OMx63Wbn8+GrASf9f8PM2jZUkr1lszdXLs4tzZmJxNikRFMdcnt9QP9MAqkUSd1PzU 2KuG2Z9fSXu0i8vyOnCEcUqYBu9uVQarB2ESuUeAC65DGwvH+rDHiBooHHbmMWfu3piZCU+PblK 4/F/9J50wVS8ouInyYecZOk7A9CoyjQYWzHSUcdKWI1EeU7qWEB9qCvBw== X-Google-Smtp-Source: AGHT+IFNLpinM9d6Ysf9Bczq+gF8e4sG1qJSFsbOkKdxtUZenYWYXvjJMo/mwPAhK/udlYJQ+Q5Z+A== X-Received: by 2002:ad4:5d66:0:b0:6d8:8109:a547 with SMTP id 6a1803df08f44-6df9b229b3dmr360985066d6.22.1736950982489; Wed, 15 Jan 2025 06:23:02 -0800 (PST) Received: from martin-pc ([204.101.17.200]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46c87321695sm65063021cf.15.2025.01.15.06.23.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 06:23:02 -0800 (PST) Date: Wed, 15 Jan 2025 09:23:00 -0500 To: lttng-dev@lists.lttng.org Subject: [PATCH] lttng-modules fix for RHEL 9.5 kernels Message-ID: <20250115142300.vlupsqd2lr5bipfo@martin-pc> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-BeenThere: lttng-dev@lists.lttng.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: LTTng development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Martin Hicks via lttng-dev Reply-To: Martin Hicks Errors-To: lttng-dev-bounces@lists.lttng.org Sender: "lttng-dev" This fixes the asoc_snd_*, kfree_skb and udp related tracepoints for the RHEL 9.5 distro kernel. In all cases they've updated to the format of newer kernels. Signed-off-by: Martin Hicks --- include/instrumentation/events/asoc.h | 8 ++++++-- include/instrumentation/events/skb.h | 4 +++- include/instrumentation/events/udp.h | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/instrumentation/events/asoc.h b/include/instrumentation/events/asoc.h index f6b2c76..31bedfe 100644 --- a/include/instrumentation/events/asoc.h +++ b/include/instrumentation/events/asoc.h @@ -120,7 +120,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_preg, snd_soc_preg_read, ) #endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0) || \ + LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1, 5,15,0,0,0,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_context, TP_PROTO(struct snd_soc_dapm_context *dapm, int val), @@ -187,7 +189,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card, snd_soc_bias_level_done, ) #endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0) || \ + LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1, 5,15,0,0,0,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic, TP_PROTO(struct snd_soc_card *card, int event), diff --git a/include/instrumentation/events/skb.h b/include/instrumentation/events/skb.h index 5556ab6..becfd80 100644 --- a/include/instrumentation/events/skb.h +++ b/include/instrumentation/events/skb.h @@ -40,7 +40,9 @@ LTTNG_TRACEPOINT_ENUM(skb_drop_reason, ) #endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0) || \ + LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1, 5,15,0,0,0,0)) + LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb, skb_kfree, diff --git a/include/instrumentation/events/udp.h b/include/instrumentation/events/udp.h index 0a94b46..c228ef6 100644 --- a/include/instrumentation/events/udp.h +++ b/include/instrumentation/events/udp.h @@ -9,7 +9,9 @@ #include #include -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0) || \ + LTTNG_RHEL_KERNEL_RANGE(5,14,0,503,21,1, 5,15,0,0,0,0)) + LTTNG_TRACEPOINT_ENUM(lttng_sk_family, TP_ENUM_VALUES( ctf_enum_value("AF_INET", AF_INET) -- 2.43.5 -- Martin Hicks SR Research Ltd. Fast, Accurate, Reliable Eye Tracking