From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A020AC2D0CE for ; Tue, 21 Jan 2020 13:48:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 741872070C for ; Tue, 21 Jan 2020 13:48:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R1pRTr7a" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729340AbgAUNsP (ORCPT ); Tue, 21 Jan 2020 08:48:15 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:44590 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728992AbgAUNsM (ORCPT ); Tue, 21 Jan 2020 08:48:12 -0500 Received: by mail-wr1-f65.google.com with SMTP id q10so3227055wrm.11; Tue, 21 Jan 2020 05:48:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=V4U+PI2PAOqbzfWZBcXXcxH5L3R8mP6ogQR4djjn9y4=; b=R1pRTr7a3ZtUe266qoFQlXBnmPdzSwJGCjQTmfGzEKfE2pUSq7003XYG07n+q/gyOk tdnvbMcO6KAQW6c+JrcQipTqeTYd+P2aj/sfxq/om1SBktNzJ/cTgidhl/aC7wnBaqBs oALXS3IJBUX5of3MbyqvUY4hdGKwl6VxFv3wRCIZ25OccOIZBvSaFYFUH4AP+6eGGdGl E8hPi8mPpHPrU5ESpf4Lw0gC/1qKv36CekvAnMk3IERAFgyz+X34qr6zFOZ7YkEXSpC5 EdAP4ZGBZPdQUNSCMZYxf9Kwk51j1nokpmrLG2BmmuF0OjeeOcRaxlGLgUEw+w4IRlQx lLrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=V4U+PI2PAOqbzfWZBcXXcxH5L3R8mP6ogQR4djjn9y4=; b=MKKBorZASEYbLtNrrrIlXTrzXTdCHo/Arw48W1sp5T9gaSNRgy5wag47z5/Lr7PQ9L 2QeTcrh9L1WLDhrwYRlr9jEcy+M0T5wxs9A6VLGVxU+CGSg6c36WuFc75NOQMQQOtJh9 i+lFU7i2fhNyyJyi6LT34KyDCvZ2JgHpAlfRnvhH7vMMVuzXwPU3rKETDmKrUy/dJdzI jUz63jqrqLkKKHeFCKqrcPV67uT1/opSwZS9feYLJdi98HvOP6XCyZYjTStF9MaD9+kZ szBkK9CoCzAopzTXDE3mPKmPeFJm+sGAlr8fXxDPHwV1OOLz8Fk5hudspNjNaMH4xydt 3RCQ== X-Gm-Message-State: APjAAAVioxxc/1aMLLxuXURcZWSuxnppcdZPuV1zrthioaJmuaPGfLSj FOp3dSQtKl16slgN+vRmijwxSvIV X-Google-Smtp-Source: APXvYqzmp8LbMs7hHnOYiuZmZpxV40ascEfcwEQqdeSNbfwYvK8vXWWwErHsLEe7Tcw+zDLv45iTUQ== X-Received: by 2002:adf:a746:: with SMTP id e6mr5340508wrd.329.1579614489944; Tue, 21 Jan 2020 05:48:09 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id b17sm51975006wrp.49.2020.01.21.05.48.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jan 2020 05:48:09 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Andy Lutomirski , Christian Borntraeger Subject: [PATCH] KVM: async_pf: drop kvm_arch_async_page_present wrappers Date: Tue, 21 Jan 2020 14:48:06 +0100 Message-Id: <1579614487-44583-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The wrappers make it less clear that the position of the call to kvm_arch_async_page_present depends on the architecture, and that only one of the two call sites will actually be active. Remove them. Cc: Andy Lutomirski Cc: Christian Borntraeger Signed-off-by: Paolo Bonzini --- virt/kvm/async_pf.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c index d8ef708a2ef6..15e5b037f92d 100644 --- a/virt/kvm/async_pf.c +++ b/virt/kvm/async_pf.c @@ -17,21 +17,6 @@ #include "async_pf.h" #include -static inline void kvm_async_page_present_sync(struct kvm_vcpu *vcpu, - struct kvm_async_pf *work) -{ -#ifdef CONFIG_KVM_ASYNC_PF_SYNC - kvm_arch_async_page_present(vcpu, work); -#endif -} -static inline void kvm_async_page_present_async(struct kvm_vcpu *vcpu, - struct kvm_async_pf *work) -{ -#ifndef CONFIG_KVM_ASYNC_PF_SYNC - kvm_arch_async_page_present(vcpu, work); -#endif -} - static struct kmem_cache *async_pf_cache; int kvm_async_pf_init(void) @@ -80,7 +65,8 @@ static void async_pf_execute(struct work_struct *work) if (locked) up_read(&mm->mmap_sem); - kvm_async_page_present_sync(vcpu, apf); + if (IS_ENABLED(CONFIG_KVM_ASYNC_PF_SYNC)) + kvm_arch_async_page_present(vcpu, apf); spin_lock(&vcpu->async_pf.lock); list_add_tail(&apf->link, &vcpu->async_pf.done); @@ -157,7 +143,8 @@ void kvm_check_async_pf_completion(struct kvm_vcpu *vcpu) spin_unlock(&vcpu->async_pf.lock); kvm_arch_async_page_ready(vcpu, work); - kvm_async_page_present_async(vcpu, work); + if (!IS_ENABLED(CONFIG_KVM_ASYNC_PF_SYNC)) + kvm_arch_async_page_present(vcpu, work); list_del(&work->queue); vcpu->async_pf.queued--; -- 1.8.3.1