From patchwork Tue Dec 5 10:49:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 173971 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3358607vqy; Tue, 5 Dec 2023 03:21:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGtlz4SCBwmADPle/c7FnBIrjBySs3VVdxRNAYZl6yDZeHxkYvhcl+1cSvmQJqlD6yhZQ+f X-Received: by 2002:a05:6358:1206:b0:16e:3803:9cf8 with SMTP id h6-20020a056358120600b0016e38039cf8mr6985109rwi.24.1701775297747; Tue, 05 Dec 2023 03:21:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701775297; cv=none; d=google.com; s=arc-20160816; b=vNY/hMW57McXprmcNg7XhJg23YsTcIkFYTpKVqDit6YGi0Jvea4Qlf8Fh8TBCaqRm8 98WzLhmeCBzc0y1PD5XIivj/KWzq25q3b1WhoRIjz8XuvpPXWJM/lweKZGeiFBn1JLZO +Xq0aXwIhoSIJF6EhsoiT+zoiteVEwAGzkEVGUBJR5BtGmCyZpm43pJo/9W0gkMBAhp1 ubSshv+kPOcNTR90o1K6TTNsEcuW6apHZLbBJSRiQCbmWM81pEG92AK1deoEaQJqNQUK kPh4U/eVGEEPqiERLNYMNacrfF3Uf6vD8Ir30nhu/VSizXUymx6AxpJoRLG30wbQ4FAd th5Q== 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=BeRPR4/jGXaagDxjLmGXy/cMX+4XIuRgyHAD1FALYJw=; fh=uCCWEUVpLc/xDP/D3WvGY/BxHU9d0NQYu/T71GEsNmA=; b=SXQZEjkiRRe7H/TB2lJGppsLXd6QRTFfPO5pb+IayXYVSoxJwY5JwpSKoueTbkbACV wCbJSRxdMljbVc+owHoDfBVQmB/wsQU7LVU0JTNHGKmdyc0pMO9dztrWbub38whFTcCP G7lx8LQE5KpCd+W4l2Cv2mo4Dqohj+XpsRFcDzMfY2Olb9yDCPCoWUqlDx0ADtmlWZqR u2TGYSwPSccM4EWgn35CBUqAmq7r5Yfc+mT0MM5Ef+3TS59aTh6UwU6dc74hPqO48yBB +pyiThF4xvi7pUC7NbVhgxdFVac9+mhnLddYGRFTHU46kYzHM4cFUXLRQB3JxIs2frMo JPkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YbZjYnno; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id v6-20020a626106000000b006ce6a1cbc97si1240916pfb.68.2023.12.05.03.21.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 03:21:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YbZjYnno; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 30C448038F3D; Tue, 5 Dec 2023 03:21:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442078AbjLELVU (ORCPT + 99 others); Tue, 5 Dec 2023 06:21:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346758AbjLELVN (ORCPT ); Tue, 5 Dec 2023 06:21:13 -0500 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FBC99A; Tue, 5 Dec 2023 03:21:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701775281; x=1733311281; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4HjA/ehjhpPNNDfV0w3r41UQQGamUWV+NqHjpKdn1bk=; b=YbZjYnnoUkYCqZLBRM/gh+BpSdVFW+Vlhek6Nu8N0BXAzL61644shYH7 1X0azAKeUjc/MdLrfJfBiNxA3wozIz39WRemZXk8G9sVzh6m3OCYcrWvN xadjC7aKYzWwvyddx1vv6g7FMoiisKh3AIs9ostRQ6AT+UkC7ocVzvTb2 O4OD6NyVyl8ZaYJGgqNMWu0m3xddJ8/y7Ea18xA7KdoAWCveyBMjUexYu pPOamlM/BKzaz8O7V87Zd9Mk622ad2xS//aho799ejVjmSTKpaX29fHw8 aS51tT16oZfCtuE8T27us06IpPX01nlIaC/3r7z7/VBREWYZoGfLCvtXg w==; X-IronPort-AV: E=McAfee;i="6600,9927,10914"; a="942363" X-IronPort-AV: E=Sophos;i="6.04,252,1695711600"; d="scan'208";a="942363" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2023 03:21:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10914"; a="1018192900" X-IronPort-AV: E=Sophos;i="6.04,252,1695711600"; d="scan'208";a="1018192900" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga006.fm.intel.com with ESMTP; 05 Dec 2023 03:21:16 -0800 From: Xin Li To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, linux-hyperv@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, luto@kernel.org, pbonzini@redhat.com, seanjc@google.com, peterz@infradead.org, jgross@suse.com, ravi.v.shankar@intel.com, mhiramat@kernel.org, andrew.cooper3@citrix.com, jiangshanlai@gmail.com, nik.borisov@suse.com, shan.kang@intel.com Subject: [PATCH v13 02/35] x86/entry: Remove idtentry_sysvec from entry_{32,64}.S Date: Tue, 5 Dec 2023 02:49:51 -0800 Message-ID: <20231205105030.8698-3-xin3.li@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231205105030.8698-1-xin3.li@intel.com> References: <20231205105030.8698-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, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 05 Dec 2023 03:21:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784440734813991713 X-GMAIL-MSGID: 1784440734813991713 idtentry_sysvec is really just DECLARE_IDTENTRY defined in , no need to define it separately. Tested-by: Shan Kang Signed-off-by: Xin Li --- arch/x86/entry/entry_32.S | 4 ---- arch/x86/entry/entry_64.S | 8 -------- arch/x86/include/asm/idtentry.h | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 4e295798638b..1b0fe4b49ea0 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -649,10 +649,6 @@ SYM_CODE_START_LOCAL(asm_\cfunc) SYM_CODE_END(asm_\cfunc) .endm -.macro idtentry_sysvec vector cfunc - idtentry \vector asm_\cfunc \cfunc has_error_code=0 -.endm - /* * Include the defines which emit the idt entries which are shared * shared between 32 and 64 bit and emit the __irqentry_text_* markers diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 567d973eed03..5a1660701623 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -370,14 +370,6 @@ SYM_CODE_END(\asmsym) idtentry \vector asm_\cfunc \cfunc has_error_code=1 .endm -/* - * System vectors which invoke their handlers directly and are not - * going through the regular common device interrupt handling code. - */ -.macro idtentry_sysvec vector cfunc - idtentry \vector asm_\cfunc \cfunc has_error_code=0 -.endm - /** * idtentry_mce_db - Macro to generate entry stubs for #MC and #DB * @vector: Vector number diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h index 05fd175cec7d..cfca68f6cb84 100644 --- a/arch/x86/include/asm/idtentry.h +++ b/arch/x86/include/asm/idtentry.h @@ -447,7 +447,7 @@ __visible noinstr void func(struct pt_regs *regs, \ /* System vector entries */ #define DECLARE_IDTENTRY_SYSVEC(vector, func) \ - idtentry_sysvec vector func + DECLARE_IDTENTRY(vector, func) #ifdef CONFIG_X86_64 # define DECLARE_IDTENTRY_MCE(vector, func) \