From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6538BC433FE for ; Tue, 8 Dec 2020 21:59:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 05F05222F9 for ; Tue, 8 Dec 2020 21:59:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730078AbgLHV73 (ORCPT ); Tue, 8 Dec 2020 16:59:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727958AbgLHV72 (ORCPT ); Tue, 8 Dec 2020 16:59:28 -0500 Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B9FBC061794; Tue, 8 Dec 2020 13:58:48 -0800 (PST) Received: by mail-qk1-x743.google.com with SMTP id y18so126517qki.11; Tue, 08 Dec 2020 13:58:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G/NMXMjSBkeIHnho7dTPVvi7pj5oBgIZnaCU/I3zMQ0=; b=A+ZPhYYidA+pxagEZ71U9PLXKR2ENZsU2cAPqf/cWywzna9sleFqTCgNsklgCl2m2K v3ywjeGYg8PvoHfYdt9NBbcoD9MsPMTfetUuqRIz7A4tYrMV+U5kez6ouFsyf70yIdcU EYptzInGQ2B9gw3CSzTCgAqHsYMdBXLFeZi/YhENnT73SvXs8JJmVmF0FTtM4Qt8Eb45 NLs3u4j3l0E4+cf/t6DRoBLRWXUzjUpYSTsXHW7nJsLiwg96mqnLY2fAmV/voeHte4vH y7NYTqblDdJYPoA0iKzESYeBuBi5BQSxL2+Xm6TIk4AYf1Ibh2anA9qzix4Od2KvsKX+ XD5g== 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=G/NMXMjSBkeIHnho7dTPVvi7pj5oBgIZnaCU/I3zMQ0=; b=kbtchNeM0c7tQ16D+lf0FscQfsarOnHxLIxxxhtZyO66XLzpOiDCTSmkx9MBVRfzoG Ecsh/u0n3J8so8Jr90YM80ILiqLXLRcNukQVDnjCrGNJ3axbai8QiSocIOMw7QcsPRV2 V7x8t20VFNlRFd9WTHjXeOQkcrVeZHhhaXUcZUQa0ZSWvrpmE1oKYODlDdig9Qoiq0ag 683xBeRtYttO2WLR6Em/U/aeuTz/HesgpTDm2lA8SRZWdeMa9TyerQCJSSbvmE+bjW7q /echx5QKcE7aYMuBhujIxaJ/I8JTfOWQX3r2Tfnxikw9NiSY1toAi6Rd50NznzmrYI3C 18dA== X-Gm-Message-State: AOAM532YQRRG2yl7BJEGqgmtPY2ENrRyEEXTLKLZed0Qjx6TulC76HqS ZJZnx3TLNym2DcetJFGbZT+IdI0WZpc= X-Google-Smtp-Source: ABdhPJwO4H460UEGuYPNbcYEti5OdjUPd0UKdYp6/7QoqZbPWMUfoX+ZeAyy5sfrywJGz3eB0Pep1A== X-Received: by 2002:a05:620a:622:: with SMTP id 2mr32323807qkv.436.1607464727640; Tue, 08 Dec 2020 13:58:47 -0800 (PST) Received: from LeoBras.ibmuc.com ([2804:14d:8084:8e41:9b0d:571e:a65:b5d8]) by smtp.gmail.com with ESMTPSA id w22sm35819qtt.76.2020.12.08.13.58.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 13:58:46 -0800 (PST) From: Leonardo Bras To: Paul Mackerras , Michael Ellerman , Benjamin Herrenschmidt Cc: Leonardo Bras , kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/1] powerpc/kvm: Fix mask size for emulated msgsndp Date: Tue, 8 Dec 2020 18:57:08 -0300 Message-Id: <20201208215707.31149-1-leobras.c@gmail.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org According to ISAv3.1 and ISAv3.0b, the msgsndp is described to split RB in: msgtype <- (RB) 32:36 payload <- (RB) 37:63 t <- (RB) 57:63 The current way of getting 'msgtype', and 't' is missing their MSB: msgtype: ((arg >> 27) & 0xf) : Gets (RB) 33:36, missing bit 32 t: (arg &= 0x3f) : Gets (RB) 58:63, missing bit 57 Fixes this by applying the correct mask. Signed-off-by: Leonardo Bras --- Changes since v1: - Commit message 's/LSB/MSB/', because ISA ordering is big-endian. arch/powerpc/kvm/book3s_hv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index e3b1839fc251..5af0a429cee8 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -1241,9 +1241,9 @@ static int kvmppc_emulate_doorbell_instr(struct kvm_vcpu *vcpu) switch (get_xop(inst)) { case OP_31_XOP_MSGSNDP: arg = kvmppc_get_gpr(vcpu, rb); - if (((arg >> 27) & 0xf) != PPC_DBELL_SERVER) + if (((arg >> 27) & 0x1f) != PPC_DBELL_SERVER) break; - arg &= 0x3f; + arg &= 0x7f; if (arg >= kvm->arch.emul_smt_mode) break; tvcpu = kvmppc_find_vcpu(kvm, vcpu->vcpu_id - thr + arg); @@ -1256,7 +1256,7 @@ static int kvmppc_emulate_doorbell_instr(struct kvm_vcpu *vcpu) break; case OP_31_XOP_MSGCLRP: arg = kvmppc_get_gpr(vcpu, rb); - if (((arg >> 27) & 0xf) != PPC_DBELL_SERVER) + if (((arg >> 27) & 0x1f) != PPC_DBELL_SERVER) break; vcpu->arch.vcore->dpdes = 0; vcpu->arch.doorbell_request = 0; -- 2.25.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C412C433FE for ; Tue, 8 Dec 2020 22:00:47 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0F01922225 for ; Tue, 8 Dec 2020 22:00:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F01922225 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CrDdQ23SPzDqld for ; Wed, 9 Dec 2020 09:00:42 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::744; helo=mail-qk1-x744.google.com; envelope-from=leobras.c@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=A+ZPhYYi; dkim-atps=neutral Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) (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 lists.ozlabs.org (Postfix) with ESMTPS id 4CrDbK4pxczDqgB for ; Wed, 9 Dec 2020 08:58:51 +1100 (AEDT) Received: by mail-qk1-x744.google.com with SMTP id b144so115328qkc.13 for ; Tue, 08 Dec 2020 13:58:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G/NMXMjSBkeIHnho7dTPVvi7pj5oBgIZnaCU/I3zMQ0=; b=A+ZPhYYidA+pxagEZ71U9PLXKR2ENZsU2cAPqf/cWywzna9sleFqTCgNsklgCl2m2K v3ywjeGYg8PvoHfYdt9NBbcoD9MsPMTfetUuqRIz7A4tYrMV+U5kez6ouFsyf70yIdcU EYptzInGQ2B9gw3CSzTCgAqHsYMdBXLFeZi/YhENnT73SvXs8JJmVmF0FTtM4Qt8Eb45 NLs3u4j3l0E4+cf/t6DRoBLRWXUzjUpYSTsXHW7nJsLiwg96mqnLY2fAmV/voeHte4vH y7NYTqblDdJYPoA0iKzESYeBuBi5BQSxL2+Xm6TIk4AYf1Ibh2anA9qzix4Od2KvsKX+ XD5g== 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=G/NMXMjSBkeIHnho7dTPVvi7pj5oBgIZnaCU/I3zMQ0=; b=ZpFdmYJQenmBGl8G0MRwoNtHxjyHMKn62AIpF2fi+BmfmmCvWBoOxE7r329RGLFkdL Ccn1T+HZy8UZc9Le5ExUB6HB8tClu9xYLZo7hI8wY8Ht57/3PtlddIgGntHYKfRYHs3E wPyPUCSozMrZa6Rnzg2dF6nuqNhKrL1ctQvEAMUkLa+3m9mwTV6whJpBdUZbiMsnc+0n AayXtlmlh6m578RrgyP/hIZDF8ArVXCvy7is253Unu+58SLYe2m1L1TdQ0EQk4HJQs4/ 1kJa6nklIpzVo2KUZSf+wfggpPmw5fSA/9jttYRrjko2iKLEn/8jHEwk2pYPmxlTAb25 NKhA== X-Gm-Message-State: AOAM530nRZn/NbRM6yBKZtEEgllktClK3SSomwTwH/j0oKKs7h6LubbQ ugBp/KnZq6jmagnsB0l6GTU= X-Google-Smtp-Source: ABdhPJwO4H460UEGuYPNbcYEti5OdjUPd0UKdYp6/7QoqZbPWMUfoX+ZeAyy5sfrywJGz3eB0Pep1A== X-Received: by 2002:a05:620a:622:: with SMTP id 2mr32323807qkv.436.1607464727640; Tue, 08 Dec 2020 13:58:47 -0800 (PST) Received: from LeoBras.ibmuc.com ([2804:14d:8084:8e41:9b0d:571e:a65:b5d8]) by smtp.gmail.com with ESMTPSA id w22sm35819qtt.76.2020.12.08.13.58.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 13:58:46 -0800 (PST) From: Leonardo Bras To: Paul Mackerras , Michael Ellerman , Benjamin Herrenschmidt Subject: [PATCH v2 1/1] powerpc/kvm: Fix mask size for emulated msgsndp Date: Tue, 8 Dec 2020 18:57:08 -0300 Message-Id: <20201208215707.31149-1-leobras.c@gmail.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonardo Bras , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, kvm-ppc@vger.kernel.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" According to ISAv3.1 and ISAv3.0b, the msgsndp is described to split RB in: msgtype <- (RB) 32:36 payload <- (RB) 37:63 t <- (RB) 57:63 The current way of getting 'msgtype', and 't' is missing their MSB: msgtype: ((arg >> 27) & 0xf) : Gets (RB) 33:36, missing bit 32 t: (arg &= 0x3f) : Gets (RB) 58:63, missing bit 57 Fixes this by applying the correct mask. Signed-off-by: Leonardo Bras --- Changes since v1: - Commit message 's/LSB/MSB/', because ISA ordering is big-endian. arch/powerpc/kvm/book3s_hv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index e3b1839fc251..5af0a429cee8 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -1241,9 +1241,9 @@ static int kvmppc_emulate_doorbell_instr(struct kvm_vcpu *vcpu) switch (get_xop(inst)) { case OP_31_XOP_MSGSNDP: arg = kvmppc_get_gpr(vcpu, rb); - if (((arg >> 27) & 0xf) != PPC_DBELL_SERVER) + if (((arg >> 27) & 0x1f) != PPC_DBELL_SERVER) break; - arg &= 0x3f; + arg &= 0x7f; if (arg >= kvm->arch.emul_smt_mode) break; tvcpu = kvmppc_find_vcpu(kvm, vcpu->vcpu_id - thr + arg); @@ -1256,7 +1256,7 @@ static int kvmppc_emulate_doorbell_instr(struct kvm_vcpu *vcpu) break; case OP_31_XOP_MSGCLRP: arg = kvmppc_get_gpr(vcpu, rb); - if (((arg >> 27) & 0xf) != PPC_DBELL_SERVER) + if (((arg >> 27) & 0x1f) != PPC_DBELL_SERVER) break; vcpu->arch.vcore->dpdes = 0; vcpu->arch.doorbell_request = 0; -- 2.25.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leonardo Bras Date: Tue, 08 Dec 2020 21:57:08 +0000 Subject: [PATCH v2 1/1] powerpc/kvm: Fix mask size for emulated msgsndp Message-Id: <20201208215707.31149-1-leobras.c@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Paul Mackerras , Michael Ellerman , Benjamin Herrenschmidt Cc: Leonardo Bras , kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org According to ISAv3.1 and ISAv3.0b, the msgsndp is described to split RB in: msgtype <- (RB) 32:36 payload <- (RB) 37:63 t <- (RB) 57:63 The current way of getting 'msgtype', and 't' is missing their MSB: msgtype: ((arg >> 27) & 0xf) : Gets (RB) 33:36, missing bit 32 t: (arg &= 0x3f) : Gets (RB) 58:63, missing bit 57 Fixes this by applying the correct mask. Signed-off-by: Leonardo Bras --- Changes since v1: - Commit message 's/LSB/MSB/', because ISA ordering is big-endian. arch/powerpc/kvm/book3s_hv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index e3b1839fc251..5af0a429cee8 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -1241,9 +1241,9 @@ static int kvmppc_emulate_doorbell_instr(struct kvm_vcpu *vcpu) switch (get_xop(inst)) { case OP_31_XOP_MSGSNDP: arg = kvmppc_get_gpr(vcpu, rb); - if (((arg >> 27) & 0xf) != PPC_DBELL_SERVER) + if (((arg >> 27) & 0x1f) != PPC_DBELL_SERVER) break; - arg &= 0x3f; + arg &= 0x7f; if (arg >= kvm->arch.emul_smt_mode) break; tvcpu = kvmppc_find_vcpu(kvm, vcpu->vcpu_id - thr + arg); @@ -1256,7 +1256,7 @@ static int kvmppc_emulate_doorbell_instr(struct kvm_vcpu *vcpu) break; case OP_31_XOP_MSGCLRP: arg = kvmppc_get_gpr(vcpu, rb); - if (((arg >> 27) & 0xf) != PPC_DBELL_SERVER) + if (((arg >> 27) & 0x1f) != PPC_DBELL_SERVER) break; vcpu->arch.vcore->dpdes = 0; vcpu->arch.doorbell_request = 0; -- 2.25.4