From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender4-op-o12.zoho.com (sender4-op-o12.zoho.com [136.143.188.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC5D283CC1; Thu, 28 Nov 2024 08:15:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.12 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732781720; cv=pass; b=kEwVw2xciVxnt54vrKUKwx0jSLbLO+JWu2MBfcjfTliJPZWqc29s8VQnbcHznZEefe6pq17Yvg4wXgljWtTVCLo9l/6aHx6DIX0Jig+QAGy9mzQvYjXymEEocc4mgWUk9BhmOtQfURaRWPCaPg8EeT/yhGHTHCMKpNGhOo19Si8= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732781720; c=relaxed/simple; bh=T5qMGD+wC79fbSNefHgwRIL3TmEmIGxLwLebXk4cZJw=; h=Message-ID:Date:MIME-Version:Cc:Subject:To:References:From: In-Reply-To:Content-Type; b=hq+LPlav93Dwvo5UV4N7bS9sigb3Ym5C7QSZwjCp+BlYfYamCYHXra9xOgjMRJdaJkTQFINznEpIqC1/GMLfhSzvjPkDn2/Zw7x8/xMzHA1xu9ne71BLGFBOuNLm77K1gPGzyNzMS/KXw3HkEu3qk5O8b4nK+DjHjh3AlO41BCg= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=Usama.Anjum@collabora.com header.b=eClgEsKb; arc=pass smtp.client-ip=136.143.188.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=Usama.Anjum@collabora.com header.b="eClgEsKb" ARC-Seal: i=1; a=rsa-sha256; t=1732781694; cv=none; d=zohomail.com; s=zohoarc; b=IX5730+8nKj3sLJJvh7RomX2Bs+xolk30lhON7oLa00kJidON75pXFhsTmEGgcAW9b2qnIjoddSqWlEG0ut7tGzImbDmYZjCFgDfUNhl6/6t+7+EPzcPFhYgOrxs8JDejMJ04f7MRdujQsl7VzotuCRZXdML8iQneCaqdGpiBsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732781694; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=QjeMdtNt1+e4a2TwpMF2rrs8wuHFTMYgg8Pn0QLiQhM=; b=c0bO1NJUGND8z0Y4gLrSaYaGMfxAbPVQZVA1BZdg4iE6Pi3TqeuXPaphf7tAMGd952CUnr4ZswDBy/l6mZAxgZh/I2iGaYYwVL1LJOGzmHdTsP2B3oX/rWqKMsmBDXkBwuCUg3EhzCyKkaPhdMJVxbZ8aVdoOpnjb6T+wvmoHaQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=Usama.Anjum@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1732781694; s=zohomail; d=collabora.com; i=Usama.Anjum@collabora.com; h=Message-ID:Date:Date:MIME-Version:Cc:Cc:Subject:Subject:To:To:References:From:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=QjeMdtNt1+e4a2TwpMF2rrs8wuHFTMYgg8Pn0QLiQhM=; b=eClgEsKbSxmj5sTOLfyh5NKXzEfPT9e7i7v9Tl02dzQ6xGxjxaTk1hHxvZTtbnaZ dQ73cjyu/pfAZJfTvOezFTgeELmmmwGEhg71PrNe72w6ACQZ7dh69Yq6MGFSHqVTDsE ziYsaq6zsfdCO0SLThzs/u60o3OeJ2VKpcIMgeyE= Received: by mx.zohomail.com with SMTPS id 1732781693505946.223322327641; Thu, 28 Nov 2024 00:14:53 -0800 (PST) Message-ID: <4431aa18-c518-4396-87e8-04176eabdd49@collabora.com> Date: Thu, 28 Nov 2024 13:14:50 +0500 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Cc: Usama.Anjum@collabora.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Andrew Jones , James Houghton Subject: Re: [PATCH v4 01/16] KVM: Move KVM_REG_SIZE() definition to common uAPI header To: Sean Christopherson , Marc Zyngier , Oliver Upton , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Paolo Bonzini , Christian Borntraeger , Janosch Frank , Claudio Imbrenda References: <20241128005547.4077116-1-seanjc@google.com> <20241128005547.4077116-2-seanjc@google.com> Content-Language: en-US From: Muhammad Usama Anjum In-Reply-To: <20241128005547.4077116-2-seanjc@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ZohoMailClient: External On 11/28/24 5:55 AM, Sean Christopherson wrote: > Define KVM_REG_SIZE() in the common kvm.h header, and delete the arm64 and > RISC-V versions. As evidenced by the surrounding definitions, all aspects > of the register size encoding are generic, i.e. RISC-V should have moved > arm64's definition to common code instead of copy+pasting. > > Acked-by: Anup Patel > Reviewed-by: Andrew Jones > Signed-off-by: Sean Christopherson Reviewed-by: Muhammad Usama Anjum > --- > arch/arm64/include/uapi/asm/kvm.h | 3 --- > arch/riscv/include/uapi/asm/kvm.h | 3 --- > include/uapi/linux/kvm.h | 4 ++++ > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h > index 66736ff04011..568bf858f319 100644 > --- a/arch/arm64/include/uapi/asm/kvm.h > +++ b/arch/arm64/include/uapi/asm/kvm.h > @@ -43,9 +43,6 @@ > #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 > #define KVM_DIRTY_LOG_PAGE_OFFSET 64 > > -#define KVM_REG_SIZE(id) \ > - (1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT)) > - > struct kvm_regs { > struct user_pt_regs regs; /* sp = sp_el0 */ > > diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h > index 3482c9a73d1b..9f60d6185077 100644 > --- a/arch/riscv/include/uapi/asm/kvm.h > +++ b/arch/riscv/include/uapi/asm/kvm.h > @@ -211,9 +211,6 @@ struct kvm_riscv_sbi_sta { > #define KVM_RISCV_TIMER_STATE_OFF 0 > #define KVM_RISCV_TIMER_STATE_ON 1 > > -#define KVM_REG_SIZE(id) \ > - (1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT)) > - > /* If you need to interpret the index values, here is the key: */ > #define KVM_REG_RISCV_TYPE_MASK 0x00000000FF000000 > #define KVM_REG_RISCV_TYPE_SHIFT 24 > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > index 502ea63b5d2e..343de0a51797 100644 > --- a/include/uapi/linux/kvm.h > +++ b/include/uapi/linux/kvm.h > @@ -1070,6 +1070,10 @@ struct kvm_dirty_tlb { > > #define KVM_REG_SIZE_SHIFT 52 > #define KVM_REG_SIZE_MASK 0x00f0000000000000ULL > + > +#define KVM_REG_SIZE(id) \ > + (1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT)) > + > #define KVM_REG_SIZE_U8 0x0000000000000000ULL > #define KVM_REG_SIZE_U16 0x0010000000000000ULL > #define KVM_REG_SIZE_U32 0x0020000000000000ULL -- BR, Muhammad Usama Anjum