From patchwork Tue Dec 20 06:36:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 34932 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2813718wrn; Mon, 19 Dec 2022 23:04:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf7jz7BmqZqayqPTDxFkFQtDc5mZKYa0EKGwVEjH/cD/xm1udbNbEnpRj/KLhJL6e08FnhDS X-Received: by 2002:a62:e219:0:b0:577:d10d:6eab with SMTP id a25-20020a62e219000000b00577d10d6eabmr47963145pfi.21.1671519856912; Mon, 19 Dec 2022 23:04:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671519856; cv=none; d=google.com; s=arc-20160816; b=cz3O49xWKj5/0m4KRgy2POsuRiScR9Ox0PdOSKMvH4o/FEuE+uebrolXZpinmOfsyM n5wH4j5L9icZUCz0LyJ+fr6IBiaBQXglT/BuXxPNjKKUVgEBw2jCweRkzb0RUP+WRnGK tJKZ4ioYUmUIz7P9m6jac9OUC1d5+Us20f3cYbfBIHG7px6Hgdix0lJjL8qZc7dT3O8Z F6PTlE97O/T8cOx4ti562VL+hyofjovCqq4Bs7wwfH0gLjzo1BRgGG6UNVAE0LU2bK8K 1Ga5H9m09qYbfgAZCQqacehPX6nM37XJXOgZTSB+tOJVg1R3ICd1p6Kx79zM3JYWojy3 dNyw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vh86c52AI4jixrEGzY6NHO0WH1hit48wl3rot9rxk8Y=; b=jmjjZYMIRkeQW4ZWZ+0RfClFsckdLey7i52IQEDhJYkNV3JAfdhs1XEe3NhDAFgDAu kj7Nw5bZTVKPtZFjRHUYZQHLOZdK70ynMli6qPi/dc6VgYG/NuqtWWCAhdb63cOuEG4G qJPktQwcGN3LFWeDiSbM9jxhXZMQr4CRSvT3QDx44UV75GhGLfV1SK5mjUwlIlMQvl7i EuyW042Avy3R/NCvcUtvC8XzB/a3Qa1+5B3q+0VpVvXivaJZKkh2txiG2feAjgp3qbER u5kAGXjYYefIiIqT9NCfLRSJhJnkJFCPtL02OTvQlgSArK5rFCzcIl5umZnNI730W29B R2Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=R2aKI80c; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bd32-20020a056a0027a000b005721983ea38si12525920pfb.48.2022.12.19.23.04.03; Mon, 19 Dec 2022 23:04:16 -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=@intel.com header.s=Intel header.b=R2aKI80c; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233643AbiLTHDe (ORCPT + 99 others); Tue, 20 Dec 2022 02:03:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233238AbiLTHBh (ORCPT ); Tue, 20 Dec 2022 02:01:37 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 912D113DD5; Mon, 19 Dec 2022 23:01:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671519696; x=1703055696; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WILQEUcGGh0f3+f/4EusBZPXm98ZhSdCi01R/9hMgCA=; b=R2aKI80caPQZa4KRIzO31xq6/EzJ0uT1GTmkkaU0vu7GcJ/0w1S9xpQb gxliCZswJ93+zNrE2SD78BUE84x//qC2lTWE/NjK2GQXbDLVFFauPLdlw OXe9peFBjrheFYaztaMZOCIBnmPgTx3aPoj5in1VBgE/WXmNxtX3RAnXT hn+0fJCnzsJeCeMzqA94IXrqZrYmm8ELeyTjobc8sPZS2JkXbhX8BmozG NVZFXyeIJtoVEXUedmjLJYn+FhwArXd66uds2OxXfQy4GJN7N8PG10qLY pOKN4v2qj7+Kcb7p4XNmgK8UXE5tjMYRJ5DVmPZw/vxjSJjNwVVAM+pj8 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="302972033" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="302972033" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 23:01:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="644326477" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="644326477" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga007.jf.intel.com with ESMTP; 19 Dec 2022 23:01:13 -0800 From: Xin Li To: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, peterz@infradead.org, andrew.cooper3@citrix.com, seanjc@google.com, pbonzini@redhat.com, ravi.v.shankar@intel.com Subject: [RFC PATCH 15/32] x86/fred: make unions for the cs and ss fields in struct pt_regs Date: Mon, 19 Dec 2022 22:36:41 -0800 Message-Id: <20221220063658.19271-16-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221220063658.19271-1-xin3.li@intel.com> References: <20221220063658.19271-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_NONE 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?1752715605209382973?= X-GMAIL-MSGID: =?utf-8?q?1752715605209382973?= From: "H. Peter Anvin (Intel)" Make the cs and ss fields in struct pt_regs unions between the actual selector and the unsigned long stack slot. FRED uses this space to store additional flags. The printk changes are simply due to the cs and ss fields changed to unsigned short from unsigned long. Signed-off-by: H. Peter Anvin (Intel) Signed-off-by: Xin Li --- arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- arch/x86/include/asm/ptrace.h | 36 ++++++++++++++++++++++++--- arch/x86/kernel/process_64.c | 2 +- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index 4af81df133ee..6349c818d20a 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c @@ -76,7 +76,7 @@ static void warn_bad_vsyscall(const char *level, struct pt_regs *regs, if (!show_unhandled_signals) return; - printk_ratelimited("%s%s[%d] %s ip:%lx cs:%lx sp:%lx ax:%lx si:%lx di:%lx\n", + printk_ratelimited("%s%s[%d] %s ip:%lx cs:%x sp:%lx ax:%lx si:%lx di:%lx\n", level, current->comm, task_pid_nr(current), message, regs->ip, regs->cs, regs->sp, regs->ax, regs->si, regs->di); diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index f4db78b09c8f..341e44847cc1 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h @@ -82,13 +82,41 @@ struct pt_regs { * On hw interrupt, it's IRQ number: */ unsigned long orig_ax; -/* Return frame for iretq */ + + /* Return frame for iretq/eretu/erets */ unsigned long ip; - unsigned long cs; + union { + unsigned long csl; /* CS + any fields above it */ + struct __attribute__((__packed__)) { + unsigned short cs; /* CS selector proper */ + unsigned int current_stack_level: 2; + unsigned int __csl_resv1 : 6; + unsigned int interrupt_shadowed : 1; + unsigned int software_initiated : 1; + unsigned int __csl_resv2 : 2; + unsigned int nmi : 1; + unsigned int __csl_resv3 : 3; + unsigned int __csl_resv4 : 32; + }; + }; unsigned long flags; unsigned long sp; - unsigned long ss; -/* top of stack page */ + union { + unsigned long ssl; /* SS + any fields above it */ + struct __attribute__((__packed__)) { + unsigned short ss; /* SS selector proper */ + unsigned int __ssl_resv1: 16; + unsigned int vector : 8; + unsigned int __ssl_resv2: 8; + unsigned int type : 4; + unsigned int __ssl_resv3: 4; + unsigned int enclv : 1; + unsigned int long_mode : 1; + unsigned int nested : 1; + unsigned int __ssl_resv4: 1; + unsigned int instr_len : 4; + }; + }; }; #endif /* !__i386__ */ diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 6b3418bff326..bfe6179b7a17 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -116,7 +116,7 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode, printk("%sFS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n", log_lvl, fs, fsindex, gs, gsindex, shadowgs); - printk("%sCS: %04lx DS: %04x ES: %04x CR0: %016lx\n", + printk("%sCS: %04x DS: %04x ES: %04x CR0: %016lx\n", log_lvl, regs->cs, ds, es, cr0); printk("%sCR2: %016lx CR3: %016lx CR4: %016lx\n", log_lvl, cr2, cr3, cr4);