Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp1919788imm; Thu, 24 May 2018 02:57:16 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp1rbrYEm9W+FAMr9BWLsYF/Tj5Vglbpbs7rBMpwPuCHq7RKO9JBYofNUd2MnYhP5DsEurW X-Received: by 2002:a63:7c12:: with SMTP id x18-v6mr1393325pgc.220.1527155836489; Thu, 24 May 2018 02:57:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527155836; cv=none; d=google.com; s=arc-20160816; b=uIrHivvNeJGQJ+F090MvRk44QvTjbnHuGom/6qCU6kqvwNaq5cmWICvBN4Ov/et+ti zbfPXR0qTMS7qNyS4T5mcfHUsu13n3i0sA2LNZdqNI5dRWuW/9Rdpt8BOBmealVtbDfe aybEKdRcs72RT1zLnuDZ/8Hnn7XApV5wXIzyp3kJHFAIzl8wvm+VsDSFfEo40W8Q5QrS LeVuLOypycFloWKaGlnJRtGQPiXm/q1oE+Tx1tw1iNmckcGju5nuGaPj//z6LqPX2OVw 2QdOuCbCDFsgvP1jNPK4nCCQ+ZHca4LS3j0NL0QOj7WFeyPHyFMeckaPwiP01wRq5rYA GaTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=gqSbt0WU/1EdKoD4zCDWujRWzxu1snNRlxm1cgvVCwQ=; b=pya10kkmdpNPHEOhjTdB1q3CHT0QFqJU1LZqVSLJ4ILjG1JH2DiKrZPdsETbeuzwI7 3SLSmf1p4ODfiY60ZdPRRV0DKtpqLL5gfguSOg2O544uL8upKbvWgfrlnqGh9MXPZx3R LFwl5W6qYPasLTVOrg8i5Mjy4uhcY/J7o8N8IltRA4ad2YXRpvMPmBeZ2aJwHCTFCiNs 6TQryDTSFyYVPKX2g6I2h+CMojU/bDwDDgjF2sOiZbrFLRirDzOKedAYR8GGBg8kELFW sS1De36hBGrVizwvFtxopDGR8GCnU6FRF/RmHarkebNslTY6Ye6E+5l1AYRPBuM9t6Xj jrYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bVN8tyxu; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c3-v6si20625057pld.593.2018.05.24.02.57.01; Thu, 24 May 2018 02:57:16 -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=@kernel.org header.s=default header.b=bVN8tyxu; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968286AbeEXJzI (ORCPT + 99 others); Thu, 24 May 2018 05:55:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:35122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968334AbeEXJy7 (ORCPT ); Thu, 24 May 2018 05:54:59 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B3A9B2089C; Thu, 24 May 2018 09:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527155699; bh=vGZI9QzVZ7AJzwabsBEpKrqI3yqiCgR80j0mSlTY5HE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bVN8tyxu8C3FOVN0cIOY0608C61PDGmCs9qNS6LDXLQZncTNCzGtbFsDL3qX5q3P3 GvHknXjqSuKZGvxIa97DKQK9mzDNVmha8YKYAoydBszRq175+eTup5ZpFKLVhe2q2v NEYUKChOMle6lUiG0EFQokRlkrUKq2+yxj5hhzk8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Martin Schwidefsky , Hendrik Brueckner Subject: [PATCH 4.14 039/165] s390/crc32-vx: use expoline for indirect branches Date: Thu, 24 May 2018 11:37:25 +0200 Message-Id: <20180524093623.559269891@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180524093621.979359379@linuxfoundation.org> References: <20180524093621.979359379@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Martin Schwidefsky [ Upstream commit 467a3bf219cee12259182c5cb4821f88fd518a51 ] The return from the crc32_le_vgfm_16/crc32c_le_vgfm_16 and the crc32_be_vgfm_16 functions are done with "br %r14". These are indirect branches as well and need to use execute trampolines for CONFIG_EXPOLINE=y. Cc: stable@vger.kernel.org # 4.16 Fixes: f19fbd5ed6 ("s390: introduce execute-trampolines for branches") Reviewed-by: Hendrik Brueckner Signed-off-by: Martin Schwidefsky Signed-off-by: Greg Kroah-Hartman --- arch/s390/crypto/crc32be-vx.S | 5 ++++- arch/s390/crypto/crc32le-vx.S | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) --- a/arch/s390/crypto/crc32be-vx.S +++ b/arch/s390/crypto/crc32be-vx.S @@ -13,6 +13,7 @@ */ #include +#include #include /* Vector register range containing CRC-32 constants */ @@ -67,6 +68,8 @@ .previous + GEN_BR_THUNK %r14 + .text /* * The CRC-32 function(s) use these calling conventions: @@ -203,6 +206,6 @@ ENTRY(crc32_be_vgfm_16) .Ldone: VLGVF %r2,%v2,3 - br %r14 + BR_EX %r14 .previous --- a/arch/s390/crypto/crc32le-vx.S +++ b/arch/s390/crypto/crc32le-vx.S @@ -14,6 +14,7 @@ */ #include +#include #include /* Vector register range containing CRC-32 constants */ @@ -76,6 +77,7 @@ .previous + GEN_BR_THUNK %r14 .text @@ -264,6 +266,6 @@ crc32_le_vgfm_generic: .Ldone: VLGVF %r2,%v2,2 - br %r14 + BR_EX %r14 .previous