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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DA1AC6FA8A for ; Thu, 15 Sep 2022 15:05:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230367AbiIOPFT (ORCPT ); Thu, 15 Sep 2022 11:05:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230253AbiIOPFP (ORCPT ); Thu, 15 Sep 2022 11:05:15 -0400 Received: from mail-ej1-x64a.google.com (mail-ej1-x64a.google.com [IPv6:2a00:1450:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55D0B2CDFC for ; Thu, 15 Sep 2022 08:04:53 -0700 (PDT) Received: by mail-ej1-x64a.google.com with SMTP id oz30-20020a1709077d9e00b0077239b6a915so7798606ejc.11 for ; Thu, 15 Sep 2022 08:04:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=fFq4uMFAQOrpNZLU6ydmQ4L19fVmnSZ8zUbgI7i1GQ4=; b=cYFC7xgwkG3gs04oiPHichqf/b1cFGgnshWpci997Y8A5dmNKzM9GLf1pSniU9D5ku Hu0GNNgLGKOuCAjrWJaXT+n9N89m2OxLOF0aOwdMyJRfQdseBJiGghcUNTQyFs/ZUubo G0Bq2nmYZaMX470D+dLwGf+5tXv+CdH3F2TMy+uDbAiFguTk8zqG98QgRczskOtYOVDt jAjc9/Nvo2lVMh0sB6dJ8QlQ6FSwdkrIQtBbc5j54TAMFUpg1fazPK6geXTDbKZa+hK/ CtUyiXzLrd1aFajhJlu7Z3AG5P4f56KCWQ3N8ixK5cFk+NBX9dXK5inzenk1xXL3SCUs gf6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=fFq4uMFAQOrpNZLU6ydmQ4L19fVmnSZ8zUbgI7i1GQ4=; b=HF3oXWrKpxmZwsXPuEqqvIoivBkyrBZ/5o+ZAUfVLEenJejOMO2mpR42VgwXATg69v MPaHUUShtqi+5wJXm4f7uHXd+4AGQMud5/KJy8urzghjQP22Pdmha3t1eTuJhzpXWFvt N5HX0FdWQkgCKyaRhdrveSc5NwwCr7ld4KPVzADD0o78QnG4l2wAyPAKXG/kLgV6PWwh eM1+14JHrhvcVfuNNnCf07gvzj+YGGaxLbJP7JW2kqe/arNQfU/RaDoA3rYb8VGXbpc5 rKoIHYytR8mhL0vGBqhovw8DOVbTYCRsvGllghk2X3r8ul7LpiyvKF6LdKaTJ8RLiBEa gITQ== X-Gm-Message-State: ACrzQf1Ht/WNFfNBYCFGveOzEBFwf67CB1P4iofb5P7mpYm9YnGO62dP WWA2yRqYaGLEMwwDElmVV+xfSvQNWI4= X-Google-Smtp-Source: AMsMyM6nb4U8HQAI/T9hvY7h7118sHc1IkAnGq/cw4fx9f/IsFE0PzlQ/IJC4zd5NEMJksDjOy7tAJB6OCw= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:686d:27b5:495:85b7]) (user=glider job=sendgmr) by 2002:a17:907:272a:b0:77c:d7df:c9da with SMTP id d10-20020a170907272a00b0077cd7dfc9damr318116ejl.332.1663254291795; Thu, 15 Sep 2022 08:04:51 -0700 (PDT) Date: Thu, 15 Sep 2022 17:03:39 +0200 In-Reply-To: <20220915150417.722975-1-glider@google.com> Mime-Version: 1.0 References: <20220915150417.722975-1-glider@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220915150417.722975-6-glider@google.com> Subject: [PATCH v7 05/43] asm-generic: instrument usercopy in cacheflush.h From: Alexander Potapenko To: glider@google.com Cc: Alexander Viro , Alexei Starovoitov , Andrew Morton , Andrey Konovalov , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Christoph Hellwig , Christoph Lameter , David Rientjes , Dmitry Vyukov , Eric Biggers , Eric Dumazet , Greg Kroah-Hartman , Herbert Xu , Ilya Leoshkevich , Ingo Molnar , Jens Axboe , Joonsoo Kim , Kees Cook , Marco Elver , Mark Rutland , Matthew Wilcox , "Michael S. Tsirkin" , Pekka Enberg , Peter Zijlstra , Petr Mladek , Stephen Rothwell , Steven Rostedt , Thomas Gleixner , Vasily Gorbik , Vegard Nossum , Vlastimil Babka , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-arch@vger.kernel.org Notify memory tools about usercopy events in copy_to_user_page() and copy_from_user_page(). Signed-off-by: Alexander Potapenko Reviewed-by: Marco Elver --- v5: -- cast user pointers to `void __user *` Link: https://linux-review.googlesource.com/id/Ic1ee8da1886325f46ad67f52176f48c2c836c48f --- include/asm-generic/cacheflush.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/asm-generic/cacheflush.h b/include/asm-generic/cacheflush.h index 4f07afacbc239..f46258d1a080f 100644 --- a/include/asm-generic/cacheflush.h +++ b/include/asm-generic/cacheflush.h @@ -2,6 +2,8 @@ #ifndef _ASM_GENERIC_CACHEFLUSH_H #define _ASM_GENERIC_CACHEFLUSH_H +#include + struct mm_struct; struct vm_area_struct; struct page; @@ -105,14 +107,22 @@ static inline void flush_cache_vunmap(unsigned long start, unsigned long end) #ifndef copy_to_user_page #define copy_to_user_page(vma, page, vaddr, dst, src, len) \ do { \ + instrument_copy_to_user((void __user *)dst, src, len); \ memcpy(dst, src, len); \ flush_icache_user_page(vma, page, vaddr, len); \ } while (0) #endif + #ifndef copy_from_user_page -#define copy_from_user_page(vma, page, vaddr, dst, src, len) \ - memcpy(dst, src, len) +#define copy_from_user_page(vma, page, vaddr, dst, src, len) \ + do { \ + instrument_copy_from_user_before(dst, (void __user *)src, \ + len); \ + memcpy(dst, src, len); \ + instrument_copy_from_user_after(dst, (void __user *)src, len, \ + 0); \ + } while (0) #endif #endif /* _ASM_GENERIC_CACHEFLUSH_H */ -- 2.37.2.789.g6183377224-goog