From patchwork Fri Dec 6 22:13:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sami Tolvanen X-Patchwork-Id: 180938 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1377621ile; Fri, 6 Dec 2019 14:14:08 -0800 (PST) X-Google-Smtp-Source: APXvYqweeX+Wvp1u64ydCj/J+kxkXAlzO8eDFEGtuWH6dtvZCn+COjCAunNRyXcO7gJ9of1ZinLl X-Received: by 2002:a9d:27c4:: with SMTP id c62mr13285811otb.292.1575670448212; Fri, 06 Dec 2019 14:14:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575670448; cv=none; d=google.com; s=arc-20160816; b=NoDGtvlX5/RDBKK64KQ/hg0JkzXm1HV1RwJG70SQF4QHSR5LdGjQMmKvOfPmcuu8mY tj9eTZEGeJs9oMzxMLfjRj7p5oNhtqsT5oMa+nGtL3pWnIsCki1sAx75pK4SIw1YThGS DQ+FxTIcEVbwa07NbubJxwaxoaVGvIdkgMss3e8ZkR4XO3WFI5RV+vCsVjza4a2+T0Vb eiHrgSyaVitGA6XDFRmGRclN3sIdYpx6Mc6jl9GFrNujgbaV7uhyzS5g4Q6ZZCLqALca aAGhf9WL7pyaFDmicGGr4dWkdwn3FTFOoSwy12Ovpd4HF5HZb6KeACmtSmtkUcNFG+i5 GUSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=8cEo3bnB2JOErtud3GvPd9W0QqVJKhLYL3PxcgBL0pc=; b=OOwIIOLEcCLr2Xx2gwTXrfmXYM3QtKfBJ95vuIb0B31zsU2YlKEd5B93zKjHsTbfns LxwU7/AzLt9j4L2abA6na3PK7axRrkSCbDq2emfsBobi8iveuG24EHZBnAZbYVWSy2XF l5h/z4cD3rP8fjKxJ4pHevTa/FsyIkyr+VWU0w9BzimYBzc3rzdaMJIS3t/OxHzqRUIl cpdg1zampjO9WPSiblnn8y+JAX3l8YKdXyH6T8ziy3lmLSxpynJTBpynfjcZgzk1slmC f1oXCVNYJdlg0VKtrH8KYN/U0igxaRqxkH/uAS9ZqX3WMsAMM4ojKhck9+bALP75NNeN b3kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=CPqQmv4W; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u16si7965239otq.92.2019.12.06.14.14.07; Fri, 06 Dec 2019 14:14:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=CPqQmv4W; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726513AbfLFWOD (ORCPT + 27 others); Fri, 6 Dec 2019 17:14:03 -0500 Received: from mail-pg1-f202.google.com ([209.85.215.202]:48377 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726374AbfLFWOB (ORCPT ); Fri, 6 Dec 2019 17:14:01 -0500 Received: by mail-pg1-f202.google.com with SMTP id p188so4542171pgp.15 for ; Fri, 06 Dec 2019 14:14:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=8cEo3bnB2JOErtud3GvPd9W0QqVJKhLYL3PxcgBL0pc=; b=CPqQmv4WqCQBFArArM8RhJECBGvYc1DYgdPm0u6MVe0Oqz9fNy0AzMgv/8cEGG/BAU aAtkoPugaKUj5l+B6gmWuX+5yxOs+N3ZWs/7Q39Wy7REQEzECblVDxd+is2N3naPmb+Z AqE5JEDUA8ZArMaJifiVfToRBNBcxgJbfiPhEMzN4QT7addM2NEiDmiH+MHpEUOrpMuY 5mCBPj6zphQUPpZkvQxiKNqQZVXSG5ZKCqPY/yDTZAouky3k/+Eg/at4qlCky/F1/OE5 FKwHQSFj6kwEepxRANrOWOQ7iDHcCUd0e0fNHAJuNQWb5uPQ20sY1xVXRPXlBPWsO0w5 mmMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=8cEo3bnB2JOErtud3GvPd9W0QqVJKhLYL3PxcgBL0pc=; b=NKosL1b35FzYQHAZqEjTBpaMWC0mpL1+tAAnLRYQU4M2LTmuf/854kUxmDnDE2znAj Ma3qdMeZvQ8dLvrUWDe7zdm2PBOL7sLph1GSPdObhFtWZnDMI3bUutpMwq2tWL7rJuyK GxvU12+Lbn96WIlNhrVekufY3ta9AnnHgc48Y3mBhD6aefLceIS9I4Ew1VbdOu2VTiKL jiD/FXWK+s1EY0t3CsCBxXd8sLtC5iGKr8NuXzOXATXlQ+OzIoKLUpwEd90e/Pidy+O1 kUzG785bDjksdmp87lFcyvRWpTmnDYyrjHnZRy8JZoSTjnoAbOzY+7UxlF+E27MxAgUo ZGzQ== X-Gm-Message-State: APjAAAWFU8ataknMMTbzEO6jftSwZKB1Kuop0CX0akcx60Sjt6REE0Bs 33Qaxf6PG2sXDZJ0siTDaVDbpKOMwPgFcHvS3lE= X-Received: by 2002:a63:184d:: with SMTP id 13mr6053846pgy.132.1575670440912; Fri, 06 Dec 2019 14:14:00 -0800 (PST) Date: Fri, 6 Dec 2019 14:13:38 -0800 In-Reply-To: <20191206221351.38241-1-samitolvanen@google.com> Message-Id: <20191206221351.38241-3-samitolvanen@google.com> Mime-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20191206221351.38241-1-samitolvanen@google.com> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog Subject: [PATCH v6 02/15] arm64/lib: copy_page: avoid x18 register in assembler code From: Sami Tolvanen To: Will Deacon , Catalin Marinas , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel , Mark Rutland Cc: Dave Martin , Kees Cook , Laura Abbott , Marc Zyngier , Nick Desaulniers , Jann Horn , Miguel Ojeda , Masahiro Yamada , clang-built-linux@googlegroups.com, kernel-hardening@lists.openwall.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sami Tolvanen Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel Register x18 will no longer be used as a caller save register in the future, so stop using it in the copy_page() code. Link: https://patchwork.kernel.org/patch/9836869/ Signed-off-by: Ard Biesheuvel [Sami: changed the offset and bias to be explicit] Signed-off-by: Sami Tolvanen Reviewed-by: Mark Rutland --- arch/arm64/lib/copy_page.S | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) -- 2.24.0.393.g34dc348eaf-goog diff --git a/arch/arm64/lib/copy_page.S b/arch/arm64/lib/copy_page.S index bbb8562396af..290dd3c5266c 100644 --- a/arch/arm64/lib/copy_page.S +++ b/arch/arm64/lib/copy_page.S @@ -34,45 +34,45 @@ alternative_else_nop_endif ldp x14, x15, [x1, #96] ldp x16, x17, [x1, #112] - mov x18, #(PAGE_SIZE - 128) + add x0, x0, #256 add x1, x1, #128 1: - subs x18, x18, #128 + tst x0, #(PAGE_SIZE - 1) alternative_if ARM64_HAS_NO_HW_PREFETCH prfm pldl1strm, [x1, #384] alternative_else_nop_endif - stnp x2, x3, [x0] + stnp x2, x3, [x0, #-256] ldp x2, x3, [x1] - stnp x4, x5, [x0, #16] + stnp x4, x5, [x0, #16 - 256] ldp x4, x5, [x1, #16] - stnp x6, x7, [x0, #32] + stnp x6, x7, [x0, #32 - 256] ldp x6, x7, [x1, #32] - stnp x8, x9, [x0, #48] + stnp x8, x9, [x0, #48 - 256] ldp x8, x9, [x1, #48] - stnp x10, x11, [x0, #64] + stnp x10, x11, [x0, #64 - 256] ldp x10, x11, [x1, #64] - stnp x12, x13, [x0, #80] + stnp x12, x13, [x0, #80 - 256] ldp x12, x13, [x1, #80] - stnp x14, x15, [x0, #96] + stnp x14, x15, [x0, #96 - 256] ldp x14, x15, [x1, #96] - stnp x16, x17, [x0, #112] + stnp x16, x17, [x0, #112 - 256] ldp x16, x17, [x1, #112] add x0, x0, #128 add x1, x1, #128 - b.gt 1b + b.ne 1b - stnp x2, x3, [x0] - stnp x4, x5, [x0, #16] - stnp x6, x7, [x0, #32] - stnp x8, x9, [x0, #48] - stnp x10, x11, [x0, #64] - stnp x12, x13, [x0, #80] - stnp x14, x15, [x0, #96] - stnp x16, x17, [x0, #112] + stnp x2, x3, [x0, #-256] + stnp x4, x5, [x0, #16 - 256] + stnp x6, x7, [x0, #32 - 256] + stnp x8, x9, [x0, #48 - 256] + stnp x10, x11, [x0, #64 - 256] + stnp x12, x13, [x0, #80 - 256] + stnp x14, x15, [x0, #96 - 256] + stnp x16, x17, [x0, #112 - 256] ret ENDPROC(copy_page)