From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: Maya Nakamura <m.maya.nakamura@gmail.com>,
mikelley@microsoft.com, kys@microsoft.com,
haiyangz@microsoft.com, sthemmin@microsoft.com,
sashal@kernel.org
Cc: x86@kernel.org, linux-hyperv@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 4/6] x86: hv: mmu.c: Replace page definitions with Hyper-V specific ones
Date: Fri, 05 Apr 2019 13:10:46 +0200 [thread overview]
Message-ID: <87zhp4iu6h.fsf@vitty.brq.redhat.com> (raw)
In-Reply-To: <3bc5d60092473815fbd90422875233fb6075285b.1554426040.git.m.maya.nakamura@gmail.com>
Maya Nakamura <m.maya.nakamura@gmail.com> writes:
> Replace PAGE_SHIFT, PAGE_SIZE, and PAGE_MASK with HV_HYP_PAGE_SHIFT,
> HV_HYP_PAGE_SIZE, and HV_HYP_PAGE_MASK, respectively, because the guest
> page size and hypervisor page size concepts are different, even though
> they happen to be the same value on x86.
>
> Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
> ---
> arch/x86/hyperv/mmu.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/hyperv/mmu.c b/arch/x86/hyperv/mmu.c
> index e65d7fe6489f..175f6dcc7362 100644
> --- a/arch/x86/hyperv/mmu.c
> +++ b/arch/x86/hyperv/mmu.c
> @@ -15,7 +15,7 @@
> #include <asm/trace/hyperv.h>
>
> /* Each gva in gva_list encodes up to 4096 pages to flush */
> -#define HV_TLB_FLUSH_UNIT (4096 * PAGE_SIZE)
> +#define HV_TLB_FLUSH_UNIT (4096 * HV_HYP_PAGE_SIZE)
>
> static u64 hyperv_flush_tlb_others_ex(const struct cpumask *cpus,
> const struct flush_tlb_info *info);
> @@ -32,15 +32,15 @@ static inline int fill_gva_list(u64 gva_list[], int offset,
> do {
> diff = end > cur ? end - cur : 0;
>
> - gva_list[gva_n] = cur & PAGE_MASK;
> + gva_list[gva_n] = cur & HV_HYP_PAGE_MASK;
I'm not sure this is correct: here we're expressing guest virtual
addresses in need of flushing, this should be unrelated to the
hypervisor page size.
> /*
> * Lower 12 bits encode the number of additional
> * pages to flush (in addition to the 'cur' page).
> */
> if (diff >= HV_TLB_FLUSH_UNIT)
> - gva_list[gva_n] |= ~PAGE_MASK;
> + gva_list[gva_n] |= ~HV_HYP_PAGE_MASK;
> else if (diff)
> - gva_list[gva_n] |= (diff - 1) >> PAGE_SHIFT;
> + gva_list[gva_n] |= (diff - 1) >> HV_HYP_PAGE_SHIFT;
>
> cur += HV_TLB_FLUSH_UNIT;
> gva_n++;
> @@ -129,7 +129,8 @@ static void hyperv_flush_tlb_others(const struct cpumask *cpus,
> * We can flush not more than max_gvas with one hypercall. Flush the
> * whole address space if we were asked to do more.
> */
> - max_gvas = (PAGE_SIZE - sizeof(*flush)) / sizeof(flush->gva_list[0]);
> + max_gvas = (HV_HYP_PAGE_SIZE - sizeof(*flush)) /
> + sizeof(flush->gva_list[0]);
>
> if (info->end == TLB_FLUSH_ALL) {
> flush->flags |= HV_FLUSH_NON_GLOBAL_MAPPINGS_ONLY;
> @@ -200,9 +201,9 @@ static u64 hyperv_flush_tlb_others_ex(const struct cpumask *cpus,
> * whole address space if we were asked to do more.
> */
> max_gvas =
> - (PAGE_SIZE - sizeof(*flush) - nr_bank *
> + (HV_HYP_PAGE_SIZE - sizeof(*flush) - nr_bank *
> sizeof(flush->hv_vp_set.bank_contents[0])) /
> - sizeof(flush->gva_list[0]);
> + sizeof(flush->gva_list[0]);
>
> if (info->end == TLB_FLUSH_ALL) {
> flush->flags |= HV_FLUSH_NON_GLOBAL_MAPPINGS_ONLY;
--
Vitaly
next prev parent reply other threads:[~2019-04-05 11:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-05 1:11 [PATCH 0/6] hv: Remove dependencies on guest page size Maya Nakamura
2019-04-05 1:13 ` [PATCH 1/6] x86: hv: hyperv-tlfs.h: Create and use Hyper-V page definitions Maya Nakamura
2019-04-05 1:14 ` [PATCH 2/6] x86: hv: hv_init.c: Replace alloc_page() with kmem_cache_alloc() Maya Nakamura
2019-04-05 11:31 ` Vitaly Kuznetsov
2019-04-12 7:24 ` Maya Nakamura
2019-04-12 7:52 ` Vitaly Kuznetsov
2019-05-08 6:46 ` Maya Nakamura
2019-05-08 14:54 ` Vitaly Kuznetsov
[not found] ` <BYAPR21MB1317AC7CA4B242106FCAD698CC320@BYAPR21MB1317.namprd21.prod.outlook.com>
2019-05-08 19:53 ` Vitaly Kuznetsov
[not found] ` <MN2PR21MB1232C6ABA5DAC847C8A910E1D70C0@MN2PR21MB1232.namprd21.prod.outlook.com>
2019-05-10 13:21 ` Vitaly Kuznetsov
[not found] ` <BYAPR21MB1221962ED2DD7FEE19E7DAB6D70C0@BYAPR21MB1221.namprd21.prod.outlook.com>
2019-05-10 17:45 ` Vitaly Kuznetsov
2019-04-05 1:16 ` [PATCH 3/6] hv: vmbus: Replace page definition with Hyper-V specific one Maya Nakamura
2019-04-05 1:17 ` [PATCH 4/6] x86: hv: mmu.c: Replace page definitions with Hyper-V specific ones Maya Nakamura
2019-04-05 11:10 ` Vitaly Kuznetsov [this message]
[not found] ` <DM5PR2101MB091843B6DD7A11C2C27917F1D7280@DM5PR2101MB0918.namprd21.prod.outlook.com>
2019-04-12 6:58 ` Vitaly Kuznetsov
2019-04-05 1:19 ` [PATCH 5/6] HID: hv: Remove dependencies on PAGE_SIZE for ring buffer Maya Nakamura
2019-04-05 1:20 ` [PATCH 6/6] Input: " Maya Nakamura
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zhp4iu6h.fsf@vitty.brq.redhat.com \
--to=vkuznets@redhat.com \
--cc=haiyangz@microsoft.com \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.maya.nakamura@gmail.com \
--cc=mikelley@microsoft.com \
--cc=sashal@kernel.org \
--cc=sthemmin@microsoft.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).