From patchwork Sat Sep 16 00:31:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 140870 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1433812vqi; Fri, 15 Sep 2023 19:08:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYx5F9aMNweMiigLzkWiqMMmzFF8115+sxK0LRNU0jKcnJr6T8oHLkTKgBvBmP7JXOCctR X-Received: by 2002:a17:90b:10f:b0:25e:a8ab:9157 with SMTP id p15-20020a17090b010f00b0025ea8ab9157mr2990759pjz.22.1694830094795; Fri, 15 Sep 2023 19:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694830094; cv=none; d=google.com; s=arc-20160816; b=MzKeRg4BA7pXAvnGI7LHLzQoiFJ0BTDZisY9I1CruNC6sv806qrYX2JZ78w4QKPe9w VEMay7G+Ey/tSNLZXV9gAGf0gRb/8wJ59RD7Sr8TgsRknGY2vTZSSt+pFXO2OjNu5jiZ EVn5DFay3J7LE6HBqQDP/cuMYEehxvQKhFxP4c17dwhFmF7NwC3X6wx+ln65BQFCPQcE pHXif42cjegrgwsquTSvksq8FotfMq6F8Ycg+gwm8MZluz8tqo8DxfoCIntDPUr29KUT mK0/krj4sK48GFMvizi9l2MmtK3+sSVzdEqzfr+ScVCyGciBul3IaFRF6aZVistZda2U mfGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=kZSgVl8Q+hmlGcu9E42B+6nCYbsSFCH4k+E/cwlLEa8=; fh=kXSkXFacTVTlVHq0XnHvR0iN61knZqi7sPJIGv3JAWo=; b=j3Ph21WhV2uKtnlg4076TR8ukukyKaelOgMxr+FQxV4EZGyFJvji5K+iIkAPBGC9Ko GD8/l4NxuthWReHzFmNIaJeVlZCddLTnpdnkjdU6rX+51jvMEOVAtn8y8tUk6X8hT3i9 Tnr5KSaWA1WmFfzEEuhlMFuTCmRZQtIr5z3KW9dQzKxhLDZXjHb40ObnAwByUlibyLGJ VTIgRilqvgoYk7gCfBU2kPs3H34ljUIbHNJEYg2Zg3aR36EkTSUM21jDCmRbNjjLMfhK /1fzReynaTJ1JqaAA2Vfp9w00MKJ6AuqChTtEBXIZz5vpbf+6MqunZxWwHZCZvm7pZae TlGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=bPv1OfhN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id t18-20020a17090ae51200b00274891d9605si2779989pjy.115.2023.09.15.19.08.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 19:08:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=bPv1OfhN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 3161283CEDD9; Fri, 15 Sep 2023 17:34:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239057AbjIPAdq (ORCPT + 28 others); Fri, 15 Sep 2023 20:33:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238820AbjIPAdH (ORCPT ); Fri, 15 Sep 2023 20:33:07 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00A372D5B for ; Fri, 15 Sep 2023 17:32:03 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-59c12d31d04so12968117b3.1 for ; Fri, 15 Sep 2023 17:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694824323; x=1695429123; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=kZSgVl8Q+hmlGcu9E42B+6nCYbsSFCH4k+E/cwlLEa8=; b=bPv1OfhNBPdU0sr0XJk80Rkg5EW4P1gXiI2In4zbIY41ZlOFQYLOnz6HKhuHcRDqZH h0A0HVwECGR4XrRSThDKFML+RxobkgH0LoQLA3xy2rM/pEa/0gq/BQLNU+NqcpWWg33x 8VIc1BFq9LgZv3B+EJD5EdoLiJ+4ulr0g9J6prUugANFkmRo+CDgD0zynjLtm1t24GY0 xkDMUF55KabBZNnKiaK/9uoOcHm5/3lbOPXGA3a98soE/v3dJuZksD5HaUcOjAC/JwVh mLCLc5erjSCqqYTXKP6YaxPdzN4vsytcejG5rjU2sdPLHjLw45d/3OhXWuB52uGzMTbJ D1sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694824323; x=1695429123; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kZSgVl8Q+hmlGcu9E42B+6nCYbsSFCH4k+E/cwlLEa8=; b=R5tz4brO8fxIrA1DZpgxHWbE0BPj1R82dkm6shdEGbARY7pX2PXm+xrL/ZSIwV3jsg PeU9HY8cLa9UyM6AVDNdHjAg496HA83Zxmsq4EQbpSFaP8HdqHb6jiaOp4O6yGcovYuB sAeaKOg9NWKPbRK+nEkg5ZWtwP/6MbsDkwRH+Bcwn1N8/dcY0MFl7XMEzZP4nxj6YwxR TKm4KLnXr5wOf4B80gr6Jciv2abLRP/uGY5G4tXr4ynaHMcURAjWvoJ2ySTCeMvCoaE7 dBMj5ypkFnw6gVvechKmTFlcge4r2vjj708KlEDLoAw11+I1J1+eGXQfgYVn/Aij3EhM nCOg== X-Gm-Message-State: AOJu0YxqH1gWqYWEtKZ0gArt819rk2nrIk93wPoGtgJlib2lL9dCQIdk dnZJqIwqdq5hJT7IG4vsWnVpFzJ7NFI= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:b60c:0:b0:586:a58d:2e24 with SMTP id u12-20020a81b60c000000b00586a58d2e24mr95790ywh.5.1694824323076; Fri, 15 Sep 2023 17:32:03 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 15 Sep 2023 17:31:13 -0700 In-Reply-To: <20230916003118.2540661-1-seanjc@google.com> Mime-Version: 1.0 References: <20230916003118.2540661-1-seanjc@google.com> X-Mailer: git-send-email 2.42.0.459.ge4e396fd5e-goog Message-ID: <20230916003118.2540661-22-seanjc@google.com> Subject: [PATCH 21/26] entry/kvm: Drop @vcpu param from arch_xfer_to_guest_mode_handle_work() From: Sean Christopherson To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Peter Zijlstra , Arnaldo Carvalho de Melo , Sean Christopherson , Paolo Bonzini , Tony Krowiak , Halil Pasic , Jason Herne , Harald Freudenberger , Alex Williamson , Andy Lutomirski Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-mips@vger.kernel.org, kvm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Anish Ghulati , Venkatesh Srinivas , Andrew Thornton X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email 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 (fry.vger.email [0.0.0.0]); Fri, 15 Sep 2023 17:34:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777158161160670503 X-GMAIL-MSGID: 1777158161160670503 Drop the "struct kvm_vcpu" parameter from arch_xfer_to_guest_mode_handle_work() as a preparatory step towards removing the vCPU parameter from xfer_to_guest_mode_work() as well. Signed-off-by: Sean Christopherson --- include/linux/entry-kvm.h | 7 ++----- kernel/entry/kvm.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/linux/entry-kvm.h b/include/linux/entry-kvm.h index 6813171afccb..e7d90d06e566 100644 --- a/include/linux/entry-kvm.h +++ b/include/linux/entry-kvm.h @@ -25,18 +25,15 @@ struct kvm_vcpu; /** * arch_xfer_to_guest_mode_handle_work - Architecture specific xfer to guest * mode work handling function. - * @vcpu: Pointer to current's VCPU data * @ti_work: Cached TIF flags gathered in xfer_to_guest_mode_handle_work() * * Invoked from xfer_to_guest_mode_handle_work(). Defaults to NOOP. Can be * replaced by architecture specific code. */ -static inline int arch_xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu, - unsigned long ti_work); +static inline int arch_xfer_to_guest_mode_handle_work(unsigned long ti_work); #ifndef arch_xfer_to_guest_mode_work -static inline int arch_xfer_to_guest_mode_handle_work(struct kvm_vcpu *vcpu, - unsigned long ti_work) +static inline int arch_xfer_to_guest_mode_handle_work(unsigned long ti_work) { return 0; } diff --git a/kernel/entry/kvm.c b/kernel/entry/kvm.c index 2e0f75bcb7fd..c2fc39824157 100644 --- a/kernel/entry/kvm.c +++ b/kernel/entry/kvm.c @@ -19,7 +19,7 @@ static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu, unsigned long ti_work) if (ti_work & _TIF_NOTIFY_RESUME) resume_user_mode_work(NULL); - ret = arch_xfer_to_guest_mode_handle_work(vcpu, ti_work); + ret = arch_xfer_to_guest_mode_handle_work(ti_work); if (ret) return ret;