From patchwork Thu Mar 16 09:05:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1757800 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=u+mnk7GI; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PchFM2x7nz247R for ; Thu, 16 Mar 2023 20:05:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pcjYS-0001gc-EN; Thu, 16 Mar 2023 09:05:48 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pcjYO-0001bw-Px for kernel-team@lists.ubuntu.com; Thu, 16 Mar 2023 09:05:44 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 728F23F1F2 for ; Thu, 16 Mar 2023 09:05:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1678957540; bh=F7bv4Uhf181vr+O6KQrR54pgbtk51/S7+JoiWh7YEzE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=u+mnk7GIk6troEMxmT5kPnQS0Fjl44yFwn1m8hNnUAUhp6nU9YGhGkXFjaaU1zHQD UVX1bTN0PxVsyE6W1wsggqR7/EQ4WkFPwsgGmKlU7SCh+Y4GDzJt29S03nLQjTbIdz zaewPaJvO+RIC+ezDxxTy98xyMrlOzFYC/ygaRwKpBgug5LtP3ojOqHSXahqnU6WP5 NaGszAipdoU+9txbCw5wMSv/vPO36z5sOlnIDIIn+vteWDRm835PtgyX4nDyvOBt7n DKvXTDBo+25GT6VqcwQB+vXTOlO+bcwIWY2YR8bwSTBCBbN6t8pf83hwi0WNZ80aZz GAOgWuaakrvVw== Received: by mail-ed1-f69.google.com with SMTP id b7-20020a056402350700b004d2a3d5cd3fso2064197edd.8 for ; Thu, 16 Mar 2023 02:05:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678957540; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F7bv4Uhf181vr+O6KQrR54pgbtk51/S7+JoiWh7YEzE=; b=JNpLhJxggfMaQXlEq7FyG0FGz0jVUQwAxllYGPwInw1OTRczoKyQaBpoGWE1D8fyDP TAiTj5iySv+pD2ULSBCmrGjctyKHGGuyDRqHZ+Af6uStAihuEJVPfy53C0/LaHPokBUT NVe6JT2O8ciE6MeGohm7GeVHdSPkDGqMv8Jg6C2MOHz8jCRUdIo1oPI5H1V+/2r0ootg SrfDU9GyuMioNeIMv00w7euxC1xtSk1q9wBJ/Ilu3qdU0RvIUAK9eAzwhm0+FmTZK6Lw zmboYQjDHg5TOjPFoT2aIt19aISJOxgvTKxIdyrtO564P8Ap9+MLq4aWpoJtajG+Revk vPXw== X-Gm-Message-State: AO0yUKUK4vZE7y4wAa+fyJBXbKOTrV77CZ/8oNkeDqCOb4t3cTohPA6X vgYXezsJhqS0VRnxd2gtSBS45tutorY/zwM/ihE3N5GFwhdrcsA1Kxo+Np92ANxv6DN1s81AUSN ANfg78Pxxx432HPobrgvhVjzM4tLI4rUj1L7GVx5RZUzTj72WrS9o X-Received: by 2002:a17:906:4e14:b0:8b1:779c:a8b1 with SMTP id z20-20020a1709064e1400b008b1779ca8b1mr9093402eju.5.1678957540295; Thu, 16 Mar 2023 02:05:40 -0700 (PDT) X-Google-Smtp-Source: AK7set9nWwN6t6+D5eVVO5I4buBxj3frUHpLwHGRy+666thLR303hydmHpO8yKurNGG4tG8ied+fpQ== X-Received: by 2002:a17:906:4e14:b0:8b1:779c:a8b1 with SMTP id z20-20020a1709064e1400b008b1779ca8b1mr9093383eju.5.1678957539905; Thu, 16 Mar 2023 02:05:39 -0700 (PDT) Received: from localhost.localdomain (host-79-53-23-214.retail.telecomitalia.it. [79.53.23.214]) by smtp.gmail.com with ESMTPSA id u11-20020a1709060b0b00b008e22978b98bsm3575977ejg.61.2023.03.16.02.05.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 02:05:39 -0700 (PDT) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [PATCH 02/16] UBUNTU: SAUCE: rust: fix regexp in scripts/is_rust_module.sh Date: Thu, 16 Mar 2023 10:05:15 +0100 Message-Id: <20230316090529.199884-3-andrea.righi@canonical.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230316090529.199884-1-andrea.righi@canonical.com> References: <20230316090529.199884-1-andrea.righi@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2007654 nm can use "R" or "r" to show read-only data sections, but scripts/is_rust_module.sh can only recognize "r", so with some versions of binutils it can fail to detect if a module is a Rust module or not. Right now we're using this script only to determine if we need to skip BTF generation (that is disabled globally if CONFIG_RUST is enabled), but it's still nice to fix this script to do the proper job. Moreover, with this patch applied I can also relax the constraint of "RUST depends on !DEBUG_INFO_BTF" and build a kernel with Rust and BTF enabled at the same time (of course BTF generation is still skipped for Rust modules). (cherry-picked from https://lore.kernel.org/lkml/CQFMIYLWW6ZO.3LCN13CG142KC@vincent-arch/T/) Signed-off-by: Andrea Righi --- scripts/is_rust_module.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/is_rust_module.sh b/scripts/is_rust_module.sh index 28b3831a7593..464761a7cf7f 100755 --- a/scripts/is_rust_module.sh +++ b/scripts/is_rust_module.sh @@ -13,4 +13,4 @@ set -e # # In the future, checking for the `.comment` section may be another # option, see https://github.com/rust-lang/rust/pull/97550. -${NM} "$*" | grep -qE '^[0-9a-fA-F]+ r _R[^[:space:]]+16___IS_RUST_MODULE[^[:space:]]*$' +${NM} "$*" | grep -qE '^[0-9a-fA-F]+ [Rr] _R[^[:space:]]+16___IS_RUST_MODULE[^[:space:]]*$'