From patchwork Tue Mar 19 16:36:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 13596906 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 A5C03CD11BF for ; Tue, 19 Mar 2024 16:37:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 390616B0088; Tue, 19 Mar 2024 12:37:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 31A2A6B0089; Tue, 19 Mar 2024 12:37:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1BA006B008A; Tue, 19 Mar 2024 12:37:07 -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 0C5386B0088 for ; Tue, 19 Mar 2024 12:37:07 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AC28DA1908 for ; Tue, 19 Mar 2024 16:37:06 +0000 (UTC) X-FDA: 81914343252.24.D36352A Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf27.hostedemail.com (Postfix) with ESMTP id F004C40016 for ; Tue, 19 Mar 2024 16:37:04 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="zB10/20+"; spf=pass (imf27.hostedemail.com: domain of 3ML_5ZQYKCMsx2zuv8x55x2v.t532z4BE-331Crt1.58x@flex--glider.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3ML_5ZQYKCMsx2zuv8x55x2v.t532z4BE-331Crt1.58x@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=1710866225; 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=k4w49nfOoRyLntHEj6xF46Ct9MhFoMry9itEqGksxZs=; b=pKTVZb3Tq/ApKkb07Z5/HCt1Apgpfh5wFI6Sd3GBUaHV7hJ6V/gASRxjcMz/0CAl/QuyXd n8NhYv+PWK4bIS7jrHoPHHecohVtsj9+fI+RiKl/yQ6Au602PyagTPKrl3LbCrgFKAIwvZ blNuzb+nAdYC+IxD0uxLRU83h1BfDpk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710866225; a=rsa-sha256; cv=none; b=zZZDnKAp2vhIaclw2fnro/LC3CiSDP5oSP4AjS0GgNxlcH8LrOedXVGnhDyLCSlpFM5uAh pO3B3hNpLZ1J5dPYCzj9lR8hGtX0WiScTHaih/8ggQ4+G+NDXcVpkGu9Sgz0CInRAUo0Ua tS7zD+Ox9gyZs7/mmuPXb6jS4GPr9Ls= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="zB10/20+"; spf=pass (imf27.hostedemail.com: domain of 3ML_5ZQYKCMsx2zuv8x55x2v.t532z4BE-331Crt1.58x@flex--glider.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3ML_5ZQYKCMsx2zuv8x55x2v.t532z4BE-331Crt1.58x@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60cc8d4e1a4so109045827b3.3 for ; Tue, 19 Mar 2024 09:37:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1710866224; x=1711471024; 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=k4w49nfOoRyLntHEj6xF46Ct9MhFoMry9itEqGksxZs=; b=zB10/20+CwRw8Q4t17bNntR88uwevQ4m88Qp4Q/qt79XIKcLLVf+etV+7UcLKZabPl LokU2o+yNejED+DQgKLRWoYF8GDjSjoFFK7wT27CxeqjbccaJvk0FgF+/36vTBagMOBS hN9lgzyA8DF+ihCOI+lLIirNE3QMoCbXq//LKeZ9kc+c3ZmWBjQvWDTVc39tMO7wvNg5 lMS9kN7a9wp9GHBJTY5o5QR55Cj5TGvzUkoBTEAZGOHJ1DF6IuRmq1Wwz1x3H+lxajnN tycBLrUT7BqIQAqmeJhs30W8zKdzAqf9KixDIzMzHa8V1KUDpPDEigweGT29GHhOxSSH IiQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710866224; x=1711471024; 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=k4w49nfOoRyLntHEj6xF46Ct9MhFoMry9itEqGksxZs=; b=mVNinoVskILlMoCKPBc1Wj3yCgaAlJe/X8wjJ70BHsndcCN7AYtqqI6v3QiI1wAVlj IQBVoQLD7qxuQE4xpXfWevhlUsH0SO+E+Cckxj0i9eGmJo7PJmndGCR8DR+ocBONEP8p yv80l3kE5GrkGg5srn/f1NpWx0vg4GsPNkt0lat37uTR0oeUtGRkza+/UQ29EwWR+Q8X FCX8/hfM4dFWPM78eSI4FY4P1RuxLad+pAAW6LtgXZdsIKbZVnwXf15cnPu0eJSvlCL8 Jcny6QLQXKC2fGRypUhwJ+Mvmuk6DNKdZwD5b1+geTJovuZPMt1TFcaQ2kemeUiEWu2a /BTQ== X-Forwarded-Encrypted: i=1; AJvYcCWq4NKMEqjOQTi09SicTuTBK3cKhL5GSHlA+EHFWCzEp7qt8zYiEJ+erc+tQHtSLim1VbJ5LV5hztOJigpmz6dLZSQ= X-Gm-Message-State: AOJu0Yz4HSyk7nyTf5LxiZMeb6mS9yWwakV304kZk0JZ1v7NVXl6HAkQ vHstIyVdcD+bm3FDv+nbNkHLeWO/v55gnfhPi8tE0dqt0e2bycSTP66X0SbHtpGhdmt5uOuCmJ0 6+w== X-Google-Smtp-Source: AGHT+IE2b5132XOPzd/fmc5XbsJpCg/epKdPr4l7eMqrWTqkXllllbtWoCJvakx0igbVQQYRl57Kyez91XQ= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:2234:4e4b:bcf0:406e]) (user=glider job=sendgmr) by 2002:a0d:d413:0:b0:60a:3d7e:2b98 with SMTP id w19-20020a0dd413000000b0060a3d7e2b98mr825284ywd.4.1710866224161; Tue, 19 Mar 2024 09:37:04 -0700 (PDT) Date: Tue, 19 Mar 2024 17:36:55 +0100 In-Reply-To: <20240319163656.2100766-1-glider@google.com> Mime-Version: 1.0 References: <20240319163656.2100766-1-glider@google.com> X-Mailer: git-send-email 2.44.0.291.gc1ea87d7ee-goog Message-ID: <20240319163656.2100766-2-glider@google.com> Subject: [PATCH v1 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-Stat-Signature: q1qrfisjy9fko5pcfwtjiwuczh4fhfks X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: F004C40016 X-Rspam-User: X-HE-Tag: 1710866224-915877 X-HE-Meta: U2FsdGVkX19WhwDxRUwqj7vB16YvhVSpysEq5MszP8XPtppLGnTAV35FLRAuYi4dm4z08A/wkMIZ0EASItfXZQT2k8FFW1tIKI3rFDComazcCXLgp1/xHL7NrOpVoi+bafeKN2vPK2BqosO69NuBaAZrYHNVauI9rKNV8ZoagO5fnD1VAgh7nxfQ3Ow/PzE2dNgszFre5HSh5KC3QHLqDnGh5+1pm/48qwuj++soNnPZTJ9JW9ig/sfa3dg/+wNoy51nflXOW2IWsQEdXPaHMGEN/wyydOBm4Fed76mXrzeKvqnEAuN7hr6n+QbzZ6cffFvN7nj0Z6yZDx3SOy4o1nNcPMrG/gbRrRwqQD5FNJSkuPtqm3G9FoIEP49n2BEsrhd3NFCAT+NiLV9Mb5NVI61K84X/fm34++vy2XwkS8UAGyj19O40OxIBWO96g1lIoTYCJExJnTZIfcRkh6PM69r7iP7OYVDjpSgGZa394hIwplFPlmxW1hQcQGG79B70HyiaTJHbIje2861CuzBNQPWviLHojTLa+c+f/Rqg/XTggXDPGX0K4ZyHdcYHqgi6A/MJQ6TMJt7C0XHnk9szC02PS1swXJ6qKnkvpZ7Tw7chFfY+r4+ZBsAgWR0KgJlx/aWL4DwGpdirxQX1I02I9KoPCqu/fzCQ7QT3j7+LRgMkW6Tp7WzgRbt+Zxe0MRX2nMZ3How345ewMvfZQ6S/biyD56x4wxz7Cer9X2F1TXO+Seyxc2Kg/3O9Z6VBl9pZG6rCVwnmvIFLaJfadQZVtEeKw7SfoI6J+gP2z06+OGDX49R7yRDVxDGkv03h6VpUq+HjrS+y/b7iykg7MXibc0+K5xT0wL3oIGDI3k9/Cb9fllFRh6ZK4pccHQlQFZiGxrsIc7PZa5ZvwpReGlLIY5loBOTGxY93kzuEEnVNCSb+EuFriTNSEs9RB/Ap4v3xAQdMC7IwfEODtoMqYhk g4yOPipp 083CRLwxbZrUuH8yIphZDnqKIOumMqj5h5BjomiAaY3XOxiDpBMYOdDGeFM5XeRpbsg+lnQ308qoLMNWYG7gFWPZs0XLRJ0iFC53gUli7ijB9kvWclzVsP8F/xpQ4olFWRVc07eq+uZRO8Rf8fQVS0fRoY5uIywrYz7OrS/Px8QfyqCA59hUHMagBR9P6yFgEApHx/fA3blujY40xBcw+bw3HWfqE9BQsu1wKL7xRxNm3DijPVdNeIF0NTJ2cFjxbKO1cNHX7V14GcY5/Q8rmmsINdUjF1fBQ8p7yV+5DXddGmJ7HgvkEc6ly6+4+zMM3D5CPZG4EczeKeMF+GGiovgtJnC8By+U/lWcwTd9dpmNffxls69wKIPd1Q2gAtR+IqEFHs7XSGkNUQWA= 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 --- include/linux/instrumented.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/linux/instrumented.h b/include/linux/instrumented.h index 1b608e00290aa..f5f81f02506eb 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 before 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