From patchwork Fri Oct 18 16:10:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sami Tolvanen X-Patchwork-Id: 176893 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1065484ill; Fri, 18 Oct 2019 09:10:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqw7Hkkjc4nO/H3yzdtGyuvtIXR3ECZsZwfNjGCaYt4nt1TGMxDbkTVQyt38DPAhS/mAsdfS X-Received: by 2002:a05:6402:1252:: with SMTP id l18mr10477679edw.64.1571415054809; Fri, 18 Oct 2019 09:10:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571415054; cv=none; d=google.com; s=arc-20160816; b=j5hLi6uD+NKX/frjI0ttCE9KbgHhvvuuzHNqaJqyZgnmxdZOjBdDBW9u+D0wC4Jl9j s26HIIYf1s5Ih9fMZXXtYSK3lxa/79sMSxm0lBWz4CoYdkvk6AnQPjSqhBJxCJKj6owH E0Ywi5YkgcNIUwrcpC/lzhG0FoS+nXbklXM2Darrqb3OR61ZEARZ4m6Ec7rU0Bz9l8T3 g6x9ttTIuAzOG3hSC7uyABgvxp92P890hzDzA5cq5aVeSve1do58CCyuaqrDRbS5dz87 zd7qn1Qety67dK+6+wEQBN87e5aOX/fHjNxelM8iSUS7O5SVVuzUf+AQIZYmonW/kgBY VjQQ== 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=jUS0dhIzgmFNCiOAuEUXvcuYNkuGL56ryAS+MUv7C/I=; b=UWFd2KM9cy3xRrekTUrVO/snh3vqRJ9eqoAYnMeA6CuxZ8v9W6k3KGHvvxzW6YnR/i Ey+e4cPH8TTwVem8s6QZtgp9TDLHWGp5LS0kAXLaw9EZMaCi5/mD0f/WOnhazW9AcVUF lL3JMmbutuDv5gGyutO44oSq+uw+dB55Ksne5Jt5iB4ublt7pKQZ5bgMFJy5lOUoR0LD S5DmAnDCO9tKpxsyyHoDJYQbFmziMYPCE1m/zHurWs5jkDVoAuDo3sqlIrAUefqje218 O1emGoteSRrInqbubxJ387NGwYU3kpfKvHVhgJpg7Ov/j/61iucQbGDI6E2eFtOxBlCY jFMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="i/jDfxdk"; 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 p10si3583415ejz.391.2019.10.18.09.10.54; Fri, 18 Oct 2019 09:10:54 -0700 (PDT) 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="i/jDfxdk"; 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 S2442925AbfJRQKx (ORCPT + 26 others); Fri, 18 Oct 2019 12:10:53 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:43829 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2442647AbfJRQKv (ORCPT ); Fri, 18 Oct 2019 12:10:51 -0400 Received: by mail-pf1-f202.google.com with SMTP id i187so4977090pfc.10 for ; Fri, 18 Oct 2019 09:10:51 -0700 (PDT) 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=jUS0dhIzgmFNCiOAuEUXvcuYNkuGL56ryAS+MUv7C/I=; b=i/jDfxdkcHMKcb5mbJursCxkiE0tLbcAT50ryu4atkNnzE9tZW2TQb4DunSXt4JOkt hyqhR6jkusYNpX0FQ9xmE9MPM+OkoO9XULEt54Q1eChfRkMXo6zH0LLx5BfDV9XxTViq ZY4f/W9+YSMQLmVbr5Hvv7U5xrLsx6ePGTXBQJ2GfNYSLJa/kqRf7pp4MN5xmr1Pm9vV U0cyLViFkAWt3zk7EDLd8J6L/oTDFeTktzFlIC0dgmBDCYk0vOIQhRFpRS9l6HZ8lGvH d40Qs4Z3TDODrADDi1vpWtmXBnOPWrst+YFdZPhbhVcTVQ3PCuWW86qVwWdHqVcy9DgV E2Sw== 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=jUS0dhIzgmFNCiOAuEUXvcuYNkuGL56ryAS+MUv7C/I=; b=JXuBKFif+pWIf0lK0lMRWwIg+1gvrbYTy75XnOrs4D+mYaQ2kbGNNKlzAzlUTQIYn4 t3piV5I4baXMHNBMeVGhgDVeY/R1RCdfx5LgVAX73LGZnjSRZHjWr8iE4h/PLkS0LzU1 xyoDbssfCUmKvC4BPMywP1pzh8nA376Go5fNv/taryG9Va1TkyAUQdhpBsIkRIZmjgGF ygcUoB/rbFBz7wbjlCnfU8COQB//ve1wbnuYmUfNcerslNv4KWEcy5S5hQ8Qpowoaijp uaWzvDAIt4mYc/EV3BOD9mVtNACdKWE9NjqhjRn9y5yUJ2xjUNrOm+lgvCgTrtgKdOl+ 5I8A== X-Gm-Message-State: APjAAAV8y12pmPNKuMRBgUiD1t0wngVABdjbkEDVcQeRgF68bQw3NiE9 qBUwXoZFHoXSjGAQrPQs2WFsK+bXC8I1sSgCLsA= X-Received: by 2002:a63:3201:: with SMTP id y1mr10741272pgy.174.1571415050913; Fri, 18 Oct 2019 09:10:50 -0700 (PDT) Date: Fri, 18 Oct 2019 09:10:17 -0700 In-Reply-To: <20191018161033.261971-1-samitolvanen@google.com> Message-Id: <20191018161033.261971-3-samitolvanen@google.com> Mime-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> X-Mailer: git-send-email 2.23.0.866.gb869b98d4c-goog Subject: [PATCH 02/18] arm64/lib: copy_page: avoid x18 register in assembler code From: Sami Tolvanen To: Will Deacon , Catalin Marinas , Steven Rostedt , Ard Biesheuvel Cc: Dave Martin , Kees Cook , Laura Abbott , Mark Rutland , Nick Desaulniers , 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 Signed-off-by: Sami Tolvanen --- arch/arm64/lib/copy_page.S | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) -- 2.23.0.866.gb869b98d4c-goog diff --git a/arch/arm64/lib/copy_page.S b/arch/arm64/lib/copy_page.S index bbb8562396af..8b562264c165 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, #-240] ldp x4, x5, [x1, #16] - stnp x6, x7, [x0, #32] + stnp x6, x7, [x0, #-224] ldp x6, x7, [x1, #32] - stnp x8, x9, [x0, #48] + stnp x8, x9, [x0, #-208] ldp x8, x9, [x1, #48] - stnp x10, x11, [x0, #64] + stnp x10, x11, [x0, #-192] ldp x10, x11, [x1, #64] - stnp x12, x13, [x0, #80] + stnp x12, x13, [x0, #-176] ldp x12, x13, [x1, #80] - stnp x14, x15, [x0, #96] + stnp x14, x15, [x0, #-160] ldp x14, x15, [x1, #96] - stnp x16, x17, [x0, #112] + stnp x16, x17, [x0, #-144] 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, #-240] + stnp x6, x7, [x0, #-224] + stnp x8, x9, [x0, #-208] + stnp x10, x11, [x0, #-192] + stnp x12, x13, [x0, #-176] + stnp x14, x15, [x0, #-160] + stnp x16, x17, [x0, #-144] ret ENDPROC(copy_page)