From patchwork Wed Mar 20 10:18:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 13597690 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 387E4C54E67 for ; Wed, 20 Mar 2024 10:19:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C72566B009A; Wed, 20 Mar 2024 06:19:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C21916B009B; Wed, 20 Mar 2024 06:19:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE9ED6B009C; Wed, 20 Mar 2024 06:19:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9EC1A6B009A for ; Wed, 20 Mar 2024 06:19:15 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3D35D1A0BE8 for ; Wed, 20 Mar 2024 10:19:15 +0000 (UTC) X-FDA: 81917019870.21.4A0E19F Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf02.hostedemail.com (Postfix) with ESMTP id 534578001D for ; Wed, 20 Mar 2024 10:19:13 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=oawsCkoM; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf02.hostedemail.com: domain of 3ILj6ZQYKCLEXcZUViXffXcV.TfdcZelo-ddbmRTb.fiX@flex--glider.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3ILj6ZQYKCLEXcZUViXffXcV.TfdcZelo-ddbmRTb.fiX@flex--glider.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710929953; 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=m0vBJz04bRZVs+p5tf5O60PjHz2OHj3PY0354SOIqxk=; b=cdErzzZXA+W6DrjIemTylmOJ0jU0YsQ1sfWZxivsVD+nxrvzvteriXYrFDV1yMlCKFUsiY tNf0kLbe+WjUKZB//NB74fxldJBJPnGivAtqTom6y6+JpJffKjlNBwy1t15h+Kj7tu69EF NLsLAeiA2b3NuG2mcn7jVYOh3ZIRBuc= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=oawsCkoM; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf02.hostedemail.com: domain of 3ILj6ZQYKCLEXcZUViXffXcV.TfdcZelo-ddbmRTb.fiX@flex--glider.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3ILj6ZQYKCLEXcZUViXffXcV.TfdcZelo-ddbmRTb.fiX@flex--glider.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710929953; a=rsa-sha256; cv=none; b=XR/tKOU1vm6fPB8PvNdLRF7odwot7EWta2LEpR4Gf/b5A9c7c7SrSyN1MUQhlZn7pmN5qv SWuzqVWuMjPO0e1NEyEyG/qt6Gw+RxAsvt/IEzWkrfXHfb10lcF4EIbwJQdjnb7JeEBYf5 QATlLH0/kov6/zqJudpLNUpYEX2c9zQ= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dd169dd4183so7971202276.3 for ; Wed, 20 Mar 2024 03:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1710929952; x=1711534752; 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=m0vBJz04bRZVs+p5tf5O60PjHz2OHj3PY0354SOIqxk=; b=oawsCkoMD4Ysz+cMsrdKSSo+lic307ohSWrbHwSe67/t3MzCYQULIfBmBPs8/ZBQaV Om3l7MW+jDBy+ZGSA9Zt2Fqgf98sMlXsxEHYSO/Iyc+WbTcmcWLsio+G8ygIllB+3JlS 8A0k1+BfPlACZNwxKDHUzizZ1pHZjCDilPGi+6SKPV9uVYtsx9GR/h5eWFeyGr4K23vo QiZEdqINh0FQu09PAqVO9z75ijwNzu5snR3i1E4R9OdIVMA6HvxKZUTIyJZpTjUFuMd1 LZw79DL7ZqXFih72e2XsddYccHUxJV3MRoJl1L5fKSHuhSUrvALlWeTHx/8Gj4W1JEHI 0n1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710929952; x=1711534752; 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=m0vBJz04bRZVs+p5tf5O60PjHz2OHj3PY0354SOIqxk=; b=PlVKysbi4grXIvcZfVoBACDXnMIq+WX3JhagZmc9yhF0ekfji8izDHb2ncSkGzSUrb EFVTUSTKC5h0tYOPLvcRkGYfYj/i5xSVXGnIqPz9+4bltstvRiltjRFnFknLTgYchjUl eAKInHCshvbuOMAOvT5tSf9dq2qm284ITE/Xf5iaMq0r5dgPOHoN7sSGbPzqjWJ+IQmC fIWfxoiMQZnx/0qsXHgJmaRCIwUZinwr3EUDoIJThHJt910xL/WR4XNPPh50G4TR9Hrl biNC3IRAvzI7t0O5Ksm4uGi0B21zSGTgGxtTv9v9PIThBLgufWq4Aau7P36Fhdgb0zgd x4sw== X-Forwarded-Encrypted: i=1; AJvYcCWhWppuI+Aw0rfRvzuxb0G9Vwivj3xI2qg9c20ll8NUCEME8DslmBMHgq3r0/B5p2DnCX+r3OlmnriaXvRkSSYNLJA= X-Gm-Message-State: AOJu0YyXjupZjPOqWy99T2yoXpAYgzANtXuK4N7irXGLjImhEDhr9og+ f4vtgkYuZ+V6BpiLkj7wG2HJ8N0pkEnTNDHNje333r8PwS9Ub1nVdseLzJSqB/uJCt1nRbwkYFJ Sgg== X-Google-Smtp-Source: AGHT+IFG8zJJFsZTjI1YIaNEwrks7akz88Yk5exPnSeBisyx550nfOfPmsTtY3RfUy1vhUp7VkINpS74JxE= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:2234:4e4b:bcf0:406e]) (user=glider job=sendgmr) by 2002:a05:6902:2484:b0:dd9:1b94:edb5 with SMTP id ds4-20020a056902248400b00dd91b94edb5mr625397ybb.10.1710929952333; Wed, 20 Mar 2024 03:19:12 -0700 (PDT) Date: Wed, 20 Mar 2024 11:18:50 +0100 In-Reply-To: <20240320101851.2589698-1-glider@google.com> Mime-Version: 1.0 References: <20240320101851.2589698-1-glider@google.com> X-Mailer: git-send-email 2.44.0.291.gc1ea87d7ee-goog Message-ID: <20240320101851.2589698-2-glider@google.com> Subject: [PATCH v2 2/3] instrumented.h: add instrument_memcpy_before, instrument_memcpy_after From: Alexander Potapenko To: glider@google.com, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, kasan-dev@googlegroups.com, tglx@linutronix.de, x86@kernel.org, Dmitry Vyukov , Marco Elver , Tetsuo Handa , Linus Torvalds X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 534578001D X-Stat-Signature: x4i5gwpnsk7dre3eg59pjy536pgcpkk3 X-Rspam-User: X-HE-Tag: 1710929953-995289 X-HE-Meta: U2FsdGVkX1/K9aI2XhX340Mib/tFUZ3jj9ffSZmYHRYZJEVwvYb2bxlN6BkLy9lbuALGPjSgG6tR+qlBdu08OZtulry+ZMKmT4KeofsW2tY2BpRFksQaIMLy4DpE9yWstUvqZHsJul/GsawxYK9c/iHFH6ENaaxgMUiqoAzU7NK5z+5arY58nVAo2tJj8BAOeILV9Y+J2IL8p2wbHZvfXxK0HxX33Zy4BByq/4bPrjgexYvXaiEOEWRif3F5OMlrhghSD7sa4ADk8w+S/AzCh3DKISU3mKkCtAX0YGZpROLri9TgzDGMX/djA/98UbfuhXwv5OGfA/O7kClR9LXbE7j8gzeGKRXN2eBMcITLIAKGZqHhyZOmExcPi/g4wB/4mFOmy37oW7PUyxE/QwluVNcuVvyEx+f+sbFrKQlzeH5uRCar/H6cW4IsrlWT46C20waUwGgQDHmk8m7YWm4LjfYZz8PF++5gK/hOB6DIBBtgrZpifJcvo5VY+kYBYZhDpdJleScgJNVkgH2TkfNj7FtzW1BwXTGHA8mJL81WTKr+6TU8lHnqPR9oa//F7AIeY2p1VXU1X914oxUlyeow362+OdOcIzgqqtqlAtuSTlMsosNoM9m7aVO6SNp1Pkp0m/UvEHASEwZe2rfRzuJHm4S3r0AWR3ErPa3qW4wgSXy/PaHAmpSfCQp77Yvp0On4QjbCwNYZFBY2HLdz9/irZbq+gnbtyMH60kBL9C46qn24CDaIGPT4ZuXqy5NL7wOsBEWO4KvkyiOPpCAGcVFstTIq8NxJPA2Q1n6I5tOlwY7m5OB3J9MBGKjg0IYmBJHbZRCwu1rDit3MD7i+upMUjG8qBUMoWxQ0o2umwFeyEYqNldc34rXgaMhiYcy57vDalpHTtw+tc9D5I9uGChSXv5JUuxPc9GsOp4cfyHzIgeMyGmKCpP2+MALxNe73SM7X6GqCgLyoRjAgVCCrnF4 tIE7IpAE AAwQqe4w7/AbDEpl89pvtuDFwZ7dSEWfeF7X0FcReR1xNU6Y8+N1Fdeb00GiywP9FCu7a5EUzgiILR1Yrqx1renKwFTJBRdOZ2x9ktMYvW1Hjj96T05zc+3kPfyllfJ1IkSExytDSj68V7V3WGnsjuDcqFCKjcAZo4qZSVSqrRFlmG42hY8cWMALm5YfUlUVflN/kL8ushqS/f5STPyPuGzDkU7oBssWcHT7qQ/Od39m7zHjv/xN9ZLA4xmQ4QFY8YAheD6g0oqExny469soPolMw9Nn+UUhUdCHWYGDtVV2NF3QDgXruM87dTgb5MtP0Va6kOOmKxcqAQeU+0zATJBkUwl5fR71gO0ACy6ghM5aoHNwDUd6O5VwsTKtWcAhlgkt3gTzIfqCV8UITuYLHkJ1nfz8gKUKKL/7G88GWCOjTWfP6yZbkDlvXhRWQ7J5hjBjcN7jX8jYZg5hR+oNl5IwBQuVg4+vfn3p0qNJ1695oHiZoN8dc/5Z5gYcRVptImFaGKU48t2vxsp/RSIfguN/ZwWXISw2W8bpb1+jeyzGWy47ffYdbApQXIYAy8TCJ2iN/dNx57vrlzQmBvvbw7kVYVqrT5K1K93Co3uZ0FnJtfvmhfGVFOUz+MmYxGiNKV7KkPHCsZTZFHFH8Kq+DRvKTlP9tl2KPJBh8PCc1/dM+mL5jW1va7BYevEQEWKFyIQtsuui8MBEwk6f+yq0y37SKpIrO4xl630ItQJthO6e4q2qEs7WJF1aGRNB4Hqrrdv/eEYvblytwqRlnHxtvs386KA== 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: Bug detection tools based on compiler instrumentation may miss memory accesses in custom memcpy implementations (such as copy_mc_to_kernel). Provide instrumentation hooks that tell KASAN, KCSAN, and KMSAN about such accesses. Link: https://lore.kernel.org/all/3b7dbd88-0861-4638-b2d2-911c97a4cadf@I-love.SAKURA.ne.jp/ Signed-off-by: Alexander Potapenko Cc: Dmitry Vyukov Cc: Marco Elver Cc: Tetsuo Handa Cc: Linus Torvalds Reviewed-by: Marco Elver --- v2: fix a copypasto in a comment spotted by Linus --- include/linux/instrumented.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/linux/instrumented.h b/include/linux/instrumented.h index 1b608e00290aa..711a1f0d1a735 100644 --- a/include/linux/instrumented.h +++ b/include/linux/instrumented.h @@ -147,6 +147,41 @@ instrument_copy_from_user_after(const void *to, const void __user *from, kmsan_unpoison_memory(to, n - left); } +/** + * instrument_memcpy_before - add instrumentation before non-instrumented memcpy + * @to: destination address + * @from: source address + * @n: number of bytes to copy + * + * Instrument memory accesses that happen in custom memcpy implementations. The + * instrumentation should be inserted before the memcpy call. + */ +static __always_inline void instrument_memcpy_before(void *to, const void *from, + unsigned long n) +{ + kasan_check_write(to, n); + kasan_check_read(from, n); + kcsan_check_write(to, n); + kcsan_check_read(from, n); +} + +/** + * instrument_memcpy_after - add instrumentation after non-instrumented memcpy + * @to: destination address + * @from: source address + * @n: number of bytes to copy + * @left: number of bytes not copied (if known) + * + * Instrument memory accesses that happen in custom memcpy implementations. The + * instrumentation should be inserted after the memcpy call. + */ +static __always_inline void instrument_memcpy_after(void *to, const void *from, + unsigned long n, + unsigned long left) +{ + kmsan_memmove(to, from, n - left); +} + /** * instrument_get_user() - add instrumentation to get_user()-like macros * @to: destination variable, may not be address-taken