From patchwork Sun Nov 27 11:13:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 26326 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5066574wrr; Sun, 27 Nov 2022 03:22:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf49BYU9OZUb/kmUm0VF6eTl+y81phvAs39MLHaTGH2o6ICINerG5umDSAoJyYNKKcVfxyBb X-Received: by 2002:a17:90b:3d04:b0:200:43c8:175a with SMTP id pt4-20020a17090b3d0400b0020043c8175amr54852864pjb.88.1669548146622; Sun, 27 Nov 2022 03:22:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669548146; cv=none; d=google.com; s=arc-20160816; b=d/M59VKOUsqZ+ju6e4NgwHWEeKnCN+FrUFszMC/h6ITMiy0ZAtEYaCUp1ndxqH690F T684x91/+Ch4Ytt/7kprO3a+9MAZJ2K+xAV36pi2E0jlGL+fE0GmBJxWNipSQzaOGkOA g9pRcKQTUgVoA6w7Ftpj+rxVa1rgVZl95EZGHtrJ8UsWCFesKq2Zvo38UX3AV4r6FLKd Y6MazRtAfuR+GFuH9zR02Ga1a2Cs6yCuxVvq28Jw8Yj3uf5IuEk2WoJhlKgdnJXw2XiC ESqv4XOis7awlNBHLm3NQ/qggDIZdWfhdvOr/rZ15IOnO6HYMjx+ENId0jGgAyebqbsy cUzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-disposition :mime-version:message-id:subject:cc:to:from:date:dkim-signature :dkim-signature; bh=/hJQt8aogWSZjN5sT9Dyem+5KAdpXY3iOrxHIUUZNfE=; b=KznPQraZDIw+K/PSxmdl4hrJKSd5Jqv1lq7Vw+SWUIW1IWIVH4nZK8X9KnXLjITLYU RoLR0YNaOylD77Mi/6y+a4bZbdvM9erXelflaLrz16ghrl5xbA5oPIvVLg6V6ud+iSVF 99shCEjwvqorv8m6GRvQkPd6IM4NAcuWqxkQW9JVuS17XfyyqcmT0Trr5ljgdxv7Dcdq vPdvxZ/SkfiYVXnWlkY7PQaCfNsrfouHZMJ8CDJw2conshO3tqnoNcdghkwJ7/FHOFR9 BYM3dbbVwsbjiod0dm3lp9As2g47lDshXBQWAaLA7xDzHJ3ZGvJR+a7dT0gsMQhJajnI ejBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Et+JiPRJ; dkim=neutral (no key) header.i=@suse.de; 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=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jw1-20020a170903278100b00189380323f7si4486205plb.318.2022.11.27.03.22.14; Sun, 27 Nov 2022 03:22:26 -0800 (PST) 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=@suse.de header.s=susede2_rsa header.b=Et+JiPRJ; dkim=neutral (no key) header.i=@suse.de; 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=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229580AbiK0LOH (ORCPT + 99 others); Sun, 27 Nov 2022 06:14:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229513AbiK0LOF (ORCPT ); Sun, 27 Nov 2022 06:14:05 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AC06D50 for ; Sun, 27 Nov 2022 03:14:04 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 897B821B79; Sun, 27 Nov 2022 11:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1669547642; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/hJQt8aogWSZjN5sT9Dyem+5KAdpXY3iOrxHIUUZNfE=; b=Et+JiPRJ2UR+9m3ph8Y19TAknEOfw7K3neSm+wyyPM9O7QzSby54Q5ZCa1vyCbQOoxObe6 PDBAObY209T2vgCc8Cj8hyLcwHN6gEGFPyxvBRWc9nRdkoRjRAPTm6ScHnDUeKBPgzqJMR 2JcVDUnFXrzCXNXC/SgNq/8Kfcqg4JI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1669547642; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/hJQt8aogWSZjN5sT9Dyem+5KAdpXY3iOrxHIUUZNfE=; b=MafNahvWWlZfGYWsL19jYplmuMsPFsYXltI2zOP31JNomSUT9l3d/fOkA17AFVoMOe9oiJ IMEAhfwYmaeFKPCg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7437413428; Sun, 27 Nov 2022 11:14:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id I2HaG3pGg2PvdwAAMHmgww (envelope-from ); Sun, 27 Nov 2022 11:14:02 +0000 Date: Sun, 27 Nov 2022 12:13:58 +0100 From: Borislav Petkov To: Linus Torvalds Cc: x86-ml , lkml Subject: [GIT PULL] x86/urgent for 6.1-rc7 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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?1750648116956317085?= X-GMAIL-MSGID: =?utf-8?q?1750648116956317085?= Hi Linus, please pull a couple of urgent x86 fixes which accumulated recently, for 6.1. Thx. --- The following changes since commit eb7081409f94a9a8608593d0fb63a1aa3d6f95d8: Linux 6.1-rc6 (2022-11-20 16:02:16 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/x86_urgent_for_v6.1_rc7 for you to fetch changes up to 4dbd6a3e90e03130973688fd79e19425f720d999: x86/ioremap: Fix page aligned size calculation in __ioremap_caller() (2022-11-22 12:21:16 +0100) ---------------------------------------------------------------- - ioremap: mask out the bits which are not part of the physical address *after* the size computation is done to prevent and hypothetical ioremap failures - Change the MSR save/restore functionality during suspend to rely on flags denoting that the related MSRs are actually supported vs reading them and assuming they are (an Atom one allows reading but not writing, thus breaking this scheme at resume time.) - prevent IV reuse in the AES-GCM communication scheme between SNP guests and the AMD secure processor ---------------------------------------------------------------- Michael Kelley (1): x86/ioremap: Fix page aligned size calculation in __ioremap_caller() Pawan Gupta (2): x86/tsx: Add a feature bit for TSX control MSR support x86/pm: Add enumeration check before spec MSRs save/restore setup Peter Gonda (1): virt/sev-guest: Prevent IV reuse in the SNP guest driver arch/x86/include/asm/cpufeatures.h | 3 ++ arch/x86/kernel/cpu/tsx.c | 38 +++++++-------- arch/x86/mm/ioremap.c | 8 +++- arch/x86/power/cpu.c | 23 +++++---- drivers/virt/coco/sev-guest/sev-guest.c | 84 +++++++++++++++++++++++++++------ 5 files changed, 112 insertions(+), 44 deletions(-)