From patchwork Thu Feb 14 02:10:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 158276 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp793688jaa; Wed, 13 Feb 2019 18:10:29 -0800 (PST) X-Received: by 2002:ae9:de44:: with SMTP id s65mr980032qkf.55.1550110229324; Wed, 13 Feb 2019 18:10:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550110229; cv=none; d=google.com; s=arc-20160816; b=w7djx0z2MwxEuNzAwQMkn/GCxQby7LVZdm2NFkh6oB/sAGy1/iQJw2j0IuH6NBrVpO MzRBqf3gmPVacFuq+oH21HE8spvWNy8nzt3TWAoAajYwzKXh04+IS9GGKapPZoQ+v9Xx kikwa4ZffCQVDIPDWZZrMhrJcI2i+x3ROk5B0bcMdA76q3KScMlA+1B+0tUc1+44f+C7 Z90VXKLVWtehvYzXL5011dnaKZGKEtv3oyErMO/9/mVc1zV38e/wyKv5K4Xe639rqvHM ug9nDnXL2KYCGPnBUpoJcpoT2pXV6JPH4/QTxfaqafBa8/YF+4aynVJGG5JTTXtsbsyj yhCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2KcANZZu3B+b5HtApH0abXmIyTLE/qQis8j8nSO9A+k=; b=DVd/oxkuyTkkuxZsuep9vDIxMh6SSggWa4R/D7vdDU1cqR71UOC75XrNmct87Z3pgz Gy3Gn7WOAgeHV9tTqgtL+ZETWy0mdGIaR6mBUA4+QZzV/D0bC/BkQIslsNcUapXvyugL j78RxAaoDcxBApf8Lrv2Wk+1I5o6bc6/C7XW5s++sb/50cWnN7b9tWITUsyeB/P3/SQF 5H4RtBszRRIqqfnk8iPvI2w2BOL4XAXXRWP5gkKadeRxhK6fxecf/0I0VMtNvDkboOoO pSVa58ojcHj6XfPag5w+D1BNOznPX5Xi08MVi2z1bPOuSCxOZtoKRll5j5LSBlUR0yA1 ygLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YRtf+fna; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y2sor1283339qtb.0.2019.02.13.18.10.29 for (Google Transport Security); Wed, 13 Feb 2019 18:10:29 -0800 (PST) Received-SPF: pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YRtf+fna; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2KcANZZu3B+b5HtApH0abXmIyTLE/qQis8j8nSO9A+k=; b=YRtf+fnalzvYzEFEGgnWPy00GIpL/bexiZ1RxPdCli1K4lq/hmRrRKkB/JpxTgl0Qt d0fPkLe4R5CbjnFVdt2yunkAymTbtKdaDsgIUo2TJvR+YGLgPR5dgZaZzBckYUryeWgr MO7JUgxfzxDtMYCT6aRA4OidQMRdsC71oyvW7CL38JZDgC8fdWTNdM6PRW9YYg6gTIF7 efeYLICL6sc9ZMr0qvfAc/bnCkfqrjAgLvsa0snW/Bs2uwUwdbK7nDb/4TB4Heedu9x6 2jDIPD8N/wkZyxP8/ddhHZgut917OgixKkyUsa5BMs3zqC5hnABSVvA9gQ3WtwHBX+Iq YUSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2KcANZZu3B+b5HtApH0abXmIyTLE/qQis8j8nSO9A+k=; b=HEer/BDXoSRYrV18ARGRVsdiIr8juJZcJSHUZVkwNWZ6Wzw0guBh/uHG68t7RNufvH hdvKPwcdd4ExfllKuF9Rqkp+aMQ673bWAXEjYV9/mO8XrR/lGkoArclPMhTKjz8aErOE 2xawsl9a7aH4r92ya+B4FsoLSrxn3z4wBeAVEdhHQpDZt8KpcXUzqJ4laToHtUmUshdl f9eyMXodoDefRK11Up09epD9NugCZAjrDO14USJmN6XURRrIN3PBFXmaBvz1m3iXOTTR Lo85CFYxoYKFqmtpBpzDUTDkZalfYAIaPmviewe4AgqQwwehtqdMqH6hL0XwOeejowrL Pdrg== X-Gm-Message-State: AHQUAubud7eBwbRaHImvI6CsztBop+/KXF5AYavaJPgq/t6B5hnSqcel O0+YJKVcyZi9tcJNpw7eNR2Hisy76zJczg== X-Google-Smtp-Source: AHgI3IbLjBtRwJjiW7vuPmPsBHq125WQ7V4HpYt9WNmX4X5Hqd7ZI8UpNuukPUDlOV8ULYYwaSnqxg== X-Received: by 2002:ac8:3501:: with SMTP id y1mr1017461qtb.209.1550110229015; Wed, 13 Feb 2019 18:10:29 -0800 (PST) Return-Path: Received: from localhost.localdomain (pool-72-71-243-63.cncdnh.fast00.myfairpoint.net. [72.71.243.63]) by smtp.googlemail.com with ESMTPSA id d63sm1091575qka.22.2019.02.13.18.10.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 18:10:28 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier , Greg KH , Mark Rutland Cc: Will Deacon , Mark Brown , linux-kernel@vger.kernel.org Subject: [PATCH 4.14 V2 03/17] ARM: 8791/1: vfp: use __copy_to_user() when saving VFP state Date: Wed, 13 Feb 2019 21:10:08 -0500 Message-Id: <20190214021022.5313-4-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190214021022.5313-1-dave.long@linaro.org> References: <20190214021022.5313-1-dave.long@linaro.org> From: Julien Thierry Commit 3aa2df6ec2ca6bc143a65351cca4266d03a8bc41 upstream. Use __copy_to_user() rather than __put_user_error() for individual members when saving VFP state. This has the benefit of disabling/enabling PAN once per copied struct intead of once per write. Signed-off-by: Julien Thierry Signed-off-by: Russell King Signed-off-by: David A. Long --- arch/arm/include/asm/thread_info.h | 4 ++-- arch/arm/kernel/signal.c | 13 +++++++------ arch/arm/vfp/vfpmodule.c | 20 ++++++++------------ 3 files changed, 17 insertions(+), 20 deletions(-) -- 2.17.1 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h index 57d2ad9c75ca..df8420672c7e 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -124,8 +124,8 @@ extern void vfp_flush_hwstate(struct thread_info *); struct user_vfp; struct user_vfp_exc; -extern int vfp_preserve_user_clear_hwstate(struct user_vfp __user *, - struct user_vfp_exc __user *); +extern int vfp_preserve_user_clear_hwstate(struct user_vfp *, + struct user_vfp_exc *); extern int vfp_restore_user_hwstate(struct user_vfp *, struct user_vfp_exc *); #endif diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index b12499cc3582..1eb83ee7e1cc 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -136,17 +136,18 @@ static int restore_iwmmxt_context(char __user **auxp) static int preserve_vfp_context(struct vfp_sigframe __user *frame) { - const unsigned long magic = VFP_MAGIC; - const unsigned long size = VFP_STORAGE_SIZE; + struct vfp_sigframe kframe; int err = 0; - __put_user_error(magic, &frame->magic, err); - __put_user_error(size, &frame->size, err); + memset(&kframe, 0, sizeof(kframe)); + kframe.magic = VFP_MAGIC; + kframe.size = VFP_STORAGE_SIZE; + err = vfp_preserve_user_clear_hwstate(&kframe.ufp, &kframe.ufp_exc); if (err) - return -EFAULT; + return err; - return vfp_preserve_user_clear_hwstate(&frame->ufp, &frame->ufp_exc); + return __copy_to_user(frame, &kframe, sizeof(kframe)); } static int restore_vfp_context(char __user **auxp) diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 6abcd4af8274..6bacd69c9e81 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -554,12 +554,11 @@ void vfp_flush_hwstate(struct thread_info *thread) * Save the current VFP state into the provided structures and prepare * for entry into a new function (signal handler). */ -int vfp_preserve_user_clear_hwstate(struct user_vfp __user *ufp, - struct user_vfp_exc __user *ufp_exc) +int vfp_preserve_user_clear_hwstate(struct user_vfp *ufp, + struct user_vfp_exc *ufp_exc) { struct thread_info *thread = current_thread_info(); struct vfp_hard_struct *hwstate = &thread->vfpstate.hard; - int err = 0; /* Ensure that the saved hwstate is up-to-date. */ vfp_sync_hwstate(thread); @@ -568,22 +567,19 @@ int vfp_preserve_user_clear_hwstate(struct user_vfp __user *ufp, * Copy the floating point registers. There can be unused * registers see asm/hwcap.h for details. */ - err |= __copy_to_user(&ufp->fpregs, &hwstate->fpregs, - sizeof(hwstate->fpregs)); + memcpy(&ufp->fpregs, &hwstate->fpregs, sizeof(hwstate->fpregs)); + /* * Copy the status and control register. */ - __put_user_error(hwstate->fpscr, &ufp->fpscr, err); + ufp->fpscr = hwstate->fpscr; /* * Copy the exception registers. */ - __put_user_error(hwstate->fpexc, &ufp_exc->fpexc, err); - __put_user_error(hwstate->fpinst, &ufp_exc->fpinst, err); - __put_user_error(hwstate->fpinst2, &ufp_exc->fpinst2, err); - - if (err) - return -EFAULT; + ufp_exc->fpexc = hwstate->fpexc; + ufp_exc->fpinst = hwstate->fpinst; + ufp_exc->fpinst2 = ufp_exc->fpinst2; /* Ensure that VFP is disabled. */ vfp_flush_hwstate(thread);