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); }