From patchwork Thu Oct 22 13:18:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851325 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 237F261C for ; Thu, 22 Oct 2020 13:19:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BFDDB221FE for ; Thu, 22 Oct 2020 13:19:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="OYz3Uex6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BFDDB221FE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 003BD6B0073; Thu, 22 Oct 2020 09:19:29 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F1DC56B0074; Thu, 22 Oct 2020 09:19:28 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D45876B0075; Thu, 22 Oct 2020 09:19:28 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0128.hostedemail.com [216.40.44.128]) by kanga.kvack.org (Postfix) with ESMTP id A00356B0073 for ; Thu, 22 Oct 2020 09:19:28 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 35A211EE6 for ; Thu, 22 Oct 2020 13:19:28 +0000 (UTC) X-FDA: 77399618016.17.egg91_3d0f5e227251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 14D8F180D0180 for ; Thu, 22 Oct 2020 13:19:28 +0000 (UTC) X-Spam-Summary: 1,0,0,42b073339fecbf4a,d41d8cd98f00b204,33oarxwokcdureuivpbemcxffxcv.tfdczelo-ddbmrtb.fix@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:966:967:968:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1542:1593:1594:1711:1730:1747:1777:1792:1981:2194:2196:2199:2200:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3353:3865:3867:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4385:4425:4605:5007:6120:6261:6653:6742:7901:8660:9025:9969:10004:10400:11026:11473:11658:11914:12043:12048:12296:12297:12438:12555:12679:12895:12986:13148:13230:14096:14097:14181:14394:14659:14721:21080:21212:21365:21444:21451:21627:21939:21966:21990:30054:30075,0,RBL:209.85.160.201:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yfzare8isffp3s68838dizcj5hmycgay3kykw65dzask68dpttpyfneuucs75.tkdrs9qjzpzez4hxu4qr4bu6h7n6kcgxkddsfx1aerh 7qurd6jz X-HE-Tag: egg91_3d0f5e227251 X-Filterd-Recvd-Size: 5916 Received: from mail-qt1-f201.google.com (mail-qt1-f201.google.com [209.85.160.201]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:27 +0000 (UTC) Received: by mail-qt1-f201.google.com with SMTP id e19so1009744qtq.17 for ; Thu, 22 Oct 2020 06:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=QY0XewM9lnHnRQ+vj0Qh7qias3TYU7mjlYARUV896zo=; b=OYz3Uex6U9uSOKmG8dnKe2ZRNBbSFCOO8PB9YiKoIPfAkmOkaw/6ymyo6N2z4rUFFK QA/R6DztoEC8wcxd06AE0Bius4X7c/Ftvt6G9p3wKYZS1veVqtDD5iASXy1APigHL3J+ iPYndXoTAgZ7G0g9rm5x9X9FjjfHxmypYlCQgRWErKC2QsF4LajQvOpb31KROOxQ41WK OYSFJLOpnhezmpsxyXoOE3KHS48ZEHk9c7FwIQOhHgIDWkyrWkB/S2CxHxacU7GXXy4H eD8PMg20cN4OPU93jp7Ur6QA+fOJK9FhytxSh8Jgir/r5sXgfQjHEY6bgN2JrU1G71to 2UhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=QY0XewM9lnHnRQ+vj0Qh7qias3TYU7mjlYARUV896zo=; b=bFG+qpmJdAUZBydAeb8ux4JmqI9fJxyFUxHfLp8f4NrilqHquvGeRVh+CUdMcBtStr VXjeZNklslXR2QPduVHtitkK1e+bwUXzNjaBgRgadp9rTlbcqYppeOX/+cCWKAEmXloX tL7u7S7O8clRzpw0EAqhat8NwqOycCYPwMpgJvWuZkXCS70TAPZpwmjahHVf9sFTMYGY dZ1U/sDi+2kEcl/TELpyyVVUZFw4dTN3rOhw5+MGa7pzOQJOuXPKKb+ivtxIAH+RhjAt 9HDT9RnecbM0x8AJeULGWni88HPcZHGESEiBHP0YuN8hwx9kw/teeRL6SbUS5xIWtOxM 4b3A== X-Gm-Message-State: AOAM531SFpu3l7GZ9KrP/zahwkDMTjGAq7+qCmj4mdkH+uZSuypZBB/U E8WCSwEw7u1tEvbecTEvTbq9YMI0Etr4WZLW X-Google-Smtp-Source: ABdhPJzQTsBQkJYG3rzMWRXjnKCNjmWERG4WSqKuEEUo0foPivBFc3WoUPPsrk/pqQdQ+K1+Kgc5n7k8hKkkenUW X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:184c:: with SMTP id d12mr2385924qvy.11.1603372766736; Thu, 22 Oct 2020 06:19:26 -0700 (PDT) Date: Thu, 22 Oct 2020 15:18:53 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 01/21] kasan: simplify quarantine_put call site From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Move get_free_info() call into quarantine_put() to simplify the call site. No functional changes. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Iab0f04e7ebf8d83247024b7190c67c3c34c7940f Reviewed-by: Dmitry Vyukov --- mm/kasan/common.c | 2 +- mm/kasan/kasan.h | 5 ++--- mm/kasan/quarantine.c | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 2bb0ef6da6bd..5712c66c11c1 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -308,7 +308,7 @@ static bool __kasan_slab_free(struct kmem_cache *cache, void *object, kasan_set_free_info(cache, object, tag); - quarantine_put(get_free_info(cache, object), cache); + quarantine_put(cache, object); return IS_ENABLED(CONFIG_KASAN_GENERIC); } diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 6850308c798a..5c0116c70579 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -214,12 +214,11 @@ struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, #if defined(CONFIG_KASAN_GENERIC) && \ (defined(CONFIG_SLAB) || defined(CONFIG_SLUB)) -void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache); +void quarantine_put(struct kmem_cache *cache, void *object); void quarantine_reduce(void); void quarantine_remove_cache(struct kmem_cache *cache); #else -static inline void quarantine_put(struct kasan_free_meta *info, - struct kmem_cache *cache) { } +static inline void quarantine_put(struct kmem_cache *cache, void *object) { } static inline void quarantine_reduce(void) { } static inline void quarantine_remove_cache(struct kmem_cache *cache) { } #endif diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c index 580ff5610fc1..a0792f0d6d0f 100644 --- a/mm/kasan/quarantine.c +++ b/mm/kasan/quarantine.c @@ -161,11 +161,12 @@ static void qlist_free_all(struct qlist_head *q, struct kmem_cache *cache) qlist_init(q); } -void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache) +void quarantine_put(struct kmem_cache *cache, void *object) { unsigned long flags; struct qlist_head *q; struct qlist_head temp = QLIST_INIT; + struct kasan_free_meta *info = get_free_info(cache, object); /* * Note: irq must be disabled until after we move the batch to the From patchwork Thu Oct 22 13:18:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851327 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 14DD061C for ; Thu, 22 Oct 2020 13:19:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9335D221FE for ; Thu, 22 Oct 2020 13:19:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="ShgR8nQg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9335D221FE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 163FB6B0075; Thu, 22 Oct 2020 09:19:32 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0CAE36B0078; Thu, 22 Oct 2020 09:19:32 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E81796B007B; Thu, 22 Oct 2020 09:19:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0237.hostedemail.com [216.40.44.237]) by kanga.kvack.org (Postfix) with ESMTP id B5D456B0075 for ; Thu, 22 Oct 2020 09:19:31 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 529F9181AEF07 for ; Thu, 22 Oct 2020 13:19:31 +0000 (UTC) X-FDA: 77399618142.04.cent97_38086a727251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id 376658009664 for ; Thu, 22 Oct 2020 13:19:31 +0000 (UTC) X-Spam-Summary: 1,0,0,2d349e10ad5a104b,d41d8cd98f00b204,34yarxwokcdguhxlysehpfaiiafy.wigfchor-ggepuwe.ila@flex--andreyknvl.bounces.google.com,,RULES_HIT:1:2:41:152:355:379:541:800:960:965:966:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1593:1594:1605:1730:1747:1777:1792:1981:2194:2196:2198:2199:2200:2201:2380:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3865:3867:3868:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4052:4321:4385:4390:4395:4425:4605:5007:6120:6261:6653:6742:7901:8603:8660:8957:9025:9969:10004:11026:11473:11658:11914:12043:12048:12296:12297:12438:12555:12679:12895:12986:13148:13230:14096:14097:14394:14659:21080:21365:21444:21451:21627:21939:21966:21990:30003:30054:30075,0,RBL:209.85.221.74:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yg9fjwbbromuktz7o9yybz1fxq7ocorjpi9k1iiuin5oumhhobfrqs3k9hmbh.xi4mqnffqograriqdb35r3mi4qsa 3w3ang4u X-HE-Tag: cent97_38086a727251 X-Filterd-Recvd-Size: 12800 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:30 +0000 (UTC) Received: by mail-wr1-f74.google.com with SMTP id 91so607385wrk.20 for ; Thu, 22 Oct 2020 06:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=3WRI9oDu6hZ+XySeeDEAjitD0U0NMNqgPQUgQO92Hds=; b=ShgR8nQgUhOkcQfTfIQc4eaXFaXUIHA5YCaRsXvDiiWMayIy/8XK2Sqc+tTJygluXt MrQ75sCMSnjRyjUUjixT9lliJfMwanCfy3hjWa6Ho61jJNyMayw0sXNO/uIqIv704RmQ uIQIxv6Wn+YaaHl5hJi1blTTAU3YbFqd17x4QfLW3D9sw4Cl6hwuhQsIQ3sTSGX2sDYJ mGM8bEdQDlC9H/Rab4/td03KNEp4BiRLJA6hiIG/IEaDSCMEebfic7LZo3TaaB+4uMto 49rwqLNJWsbqcQHTSOQsihuQ+NqUFvVi40kYv03UXRiRuE6G+y8D04JlSSYiLUf9Pd7+ XC3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=3WRI9oDu6hZ+XySeeDEAjitD0U0NMNqgPQUgQO92Hds=; b=BKkYM2Idces6jStRmgn6EPMqckRXewKxCtTfTWEiDsnNRbY5IWbYUAOnJEcjzsIEbO JZTX+5IJupS0Oo7DPtFRfIJ08EXalV49JbTNCccpspVBA2uMNR2R17yUE/HWftscy2g5 ASqn8tIMdTPaDGmy6UEDZVyglxL7YXNxXuCnW3SA8TMAwffzd/6YCeiPEF6dJDNjhz/C 8hmwQx6ZBEZxvyArL1vCRpBetwhAQTDvcYl5AHhgdWCT8grCKWbmAeQ65D+gC8dsFK8l v4BH/UolObhlI9zSrbP1Qd86Q1eFotFMp8PTAQebQEbBTBE5hawmNtPRuZ1aOAhXG0jJ 7yLA== X-Gm-Message-State: AOAM530OFvJ2YgjWHv3/LBSpB7rfM3c59+ohYhpOO2FwilxvJuc+f4hD /VnDx++ROQ1ee78kmoO54oTTquRFEgVMjAZf X-Google-Smtp-Source: ABdhPJxZqpiWdGUZlHhnoGaRWY1sZ1m9T5fM//GRaH86FzUYD9IUHxIPddaiaKJgckeEcg63A56skYvs5x1hVDNb X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:adf:fe48:: with SMTP id m8mr2645540wrs.127.1603372769376; Thu, 22 Oct 2020 06:19:29 -0700 (PDT) Date: Thu, 22 Oct 2020 15:18:54 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 02/21] kasan: rename get_alloc/free_info From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Rename get_alloc_info() and get_free_info() to kasan_get_alloc_meta() and kasan_get_free_meta() to better reflect what those do and avoid confusion with kasan_set_free_info(). No functional changes. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Ib6e4ba61c8b12112b403d3479a9799ac8fff8de1 Reviewed-by: Dmitry Vyukov --- mm/kasan/common.c | 16 ++++++++-------- mm/kasan/generic.c | 12 ++++++------ mm/kasan/hw_tags.c | 4 ++-- mm/kasan/kasan.h | 8 ++++---- mm/kasan/quarantine.c | 4 ++-- mm/kasan/report.c | 12 ++++++------ mm/kasan/report_sw_tags.c | 2 +- mm/kasan/sw_tags.c | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 5712c66c11c1..8fd04415d8f4 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -175,14 +175,14 @@ size_t kasan_metadata_size(struct kmem_cache *cache) sizeof(struct kasan_free_meta) : 0); } -struct kasan_alloc_meta *get_alloc_info(struct kmem_cache *cache, - const void *object) +struct kasan_alloc_meta *kasan_get_alloc_meta(struct kmem_cache *cache, + const void *object) { return (void *)reset_tag(object) + cache->kasan_info.alloc_meta_offset; } -struct kasan_free_meta *get_free_info(struct kmem_cache *cache, - const void *object) +struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, + const void *object) { BUILD_BUG_ON(sizeof(struct kasan_free_meta) > 32); return (void *)reset_tag(object) + cache->kasan_info.free_meta_offset; @@ -259,13 +259,13 @@ static u8 assign_tag(struct kmem_cache *cache, const void *object, void * __must_check kasan_init_slab_obj(struct kmem_cache *cache, const void *object) { - struct kasan_alloc_meta *alloc_info; + struct kasan_alloc_meta *alloc_meta; if (!(cache->flags & SLAB_KASAN)) return (void *)object; - alloc_info = get_alloc_info(cache, object); - __memset(alloc_info, 0, sizeof(*alloc_info)); + alloc_meta = kasan_get_alloc_meta(cache, object); + __memset(alloc_meta, 0, sizeof(*alloc_meta)); if (IS_ENABLED(CONFIG_KASAN_SW_TAGS) || IS_ENABLED(CONFIG_KASAN_HW_TAGS)) object = set_tag(object, assign_tag(cache, object, true, false)); @@ -345,7 +345,7 @@ static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, KASAN_KMALLOC_REDZONE); if (cache->flags & SLAB_KASAN) - kasan_set_track(&get_alloc_info(cache, object)->alloc_track, flags); + kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); return set_tag(object, tag); } diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index e1af3b6c53b8..de6b3f03a023 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -331,7 +331,7 @@ void kasan_record_aux_stack(void *addr) { struct page *page = kasan_addr_to_page(addr); struct kmem_cache *cache; - struct kasan_alloc_meta *alloc_info; + struct kasan_alloc_meta *alloc_meta; void *object; if (!(page && PageSlab(page))) @@ -339,13 +339,13 @@ void kasan_record_aux_stack(void *addr) cache = page->slab_cache; object = nearest_obj(cache, page, addr); - alloc_info = get_alloc_info(cache, object); + alloc_meta = kasan_get_alloc_meta(cache, object); /* * record the last two call_rcu() call stacks. */ - alloc_info->aux_stack[1] = alloc_info->aux_stack[0]; - alloc_info->aux_stack[0] = kasan_save_stack(GFP_NOWAIT); + alloc_meta->aux_stack[1] = alloc_meta->aux_stack[0]; + alloc_meta->aux_stack[0] = kasan_save_stack(GFP_NOWAIT); } void kasan_set_free_info(struct kmem_cache *cache, @@ -353,7 +353,7 @@ void kasan_set_free_info(struct kmem_cache *cache, { struct kasan_free_meta *free_meta; - free_meta = get_free_info(cache, object); + free_meta = kasan_get_free_meta(cache, object); kasan_set_track(&free_meta->free_track, GFP_NOWAIT); /* @@ -367,5 +367,5 @@ struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, { if (*(u8 *)kasan_mem_to_shadow(object) != KASAN_KMALLOC_FREETRACK) return NULL; - return &get_free_info(cache, object)->free_track; + return &kasan_get_free_meta(cache, object)->free_track; } diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 7f0568df2a93..2a38885014e3 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -56,7 +56,7 @@ void kasan_set_free_info(struct kmem_cache *cache, { struct kasan_alloc_meta *alloc_meta; - alloc_meta = get_alloc_info(cache, object); + alloc_meta = kasan_get_alloc_meta(cache, object); kasan_set_track(&alloc_meta->free_track[0], GFP_NOWAIT); } @@ -65,6 +65,6 @@ struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, { struct kasan_alloc_meta *alloc_meta; - alloc_meta = get_alloc_info(cache, object); + alloc_meta = kasan_get_alloc_meta(cache, object); return &alloc_meta->free_track[0]; } diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 5c0116c70579..456b264e5124 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -148,10 +148,10 @@ struct kasan_free_meta { #endif }; -struct kasan_alloc_meta *get_alloc_info(struct kmem_cache *cache, - const void *object); -struct kasan_free_meta *get_free_info(struct kmem_cache *cache, - const void *object); +struct kasan_alloc_meta *kasan_get_alloc_meta(struct kmem_cache *cache, + const void *object); +struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, + const void *object); void kasan_poison_memory(const void *address, size_t size, u8 value); diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c index a0792f0d6d0f..0da3d37e1589 100644 --- a/mm/kasan/quarantine.c +++ b/mm/kasan/quarantine.c @@ -166,7 +166,7 @@ void quarantine_put(struct kmem_cache *cache, void *object) unsigned long flags; struct qlist_head *q; struct qlist_head temp = QLIST_INIT; - struct kasan_free_meta *info = get_free_info(cache, object); + struct kasan_free_meta *meta = kasan_get_free_meta(cache, object); /* * Note: irq must be disabled until after we move the batch to the @@ -179,7 +179,7 @@ void quarantine_put(struct kmem_cache *cache, void *object) local_irq_save(flags); q = this_cpu_ptr(&cpu_quarantine); - qlist_put(q, &info->quarantine_link, cache->size); + qlist_put(q, &meta->quarantine_link, cache->size); if (unlikely(q->bytes > QUARANTINE_PERCPU_SIZE)) { qlist_move_all(q, &temp); diff --git a/mm/kasan/report.c b/mm/kasan/report.c index f8817d5685a7..dee5350b459c 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -162,12 +162,12 @@ static void describe_object_addr(struct kmem_cache *cache, void *object, static void describe_object(struct kmem_cache *cache, void *object, const void *addr, u8 tag) { - struct kasan_alloc_meta *alloc_info = get_alloc_info(cache, object); + struct kasan_alloc_meta *alloc_meta = kasan_get_alloc_meta(cache, object); if (cache->flags & SLAB_KASAN) { struct kasan_track *free_track; - print_track(&alloc_info->alloc_track, "Allocated"); + print_track(&alloc_meta->alloc_track, "Allocated"); pr_err("\n"); free_track = kasan_get_free_track(cache, object, tag); if (free_track) { @@ -176,14 +176,14 @@ static void describe_object(struct kmem_cache *cache, void *object, } #ifdef CONFIG_KASAN_GENERIC - if (alloc_info->aux_stack[0]) { + if (alloc_meta->aux_stack[0]) { pr_err("Last call_rcu():\n"); - print_stack(alloc_info->aux_stack[0]); + print_stack(alloc_meta->aux_stack[0]); pr_err("\n"); } - if (alloc_info->aux_stack[1]) { + if (alloc_meta->aux_stack[1]) { pr_err("Second to last call_rcu():\n"); - print_stack(alloc_info->aux_stack[1]); + print_stack(alloc_meta->aux_stack[1]); pr_err("\n"); } #endif diff --git a/mm/kasan/report_sw_tags.c b/mm/kasan/report_sw_tags.c index aebc44a29e83..317100fd95b9 100644 --- a/mm/kasan/report_sw_tags.c +++ b/mm/kasan/report_sw_tags.c @@ -46,7 +46,7 @@ const char *get_bug_type(struct kasan_access_info *info) if (page && PageSlab(page)) { cache = page->slab_cache; object = nearest_obj(cache, page, (void *)addr); - alloc_meta = get_alloc_info(cache, object); + alloc_meta = kasan_get_alloc_meta(cache, object); for (i = 0; i < KASAN_NR_FREE_STACKS; i++) if (alloc_meta->free_pointer_tag[i] == tag) diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index ccc35a311179..c10863a45775 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -172,7 +172,7 @@ void kasan_set_free_info(struct kmem_cache *cache, struct kasan_alloc_meta *alloc_meta; u8 idx = 0; - alloc_meta = get_alloc_info(cache, object); + alloc_meta = kasan_get_alloc_meta(cache, object); #ifdef CONFIG_KASAN_SW_TAGS_IDENTIFY idx = alloc_meta->free_track_idx; @@ -189,7 +189,7 @@ struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, struct kasan_alloc_meta *alloc_meta; int i = 0; - alloc_meta = get_alloc_info(cache, object); + alloc_meta = kasan_get_alloc_meta(cache, object); #ifdef CONFIG_KASAN_SW_TAGS_IDENTIFY for (i = 0; i < KASAN_NR_FREE_STACKS; i++) { From patchwork Thu Oct 22 13:18:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851329 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A898014B4 for ; Thu, 22 Oct 2020 13:19:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3B381221FE for ; Thu, 22 Oct 2020 13:19:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="s9oM5iH8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B381221FE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 13B4F6B007B; Thu, 22 Oct 2020 09:19:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0EB296B007D; Thu, 22 Oct 2020 09:19:36 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0027D6B007E; Thu, 22 Oct 2020 09:19:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C31E56B007B for ; Thu, 22 Oct 2020 09:19:35 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 5F0B7181AEF07 for ; Thu, 22 Oct 2020 13:19:35 +0000 (UTC) X-FDA: 77399618310.10.mouth19_400f8bb27251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id 9B6AF16A4BC for ; Thu, 22 Oct 2020 13:19:33 +0000 (UTC) X-Spam-Summary: 1,0,0,4be056992b633813,d41d8cd98f00b204,35iarxwokcdsxkaobvhksidlldib.zljifkru-jjhsxzh.lod@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:966:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2525:2559:2563:2682:2685:2693:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3352:3865:3866:3868:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4385:4425:5007:6120:6261:6653:6742:7901:8603:9025:9969:10004:10400:11026:11473:11658:11914:12043:12048:12296:12297:12438:12555:12679:12895:13069:13311:13357:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21627:21939:21990:30012:30054,0,RBL:209.85.128.74:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yfrf8j4xw1cn79yicwgb9g1n6baocj9tbix43iwnn7pnhnp8o6scggzd4jsim.uiwj4aijtbxoxhsznpa74oeioiwuky3c33eyfeqapkcj6trp5pr8dasn15mmo1s.a -lbl8.ma X-HE-Tag: mouth19_400f8bb27251 X-Filterd-Recvd-Size: 4853 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:33 +0000 (UTC) Received: by mail-wm1-f74.google.com with SMTP id y13so346092wmj.7 for ; Thu, 22 Oct 2020 06:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=5q3U4VLFNuW4Say/+COEa9cSd+BCTb/gfYzQFqbrIt4=; b=s9oM5iH8DyztpJ3yei2iELfje52kmUcHTd8eyzbMwAQSbqFtWHjatQDduusnEXcBlF dRcEZe7WUb2zjkKKb+HrmDJii0fH3LewAeHtE4bfLxfxNB0awQTKOED3tKnrbtywAlmZ RJsxxpdAFtW5V3dmIz/CVR+19BKDULMG6qzSLXojtBknlRQx9kN4tTCncVdHJPA8VUw+ ntbNj4QyHwsTBqXjJyzC4GHrQpK32UiA4tB+hd9+MQf5vqF/urDWATHcyIIPeqmLx/5g KDMHT07LfkP+rVyJQx5//13B01/a4uwGjMKhjHmZSq1H44/nxYNmf/RuVz3Hw+mGHk0B ozkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=5q3U4VLFNuW4Say/+COEa9cSd+BCTb/gfYzQFqbrIt4=; b=K8H3rM6NW/iaO1LUB4C/4goWlmWKURcvSZgsvLWmQ3wdpF8PxGUDQagl8d/uwWjpKe xhN8O/Ngu6nKuHTIWfxj8utT8qjjMy69fsQtXN/UtegUFrI1hu409grNsY5CIj+Sd3SE iSiBrNKVs37IE3+OwIflh+hizYzke7eSzzX9yVas20syKoVW1iO+RTTz5M31i8oW5Z+f 3fpA367COJcAC/l5JUxKi7OUXCK7FP5fuEHVexyVuvjIRJosWKrkRkEAG1Et0Wjzv3sG n2Gx1YoXznCxuAwIdjlcUHEs8SfUzBd4q9ZkawsrN2ZiLKJgeR8CBHxIjwva/crvS/Ij dd3Q== X-Gm-Message-State: AOAM530Ycr+ZSBcSSsxY5Nuze8ptVHg6XovLRXbZRBE7bj8/NXHZGJiy 8G7UKw2JsI07TRY3AgY7prsMfs789h7w6QG6 X-Google-Smtp-Source: ABdhPJz4Ufp39mZeum3PfjjYho0JpryDj6izuaC9cJUX07BIT7hBs0Dfy/fZBFj7FE4zj5eQxQAoPX94JecMHeSF X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a5d:4fcc:: with SMTP id h12mr2880700wrw.132.1603372772026; Thu, 22 Oct 2020 06:19:32 -0700 (PDT) Date: Thu, 22 Oct 2020 15:18:55 +0200 In-Reply-To: Message-Id: <595f9936a80b62ab89b884d71e904eaa884a96c2.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 03/21] kasan: introduce set_alloc_info From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Add set_alloc_info() helper and move kasan_set_track() into it. This will simplify the code for one of the upcoming changes. No functional changes. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I0316193cbb4ecc9b87b7c2eee0dd79f8ec908c1a Reviewed-by: Dmitry Vyukov --- mm/kasan/common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 8fd04415d8f4..a880e5a547ed 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -318,6 +318,11 @@ bool kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip) return __kasan_slab_free(cache, object, ip, true); } +static void set_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) +{ + kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); +} + static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, size_t size, gfp_t flags, bool keep_tag) { @@ -345,7 +350,7 @@ static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, KASAN_KMALLOC_REDZONE); if (cache->flags & SLAB_KASAN) - kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); + set_alloc_info(cache, (void *)object, flags); return set_tag(object, tag); } From patchwork Thu Oct 22 13:18:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851331 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7519014B4 for ; Thu, 22 Oct 2020 13:19:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2024824178 for ; Thu, 22 Oct 2020 13:19:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="nyVZvbQw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2024824178 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EF6E66B007E; Thu, 22 Oct 2020 09:19:39 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ECBA46B0080; Thu, 22 Oct 2020 09:19:39 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DBB636B0081; Thu, 22 Oct 2020 09:19:39 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0110.hostedemail.com [216.40.44.110]) by kanga.kvack.org (Postfix) with ESMTP id AD4046B007E for ; Thu, 22 Oct 2020 09:19:39 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 0EA783625 for ; Thu, 22 Oct 2020 13:19:37 +0000 (UTC) X-FDA: 77399618436.30.straw00_0502d4d27251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id A6D79180B3CAD for ; Thu, 22 Oct 2020 13:19:35 +0000 (UTC) X-Spam-Summary: 1,0,0,f27ac25f89d3dcfa,d41d8cd98f00b204,35oarxwokcd0zmcqdxjmukfnnfkd.bnlkhmtw-lljuzbj.nqf@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:966:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1543:1593:1594:1711:1730:1747:1777:1792:1981:2194:2196:2198:2199:2200:2201:2393:2525:2553:2559:2563:2682:2685:2731:2859:2896:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3354:3865:3867:3868:3870:3871:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4118:4250:4321:4385:4425:4605:5007:6120:6261:6653:6742:7875:7901:8603:8660:9025:9592:9969:10004:10400:11026:11473:11657:11658:11914:12043:12048:12295:12296:12297:12438:12555:12679:12895:12986:13148:13161:13229:13230:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21627:21939:21990:30003:30054:30090,0,RBL:209.85.160.202:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yfu4k7ihrh3chq7ib9kur h6widiop X-HE-Tag: straw00_0502d4d27251 X-Filterd-Recvd-Size: 7139 Received: from mail-qt1-f202.google.com (mail-qt1-f202.google.com [209.85.160.202]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:35 +0000 (UTC) Received: by mail-qt1-f202.google.com with SMTP id e19so1010018qtq.17 for ; Thu, 22 Oct 2020 06:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=cQVLrwUdxN7VB2XZ42Engk9gK33XrCOfDjGCi6TbRVk=; b=nyVZvbQwJKil209qrPnO1RCGT8S27NaIYZ+peNzRSTQdYpzmUd0ad8fLlhrZa50gj4 gdPyukkf/2bC3V42Nncw/TB2lVLlGPZUIC+cxatTMcyLZabxnDwUt+X/Si61f992QEeq YZQBzLESYkrhPi1KwM0Vgtn48uzxCHcFz9p1euPx9/0q76h5gy/QkRzdVgRfzyhwvDmU 1WxQSmIYXBlzSGw9Tq9CZqbkXLjaJcYB2SLWAUOGTswZt0RId0kVTIk2achigNnTltJr OcpVpY6ya0cbCiVJN/73hIRgW1YHoBYcRZ8MV/y8Dg8Q5N6vzjMI/KWadh5Z+kyvbt+k 7lcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=cQVLrwUdxN7VB2XZ42Engk9gK33XrCOfDjGCi6TbRVk=; b=g7u1f7cYOzHmCsNCmpXbhPOJ4cAFbURvKP7V496PE6e6yTAJtd4efTI4TdjlJJ62b0 grwEZRPmz2a0urnYuCgRbiSojTdTdNkVk0jGJD+54A38xWKylH8f0fyIQB1xdzEXhy8C qK/mDlyztlCPlYDn60xgLT4nzFq3ol22tx6x5kYikc8NWH/5PYUE23IQ0nWlYUM46X8w EU0p2j8yM8YAm/YvOu0tHHhoiS+jVk3ZbSgz5jOKuUUrV74+SE4ddeOQ6SC1mpx8hyKe nBo4vnz5Nd+y6KVncfbIOEvd3FIkYH1OMcDcPMX56vhH9C+0HgPDxXa3p2ORHvjYfbT4 293w== X-Gm-Message-State: AOAM5307zOsu+mRP+P6a2EwjB/rb4sDaVTj9LYurgA5JMDX6niraY4zB eMlFrKgogmp5azlqxyBMhuOqcf1a4sZ7qxMK X-Google-Smtp-Source: ABdhPJxC+cHl3A6vxbAhEsJcstIa/YPUKLBxMm0Gygy5clgGTysFnJWscf3YLAf5go7mTyNLfj4cOUScq3LNKTs9 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:4ba8:: with SMTP id i8mr2332119qvw.59.1603372774241; Thu, 22 Oct 2020 06:19:34 -0700 (PDT) Date: Thu, 22 Oct 2020 15:18:56 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 04/21] kasan: unpoison stack only with CONFIG_KASAN_STACK From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: There's a config option CONFIG_KASAN_STACK that has to be enabled for KASAN to use stack instrumentation and perform validity checks for stack variables. There's no need to unpoison stack when CONFIG_KASAN_STACK is not enabled. Only call kasan_unpoison_task_stack[_below]() when CONFIG_KASAN_STACK is enabled. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/If8a891e9fe01ea543e00b576852685afec0887e3 --- arch/arm64/kernel/sleep.S | 2 +- arch/x86/kernel/acpi/wakeup_64.S | 2 +- include/linux/kasan.h | 10 ++++++---- mm/kasan/common.c | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S index ba40d57757d6..bdadfa56b40e 100644 --- a/arch/arm64/kernel/sleep.S +++ b/arch/arm64/kernel/sleep.S @@ -133,7 +133,7 @@ SYM_FUNC_START(_cpu_resume) */ bl cpu_do_resume -#ifdef CONFIG_KASAN +#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK mov x0, sp bl kasan_unpoison_task_stack_below #endif diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S index c8daa92f38dc..5d3a0b8fd379 100644 --- a/arch/x86/kernel/acpi/wakeup_64.S +++ b/arch/x86/kernel/acpi/wakeup_64.S @@ -112,7 +112,7 @@ SYM_FUNC_START(do_suspend_lowlevel) movq pt_regs_r14(%rax), %r14 movq pt_regs_r15(%rax), %r15 -#ifdef CONFIG_KASAN +#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK /* * The suspend path may have poisoned some areas deeper in the stack, * which we now need to unpoison. diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 3f3f541e5d5f..7be9fb9146ac 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -68,8 +68,6 @@ static inline void kasan_disable_current(void) {} void kasan_unpoison_memory(const void *address, size_t size); -void kasan_unpoison_task_stack(struct task_struct *task); - void kasan_alloc_pages(struct page *page, unsigned int order); void kasan_free_pages(struct page *page, unsigned int order); @@ -114,8 +112,6 @@ void kasan_restore_multi_shot(bool enabled); static inline void kasan_unpoison_memory(const void *address, size_t size) {} -static inline void kasan_unpoison_task_stack(struct task_struct *task) {} - static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} static inline void kasan_free_pages(struct page *page, unsigned int order) {} @@ -167,6 +163,12 @@ static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } #endif /* CONFIG_KASAN */ +#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK +void kasan_unpoison_task_stack(struct task_struct *task); +#else +static inline void kasan_unpoison_task_stack(struct task_struct *task) {} +#endif + #ifdef CONFIG_KASAN_GENERIC void kasan_cache_shrink(struct kmem_cache *cache); diff --git a/mm/kasan/common.c b/mm/kasan/common.c index a880e5a547ed..a3e67d49b893 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -58,6 +58,7 @@ void kasan_disable_current(void) } #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ +#if CONFIG_KASAN_STACK static void __kasan_unpoison_stack(struct task_struct *task, const void *sp) { void *base = task_stack_page(task); @@ -84,6 +85,7 @@ asmlinkage void kasan_unpoison_task_stack_below(const void *watermark) kasan_unpoison_memory(base, watermark - base); } +#endif /* CONFIG_KASAN_STACK */ void kasan_alloc_pages(struct page *page, unsigned int order) { From patchwork Thu Oct 22 13:18:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851337 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0AAA614B4 for ; Thu, 22 Oct 2020 13:19:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id ACB20221FE for ; Thu, 22 Oct 2020 13:19:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="FFBTC951" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ACB20221FE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 07D5C6B008C; Thu, 22 Oct 2020 09:19:46 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EB0C86B0089; Thu, 22 Oct 2020 09:19:45 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D4A416B008A; Thu, 22 Oct 2020 09:19:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0026.hostedemail.com [216.40.44.26]) by kanga.kvack.org (Postfix) with ESMTP id A49186B0087 for ; Thu, 22 Oct 2020 09:19:45 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 486BF3625 for ; Thu, 22 Oct 2020 13:19:45 +0000 (UTC) X-FDA: 77399618730.10.coal65_40128ab27251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id 7676316A4B8 for ; Thu, 22 Oct 2020 13:19:40 +0000 (UTC) X-Spam-Summary: 1,0,0,374eab619d051d32,d41d8cd98f00b204,36iarxwokcd8boesfzlowmhpphmf.dpnmjovy-nnlwbdl.psh@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1534:1540:1593:1594:1711:1714:1730:1747:1777:1792:1981:2194:2199:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3351:3865:3867:3868:3871:3872:3873:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4425:5007:6120:6261:6653:6742:7901:9025:9969:10004:10400:11026:11473:11658:11914:12043:12048:12296:12297:12438:12555:12679:12895:13069:13311:13357:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21627:21740:21939:30054:30070,0,RBL:209.85.128.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yr8xxxec644up8dwdget4tytk5eycpjyujoegwise66mss5acrojnyho9cwyd.m8psbzcmmtt9xa8z9a4qhtcgtmqcuctsbamwn4zq8pxtqe336snkb8jrh1ye9g8. q-lbl8.m X-HE-Tag: coal65_40128ab27251 X-Filterd-Recvd-Size: 4418 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:38 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id y13so346162wmj.7 for ; Thu, 22 Oct 2020 06:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=hz6KTz5FwSVcKdBcrWKk1T0dlNcGWPgygtgKcp7KEb8=; b=FFBTC951UmrhzpM9y+uLT8ZyOJj5GaA4k7AAgHlI5bzWx5afJoz6OzMm5XOyKBSXEM 33gEVoauyorNsYP0Q+ECaBpvPq/DZsJ5GgUIr7AP8JaxkCXd6/ck44zNbrnvejRmGtPt EHfugNeWva1kLDKx2Qx1nxAVs6bGYzf2jmT6eIkENmOIa53fxT0rEq/NEicFsH/oNwGr kyZxIJNVaHioOKRiM7oaMAGLtWsmEWjRiP1xlZvhqFVIvyiM18wlBZsZyxxnH1h+QpZD MTSh30CAWNtQXA81JdLugm9ci6jQbTia/3CdNk9dj5LNdLvS1N9838gPFioY0FC54Psv Ekjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=hz6KTz5FwSVcKdBcrWKk1T0dlNcGWPgygtgKcp7KEb8=; b=Xa2zNvCwxwjK4zc07AnmbqZAUAyAQ9v41c66sNojghLEzupZ4MclnF2GGRYx1j9yNP Cdr+mRxeOw3Ea3/tuIkbL0aiZjPwPn7UI7hKsbvqsZDSfQJr0CUVElKHAarbbmHiQp9L 86JczWA91udsWdYPTmkvp6V8LpMazY8ULtVHn5bgkXb794x1WCeVmu5nJfQYDWWSLA5H CFtXIAmYrtscfIXDrAwZnVrGXBzHpisu1xHUgkyn1paZg+U9cFwt7YKO80kWhZIeNSiH C0yRIozeffPeF83qg0SiPJjCKpS92rTr68MMZi6KMvl90ElkKumHAh3QCG0JXXsngUR3 jsFA== X-Gm-Message-State: AOAM530l4x6yKLoYwXIGwGnKRE+Jlpkl0fn3p29nZJEuh/rqEWe0K4K9 Z9pKssmvh7ABpFSbHj8MqHOn0ePRVhPlzLLd X-Google-Smtp-Source: ABdhPJx5O4kSUaBGwRtLvKusVioF7tY95svs/rFufga7Cd+WWBIpFFtwb4jM57egcfFrxBGA7vCl5k+pvkZDaTLZ X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6000:108:: with SMTP id o8mr2676067wrx.256.1603372776882; Thu, 22 Oct 2020 06:19:36 -0700 (PDT) Date: Thu, 22 Oct 2020 15:18:57 +0200 In-Reply-To: Message-Id: <1049f02fb4132390a6a314eb21dccfe5500e69d6.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 05/21] kasan: allow VMAP_STACK for HW_TAGS mode From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Even though hardware tag-based mode currently doesn't support checking vmalloc allocations, it doesn't use shadow memory and works with VMAP_STACK as is. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I3552cbc12321dec82cd7372676e9372a2eb452ac --- arch/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/Kconfig b/arch/Kconfig index af14a567b493..3caf7bcdcf93 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -868,7 +868,7 @@ config VMAP_STACK default y bool "Use a virtually-mapped stack" depends on HAVE_ARCH_VMAP_STACK - depends on !KASAN || KASAN_VMALLOC + depends on !(KASAN_GENERIC || KASAN_SW_TAGS) || KASAN_VMALLOC help Enable this if you want the use virtually-mapped kernel stacks with guard pages. This causes kernel stack overflows to be From patchwork Thu Oct 22 13:18:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851333 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 31F9F61C for ; Thu, 22 Oct 2020 13:19:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D76E724182 for ; Thu, 22 Oct 2020 13:19:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Jl7LpW95" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D76E724182 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5F7256B0081; Thu, 22 Oct 2020 09:19:42 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5A9996B0082; Thu, 22 Oct 2020 09:19:42 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 422456B0083; Thu, 22 Oct 2020 09:19:42 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id 0FAA46B0081 for ; Thu, 22 Oct 2020 09:19:42 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id A7D301EF3 for ; Thu, 22 Oct 2020 13:19:41 +0000 (UTC) X-FDA: 77399618562.08.table33_470cff127251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 817961819E76F for ; Thu, 22 Oct 2020 13:19:41 +0000 (UTC) X-Spam-Summary: 1,0,0,45c83c2cde13c6e7,d41d8cd98f00b204,364arxwokceierhvi2orzpksskpi.gsqpmry1-qqozego.svk@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3352:3867:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4425:5007:6120:6261:6642:6653:6742:7901:9025:9969:10004:10400:11026:11473:11658:11914:12043:12048:12297:12438:12555:12679:12895:12986:13069:13311:13357:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21627:21939:30054,0,RBL:209.85.221.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yf1aa8o7pfwcswft1ijppd3hafyycgmtgefenrm1s7za1yareouw8pfoo6363.t8mgz4owyjhus94gqszbcwosac3ow1gs6izc98icx7w4bwphp7d1t3jk1nwxnkc.1-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesia n:0.5,0. X-HE-Tag: table33_470cff127251 X-Filterd-Recvd-Size: 4916 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf34.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:40 +0000 (UTC) Received: by mail-wr1-f73.google.com with SMTP id j15so614100wrd.16 for ; Thu, 22 Oct 2020 06:19:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=zMvzayRKcZjOHIZsW9PV/RuW73K9oxGh1X5zaP2bEOg=; b=Jl7LpW955l/dwj9TojILe9Xb+TqqDX/Xo2Z/09O4WWqaxkbtLts1gm1bh/P5/lU/R4 /ycVct2F2bwDjYPI+eyvKUKV+LEV3NlyfJzuTxqZuRg8CW2mEZqiN+ThOhaggbGMHmO/ sQJib58QVON48b/5W4KD1EI6ix/er4/oUXHUGbxu4uHV9VaDmgAiS5oCsen24e2vLtjB wQwvKboWNK27s1haqBmsswhp7Ve+OrOUAsUGRXyKvH4nqQ9/zui7lslB38o8dYqjHUg8 rqnoSAKjre5bfzDPuq+b8RQelN16LiZyNKuHA3FSOoXz8aIsol9skZjbmx46l1Qd0EfU abQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=zMvzayRKcZjOHIZsW9PV/RuW73K9oxGh1X5zaP2bEOg=; b=NInA2AYCPmFMGjt87zQusyTdQBNsvdD71tn/qlEc28Ip2wvaieywV0R/ySeW+2wgJV y8qHA7u5ghfPnImPSvW517eEgG53Xto1gUGnQYBw1a+D6R89APzhu8Nsq9kHOmoDKaiu CL2fGNnOCvspCD8aPnGEA4n8jqvDlTU3/LeeSu4EUfXpHUW2lCz1KFDzkP9RITuDrGmI xzON5kZkbGGbik0n2hR77gwwVhOEK0A2HWpjWticOALYuI7zI5ZCMwmTnCkhZBiRi7R4 x/uh2T0TzzeCiV35QloEF9U+5LejZ2Q4JsuQZ1ZE90sS08Hwl+hRwkkkcEb/m0uINra2 zBnA== X-Gm-Message-State: AOAM532ebHHsNCkcKFrdRtGm6EsaLHUcOaAgZFlmf33rCu0/TZYHO2I+ yolcE8kxe5e005HsI7WAWvQjECfITo06qCc9 X-Google-Smtp-Source: ABdhPJy1zF0M4ifiMercLiyrFr+TTZ2TNMz/uq3oy1C9MnNbR57Fur3hTUw7Pnk/ecaOdgtH3sUdKnL7XFwrPF8M X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a7b:c7c9:: with SMTP id z9mr2640989wmk.91.1603372779361; Thu, 22 Oct 2020 06:19:39 -0700 (PDT) Date: Thu, 22 Oct 2020 15:18:58 +0200 In-Reply-To: Message-Id: <155123c77b1a068089421022c4c5b1ccb75defd8.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 06/21] kasan: mark kasan_init_tags as __init From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Similarly to kasan_init() mark kasan_init_tags() as __init. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I8792e22f1ca5a703c5e979969147968a99312558 Reviewed-by: Dmitry Vyukov --- include/linux/kasan.h | 2 +- mm/kasan/hw_tags.c | 2 +- mm/kasan/sw_tags.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 7be9fb9146ac..93d9834b7122 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -185,7 +185,7 @@ static inline void kasan_record_aux_stack(void *ptr) {} #if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) -void kasan_init_tags(void); +void __init kasan_init_tags(void); void *kasan_reset_tag(const void *addr); diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 2a38885014e3..0128062320d5 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -15,7 +15,7 @@ #include "kasan.h" -void kasan_init_tags(void) +void __init kasan_init_tags(void) { init_tags(KASAN_TAG_MAX); } diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index c10863a45775..bf1422282bb5 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -35,7 +35,7 @@ static DEFINE_PER_CPU(u32, prng_state); -void kasan_init_tags(void) +void __init kasan_init_tags(void) { int cpu; From patchwork Thu Oct 22 13:18:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851335 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC7CF61C for ; Thu, 22 Oct 2020 13:19:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5A44624178 for ; Thu, 22 Oct 2020 13:19:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="A/DzVj6N" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A44624178 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 4E49A6B0083; Thu, 22 Oct 2020 09:19:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 46D866B0085; Thu, 22 Oct 2020 09:19:44 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 35B996B0087; Thu, 22 Oct 2020 09:19:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0114.hostedemail.com [216.40.44.114]) by kanga.kvack.org (Postfix) with ESMTP id 046686B0083 for ; Thu, 22 Oct 2020 09:19:43 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 99B5F80353DB for ; Thu, 22 Oct 2020 13:19:43 +0000 (UTC) X-FDA: 77399618646.30.foot02_1a15ab527251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 4ED21180B3C8B for ; Thu, 22 Oct 2020 13:19:43 +0000 (UTC) X-Spam-Summary: 1,0,0,afb7e17d3f27844d,d41d8cd98f00b204,37yarxwokceqgtjxk4qt1rmuumrk.iusrot03-ssq1giq.uxm@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1542:1593:1594:1711:1730:1747:1777:1792:1981:2194:2199:2393:2525:2559:2563:2682:2685:2859:2902:2904:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3353:3865:3866:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4117:4250:4321:4425:4605:5007:6119:6120:6261:6653:6742:7514:7901:8957:9025:9592:9969:10004:10400:11026:11473:11658:11914:12043:12048:12296:12297:12438:12555:12679:12895:12986:13095:14181:14394:14659:14721:21080:21212:21365:21433:21444:21451:21627:21660:21939:30012:30054,0,RBL:209.85.222.202:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yfp4goc4e5rh4y3zuspmj8a9ydpopexap993bxrqnktpbnk6734dxjfcrp76k.7ik3fw1h4gb35p1bbihx9y4fn3jic4531znpsq7oadf5q5sep 4c511yak X-HE-Tag: foot02_1a15ab527251 X-Filterd-Recvd-Size: 6156 Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:42 +0000 (UTC) Received: by mail-qk1-f202.google.com with SMTP id j20so462008qkl.7 for ; Thu, 22 Oct 2020 06:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=S3zpKFgl6lOQ4xschlXI9IBqFZJcfplQNQgfAvCSd9c=; b=A/DzVj6NJxiFJ1FGJ6LmU2ByOvdQoNTbI0xyZCf/l69mGnF7H5keOh0cFSh6PSKDDW UHgRUgb4ay+Bz2HtzVeITURs24/VAJzkUUMrbBSiRqCemaRmiituhtSDAnGPjpzUAV7G Ei3KV9+HsVFPHC28hTUw4gJGHTaodYigbcSOTvK2AWvQufR2FcbEhGoUMuKdYfzt1MPd 8nIHmu9UMA1TypVVK3IeFONWs9DUwaoRRERr7So3y4edr6JN5LQblz7M5V0PmuvctKPC UoVTtgZE67tor/jqK0uHNZ6etDCPZk14fm7juz+4hjSvuI0gvPWbT+aULiOTmcNYUsdV KJng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=S3zpKFgl6lOQ4xschlXI9IBqFZJcfplQNQgfAvCSd9c=; b=Ky2INwqF6fi8yXSmkcbEnNGSIH69mxrWnVyguawQRroUMfVI+r2Ke/8Nc8atD3r+4P upG8FQ61Agl+1oagSTHtz68hEmRGoSNvSvIdhKg20wW4xk7+EbPZfrmPG1hkOA2ms2fY azznz1R5ByWeon3bI42JiNkwSMkGZrIy+UbgcotGosqZR1Kb5bMmSiwP1zfqjo1mt8Mg /hBfw293ZNBWzXSZhTqnGjWbJcp2PPdMdMvpmF5L0Bty93dGiq5iw63ZShz9fUWqSNTJ AoIp2YuOHP9m2KhOrP8KgM0vgBKQ5rZ5TMzO6RcewdSKsMvcapZccZWoiVVATiIsb0vc F/gg== X-Gm-Message-State: AOAM5309BfoDtBf3tAJi14FG3vIDh/KaysQrHTOPuFX0qy9Qr0kmmFF/ eejGg+/GRUsAS/wenVXDZxoG0TwjoUNQXq1N X-Google-Smtp-Source: ABdhPJye0iIWFtk9uCN4G57gAraBO0b8dguucuYN00Tzqt7FUHcOAlZwClbYPWiparjNpI11i9pTLLg1NFTsf+gO X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:52c6:: with SMTP id p6mr2361291qvs.38.1603372781851; Thu, 22 Oct 2020 06:19:41 -0700 (PDT) Date: Thu, 22 Oct 2020 15:18:59 +0200 In-Reply-To: Message-Id: <1d87f0d5a282d9e8d14d408ac6d63462129f524c.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 07/21] kasan, arm64: move initialization message From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Tag-based KASAN modes are fully initialized with kasan_init_tags(), while the generic mode only requireds kasan_init(). Move the initialization message for tag-based modes into kasan_init_tags(). Also fix pr_fmt() usage for KASAN code: generic mode doesn't need it, tag-based modes should use "kasan:" instead of KBUILD_MODNAME. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Idfd1e50625ffdf42dfc3dbf7455b11bd200a0a49 --- arch/arm64/mm/kasan_init.c | 3 +++ mm/kasan/generic.c | 2 -- mm/kasan/hw_tags.c | 4 ++++ mm/kasan/sw_tags.c | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index b6b9d55bb72e..8f17fa834b62 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -290,5 +290,8 @@ void __init kasan_init(void) { kasan_init_shadow(); kasan_init_depth(); +#if defined(CONFIG_KASAN_GENERIC) + /* CONFIG_KASAN_SW/HW_TAGS also requires kasan_init_tags(). */ pr_info("KernelAddressSanitizer initialized\n"); +#endif } diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index de6b3f03a023..d259e4c3aefd 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -9,8 +9,6 @@ * Andrey Konovalov */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include #include #include diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 0128062320d5..b372421258c8 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -6,6 +6,8 @@ * Author: Andrey Konovalov */ +#define pr_fmt(fmt) "kasan: " fmt + #include #include #include @@ -18,6 +20,8 @@ void __init kasan_init_tags(void) { init_tags(KASAN_TAG_MAX); + + pr_info("KernelAddressSanitizer initialized\n"); } void *kasan_reset_tag(const void *addr) diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index bf1422282bb5..099af6dc8f7e 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -6,7 +6,7 @@ * Author: Andrey Konovalov */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define pr_fmt(fmt) "kasan: " fmt #include #include @@ -41,6 +41,8 @@ void __init kasan_init_tags(void) for_each_possible_cpu(cpu) per_cpu(prng_state, cpu) = (u32)get_cycles(); + + pr_info("KernelAddressSanitizer initialized\n"); } /* From patchwork Thu Oct 22 13:19:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851339 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6EDA014B4 for ; Thu, 22 Oct 2020 13:19:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1E147221FE for ; Thu, 22 Oct 2020 13:19:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="KYdK90La" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E147221FE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 4279E6B0087; Thu, 22 Oct 2020 09:19:46 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 38FB16B008A; Thu, 22 Oct 2020 09:19:46 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 078B46B0087; Thu, 22 Oct 2020 09:19:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0240.hostedemail.com [216.40.44.240]) by kanga.kvack.org (Postfix) with ESMTP id C27916B0088 for ; Thu, 22 Oct 2020 09:19:45 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 66F02362B for ; Thu, 22 Oct 2020 13:19:45 +0000 (UTC) X-FDA: 77399618730.22.seed51_2e06dff27251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id 4B8BE18038E60 for ; Thu, 22 Oct 2020 13:19:45 +0000 (UTC) X-Spam-Summary: 1,0,0,b4f806afa37a15bd,d41d8cd98f00b204,38iarxwokcecjwm0n7tw4upxxpun.lxvurw36-vvt4jlt.x0p@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:967:968:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:1981:2194:2199:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3352:3865:3870:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4425:5007:6120:6261:6653:6742:7875:7901:7903:8603:9025:9592:9969:10004:10400:11026:11473:11658:11914:12043:12048:12114:12296:12297:12438:12555:12679:12895:12986:13069:13161:13229:13311:13357:14096:14097:14181:14394:14659:14721:14877:21080:21365:21444:21451:21627:21939:21990:30054,0,RBL:209.85.222.202:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yfaie45qq3uf9pemywb6zor4u77ypjpamzdfg1o9wkrtxd7i1r11ktk4bzumf.g691bmbs8mfre6z4stfi7wqrxma51xse198 xwnu99c5 X-HE-Tag: seed51_2e06dff27251 X-Filterd-Recvd-Size: 4787 Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:44 +0000 (UTC) Received: by mail-qk1-f202.google.com with SMTP id y8so999213qki.12 for ; Thu, 22 Oct 2020 06:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=9DI5u3KafPzj5V3i+niAdO1uhXW2it0RjumucIpkaOw=; b=KYdK90La20UFPuJ0fER+IgQyEcsxZKP6b9b4wzo9FrNthDqnAFuD/5RyVeAhzGtgFD 1rxDr3Tc3DpMi3VJMulxGYNmOXPyCZ44TXQZaLrnagTdrvXkZGmK0uz5CxJO/kcl5io3 867JSelEDG2IXELgOzI1dAaZAG7MmtKcjNEZw8rVk16HYclXkCIp562h7Clu9cWh/Wg5 5sMDUaz9GmxLB9D5wgH9F8tliUrf553LG/ujqa+Aw8uNtunaPRVtcHU0XXldn0KPABn4 67TodbIEgPzRL7xJwdjXnRZry1RJYdBDnHwRP6RxpKrDAAvx5/BmRHoHIKiIx5Jn7T5Q Z85g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=9DI5u3KafPzj5V3i+niAdO1uhXW2it0RjumucIpkaOw=; b=R3aownqWpCif4MSE6mAivcGWCKdmAfWlstK47PMR2ckIKgytj21NYase2JWPTK4ugH oe2fCAlLNyHfnQhiAmZxfLpUQ+AJ3VGRPOYdMxxiKnZE0btZURF1jHH26euBL0htCNBh noCtN6mxSK193kBegmMedVIw5lp+cKCJj8xx46+eZesAlY9VqjCl2ygiJtLfKpK9okRJ /BET3GMooppcgTE0LnAzWoOvTQHbPYFwLfgqJhgeycOIogNoOL/IdpCzUJcJHilVi6vl MYXcL025NAhPlXa5Mru8NtVEkbt6DqAJ3ojsZDWJMOKf2LszLZj2OwFiuOeDfRdj8psS VQ3g== X-Gm-Message-State: AOAM532asKRGv+PNXr/88NKHDb1H4boOUqV7Xg0tc/eNSJUjeTDk27E7 IP3ANtrugGqQThoegmPUfRHzMnkTeMa1qPI9 X-Google-Smtp-Source: ABdhPJzpu4qsDmsSwhmtsakN67Db1oW3vqlMK/6JoYcULaWh7/ua/BL0cxNVhiDmj+hapXuFvoOwNe42CSDioYtU X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:b5e1:: with SMTP id o33mr516199qvf.17.1603372784151; Thu, 22 Oct 2020 06:19:44 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:00 +0200 In-Reply-To: Message-Id: <84dc684519c5de460c58b85f0351c4f9ab57e897.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 08/21] kasan: remove __kasan_unpoison_stack From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: There's no need for __kasan_unpoison_stack() helper, as it's only currently used in a single place. Removing it also removes undeed arithmetic. No functional changes. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Ie5ba549d445292fe629b4a96735e4034957bcc50 Reviewed-by: Dmitry Vyukov --- mm/kasan/common.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index a3e67d49b893..9008fc6b0810 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -59,18 +59,12 @@ void kasan_disable_current(void) #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ #if CONFIG_KASAN_STACK -static void __kasan_unpoison_stack(struct task_struct *task, const void *sp) -{ - void *base = task_stack_page(task); - size_t size = sp - base; - - kasan_unpoison_memory(base, size); -} - /* Unpoison the entire stack for a task. */ void kasan_unpoison_task_stack(struct task_struct *task) { - __kasan_unpoison_stack(task, task_stack_page(task) + THREAD_SIZE); + void *base = task_stack_page(task); + + kasan_unpoison_memory(base, THREAD_SIZE); } /* Unpoison the stack for the current task beyond a watermark sp value. */ From patchwork Thu Oct 22 13:19:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851341 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F32F461C for ; Thu, 22 Oct 2020 13:19:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 94400222E9 for ; Thu, 22 Oct 2020 13:19:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="FpiS6ya9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94400222E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 691CE6B0089; Thu, 22 Oct 2020 09:19:48 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5F8476B008A; Thu, 22 Oct 2020 09:19:48 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4709D6B0092; Thu, 22 Oct 2020 09:19:48 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0129.hostedemail.com [216.40.44.129]) by kanga.kvack.org (Postfix) with ESMTP id 0EF7D6B0089 for ; Thu, 22 Oct 2020 09:19:48 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 9C029180AD801 for ; Thu, 22 Oct 2020 13:19:47 +0000 (UTC) X-FDA: 77399618814.02.line00_320bf1827251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 79F1C10263C46 for ; Thu, 22 Oct 2020 13:19:47 +0000 (UTC) X-Spam-Summary: 1,0,0,e3852044d933eb1a,d41d8cd98f00b204,38oarxwokceklyo2p9vy6wrzzrwp.nzxwty58-xxv6lnv.z2r@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1542:1593:1594:1711:1730:1747:1777:1792:2380:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3353:3865:3867:3868:3870:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4117:4321:4425:4605:5007:6120:6261:6653:6742:7901:8603:8660:8957:9025:9592:9969:10004:10400:11026:11473:11658:11914:12043:12048:12297:12438:12555:12679:12895:12986:13148:13230:14096:14097:14181:14394:14659:14721:21067:21080:21365:21444:21451:21611:21627:21939:21990:30003:30012:30045:30054,0,RBL:209.85.222.202:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yriwikk9guggcs7yy964jokhpz4ycx7atxyyn8djwdfm1ywnrz1o453pz678k.jrhpr6nbf1xnnzbh7akiu9prdrojoyew1u6 dcyt78ex X-HE-Tag: line00_320bf1827251 X-Filterd-Recvd-Size: 6300 Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:46 +0000 (UTC) Received: by mail-qk1-f202.google.com with SMTP id i2so1022346qkk.0 for ; Thu, 22 Oct 2020 06:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=2LAxUi3Z+b/LyEBabYwH/SVI831szHE0G1gzyusivfA=; b=FpiS6ya9dima3cGFv2ElWjEzGn/AjgIOjjA4nCJucaeUIGickhtOh9Bys9UiRtSADE fjopvPyI20DFOwopcIT5lUJlbZcMF4DbGfWV51sjg9G4uSGmBjo9k71EyAqpVLZlocmc RZuzjb+QS/uWksRQdms/OIEEQtSHAP1YCrtaxsPDUhddEQl/Tm449I9yrgBZ6gyhzmEx Z+YYNrCbQs0F1iFLDro2B5zKIPve2PJYP+8EChCsz8ppySMSulg21A7GMsmWXlwY9ZJl Gw/zTKPaB0G881vyNGTjYBcUivggDHvOEkXXyh1Y3bNv+t+M6vkHWtge1bYsrivUKKLZ UHhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=2LAxUi3Z+b/LyEBabYwH/SVI831szHE0G1gzyusivfA=; b=dgFUMAJi2QxCM6fdCdZ0zCKJnB/uVIFzAR0AfNw7GlSljxcp25FoBtofYMjT6l8bUp 23qhPBhnhRH55DgvuVs9g/EWgSfnepIExQnUPDCrk2qy3Svryo3vW0HDW/YHrfBBPB1P puqy/BINZMT5zKCeRBtB3+x/wZx8y/LANCo4tQhZjg2ZIOM9u6xtkUNYtBTUnUCYqBrp 0jpZYH/R7+6AZhbvgUMmdbIVpQCF8yh23WPKFe4s9II6c5QrWyzBfdXoBLZ3D+AjdMbG jvjLH6ezhwlUTTKHZyd14lh/Vj/KHW4MB4q0aVI5nwzD/GWl1tg50J+YLUv4UjdVR7sR wmIA== X-Gm-Message-State: AOAM531FBoCgz9IoSw84FJFvm2uOPanel9DQOHIOaGwExBvVWEUoodTL d3hpfNBNlgeeOc/V8NkfUXYavgjPoMPiOFv7 X-Google-Smtp-Source: ABdhPJxIP3IGzvps/ztZVCxylxxW3pDrg7OAYIS67bKz5QYods1FZnmEDxL5RuFvtWUriGc+3ulAxeTDdpoAifDt X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:45ed:: with SMTP id q13mr2255535qvu.55.1603372786206; Thu, 22 Oct 2020 06:19:46 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:01 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 09/21] kasan: inline kasan_reset_tag for tag-based modes From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Using kasan_reset_tag() currently results in a function call. As it's called quite often from the allocator code this leads to a noticeable slowdown. Move it to include/linux/kasan.h and turn it into a static inline function. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I4d2061acfe91d480a75df00b07c22d8494ef14b5 --- include/linux/kasan.h | 5 ++++- mm/kasan/hw_tags.c | 5 ----- mm/kasan/kasan.h | 6 ++---- mm/kasan/sw_tags.c | 5 ----- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 93d9834b7122..6377d7d3a951 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -187,7 +187,10 @@ static inline void kasan_record_aux_stack(void *ptr) {} void __init kasan_init_tags(void); -void *kasan_reset_tag(const void *addr); +static inline void *kasan_reset_tag(const void *addr) +{ + return (void *)arch_kasan_reset_tag(addr); +} bool kasan_report(unsigned long addr, size_t size, bool is_write, unsigned long ip); diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index b372421258c8..c3a0e83b5e7a 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -24,11 +24,6 @@ void __init kasan_init_tags(void) pr_info("KernelAddressSanitizer initialized\n"); } -void *kasan_reset_tag(const void *addr) -{ - return reset_tag(addr); -} - void kasan_poison_memory(const void *address, size_t size, u8 value) { set_mem_tag_range(reset_tag(address), diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 456b264e5124..0ccbb3c4c519 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -246,15 +246,13 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) return addr; } #endif -#ifndef arch_kasan_reset_tag -#define arch_kasan_reset_tag(addr) ((void *)(addr)) -#endif #ifndef arch_kasan_get_tag #define arch_kasan_get_tag(addr) 0 #endif +/* kasan_reset_tag() defined in include/linux/kasan.h. */ +#define reset_tag(addr) ((void *)kasan_reset_tag(addr)) #define set_tag(addr, tag) ((void *)arch_kasan_set_tag((addr), (tag))) -#define reset_tag(addr) ((void *)arch_kasan_reset_tag(addr)) #define get_tag(addr) arch_kasan_get_tag(addr) #ifndef arch_init_tags diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index 099af6dc8f7e..4db41f274702 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -67,11 +67,6 @@ u8 random_tag(void) return (u8)(state % (KASAN_TAG_MAX + 1)); } -void *kasan_reset_tag(const void *addr) -{ - return reset_tag(addr); -} - bool check_memory_region(unsigned long addr, size_t size, bool write, unsigned long ret_ip) { From patchwork Thu Oct 22 13:19:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851343 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 929F261C for ; Thu, 22 Oct 2020 13:19:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4214E222E9 for ; Thu, 22 Oct 2020 13:19:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="DNq7BoOI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4214E222E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 83E816B0092; Thu, 22 Oct 2020 09:19:50 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7C7286B0093; Thu, 22 Oct 2020 09:19:50 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 691866B0095; Thu, 22 Oct 2020 09:19:50 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0112.hostedemail.com [216.40.44.112]) by kanga.kvack.org (Postfix) with ESMTP id 31F556B0092 for ; Thu, 22 Oct 2020 09:19:50 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id CDEE1181AEF07 for ; Thu, 22 Oct 2020 13:19:49 +0000 (UTC) X-FDA: 77399618898.13.bomb24_131436627251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id ABEA118140B67 for ; Thu, 22 Oct 2020 13:19:49 +0000 (UTC) X-Spam-Summary: 1,0,0,e926f7f03b0cacee,d41d8cd98f00b204,39iarxwokcesn0q4rbx08yt11tyr.p1zyv07a-zzx8npx.14t@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:69:152:355:379:541:800:960:966:967:968:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1542:1593:1594:1711:1730:1747:1777:1792:1981:2194:2196:2199:2200:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3353:3867:3868:3870:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4117:4321:4385:4425:5007:6120:6261:6653:6742:7901:8603:8660:9025:9592:9969:10004:10400:11026:11473:11658:11914:12043:12048:12291:12296:12297:12438:12555:12679:12683:12895:12986:13148:13230:14096:14097:14181:14394:14659:14721:21080:21324:21365:21444:21451:21627:21939:21990:30003:30012:30054,0,RBL:209.85.219.74:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yrawui6eobmdiq5cuk5ijpd8wbqocjq9qzbgi39jxwb8p818w9rzodsao96q3.faswu1qgq zgqk3on8 X-HE-Tag: bomb24_131436627251 X-Filterd-Recvd-Size: 6259 Received: from mail-qv1-f74.google.com (mail-qv1-f74.google.com [209.85.219.74]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:49 +0000 (UTC) Received: by mail-qv1-f74.google.com with SMTP id ec4so982495qvb.21 for ; Thu, 22 Oct 2020 06:19:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=ttDbGg8ckV2PZque6BU+M0wdmEgRXMhDQET60HhqsRw=; b=DNq7BoOIMFRWZI331hPIuN8vmCPTnZnXF+XeIjG3w9Hk2atPyCaUpdrcWQFtLMEsK6 LNS+gBQZSNMj+AQNcPlzCyjpQD+9cvI78lR3QVEDsT5li5S1WII6cVWu5VIIQkUnwM4e +bQIJ4VljeoRS67xneeuZbD+h9ZhKdXuyYyYcBr8991D5MhajraRH9cLTqIYWls1s/Kv 1rWH3LASWY26b9h93KZAno8D5Spvwl5ggv8QS0bjaP3ThZhgnUW9192aLQdwG4/DjTjJ w0gzTW48I1nyPkSPnDsSs55Y8p2ekSNdOpn+V1L+KMK2eeF1JEdYr18irubGQFKoUNLs p0oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ttDbGg8ckV2PZque6BU+M0wdmEgRXMhDQET60HhqsRw=; b=luZ4sxvcdaBR3Z6aVPKKd2JlFnmTb4a/Cw6KvufIWQcJCIy3ZMF2St4/JOfoANbXhj KbxVzE+DcuRGPP2Ip3Yd4yPTWwIjZZVkn5YwWSKLFjT2jjQjbDaXRE9agPMYDlgOeK1S R8+GAmSBydqDjwxu2adESX4M5UYrs9k7zCjvQiRS0ZHbfeLukAaE6J+FEvzTlfgj2k7G k/QW99FcVaIQL5r9Vrk0RY4PAT4mjpTu3CjKICbbHsnOPaD74S8SCPIVLbGKHZCFxzWK 5EIvtJTinYC1a4xAbaB3xVJpxh+cbXexsznFDfq8s/GyaK3qkSv7ULm2kQQoEZ+AVCtB bYIQ== X-Gm-Message-State: AOAM531bCaqcv1T/oyWX7MnjYFiACSaslPf33/GcGafh2PQmShB00Qmc oDgWQrjcpMFmFk9HmolTDUU9xXfroAsrNdjV X-Google-Smtp-Source: ABdhPJwJNOlcCNokD229g2j6kSc2H2jEf2rPOcfKu2ebxDvvoQ75tqz88rP7WbdvohZY0+9l7Lmu+TJ0jcXmoqbT X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:4d46:: with SMTP id m6mr2314403qvm.60.1603372788362; Thu, 22 Oct 2020 06:19:48 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:02 +0200 In-Reply-To: Message-Id: <56b19be34ee958103481bdfc501978556a168b42.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 10/21] kasan: inline random_tag for HW_TAGS From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Using random_tag() currently results in a function call. Move its definition to mm/kasan/kasan.h and turn it into a static inline function for hardware tag-based mode to avoid uneeded function call. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Iac5b2faf9a912900e16cca6834d621f5d4abf427 --- mm/kasan/hw_tags.c | 5 ----- mm/kasan/kasan.h | 37 ++++++++++++++++++++----------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index c3a0e83b5e7a..4c24bfcfeff9 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -36,11 +36,6 @@ void kasan_unpoison_memory(const void *address, size_t size) round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); } -u8 random_tag(void) -{ - return get_random_tag(); -} - bool check_invalid_free(void *addr) { u8 ptr_tag = get_tag(addr); diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 0ccbb3c4c519..94ba15c2f860 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -188,6 +188,12 @@ static inline bool addr_has_metadata(const void *addr) #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ +#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) +void print_tags(u8 addr_tag, const void *addr); +#else +static inline void print_tags(u8 addr_tag, const void *addr) { } +#endif + bool check_invalid_free(void *addr); void *find_first_bad_addr(void *addr, size_t size); @@ -223,23 +229,6 @@ static inline void quarantine_reduce(void) { } static inline void quarantine_remove_cache(struct kmem_cache *cache) { } #endif -#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) - -void print_tags(u8 addr_tag, const void *addr); - -u8 random_tag(void); - -#else - -static inline void print_tags(u8 addr_tag, const void *addr) { } - -static inline u8 random_tag(void) -{ - return 0; -} - -#endif - #ifndef arch_kasan_set_tag static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) { @@ -273,6 +262,20 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) #define get_mem_tag(addr) arch_get_mem_tag(addr) #define set_mem_tag_range(addr, size, tag) arch_set_mem_tag_range((addr), (size), (tag)) +#ifdef CONFIG_KASAN_SW_TAGS +u8 random_tag(void); +#elif defined(CONFIG_KASAN_HW_TAGS) +static inline u8 random_tag(void) +{ + return get_random_tag(); +} +#else +static inline u8 random_tag(void) +{ + return 0; +} +#endif + /* * Exported functions for interfaces called from assembly or from generated * code. Declarations here to avoid warning about missing declarations. From patchwork Thu Oct 22 13:19:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851345 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 202F561C for ; Thu, 22 Oct 2020 13:19:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C4C1F221FE for ; Thu, 22 Oct 2020 13:19:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="g6JwnRNL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4C1F221FE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3D0776B0095; Thu, 22 Oct 2020 09:19:53 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 386926B0096; Thu, 22 Oct 2020 09:19:53 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 18AFA6B0098; Thu, 22 Oct 2020 09:19:53 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0144.hostedemail.com [216.40.44.144]) by kanga.kvack.org (Postfix) with ESMTP id D7B1E6B0095 for ; Thu, 22 Oct 2020 09:19:52 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 7CE088A218BF for ; Thu, 22 Oct 2020 13:19:52 +0000 (UTC) X-FDA: 77399619024.11.tent40_4d10ed527251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 5C6ED180F8B81 for ; Thu, 22 Oct 2020 13:19:52 +0000 (UTC) X-Spam-Summary: 1,0,0,897e895a93bab19b,d41d8cd98f00b204,39oarxwokce0p2s6tdz2a0v33v0t.r310x29c-11zaprz.36v@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:69:152:355:379:541:800:960:965:966:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1543:1593:1594:1711:1730:1747:1777:1792:1981:2194:2196:2199:2200:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3354:3867:3868:3870:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4117:4321:4385:4390:4395:4425:5007:6120:6261:6653:6742:7901:8603:8957:9025:9592:9969:10004:10400:11026:11473:11658:11914:12043:12048:12291:12296:12297:12438:12555:12679:12895:14096:14097:14181:14394:14659:14721:21080:21324:21365:21444:21451:21627:21939:21990:30003:30012:30054:30075,0,RBL:209.85.218.74:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yfap8f67gdbee76izsfpy1isbcnochqkkj59zcdwohity1ggxgzbkf57h3b3i.sgskoiu6notim9imoabxr4 xttzhaka X-HE-Tag: tent40_4d10ed527251 X-Filterd-Recvd-Size: 6803 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.74]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:51 +0000 (UTC) Received: by mail-ej1-f74.google.com with SMTP id x12so638268eju.22 for ; Thu, 22 Oct 2020 06:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=ZDpLws4WWjszeBZt7nTlIzp0p338D/8ILsPCgH/ymC0=; b=g6JwnRNLjkaRFkpFVHgLjZOQIQP4rh4rnIwcyms2N78ZDOmBQSYZP56ZAmgxHWUXcm IUxQSQ2WjpTQOfUa8ywDBIZo1cjnWs8RIdmAIYR9BmY3f8dJANNQmkqPsknBrdP0mTKd 7pCLzIjmPAiHrKFfW7/HdqypIdOXRxYiU0A/P2X0gH4z/L+QRN+nb/l+nlJ8Ry9HIATi yOztfvRbuWiGoiuYr/982JFzJxS8rVLWNALBOnthgIh/rCbjPQo4UQOn0uk+zjVYB9Qu tUcKGvDXUfdIG3nRrZ6DpILb3BTK4YSl1/12TJvrVWROGFqZHPvDO3fClAxHO5QiQ5ok hAYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ZDpLws4WWjszeBZt7nTlIzp0p338D/8ILsPCgH/ymC0=; b=ObE+ztnoy+7kQPKO6IWSomz53nBHy6ZWntEeeQtz611Y5M9jFSDt5TM5StR28EZHfM STXXBAopZIT8KvCcBZqOuQ5vG7dk7WN8vG5k5KVFd5h8LLLzj1kTlp33VXMm4vAVKzCF r6S/C8xpTSi2XRXBpKZhZA4DIg3tJd4aJ8E7BFeM9rBy1O24T4R4vRcRB4ADOQ0YeX0g iQLplWwShiXESLpBtO1ciFV3CBp/UaslYRLvv8hj4RJPSAnKDKoYN6bDJpk2lbbTqBG4 YBz7FAVuwkdR/kHUszftHTZdlGNzkjPckxQNCJcf3Mb13Uadi4k85FZL4G0FCRUVUbvH 2/UA== X-Gm-Message-State: AOAM5338Mbc/vJwdobgea7vGK8Jsc+2oOZNoG2YctqrVoymnPwvqiO1i qncPs53QWRFxyh2ORt3lxaO77G9vP4nJ2h2y X-Google-Smtp-Source: ABdhPJxu3Fj1qguz52Emo3v2IYFJxBR6Ao7egY4U/BdH3m+sfImkhBYYfIlca1OIixc7Du21Hd+WcdpgheaEGhNu X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a50:fb06:: with SMTP id d6mr2197662edq.312.1603372790776; Thu, 22 Oct 2020 06:19:50 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:03 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 11/21] kasan: inline kasan_poison_memory and check_invalid_free From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Using kasan_poison_memory() or check_invalid_free() currently results in function calls. Move their definitions to mm/kasan/kasan.h and turn them into static inline functions for hardware tag-based mode to avoid uneeded function calls. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Ia9d8191024a12d1374675b3d27197f10193f50bb Reviewed-by: Dmitry Vyukov --- mm/kasan/hw_tags.c | 15 --------------- mm/kasan/kasan.h | 28 ++++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 4c24bfcfeff9..f03161f3da19 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -24,27 +24,12 @@ void __init kasan_init_tags(void) pr_info("KernelAddressSanitizer initialized\n"); } -void kasan_poison_memory(const void *address, size_t size, u8 value) -{ - set_mem_tag_range(reset_tag(address), - round_up(size, KASAN_GRANULE_SIZE), value); -} - void kasan_unpoison_memory(const void *address, size_t size) { set_mem_tag_range(reset_tag(address), round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); } -bool check_invalid_free(void *addr) -{ - u8 ptr_tag = get_tag(addr); - u8 mem_tag = get_mem_tag(addr); - - return (mem_tag == KASAN_TAG_INVALID) || - (ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag); -} - void kasan_set_free_info(struct kmem_cache *cache, void *object, u8 tag) { diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 94ba15c2f860..8d84ae6f58f1 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -153,8 +153,6 @@ struct kasan_alloc_meta *kasan_get_alloc_meta(struct kmem_cache *cache, struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, const void *object); -void kasan_poison_memory(const void *address, size_t size, u8 value); - #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) static inline const void *kasan_shadow_to_mem(const void *shadow_addr) @@ -194,8 +192,6 @@ void print_tags(u8 addr_tag, const void *addr); static inline void print_tags(u8 addr_tag, const void *addr) { } #endif -bool check_invalid_free(void *addr); - void *find_first_bad_addr(void *addr, size_t size); const char *get_bug_type(struct kasan_access_info *info); void metadata_fetch_row(char *buffer, void *row); @@ -276,6 +272,30 @@ static inline u8 random_tag(void) } #endif +#ifdef CONFIG_KASAN_HW_TAGS + +static inline void kasan_poison_memory(const void *address, size_t size, u8 value) +{ + set_mem_tag_range(reset_tag(address), + round_up(size, KASAN_GRANULE_SIZE), value); +} + +static inline bool check_invalid_free(void *addr) +{ + u8 ptr_tag = get_tag(addr); + u8 mem_tag = get_mem_tag(addr); + + return (mem_tag == KASAN_TAG_INVALID) || + (ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag); +} + +#else /* CONFIG_KASAN_HW_TAGS */ + +void kasan_poison_memory(const void *address, size_t size, u8 value); +bool check_invalid_free(void *addr); + +#endif /* CONFIG_KASAN_HW_TAGS */ + /* * Exported functions for interfaces called from assembly or from generated * code. Declarations here to avoid warning about missing declarations. From patchwork Thu Oct 22 13:19:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851347 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC44914B4 for ; Thu, 22 Oct 2020 13:20:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 90C9D222E9 for ; Thu, 22 Oct 2020 13:20:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="JUPSUQCu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90C9D222E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 076BD6B0098; Thu, 22 Oct 2020 09:19:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 029D56B0099; Thu, 22 Oct 2020 09:19:56 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DBB676B009A; Thu, 22 Oct 2020 09:19:56 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0032.hostedemail.com [216.40.44.32]) by kanga.kvack.org (Postfix) with ESMTP id AD8856B0098 for ; Thu, 22 Oct 2020 09:19:56 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 523638995502 for ; Thu, 22 Oct 2020 13:19:56 +0000 (UTC) X-FDA: 77399619192.15.scene82_091635227251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id B36861814B0D4 for ; Thu, 22 Oct 2020 13:19:55 +0000 (UTC) X-Spam-Summary: 1,0,0,eab99c9e711b40ea,d41d8cd98f00b204,3-yarxwokcfas5v9wg25d3y66y3w.u64305cf-442dsu2.69y@flex--andreyknvl.bounces.google.com,,RULES_HIT:2:41:69:152:355:379:541:800:960:966:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1593:1594:1605:1730:1747:1777:1792:2196:2198:2199:2200:2393:2525:2559:2563:2682:2685:2731:2859:2898:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3865:3866:3867:3868:3870:3871:3872:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4049:4120:4321:4385:4425:4605:5007:6120:6261:6653:6742:7901:8603:8660:8957:9025:9592:9969:10004:11026:11473:11658:11914:12043:12048:12114:12296:12297:12438:12555:12679:12895:12986:13148:13161:13229:13230:14096:14097:14394:14659:14877:21080:21365:21444:21451:21627:21939:21990:30003:30034:30054:30070,0,RBL:209.85.208.201:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.84.100 66.100.201.100;04yrqpubwyccwznsjn8qx7j3zs7p9ocbqre37c7s63c6rzh4f yk17mmer X-HE-Tag: scene82_091635227251 X-Filterd-Recvd-Size: 9756 Received: from mail-lj1-f201.google.com (mail-lj1-f201.google.com [209.85.208.201]) by imf07.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:55 +0000 (UTC) Received: by mail-lj1-f201.google.com with SMTP id 14so699711lju.6 for ; Thu, 22 Oct 2020 06:19:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=IcAE4Jyu1jclhjsbbav79rrFgX1+75/awDcEqCY54u8=; b=JUPSUQCugXbpMvU+5lWMoq1Q7csjmAxp/+xs9wlbLHvL0gEIeeRyX74Xq81EkalwMD CDbEUkHaZHb5wWaHbmZXBc6CkAs7EVeetyNeWUZ9+k0pputrmvxW17UUEOPok9ia51HV qHRwNWCHdqavnqYSJqpxB4/B3n1/4UCmgUqrkESq3/QnSeMUMTYp1wZioTJYAIzjnY5j 8amHP91XRSNR62vonB2SS+JDQUOL8qO8VtRl1V3Si0NljR3vu7YEKBpAt+m7plkEaSwu Fvbo8vCqd8yRnFojZjnyO0ppYrMqgTvWf1y0IwK5mkN/B0xmqTNyqUVY0CcSnQEfYBex CMqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=IcAE4Jyu1jclhjsbbav79rrFgX1+75/awDcEqCY54u8=; b=YGNe+yAecEQfPJZPWbVOjBatkzBYuuNRgXS/otj2APxT3ygt57oIUkIQyMKXnphzbi pjfURJntrXATg2uTnEDL285SBHVmnnP68XSZ8eJVaVVtg03z3vyc6DifMIPSX8BfJ1t3 K+lCDJyT4Eoge/brm2NjbLmBqz4fzZGvlQZalt7HJrI6Ckj1HTIb1GxnrfEoWwKRiNRr 9MwB5iKMmSS5oZ4AcOh9Q3ZMId9yoQnLNzQtKwOwpAcRgyRG5xQ6kjBHh0BuPTTp3tzY 8TLf6+U81dWa7fce/WshxK+x735ivGJimMSr41GdFr//5LH1gC6uPrNY/u5go6jri5kx AaJg== X-Gm-Message-State: AOAM530ExXSrwUgwaK+pLo9HuSKzMa1BHzgPAgQ3yexltVJc1a55pXCB CXwmbnjzKZvyUmXrpHr1ccy/kZZQ5phYKV3o X-Google-Smtp-Source: ABdhPJwZGwfk0XCwSQapv30wLa6jrBk0HnDt0f1kgNHrVf7DZPKxRI4cNcY1vAmAYLTPAeB8Q8a2l9IHoun2wT9B X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a19:8a88:: with SMTP id m130mr896681lfd.503.1603372793217; Thu, 22 Oct 2020 06:19:53 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:04 +0200 In-Reply-To: Message-Id: <6f87cb86aeeca9f4148d435ff01ad7d21af4bdfc.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 12/21] kasan: inline and rename kasan_unpoison_memory From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Currently kasan_unpoison_memory() is used as both an external annotation and as internal memory poisoning helper. Rename external annotation to kasan_unpoison_data() and inline the internal helper for for hardware tag-based mode to avoid undeeded function calls. There's the external annotation kasan_unpoison_slab() that is currently defined as static inline and uses kasan_unpoison_memory(). With this change it's turned into a function call. Overall, this results in the same number of calls for hardware tag-based mode as kasan_unpoison_memory() is now inlined. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Ia7c8b659f79209935cbaab3913bf7f082cc43a0e --- include/linux/kasan.h | 16 ++++++---------- kernel/fork.c | 2 +- mm/kasan/common.c | 10 ++++++++++ mm/kasan/hw_tags.c | 6 ------ mm/kasan/kasan.h | 7 +++++++ mm/slab_common.c | 2 +- 6 files changed, 25 insertions(+), 18 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 6377d7d3a951..2b9023224474 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -66,14 +66,15 @@ static inline void kasan_disable_current(void) {} #ifdef CONFIG_KASAN -void kasan_unpoison_memory(const void *address, size_t size); - void kasan_alloc_pages(struct page *page, unsigned int order); void kasan_free_pages(struct page *page, unsigned int order); void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, slab_flags_t *flags); +void kasan_unpoison_data(const void *address, size_t size); +void kasan_unpoison_slab(const void *ptr); + void kasan_poison_slab(struct page *page); void kasan_unpoison_object_data(struct kmem_cache *cache, void *object); void kasan_poison_object_data(struct kmem_cache *cache, void *object); @@ -98,11 +99,6 @@ struct kasan_cache { int free_meta_offset; }; -size_t __ksize(const void *); -static inline void kasan_unpoison_slab(const void *ptr) -{ - kasan_unpoison_memory(ptr, __ksize(ptr)); -} size_t kasan_metadata_size(struct kmem_cache *cache); bool kasan_save_enable_multi_shot(void); @@ -110,8 +106,6 @@ void kasan_restore_multi_shot(bool enabled); #else /* CONFIG_KASAN */ -static inline void kasan_unpoison_memory(const void *address, size_t size) {} - static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} static inline void kasan_free_pages(struct page *page, unsigned int order) {} @@ -119,6 +113,9 @@ static inline void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, slab_flags_t *flags) {} +static inline void kasan_unpoison_data(const void *address, size_t size) { } +static inline void kasan_unpoison_slab(const void *ptr) { } + static inline void kasan_poison_slab(struct page *page) {} static inline void kasan_unpoison_object_data(struct kmem_cache *cache, void *object) {} @@ -158,7 +155,6 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, return false; } -static inline void kasan_unpoison_slab(const void *ptr) { } static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } #endif /* CONFIG_KASAN */ diff --git a/kernel/fork.c b/kernel/fork.c index b41fecca59d7..858d78eee6ec 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -225,7 +225,7 @@ static unsigned long *alloc_thread_stack_node(struct task_struct *tsk, int node) continue; /* Mark stack accessible for KASAN. */ - kasan_unpoison_memory(s->addr, THREAD_SIZE); + kasan_unpoison_data(s->addr, THREAD_SIZE); /* Clear stale pointers from reused stack. */ memset(s->addr, 0, THREAD_SIZE); diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 9008fc6b0810..1a5e6c279a72 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -184,6 +184,16 @@ struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, return (void *)reset_tag(object) + cache->kasan_info.free_meta_offset; } +void kasan_unpoison_data(const void *address, size_t size) +{ + kasan_unpoison_memory(address, size); +} + +void kasan_unpoison_slab(const void *ptr) +{ + kasan_unpoison_memory(ptr, __ksize(ptr)); +} + void kasan_poison_slab(struct page *page) { unsigned long i; diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index f03161f3da19..915142da6b57 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -24,12 +24,6 @@ void __init kasan_init_tags(void) pr_info("KernelAddressSanitizer initialized\n"); } -void kasan_unpoison_memory(const void *address, size_t size) -{ - set_mem_tag_range(reset_tag(address), - round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); -} - void kasan_set_free_info(struct kmem_cache *cache, void *object, u8 tag) { diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 8d84ae6f58f1..da08b2533d73 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -280,6 +280,12 @@ static inline void kasan_poison_memory(const void *address, size_t size, u8 valu round_up(size, KASAN_GRANULE_SIZE), value); } +static inline void kasan_unpoison_memory(const void *address, size_t size) +{ + set_mem_tag_range(reset_tag(address), + round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); +} + static inline bool check_invalid_free(void *addr) { u8 ptr_tag = get_tag(addr); @@ -292,6 +298,7 @@ static inline bool check_invalid_free(void *addr) #else /* CONFIG_KASAN_HW_TAGS */ void kasan_poison_memory(const void *address, size_t size, u8 value); +void kasan_unpoison_memory(const void *address, size_t size); bool check_invalid_free(void *addr); #endif /* CONFIG_KASAN_HW_TAGS */ diff --git a/mm/slab_common.c b/mm/slab_common.c index 53d0f8bb57ea..f1b0c4a22f08 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -1176,7 +1176,7 @@ size_t ksize(const void *objp) * We assume that ksize callers could use whole allocated area, * so we need to unpoison this area. */ - kasan_unpoison_memory(objp, size); + kasan_unpoison_data(objp, size); return size; } EXPORT_SYMBOL(ksize); From patchwork Thu Oct 22 13:19:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851349 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DDEF214B4 for ; Thu, 22 Oct 2020 13:20:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8EA2C24630 for ; Thu, 22 Oct 2020 13:20:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="hyg/yHWH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8EA2C24630 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D20736B009A; Thu, 22 Oct 2020 09:19:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CD6BB6B009B; Thu, 22 Oct 2020 09:19:57 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B4B246B009C; Thu, 22 Oct 2020 09:19:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0020.hostedemail.com [216.40.44.20]) by kanga.kvack.org (Postfix) with ESMTP id 7BB1C6B009A for ; Thu, 22 Oct 2020 09:19:57 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 03C62180AD817 for ; Thu, 22 Oct 2020 13:19:57 +0000 (UTC) X-FDA: 77399619234.14.look25_470e37627251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id DB3D018229835 for ; Thu, 22 Oct 2020 13:19:56 +0000 (UTC) X-Spam-Summary: 1,0,0,7df60b37684224a3,d41d8cd98f00b204,3-4arxwokcfiu7xbyi47f508805y.w86527eh-664fuw4.8b0@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1543:1593:1594:1711:1730:1747:1777:1792:1981:2194:2199:2393:2525:2559:2563:2682:2685:2693:2859:2892:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3354:3865:3867:3868:3871:3872:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4118:4250:4321:4425:4605:5007:6120:6261:6653:6742:7901:7903:8603:9025:9969:10004:10400:11026:11473:11657:11658:11914:12043:12048:12291:12297:12438:12555:12679:12691:12737:12895:12986:13141:13230:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21627:21740:21939:21990:30054:30075,0,RBL:209.85.222.201:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04y8wa1pzjf8idj6m969qe1tgm4rryp3x6cfdy8e6eihzs1g9ozke1pfmnd3tig.sqeoycjhe rh68ep8r X-HE-Tag: look25_470e37627251 X-Filterd-Recvd-Size: 7438 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:56 +0000 (UTC) Received: by mail-qk1-f201.google.com with SMTP id u16so981326qkm.22 for ; Thu, 22 Oct 2020 06:19:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=ZoFNxYTX2w5xrKhT+4kOLYASUdfUPOoAnADKxtZ91BU=; b=hyg/yHWHvwShqvDVWk+p9jRaj1k1vbYvbMkQiwt/KYz+fgLWUl5RZZxkLQGBjmXyTg 4Mpc350rxmj8NEmdVWFhN7K3IA0gBvxNU4krBGMa40Pe5tYLMpxQp9rTdZcI2IVNAq8X X6BGbZ198yO5M4c9WFkFQB1vRxo/zQKgMMnJ71TSXhFNz3csA5eIcnR7mgxlYqKdbvfO F6V3nrozw4kqQp8r3Mhim3FV/62Y22qIA0J/BOk+a8s/8mqn9yOWPdIKUBViFZUM5jRy Z4a7ho525wIUCVayqHieRmS5aR43zx68e2mZ9l/J1sD2671q8FvP0uYhAMnEpSGEGE0q iIbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ZoFNxYTX2w5xrKhT+4kOLYASUdfUPOoAnADKxtZ91BU=; b=BxBkXDXieqPsbctvopfaBTOSTtHX6IeI3elMBiiVuYMFsb+8EVAB1ro3pUQEZpZRP0 Uf/rh29I4NEMl06CgidzzWM0+Q/aX3ZAC+7cWl9+MlcOwPfzFNQ0gCg3b4KrTh8fAdwP rhEtachZtdN4XX3/Ju/DOF17eGQUHlgJB9Y6uotE18pu9Xgm7aSnPGGsINgdHki8ez7W Zy409VQYTuw5Vpw8ymDPpy0zagby3+2oasHTpsElZHnMGXWIsYmfIihl9WdEE6Duc7fP wcH0aKaS000MK+PNy0an0E7sBVjpQbRKFwqorJsP38o7gCsteCpB6yyUdSyVrG0cjpmc 9rwA== X-Gm-Message-State: AOAM533S+cpYbHlDGQQlBFldyorAOAXK2w5BvlyIw+zy1c8lnnaA4P4a JwWQeloqsYAFLWHY6A9DhpgmEUUdZQHCgdgK X-Google-Smtp-Source: ABdhPJz/upwD11o6KftRnmUWcVjQhuj/aMMh5idv43GrvZzPuF9FjjUI7+5zI2FNbmCB5582zV2P7+i0EuR2ktv5 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:1267:: with SMTP id r7mr2283039qvv.50.1603372795643; Thu, 22 Oct 2020 06:19:55 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:05 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 13/21] arm64: kasan: Add cpu_supports_tags helper From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Add an arm64 helper called cpu_supports_mte() that exposes information about whether the CPU supports memory tagging and that can be called during early boot (unlike system_supports_mte()). Use that helper to implement a generic cpu_supports_tags() helper, that will be used by hardware tag-based KASAN. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Ib4b56a42c57c6293df29a0cdfee334c3ca7bdab4 Reviewed-by: Dmitry Vyukov --- arch/arm64/include/asm/memory.h | 1 + arch/arm64/include/asm/mte-kasan.h | 6 ++++++ arch/arm64/kernel/mte.c | 20 ++++++++++++++++++++ mm/kasan/kasan.h | 4 ++++ 4 files changed, 31 insertions(+) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index b5d6b824c21c..f496abfcf7f5 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -232,6 +232,7 @@ static inline const void *__tag_set(const void *addr, u8 tag) } #ifdef CONFIG_KASAN_HW_TAGS +#define arch_cpu_supports_tags() cpu_supports_mte() #define arch_init_tags(max_tag) mte_init_tags(max_tag) #define arch_get_random_tag() mte_get_random_tag() #define arch_get_mem_tag(addr) mte_get_mem_tag(addr) diff --git a/arch/arm64/include/asm/mte-kasan.h b/arch/arm64/include/asm/mte-kasan.h index a4c61b926d4a..4c3f2c6b4fe6 100644 --- a/arch/arm64/include/asm/mte-kasan.h +++ b/arch/arm64/include/asm/mte-kasan.h @@ -9,6 +9,7 @@ #ifndef __ASSEMBLY__ +#include #include /* @@ -30,6 +31,7 @@ u8 mte_get_random_tag(void); void *mte_set_mem_tag_range(void *addr, size_t size, u8 tag); void mte_init_tags(u64 max_tag); +bool __init cpu_supports_mte(void); #else /* CONFIG_ARM64_MTE */ @@ -54,6 +56,10 @@ static inline void *mte_set_mem_tag_range(void *addr, size_t size, u8 tag) static inline void mte_init_tags(u64 max_tag) { } +static inline bool cpu_supports_mte(void) +{ + return false; +} #endif /* CONFIG_ARM64_MTE */ diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index ca8206b7f9a6..8fcd17408515 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -134,6 +134,26 @@ void mte_init_tags(u64 max_tag) gcr_kernel_excl = ~incl & SYS_GCR_EL1_EXCL_MASK; } +/* + * This function can be used during early boot to determine whether the CPU + * supports MTE. The alternative that must be used after boot is completed is + * system_supports_mte(), but it only works after the cpufeature framework + * learns about MTE. + */ +bool __init cpu_supports_mte(void) +{ + u64 pfr1; + u32 val; + + if (!IS_ENABLED(CONFIG_ARM64_MTE)) + return false; + + pfr1 = read_cpuid(ID_AA64PFR1_EL1); + val = cpuid_feature_extract_unsigned_field(pfr1, ID_AA64PFR1_MTE_SHIFT); + + return val >= ID_AA64PFR1_MTE; +} + static void update_sctlr_el1_tcf0(u64 tcf0) { /* ISB required for the kernel uaccess routines */ diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index da08b2533d73..f7ae0c23f023 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -240,6 +240,9 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) #define set_tag(addr, tag) ((void *)arch_kasan_set_tag((addr), (tag))) #define get_tag(addr) arch_kasan_get_tag(addr) +#ifndef arch_cpu_supports_tags +#define arch_cpu_supports_tags() (false) +#endif #ifndef arch_init_tags #define arch_init_tags(max_tag) #endif @@ -253,6 +256,7 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) #define arch_set_mem_tag_range(addr, size, tag) ((void *)(addr)) #endif +#define cpu_supports_tags() arch_cpu_supports_tags() #define init_tags(max_tag) arch_init_tags(max_tag) #define get_random_tag() arch_get_random_tag() #define get_mem_tag(addr) arch_get_mem_tag(addr) From patchwork Thu Oct 22 13:19:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851351 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 10C1C14B4 for ; Thu, 22 Oct 2020 13:20:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 71238222E9 for ; Thu, 22 Oct 2020 13:20:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="VesxqZfV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71238222E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 422016B009B; Thu, 22 Oct 2020 09:20:00 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3D26C6B009D; Thu, 22 Oct 2020 09:20:00 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2491F6B009E; Thu, 22 Oct 2020 09:20:00 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0008.hostedemail.com [216.40.44.8]) by kanga.kvack.org (Postfix) with ESMTP id DCD586B009B for ; Thu, 22 Oct 2020 09:19:59 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 75C073625 for ; Thu, 22 Oct 2020 13:19:59 +0000 (UTC) X-FDA: 77399619318.06.idea48_4a1543627251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id 4FAD81026C321 for ; Thu, 22 Oct 2020 13:19:59 +0000 (UTC) X-Spam-Summary: 1,0,0,b690254c09ec3554,d41d8cd98f00b204,3_yarxwokcfqw9zd0k69h72aa270.ya8749gj-886hwy6.ad2@flex--andreyknvl.bounces.google.com,,RULES_HIT:4:41:69:152:355:379:541:800:960:966:967:973:982:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1593:1594:1605:1730:1747:1777:1792:1981:2194:2196:2199:2200:2393:2525:2559:2563:2638:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3865:3866:3867:3868:3870:3871:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4250:4321:4385:4425:4605:5007:6117:6119:6120:6261:6653:6742:7875:7901:7903:8603:8957:9025:9592:9969:10004:11026:11473:11658:11914:12043:12048:12291:12295:12296:12297:12438:12555:12679:12683:12895:12986:14096:14097:14110:14394:14659:21080:21365:21444:21451:21611:21627:21939:21990:30054:30070,0,RBL:209.85.160.202:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yge5u1nmutn1cfz8nd7br1ug9kryp9hj79h51q4zdwzwb7qdb9q5hrezps7bq.hurtp qb816ghc X-HE-Tag: idea48_4a1543627251 X-Filterd-Recvd-Size: 16172 Received: from mail-qt1-f202.google.com (mail-qt1-f202.google.com [209.85.160.202]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:58 +0000 (UTC) Received: by mail-qt1-f202.google.com with SMTP id d22so1039919qtn.0 for ; Thu, 22 Oct 2020 06:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=hXyFPEk4foicA9MHUn1LEAgXXkiWJy7tayx5woeXroY=; b=VesxqZfVc4TwIJOMCHCJCamqxdv3ivbVcAf/dPZk4kFR93xcHiGrBpORd1FmKSnz4M LLYv6Ue+5wAxbuGSDmXQxMoN8Y4ep4iGBpMomTNuR0kdJNPaa2GGqQCFz4rEiglKvW8h Mj1BXmRBClmxHgIpHikrc/rCK7c3cBSofpyvsWyoYZ0y1nTw8CDWIJLlKn1zT7zyniuA Xpj4CbezQmIO6q+TMWARr7yMMdERPhlVsoPT9rH67PVkJYge8klVwSHrqAtC6EUYMsnG eyy8fdtPy02ZuttyO1oMl1zmHFMk5+ZPxxEJglbphMNSlZcjZIxAZspqPwEO5HQXRouQ XKkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=hXyFPEk4foicA9MHUn1LEAgXXkiWJy7tayx5woeXroY=; b=FVLynQmtIGJ05zkjtsuwG/EKKNBYViekGEatdSXovwoCuTQ48iEpZW3ZthXr2omI9v ucKjFZWg2yWqSllVrP05pw5GUwASqdbfpqV4mQ9SRm1D+KdyJOAeUpIjNnYGlsgBDG63 43ao6B/2DMVHFeRyPBkYkvsH2EDu6UkmEiAiItdLRGTarFtOK4182FiZg3Uno9j0T15K oWLsKmnhaNKWq4yXlbcirv2FCC3Box6j5FJK14qGrg/74AR0S633LCUELy552PezRu82 ddoqXuMSbuWzi8uK4h7pQGYtEkcCynn30PUrbQnSWRYyRcJtn65P40jIYXDpMyyBkKIx S6cQ== X-Gm-Message-State: AOAM532O9d85+KQWbz7WAbxYTq/6XFYX0tpRaC2eBvl+m9B160Pk4CF3 ZS+uwhKN9MuXN/OykqlThErRjMLr5ixE0AQo X-Google-Smtp-Source: ABdhPJz9rkeUtygs5ZPEaDOWc/yvjgB7QSCk5bCAQdXqW9yO1wZyxT1pgPdZxui+xVFkBbj2LobYJDXK6Aw6OyF4 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:8d05:: with SMTP id r5mr2364576qvb.31.1603372797908; Thu, 22 Oct 2020 06:19:57 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:06 +0200 In-Reply-To: Message-Id: <6a4a7626bf280871518656f4fa89cb064740baf7.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 14/21] kasan: add and integrate kasan boot parameters From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: TODO: no meaningful description here yet, please see the cover letter for this RFC series. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/If7d37003875b2ed3e0935702c8015c223d6416a4 --- mm/kasan/common.c | 92 +++++++++++++----------- mm/kasan/generic.c | 5 ++ mm/kasan/hw_tags.c | 169 ++++++++++++++++++++++++++++++++++++++++++++- mm/kasan/kasan.h | 9 +++ mm/kasan/report.c | 14 +++- mm/kasan/sw_tags.c | 5 ++ 6 files changed, 250 insertions(+), 44 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 1a5e6c279a72..cc129ef62ab1 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -129,35 +129,37 @@ void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, unsigned int redzone_size; int redzone_adjust; - /* Add alloc meta. */ - cache->kasan_info.alloc_meta_offset = *size; - *size += sizeof(struct kasan_alloc_meta); - - /* Add free meta. */ - if (IS_ENABLED(CONFIG_KASAN_GENERIC) && - (cache->flags & SLAB_TYPESAFE_BY_RCU || cache->ctor || - cache->object_size < sizeof(struct kasan_free_meta))) { - cache->kasan_info.free_meta_offset = *size; - *size += sizeof(struct kasan_free_meta); - } - - redzone_size = optimal_redzone(cache->object_size); - redzone_adjust = redzone_size - (*size - cache->object_size); - if (redzone_adjust > 0) - *size += redzone_adjust; - - *size = min_t(unsigned int, KMALLOC_MAX_SIZE, - max(*size, cache->object_size + redzone_size)); + if (static_branch_unlikely(&kasan_stack)) { + /* Add alloc meta. */ + cache->kasan_info.alloc_meta_offset = *size; + *size += sizeof(struct kasan_alloc_meta); + + /* Add free meta. */ + if (IS_ENABLED(CONFIG_KASAN_GENERIC) && + (cache->flags & SLAB_TYPESAFE_BY_RCU || cache->ctor || + cache->object_size < sizeof(struct kasan_free_meta))) { + cache->kasan_info.free_meta_offset = *size; + *size += sizeof(struct kasan_free_meta); + } - /* - * If the metadata doesn't fit, don't enable KASAN at all. - */ - if (*size <= cache->kasan_info.alloc_meta_offset || - *size <= cache->kasan_info.free_meta_offset) { - cache->kasan_info.alloc_meta_offset = 0; - cache->kasan_info.free_meta_offset = 0; - *size = orig_size; - return; + redzone_size = optimal_redzone(cache->object_size); + redzone_adjust = redzone_size - (*size - cache->object_size); + if (redzone_adjust > 0) + *size += redzone_adjust; + + *size = min_t(unsigned int, KMALLOC_MAX_SIZE, + max(*size, cache->object_size + redzone_size)); + + /* + * If the metadata doesn't fit, don't enable KASAN at all. + */ + if (*size <= cache->kasan_info.alloc_meta_offset || + *size <= cache->kasan_info.free_meta_offset) { + cache->kasan_info.alloc_meta_offset = 0; + cache->kasan_info.free_meta_offset = 0; + *size = orig_size; + return; + } } *flags |= SLAB_KASAN; @@ -165,10 +167,12 @@ void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, size_t kasan_metadata_size(struct kmem_cache *cache) { - return (cache->kasan_info.alloc_meta_offset ? - sizeof(struct kasan_alloc_meta) : 0) + - (cache->kasan_info.free_meta_offset ? - sizeof(struct kasan_free_meta) : 0); + if (static_branch_unlikely(&kasan_stack)) + return (cache->kasan_info.alloc_meta_offset ? + sizeof(struct kasan_alloc_meta) : 0) + + (cache->kasan_info.free_meta_offset ? + sizeof(struct kasan_free_meta) : 0); + return 0; } struct kasan_alloc_meta *kasan_get_alloc_meta(struct kmem_cache *cache, @@ -270,8 +274,10 @@ void * __must_check kasan_init_slab_obj(struct kmem_cache *cache, if (!(cache->flags & SLAB_KASAN)) return (void *)object; - alloc_meta = kasan_get_alloc_meta(cache, object); - __memset(alloc_meta, 0, sizeof(*alloc_meta)); + if (static_branch_unlikely(&kasan_stack)) { + alloc_meta = kasan_get_alloc_meta(cache, object); + __memset(alloc_meta, 0, sizeof(*alloc_meta)); + } if (IS_ENABLED(CONFIG_KASAN_SW_TAGS) || IS_ENABLED(CONFIG_KASAN_HW_TAGS)) object = set_tag(object, assign_tag(cache, object, true, false)); @@ -308,15 +314,19 @@ static bool __kasan_slab_free(struct kmem_cache *cache, void *object, rounded_up_size = round_up(cache->object_size, KASAN_GRANULE_SIZE); kasan_poison_memory(object, rounded_up_size, KASAN_KMALLOC_FREE); - if ((IS_ENABLED(CONFIG_KASAN_GENERIC) && !quarantine) || - unlikely(!(cache->flags & SLAB_KASAN))) - return false; + if (static_branch_unlikely(&kasan_stack)) { + if ((IS_ENABLED(CONFIG_KASAN_GENERIC) && !quarantine) || + unlikely(!(cache->flags & SLAB_KASAN))) + return false; + + kasan_set_free_info(cache, object, tag); - kasan_set_free_info(cache, object, tag); + quarantine_put(cache, object); - quarantine_put(cache, object); + return IS_ENABLED(CONFIG_KASAN_GENERIC); + } - return IS_ENABLED(CONFIG_KASAN_GENERIC); + return false; } bool kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip) @@ -355,7 +365,7 @@ static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, kasan_poison_memory((void *)redzone_start, redzone_end - redzone_start, KASAN_KMALLOC_REDZONE); - if (cache->flags & SLAB_KASAN) + if (static_branch_unlikely(&kasan_stack) && (cache->flags & SLAB_KASAN)) set_alloc_info(cache, (void *)object, flags); return set_tag(object, tag); diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index d259e4c3aefd..20a1e753e0c5 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -33,6 +33,11 @@ #include "kasan.h" #include "../slab.h" +/* See the comments in hw_tags.c */ +DEFINE_STATIC_KEY_TRUE_RO(kasan_enabled); +EXPORT_SYMBOL(kasan_enabled); +DEFINE_STATIC_KEY_TRUE_RO(kasan_stack); + /* * All functions below always inlined so compiler could * perform better optimizations in each of __asan_loadX/__assn_storeX diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 915142da6b57..bccd781011ad 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -8,6 +8,8 @@ #define pr_fmt(fmt) "kasan: " fmt +#include +#include #include #include #include @@ -17,10 +19,175 @@ #include "kasan.h" +enum kasan_arg_mode { + KASAN_ARG_MODE_OFF, + KASAN_ARG_MODE_PROD, + KASAN_ARG_MODE_FULL, +}; + +enum kasan_arg_stack { + KASAN_ARG_STACK_DEFAULT, + KASAN_ARG_STACK_OFF, + KASAN_ARG_STACK_ON, +}; + +enum kasan_arg_trap { + KASAN_ARG_TRAP_DEFAULT, + KASAN_ARG_TRAP_ASYNC, + KASAN_ARG_TRAP_SYNC, +}; + +enum kasan_arg_fault { + KASAN_ARG_FAULT_DEFAULT, + KASAN_ARG_FAULT_REPORT, + KASAN_ARG_FAULT_PANIC, +}; + +static enum kasan_arg_mode kasan_arg_mode __ro_after_init; +static enum kasan_arg_stack kasan_arg_stack __ro_after_init; +static enum kasan_arg_fault kasan_arg_fault __ro_after_init; +static enum kasan_arg_trap kasan_arg_trap __ro_after_init; + +/* Whether KASAN is enabled at all. */ +DEFINE_STATIC_KEY_FALSE_RO(kasan_enabled); +EXPORT_SYMBOL(kasan_enabled); + +/* Whether to collect alloc/free stack traces. */ +DEFINE_STATIC_KEY_FALSE_RO(kasan_stack); + +/* Whether to use synchronous or asynchronous tag checking. */ +static bool kasan_sync __ro_after_init; + +/* Whether panic or disable tag checking on fault. */ +bool kasan_panic __ro_after_init; + +/* kasan.mode=off/prod/full */ +static int __init early_kasan_mode(char *arg) +{ + if (!arg) + return -EINVAL; + + if (!strcmp(arg, "off")) + kasan_arg_mode = KASAN_ARG_MODE_OFF; + else if (!strcmp(arg, "prod")) + kasan_arg_mode = KASAN_ARG_MODE_PROD; + else if (!strcmp(arg, "full")) + kasan_arg_mode = KASAN_ARG_MODE_FULL; + else + return -EINVAL; + + return 0; +} +early_param("kasan.mode", early_kasan_mode); + +/* kasan.stack=off/on */ +static int __init early_kasan_stack(char *arg) +{ + if (!arg) + return -EINVAL; + + if (!strcmp(arg, "off")) + kasan_arg_stack = KASAN_ARG_STACK_OFF; + else if (!strcmp(arg, "on")) + kasan_arg_stack = KASAN_ARG_STACK_ON; + else + return -EINVAL; + + return 0; +} +early_param("kasan.stack", early_kasan_stack); + +/* kasan.trap=sync/async */ +static int __init early_kasan_trap(char *arg) +{ + if (!arg) + return -EINVAL; + + if (!strcmp(arg, "ASYNC")) + kasan_arg_trap = KASAN_ARG_TRAP_ASYNC; + else if (!strcmp(arg, "sync")) + kasan_arg_trap = KASAN_ARG_TRAP_SYNC; + else + return -EINVAL; + + return 0; +} +early_param("kasan.trap", early_kasan_trap); + +/* kasan.fault=report/panic */ +static int __init early_kasan_fault(char *arg) +{ + if (!arg) + return -EINVAL; + + if (!strcmp(arg, "report")) + kasan_arg_fault = KASAN_ARG_FAULT_REPORT; + else if (!strcmp(arg, "panic")) + kasan_arg_fault = KASAN_ARG_FAULT_PANIC; + else + return -EINVAL; + + return 0; +} +early_param("kasan.fault", early_kasan_fault); + void __init kasan_init_tags(void) { - init_tags(KASAN_TAG_MAX); + if (!cpu_supports_tags()) + return; + + /* First, preset values based on the mode. */ + + switch (kasan_arg_mode) { + case KASAN_ARG_MODE_OFF: + return; + case KASAN_ARG_MODE_PROD: + static_branch_enable(&kasan_enabled); + break; + case KASAN_ARG_MODE_FULL: + static_branch_enable(&kasan_enabled); + static_branch_enable(&kasan_stack); + kasan_sync = true; + break; + } + + /* Now, optionally override the presets. */ + switch (kasan_arg_stack) { + case KASAN_ARG_STACK_OFF: + static_branch_disable(&kasan_stack); + break; + case KASAN_ARG_STACK_ON: + static_branch_enable(&kasan_stack); + break; + default: + break; + } + + switch (kasan_arg_trap) { + case KASAN_ARG_TRAP_ASYNC: + kasan_sync = false; + break; + case KASAN_ARG_TRAP_SYNC: + kasan_sync = true; + break; + default: + break; + } + + switch (kasan_arg_fault) { + case KASAN_ARG_FAULT_REPORT: + kasan_panic = false; + break; + case KASAN_ARG_FAULT_PANIC: + kasan_panic = true; + break; + default: + break; + } + + /* TODO: choose between sync and async based on kasan_sync. */ + init_tags(KASAN_TAG_MAX); pr_info("KernelAddressSanitizer initialized\n"); } diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index f7ae0c23f023..00b47bc753aa 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -2,9 +2,18 @@ #ifndef __MM_KASAN_KASAN_H #define __MM_KASAN_KASAN_H +#include #include #include +#ifdef CONFIG_KASAN_HW_TAGS +DECLARE_STATIC_KEY_FALSE(kasan_stack); +#else +DECLARE_STATIC_KEY_TRUE(kasan_stack); +#endif + +extern bool kasan_panic __ro_after_init; + #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) #define KASAN_GRANULE_SIZE (1UL << KASAN_SHADOW_SCALE_SHIFT) #else diff --git a/mm/kasan/report.c b/mm/kasan/report.c index dee5350b459c..426dd1962d3c 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -97,6 +97,10 @@ static void end_report(unsigned long *flags) panic_on_warn = 0; panic("panic_on_warn set ...\n"); } +#ifdef CONFIG_KASAN_HW_TAGS + if (kasan_panic) + panic("kasan.fault=panic set ...\n"); +#endif kasan_enable_current(); } @@ -159,8 +163,8 @@ static void describe_object_addr(struct kmem_cache *cache, void *object, (void *)(object_addr + cache->object_size)); } -static void describe_object(struct kmem_cache *cache, void *object, - const void *addr, u8 tag) +static void describe_object_stacks(struct kmem_cache *cache, void *object, + const void *addr, u8 tag) { struct kasan_alloc_meta *alloc_meta = kasan_get_alloc_meta(cache, object); @@ -188,7 +192,13 @@ static void describe_object(struct kmem_cache *cache, void *object, } #endif } +} +static void describe_object(struct kmem_cache *cache, void *object, + const void *addr, u8 tag) +{ + if (static_branch_unlikely(&kasan_stack)) + describe_object_stacks(cache, object, addr, tag); describe_object_addr(cache, object, addr); } diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index 4db41f274702..b6d185adf2c5 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -33,6 +33,11 @@ #include "kasan.h" #include "../slab.h" +/* See the comments in hw_tags.c */ +DEFINE_STATIC_KEY_TRUE_RO(kasan_enabled); +EXPORT_SYMBOL(kasan_enabled); +DEFINE_STATIC_KEY_TRUE_RO(kasan_stack); + static DEFINE_PER_CPU(u32, prng_state); void __init kasan_init_tags(void) From patchwork Thu Oct 22 13:19:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851353 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3AB6B61C for ; Thu, 22 Oct 2020 13:20:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BB22624182 for ; Thu, 22 Oct 2020 13:20:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="T8XkZLbo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB22624182 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5F4EC6B009D; Thu, 22 Oct 2020 09:20:03 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 582986B009F; Thu, 22 Oct 2020 09:20:03 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 444C16B00A0; Thu, 22 Oct 2020 09:20:03 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0241.hostedemail.com [216.40.44.241]) by kanga.kvack.org (Postfix) with ESMTP id 095116B009D for ; Thu, 22 Oct 2020 09:20:02 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 9479E180AD81D for ; Thu, 22 Oct 2020 13:20:02 +0000 (UTC) X-FDA: 77399619444.15.sort34_550f2dd27251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 5D5DA1814B0D2 for ; Thu, 22 Oct 2020 13:20:02 +0000 (UTC) X-Spam-Summary: 1,0,0,1eea6c7b40e40408,d41d8cd98f00b204,3aierxwokcfczc2g3n9cka5dd5a3.1dba7cjm-bb9kz19.dg5@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:69:152:327:355:379:541:800:960:966:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1593:1594:1605:1730:1747:1777:1792:2196:2198:2199:2200:2393:2525:2559:2563:2682:2685:2731:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3740:3865:3867:3868:3870:3871:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4385:4425:4605:5007:6119:6120:6261:6653:6742:7901:7903:8603:8957:9025:9036:9592:9969:10004:10954:11026:11473:11658:11914:12043:12048:12291:12295:12296:12297:12438:12555:12679:12683:12895:12986:14096:14097:14394:14659:21080:21365:21444:21451:21627:21939:21966:21990:30003:30054:30070,0,RBL:209.85.128.74:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yroswrcce6rqx1h8wu4sowi46ceypccwpxg96atyt34abwqr5ff9gdpcxd3gk.tgiayqo4iyyw 1jzadfoo X-HE-Tag: sort34_550f2dd27251 X-Filterd-Recvd-Size: 22122 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:20:01 +0000 (UTC) Received: by mail-wm1-f74.google.com with SMTP id l23so347160wmg.6 for ; Thu, 22 Oct 2020 06:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=RAUHacgq2cb8MVx0OL/jnsTS0+3Q5wxOMCs5kif8wrA=; b=T8XkZLboTUX2NyOYysgmKUiNk47jsUn1qeJWg7MIIbqEAd+73paV8PYdNWZo6nu+Cc k9/ygi18x5EwM1VIUVKq5F4L9UNaIvDN3+40sUuBBRSvoUtzSR5IniG++gYkSVhaZp2v 9ndLX9Tm15qJSy9ca1BvuJPmgCv28b8wlEXO8TC1/7YcSPn7/i5fq7mdUnRrrntcQ1d7 vZ4nDjVe8UoLw7sFNS3oyvqYr3Fh3XDMi1YkYK0+XaSl85rXlSl4WeS9f4yriHXPV27b PaHUtpGmenEDBXLWwpDQgNQ4ZGkUDbAkYai9f0cMqqPeTkzCasYSwQuBGOyoAPpBUkV3 fiMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=RAUHacgq2cb8MVx0OL/jnsTS0+3Q5wxOMCs5kif8wrA=; b=JlfJ1ICtaWC5gGFMMeomonvFAzW7r61ddA+p5Sn/l+e5sBRkFHe6HrU0OxlJcA9V7B uZ5WtXjrP6LOvluhT0MPEEMTjgAcgcifnK4SzXWJuXopvQhEYVDP0lF1W6m649qATOSr +g3+fSD0d89E33IVJjas7WVx9GbEjh6j/3VbyJDajQukSTiPSehxLKbjTrqS8CrX2cB8 clwRwOVGalxHMxKF1q7JwROu2RS4OscmCyB8I35EHIInMVB6oCweussxLEIceeD7W4Lg ekyDW1HjySzFL5x7S1cNx3ug0G4AwZI0dVPmnrmeaCKeCb2pF604RMXnj+2JHXbKLUZp smCQ== X-Gm-Message-State: AOAM531cjtSV+2WOWoVzfO5DmExD7874Rpg8zuxrEYr0JFpwUoAdQcwY oM92kdGiEgwxwocD7gwAkR4fxN5OMlBCye6M X-Google-Smtp-Source: ABdhPJybl2hZjVJhVj+u6ji4X1587kqW3ZlYy5FlGcVnGVLNVb1giLbLOy6rElUKlVmUuT7L3Y0Fqzr5L6ftaY9F X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:7707:: with SMTP id t7mr2703228wmi.54.1603372800484; Thu, 22 Oct 2020 06:20:00 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:07 +0200 In-Reply-To: Message-Id: <21fa5f4eb6ee132a57b716ff6245f2c98de2d204.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 15/21] kasan: check kasan_enabled in annotations From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Declare the kasan_enabled static key in include/linux/kasan.h and in include/linux/mm.h and check it in all kasan annotations. This allows to avoid any slowdown caused by function calls when kasan_enabled is disabled. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I2589451d3c96c97abbcbf714baabe6161c6f153e --- include/linux/kasan.h | 210 ++++++++++++++++++++++++++++++++---------- include/linux/mm.h | 27 ++++-- mm/kasan/common.c | 60 ++++++------ 3 files changed, 211 insertions(+), 86 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 2b9023224474..8654275aa62e 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -2,6 +2,7 @@ #ifndef _LINUX_KASAN_H #define _LINUX_KASAN_H +#include #include struct kmem_cache; @@ -66,40 +67,154 @@ static inline void kasan_disable_current(void) {} #ifdef CONFIG_KASAN -void kasan_alloc_pages(struct page *page, unsigned int order); -void kasan_free_pages(struct page *page, unsigned int order); +struct kasan_cache { + int alloc_meta_offset; + int free_meta_offset; +}; + +#ifdef CONFIG_KASAN_HW_TAGS +DECLARE_STATIC_KEY_FALSE(kasan_enabled); +#else +DECLARE_STATIC_KEY_TRUE(kasan_enabled); +#endif -void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, - slab_flags_t *flags); +void __kasan_alloc_pages(struct page *page, unsigned int order); +static inline void kasan_alloc_pages(struct page *page, unsigned int order) +{ + if (static_branch_likely(&kasan_enabled)) + __kasan_alloc_pages(page, order); +} -void kasan_unpoison_data(const void *address, size_t size); -void kasan_unpoison_slab(const void *ptr); +void __kasan_free_pages(struct page *page, unsigned int order); +static inline void kasan_free_pages(struct page *page, unsigned int order) +{ + if (static_branch_likely(&kasan_enabled)) + __kasan_free_pages(page, order); +} -void kasan_poison_slab(struct page *page); -void kasan_unpoison_object_data(struct kmem_cache *cache, void *object); -void kasan_poison_object_data(struct kmem_cache *cache, void *object); -void * __must_check kasan_init_slab_obj(struct kmem_cache *cache, - const void *object); +void __kasan_cache_create(struct kmem_cache *cache, unsigned int *size, + slab_flags_t *flags); +static inline void kasan_cache_create(struct kmem_cache *cache, + unsigned int *size, slab_flags_t *flags) +{ + if (static_branch_likely(&kasan_enabled)) + __kasan_cache_create(cache, size, flags); +} -void * __must_check kasan_kmalloc_large(const void *ptr, size_t size, - gfp_t flags); -void kasan_kfree_large(void *ptr, unsigned long ip); -void kasan_poison_kfree(void *ptr, unsigned long ip); -void * __must_check kasan_kmalloc(struct kmem_cache *s, const void *object, - size_t size, gfp_t flags); -void * __must_check kasan_krealloc(const void *object, size_t new_size, - gfp_t flags); +size_t __kasan_metadata_size(struct kmem_cache *cache); +static inline size_t kasan_metadata_size(struct kmem_cache *cache) +{ + if (static_branch_likely(&kasan_enabled)) + return __kasan_metadata_size(cache); + return 0; +} -void * __must_check kasan_slab_alloc(struct kmem_cache *s, void *object, - gfp_t flags); -bool kasan_slab_free(struct kmem_cache *s, void *object, unsigned long ip); +void __kasan_unpoison_data(const void *addr, size_t size); +static inline void kasan_unpoison_data(const void *addr, size_t size) +{ + if (static_branch_likely(&kasan_enabled)) + __kasan_unpoison_data(addr, size); +} -struct kasan_cache { - int alloc_meta_offset; - int free_meta_offset; -}; +void __kasan_unpoison_slab(const void *ptr); +static inline void kasan_unpoison_slab(const void *ptr) +{ + if (static_branch_likely(&kasan_enabled)) + __kasan_unpoison_slab(ptr); +} + +void __kasan_poison_slab(struct page *page); +static inline void kasan_poison_slab(struct page *page) +{ + if (static_branch_likely(&kasan_enabled)) + return __kasan_poison_slab(page); +} + +void __kasan_unpoison_object_data(struct kmem_cache *cache, void *object); +static inline void kasan_unpoison_object_data(struct kmem_cache *cache, void *object) +{ + if (static_branch_likely(&kasan_enabled)) + return __kasan_unpoison_object_data(cache, object); +} + +void __kasan_poison_object_data(struct kmem_cache *cache, void *object); +static inline void kasan_poison_object_data(struct kmem_cache *cache, void *object) +{ + if (static_branch_likely(&kasan_enabled)) + __kasan_poison_object_data(cache, object); +} + +void * __must_check __kasan_init_slab_obj(struct kmem_cache *cache, + const void *object); +static inline void * __must_check kasan_init_slab_obj(struct kmem_cache *cache, + const void *object) +{ + if (static_branch_likely(&kasan_enabled)) + return __kasan_init_slab_obj(cache, object); + return (void *)object; +} + +bool __kasan_slab_free(struct kmem_cache *s, void *object, unsigned long ip); +static inline bool kasan_slab_free(struct kmem_cache *s, void *object, unsigned long ip) +{ + if (static_branch_likely(&kasan_enabled)) + return __kasan_slab_free(s, object, ip); + return false; +} -size_t kasan_metadata_size(struct kmem_cache *cache); +void * __must_check __kasan_slab_alloc(struct kmem_cache *s, + void *object, gfp_t flags); +static inline void * __must_check kasan_slab_alloc(struct kmem_cache *s, + void *object, gfp_t flags) +{ + if (static_branch_likely(&kasan_enabled)) + return __kasan_slab_alloc(s, object, flags); + return object; +} + +void * __must_check __kasan_kmalloc(struct kmem_cache *s, const void *object, + size_t size, gfp_t flags); +static inline void * __must_check kasan_kmalloc(struct kmem_cache *s, const void *object, + size_t size, gfp_t flags) +{ + if (static_branch_likely(&kasan_enabled)) + return __kasan_kmalloc(s, object, size, flags); + return (void *)object; +} + +void * __must_check __kasan_kmalloc_large(const void *ptr, + size_t size, gfp_t flags); +static inline void * __must_check kasan_kmalloc_large(const void *ptr, + size_t size, gfp_t flags) +{ + if (static_branch_likely(&kasan_enabled)) + return __kasan_kmalloc_large(ptr, size, flags); + return (void *)ptr; +} + +void * __must_check __kasan_krealloc(const void *object, + size_t new_size, gfp_t flags); +static inline void * __must_check kasan_krealloc(const void *object, + size_t new_size, gfp_t flags) +{ + if (static_branch_likely(&kasan_enabled)) + return __kasan_krealloc(object, new_size, flags); + return (void *)object; +} + +void __kasan_poison_kfree(void *ptr, unsigned long ip); +static inline void kasan_poison_kfree(void *ptr, unsigned long ip) +{ + if (static_branch_likely(&kasan_enabled)) + __kasan_poison_kfree(ptr, ip); +} + +void __kasan_kfree_large(void *ptr, unsigned long ip); +static inline void kasan_kfree_large(void *ptr, unsigned long ip) +{ + if (static_branch_likely(&kasan_enabled)) + __kasan_kfree_large(ptr, ip); +} bool kasan_save_enable_multi_shot(void); void kasan_restore_multi_shot(bool enabled); @@ -108,14 +223,12 @@ void kasan_restore_multi_shot(bool enabled); static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} static inline void kasan_free_pages(struct page *page, unsigned int order) {} - static inline void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, slab_flags_t *flags) {} - -static inline void kasan_unpoison_data(const void *address, size_t size) { } -static inline void kasan_unpoison_slab(const void *ptr) { } - +static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } +static inline void kasan_unpoison_data(const void *address, size_t size) {} +static inline void kasan_unpoison_slab(const void *ptr) {} static inline void kasan_poison_slab(struct page *page) {} static inline void kasan_unpoison_object_data(struct kmem_cache *cache, void *object) {} @@ -126,36 +239,33 @@ static inline void *kasan_init_slab_obj(struct kmem_cache *cache, { return (void *)object; } - -static inline void *kasan_kmalloc_large(void *ptr, size_t size, gfp_t flags) +static inline bool kasan_slab_free(struct kmem_cache *s, void *object, + unsigned long ip) { - return ptr; + return false; } -static inline void kasan_kfree_large(void *ptr, unsigned long ip) {} -static inline void kasan_poison_kfree(void *ptr, unsigned long ip) {} -static inline void *kasan_kmalloc(struct kmem_cache *s, const void *object, - size_t size, gfp_t flags) +static inline void *kasan_slab_alloc(struct kmem_cache *s, void *object, + gfp_t flags) { - return (void *)object; + return object; } -static inline void *kasan_krealloc(const void *object, size_t new_size, - gfp_t flags) +static inline void *kasan_kmalloc(struct kmem_cache *s, const void *object, + size_t size, gfp_t flags) { return (void *)object; } -static inline void *kasan_slab_alloc(struct kmem_cache *s, void *object, - gfp_t flags) +static inline void *kasan_kmalloc_large(const void *ptr, size_t size, gfp_t flags) { - return object; + return (void *)ptr; } -static inline bool kasan_slab_free(struct kmem_cache *s, void *object, - unsigned long ip) +static inline void *kasan_krealloc(const void *object, size_t new_size, + gfp_t flags) { - return false; + return (void *)object; } - -static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } +static inline void kasan_poison_kfree(void *ptr, unsigned long ip) {} +static inline void kasan_kfree_large(void *ptr, unsigned long ip) {} #endif /* CONFIG_KASAN */ diff --git a/include/linux/mm.h b/include/linux/mm.h index a3cac68c737c..701e9d7666d6 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1412,22 +1412,36 @@ static inline bool cpupid_match_pid(struct task_struct *task, int cpupid) #endif /* CONFIG_NUMA_BALANCING */ #if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) + +#ifdef CONFIG_KASAN_HW_TAGS +DECLARE_STATIC_KEY_FALSE(kasan_enabled); +#else +DECLARE_STATIC_KEY_TRUE(kasan_enabled); +#endif + static inline u8 page_kasan_tag(const struct page *page) { - return (page->flags >> KASAN_TAG_PGSHIFT) & KASAN_TAG_MASK; + if (static_branch_likely(&kasan_enabled)) + return (page->flags >> KASAN_TAG_PGSHIFT) & KASAN_TAG_MASK; + return 0xff; } static inline void page_kasan_tag_set(struct page *page, u8 tag) { - page->flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT); - page->flags |= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT; + if (static_branch_likely(&kasan_enabled)) { + page->flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT); + page->flags |= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT; + } } static inline void page_kasan_tag_reset(struct page *page) { - page_kasan_tag_set(page, 0xff); + if (static_branch_likely(&kasan_enabled)) + page_kasan_tag_set(page, 0xff); } -#else + +#else /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */ + static inline u8 page_kasan_tag(const struct page *page) { return 0xff; @@ -1435,7 +1449,8 @@ static inline u8 page_kasan_tag(const struct page *page) static inline void page_kasan_tag_set(struct page *page, u8 tag) { } static inline void page_kasan_tag_reset(struct page *page) { } -#endif + +#endif /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */ static inline struct zone *page_zone(const struct page *page) { diff --git a/mm/kasan/common.c b/mm/kasan/common.c index cc129ef62ab1..c5ec60e1a4d2 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -81,7 +81,7 @@ asmlinkage void kasan_unpoison_task_stack_below(const void *watermark) } #endif /* CONFIG_KASAN_STACK */ -void kasan_alloc_pages(struct page *page, unsigned int order) +void __kasan_alloc_pages(struct page *page, unsigned int order) { u8 tag; unsigned long i; @@ -95,7 +95,7 @@ void kasan_alloc_pages(struct page *page, unsigned int order) kasan_unpoison_memory(page_address(page), PAGE_SIZE << order); } -void kasan_free_pages(struct page *page, unsigned int order) +void __kasan_free_pages(struct page *page, unsigned int order) { if (likely(!PageHighMem(page))) kasan_poison_memory(page_address(page), @@ -122,8 +122,8 @@ static inline unsigned int optimal_redzone(unsigned int object_size) object_size <= (1 << 16) - 1024 ? 1024 : 2048; } -void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, - slab_flags_t *flags) +void __kasan_cache_create(struct kmem_cache *cache, unsigned int *size, + slab_flags_t *flags) { unsigned int orig_size = *size; unsigned int redzone_size; @@ -165,7 +165,7 @@ void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, *flags |= SLAB_KASAN; } -size_t kasan_metadata_size(struct kmem_cache *cache) +size_t __kasan_metadata_size(struct kmem_cache *cache) { if (static_branch_unlikely(&kasan_stack)) return (cache->kasan_info.alloc_meta_offset ? @@ -188,17 +188,17 @@ struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, return (void *)reset_tag(object) + cache->kasan_info.free_meta_offset; } -void kasan_unpoison_data(const void *address, size_t size) +void __kasan_unpoison_data(const void *addr, size_t size) { - kasan_unpoison_memory(address, size); + kasan_unpoison_memory(addr, size); } -void kasan_unpoison_slab(const void *ptr) +void __kasan_unpoison_slab(const void *ptr) { kasan_unpoison_memory(ptr, __ksize(ptr)); } -void kasan_poison_slab(struct page *page) +void __kasan_poison_slab(struct page *page) { unsigned long i; @@ -208,12 +208,12 @@ void kasan_poison_slab(struct page *page) KASAN_KMALLOC_REDZONE); } -void kasan_unpoison_object_data(struct kmem_cache *cache, void *object) +void __kasan_unpoison_object_data(struct kmem_cache *cache, void *object) { kasan_unpoison_memory(object, cache->object_size); } -void kasan_poison_object_data(struct kmem_cache *cache, void *object) +void __kasan_poison_object_data(struct kmem_cache *cache, void *object) { kasan_poison_memory(object, round_up(cache->object_size, KASAN_GRANULE_SIZE), @@ -266,7 +266,7 @@ static u8 assign_tag(struct kmem_cache *cache, const void *object, #endif } -void * __must_check kasan_init_slab_obj(struct kmem_cache *cache, +void * __must_check __kasan_init_slab_obj(struct kmem_cache *cache, const void *object) { struct kasan_alloc_meta *alloc_meta; @@ -285,7 +285,7 @@ void * __must_check kasan_init_slab_obj(struct kmem_cache *cache, return (void *)object; } -static bool __kasan_slab_free(struct kmem_cache *cache, void *object, +static bool ____kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip, bool quarantine) { u8 tag; @@ -329,9 +329,9 @@ static bool __kasan_slab_free(struct kmem_cache *cache, void *object, return false; } -bool kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip) +bool __kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip) { - return __kasan_slab_free(cache, object, ip, true); + return ____kasan_slab_free(cache, object, ip, true); } static void set_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) @@ -339,7 +339,7 @@ static void set_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); } -static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, +static void *____kasan_kmalloc(struct kmem_cache *cache, const void *object, size_t size, gfp_t flags, bool keep_tag) { unsigned long redzone_start; @@ -371,20 +371,20 @@ static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, return set_tag(object, tag); } -void * __must_check kasan_slab_alloc(struct kmem_cache *cache, void *object, - gfp_t flags) +void * __must_check __kasan_slab_alloc(struct kmem_cache *cache, + void *object, gfp_t flags) { - return __kasan_kmalloc(cache, object, cache->object_size, flags, false); + return ____kasan_kmalloc(cache, object, cache->object_size, flags, false); } -void * __must_check kasan_kmalloc(struct kmem_cache *cache, const void *object, - size_t size, gfp_t flags) +void * __must_check __kasan_kmalloc(struct kmem_cache *cache, const void *object, + size_t size, gfp_t flags) { - return __kasan_kmalloc(cache, object, size, flags, true); + return ____kasan_kmalloc(cache, object, size, flags, true); } -EXPORT_SYMBOL(kasan_kmalloc); +EXPORT_SYMBOL(__kasan_kmalloc); -void * __must_check kasan_kmalloc_large(const void *ptr, size_t size, +void * __must_check __kasan_kmalloc_large(const void *ptr, size_t size, gfp_t flags) { struct page *page; @@ -409,7 +409,7 @@ void * __must_check kasan_kmalloc_large(const void *ptr, size_t size, return (void *)ptr; } -void * __must_check kasan_krealloc(const void *object, size_t size, gfp_t flags) +void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flags) { struct page *page; @@ -419,13 +419,13 @@ void * __must_check kasan_krealloc(const void *object, size_t size, gfp_t flags) page = virt_to_head_page(object); if (unlikely(!PageSlab(page))) - return kasan_kmalloc_large(object, size, flags); + return __kasan_kmalloc_large(object, size, flags); else - return __kasan_kmalloc(page->slab_cache, object, size, + return ____kasan_kmalloc(page->slab_cache, object, size, flags, true); } -void kasan_poison_kfree(void *ptr, unsigned long ip) +void __kasan_poison_kfree(void *ptr, unsigned long ip) { struct page *page; @@ -438,11 +438,11 @@ void kasan_poison_kfree(void *ptr, unsigned long ip) } kasan_poison_memory(ptr, page_size(page), KASAN_FREE_PAGE); } else { - __kasan_slab_free(page->slab_cache, ptr, ip, false); + ____kasan_slab_free(page->slab_cache, ptr, ip, false); } } -void kasan_kfree_large(void *ptr, unsigned long ip) +void __kasan_kfree_large(void *ptr, unsigned long ip) { if (ptr != page_address(virt_to_head_page(ptr))) kasan_report_invalid_free(ptr, ip); From patchwork Thu Oct 22 13:19:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851355 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A5B4A61C for ; Thu, 22 Oct 2020 13:20:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3014D222E9 for ; Thu, 22 Oct 2020 13:20:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="jSZdrkfY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3014D222E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3A9146B009F; Thu, 22 Oct 2020 09:20:05 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3594D6B00A0; Thu, 22 Oct 2020 09:20:05 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2704D6B00A1; Thu, 22 Oct 2020 09:20:05 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0004.hostedemail.com [216.40.44.4]) by kanga.kvack.org (Postfix) with ESMTP id E940C6B009F for ; Thu, 22 Oct 2020 09:20:04 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 8A18D1EE6 for ; Thu, 22 Oct 2020 13:20:04 +0000 (UTC) X-FDA: 77399619528.20.boats11_26078ed27251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 5CD4A180C0609 for ; Thu, 22 Oct 2020 13:20:04 +0000 (UTC) X-Spam-Summary: 1,0,0,501e3a3fa4a015da,d41d8cd98f00b204,3aoerxwokcfk1e4i5pbemc7ff7c5.3fdc9elo-ddbm13b.fi7@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:69:152:355:379:541:800:960:966:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1544:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3355:3865:3867:3868:3870:3871:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4118:4250:4321:4385:4425:4605:5007:6119:6120:6261:6653:6742:7875:7901:7903:8603:8957:9025:9969:10004:11026:11232:11473:11658:11914:12043:12048:12291:12296:12297:12438:12555:12679:12683:12895:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21611:21627:21939:21990:30054,0,RBL:209.85.221.74:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04y8drdgoc19eqq41ijyqcfqaaswboc83rim58fz98aqnq8zaruuf16emujsfdn.5xkj3gnmut1ktazp4pkrrmdugu86 d33jr7eo X-HE-Tag: boats11_26078ed27251 X-Filterd-Recvd-Size: 7742 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:20:03 +0000 (UTC) Received: by mail-wr1-f74.google.com with SMTP id u15so625137wrn.4 for ; Thu, 22 Oct 2020 06:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=OXY1Rszcej9Z+zHeV4E2RjMvc6KaNi19mvRQTnsPsy0=; b=jSZdrkfYHdvmkFju49p2qS0kgX2rxE4/jZ6jdMbQBk8JbMtDBsCGSZDA0F5DFfMUzJ 125NE/PkCAu7vblUYOEBxCcXW/oqJuZuWWNUhTID58/RzuS76DG+2id6CQTTfbadeKuU Nanbu0+Vac4ZfyGxSA4Eup2d5Q0cFnKE9eF+63c/g34MmKm3qg6zcKumetvpvAlrn0NZ CT6lCbQLpwFIm4Z2BFtFjpRLquLSET4CjXaU4jxUM/X1ZV6GXtFLHARWz7EkycSfDpJZ 45XlQqS3KATaw5tIUU5NIoJW4nT6HtVwv0C3OE5c9IagN7/X9hbdZ7wMduUpy+LoOYjy sB9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=OXY1Rszcej9Z+zHeV4E2RjMvc6KaNi19mvRQTnsPsy0=; b=EdI+HMdPAUqmFZMj2fXjMN7FIEDZKZIeU/oLuRejoXLtWc+fNYXf39aXMxZtAAcVCk 4pb4i7yFsbV5ROXSwQHf+jCBOo+gd8QpG9VFU+FGHJ3ksTcm7QRd9QfReogwDVPFvFow Uojr2Yk5ZYFmEHvQas/IEDW0g8VZvnAChPxeMz7UjVC9lJJ55aIjBullYqszURifTpLx c9EpOGkOxJ0zxtFxQn/cmylqWVVg22rEXvVhjIHx+Pu/ozwM5baS5FtC5XIt04eSEzpm N36MDpOZOuIec5GMb567iuf9Diysr1HklelTm6Fk0o8QBuQhTxV3h0uTqnkvwyOvlBUz i8SQ== X-Gm-Message-State: AOAM533lnhz+Pjc2cjvGKxDUNC41JtHq0P0G25fMtB3WBhTw9yk3Ee6u vRv40XuwwSj4GyKtq2TqDLaV2mIH17lZkUPK X-Google-Smtp-Source: ABdhPJy3D1LRywWc/ht9ZMDiiul5ZWljka05fqMEDEJhehrq0Xcx8gYVjiEcOyxi8iZPzt+IvfBa0o5POo4KjZTx X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:adf:e88a:: with SMTP id d10mr2859147wrm.247.1603372802756; Thu, 22 Oct 2020 06:20:02 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:08 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 16/21] kasan: optimize poisoning in kmalloc and krealloc From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Since kasan_kmalloc() always follows kasan_slab_alloc(), there's no need to reunpoison the object data, only to poison the redzone. This requires changing kasan annotation for early SLUB cache to kasan_slab_alloc(). Otherwise kasan_kmalloc() doesn't untag the object. This doesn't do any functional changes, as kmem_cache_node->object_size is equal to sizeof(struct kmem_cache_node). Similarly for kasan_krealloc(), as it's called after ksize(), which already unpoisoned the object, there's no need to do it again. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I4083d3b55605f70fef79bca9b90843c4390296f2 --- mm/kasan/common.c | 31 +++++++++++++++++++++---------- mm/slub.c | 3 +-- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index c5ec60e1a4d2..a581937c2a44 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -360,8 +360,14 @@ static void *____kasan_kmalloc(struct kmem_cache *cache, const void *object, if (IS_ENABLED(CONFIG_KASAN_SW_TAGS) || IS_ENABLED(CONFIG_KASAN_HW_TAGS)) tag = assign_tag(cache, object, false, keep_tag); - /* Tag is ignored in set_tag without CONFIG_KASAN_SW/HW_TAGS */ - kasan_unpoison_memory(set_tag(object, tag), size); + /* + * Don't unpoison the object when keeping the tag. Tag is kept for: + * 1. krealloc(), and then the memory has already been unpoisoned via ksize(); + * 2. kmalloc(), and then the memory has already been unpoisoned by kasan_kmalloc(). + * Tag is ignored in set_tag() without CONFIG_KASAN_SW/HW_TAGS. + */ + if (!keep_tag) + kasan_unpoison_memory(set_tag(object, tag), size); kasan_poison_memory((void *)redzone_start, redzone_end - redzone_start, KASAN_KMALLOC_REDZONE); @@ -384,10 +390,9 @@ void * __must_check __kasan_kmalloc(struct kmem_cache *cache, const void *object } EXPORT_SYMBOL(__kasan_kmalloc); -void * __must_check __kasan_kmalloc_large(const void *ptr, size_t size, - gfp_t flags) +static void * __must_check ____kasan_kmalloc_large(struct page *page, const void *ptr, + size_t size, gfp_t flags, bool realloc) { - struct page *page; unsigned long redzone_start; unsigned long redzone_end; @@ -397,18 +402,24 @@ void * __must_check __kasan_kmalloc_large(const void *ptr, size_t size, if (unlikely(ptr == NULL)) return NULL; - page = virt_to_page(ptr); - redzone_start = round_up((unsigned long)(ptr + size), - KASAN_GRANULE_SIZE); + redzone_start = round_up((unsigned long)(ptr + size), KASAN_GRANULE_SIZE); redzone_end = (unsigned long)ptr + page_size(page); - kasan_unpoison_memory(ptr, size); + /* ksize() in __do_krealloc() already unpoisoned the memory. */ + if (!realloc) + kasan_unpoison_memory(ptr, size); kasan_poison_memory((void *)redzone_start, redzone_end - redzone_start, KASAN_PAGE_REDZONE); return (void *)ptr; } +void * __must_check __kasan_kmalloc_large(const void *ptr, size_t size, + gfp_t flags) +{ + return ____kasan_kmalloc_large(virt_to_page(ptr), ptr, size, flags, false); +} + void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flags) { struct page *page; @@ -419,7 +430,7 @@ void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flag page = virt_to_head_page(object); if (unlikely(!PageSlab(page))) - return __kasan_kmalloc_large(object, size, flags); + return ____kasan_kmalloc_large(page, object, size, flags, true); else return ____kasan_kmalloc(page->slab_cache, object, size, flags, true); diff --git a/mm/slub.c b/mm/slub.c index 1d3f2355df3b..afb035b0bf2d 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3535,8 +3535,7 @@ static void early_kmem_cache_node_alloc(int node) init_object(kmem_cache_node, n, SLUB_RED_ACTIVE); init_tracking(kmem_cache_node, n); #endif - n = kasan_kmalloc(kmem_cache_node, n, sizeof(struct kmem_cache_node), - GFP_KERNEL); + n = kasan_slab_alloc(kmem_cache_node, n, GFP_KERNEL); page->freelist = get_freepointer(kmem_cache_node, n); page->inuse = 1; page->frozen = 0; From patchwork Thu Oct 22 13:19:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851357 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C515261C for ; Thu, 22 Oct 2020 13:20:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 75C2124630 for ; Thu, 22 Oct 2020 13:20:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="tWtwnKyn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75C2124630 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 530F86B00A1; Thu, 22 Oct 2020 09:20:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4E16B6B00A2; Thu, 22 Oct 2020 09:20:07 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3879A6B00A3; Thu, 22 Oct 2020 09:20:07 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0239.hostedemail.com [216.40.44.239]) by kanga.kvack.org (Postfix) with ESMTP id 00DE36B00A1 for ; Thu, 22 Oct 2020 09:20:06 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 86BF08995502 for ; Thu, 22 Oct 2020 13:20:06 +0000 (UTC) X-FDA: 77399619612.24.cover48_00154ee27251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id 64D8A1A4A0 for ; Thu, 22 Oct 2020 13:20:06 +0000 (UTC) X-Spam-Summary: 1,0,0,7ae887d1786c756e,d41d8cd98f00b204,3byerxwokcfw4h7l8sehpfaiiaf8.6igfchor-ggep46e.ila@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:69:152:355:379:541:800:960:965:966:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3352:3865:3867:3868:3871:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4385:4390:4395:4425:5007:6119:6120:6261:6653:6742:7901:7903:8957:9025:9592:9969:10004:10400:11026:11473:11658:11914:12043:12048:12297:12438:12555:12679:12895:12986:13069:13311:13357:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21627:21939:21990:30054:30070,0,RBL:209.85.219.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04ygny5t7xsq55iu8o1ppgkwamr6fypobc4ayfjwe1afm4cixuamb5zamrqhb3y.ouqxubqdwy3r3x41xqcrk19ftuxu66esf azwam9oi X-HE-Tag: cover48_00154ee27251 X-Filterd-Recvd-Size: 4692 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:20:05 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id s8so988481qvv.18 for ; Thu, 22 Oct 2020 06:20:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=82GpDRN2bzlSEUUIs0zjPg3hV7sJu2/XktKPfbK22J8=; b=tWtwnKynPkzSOrG+zSy5kc/FMphMTKm2dq/9iFU7e1/dkaF/2JuWYdipjcobDjyBwy wIQC4feJr5dILPBZ3dRT/nrzycw6f57z1xZloihNJ3+gK7ipusk77GKQhcI3aKBQ2ZSR N/1r26kJcMOOQd2aXSW9ltDFysrTwSD0D7KAuzJ0nLq304E7w7cf++Vt7iYZclqE2hra w23JnppKE3gOCzKNb8lOXAgrDXBnu984Jp8yxvgvA9MRE1Xzc8XPn00MqRBYydbd/Vvf nMS4+plzVke/OgKnlh9IgvUUOrfSISvb3eiI+QxNns8PEhwTX5Dsqtizd/LGoNYa9mnt M3JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=82GpDRN2bzlSEUUIs0zjPg3hV7sJu2/XktKPfbK22J8=; b=lVjubrt4A+zqvQY6u9aQkdCbN+dgThfxM/718QKGQKtOEduV7q+okF62iwSkXkdhMF O1LhqSAh3NlQ1kRwoCIeyWDnESleGV4y3E9IJbdwTtIAL6y5R8SfO85Y3ArUBILcyCDK sHBEGWP9M9DgNj7tK5zueX5wX4iMTUv4q6Dij6tDYLySgZK9PQSBOcWVCObk1r7M0l+z SmSZG2elIy7kedtChLfAq6RS5yJrmn+PQIkTjixmPckeF4DPLDIPqUMz5um9yUFvPGnL yfhs6Jq0sL7kj2ewt6ukJ0nSsgnJBQmozuJXviVL3Hi1vGuD2XAgGNPlfyIxYbzkxtIy k3BA== X-Gm-Message-State: AOAM533/GGGby8gzrcOJy9dHKLaOP8S3ZHv9B0xi5iT4oltNsFQJjls7 Ye/ZibjKWRTOI+ikhDbe5+FOomLwNMj/ZQMS X-Google-Smtp-Source: ABdhPJzTohZHh5HournX+riNqfWMMNH1faYgSuMJ/kor6Kn86pEMP35j+/Fvz9Ycg0Qh5XDdJzsdAhfctEmFzy3g X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:4ba8:: with SMTP id i8mr2334507qvw.59.1603372805117; Thu, 22 Oct 2020 06:20:05 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:09 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 17/21] kasan: simplify kasan_poison_kfree From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: kasan_poison_kfree() is currently only called for mempool allocations that are backed by either kmem_cache_alloc() or kmalloc(). Therefore, the page passed to kasan_poison_kfree() is always PageSlab() and there's no need to do the check. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/If31f88726745da8744c6bea96fb32584e6c2778c Reviewed-by: Dmitry Vyukov --- mm/kasan/common.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index a581937c2a44..b82dbae0c5d6 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -441,16 +441,7 @@ void __kasan_poison_kfree(void *ptr, unsigned long ip) struct page *page; page = virt_to_head_page(ptr); - - if (unlikely(!PageSlab(page))) { - if (ptr != page_address(page)) { - kasan_report_invalid_free(ptr, ip); - return; - } - kasan_poison_memory(ptr, page_size(page), KASAN_FREE_PAGE); - } else { - ____kasan_slab_free(page->slab_cache, ptr, ip, false); - } + ____kasan_slab_free(page->slab_cache, ptr, ip, false); } void __kasan_kfree_large(void *ptr, unsigned long ip) From patchwork Thu Oct 22 13:19:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851359 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF5C414B4 for ; Thu, 22 Oct 2020 13:20:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9FF9A222E9 for ; Thu, 22 Oct 2020 13:20:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="WMfS9dRt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FF9A222E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 35AAE6B00A3; Thu, 22 Oct 2020 09:20:10 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 317766B00A4; Thu, 22 Oct 2020 09:20:10 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 15DFB6B00A5; Thu, 22 Oct 2020 09:20:10 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0057.hostedemail.com [216.40.44.57]) by kanga.kvack.org (Postfix) with ESMTP id CCE8A6B00A3 for ; Thu, 22 Oct 2020 09:20:09 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 3528E3625 for ; Thu, 22 Oct 2020 13:20:09 +0000 (UTC) X-FDA: 77399619738.08.metal37_330fd4227251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 183B01819E773 for ; Thu, 22 Oct 2020 13:20:09 +0000 (UTC) X-Spam-Summary: 1,0,0,0f170690038113e2,d41d8cd98f00b204,3b4erxwokcf46j9naugjrhckkcha.8kihejqt-iigr68g.knc@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:965:966:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1543:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3355:3872:3876:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4118:4321:4385:4390:4395:4425:4605:5007:6119:6120:6261:6653:6742:7901:8603:9025:9592:9969:10004:10400:11026:11658:11914:12043:12048:12296:12297:12438:12555:12679:12895:12986:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21611:21627:21939:21990:30054,0,RBL:209.85.221.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yfzffzb8xoq9rom57oyghn31hhoycoudfw48x36fnini8k4h69by97ks4tisb.mbj13wi8iqkkmcsz4f446wrt8po7we4exmcg6yyjefqoma7w1xc8j8gearaa3kp. h-lbl8.m X-HE-Tag: metal37_330fd4227251 X-Filterd-Recvd-Size: 7427 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:20:08 +0000 (UTC) Received: by mail-wr1-f73.google.com with SMTP id h8so620677wrt.9 for ; Thu, 22 Oct 2020 06:20:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=mi7vvSs1Xj6QP3ZrLQqzK4ZcKPoucW49C95TbzYwJvE=; b=WMfS9dRtWZDX51w4plP16bp5piaEqQBpE3ornSYeL4364aMXjgpHqTbWKaOtT8lIOT v5zOz0YSe6e0XtaHoql8967nc/Ii8Xyg3lq0RkSpi0aEH27mCDY9+Sm1vddt2AcHGw+3 M+4LeBiz3q9p/G41hOvs2+O6TYRJRlz5Z4/lK4kPB4PV1Uwo2emgWq4qSbkzvrBrPkMz CZRZd+EFA54+4QVaXcXhxB+1cxfOvt4wyBzRVaJBz/D+2wnhEul+MQwlP5Fgl2Sljjxs UVriHaxB0mWYuChQ5nj6umtVt+86dyH3deGoVsEldYIV3EuTpba9LgakwKDulbRSW3yy WYPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=mi7vvSs1Xj6QP3ZrLQqzK4ZcKPoucW49C95TbzYwJvE=; b=Y1PrfiKs2wraCYvO2jrOrkryM+pY5nDjd5gQBMKcngNVXJQp69AyhrpNxB5kLmAZmd DRD5EAgSDKZVEZ5FA42POgRENYOwHmyKXLZY0EG1iUZW9qi438dGq3QkMsSmb9TFxoRm V5K77F+TGUIoLgl0jaEOu+plrxomANgYczLsFCRyVTtv/fGN/PZ1QlH07s/1KhY4uguc 63YHeowJHsJDkBihGZFQbyH8WPA2l2w45aFKdE2NNLhbjVINThvXNPxT/GQwWwNTNI9P 7VVRkoVUvEagbegSKF0We6x37erDZu/FICsAeoZTjvzMbCCURd0tkF4KcTmM3iANF/Mm A/eQ== X-Gm-Message-State: AOAM532V2Z6QhPeSQrvwsJkIsfjRb8LAGEb+M/e3OZxcm/zQ73sxI8cz gTZlm9OnnY2pHqFq1TMkgdBU8qof4/2tR5tW X-Google-Smtp-Source: ABdhPJyeu67ARBka23poZcAOoLY0EqwcOXOj2FFCFiEBl9x3OWHicQB9Jdn9dGK4WtpJc3PPmsLntPwXfNYvLXyq X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:4b09:: with SMTP id y9mr2666404wma.90.1603372807440; Thu, 22 Oct 2020 06:20:07 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:10 +0200 In-Reply-To: Message-Id: <5a6f32308101c49da5eef652437bd3da9234c0da.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 18/21] kasan: rename kasan_poison_kfree From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Rename kasan_poison_kfree() into kasan_slab_free_mempool() as it better reflects what this annotation does. No functional changes. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I5026f87364e556b506ef1baee725144bb04b8810 Reviewed-by: Dmitry Vyukov --- include/linux/kasan.h | 16 ++++++++-------- mm/kasan/common.c | 16 ++++++++-------- mm/mempool.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 8654275aa62e..2ae92f295f76 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -162,6 +162,13 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, unsigned return false; } +void __kasan_slab_free_mempool(void *ptr, unsigned long ip); +static inline void kasan_slab_free_mempool(void *ptr, unsigned long ip) +{ + if (static_branch_likely(&kasan_enabled)) + __kasan_slab_free_mempool(ptr, ip); +} + void * __must_check __kasan_slab_alloc(struct kmem_cache *s, void *object, gfp_t flags); static inline void * __must_check kasan_slab_alloc(struct kmem_cache *s, @@ -202,13 +209,6 @@ static inline void * __must_check kasan_krealloc(const void *object, return (void *)object; } -void __kasan_poison_kfree(void *ptr, unsigned long ip); -static inline void kasan_poison_kfree(void *ptr, unsigned long ip) -{ - if (static_branch_likely(&kasan_enabled)) - __kasan_poison_kfree(ptr, ip); -} - void __kasan_kfree_large(void *ptr, unsigned long ip); static inline void kasan_kfree_large(void *ptr, unsigned long ip) { @@ -244,6 +244,7 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, { return false; } +static inline void kasan_slab_free_mempool(void *ptr, unsigned long ip) {} static inline void *kasan_slab_alloc(struct kmem_cache *s, void *object, gfp_t flags) { @@ -264,7 +265,6 @@ static inline void *kasan_krealloc(const void *object, size_t new_size, { return (void *)object; } -static inline void kasan_poison_kfree(void *ptr, unsigned long ip) {} static inline void kasan_kfree_large(void *ptr, unsigned long ip) {} #endif /* CONFIG_KASAN */ diff --git a/mm/kasan/common.c b/mm/kasan/common.c index b82dbae0c5d6..5622b0ec0907 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -334,6 +334,14 @@ bool __kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip) return ____kasan_slab_free(cache, object, ip, true); } +void __kasan_slab_free_mempool(void *ptr, unsigned long ip) +{ + struct page *page; + + page = virt_to_head_page(ptr); + ____kasan_slab_free(page->slab_cache, ptr, ip, false); +} + static void set_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) { kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); @@ -436,14 +444,6 @@ void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flag flags, true); } -void __kasan_poison_kfree(void *ptr, unsigned long ip) -{ - struct page *page; - - page = virt_to_head_page(ptr); - ____kasan_slab_free(page->slab_cache, ptr, ip, false); -} - void __kasan_kfree_large(void *ptr, unsigned long ip) { if (ptr != page_address(virt_to_head_page(ptr))) diff --git a/mm/mempool.c b/mm/mempool.c index 79bff63ecf27..0e8d877fbbc6 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -106,7 +106,7 @@ static inline void poison_element(mempool_t *pool, void *element) static __always_inline void kasan_poison_element(mempool_t *pool, void *element) { if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) - kasan_poison_kfree(element, _RET_IP_); + kasan_slab_free_mempool(element, _RET_IP_); if (pool->alloc == mempool_alloc_pages) kasan_free_pages(element, (unsigned long)pool->pool_data); } From patchwork Thu Oct 22 13:19:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851361 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1C63A61C for ; Thu, 22 Oct 2020 13:20:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C1FA624630 for ; Thu, 22 Oct 2020 13:20:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="ChsOlRrZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1FA624630 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8DF446B00A4; Thu, 22 Oct 2020 09:20:12 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 839AA6B00A5; Thu, 22 Oct 2020 09:20:12 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 704426B00A6; Thu, 22 Oct 2020 09:20:12 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0134.hostedemail.com [216.40.44.134]) by kanga.kvack.org (Postfix) with ESMTP id 386AB6B00A4 for ; Thu, 22 Oct 2020 09:20:12 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id B88923625 for ; Thu, 22 Oct 2020 13:20:11 +0000 (UTC) X-FDA: 77399619822.03.hand64_39024de27251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin03.hostedemail.com (Postfix) with ESMTP id 87AC628A4E8 for ; Thu, 22 Oct 2020 13:20:11 +0000 (UTC) X-Spam-Summary: 1,0,0,948964e4f5a175ce,d41d8cd98f00b204,3cyerxwokcga8lbpcwiltjemmejc.amkjglsv-kkit8ai.mpe@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:966:967:968:973:988:989:1042:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1542:1593:1594:1711:1730:1747:1777:1792:1981:2194:2196:2199:2200:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3352:3865:3867:3868:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4385:4425:5007:6120:6261:6653:6742:7901:8603:9025:9969:10004:10400:10429:10430:10431:11026:11232:11473:11658:11914:12043:12048:12296:12297:12438:12555:12679:12895:12986:13161:13229:14096:14097:14181:14394:14659:14721:19903:19997:21080:21365:21444:21451:21627:21772:21939:21990:30003:30012:30054,0,RBL:209.85.128.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04y81xhyfa5sqferrjmc8j1quosyiocczxqaws4ctph6njosfda1p5ibr3o4sj1.khr ey3sckqy X-HE-Tag: hand64_39024de27251 X-Filterd-Recvd-Size: 5575 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:20:10 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id s25so583603wmj.7 for ; Thu, 22 Oct 2020 06:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=YuCr19yY32x7rWFAvs+3N7JOh1jAyp/iY7KfCFpXvOQ=; b=ChsOlRrZcpMoNGFYVgPoeVQg4Og5D+L7BbXiRVwpiZdViVq24qE3ZXqD3tQKH1FVJ7 HPd8FiV4pgtZUpYsxjl4hjAI/chk6N6P7ZOwFJUSMDGqaZlGN3Hx2rCtgiR2Spdsr11A 3RijHVED0ZEakIzCCu8/+3wIW9zFSUQ1BdGEpmQt/saJo1CR2tEUDMT1zxXdSJBvnLiS 5+2dw/bqnsJNllMA9jtkCYiE9XPytCZ2yg+rSNEse1oRsbObLdRtoFTJYWV+BND/RPsk pbKBGe+3Ar4H6vvSgqCb8RcHo/nToy4mNwHFBvnAXbW5hdwoTVk4JYy0UyQMOuTBOAbB 3krg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=YuCr19yY32x7rWFAvs+3N7JOh1jAyp/iY7KfCFpXvOQ=; b=YxceieHekpdWCAb5BI0hjiQPVjlC/fh9FKj4/ofGNd6CweoE0owH51G1acDuAyYCPm NeuH9Jrm8PU6sxl+iL8ylgU495j1UyOs7I7cHJdQczEEK5hy+gvtriNHBdZduER4Xk7C 3gGNRTJ1fnowkK6w2RG+CeORqvKwTLxs4zx32vMKkbq/NHFfkr4kpqeTz3igLkZmx6Z4 K2jDtbg5F1WJvrXXG8vtErGcUOOKFHe3fKh/VaFXOC15vovnAv8fDZKx2rZhHG80+Z+e drUwmL/23T2ByxMqS1by0MV1HCRRvohwj0Mn5/B6+2RzNlQclfT3FBPQi+bRv8ZUF01p 9iZA== X-Gm-Message-State: AOAM531MtUqlGaTL38Ykb/pl+aLQ9arUs67BmoXgOMoeHB9rPuN07ta7 BUWSRWszIZlJrxBhZRLFi514iekK9AFz2vTr X-Google-Smtp-Source: ABdhPJwWNBYBHEv7lNZy893nJ+RAAVNZlsa6c03VHyI91VlaLfFFNpC5caS3U7BZ/Z95iIq4PIHypm2N0XWIka41 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a7b:c04a:: with SMTP id u10mr2667777wmc.83.1603372809904; Thu, 22 Oct 2020 06:20:09 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:11 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 19/21] kasan: don't round_up too much From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: For tag-based mode kasan_poison_memory() already rounds up the size. Do the same for software modes and remove round_up() from common code. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Ib397128fac6eba874008662b4964d65352db4aa4 Reviewed-by: Dmitry Vyukov --- mm/kasan/common.c | 8 ++------ mm/kasan/shadow.c | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 5622b0ec0907..983383ebe32a 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -215,9 +215,7 @@ void __kasan_unpoison_object_data(struct kmem_cache *cache, void *object) void __kasan_poison_object_data(struct kmem_cache *cache, void *object) { - kasan_poison_memory(object, - round_up(cache->object_size, KASAN_GRANULE_SIZE), - KASAN_KMALLOC_REDZONE); + kasan_poison_memory(object, cache->object_size, KASAN_KMALLOC_REDZONE); } /* @@ -290,7 +288,6 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object, { u8 tag; void *tagged_object; - unsigned long rounded_up_size; tag = get_tag(object); tagged_object = object; @@ -311,8 +308,7 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object, return true; } - rounded_up_size = round_up(cache->object_size, KASAN_GRANULE_SIZE); - kasan_poison_memory(object, rounded_up_size, KASAN_KMALLOC_FREE); + kasan_poison_memory(object, cache->object_size, KASAN_KMALLOC_FREE); if (static_branch_unlikely(&kasan_stack)) { if ((IS_ENABLED(CONFIG_KASAN_GENERIC) && !quarantine) || diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index 616ac64c4a21..ab1d39c566b9 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -82,6 +82,7 @@ void kasan_poison_memory(const void *address, size_t size, u8 value) * addresses to this function. */ address = reset_tag(address); + size = round_up(size, KASAN_GRANULE_SIZE); shadow_start = kasan_mem_to_shadow(address); shadow_end = kasan_mem_to_shadow(address + size); From patchwork Thu Oct 22 13:19:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851363 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 088E061C for ; Thu, 22 Oct 2020 13:20:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AF18A222E9 for ; Thu, 22 Oct 2020 13:20:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="HfX7ercL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF18A222E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B97EE6B00A6; Thu, 22 Oct 2020 09:20:14 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B48056B00A7; Thu, 22 Oct 2020 09:20:14 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 99A0E6B00A8; Thu, 22 Oct 2020 09:20:14 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0190.hostedemail.com [216.40.44.190]) by kanga.kvack.org (Postfix) with ESMTP id 690B06B00A6 for ; Thu, 22 Oct 2020 09:20:14 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 01E988996995 for ; Thu, 22 Oct 2020 13:20:14 +0000 (UTC) X-FDA: 77399619948.17.brass90_4306a7227251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id D91FE180D0180 for ; Thu, 22 Oct 2020 13:20:13 +0000 (UTC) X-Spam-Summary: 1,0,0,8dc8272c4e7d1e20,d41d8cd98f00b204,3dierxwokcgmboesfzlowmhpphmf.dpnmjovy-nnlwbdl.psh@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1541:1593:1594:1711:1730:1747:1777:1792:1981:2194:2199:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3353:3865:3867:3868:3870:3871:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4425:5007:6120:6261:6653:6742:7901:8660:9025:9592:9969:10004:10400:11026:11473:11658:11914:12043:12048:12296:12297:12438:12555:12679:12895:12986:13069:13148:13230:13311:13357:14096:14097:14181:14394:14659:14721:21080:21212:21365:21444:21451:21627:21939:21990:30054:30070,0,RBL:209.85.221.74:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yr38w7yxjucmbq5in1n5x3m3q4yyppgs1446rz1nu5ckccmm36b6cmchpzbaz.dcg7bp9hjpgdbzhcyh17nj8xdh9q3cgzrq5 bmhxn9n5 X-HE-Tag: brass90_4306a7227251 X-Filterd-Recvd-Size: 5449 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:20:13 +0000 (UTC) Received: by mail-wr1-f74.google.com with SMTP id n14so624496wrp.1 for ; Thu, 22 Oct 2020 06:20:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=xOXxdsX9wfgVlPASo24fEeH7IiHQsViadxCdQzhZ1/Y=; b=HfX7ercL+cFW/KClhFoz+6kZbu2i+/58U1zQot0xkcWJUF4lNlzTPutId70SOfd2su jTfaHHJ/k1+6vcydfwijYQY45vVXk4hQxn0bovGm+FuCTzRWCzYeHfO5c+0PaBsWEAs9 SkSvJy/yjNmODf8+50lkI136iZ6TU/E+cKDQ2rkS5Evb8rPm80APJnXIvGMRkPuFRDXJ MxmPdEPchFR3620tU25OHllWIx19ppDbTTIYyRq9ZyvHnxi3SPOuQLihNQInuBF5+BW9 Lhm+va8L6VezXpICA36BvVmlZaQeLJCdYjNnF5WhHdYgVS3mujiiSLiBvdM8+39/CCs1 s+gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=xOXxdsX9wfgVlPASo24fEeH7IiHQsViadxCdQzhZ1/Y=; b=GWPEmz8al4rgk9kT0yTeeJpZLefj7e+InEoghjaVnHnejP1le9ZalPdCE54Gni6HGH n110SdUcPxBrvg8LGD7jBs/9Zx++gIYbOcj/cp23s2FRngadDcLtSlRDetXnLzDsGQ44 50smBPvZoDflS58av7b85FM59f5Kl47pUdBu/u2LptjWBmzr0XXJhIiXBIl9l6DU9YjM uzF5rUdstd9RTLIwR6cJ6OiEaksRDQeulzBWblmpw/N7CrCeDNtA/no606mryXXXdtTQ fvNpiP50CjLlfPe/62KBUvUo1wv1T5CIGlUZAPnACeuIoUlqXjEB0wg7Y+SUbxJrSEJK IgGQ== X-Gm-Message-State: AOAM530cURpooAx59In/NfaSWbIAt5q24CBmomz2WKyxpFYTiLaJS7ed /pWbzdxuxN/kM2HRayit8Ij4NcffMNQhPJJO X-Google-Smtp-Source: ABdhPJxmmX9viwK28cT2Ay5EHxingwtZYKgXsdkjeLwZhFRedSASX0UK4zU6EaIwvfeoe8I2Gxb7B7c+TXE5SqrB X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:3503:: with SMTP id c3mr2468528wma.43.1603372812346; Thu, 22 Oct 2020 06:20:12 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:12 +0200 In-Reply-To: Message-Id: <6e866efaa7620162a9824914186ce54b29c17788.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 20/21] kasan: simplify assign_tag and set_tag calls From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: set_tag() already ignores the tag for the generic mode, so just call it as is. Add a check for the generic mode to assign_tag(), and simplify its call in ____kasan_kmalloc(). Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I18905ca78fb4a3d60e1a34a4ca00247272480438 Reviewed-by: Dmitry Vyukov --- mm/kasan/common.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 983383ebe32a..3cd56861eb11 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -235,6 +235,9 @@ void __kasan_poison_object_data(struct kmem_cache *cache, void *object) static u8 assign_tag(struct kmem_cache *cache, const void *object, bool init, bool keep_tag) { + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + return 0xff; + /* * 1. When an object is kmalloc()'ed, two hooks are called: * kasan_slab_alloc() and kasan_kmalloc(). We assign the @@ -277,8 +280,8 @@ void * __must_check __kasan_init_slab_obj(struct kmem_cache *cache, __memset(alloc_meta, 0, sizeof(*alloc_meta)); } - if (IS_ENABLED(CONFIG_KASAN_SW_TAGS) || IS_ENABLED(CONFIG_KASAN_HW_TAGS)) - object = set_tag(object, assign_tag(cache, object, true, false)); + /* Tag is ignored in set_tag() without CONFIG_KASAN_SW/HW_TAGS */ + object = set_tag(object, assign_tag(cache, object, true, false)); return (void *)object; } @@ -360,9 +363,7 @@ static void *____kasan_kmalloc(struct kmem_cache *cache, const void *object, KASAN_GRANULE_SIZE); redzone_end = round_up((unsigned long)object + cache->object_size, KASAN_GRANULE_SIZE); - - if (IS_ENABLED(CONFIG_KASAN_SW_TAGS) || IS_ENABLED(CONFIG_KASAN_HW_TAGS)) - tag = assign_tag(cache, object, false, keep_tag); + tag = assign_tag(cache, object, false, keep_tag); /* * Don't unpoison the object when keeping the tag. Tag is kept for: From patchwork Thu Oct 22 13:19:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851365 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C49D61C for ; Thu, 22 Oct 2020 13:20:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EEBA1241A3 for ; Thu, 22 Oct 2020 13:20:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="tYUeZ/yu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EEBA1241A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B025A6B00A8; Thu, 22 Oct 2020 09:20:16 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A5C506B00A9; Thu, 22 Oct 2020 09:20:16 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 94B5E6B00AA; Thu, 22 Oct 2020 09:20:16 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0104.hostedemail.com [216.40.44.104]) by kanga.kvack.org (Postfix) with ESMTP id 6315B6B00A8 for ; Thu, 22 Oct 2020 09:20:16 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 103851EF3 for ; Thu, 22 Oct 2020 13:20:16 +0000 (UTC) X-FDA: 77399620032.14.veil20_4e11cd327251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id C94E318229818 for ; Thu, 22 Oct 2020 13:20:15 +0000 (UTC) X-Spam-Summary: 1,0,0,4179f5628090e5f0,d41d8cd98f00b204,3doerxwokcgudqguhbnqyojrrjoh.frpolqxa-ppnydfn.ruj@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:965:966:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1534:1540:1593:1594:1711:1714:1730:1747:1777:1792:2196:2199:2393:2525:2559:2563:2682:2685:2693:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3350:3865:3872:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4385:4390:4395:4425:5007:6119:6120:6261:6653:6742:7901:7903:9025:9969:10004:10400:11026:11658:11914:12043:12048:12296:12297:12438:12555:12679:12895:13069:13311:13357:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21627:21939:30012:30054,0,RBL:209.85.222.201:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yrgmppx6p9q3hqkcqbotf35crj7ycmuq1op81wzi88dur6e3j45f1bptqd1qq.rgpmgybqu9mrpdumycsqjq4muma8ziuybjiyymw7n47tdpc8t8wne4wssz6d9x k.y-lbl8 X-HE-Tag: veil20_4e11cd327251 X-Filterd-Recvd-Size: 4353 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:20:15 +0000 (UTC) Received: by mail-qk1-f201.google.com with SMTP id i2so1023405qkk.0 for ; Thu, 22 Oct 2020 06:20:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=mqqQQdM8JUr2kVRXhQOSR7CrNIaI2iWXdt/tai4LwbA=; b=tYUeZ/yuoAUqpMMtT3/FXIgF1U5aJ/Y/E3Q07dKl0M4ZTDGyDLG1y7pJyS20XAVNjp GtwFPBc7sHc1pInjRGbbIz1G+Wddt8RvUgbEcqpQabJVabz83pxs5+iYGehudHLpTAGw 1m+lZXfOUZGZief7N9zp6TU19VIeQLN8s64Pqc1PqicXS5zNDx+UXRHBHn6wBlGNneyA n6iavQ7gpjas2eEHo8v7WaeaT39jAeU1zFUaIgjC9oHg5SDhR1Y6IeCguJs4YTVJoi3o FsInPlHbbG8001FIuLQ92owi/jo5PvRhUCEMmIGJiU88BgUAUbDY0ZfnjrJ3lvI4BK7/ swTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=mqqQQdM8JUr2kVRXhQOSR7CrNIaI2iWXdt/tai4LwbA=; b=SWOS5nbJuuZ3QIYEvsowLeJDwdPYxx5Fw0EuAUYkp9KDbjABEkkyusR81L4xS+jMHQ CGtUEWUzhxGCXe/J+k9n4whKTtjH1MuYyOf8bnr/HcpT90vuDga1Ve8Oaq+fSjtHkSdd 0E8J+jkhlJ3BgQEaOi/Q88Pq7AyGMURf5pxjPzmIY5lVZnxLW+/FrKrVmXi0CuvHKM2z IXpw1ntf/Crz52jPpR/j5NDJTZb5Q2gWApbyq3hna6r7x9NLE2G2bkBLu49ftDqNynru kX1Y+wztqvoicS7B/pl/37ZWFnzHzarQcdM9n7KuooC6EShZhF9O3HABOLN34rxnJ7e3 aONg== X-Gm-Message-State: AOAM532SpikWkKqKiSImP/P+gN+3TDaldX9QbyGgjpy0kB5vXWUg1Xgy Uje11CgzigIN7jPAZZJkwtXcBUGWfw01McNT X-Google-Smtp-Source: ABdhPJwJgylx1JUTQNojAJNRJerxaTTFGMzntqBoaDQwRIiDViUSDSWvbVuNd0NgpRRQCLWkPAGm38knN8O0I1xf X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:a261:: with SMTP id f88mr2273549qva.56.1603372814622; Thu, 22 Oct 2020 06:20:14 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:13 +0200 In-Reply-To: Message-Id: <6ed65cca58736301a1cacb539a6e672aecd7859d.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 21/21] kasan: clarify comment in __kasan_kfree_large From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Currently it says that the memory gets poisoned by page_alloc code. Clarify this by mentioning the specific callback that poisons the memory. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I1334dffb69b87d7986fab88a1a039cc3ea764725 Reviewed-by: Dmitry Vyukov --- mm/kasan/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 3cd56861eb11..54af79aa8d3f 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -445,5 +445,5 @@ void __kasan_kfree_large(void *ptr, unsigned long ip) { if (ptr != page_address(virt_to_head_page(ptr))) kasan_report_invalid_free(ptr, ip); - /* The object will be poisoned by page_alloc. */ + /* The object will be poisoned by kasan_free_pages(). */ }