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 C75D4C54EBC for ; Thu, 12 Jan 2023 10:31:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63E488E0001; Thu, 12 Jan 2023 05:31:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EF71900003; Thu, 12 Jan 2023 05:31:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41BC48E0003; Thu, 12 Jan 2023 05:31:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 2B84D8E0001 for ; Thu, 12 Jan 2023 05:31:55 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id F1A08808DE for ; Thu, 12 Jan 2023 10:31:54 +0000 (UTC) X-FDA: 80345781348.15.36F2E00 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) by imf29.hostedemail.com (Postfix) with ESMTP id 47E94120014 for ; Thu, 12 Jan 2023 10:31:53 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=osDqB7oB; spf=pass (imf29.hostedemail.com: domain of 3l-G_YwYKCH4inkfgtiqqing.eqonkpwz-oomxcem.qti@flex--glider.bounces.google.com designates 209.85.218.73 as permitted sender) smtp.mailfrom=3l-G_YwYKCH4inkfgtiqqing.eqonkpwz-oomxcem.qti@flex--glider.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=1673519513; 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: references:dkim-signature; bh=LSkZFm2zhcJ11sH6VV/UUBhi7d17SDGndMSvaJIxOZI=; b=kkJVPn/BHTupat9PmXzbQhw50YlMljSip/NVcrixom9d+B+q4DDur4vgkXOtxW4UdwZobC 14hXSwCGwUYW5z+zy/I+5rzA2o/kCGEb2DoK4V/YHT/G3IRAlcM4h5quv26p5m+Q0jDtie lKO2X6F2bUTXRaw+MIxAsdH1l5hZ9Ok= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=osDqB7oB; spf=pass (imf29.hostedemail.com: domain of 3l-G_YwYKCH4inkfgtiqqing.eqonkpwz-oomxcem.qti@flex--glider.bounces.google.com designates 209.85.218.73 as permitted sender) smtp.mailfrom=3l-G_YwYKCH4inkfgtiqqing.eqonkpwz-oomxcem.qti@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673519513; a=rsa-sha256; cv=none; b=Zw/L8NqhvWnYbtBGOhS4DWzhZJx+XL/7nG7c4PFsVqKUN6r/+woLDrugHVXo9BCNx6pfmx BQfVURxwK+rif2/yI5Rr7k3c6KCuAJRKHz5mkNYIZ6G7jF9YOSYczo1v6suH5tWj8xmMIB MCyTRT1o+U1OoJl3DpnKXY0TzIZsrCM= Received: by mail-ej1-f73.google.com with SMTP id nb4-20020a1709071c8400b0084d4712780bso8678166ejc.18 for ; Thu, 12 Jan 2023 02:31:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=LSkZFm2zhcJ11sH6VV/UUBhi7d17SDGndMSvaJIxOZI=; b=osDqB7oB9rliiSEwujnVRRlF2iLya0drTf/pDhu92kUkCg30pCF8TFT1zoQOR4sxof rQ/zRExf3uGEYMJLnCrYtgReLRAHWLcYQ1RtH/q4QvG5G9TTKt32LQLyr1J9mOujv62k JCsOMnQUJ0f0/46fBpXaS4x3rk4UOuiWnE1PsQRb71wyBl2SffSxNs5jCB75hKlG4z7y +UbLxQ+m0/phOR5KpY8E1S8LYGdxd4kEQul9sOPZ46HQQ4h3z7WD5mTStE1O9wNy5YMr cspLC3jr8JFMi+zRboBTrI9qpopxyybLjqw1gAbnZVDC/B9Zs5UzjAsesbGTV9RDtNg2 DQdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=LSkZFm2zhcJ11sH6VV/UUBhi7d17SDGndMSvaJIxOZI=; b=FA2rX2ekQbSU3BEA0rYMJ5rY1kmwqeciEpizqoJt9nZPouum3eBfdF8tqWO0x5AvGK 7lZDY+31XbtlV76hEXNF2itc5m/TDkE78sOyUXa1IcGwIAI6jRDWP2Fz1pLqF2l0w55Z lmEYFJQLk3zj5i/QAf0kEHQ8LAjkDuHFMSR0Es1Pypy+osHzii7+cQdJo/QiIHma54v6 FFlG7nawQIDJaDm2jmX/vxj8ai5oRIHh/aXKszIBAls4rfQqrnC6xzzK/qZYW19FOK+c InAxbRwPinzyjv4dBqsASfV+m3popPeJPQWE1XAk7u0VoY7T6aSunoBE8/V3ToZwdBkM g5Tg== X-Gm-Message-State: AFqh2kpamzBxunSJlk8pYWArSGM9zv2dhTMXB/Jm73SoKvfSb9DrGIQI sKO0sSu3ah8+s1VI9VoS7vWfdb9Q+js= X-Google-Smtp-Source: AMrXdXsiV3DmNxAS7ow1FffnVfftZlNGUXqJ+SVvKBpRxiv55Tp5gQYdKTozmOpocUEgNb+vEtR77ZqNiQc= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:c17f:273f:c35:6186]) (user=glider job=sendgmr) by 2002:a17:906:b88d:b0:7c0:911e:199a with SMTP id hb13-20020a170906b88d00b007c0911e199amr5393223ejb.689.1673519511607; Thu, 12 Jan 2023 02:31:51 -0800 (PST) Date: Thu, 12 Jan 2023 11:31:47 +0100 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230112103147.382416-1-glider@google.com> Subject: [PATCH] kmsan: silence -Wmissing-prototypes warnings From: Alexander Potapenko To: glider@google.com Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, peterz@infradead.org, mingo@redhat.com, elver@google.com, dvyukov@google.com, linux-mm@kvack.org, kasan-dev@googlegroups.com, kernel test robot , Vlastimil Babka Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 47E94120014 X-Stat-Signature: c3f51mttnqb4q8da9yj7sxdxgmbep4dr X-Rspam-User: X-HE-Tag: 1673519513-166309 X-HE-Meta: U2FsdGVkX1+SpfUGcohCruakyt3s6jKmw0erf6eIonExfcHvyysBZnvG0lf/Y+i4+ZLbXUa6014FInE0sFCBL0i6mm0pVMOidyB6FR9LgiqQKfzeM8U5wpAuZB1NFFrT6F+M993XUqBIs2FLtorWaUBO1KfFccX3iAB/VXbeHxZziWWecH2DQYENzJfkYZqDODJleMwTf9iEIvIsJYXuwN5LvYWMu3RK1teHm9IMvtafy+8YQ2x7oJzZm7sCV6mlC6XVJQL3KgheMjjQp+Mjr/c/xdJPRJ01GboqZXljGDag1upCXQXfRpuKSEddL5Z8tweB3YzJXnaunvZoHcZzInJGoiMZQjDY7vZaMNGrSCk2Tw7WFC9effNgNkep5RPZO/9iH32PEbSvyz+e7A2DZ3u9loBNUTDJE+gzehqd9WNscwAoNK9Ugqd3bSqa9bEV+rvBNTOaXn82OqiREj3mqQL08JyWjPQTjCqGjGNnGBrbTG+nDO+EzFo4I9DFqYbWRJ1CgYrJF+JoDv37Ly/wVQGuSTNfbW5xZizAhmbWgRcEpoT2iblwYI9JNt1H9Wvbg+ghAaVTcKi0hPC0tW03LIyns4y0TW/obnGU7lCRFfhrY3eJFTkOuyH0TSVvRpbJp4100g6a+iyocmIGMmGBM5D5cDusv4U20xjho7uxqf5Dc+9quRwJQZVVVX6HgimoxY2a0ao87xDE8jXKMEa0qViooZOtB/jwy9C4xUHn9bL6aclfpJNM2BevEuZ2+TG/kg961Zr2aJtZyv+XVzRnsEQvrGPOL57FL/cksCVI+AakRpkU7mEjk6Vdifvp/Ow1sOcdK3Cwfy0+uLwWokmHryDlC9XaJPvWnl5GHztbVcLr2MZA7F8l4TFPPCv25hQW8yF4Fwn/VWTcdUQ9gVsQt2QU5rVIR0DnaNqSz/tEcMgHw9mBLBP7poWAhcsT9ggUhhwb7E23YPzUdIakuGI 4ER5mDM7 5+KlDKQujKVO0+JQSHxhPUSsCF18LBwWsDf3DSs41PESxd0LGjwvkXTV6t7DunICHITMlkqmH7wt9H0Os9PZQRXmkpPnEFY5hTXcriOpyMI2Wnwas9TA2nSuin9x0hQuHUJdw4jl4BmUijVECMA3F4jW/e7d8wnDMTU5dFgekwA6znPWLaI6UNV/LvmaM//NxHmtMinuypQZUc3daRTcM70QW/zNaZlIwH8/YY8IkuP2JohyyogonxBdwpNUiqLjO+1u8ahjnpDYyuEsUmCuq3/OrWVmSzzr7aSjFLuAfwqSd4wZxC51XGuzFg8nGRIO4WV0tLucFjTiaUvMvYGcfcNQBQ2dZNpzWjefxBOtQjusjHNA= 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: When building the kernel with W=1, the compiler reports numerous warnings about the missing prototypes for KMSAN instrumentation hooks. Because these functions are not supposed to be called explicitly by the kernel code (calls to them are emitted by the compiler), they do not have to be declared in the headers. Instead, we add forward declarations right before the definitions to silence the warnings produced by -Wmissing-prototypes. Reported-by: kernel test robot Link: https://lore.kernel.org/lkml/202301020356.dFruA4I5-lkp@intel.com/T/ Reported-by: Vlastimil Babka Suggested-by: Marco Elver Signed-off-by: Alexander Potapenko --- mm/kmsan/instrumentation.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mm/kmsan/instrumentation.c b/mm/kmsan/instrumentation.c index 770fe02904f36..cf12e9616b243 100644 --- a/mm/kmsan/instrumentation.c +++ b/mm/kmsan/instrumentation.c @@ -38,7 +38,15 @@ get_shadow_origin_ptr(void *addr, u64 size, bool store) return ret; } +/* + * KMSAN instrumentation functions follow. They are not declared elsewhere in + * the kernel code, so they are preceded by prototypes, to silence + * -Wmissing-prototypes warnings. + */ + /* Get shadow and origin pointers for a memory load with non-standard size. */ +struct shadow_origin_ptr __msan_metadata_ptr_for_load_n(void *addr, + uintptr_t size); struct shadow_origin_ptr __msan_metadata_ptr_for_load_n(void *addr, uintptr_t size) { @@ -47,6 +55,8 @@ struct shadow_origin_ptr __msan_metadata_ptr_for_load_n(void *addr, EXPORT_SYMBOL(__msan_metadata_ptr_for_load_n); /* Get shadow and origin pointers for a memory store with non-standard size. */ +struct shadow_origin_ptr __msan_metadata_ptr_for_store_n(void *addr, + uintptr_t size); struct shadow_origin_ptr __msan_metadata_ptr_for_store_n(void *addr, uintptr_t size) { @@ -59,12 +69,16 @@ EXPORT_SYMBOL(__msan_metadata_ptr_for_store_n); * with fixed size. */ #define DECLARE_METADATA_PTR_GETTER(size) \ + struct shadow_origin_ptr __msan_metadata_ptr_for_load_##size( \ + void *addr); \ struct shadow_origin_ptr __msan_metadata_ptr_for_load_##size( \ void *addr) \ { \ return get_shadow_origin_ptr(addr, size, /*store*/ false); \ } \ EXPORT_SYMBOL(__msan_metadata_ptr_for_load_##size); \ + struct shadow_origin_ptr __msan_metadata_ptr_for_store_##size( \ + void *addr); \ struct shadow_origin_ptr __msan_metadata_ptr_for_store_##size( \ void *addr) \ { \ @@ -86,6 +100,7 @@ DECLARE_METADATA_PTR_GETTER(8); * entering or leaving IRQ. We omit the check for kmsan_in_runtime() to ensure * the memory written to in these cases is also marked as initialized. */ +void __msan_instrument_asm_store(void *addr, uintptr_t size); void __msan_instrument_asm_store(void *addr, uintptr_t size) { unsigned long ua_flags; @@ -138,6 +153,7 @@ static inline void set_retval_metadata(u64 shadow, depot_stack_handle_t origin) } /* Handle llvm.memmove intrinsic. */ +void *__msan_memmove(void *dst, const void *src, uintptr_t n); void *__msan_memmove(void *dst, const void *src, uintptr_t n) { depot_stack_handle_t origin; @@ -162,6 +178,7 @@ void *__msan_memmove(void *dst, const void *src, uintptr_t n) EXPORT_SYMBOL(__msan_memmove); /* Handle llvm.memcpy intrinsic. */ +void *__msan_memcpy(void *dst, const void *src, uintptr_t n); void *__msan_memcpy(void *dst, const void *src, uintptr_t n) { depot_stack_handle_t origin; @@ -188,6 +205,7 @@ void *__msan_memcpy(void *dst, const void *src, uintptr_t n) EXPORT_SYMBOL(__msan_memcpy); /* Handle llvm.memset intrinsic. */ +void *__msan_memset(void *dst, int c, uintptr_t n); void *__msan_memset(void *dst, int c, uintptr_t n) { depot_stack_handle_t origin; @@ -217,6 +235,7 @@ EXPORT_SYMBOL(__msan_memset); * uninitialized value to memory. When reporting an error, KMSAN unrolls and * prints the whole chain of stores that preceded the use of this value. */ +depot_stack_handle_t __msan_chain_origin(depot_stack_handle_t origin); depot_stack_handle_t __msan_chain_origin(depot_stack_handle_t origin) { depot_stack_handle_t ret = 0; @@ -237,6 +256,7 @@ depot_stack_handle_t __msan_chain_origin(depot_stack_handle_t origin) EXPORT_SYMBOL(__msan_chain_origin); /* Poison a local variable when entering a function. */ +void __msan_poison_alloca(void *address, uintptr_t size, char *descr); void __msan_poison_alloca(void *address, uintptr_t size, char *descr) { depot_stack_handle_t handle; @@ -272,6 +292,7 @@ void __msan_poison_alloca(void *address, uintptr_t size, char *descr) EXPORT_SYMBOL(__msan_poison_alloca); /* Unpoison a local variable. */ +void __msan_unpoison_alloca(void *address, uintptr_t size); void __msan_unpoison_alloca(void *address, uintptr_t size) { if (!kmsan_enabled || kmsan_in_runtime()) @@ -287,6 +308,7 @@ EXPORT_SYMBOL(__msan_unpoison_alloca); * Report that an uninitialized value with the given origin was used in a way * that constituted undefined behavior. */ +void __msan_warning(u32 origin); void __msan_warning(u32 origin) { if (!kmsan_enabled || kmsan_in_runtime()) @@ -303,6 +325,7 @@ EXPORT_SYMBOL(__msan_warning); * At the beginning of an instrumented function, obtain the pointer to * `struct kmsan_context_state` holding the metadata for function parameters. */ +struct kmsan_context_state *__msan_get_context_state(void); struct kmsan_context_state *__msan_get_context_state(void) { return &kmsan_get_context()->cstate; -- 2.39.0.314.g84b9a713c41-goog