From patchwork Thu Apr 2 12:08:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 6147331 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 477DFBF4A6 for ; Thu, 2 Apr 2015 12:08:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D03B520392 for ; Thu, 2 Apr 2015 12:08:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD61520396 for ; Thu, 2 Apr 2015 12:08:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752801AbbDBMIa (ORCPT ); Thu, 2 Apr 2015 08:08:30 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:35031 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752036AbbDBMI2 (ORCPT ); Thu, 2 Apr 2015 08:08:28 -0400 Received: by widdi4 with SMTP id di4so76384737wid.0; Thu, 02 Apr 2015 05:08:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=7gvpsz//VxzSi+H7Znz44FyGLtXBszHqg1cnX+7UTi4=; b=n8uIrqSXmlzm6Q/jvlgJpbIRGkpOaPPgupfZGHbJsheNKXnU2xn72xfZycH2zuMfn/ a3S26mLLSsqXxlbrogn/dQ6aEREh2RATC2h7Imc/dwb/rWfR9O7dZ70Ii0EDyu/HAPwc /Wmk0FzDTMDCCErAJhmgkCtoTpxdN0jSa0Ud++LDpGopc43ovU5T6kFxB1YTBzqZ4n8X eMIy8CjL2o2lGfr/7OUtoR/dMXkKMBJP5GezaixP+8HegwbfDVn08biIWKQxJA0I1RDq utQ0w7A5Km1H/9h9s5ibRJ7225ImS4W1Ev8GI97wRdONMsArTRxikPWyn3DV4/xxlIbf ZFwA== X-Received: by 10.194.63.16 with SMTP id c16mr94634383wjs.117.1427976507744; Thu, 02 Apr 2015 05:08:27 -0700 (PDT) Received: from donizetti.station (net-93-66-123-41.cust.vodafonedsl.it. [93.66.123.41]) by mx.google.com with ESMTPSA id m4sm6971417wjb.25.2015.04.02.05.08.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Apr 2015 05:08:26 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Xiao Guangrong Subject: [PATCH] KVM: remove kvm_read_hva and kvm_read_hva_atomic Date: Thu, 2 Apr 2015 14:08:20 +0200 Message-Id: <1427976500-28533-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.3.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The corresponding write functions just use __copy_to_user. Do the same on the read side. This reverts what's left of commit 86ab8cffb498 (KVM: introduce gfn_to_hva_read/kvm_read_hva/kvm_read_hva_atomic, 2012-08-21) Cc: Xiao Guangrong Signed-off-by: Paolo Bonzini Reviewed-by: Xiao Guangrong --- virt/kvm/kvm_main.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a1093700f3a4..c772c31a87bb 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1193,16 +1193,6 @@ unsigned long gfn_to_hva_prot(struct kvm *kvm, gfn_t gfn, bool *writable) return gfn_to_hva_memslot_prot(slot, gfn, writable); } -static int kvm_read_hva(void *data, void __user *hva, int len) -{ - return __copy_from_user(data, hva, len); -} - -static int kvm_read_hva_atomic(void *data, void __user *hva, int len) -{ - return __copy_from_user_inatomic(data, hva, len); -} - static int get_user_page_nowait(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, int write, struct page **page) { @@ -1554,7 +1544,7 @@ int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset, addr = gfn_to_hva_prot(kvm, gfn, NULL); if (kvm_is_error_hva(addr)) return -EFAULT; - r = kvm_read_hva(data, (void __user *)addr + offset, len); + r = __copy_from_user(data, (void __user *)addr + offset, len); if (r) return -EFAULT; return 0; @@ -1593,7 +1583,7 @@ int kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data, if (kvm_is_error_hva(addr)) return -EFAULT; pagefault_disable(); - r = kvm_read_hva_atomic(data, (void __user *)addr + offset, len); + r = __copy_from_user_inatomic(data, (void __user *)addr + offset, len); pagefault_enable(); if (r) return -EFAULT;