From patchwork Mon Mar 14 11:24:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Heimes X-Patchwork-Id: 1605032 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=oCOmwUyN; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KHDjp4qhcz9sGJ for ; Mon, 14 Mar 2022 22:25:33 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nTipL-00061z-If; Mon, 14 Mar 2022 11:25:27 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nTipJ-0005z4-NM for kernel-team@lists.ubuntu.com; Mon, 14 Mar 2022 11:25:25 +0000 Received: from T570.fritz.box (p5dce2f8b.dip0.t-ipconnect.de [93.206.47.139]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 66CD1412E0 for ; Mon, 14 Mar 2022 11:25:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1647257125; bh=a1arhI6bJyOCmk8om4Zmu63E1E/3Lc+gOTQcz+bA1QU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oCOmwUyNHnKaUPEyl1tlDuWpn5gXi1qimU2cv9sbsVxAWFlVSnZeixeszS4OfWzdx TG9a4JTvTyp+6nR63qpBT8VMVNr5vAkVjz0CYljnn1pm2yKL3uW0hrLgLLdkj6EyKa moew3Wla2afoOOl6waonh267oJJ3CwtVL0yIpsr1Qg2S36VjvDxzBHygmmjpN0Xs4Q DBre1MP7uQNPMflUSRXD1BprhndLwK9W90y8lXt68jEkvR9GroQxEqgo287UAws7X1 bKuMmFDnsEQaUnOx+w7gl5u46SdpNY/JuNFmCQOJShkUl6E+yZuP1W1tMBkCc7qJgv aK/PUt1p5JGhw== From: frank.heimes@canonical.com To: kernel-team@lists.ubuntu.com Subject: [J][PATCH 1/1] UBUNTU: SAUCE: Set KVM_CAP_S390_MEM_OP_EXTENSION capability to 211 Date: Mon, 14 Mar 2022 12:24:17 +0100 Message-Id: <20220314112417.1599846-2-frank.heimes@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220314112417.1599846-1-frank.heimes@canonical.com> References: <20220314112417.1599846-1-frank.heimes@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Frank Heimes BugLink: https://bugs.launchpad.net/bugs/1963901 Setting KVM_CAP_S390_MEM_OP_EXTENSION capability to 211 is required to enable storage key checking for intercepted instruction and to ensure compatibility with upstream. The upstream merge request "Merge branch 'kvm-ppc-cap-210' into kvm-next-5.18." https://git.kernel.org/pub/scm/virt/kvm/kvm.git/commit/?h=next&id=4dfc4ec2b7f5a3a27d166ac42cf8a583fa2d3284 is referenced in LP: 1963901, but it includes and pulls in more changes than needed - even changes for ppc64el and at the API doc that are not relevant for s390x. Hence this UBUNTU SAUCE patch, that limits the modification to the bare minimum (a single line). [Avoiding backport of "Merge branch 'kvm-ppc-cap-210' into kvm-next-5.18.", upstream commit 4dfc4ec2b7f5a3a27d166ac42cf8a583fa2d3284, and limiting change to the bare minimum.] Signed-off-by: Frank Heimes Acked-by: Krzysztof Kozlowski --- include/uapi/linux/kvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index f261bb900bd0..0d47e07f4781 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1122,7 +1122,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_VM_GPA_BITS 207 #define KVM_CAP_XSAVE2 208 #define KVM_CAP_SYS_ATTRIBUTES 209 -#define KVM_CAP_S390_MEM_OP_EXTENSION 210 +#define KVM_CAP_S390_MEM_OP_EXTENSION 211 #ifdef KVM_CAP_IRQ_ROUTING