Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
From:   Julian Stecklina <julian.stecklina@cyberus-technology.de>
To:     Sean Christopherson <seanjc@google.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org,
        "H. Peter Anvin" <hpa@zytor.com>
Cc:     Julian Stecklina <julian.stecklina@cyberus-technology.de>,
        kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] KVM: x86: rename push to emulate_push for consistency
Date:   Wed,  4 Oct 2023 15:38:27 +0200
Message-Id: <20231004133827.107-2-julian.stecklina@cyberus-technology.de>
In-Reply-To: <20231004133827.107-1-julian.stecklina@cyberus-technology.de>
References: <20231004133827.107-1-julian.stecklina@cyberus-technology.de>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OUiB2rgZCIWE1hTDTB6PKAxAJ5AHOxmrI7WPvjuufamXt8McX4jhpT9czAEi?=
 =?us-ascii?Q?otdpXm/77zl+X8dMBl+6VpZFtyfyrFCiIRS2y9LEY4aL3UpugVRHXP2qSkSr?=
 =?us-ascii?Q?MQEXzFkiyipRtQxQpTaAzVUpK9DDLwwu/uvhwYovQb+QwUNF7bjiomTp0RrU?=
 =?us-ascii?Q?XcAWKSQSRTSLYe4+1eBlRIriVC0RLi/wJERAQKuJVv6WYyxPOdmbpqsX6rC4?=
 =?us-ascii?Q?bYgu7edK4rWIwRRzFVi0Xemeu5I9AsKNjycN8K6kPlnNxQVKIdDy7QIGx9nb?=
 =?us-ascii?Q?VjPcRViUBMEo/qT0M6tyFv4uthq8wR9ji0uPmO49fPQfIsGhN7mpR45KA1JV?=
 =?us-ascii?Q?YrsSwsRzbNACrXPrPBOUZrmB6Ew94lF3hTlKIzF2JvATbpMt5EHm+edkuooh?=
 =?us-ascii?Q?pLsaTw0y5RPZQ9wprNSuwCmUqbjfFs+p3LVWmbN4yxqd/SEzCjh1MAlbg9Np?=
 =?us-ascii?Q?mlxgMuXmbvPXplzS/ErV2vdQyCin8DLUwLn78FfV+KSgI2y6qWdSqlWfZJuD?=
 =?us-ascii?Q?L1RoZEmoxKrO0oElEH2SJ2jBX1Klw7RrvE7MPrOGMvUjVqrBe+YEQSVFYrAq?=
 =?us-ascii?Q?l0x7kRd7A4+XSQg3PBc2OkUnGcXvk19ijUVaxTZubrdLMFMciAEUFdtj2sZO?=
 =?us-ascii?Q?L04jxjsVscu+ydf+asV9s5kY2SGRDup4XyioI1aVUOoEhFa3FcSIOG3Q724C?=
 =?us-ascii?Q?P5Rr9oDVIYrPFdH8NCOCow5WtMbJfqmV6uQ4qf5kMTMkQ2NjP1ra01OElPEs?=
 =?us-ascii?Q?TOfki2f5RPysYNNe9WeTVnS+PEgrzIrVhEnjdilIE8dlRygjC66sWdTafClA?=
 =?us-ascii?Q?e7U+oU6F8wMhHqOgXYrE2V/AZSovOXTLwEVqM7AgB2rtawIEqHLsipdx56kh?=
 =?us-ascii?Q?2jLCmS7VXshK1dr5C3FFo4UEaxAiInES+zez8c/BDqJF1+CoaZMMUAhnVf2X?=
 =?us-ascii?Q?wKM3VS6t1TnpX13bkS2JdXeHo1aDDwYFgC53cevRASNfBAjNtooAj0qD6tBU?=
 =?us-ascii?Q?N/a5sKktWJKkogHyzkYIZSmMOFmjLih0CcISi26CXqvqDf2dkzAiNKUV+XlT?=
 =?us-ascii?Q?BZ+bbvPrTrXa+msu9vzMYTZ+tZIUc6rZwm6zC83eoTD3d+f79VNQDacJhBPz?=
 =?us-ascii?Q?D1dH6X8waCvjT31KKt6NYOx/GvKM4PAwKK18uJ3OK/nGIGtxhff+WdTlJFSz?=
 =?us-ascii?Q?i8be9vtgnTXQpCSzW+VN0bq6X5j9+A7kfL88erEdL7bP5zsfWIt2+ePuTS3j?=
 =?us-ascii?Q?cVVtlDVPrZO0WsdVGOhWnGFRDjcE82ks/ujciwdp8tAtzhxVajkuYziUF1Io?=
 =?us-ascii?Q?Hh3E8w9M2YbNgZQvRsIDr1crxS1Fk1AYaEUVX65qIJoindsaIZh+WrpNRouA?=
 =?us-ascii?Q?Ydy5MSco20K1vP0emweVazVohwGECENB3GrG4Qe9g1XRwlXcMf+QYBnORdva?=
 =?us-ascii?Q?Mb8P4mQ17OAoUSTUXHZ9XEIisN9QlRjNWXR3f0QF32fDFHnZctzQI8ujODEJ?=
 =?us-ascii?Q?2mf7BaHS7FCnAKWa+ZZbWrBdv2y/UYfH3eFkiyDLAx8ZyvPF9FEjtsbB0m1A?=
 =?us-ascii?Q?kKDhwX1GOdouzh6z/KtQ0mJN+wT96Ma3PODASiLbNn7H4Cahbn4SgPT27t3C?=
 =?us-ascii?Q?9kjFqb9Ie5hUX5BYBwVdxlA=3D?=
