From patchwork Thu Feb 14 14:49:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 158396 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1462106jaa; Thu, 14 Feb 2019 06:49:36 -0800 (PST) X-Received: by 2002:ac8:21ce:: with SMTP id 14mr3305793qtz.306.1550155776073; Thu, 14 Feb 2019 06:49:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550155776; cv=none; d=google.com; s=arc-20160816; b=Bbby0y/vkNB3HB+vkvq+HH7pdYZiwC0N1CYma1UgsUBTUePU5aXioEmHg+DJ42ghrY vCIdyaVciz1QAyw7+D7O8ZLiZNlz8CnAxvzmw/34e9UyLM3+g+W2SEfA4pYK0Zqsws1z 30rEeMMJANOUBMykQPG0geW85NDO6yqbbo4e0Mv2BWKVSiCglqpnFkNLEAf/YY6yjdDL 45VsA5lq2s2gcpBiM3Tb0Z5jFaNoLUzLdxeGnLvlDRQmQ+360UAgEsF7BdONYlbuv/BJ EO7N/XbZ+6fv39at+wEAxLJ9BYsrtQrVw7ifYuKOKgq7Is7l8R//JsCVypF1iqd5cw41 ESBQ== 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=60g7G9GsgPysXeQeRaphSyl4TAccnCLeHznr84gZrn0=; b=KCYDXKuMFLhyXgJXpGlMuwcrt1a4JzkoPfUpChiYmJ2hvroUGlp99AbCLfPw/JMbvs RIWGrZU+PZxZ9bomtu7Fi8xfoVTCqiPtLiPAMeyUSsFt/aS+ItXm/dTABIkzPPOzK+NI jhl6am07psOiSx7aXQ9rL3Igsa6L54PF2M1u7RRsb4NMJ1tgU2hctTsKQqdpuyy+rCfP WXENRIFyofrP9FCIP0GxDJQlTdiQ317y2wX0arQRdVkEXRODGaf2O5EbxAzipr6KMea9 whHVOmmFmYKgZtsZdr06HQ+g48n3VcRo2apBDVkyS4sTMNh3KT9mlkqYjbaRVNynqLoY yH1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="V/EIJY9B"; 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 c47sor2909797qvh.6.2019.02.14.06.49.36 for (Google Transport Security); Thu, 14 Feb 2019 06:49:36 -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="V/EIJY9B"; 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=60g7G9GsgPysXeQeRaphSyl4TAccnCLeHznr84gZrn0=; b=V/EIJY9BGKspAndcNIdR3th42CLoUkdNivW75Klm61UNfZ5bUDb+8pQ9YgZ+aV9xaW quJp2RA+dWlDK3eGad2f+vpkapMMnVGuqwuBFVIeY57WfSscvObAdyBO/a6LuYnJCadR SgaQcUcVZQ9VbZVyPs8vu7TS/YXhoblTOO9nySwB//QuURMG2g6D+Xt/OnAAbNXrpCg/ ajqXQGM6wLjN5oPZjbGUWzhvuBMl7RKG5nWYW7Xk6NHxSgcMLNBmzTLRXB5T1IQp4JSc 2mgz3bRQMV60JYS8WdZTOmCJSwl2uxAbvYrhcmPI0rZ2LPEtN2DHL0L+SNIlWzfHL+Ru gRdw== 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=60g7G9GsgPysXeQeRaphSyl4TAccnCLeHznr84gZrn0=; b=aHVzcd5H8m/+zrW7RHPPtGb26G6Jy2+GrGBEu4397A1/oYpfh7PdJQS/LV6xz+AOZ3 blEVahZUKx5DVVrgglW0YYaZ4JgAqlJxkRt7kAs0N+GtC21DT3MV0ISywihaVo7pZzOu 7ZcIlsCruCaCxLO0ADcmnOp1XXUZkk24+8mMm0rEO24g99JQpriBuKt6/ySqud3Xrrap S3ZZa6NkY1247/LYoX2fq0kcbHWQnV3igqXWpJwVY9/Z+ldzJ3vymUqd2koJpPdJIkUc C/IlphuVb9/4QjB67WmvXpALvNt1it8Ep74veB8oOvc1D/EeHJnwMPAvjRiqcGtdzumo YmfA== X-Gm-Message-State: AHQUAuad+FrMDF/17rMvAn28/9969h1WlaTD66JsNQdv4PbYEJ8aDo5o ELQ9bfWX60E1Mxg0pfOfetFos9Sd X-Google-Smtp-Source: AHgI3IbUU3fl8LTHjYQsqZGkkIyqoaHWVIlo+/lOgXaFrHX57zihf8dkPnwR1cEkqHGfrtbL0hyKSA== X-Received: by 2002:a0c:b2d9:: with SMTP id d25mr3234605qvf.79.1550155775806; Thu, 14 Feb 2019 06:49:35 -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 k66sm1498919qkc.25.2019.02.14.06.49.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 06:49:35 -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.9 02/16] ARM: 8791/1: vfp: use __copy_to_user() when saving VFP state Date: Thu, 14 Feb 2019 09:49:16 -0500 Message-Id: <20190214144930.27539-3-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190214144930.27539-1-dave.long@linaro.org> References: <20190214144930.27539-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 fbb325ff8acc..135b1a8e12eb 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -94,17 +94,18 @@ static int restore_iwmmxt_context(struct iwmmxt_sigframe *frame) 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(struct vfp_sigframe __user *auxp) diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 8e5e97989fda..df3fa52c0aa3 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);