From patchwork Fri Nov 13 22:20: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: 11904985 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 B00FB697 for ; Fri, 13 Nov 2020 22:20:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 75442206F9 for ; Fri, 13 Nov 2020 22:20:55 +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="gVybcLoF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75442206F9 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 304756B009C; Fri, 13 Nov 2020 17:20:54 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2B08B6B009D; Fri, 13 Nov 2020 17:20:54 -0500 (EST) 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 1A34E6B009E; Fri, 13 Nov 2020 17:20:54 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0009.hostedemail.com [216.40.44.9]) by kanga.kvack.org (Postfix) with ESMTP id D96CD6B009C for ; Fri, 13 Nov 2020 17:20:53 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 8024933CD for ; Fri, 13 Nov 2020 22:20:53 +0000 (UTC) X-FDA: 77480815986.28.coal31_4507b7d27312 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 586116C1A for ; Fri, 13 Nov 2020 22:20:53 +0000 (UTC) X-Spam-Summary: 1,0,0,33f2f11fa9ab6655,d41d8cd98f00b204,3wwavxwokcjau7xbyi47f508805y.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:1542: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:6261:6653:6742:7901:8603:8660:9025:9592:9969:10004:10400:11026:11473:11658:11914:12043:12296:12297:12438:12555:12679:12895:12986:13148:13230:14096:14097:14181:14394:14659:14721:21080:21212:21365:21444:21451:21627:21939:21990:30054:30070,0,RBL:209.85.128.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04y8s67d4qxsxxzgwg4h16mdrjqm5ycqbpzx93jkr4p8zqpgps383gh7hu8dxsz.qi6jaygancmcqehpywztcw9zsmqeha9kydfbmhxn9n5u6ogoo6usog155y7 c91c.4-l X-HE-Tag: coal31_4507b7d27312 X-Filterd-Recvd-Size: 5679 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Fri, 13 Nov 2020 22:20:52 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id j62so3140578wma.4 for ; Fri, 13 Nov 2020 14:20:52 -0800 (PST) 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=FjDCd3uZs5tZgyebUG073A1B5l2RXwE8lidjbcRsCvs=; b=gVybcLoFQUNnqi8BvDXIuLxWzyBvmJ9r8YgiuYhT5Vu2C/zCCrI7te3RDmVOXAIc8d jWdwWo5LeuXbMT+aa3nFbTr7pi1D7mqVCTn1+Kr06wbwlyMlEdafbkwCQf+Np9kgAEwq G18BCLYbfNs//MAyXfJCvA4BZPSNOgVNjaxII/tGOSP3J7KzzOpraccZJslROAokEP/w gbpLxCXcb8AwsSYVXkVGO1YkPuVk07OlX1Ri3z5eDOhzP2nxBArhzqAoDZvUib0T7cA6 sxJ2VEfODnX22F93ftmfkG7ItpS54IPEpfsGlbzriQ4c07kVaMvIWMlMtIo0OfVbEEEc TDHw== 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=FjDCd3uZs5tZgyebUG073A1B5l2RXwE8lidjbcRsCvs=; b=cq7t8FmYD5jcrcjyuKSNqUPwxKw7XnHjkGW7i82MMs9nd1ysD98+l6gyGWEuTiEWBa n/4UWVawyn44s0ZTNMQwErDhpg/hmLHhxlpthNTFP2IrzSIlx9DHN2Cv0cOozuNbmUd6 pI21dAq1LRuQFmBhaAEbnr9C2F94Mc/WWbhtwBLfAOfiE6DeHWA8kRNJfsF5d7hvVFBL F7l4bVN7Ofp3loBOERXS7V+8rgnij3lJE3yqj/AM+JyeetIKZZRC4CbtQs/sfNwclMtW po69cbd3Cw62oPkITciSNpGCFa4G0binmVJxUgnhqwHsBNdisdXDNt+kie7Z/gJ9MVmp wwlQ== X-Gm-Message-State: AOAM532uftf4PcVIn+ceiOUvCGR/PZAdSLdWNmBAEjlI4BPqwB3DFcvr B+vrIvBJY6lwu47cqYUPAb9Z8sbelehbzlJZ X-Google-Smtp-Source: ABdhPJyhSXjfAMNZDyab6PZ2QpxILyu3jBNhWgi25Hcu7VUSLE8KCaS2ijL7XZdOMCTm1EGjb1TAJwfcjEDFzQlL X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:adf:e74d:: with SMTP id c13mr6274338wrn.277.1605306051483; Fri, 13 Nov 2020 14:20:51 -0800 (PST) Date: Fri, 13 Nov 2020 23:20:05 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH mm v3 15/19] kasan: simplify assign_tag and set_tag calls From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , 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 Reviewed-by: Dmitry Vyukov Reviewed-by: Marco Elver Link: https://linux-review.googlesource.com/id/I18905ca78fb4a3d60e1a34a4ca00247272480438 --- mm/kasan/common.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 1a88e4005181..821678a58ac6 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -234,6 +234,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 @@ -276,8 +279,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; } @@ -364,7 +367,7 @@ static void *____kasan_kmalloc(struct kmem_cache *cache, const void *object, { unsigned long redzone_start; unsigned long redzone_end; - u8 tag = 0xff; + u8 tag; if (gfpflags_allow_blocking(flags)) quarantine_reduce(); @@ -379,9 +382,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); /* Tag is ignored in set_tag without CONFIG_KASAN_SW/HW_TAGS */ unpoison_range(set_tag(object, tag), size);