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 2F6C0C433EF for ; Wed, 2 Mar 2022 21:58:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235108AbiCBV7Q (ORCPT ); Wed, 2 Mar 2022 16:59:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235068AbiCBV7Q (ORCPT ); Wed, 2 Mar 2022 16:59:16 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 762B6C3373 for ; Wed, 2 Mar 2022 13:58:31 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 265BAB821BD for ; Wed, 2 Mar 2022 21:58:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8E5DC004E1; Wed, 2 Mar 2022 21:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1646258308; bh=M/yF+n7LOku/1K8kefGSeGPyjVPSJWkjroSM1us+cFc=; h=Date:To:From:Subject:From; b=oCdRNaA8QEF2K8O3doEvAtQJ2CPpKFu8h8xTdRV9t1r8OaFSlntPGpecpRwj6hZpf r8BRVfQ0vcL/lJ888nIbVDqt9q75MZEmZRdeFPTv0z6KYe98eN2q/pPip56PTgKWlD 0/3LCcn8cvCgeD54aTpK7LzHIBswq1XP7vprHPyg= Date: Wed, 02 Mar 2022 13:58:28 -0800 To: mm-commits@vger.kernel.org, will@kernel.org, vincenzo.frascino@arm.com, ryabinin.a.a@gmail.com, pcc@google.com, mark.rutland@arm.com, glider@google.com, eugenis@google.com, elver@google.com, dvyukov@google.com, catalin.marinas@arm.com, andreyknvl@google.com, akpm@linux-foundation.org From: Andrew Morton Subject: + kasan-vmalloc-only-tag-normal-vmalloc-allocations-fix-fix.patch added to -mm tree Message-Id: <20220302215828.D8E5DC004E1@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: kasan, scs: support tagged vmalloc mappings has been added to the -mm tree. Its filename is kasan-vmalloc-only-tag-normal-vmalloc-allocations-fix-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/kasan-vmalloc-only-tag-normal-vmalloc-allocations-fix-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/kasan-vmalloc-only-tag-normal-vmalloc-allocations-fix-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrey Konovalov Subject: kasan, scs: support tagged vmalloc mappings Fix up the custom KASAN instrumentation for Shadow Call Stack to support vmalloc() mappings and pointers being tagged. - Use the tagged pointer returned by kasan_unpoison_vmalloc() in __scs_alloc() when calling memset() to avoid false-positives. - Do not return a tagged Shadow Call Stack pointer from __scs_alloc(), as this might lead to conflicts with the instrumentation. Link: https://lkml.kernel.org/r/2f6605e3a358cf64d73a05710cb3da356886ad29.1646233925.git.andreyknvl@google.com Signed-off-by: Andrey Konovalov Cc: Marco Elver Cc: Alexander Potapenko Cc: Andrey Ryabinin Cc: Catalin Marinas Cc: Dmitry Vyukov Cc: Evgenii Stepanov Cc: Mark Rutland Cc: Peter Collingbourne Cc: Vincenzo Frascino Cc: Will Deacon Signed-off-by: Andrew Morton --- kernel/scs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/kernel/scs.c~kasan-vmalloc-only-tag-normal-vmalloc-allocations-fix-fix +++ a/kernel/scs.c @@ -32,16 +32,19 @@ static void *__scs_alloc(int node) for (i = 0; i < NR_CACHED_SCS; i++) { s = this_cpu_xchg(scs_cache[i], NULL); if (s) { - kasan_unpoison_vmalloc(s, SCS_SIZE, - KASAN_VMALLOC_PROT_NORMAL); + s = kasan_unpoison_vmalloc(s, SCS_SIZE, + KASAN_VMALLOC_PROT_NORMAL); memset(s, 0, SCS_SIZE); - return s; + goto out; } } - return __vmalloc_node_range(SCS_SIZE, 1, VMALLOC_START, VMALLOC_END, + s = __vmalloc_node_range(SCS_SIZE, 1, VMALLOC_START, VMALLOC_END, GFP_SCS, PAGE_KERNEL, 0, node, __builtin_return_address(0)); + +out: + return kasan_reset_tag(s); } void *scs_alloc(int node) _ Patches currently in -mm which might be from andreyknvl@google.com are kasan-page_alloc-deduplicate-should_skip_kasan_poison.patch kasan-page_alloc-move-tag_clear_highpage-out-of-kernel_init_free_pages.patch kasan-page_alloc-merge-kasan_free_pages-into-free_pages_prepare.patch kasan-page_alloc-simplify-kasan_poison_pages-call-site.patch kasan-page_alloc-init-memory-of-skipped-pages-on-free.patch kasan-drop-skip_kasan_poison-variable-in-free_pages_prepare.patch mm-clarify-__gfp_zerotags-comment.patch kasan-only-apply-__gfp_zerotags-when-memory-is-zeroed.patch kasan-page_alloc-refactor-init-checks-in-post_alloc_hook.patch kasan-page_alloc-merge-kasan_alloc_pages-into-post_alloc_hook.patch kasan-page_alloc-combine-tag_clear_highpage-calls-in-post_alloc_hook.patch kasan-page_alloc-move-setpageskipkasanpoison-in-post_alloc_hook.patch kasan-page_alloc-move-kernel_init_free_pages-in-post_alloc_hook.patch kasan-page_alloc-rework-kasan_unpoison_pages-call-site.patch kasan-clean-up-metadata-byte-definitions.patch kasan-define-kasan_vmalloc_invalid-for-sw_tags.patch kasan-x86-arm64-s390-rename-functions-for-modules-shadow.patch kasan-vmalloc-drop-outdated-vm_kasan-comment.patch kasan-reorder-vmalloc-hooks.patch kasan-add-wrappers-for-vmalloc-hooks.patch kasan-vmalloc-reset-tags-in-vmalloc-functions.patch kasan-fork-reset-pointer-tags-of-vmapped-stacks.patch kasan-arm64-reset-pointer-tags-of-vmapped-stacks.patch kasan-fork-reset-pointer-tags-of-vmapped-stacks-fix.patch kasan-vmalloc-add-vmalloc-tagging-for-sw_tags.patch kasan-vmalloc-arm64-mark-vmalloc-mappings-as-pgprot_tagged.patch kasan-vmalloc-unpoison-vm_alloc-pages-after-mapping.patch kasan-mm-only-define-___gfp_skip_kasan_poison-with-hw_tags.patch kasan-page_alloc-allow-skipping-unpoisoning-for-hw_tags.patch kasan-page_alloc-allow-skipping-memory-init-for-hw_tags.patch kasan-vmalloc-add-vmalloc-tagging-for-hw_tags.patch kasan-vmalloc-only-tag-normal-vmalloc-allocations.patch kasan-vmalloc-only-tag-normal-vmalloc-allocations-fix.patch kasan-vmalloc-only-tag-normal-vmalloc-allocations-fix-fix.patch kasan-arm64-dont-tag-executable-vmalloc-allocations.patch kasan-mark-kasan_arg_stacktrace-as-__initdata.patch kasan-clean-up-feature-flags-for-hw_tags-mode.patch kasan-add-kasanvmalloc-command-line-flag.patch kasan-allow-enabling-kasan_vmalloc-and-sw-hw_tags.patch arm64-select-kasan_vmalloc-for-sw-hw_tags-modes.patch kasan-documentation-updates.patch kasan-improve-vmalloc-tests.patch kasan-improve-vmalloc-tests-fix-2.patch kasan-improve-vmalloc-tests-fix-3.patch kasan-test-support-async-again-and-asymm-modes-for-hw_tags.patch kasan-print-virtual-mapping-info-in-reports.patch kasan-drop-addr-check-from-describe_object_addr.patch kasan-more-line-breaks-in-reports.patch kasan-rearrange-stack-frame-info-in-reports.patch kasan-improve-stack-frame-info-in-reports.patch kasan-print-basic-stack-frame-info-for-sw_tags.patch kasan-simplify-async-check-in-end_report.patch kasan-simplify-kasan_update_kunit_status-and-call-sites.patch kasan-check-config_kasan_kunit_test-instead-of-config_kunit.patch kasan-move-update_kunit_status-to-start_report.patch kasan-move-disable_trace_on_warning-to-start_report.patch kasan-split-out-print_report-from-__kasan_report.patch kasan-simplify-kasan_find_first_bad_addr-call-sites.patch kasan-restructure-kasan_report.patch kasan-merge-__kasan_report-into-kasan_report.patch kasan-call-print_report-from-kasan_report_invalid_free.patch kasan-move-and-simplify-kasan_report_async.patch kasan-rename-kasan_access_info-to-kasan_report_info.patch kasan-add-comment-about-uaccess-regions-to-kasan_report.patch kasan-respect-kasan_bit_reported-in-all-reporting-routines.patch kasan-reorder-reporting-functions.patch kasan-move-and-hide-kasan_save_enable-restore_multi_shot.patch kasan-disable-lockdep-when-printing-reports.patch