From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752302Ab2DPIYK (ORCPT ); Mon, 16 Apr 2012 04:24:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29815 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750953Ab2DPIYI (ORCPT ); Mon, 16 Apr 2012 04:24:08 -0400 Message-ID: <4F8BD71F.5060300@redhat.com> Date: Mon, 16 Apr 2012 16:23:59 +0800 From: Jason Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 MIME-Version: 1.0 To: "Michael S. Tsirkin" CC: netdev@vger.kernel.org, xma@us.ibm.com, davem@davemloft.net, linux-kernel@vger.kernel.org, ebiederm@xmission.com, Eric Dumazet Subject: Re: [PATCH 2/6] macvtap: zerocopy: fix truesize underestimation References: <20120416060749.14140.19433.stgit@intel-e5620-16-2.englab.nay.redhat.com> <20120416060758.14140.40252.stgit@intel-e5620-16-2.englab.nay.redhat.com> <20120416071423.GA25396@redhat.com> In-Reply-To: <20120416071423.GA25396@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04/16/2012 03:14 PM, Michael S. Tsirkin wrote: > On Mon, Apr 16, 2012 at 02:07:59PM +0800, Jason Wang wrote: >> As the skb fragment were pinned/built from user pages, we should >> account the page instead of length for truesize. >> >> Signed-off-by: Jason Wang > I'm not sure this is right: the skb does *not* consume the > whole page, userspace uses the rest of the page > for other skbs. So we'll end up accounting for the > same page twice. > Eric, what's the right thing to do here in your opinion? Or at very least, we need to do this in skb_copy_ubufs() as it allocate whole new pages. >> --- >> drivers/net/macvtap.c | 6 ++++-- >> 1 files changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c >> index bd4a70d..7cb2684 100644 >> --- a/drivers/net/macvtap.c >> +++ b/drivers/net/macvtap.c >> @@ -519,6 +519,7 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from, >> struct page *page[MAX_SKB_FRAGS]; >> int num_pages; >> unsigned long base; >> + unsigned long truesize; >> >> len = from->iov_len - offset; >> if (!len) { >> @@ -533,10 +534,11 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from, >> (num_pages> MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags)) >> /* put_page is in skb free */ >> return -EFAULT; >> + truesize = size * PAGE_SIZE; >> skb->data_len += len; >> skb->len += len; >> - skb->truesize += len; >> - atomic_add(len,&skb->sk->sk_wmem_alloc); >> + skb->truesize += truesize; >> + atomic_add(truesize,&skb->sk->sk_wmem_alloc); >> while (len) { >> int off = base& ~PAGE_MASK; >> int size = min_t(int, len, PAGE_SIZE - off); > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/