From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1495C54E58 for ; Thu, 21 Mar 2024 16:37:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6E3E96B00A5; Thu, 21 Mar 2024 12:37:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C4EB6B00A4; Thu, 21 Mar 2024 12:37:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C1B56B00A3; Thu, 21 Mar 2024 12:37:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 222D26B00A1 for ; Thu, 21 Mar 2024 12:37:38 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 03A0B16015A for ; Thu, 21 Mar 2024 16:37:37 +0000 (UTC) X-FDA: 81921602196.11.E3C0534 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf04.hostedemail.com (Postfix) with ESMTP id B7C1E40020 for ; Thu, 21 Mar 2024 16:37:34 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=leKtAEWV; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3TWL8ZQYKCDooqnajXckkcha.Ykihejqt-iigrWYg.knc@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3TWL8ZQYKCDooqnajXckkcha.Ykihejqt-iigrWYg.knc@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711039054; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BO7qlg8CrJrpGAZLx2tB5/z68XAeLcOjL+jbqSm1NrE=; b=n/ffmaKMG1VyQMHOOTLwySEtVdwxYzpMLxqlgfcOfH0153G66MeewVCbqyLFPjoCa7jhpu whEoL3Do2Ho2uWyjf6SISXoNh9Ti/d5rmZtgsDQB0r36C0s08Xly46F520enSZe9aBf6uQ jsBS3O3OGHQkpOuzOGGP8c0996mrzEw= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=leKtAEWV; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3TWL8ZQYKCDooqnajXckkcha.Ykihejqt-iigrWYg.knc@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3TWL8ZQYKCDooqnajXckkcha.Ykihejqt-iigrWYg.knc@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711039054; a=rsa-sha256; cv=none; b=xcGphInaacx5j4a6uPNGu3GZ3XURw/Qiy36IsSoFzRt00A4x6LMjJAqLqhkPUuAXEOy+OF reht+ZGpHruyT/P1Qrsa4rJTMH9lsgwSDcKDlY5sqkGLGenKWI/R1Ya/81zXhRp7y6uOIe DhX2WcUw4QqyFVfMfZCm2aJvZFnDQlY= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dcc58cddb50so1750336276.0 for ; Thu, 21 Mar 2024 09:37:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711039054; x=1711643854; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=BO7qlg8CrJrpGAZLx2tB5/z68XAeLcOjL+jbqSm1NrE=; b=leKtAEWVFYpjMaRtNpM/O8TNQkAlb+t4qIwD/bxHFtPHF/I5dVt6dptvnW25De5XGv JCV5jubUf5tTD0MQExCvnIPQtWatL6zoDLgF3ARRtvclEFY9Mbu/kzEOcwVepjfOJuWU fRDlY8hrYXnNk5s3SJ1YAU9BAnnMusBdYlNfTOoSwnb4dFKhcwjreLSbArNPbh6admJL wLV8HojUrL/vArLkJEwQV7IWu8oa8eWu8vFPVTPo/v1pUr3MtrKmPqQjSeBBolv4tBRo cg6py5KLfgHsBP8q5uanvZpKL98IaSr4W+pHw0PCCSxcSxo/DAxZP7M84s5Mwb9XCbC2 ifBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711039054; x=1711643854; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BO7qlg8CrJrpGAZLx2tB5/z68XAeLcOjL+jbqSm1NrE=; b=Rir/GHvpYJGclHnfmC/iDYeU/5xtu5OB5K3goT6aag81JhSxzkbX3M2nFB60rLB5Nx VJDDGbOoErl2P5Uk0wKS0ZAG01VyGvdvTlQRgEz/xE7+pdv9+UrSa4oqJasZxhrl20fr 37MUsUzUHdWAK6nlU8e/1fGWeokYCGt3gvJkTXCqczg6yGlP83F2JraJQg+iqoxst5GI feZe3whbiBPOPRA0zZZErRd1T7KGhWLCXMTpG95MJdnzBdR+GD9IsjiYtrHvb4S+8xvJ KdiQlP/Vl99xW5jXPZUpXzDDkrKQkHxupnTkLRWtlEF8CCcsINqWg72weWmfZyfxxICd 7JvQ== X-Forwarded-Encrypted: i=1; AJvYcCVgRJeKxErjmLAWDCIjG+iZDRaqJfRj0NuCe/viABZ4QjbinFBPNbm9vBQ4RiNp23Pa4Fnrt+Y9PckG0a4U2aL4ubM= X-Gm-Message-State: AOJu0Yz8bomlt8vt55xxzKgoj4baWKQyJtjUosJBIPhK3Lt+C4MBB5KK 8GtTOBTUA6E3d/xX+hWaimIp2e2A472+WEbmXTzgLTZevVWiIPZeE/g38LBxQ0T4vhwQF5+zJL7 hfg== X-Google-Smtp-Source: AGHT+IFS8l6862ma7ZQ5nEeHVOl9wKPYzuGCINkU9A5+oHuouEfxTwfUntJ3DBz0B7w6WbE929F2a5bqsSQ= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:a489:6433:be5d:e639]) (user=surenb job=sendgmr) by 2002:a05:6902:2681:b0:dcb:bc80:8333 with SMTP id dx1-20020a056902268100b00dcbbc808333mr5470245ybb.13.1711039053606; Thu, 21 Mar 2024 09:37:33 -0700 (PDT) Date: Thu, 21 Mar 2024 09:36:33 -0700 In-Reply-To: <20240321163705.3067592-1-surenb@google.com> Mime-Version: 1.0 References: <20240321163705.3067592-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.291.gc1ea87d7ee-goog Message-ID: <20240321163705.3067592-12-surenb@google.com> Subject: [PATCH v6 11/37] lib: code tagging module support From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, roman.gushchin@linux.dev, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, penguin-kernel@i-love.sakura.ne.jp, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, peterx@redhat.com, david@redhat.com, axboe@kernel.dk, mcgrof@kernel.org, masahiroy@kernel.org, nathan@kernel.org, dennis@kernel.org, jhubbard@nvidia.com, tj@kernel.org, muchun.song@linux.dev, rppt@kernel.org, paulmck@kernel.org, pasha.tatashin@soleen.com, yosryahmed@google.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, andreyknvl@gmail.com, keescook@chromium.org, ndesaulniers@google.com, vvvvvv@google.com, gregkh@linuxfoundation.org, ebiggers@google.com, ytcoode@gmail.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, bristot@redhat.com, vschneid@redhat.com, cl@linux.com, penberg@kernel.org, iamjoonsoo.kim@lge.com, 42.hyeyoo@gmail.com, glider@google.com, elver@google.com, dvyukov@google.com, songmuchun@bytedance.com, jbaron@akamai.com, aliceryhl@google.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, surenb@google.com, kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: B7C1E40020 X-Stat-Signature: 3junr3bf53hj3a9fr7oh6wbkg418qjpa X-Rspam-User: X-HE-Tag: 1711039054-530016 X-HE-Meta: U2FsdGVkX1+8PBGiXUbwgqyqBvV08w78+gm0KTn051qw0KeFkpLgKbDVr3m9SK0R/5i8JslkLaPxaYLQahNNf2vgl2sAlWAXMgLYkZGvC3aLkVnGS5N3JU/YQHW6NbY4ipIRfXCwC68zL3JpvkjLBLOgHWTFSFdyZOjoBn4NyreKkCLoIxnQGwFJIvneFNRRWCMm5grbyRaxjPu2Xdcb4k94RwXG2t0Qo89rTqWNM01gOIdNsdK0a+6C+/Devcxn8oJ52mUUeaqIogazDHYOgEV2tI7EIf4Yp2H2MhI4QBoNB2K9Kopw9O4vU7pKl6HhntFSzdDIiH5hotIPbCexKESBJ1DpOhCB9/VTCMk8xmt/7IaenM74fOLbd8LY7vtEZU+ZRK1u7HGVm6mGlTy435pFhnoYbryBHC2xJ5GgcBcOxunysntq05YfoDXcQYT+YW9PCXycPC1uvM2qLlKxte6p9lBJhKGmZIb/H2WTDW1lBh5+VdHVpT3lR8SV//DR8RZ1xRhRBQu4/5PioPRQnbkTARL5EuOulIz4murT0AzsZPXsn4a4gZ7sMNNaSLjOpbwEYWbkgis+FJw5fUom1Dla88yJvxBlc7Q3p8Q+VyAf14TJkAdpCRF5i45D2LFauv6Uy22CG9EZPcflFx7h0raP7orjqYEWXJ26C/bdSc+2CDWWVWj6kad5aCa1b+ubWMPueGxe/IjApS7huGVEnrJXHNedmrXVBDlBe/xgrCfWh6gCvkfwURr0aCGZ0JmUGfT9N8znZOgabzd4lvdJQXDXaQh1K6BUJsPOe3WuOh6T4S149D0n1BxH0Zk19zGnOEhsFzEorouBIzyTkEkArEDMmIazMAjC4kYgJAvw4EZFh37lepTQ6OaqKORQDMRR7IGbY2WRKcdQIxM5IMTqmD+H5QMF4mc6Nmb+ipi4P5keMr99h4fZ0sM4IgUHTAcBap1Yv2Chi/Gc/ny+6eD JMCGk0E0 JCj7WPXByxgkYc5FMOrI263w8vmKygPIJQzCDObUv4o2cUfPrY8qwf/0dCMfNVp3Tv0Gf2Of49X0km29qQkwVZ6RBona43wYxRqBX9z2S5RVvndC9IJbAVipd2ARednjVX485vkCmOnPrMaRVAoMLzjMvJt2oixAGn4oxpraE1goKqwTq4y5Ili3XKi7NW8IrQ+bDNSlgmpi+rTCQjUUHWXCp8z2V3gM3nWa/44HEKW3c9NWP1LzkkKrUrXmHNSkdVY50fw6qkwNNesOKmg2Y7LfLLVhbI5ULWyV92EvAB27CEe0zfIOzUnkjbLn+P4AV98zDGsD57PmoOagUr10vTzdFq9K+s8SMBmSpwm1PzMCtL/NkkHZCZ++e2hiBY3FLJJ3wldoqAdd03lWuHE8R3GEsV3EGICZ33KOWL7lYUVZiwNmvTMvAhLSbl2VD+DWTrfs0dXCKPLfyAPzz48cDtekM1dRk/MrmfJ6KUB9lUeGyuE6sTyGVLUbqkRftx9UuY7sgUUP/Z9G3EpVghNFDCO8U46vgyWf/Ye0Tu3SRGxftuNhZZYkK/QyCeDj6oWvCltkk8bMCOtzjWYrP2kdzs1wc1e80FNp3R/+aADjFk9WnLgnQJy01j2rSG5XIKugINP7cpOBQaya6/9Iv18HDjyDEA0ZCphfMhsFsaaEaDQz/E00= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add support for code tagging from dynamically loaded modules. Signed-off-by: Suren Baghdasaryan Co-developed-by: Kent Overstreet Signed-off-by: Kent Overstreet --- include/linux/codetag.h | 12 +++++++++ kernel/module/main.c | 4 +++ lib/codetag.c | 58 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/include/linux/codetag.h b/include/linux/codetag.h index 7734269cdb63..c44f5b83f24d 100644 --- a/include/linux/codetag.h +++ b/include/linux/codetag.h @@ -33,6 +33,10 @@ union codetag_ref { struct codetag_type_desc { const char *section; size_t tag_size; + void (*module_load)(struct codetag_type *cttype, + struct codetag_module *cmod); + void (*module_unload)(struct codetag_type *cttype, + struct codetag_module *cmod); }; struct codetag_iterator { @@ -65,4 +69,12 @@ void codetag_to_text(struct seq_buf *out, struct codetag *ct); struct codetag_type * codetag_register_type(const struct codetag_type_desc *desc); +#if defined(CONFIG_CODE_TAGGING) && defined(CONFIG_MODULES) +void codetag_load_module(struct module *mod); +void codetag_unload_module(struct module *mod); +#else +static inline void codetag_load_module(struct module *mod) {} +static inline void codetag_unload_module(struct module *mod) {} +#endif + #endif /* _LINUX_CODETAG_H */ diff --git a/kernel/module/main.c b/kernel/module/main.c index e1e8a7a9d6c1..ffa6b3e9cb43 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include "internal.h" @@ -1242,6 +1243,7 @@ static void free_module(struct module *mod) { trace_module_free(mod); + codetag_unload_module(mod); mod_sysfs_teardown(mod); /* @@ -2995,6 +2997,8 @@ static int load_module(struct load_info *info, const char __user *uargs, /* Get rid of temporary copy. */ free_copy(info, flags); + codetag_load_module(mod); + /* Done! */ trace_module_load(mod); diff --git a/lib/codetag.c b/lib/codetag.c index 8b5b89ad508d..54d2828eba25 100644 --- a/lib/codetag.c +++ b/lib/codetag.c @@ -124,15 +124,20 @@ static void *get_symbol(struct module *mod, const char *prefix, const char *name { DECLARE_SEQ_BUF(sb, KSYM_NAME_LEN); const char *buf; + void *ret; seq_buf_printf(&sb, "%s%s", prefix, name); if (seq_buf_has_overflowed(&sb)) return NULL; buf = seq_buf_str(&sb); - return mod ? + preempt_disable(); + ret = mod ? (void *)find_kallsyms_symbol_value(mod, buf) : (void *)kallsyms_lookup_name(buf); + preempt_enable(); + + return ret; } static struct codetag_range get_section_range(struct module *mod, @@ -173,8 +178,11 @@ static int codetag_module_init(struct codetag_type *cttype, struct module *mod) down_write(&cttype->mod_lock); err = idr_alloc(&cttype->mod_idr, cmod, 0, 0, GFP_KERNEL); - if (err >= 0) + if (err >= 0) { cttype->count += range_size(cttype, &range); + if (cttype->desc.module_load) + cttype->desc.module_load(cttype, cmod); + } up_write(&cttype->mod_lock); if (err < 0) { @@ -185,6 +193,52 @@ static int codetag_module_init(struct codetag_type *cttype, struct module *mod) return 0; } +void codetag_load_module(struct module *mod) +{ + struct codetag_type *cttype; + + if (!mod) + return; + + mutex_lock(&codetag_lock); + list_for_each_entry(cttype, &codetag_types, link) + codetag_module_init(cttype, mod); + mutex_unlock(&codetag_lock); +} + +void codetag_unload_module(struct module *mod) +{ + struct codetag_type *cttype; + + if (!mod) + return; + + mutex_lock(&codetag_lock); + list_for_each_entry(cttype, &codetag_types, link) { + struct codetag_module *found = NULL; + struct codetag_module *cmod; + unsigned long mod_id, tmp; + + down_write(&cttype->mod_lock); + idr_for_each_entry_ul(&cttype->mod_idr, cmod, tmp, mod_id) { + if (cmod->mod && cmod->mod == mod) { + found = cmod; + break; + } + } + if (found) { + if (cttype->desc.module_unload) + cttype->desc.module_unload(cttype, cmod); + + cttype->count -= range_size(cttype, &cmod->range); + idr_remove(&cttype->mod_idr, mod_id); + kfree(cmod); + } + up_write(&cttype->mod_lock); + } + mutex_unlock(&codetag_lock); +} + #else /* CONFIG_MODULES */ static int codetag_module_init(struct codetag_type *cttype, struct module *mod) { return 0; } #endif /* CONFIG_MODULES */ -- 2.44.0.291.gc1ea87d7ee-goog