From patchwork Wed Mar 28 19:58:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Malaterre X-Patchwork-Id: 892461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BrdjlH/n"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40BJbJ0gqcz9s1S for ; Thu, 29 Mar 2018 06:58:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753407AbeC1T6S (ORCPT ); Wed, 28 Mar 2018 15:58:18 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35655 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752992AbeC1T6S (ORCPT ); Wed, 28 Mar 2018 15:58:18 -0400 Received: by mail-wr0-f196.google.com with SMTP id 80so3372818wrb.2; Wed, 28 Mar 2018 12:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OHwrk7sYVJcaTH7yQImbQIU0GxZf5HTcoewy5EZgqXw=; b=BrdjlH/ncYmGPMC+jC2UHbIdyYlPDnd4uH75/PRW/Smog6Xb0IJfFaUf77O2LpOC+y tWu4wwnbDkhN5+gCuoM1DKYTUbU4m6zZ5pItIkpbV8dGIhnjHiOAjIctG4N1FjfptkCV 1viLZg80haJ8p0KOCtn0YkL16mzQpSnFu8XEB8302mtuykvZpm8S9j4MiG2cXG6rM7i+ wPZHP1kVN1Pd7ucrC0n4OeQQqkH2iFu1+PLXDiEdZQIXxh6O+ZYGeQZ+hulsyi4J87uc jxZ4PKtVeZQGK8rdbMjLosWNnNWDtUp1zCPOx8xteWP7CtNAmPZsHcG38/fiTuRn+gqd wUsw== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=OHwrk7sYVJcaTH7yQImbQIU0GxZf5HTcoewy5EZgqXw=; b=VPBE9lx8L9eeuP6d2AXreeSuZuwgEbCWWNXQO/taJQNMIllLL/0RTdVNMAjX1D/Vo1 oe0mUmq/QmXr4SuGHXI0oTrub2VOhuc8Jo48eKXjPqnehnnp/sju/wDppLyVICfApTMQ IVGAmdgcELp7bbiuM10ahVljHNwQvIBpuritqd9uSy69JaPWogTr7ZocjvRndbesf59l WldQrIOfHT/a3YxYcAT0HD40CsozBeufQOlYtVdhyn4stt2QTGEG9Vg9mfv3WnUed79U 1m7fg4j1rBPoQ3KQFL2QLQc5hZ0KPtofifsZ0vAUdwfeciHjYVNRYPn3mVdDsY6GwrFt s0/g== X-Gm-Message-State: AElRT7FUzzN5GGVNxqrsHs4/fVUlI6u1861EtcI0uqbIe4tXngBzQGar 9atYkKcWA1pXX65PKULlWDg= X-Google-Smtp-Source: AIpwx480XsOYLFcvJyLfzst+/ud9hZLGEPKnz6YD8XIci5wLO5A27XtXNM7csrBEbSAsmXowpz+gng== X-Received: by 10.223.163.25 with SMTP id c25mr4309775wrb.58.1522267096737; Wed, 28 Mar 2018 12:58:16 -0700 (PDT) Received: from macbookpro.malat.net (bru31-1-78-225-226-121.fbx.proxad.net. [78.225.226.121]) by smtp.gmail.com with ESMTPSA id z12sm4215061wrg.20.2018.03.28.12.58.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Mar 2018 12:58:16 -0700 (PDT) Received: by macbookpro.malat.net (Postfix, from userid 1000) id 16F6A10C01BF; Wed, 28 Mar 2018 21:58:15 +0200 (CEST) From: Mathieu Malaterre To: Michael Ellerman Cc: LEROY Christophe , Mathieu Malaterre , Paul Mackerras , Benjamin Herrenschmidt , kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 04/19] powerpc/kvm: Prefer fault_in_pages_readable function Date: Wed, 28 Mar 2018 21:58:11 +0200 Message-Id: <20180328195811.27758-1-malat@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180322202007.23088-5-malat@debian.org> References: <20180322202007.23088-5-malat@debian.org> MIME-Version: 1.0 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Directly use fault_in_pages_readable instead of manual __get_user code. Fix warning treated as error with W=1: arch/powerpc/kernel/kvm.c:675:6: error: variable ‘tmp’ set but not used [-Werror=unused-but-set-variable] Suggested-by: Christophe Leroy Signed-off-by: Mathieu Malaterre Reviewed-by: Christophe Leroy --- v2: use fault_in_pages_readable instead arch/powerpc/kernel/kvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/kvm.c b/arch/powerpc/kernel/kvm.c index 9ad37f827a97..124c51030b75 100644 --- a/arch/powerpc/kernel/kvm.c +++ b/arch/powerpc/kernel/kvm.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -672,14 +673,13 @@ static void kvm_use_magic_page(void) { u32 *p; u32 *start, *end; - u32 tmp; u32 features; /* Tell the host to map the magic page to -4096 on all CPUs */ on_each_cpu(kvm_map_magic_page, &features, 1); /* Quick self-test to see if the mapping works */ - if (__get_user(tmp, (u32*)KVM_MAGIC_PAGE)) { + if (!fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) { kvm_patching_worked = false; return; }