From patchwork Wed Jun 14 17:41:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 108070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp127314vqr; Wed, 14 Jun 2023 10:53:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5RcZmZaUuNymST/VR6GG5hhE4tt1pHu2ZtOldnNlTD6ICApMYncowni22hQGCBCr1LP423 X-Received: by 2002:a17:906:dc8a:b0:982:8918:7d9e with SMTP id cs10-20020a170906dc8a00b0098289187d9emr1378657ejc.62.1686765233959; Wed, 14 Jun 2023 10:53:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686765233; cv=none; d=google.com; s=arc-20160816; b=KyrKDFmg5N+jpFOHjsld1kx2K+Vsqn9kNl6t8RIFwclmFSeW0GaEYAxFzgGSK5pbTw L6FUnsvtkwI9vKVUayrtBwdbj843cqF0Pa2nuXtOjuLZ9IHUhHirQe3S+E9XhG6CPdtP dFG33xk1Vh9vmYYm5R2TZRlMHeB2fP/RJIcIdVlYqYl9bY7/ssCFThT74z27f2+yJnDT BzTLOOkH8eDrDysKhK9DFVmfuq/AQKQfiFq5K+x8cz7bDs5qMgVnozIhB4UAKN+W42D+ 2nl5FFksm/7GlIowROlq/HSz3RyjMCAGYFJpkU+fkgCSmr/3L5zqlArai9Gvt88tVO5A tV4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-signature; bh=3z3MKtktPipTbMT6FDWkS53LB65olic/LTA7JjPLGS4=; b=lDI6FuDmQMMyr0oArOZ/0mN840/DkmOvIbBzwF9jPKlNmCOFYg7bE7C9NTEdpdqson S9IUwq2rowGYpaevnTc7IRKDhzQuHGhWWKbrNMaR9xCub9sKxwILVGgtspiCs1n7KXSq Kt7kV4vH+EZwfnabS+5xVZvWS3XJEe4wIL4PJhPD9zEUBGWwYug5yL30eS1vj6N1Ptp5 4IWjqRWAAA8Z6XpaoUJutGO88gRTIiPL8ZKZ8/2+o9bjfinDmJll59mDyju2J/PrUGVU qbN6egV4iF853yKLIPCRaiW7YKKQX5T/5Y3zsgba0Wy8kgVbFHiLpevCrkSCSILmmg6c EuRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=W1wHrjih; dkim=neutral (body hash did not verify) header.i=@alien8.de header.s=alien8 header.b="inFYy5/8"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z2-20020a1709063ac200b00977e918b23fsi7649736ejd.449.2023.06.14.10.53.28; Wed, 14 Jun 2023 10:53:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=W1wHrjih; dkim=neutral (body hash did not verify) header.i=@alien8.de header.s=alien8 header.b="inFYy5/8"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237086AbjFNRmI (ORCPT + 99 others); Wed, 14 Jun 2023 13:42:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234236AbjFNRmG (ORCPT ); Wed, 14 Jun 2023 13:42:06 -0400 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA8682110 for ; Wed, 14 Jun 2023 10:42:04 -0700 (PDT) Received: from mail.alien8.de (mail.alien8.de [IPv6:2a01:4f9:3051:3f93::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 44A421EC0758; Wed, 14 Jun 2023 19:42:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1686764523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=3z3MKtktPipTbMT6FDWkS53LB65olic/LTA7JjPLGS4=; b=W1wHrjihlD6J5AGBhE3CMPJw71eldpg1oFRWgV9EbIRUDmwXzb4noEeC3iUzoFdTTZgU4E Mzg5stCWZxvBC3JVUciO6dlCpbxPn3mnkZA2HmTl/kEtBUr3dX4nh8uCssyGot4Oplx3jV r2AP/V0v1Tb+fKwk0YRMZlf/si3UnNc= X-Virus-Scanned: Debian amavisd-new at mail.alien8.de Authentication-Results: mail.alien8.de (amavisd-new); dkim=fail (4096-bit key) reason="fail (body has been altered)" header.d=alien8.de Received: from mail.alien8.de ([127.0.0.1]) by localhost (mail.alien8.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id G3Qa-VRC4uQ0; Wed, 14 Jun 2023 17:42:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=alien8; t=1686764520; bh=PnUSMmI/UMKWMxp9iAR2+Lo0CSCvDctjlDJJNzAxRdE=; h=From:To:Cc:Subject:Date:From; b=inFYy5/84D3/T2SCKZlCOLXACW6YtXFTAZeTNNbMRHc7RaQUwjLgflOYxapmZMqZ7 MVLu7kGhV4y0js6FSXvpRw9wK+IkP8J9V8mHZqx0Zvkd48uFfFmT1pn8/o6XLDkM00 uAMA6cL98pknhsssh9H4e9dPp/0CIJqKNNt3ZtXnEVddGp7XIe7JYBYAW9f4eQ/++R K5mIGCcadluLJEc9P23QLkNkHuIN5iJT8NGuUmyDoTbz0xjTq4YXXj5+gzPGruMUHl qWjVeqS5+wU61rSJs8saTW/YZv/gPLzPxS7sB+G1y3hA2/xECwsAIS3de6eK6vsQ23 CjdpSG7IyGewMaEJ2ipJVYs+B2TbirHVDBJi51VK7lEuI+dZu9ZWUcRNDWtOS3BHMH c8NACpAaBdpqPcLikQXCa2RBj6NhyBa+E7G+OiLAl3hQ8abUzbBOUWlCBUjJAhhZmS hlvXC0VRrgOPq6eLWWsk2u/MBHADrj21hVWe9Jpp9CipNMhDCSyhdUP1EWsFD1Div2 izFwuPBvUxhZw1QIirWrQQu2lMb8r/1E0XGb/OYnEtl7jV5thmy2SI6uVBHytGTN8n kGd8C7QGKTOM5abeBn/dA4lEvrCXBNWD9omYTfU2Q1YJEyOMpNLal7lyrt7Bj8r24p CAmPXdVzUkXDt6oMKWocnIh8= Received: from zn.tnic (p200300ea971dc522329c23FFFEA6A903.dip0.t-ipconnect.de [IPv6:2003:ea:971d:c522:329c:23ff:fea6:a903]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 9562740E0185; Wed, 14 Jun 2023 17:41:57 +0000 (UTC) From: Borislav Petkov To: X86 ML Cc: "Kirill A . Shutemov" , LKML Subject: [PATCH] x86/mm: Remove unused current_untag_mask() Date: Wed, 14 Jun 2023 19:41:48 +0200 Message-Id: <20230614174148.5439-1-bp@alien8.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768701541692966005?= X-GMAIL-MSGID: =?utf-8?q?1768701541692966005?= From: "Borislav Petkov (AMD)" e0bddc19ba95 ("x86/mm: Reduce untagged_addr() overhead for systems without LAM") removed its only usage site so drop it. Move the tlbstate_untag_mask up in the header and drop the ugly ifdeffery as the unused declaration should be properly discarded. Signed-off-by: Borislav Petkov (AMD) Acked-by: Kirill A. Shutemov --- arch/x86/include/asm/tlbflush.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h index 75bfaa421030..80450e1d5385 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -14,6 +14,8 @@ #include #include +DECLARE_PER_CPU(u64, tlbstate_untag_mask); + void __flush_tlb_all(void); #define TLB_FLUSH_ALL -1UL @@ -54,15 +56,6 @@ static inline void cr4_clear_bits(unsigned long mask) local_irq_restore(flags); } -#ifdef CONFIG_ADDRESS_MASKING -DECLARE_PER_CPU(u64, tlbstate_untag_mask); - -static inline u64 current_untag_mask(void) -{ - return this_cpu_read(tlbstate_untag_mask); -} -#endif - #ifndef MODULE /* * 6 because 6 should be plenty and struct tlb_state will fit in two cache