From patchwork Wed Jan 11 10:18:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 13096369 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B075FC5479D for ; Wed, 11 Jan 2023 10:18:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A5068E0002; Wed, 11 Jan 2023 05:18:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 356208E0001; Wed, 11 Jan 2023 05:18:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21D9F8E0002; Wed, 11 Jan 2023 05:18:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 10BAB8E0001 for ; Wed, 11 Jan 2023 05:18:15 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E4F5F1208FA for ; Wed, 11 Jan 2023 10:18:14 +0000 (UTC) X-FDA: 80342118108.29.83B2B85 Received: from mail-lj1-f201.google.com (mail-lj1-f201.google.com [209.85.208.201]) by imf04.hostedemail.com (Postfix) with ESMTP id 5216040014 for ; Wed, 11 Jan 2023 10:18:13 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=bqqcT2FV; spf=pass (imf04.hostedemail.com: domain of 344y-YwYKCBw8DA56J8GG8D6.4GEDAFMP-EECN24C.GJ8@flex--glider.bounces.google.com designates 209.85.208.201 as permitted sender) smtp.mailfrom=344y-YwYKCBw8DA56J8GG8D6.4GEDAFMP-EECN24C.GJ8@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673432293; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=PBX6ktcO3Ge095CwaOXemPHb5zPjrq8Ho5XrQZ9Bxvg=; b=OojRq22SkOg9sJJIwRn4N0jfDmhtk5XVzjoZinHIe1TW5cjClJnkxsYbeXrEsSuXeGRpk0 dNaZFDAt9r4cKi2KJ4iFI2KNUH+Kk0hcv8aH8bB30QafS+QuqcJ5eoSoiyeprSFlw1ZsSh pupmKjr4/pSdMZkfVJixOKCQB+GhoqQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=bqqcT2FV; spf=pass (imf04.hostedemail.com: domain of 344y-YwYKCBw8DA56J8GG8D6.4GEDAFMP-EECN24C.GJ8@flex--glider.bounces.google.com designates 209.85.208.201 as permitted sender) smtp.mailfrom=344y-YwYKCBw8DA56J8GG8D6.4GEDAFMP-EECN24C.GJ8@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673432293; a=rsa-sha256; cv=none; b=4vR0piMQl4RF/NNRPKPSvGG1wxkMFzn0Fw7s1ji4R5UVyrCRKp1CBruArn0DbIZoUSwyBt f4MPPcYjJbN3rXTvuahSJNCYDsvliREZGeFHV0asXVcG9yGx4jpGPxYodEh404ndwiX8C8 E6zbcDYJLVCmby+5a/5J7GrEvqZ0Gb4= Received: by mail-lj1-f201.google.com with SMTP id w9-20020a2e9989000000b002831e1aaac6so2911017lji.14 for ; Wed, 11 Jan 2023 02:18:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=PBX6ktcO3Ge095CwaOXemPHb5zPjrq8Ho5XrQZ9Bxvg=; b=bqqcT2FVFiBu6f8kPh3KoIxAbk+mVUFALhsHjDK0hMLgCUAdL5me7vcjnxCx80rB9b Gzc07MjHzzZo2816B4wC2RA92p8pDRX3MjCVW2puJ8lsqZJ4YmrjEHfOC70KP6UXPbxX e/veF5hWoeXz34SghDx7p8yLY+6r5LH0SkgCVbwfO3yTG+xXz+LeBoSYVzS53I0tLfuq iotLNjTOjTzEF2CA4U+JNPCmQpps+cdfwJLD6VlPGQQkdbwBbiZIH7RvH21wDqyvtbls ZurKCqsftSnNBDyiSKGOMNsuSKEAtMiavAPDWCpK1HgxVuf50KTKSQSPvn1OgI0A4x1V uWWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PBX6ktcO3Ge095CwaOXemPHb5zPjrq8Ho5XrQZ9Bxvg=; b=xCk0eTa+QWFV2fuc2AAI+h2PSI2kSy3xguyqUBRYJpCtT/6b5yp3ZBZgDALYms7dXV eH3Bow0SM1fBKdBWxuVhrWtPH5hefRChEBxWh4+Pa2eQz80vuAPxzZU/Z7lzI58fPfSg V5eZ2M2IBgbMzVPVEbXMG9CPf2QMUbyJ5dX3rNjCECx0Hn5vD55ZE/q33rM5yrudNMTP a7lo9tRYrC52zXqllOxdEJ+GNVyPWM2RsHYra7lNAo1effJkd15HNt5S0/U8H+PmtxTD I+ByxYeMdVUJJbCQgriGlr/L4+d+dAJbMKohSOgl1KfzMmR7/MYSpdhwGE3rKKEkmrgo fxTw== X-Gm-Message-State: AFqh2krunhRzCtAjsBMwP3gm7bttoXXNQTvqQagsjO02h/Rf1wgb2VPp qjwTHMmgUTtG2hy5NqvnFiynAvW3V0o= X-Google-Smtp-Source: AMrXdXsiS/4gZ6OefjNUDp2d8XXZArpryqGnokNoLm4LvBVglaG84Is8mlOk89qrIJRcyI3+99wXhjp764E= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:c1cc:851a:3d0:4d31]) (user=glider job=sendgmr) by 2002:a05:6512:3b07:b0:4b6:f1af:4263 with SMTP id f7-20020a0565123b0700b004b6f1af4263mr3407142lfv.114.1673432291206; Wed, 11 Jan 2023 02:18:11 -0800 (PST) Date: Wed, 11 Jan 2023 11:18:06 +0100 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230111101806.3236991-1-glider@google.com> Subject: [PATCH] Revert "x86: kmsan: sync metadata pages on page fault" From: Alexander Potapenko To: glider@google.com Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, peterz@infradead.org, mingo@redhat.com, elver@google.com, dvyukov@google.com, linux-mm@kvack.org, kasan-dev@googlegroups.com, luto@kernel.org, tglx@linutronix.de, x86@kernel.org, Qun-Wei Lin X-Stat-Signature: 9ujs51pt99ht1hotq15wzxej4nmtwoxk X-Rspam-User: X-Rspamd-Queue-Id: 5216040014 X-Rspamd-Server: rspam06 X-HE-Tag: 1673432293-91233 X-HE-Meta: U2FsdGVkX1+YQTGKQ1dNfD3Qv0uftDdTIbInKQSvZnoVSf4maqPEpwELC/FDSi00RK2WjuPFLc204pi3/82Ydnd84GmcOpnwNugzB9CC7sBNwAMZQtlWoleyV3TQs5UMqsAB8JWq248BPaQXtoZhqnMfYnjttvQYDwrNf2O/aTN//veXYnifMqz4rTp314fDip3z2uauXMiYATfVUpEl+Gf/4+vHaxQxSQGkpgu1UdNZlyp1ft0j2M/ZvQY0z4FhEDaTF/naxMRRY7Ou3w1gbWE+9rbb+H+D+bAVxiQnrrYqkfijkVF3DDnCfblhyPQLILrOflVvSSKpeht96JS161Ww1cKe1VwKva/SvA7onqCiZMkNorPW3rkARfPQSRVFZZBuUhT7r1ZQGreKCdIAypIZEAIT740tHbGgi34mGaZzSReR431cVZ0y3gt+O0uNssxe0ggLpr9wjrfjIE4r2kAKGHBCFgkq0HFA1AfM+ZvI2VGwId4JzBEcnOOaRw4ytLEyS72HAd1L5nKJ51DoFiF3qLIgqEV2HC5LhluChXjCNI1O6VsJNECHxvB+uqiZ/vyCDkWLxA28smudhjJnNZ11lOIvUV6VfgLNdz52r9Z/fPivoJXgK4iXgtz5W4OvXGOoyxIsBLZEvtD1jnNdlB34CgNfjXlprlLSLe5f/kAeWQjHJ3Z+f3Y4uAIujDxvfcpKrEIyjCOLaAqotoj/pDLGjdwbf3ICDs82xEBSjvDjtXEzWLAn1CXyG6P5UdyoV18QkOIR9uYN8CZHvHuu+YnjWw79VLfkmJsdbAJg3x6IfDLfWqgC4rb8heFJx1FR6U7SPOVtg+J3AUtnz8SfTCnJBzFsE4aQ0gfM0Gm7QlhC1NTPm1iKaTm9ZyPKgo7L3rpf+30NCtla1ypG8MfmW4/SRP+jWW1tg2WgHJKQCKAk7fsmaz9YcqBQSsQ0lihK+/AUgUndrjwBtWVG7lL NsoqT9PZ 215Q5ZAzMtMs7tePYRpClu5WK0W4Sr/R8j8Ukr6NdjuzWQ2dPs83InjEzn3jeqIRAJm6ORPuHm6LTGKRi59QXQjsIXzoxK0v4WvvBl81SVrkfmqt1yLNDCuAqWoYdRIE0bd4wGNFHktazBw/RlCSngDXLa9f/wBATnCl0osZfKpjdTSjVcAzuKduUvGS4xyOI+j6YmEYGJS4MrEZRU+sNPkde0VszHsIRJ1OHV7V+N5468Ap1RJsv9Pxpe+0jDe09KVTE6NPhMAolP1NL9aJE/MhFZRwP/1Z/KPpResKWg4cu976e+l1+DCM0EwMenxt5Y/NrMHvEu2+fB+X9Y3JucmhoqYkPtYHGUneEHgzrWCLl0+M= 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: This reverts commit 3f1e2c7a9099c1ed32c67f12cdf432ba782cf51f. As noticed by Qun-Wei Lin, arch_sync_kernel_mappings() in arch/x86/mm/fault.c is only used with CONFIG_X86_32, whereas KMSAN is only supported on x86_64, where this code is not compiled. The patch in question dates back to downstream KMSAN branch based on v5.8-rc5, it sneaked into upstream unnoticed in v6.1. Reported-by: Qun-Wei Lin Link: https://github.com/google/kmsan/issues/91 Signed-off-by: Alexander Potapenko --- arch/x86/mm/fault.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 7b0d4ab894c8b..a498ae1fbe665 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -260,7 +260,7 @@ static noinline int vmalloc_fault(unsigned long address) } NOKPROBE_SYMBOL(vmalloc_fault); -static void __arch_sync_kernel_mappings(unsigned long start, unsigned long end) +void arch_sync_kernel_mappings(unsigned long start, unsigned long end) { unsigned long addr; @@ -284,27 +284,6 @@ static void __arch_sync_kernel_mappings(unsigned long start, unsigned long end) } } -void arch_sync_kernel_mappings(unsigned long start, unsigned long end) -{ - __arch_sync_kernel_mappings(start, end); -#ifdef CONFIG_KMSAN - /* - * KMSAN maintains two additional metadata page mappings for the - * [VMALLOC_START, VMALLOC_END) range. These mappings start at - * KMSAN_VMALLOC_SHADOW_START and KMSAN_VMALLOC_ORIGIN_START and - * have to be synced together with the vmalloc memory mapping. - */ - if (start >= VMALLOC_START && end < VMALLOC_END) { - __arch_sync_kernel_mappings( - start - VMALLOC_START + KMSAN_VMALLOC_SHADOW_START, - end - VMALLOC_START + KMSAN_VMALLOC_SHADOW_START); - __arch_sync_kernel_mappings( - start - VMALLOC_START + KMSAN_VMALLOC_ORIGIN_START, - end - VMALLOC_START + KMSAN_VMALLOC_ORIGIN_START); - } -#endif -} - static bool low_pfn(unsigned long pfn) { return pfn < max_low_pfn;