From patchwork Thu Dec 6 15:57:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10716287 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ECA1113BF for ; Thu, 6 Dec 2018 16:00:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D89ED2E94A for ; Thu, 6 Dec 2018 16:00:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB5B82E950; Thu, 6 Dec 2018 16:00:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 65EAD2E94A for ; Thu, 6 Dec 2018 16:00:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=xrsQ6/gaHyWY4jyiRqtZ3zBLHFaxIyIdAoR/0Na/j0M=; b=CO1wuGCk8K3IoO dBpK8sQWwHPJOtUU5FGXXAYur5a6e0rZZLspczxwvhwgCPCiTibh2SWqf3qEc45n6E/H1N1mChV2w 9PN/BTk3P4e/LYskd1IciVVtFx3NnX1wUPibvOqFzuyra8QC3rf+2HcnXH7l62yfbwitulDVZodpv 8pqacPIWKRXRx3McRGJGQPyXbgu8K9UEHTdaD0+ebLf6jvwL1h0GP7uwuMcmj9Raq8WOmPl6lTYXg PgwfvywNI2V5COu8Ol7KvN1i+4I6XOtzDlXxQB9QWkQDbjCTw3MPFz4evKKNlSkkO0kWun+iRKpl8 B0PyG5pPuBhYv3lpY8VA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUw4C-0003EU-ES; Thu, 06 Dec 2018 15:59:56 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUw49-00038s-0M for linux-arm-kernel@lists.infradead.org; Thu, 06 Dec 2018 15:59:54 +0000 Received: by mail-wm1-x342.google.com with SMTP id s14so1514848wmh.1 for ; Thu, 06 Dec 2018 07:59:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HsOLDUWwS8wWEQ+PD9JmGHJK/WLq/vNZaVg+lNHLzj4=; b=O4ObU8n11TBr2ObnmJrGLcsQN3HvgIP5sU1+BuOrpY7vMygSWU3d6W9+76PAeBS/fY ENBpFShrhNiSOWQ1xsLuuDgFMAB982FPJ+EIWj3+eZvWrkC/CbKKQG3f1JKtreMG4UWH Wn9aP5/upm/BeA++LtzUvDtozSI7nFkzXZPnI= 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:mime-version :content-transfer-encoding; bh=HsOLDUWwS8wWEQ+PD9JmGHJK/WLq/vNZaVg+lNHLzj4=; b=ahrMXso0FVEJWFfqYgn8vhX0Q3p76ziWByO2AEF3e3tW+Egl4gBf90scgGFPu+Jm+t 30oa4ssHIiYnJYPFJr6WEhS27gijafS/FKpAEBjLHc5tkiLDATNdMkFB2yf1g9ihwOkr p6L+JtX2Q+dHArVYjCHrUW9G6QMBHAMOre6hGT4fRQOvmjFdrS2zdu2DBxIinCa0Rl/A 53pdf6FhpnconAgCTDMEB7k2/t3b/uRjFvcLooBAJXR9Gd8gQOFgWA7QD89OYNPAlvBK kscJeIogzEzklv3RzI4gGq5twp/rPxHHK5p5OQsoflcOvSmLpJxp8gKULZhVnMANfyrm 3OEA== X-Gm-Message-State: AA+aEWZbtUdAnpOUBW+br3av31RHjGUAAOJTpU3h61T2LTluokOKa5gN w7poKqFSPFqM1fVAM+cnppUv7w== X-Google-Smtp-Source: AFSGD/UslGuIVtLy5O4X2xEgkigRmH0XwoOq8dX9DZs4zGkT8FRe3OjgscFlOotup9DUk/krCQFIow== X-Received: by 2002:a1c:128b:: with SMTP id 133mr21076331wms.22.1544111981435; Thu, 06 Dec 2018 07:59:41 -0800 (PST) Received: from localhost.localdomain (laubervilliers-657-1-83-120.w92-154.abo.wanadoo.fr. [92.154.90.120]) by smtp.gmail.com with ESMTPSA id y34sm1525233wrd.68.2018.12.06.07.59.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 07:59:40 -0800 (PST) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Subject: [PATCH 0/5] arm64: assorted fixes for dcache_by_line_op Date: Thu, 6 Dec 2018 16:57:34 +0100 Message-Id: <20181206155739.20229-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181206_075953_042322_11B02E45 X-CRM114-Status: UNSURE ( 9.83 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel , Marc Zyngier , Catalin Marinas , Suzuki Poulose , Will Deacon , Robin Murphy , Dave Martin , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This fixes two issues in dcache_by_line_op: patch #4 fixes the logic that is applied when patching DC CVAP instructions, and patch #5 gets rid of some unintended undefined symbols resulting from incorrect use of conditional GAS directives. Patches #1 to #3 are groundwork for #4. Cc: Robin Murphy Cc: Will Deacon Cc: Catalin Marinas Cc: Marc Zyngier Cc: Suzuki Poulose Cc: Dave Martin Ard Biesheuvel (5): arm64/alternative_cb: move callback reference into replacements section arm64/alternative_cb: add nr_alts parameter to callback handlers arm64/alternative_cb: add support for alternative sequences arm64/assembler: use callback to 3-way alt-patch DC CVAP instructions arm64/mm: use string comparisons in dcache_by_line_op arch/arm64/include/asm/alternative.h | 54 +++++++++++--------- arch/arm64/include/asm/assembler.h | 17 +++--- arch/arm64/include/asm/kvm_mmu.h | 4 +- arch/arm64/kernel/alternative.c | 22 +++++--- arch/arm64/kernel/cpu_errata.c | 24 ++++++--- arch/arm64/kvm/va_layout.c | 8 +-- 6 files changed, 79 insertions(+), 50 deletions(-)