From patchwork Wed Mar 6 18:24:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13584421 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 1FA14C5475B for ; Wed, 6 Mar 2024 18:25:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 420236B009C; Wed, 6 Mar 2024 13:25:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3CFC16B009D; Wed, 6 Mar 2024 13:25:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 224F16B009E; Wed, 6 Mar 2024 13:25:12 -0500 (EST) 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 0A1E86B009C for ; Wed, 6 Mar 2024 13:25:12 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id BDC11A0F58 for ; Wed, 6 Mar 2024 18:25:11 +0000 (UTC) X-FDA: 81867441222.27.FEE4F6F Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf07.hostedemail.com (Postfix) with ESMTP id 8740A4001C for ; Wed, 6 Mar 2024 18:25:09 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=h8JCds78; spf=pass (imf07.hostedemail.com: domain of 3BLXoZQYKCEc130nwkpxxpun.lxvurw36-vvt4jlt.x0p@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3BLXoZQYKCEc130nwkpxxpun.lxvurw36-vvt4jlt.x0p@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709749509; 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=tPAQlIYBmu/nqjnWAR+Y3waoaH5kDJ/L5+WSbugHpuw=; b=cfPCiEZ7mqhPXguE24GG6rvzswzbJFx39SP9FoB6IuaAz3z53nI6v0mtsQ8QeN1XvN3Y93 5Xm8iOHJnfSZHtLq1CBLg6wtHQKP9HxnY1AIDzuBDoRVlVLDneUM1uH7IPN4iYg9LW3xuR DyyfcOg9Afhy4alhO/xEI0J+Zw8ve94= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709749509; a=rsa-sha256; cv=none; b=G/foJh0sU0foTOmzmIKMjAstf9qq9T9BYIp6OZ3KL/edzVzSkrVD8hnUYvFH/DAwJ1dYGh 29jQEs/3FfpBUB+40bKqePSlrtKOLL1TbeVuFU5pw5XkFQ9446juEjUy75aXyzE0cKHIza CYg4cgVbMb52QvaYs37lE7EcjdJxH1Y= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=h8JCds78; spf=pass (imf07.hostedemail.com: domain of 3BLXoZQYKCEc130nwkpxxpun.lxvurw36-vvt4jlt.x0p@flex--surenb.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3BLXoZQYKCEc130nwkpxxpun.lxvurw36-vvt4jlt.x0p@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60904453110so154477b3.2 for ; Wed, 06 Mar 2024 10:25:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709749508; x=1710354308; 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=tPAQlIYBmu/nqjnWAR+Y3waoaH5kDJ/L5+WSbugHpuw=; b=h8JCds78nrW+R8/UG5WoYoQpHVH+EO+/dzcLCoYuRVDDdyJBT82Q/aOEQDNaeDm+TQ 4XWSxpLqsqABK8qoXvbnP6+dZAZr6tn7p5uXXSTZ7ZKJWumO7QfVhC0uzu9/UfmINuKk AZ/fUL3HozclASxZ2Sz+uDtvOSpyS6YkBdBJjh0SzknTMnrjAbU/LpW5Ng2I2F+HdZPr j6z5uvXZfCu79Y0Cmime9oSlm4P11A5udVKstye7UxfJU4AXeNpu+WlA03buTnbXVm3y QNm8gThD/plxf0+iavZ1kraqbOOxTp+7/nB1bi9/Iy9RxXflbCoQHB3yEkBE3O/rv+16 Ds2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709749508; x=1710354308; 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=tPAQlIYBmu/nqjnWAR+Y3waoaH5kDJ/L5+WSbugHpuw=; b=VSuZNfIpO48GxlI6HWE+KKIQ0FYe9Vugf8J0m+Um4o1rZze5M7lwHfX964r0JJOedc 0yzF3J+HbcCLQt4iXFnmmHJsbGDM21njdVjKrvZY3I1YLWWEKur192gig1N9h7iZrL4p tuTgBJz18pZse89zylHQfvXGfulB+hO9e2utumNgN/CsAEv5D8H/kdDMwf0II0m/1nIn +dClxW+b+c9xzZeHPlV7z643iPTwdTiF6NGJBHLfOzxwb50DLINqumZNqk4keBeuJAt7 RR3v6AcD/MkNHn5e6ONjGLBYODhAx74CjsHA/Jf1gO8yXvRZtI3wEmHhIY0SwrW4o7Nn vDhg== X-Forwarded-Encrypted: i=1; AJvYcCXoUVVSf1ag+BII81ACkZNiiZa0Z5YqR9iv311mD3k1r+etl+69/EQujSPp8oSUWDlmi3IEMZ5T7kR0csnssH146Fc= X-Gm-Message-State: AOJu0YzBXANCIdPtdfzcp2irDhF/YdB5JkIbxWVWhEgs4V4zknNEiKZR Jk5ly+LH/WTQLjLI35AT6tpoLHLZbyx+55cwA++3S9oHitj1MQBwc1OIOYIxWQQatcxjbjaTZZL e0w== X-Google-Smtp-Source: AGHT+IEd0tsvecVu5KDk9xxf7Y3b9Rk1jgR8DS8Z815x0mHqtjUMO8iZmPCQu0I1T2SCEsTJC91g87PAOnY= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:85f0:e3db:db05:85e2]) (user=surenb job=sendgmr) by 2002:a05:690c:ec5:b0:609:247a:fd3c with SMTP id cs5-20020a05690c0ec500b00609247afd3cmr4821873ywb.2.1709749508522; Wed, 06 Mar 2024 10:25:08 -0800 (PST) Date: Wed, 6 Mar 2024 10:24:09 -0800 In-Reply-To: <20240306182440.2003814-1-surenb@google.com> Mime-Version: 1.0 References: <20240306182440.2003814-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Message-ID: <20240306182440.2003814-12-surenb@google.com> Subject: [PATCH v5 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, shakeelb@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 X-Rspamd-Queue-Id: 8740A4001C X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: y36qh1xr7sr9pm1nkz6pqmhwts7txy6i X-HE-Tag: 1709749509-850661 X-HE-Meta: U2FsdGVkX19OcytNDwvDl9oaQCa1wVZu0bSzsa584rIB3fQRzFqs6YtFxNHvGWGmt06WQFXWgDC3w1U2UHPRDCIYbW9+rubm4QTFm9Q/tBLCr3T92w7EoCol+7szvl9gyMwEFbFbpVX9rQ+LPSAhVlh+v/LKVm2DdmPQf4N1BiC9EWZ0Vd73rnsrZeK18mS6dQOt/Ei5ALHtw7d8Jli+ndC99Njz09vgtUCQfjH2No4kLNvIUc+Cdjmjyop0QAXBByD+QGe+NWgHtBfZmJdXCchtrKsafeXoXRuo2UFKw4IYDowXNXsVWnptJZ/AIHKauWhVvdlFKy3FjqXQS9eiGvqpDr3OSm2jF3X8apd/YsLmAsUYLxIW0A6G/K6ZUbwdoD8ImYelkZg7MFhawo4C8H7D4UJ/HjZMympvu0SEnmpZ4wWL6ylMo07ENIm3Hkul9zZmIq/cZ/0xn1/HMcD68dWiEfKRFdhPAQTuWQD74iSwOYSOvUA2+Qw6h2eyWprw40ZE5f+qxt2K49KIf1XjDoepw/bkeISMJ+NTGp8Wuz/7V73e48CmGjhVm/fcG4xpR/i0lWP+qnvk0zCnhE6HnWuL97SC4O3EirW2X4rG3NTynZboyeMnSkA6gDqHDeEL5T6vMWHZbDNQP9g6FJdDx75HrF278YUPSjQgtdoGy+RVvCvW0OT0OREesW2sPuMZKZspw42A/VbUxiYq2r8W+CVHj6prWMRlUtWzAhr/vWCGRjmK/2fdqVYU8i9pCl76qA1WRj4DcXGCySAW0ByF8ZTz8O30oFW4BTU1KbZn332DSqW3cganzzruyTu5Qwdmo+TWhLm2LEz0TUiXCQQb86nfA4YhoMC0A0fgZShsTaKdv6/AymOHgX4gm5nIQ3rtD5hDAS/k+7T8/H2eJqKaKHhbllBtsyB0LmXNEhNC95+ZnR6raqaCEUZiE4WxagPkCfgygFIXhTWASwlXnpZ j62SOBO8 21YTzcTIDahlrPoxLZXfZYf+u43Uyn8dipUP+hKNILnMB30INp9Y5AC6hjWTnF5zq96PIHavkZULtjVi7M7fsrmHL3drvDc2YV+fc7YzHsk/V35hachhDn1GwfwUF2wS6T4a/yows6LLyUb6a1RFHjZCLZG4fZPgX0PL/+YRRkts1NYKhq/Ijpx9UnBn9Uy0eJM0bNtxsqLVJ7hOz1+M8YGL/7Wvypww4HkYN2A+j5EWJ8wDg9duH8+dNoIC34xY3tn6IQhkXIa6NU69+Hr+cB8NItWa9nHUqUQFOspaT+ccpDSfoOS+QjrlOSN7ielLV5iLrYGXthkW9e4MgDpJvxtgtzS0W/R2hyIt70RBkEwSQIvPgThaW0Bcm/TDIuMrdnPv4dyaIad+oc9VlcfHeX55dFZxAKUOYIQo765HoSXq0oddTIg5bqRfuBITYTldojutBVrIqeDuO4RN36JS33by6ZfWRmrheBwcBxH4c+DEmS+3NCKg3sIVTii5AmgIpPbwhsuBE1wrZ68uFbYgu3/iBrISZyBvBRNwNySrRUJ5VyTxixFhjLkP4JX2Gi3aJbfy06rXbSBklprzxHQGtcRrbYd+4nRGtO4Jhh3jTVKpQYo6EIBcolatqP0wEsjsO/MrKbhWJMLc1qYkrwkq83IGI01353XxZXQwbW+8sCY2I1JE= 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 b0b99348e1a8..bf5a4afbe4c5 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); /* @@ -2983,6 +2985,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 */