X-OriginatorOrg: cyberus-technology.de
X-MS-Exchange-CrossTenant-Network-Message-Id: eda76357-74e7-4314-c354-08dbc4df3de4
X-MS-Exchange-CrossTenant-AuthSource: FR3P281MB1567.DEUP281.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2023 13:38:49.9514
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f4e0f4e0-9d68-4bd6-a95b-0cba36dbac2e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2LmoMwbJTrTKQrROAB969GWXj/Dll7quQWhUI6YjZj29XKEgsl+5AIBtARd+pVrfYcG/3sLbFCMibfosdaopIj23QR9dm+mi6RVNCgRyT2mZKprfrJmgsAvus56HV3ww
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE1P281MB1473
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 04 Oct 2023 06:39:03 -0700 (PDT)

push and emulate_pop are counterparts. Rename push to emulate_push and
harmonize its function signature with emulate_pop. This should remove
a bit of cognitive load when reading this code.

Signed-off-by: Julian Stecklina <julian.stecklina@cyberus-technology.de>
---
 arch/x86/kvm/emulate.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index fc4a365a309f..33f3327ddfa7 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -1819,22 +1819,23 @@ static int writeback(struct x86_emulate_ctxt *ctxt, struct operand *op)
 	return X86EMUL_CONTINUE;
 }
 
-static int push(struct x86_emulate_ctxt *ctxt, void *data, int bytes)
+static int emulate_push(struct x86_emulate_ctxt *ctxt, const unsigned long *data,
+			u8 op_bytes)
 {
 	struct segmented_address addr;
 
-	rsp_increment(ctxt, -bytes);
+	rsp_increment(ctxt, -(int)op_bytes);
 	addr.ea = reg_read(ctxt, VCPU_REGS_RSP) & stack_mask(ctxt);
 	addr.seg = VCPU_SREG_SS;
 
-	return segmented_write(ctxt, addr, data, bytes);
+	return segmented_write(ctxt, addr, data, op_bytes);
 }
 
 static int em_push(struct x86_emulate_ctxt *ctxt)
 {
 	/* Disable writeback. */
 	ctxt->dst.type = OP_NONE;
-	return push(ctxt, &ctxt->src.val, ctxt->op_bytes);
+	return emulate_push(ctxt, &ctxt->src.val, ctxt->op_bytes);
 }
 
 static int emulate_pop(struct x86_emulate_ctxt *ctxt,
@@ -1925,7 +1926,7 @@ static int em_enter(struct x86_emulate_ctxt *ctxt)
 		return X86EMUL_UNHANDLEABLE;
 
 	rbp = reg_read(ctxt, VCPU_REGS_RBP);
-	rc = push(ctxt, &rbp, stack_size(ctxt));
+	rc = emulate_push(ctxt, &rbp, stack_size(ctxt));
 	if (rc != X86EMUL_CONTINUE)
 		return rc;
 	assign_masked(reg_rmw(ctxt, VCPU_REGS_RBP), reg_read(ctxt, VCPU_REGS_RSP),
-- 
2.40.1