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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9994EC433EF for ; Wed, 10 Nov 2021 18:51:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 81B586115B for ; Wed, 10 Nov 2021 18:51:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233157AbhKJSya (ORCPT ); Wed, 10 Nov 2021 13:54:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:47820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233504AbhKJSwj (ORCPT ); Wed, 10 Nov 2021 13:52:39 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2B94F61247; Wed, 10 Nov 2021 18:48:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1636570081; bh=LLBinJJM2VdG9psh21G8WbOpU84azKF13NA2GJ6SUOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fRvyWOKejFbe0ynx8jQHKyu7WZBmwgMoYmeafYMbHhPTO0kUQMmJYEzKZwh22ToUE 4iuBuLvAcnMh7P6kI7r7pvy1GOijwxXLpTOwQrOvYzrGZeIaevmIB+UBOsD20eAxMy 9PWA9wwstmtenpj7VAjvou+tOkt3Lj8zbcaUYQYY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, torvic9@mailbox.org, Paolo Bonzini , Nathan Chancellor Subject: [PATCH 5.10 01/21] KVM: x86: avoid warning with -Wbitwise-instead-of-logical Date: Wed, 10 Nov 2021 19:43:47 +0100 Message-Id: <20211110182003.010947261@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211110182002.964190708@linuxfoundation.org> References: <20211110182002.964190708@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Paolo Bonzini commit 3d5e7a28b1ea2d603dea478e58e37ce75b9597ab upstream. This is a new warning in clang top-of-tree (will be clang 14): In file included from arch/x86/kvm/mmu/mmu.c:27: arch/x86/kvm/mmu/spte.h:318:9: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical] return __is_bad_mt_xwr(rsvd_check, spte) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ || arch/x86/kvm/mmu/spte.h:318:9: note: cast one or both operands to int to silence this warning The code is fine, but change it anyway to shut up this clever clogs of a compiler. Reported-by: torvic9@mailbox.org Signed-off-by: Paolo Bonzini [nathan: Backport to 5.10, which does not have 961f84457cd4] Signed-off-by: Nathan Chancellor Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/mmu/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3545,7 +3545,7 @@ static bool get_mmio_spte(struct kvm_vcp * reserved bit and EPT's invalid memtype/XWR checks to avoid * adding a Jcc in the loop. */ - reserved |= __is_bad_mt_xwr(rsvd_check, sptes[level - 1]) | + reserved |= __is_bad_mt_xwr(rsvd_check, sptes[level - 1]) || __is_rsvd_bits_set(rsvd_check, sptes[level - 1], level); }