From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: Paul Mackerras <paulus@ozlabs.org>
Cc: linuxppc-dev@lists.ozlabs.org, Alexander Graf <agraf@suse.com>,
David Gibson <david@gibson.dropbear.id.au>,
kvm-ppc@vger.kernel.org, kvm@vger.kernel.org
Subject: Re: [PATCH kernel 5/9] KVM: PPC: Account TCE-containing pages in locked_vm
Date: Mon, 30 Nov 2015 05:09:27 +0000 [thread overview]
Message-ID: <565BDA07.8050302@ozlabs.ru> (raw)
In-Reply-To: <20151130020600.GB8991@fergus.ozlabs.ibm.com>
On 11/30/2015 01:06 PM, Paul Mackerras wrote:
> On Tue, Sep 15, 2015 at 08:49:35PM +1000, Alexey Kardashevskiy wrote:
>> At the moment pages used for TCE tables (in addition to pages addressed
>> by TCEs) are not counted in locked_vm counter so a malicious userspace
>> tool can call ioctl(KVM_CREATE_SPAPR_TCE) as many times as RLIMIT_NOFILE and
>> lock a lot of memory.
>>
>> This adds counting for pages used for TCE tables.
>>
>> This counts the number of pages required for a table plus pages for
>> the kvmppc_spapr_tce_table struct (TCE table descriptor) itself.
>>
>> This does not change the amount of (de)allocated memory.
>>
>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>> ---
>> arch/powerpc/kvm/book3s_64_vio.c | 51 +++++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 50 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c
>> index 9526c34..b70787d 100644
>> --- a/arch/powerpc/kvm/book3s_64_vio.c
>> +++ b/arch/powerpc/kvm/book3s_64_vio.c
>> @@ -45,13 +45,56 @@ static long kvmppc_stt_npages(unsigned long window_size)
>> * sizeof(u64), PAGE_SIZE) / PAGE_SIZE;
>> }
>>
>> +static long kvmppc_account_memlimit(long npages, bool inc)
>> +{
>> + long ret = 0;
>> + const long bytes = sizeof(struct kvmppc_spapr_tce_table) +
>> + (abs(npages) * sizeof(struct page *));
>
> Why abs(npages)? Can npages be negative? If so, what does that mean?
Leftover from older versions when there was one shared
account_memlimit(long npages). It does not make sense here, I need to
remove it.
--
Alexey
WARNING: multiple messages have this Message-ID (diff)
From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: Paul Mackerras <paulus@ozlabs.org>
Cc: linuxppc-dev@lists.ozlabs.org, Alexander Graf <agraf@suse.com>,
David Gibson <david@gibson.dropbear.id.au>,
kvm-ppc@vger.kernel.org, kvm@vger.kernel.org
Subject: Re: [PATCH kernel 5/9] KVM: PPC: Account TCE-containing pages in locked_vm
Date: Mon, 30 Nov 2015 16:09:27 +1100 [thread overview]
Message-ID: <565BDA07.8050302@ozlabs.ru> (raw)
In-Reply-To: <20151130020600.GB8991@fergus.ozlabs.ibm.com>
On 11/30/2015 01:06 PM, Paul Mackerras wrote:
> On Tue, Sep 15, 2015 at 08:49:35PM +1000, Alexey Kardashevskiy wrote:
>> At the moment pages used for TCE tables (in addition to pages addressed
>> by TCEs) are not counted in locked_vm counter so a malicious userspace
>> tool can call ioctl(KVM_CREATE_SPAPR_TCE) as many times as RLIMIT_NOFILE and
>> lock a lot of memory.
>>
>> This adds counting for pages used for TCE tables.
>>
>> This counts the number of pages required for a table plus pages for
>> the kvmppc_spapr_tce_table struct (TCE table descriptor) itself.
>>
>> This does not change the amount of (de)allocated memory.
>>
>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>> ---
>> arch/powerpc/kvm/book3s_64_vio.c | 51 +++++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 50 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c
>> index 9526c34..b70787d 100644
>> --- a/arch/powerpc/kvm/book3s_64_vio.c
>> +++ b/arch/powerpc/kvm/book3s_64_vio.c
>> @@ -45,13 +45,56 @@ static long kvmppc_stt_npages(unsigned long window_size)
>> * sizeof(u64), PAGE_SIZE) / PAGE_SIZE;
>> }
>>
>> +static long kvmppc_account_memlimit(long npages, bool inc)
>> +{
>> + long ret = 0;
>> + const long bytes = sizeof(struct kvmppc_spapr_tce_table) +
>> + (abs(npages) * sizeof(struct page *));
>
> Why abs(npages)? Can npages be negative? If so, what does that mean?
Leftover from older versions when there was one shared
account_memlimit(long npages). It does not make sense here, I need to
remove it.
--
Alexey
next prev parent reply other threads:[~2015-11-30 5:09 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-15 10:49 [PATCH kernel 0/9] KVM: PPC: Add in-kernel multitce handling Alexey Kardashevskiy
2015-09-15 10:49 ` Alexey Kardashevskiy
2015-09-15 10:49 ` [PATCH kernel 1/9] rcu: Define notrace version of list_for_each_entry_rcu Alexey Kardashevskiy
2015-09-15 10:49 ` Alexey Kardashevskiy
2015-12-08 2:05 ` David Gibson
2015-12-08 2:05 ` David Gibson
2015-09-15 10:49 ` [PATCH kernel 2/9] KVM: PPC: Make real_vmalloc_addr() public Alexey Kardashevskiy
2015-09-15 10:49 ` Alexey Kardashevskiy
2015-12-08 2:08 ` David Gibson
2015-12-08 2:08 ` David Gibson
2015-09-15 10:49 ` [PATCH kernel 3/9] KVM: PPC: Rework H_PUT_TCE/H_GET_TCE handlers Alexey Kardashevskiy
2015-09-15 10:49 ` Alexey Kardashevskiy
2015-12-08 2:18 ` David Gibson
2015-12-08 2:18 ` David Gibson
2015-09-15 10:49 ` [PATCH kernel 4/9] KVM: PPC: Use RCU for arch.spapr_tce_tables Alexey Kardashevskiy
2015-09-15 10:49 ` Alexey Kardashevskiy
2015-12-08 2:35 ` David Gibson
2015-12-08 2:35 ` David Gibson
2015-09-15 10:49 ` [PATCH kernel 5/9] KVM: PPC: Account TCE-containing pages in locked_vm Alexey Kardashevskiy
2015-09-15 10:49 ` Alexey Kardashevskiy
2015-11-30 2:06 ` Paul Mackerras
2015-11-30 2:06 ` Paul Mackerras
2015-11-30 5:09 ` Alexey Kardashevskiy [this message]
2015-11-30 5:09 ` Alexey Kardashevskiy
2015-12-08 5:18 ` David Gibson
2015-12-08 5:18 ` David Gibson
2015-09-15 10:49 ` [PATCH kernel 6/9] KVM: PPC: Replace SPAPR_TCE_SHIFT with IOMMU_PAGE_SHIFT_4K Alexey Kardashevskiy
2015-09-15 10:49 ` Alexey Kardashevskiy
2015-12-08 5:19 ` David Gibson
2015-12-08 5:19 ` David Gibson
2015-09-15 10:49 ` [PATCH kernel 7/9] KVM: PPC: Move reusable bits of H_PUT_TCE handler to helpers Alexey Kardashevskiy
2015-09-15 10:49 ` Alexey Kardashevskiy
2015-12-08 5:27 ` David Gibson
2015-12-08 5:27 ` David Gibson
2015-12-22 7:24 ` Alexey Kardashevskiy
2015-12-22 7:24 ` Alexey Kardashevskiy
2015-09-15 10:49 ` [PATCH kernel 8/9] KVM: Fix KVM_SMI chapter number Alexey Kardashevskiy
2015-09-15 10:49 ` Alexey Kardashevskiy
2015-12-08 5:29 ` David Gibson
2015-12-08 5:29 ` David Gibson
2015-09-15 10:49 ` [PATCH kernel 9/9] KVM: PPC: Add support for multiple-TCE hcalls Alexey Kardashevskiy
2015-09-15 10:49 ` Alexey Kardashevskiy
2015-12-08 5:48 ` David Gibson
2015-12-08 5:48 ` David Gibson
2015-12-22 7:42 ` Alexey Kardashevskiy
2015-12-22 7:42 ` Alexey Kardashevskiy
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=565BDA07.8050302@ozlabs.ru \
--to=aik@ozlabs.ru \
--cc=agraf@suse.com \
--cc=david@gibson.dropbear.id.au \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@ozlabs.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.