From:   Anup Patel <anup.patel@wdc.com>
To:     Paolo Bonzini <pbonzini@redhat.com>, Shuah Khan <shuah@kernel.org>,
        Atish Patra <atishp@atishpatra.org>
Cc:     Sean Christopherson <seanjc@google.com>,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Albert Ou <aou@eecs.berkeley.edu>,
        Alistair Francis <Alistair.Francis@wdc.com>,
        Anup Patel <anup@brainfault.org>, kvm@vger.kernel.org,
        kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org,
        linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
        Anup Patel <anup.patel@wdc.com>
Subject: [PATCH] KVM: selftests: Fix compile error for non-x86 vm_compute_max_gfn()
Date:   Tue, 21 Dec 2021 18:26:17 +0530
Message-Id: <20211221125617.932371-1-anup.patel@wdc.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
WDCIPOUTBOUND: EOP-TRUE
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rug1//6RS0KglDChVEQzJuYKRyJEwwss1OBqh7c/FzblA25iy1f+Zs7lapBT?=
 =?us-ascii?Q?oBy/5uJ+Aj7e7PU2cb/RBmS+SIAyqE/0f2RXg72IcZNomXXnKJTK6UXzhLgw?=
 =?us-ascii?Q?V53mAbDC+Jd7dnt7Og79RfCz3+QunI1w4kfD+iH8GjBLap2NHSDx9pNNmuY7?=
 =?us-ascii?Q?Zed67u3Urb89e7hYxFKaLgR6HRnX05IbcSkODgg2OqYWNWgtDF6F1V36j2RZ?=
 =?us-ascii?Q?QU/TdwksZd5nlR3nuh/fBznvMsin1Pg9GgOPOKcbEzOk4V3visgbB5YDoewj?=
 =?us-ascii?Q?Fre+vEsXK8sTFceywildxTaqsptuRvufT7HYJSZofneuFURMNNKTXhkh9bLo?=
 =?us-ascii?Q?mD30KG4n60pBZyyTyt/6+Qq7eBp0D2AqSbGOh44xCroZ5jrjkc9m+b+B+LmD?=
 =?us-ascii?Q?ZsiI3qP2Q3mBJ+L8+KMKGA8ZM3IdLzIJXY87+DShqxmXnygAo63NESlngHt1?=
 =?us-ascii?Q?pUKFoaMH00QYptoETg8aRsh3aGwi0fVk3bVI6Pfh0rEvAt60b49j1oC8rLIM?=
 =?us-ascii?Q?jpfw1Pu7WDIINcGMO+gElWkHgsDZgBEuQ1Xoba1jVqiuQ3n4tgiH22M208ts?=
 =?us-ascii?Q?10T171Ufysz1x8ea/pt3ek23zFIZ54OSMvuzl8SbdIFOpueLStsG/psR3xUg?=
 =?us-ascii?Q?8HDa2NWP2tyKWvqvR2XYwU+Qwe2Efruu/SZFB/NCFAkeOFpJhF/QNsNDtlgm?=
 =?us-ascii?Q?+b8hoY6Kk/DS0cbZI9vmDIzs75svPzxunaGMTOyi6Yewv+BjBCtBtn8HgMZR?=
 =?us-ascii?Q?un7Fuw3iYHxWLurY+AZgw1StC4yXMVV2t9+BUu/zgo3HPa/sfDr4rIhRQBPN?=
 =?us-ascii?Q?QkmlwJGo1KHh0YydcEhY6nYGXFkyE6gNBMzxIR+CdRnuYCvnsxjx0u40Y2Xa?=
 =?us-ascii?Q?h1CxH8IB3g8N3bvE33PagmvPD8Je6WbRqyMpdPKBgg6Um1/XpxWiG3iJYZQE?=
 =?us-ascii?Q?Vne6Qt9lq4s1gPX1IxoZqVqMEddY9gx2woga4XTO/N/eU72e1DbilYmiozg0?=
 =?us-ascii?Q?PyGAXPqp1siGFA64jx0Ev26UmYHo6sW+0zdieqLomlknNCrQim+j26WYIfxw?=
 =?us-ascii?Q?kUQB19tVNuBGd4VECpupgkpFfJYgEKEbQpZRYzEtWxYRIH0xL5ytVjZcozu4?=
 =?us-ascii?Q?Gcmp5WcKR3D6tFysDa0ZGkrWtp50baDiZIYD+3miM6NYlzZ4KDp7AOyl70uP?=
 =?us-ascii?Q?06oBiorn4uZH/eenhV7zrvADF2rsyXTpO7pHKVwjLjLzydGSKVkwADAxByn/?=
 =?us-ascii?Q?7VeH2oNZogRnpFnN9wYiT9LNd4iG24PK23wjpq9fhrNCAyRJdtekFPOYluWu?=
 =?us-ascii?Q?0BNqYgHXiJqSlZwVo/nYXt7t9mRBisQqgh/PO3pPJ/IT+29X9S14ZgYcJJR9?=
 =?us-ascii?Q?15IXLCi0myIhskNzmq3cxqkl/h1kjwD0F5sL0ZJJunOwTu+TxkYglN6PdtZL?=
 =?us-ascii?Q?qH54BrOwjkeS/+bFZGyNFL69E/ELAPm7EL24iarCi+aQjjyURtie4FLK5nDO?=
 =?us-ascii?Q?wCNxDaO9XzNGv3JQ+Pj4OPHHlXmWJTLUMhBsIbsiYifmruVIMeQ4zRnxKwcB?=
 =?us-ascii?Q?YvsIB8lmCjkOXy0X6QbbKDng3aCUHF+7O+5K6OP6aSYhC7x8Xe5CExz6g6j5?=
 =?us-ascii?Q?q9wQ/J2QA9jO9qvn2+L9j70=3D?=
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0e5e9112-57dc-4a53-5e6c-08d9c4815b07
X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2021 12:56:51.0420
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 4Yl5l6TK+zn0mVHDrzRjqzlyJbaBFxvKW1d7LVrcaEzxCFOC58saKY4eAfCwwdgvmLoLnWzY/tPhyc95+q8LmQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR04MB8266
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The inline version of vm_compute_max_gfn() in kvm_util.h directly
access members of "struct kvm_vm" which causes compile errors for
non-x86 architectures because lib/elf.c includes "kvm_util.h" before
"kvm_util_internal.h".

This patch fixes above described compile error by converting inline
version of vm_compute_max_gfn() into a macro.

Fixes: c8cc43c1eae2 ("selftests: KVM: avoid failures due to reserved
HyperTransport region")
Signed-off-by: Anup Patel <anup.patel@wdc.com>
---
 tools/testing/selftests/kvm/include/kvm_util.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
index da2b702da71a..2279e340ca58 100644
--- a/tools/testing/selftests/kvm/include/kvm_util.h
+++ b/tools/testing/selftests/kvm/include/kvm_util.h
@@ -74,10 +74,8 @@ enum vm_guest_mode {
 #if defined(__x86_64__)
 unsigned long vm_compute_max_gfn(struct kvm_vm *vm);
 #else
-static inline unsigned long vm_compute_max_gfn(struct kvm_vm *vm)
-{
-	return ((1ULL << vm->pa_bits) >> vm->page_shift) - 1;
-}
+#define vm_compute_max_gfn(vm) \
+	((unsigned long)(((1ULL << (vm)->pa_bits) >> (vm)->page_shift) - 1))
 #endif
 
 #define MIN_PAGE_SIZE		(1U << MIN_PAGE_SHIFT)
-- 
2.25.1