From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751605AbdB0HIX (ORCPT ); Mon, 27 Feb 2017 02:08:23 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:57117 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751011AbdB0HIV (ORCPT ); Mon, 27 Feb 2017 02:08:21 -0500 Date: Mon, 27 Feb 2017 08:07:15 +0100 From: Martin Schwidefsky To: Linus Torvalds Cc: linux-kernel , linux-s390 , Heiko Carstens Subject: [GIT PULL] s390 patches for 4.11 merge window #2 X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17022707-0036-0000-0000-000003744321 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17022707-0037-0000-0000-0000153F2D4F Message-Id: <20170227080715.4c4ae517@mschwideX1> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-02-27_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702270073 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, please pull from the 'for-linus' branch of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus to receive the following updates: Next to the usual bug fixes (including the TASK_SIZE fix), there is one larger crypto item. It allows to use protected keys with the in-kernel crypto API. The protected key support has two parts, the pkey user space API to convert key formats and the paes crypto module that uses a protected key instead of a standard AES key. Colin Ian King (1): s390/dasd: fix spelling mistake: "supportet" -> "supported" Dominik Dingel (1): s390/mm: use _SEGMENT_ENTRY_EMPTY in the code Harald Freudenberger (6): s390/zcrypt: Enable request count reset for cards and queues. s390/crypto: Add PCKMO inline function s390/zcrypt: Cleanup leftover module code. s390/zcrypt: Rework CONFIG_ZCRYPT Kconfig text. s390/zcrypt: export additional symbols s390/pkey: Introduce pkey kernel module Heiko Carstens (5): s390: rename CIF_ASCE to CIF_ASCE_PRIMARY s390: restore address space when returning to user space s390: opt into HAVE_COPY_THREAD_TLS s390/nmi: fix order of register validation s390/nmi: purge tlbs after control register validation Martin Schwidefsky (2): s390/crypt: Add protected key AES module s390: TASK_SIZE for kernel threads Peter Oberparleiter (1): s390/chsc: Add exception handler for CHSC instruction arch/s390/Kconfig | 1 + arch/s390/configs/default_defconfig | 1 + arch/s390/configs/performance_defconfig | 1 + arch/s390/crypto/Makefile | 2 +- arch/s390/crypto/paes_s390.c | 619 +++++++++++++++++ arch/s390/defconfig | 1 + arch/s390/include/asm/cpacf.h | 46 +- arch/s390/include/asm/mmu_context.h | 4 +- arch/s390/include/asm/pgtable.h | 14 +- arch/s390/include/asm/pkey.h | 90 +++ arch/s390/include/asm/processor.h | 19 +- arch/s390/include/asm/uaccess.h | 23 +- arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/pkey.h | 112 +++ arch/s390/kernel/entry.S | 33 +- arch/s390/kernel/entry.h | 1 + arch/s390/kernel/nmi.c | 25 +- arch/s390/kernel/process.c | 18 +- arch/s390/mm/gmap.c | 6 +- arch/s390/mm/hugetlbpage.c | 2 +- drivers/crypto/Kconfig | 32 +- drivers/s390/block/dasd_eckd.c | 2 +- drivers/s390/cio/ioasm.c | 8 +- drivers/s390/crypto/Makefile | 4 + drivers/s390/crypto/ap_bus.c | 10 - drivers/s390/crypto/ap_card.c | 24 +- drivers/s390/crypto/ap_queue.c | 21 +- drivers/s390/crypto/pkey_api.c | 1148 +++++++++++++++++++++++++++++++ drivers/s390/crypto/zcrypt_api.c | 5 +- drivers/s390/crypto/zcrypt_api.h | 2 + 30 files changed, 2182 insertions(+), 93 deletions(-) create mode 100644 arch/s390/crypto/paes_s390.c create mode 100644 arch/s390/include/asm/pkey.h create mode 100644 arch/s390/include/uapi/asm/pkey.h create mode 100644 drivers/s390/crypto/pkey_api.c