From: Randy Dunlap <randy.dunlap@oracle.com>
To: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
linux-mm@kvack.org, Balbir Singh <balbir@linux.vnet.ibm.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Subject: Re: mmotm 2010-04-15-14-42 uploaded (shmem, CGROUP_MEM_RES_CTLR)
Date: Sun, 18 Apr 2010 19:17:33 -0700 [thread overview]
Message-ID: <4BCBBD3D.5020102@oracle.com> (raw)
In-Reply-To: <20100419104917.1a568b17.nishimura@mxp.nes.nec.co.jp>
On 04/18/10 18:49, Daisuke Nishimura wrote:
> On Fri, 16 Apr 2010 09:03:15 -0700, Randy Dunlap <randy.dunlap@oracle.com> wrote:
>> On Thu, 15 Apr 2010 14:42:59 -0700 akpm@linux-foundation.org wrote:
>>
>>> The mm-of-the-moment snapshot 2010-04-15-14-42 has been uploaded to
>>>
>>> http://userweb.kernel.org/~akpm/mmotm/
>>>
>>> and will soon be available at
>>>
>>> git://zen-kernel.org/kernel/mmotm.git
>>>
>>> It contains the following patches against 2.6.34-rc4:
>>
>>
>> memcg-move-charge-of-file-pages.patch:
>>
>> when CONFIG_SHMFS is not enabled:
>>
>> mm/shmem.c:2721: error: implicit declaration of function 'SHMEM_I'
>> mm/shmem.c:2721: warning: initialization makes pointer from integer without a cast
>> mm/shmem.c:2726: error: dereferencing pointer to incomplete type
>> mm/shmem.c:2727: error: implicit declaration of function 'shmem_swp_entry'
>> mm/shmem.c:2727: warning: assignment makes pointer from integer without a cast
>> mm/shmem.c:2734: error: implicit declaration of function 'shmem_swp_unmap'
>> mm/shmem.c:2735: error: dereferencing pointer to incomplete type
>>
> Thank you very much for your report.
>
> I attach a fix patch.
>
> ===
> From: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
>
> build fix for !CONFIG_SHMEM case.
>
> CC mm/shmem.o
> mm/shmem.c: In function 'mem_cgroup_get_shmem_target':
> mm/shmem.c:2721: error: implicit declaration of function 'SHMEM_I'
> mm/shmem.c:2721: warning: initialization makes pointer from integer without a cast
> mm/shmem.c:2726: error: dereferencing pointer to incomplete type
> mm/shmem.c:2727: error: implicit declaration of function 'shmem_swp_entry'
> mm/shmem.c:2727: warning: assignment makes pointer from integer without a cast
> mm/shmem.c:2734: error: implicit declaration of function 'shmem_swp_unmap'
> mm/shmem.c:2735: error: dereferencing pointer to incomplete type
> make[1]: *** [mm/shmem.o] Error 1
>
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Thanks.
> ---
> mm/shmem.c | 99 +++++++++++++++++++++++++++++++++++++----------------------
> 1 files changed, 62 insertions(+), 37 deletions(-)
>
> diff --git a/mm/shmem.c b/mm/shmem.c
> index cb87365..6f183ef 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -2568,6 +2568,43 @@ out4:
> return error;
> }
>
> +#ifdef CONFIG_CGROUP_MEM_RES_CTLR
> +/**
> + * mem_cgroup_get_shmem_target - find a page or entry assigned to the shmem file
> + * @inode: the inode to be searched
> + * @pgoff: the offset to be searched
> + * @pagep: the pointer for the found page to be stored
> + * @ent: the pointer for the found swap entry to be stored
> + *
> + * If a page is found, refcount of it is incremented. Callers should handle
> + * these refcount.
> + */
> +void mem_cgroup_get_shmem_target(struct inode *inode, pgoff_t pgoff,
> + struct page **pagep, swp_entry_t *ent)
> +{
> + swp_entry_t entry = { .val = 0 }, *ptr;
> + struct page *page = NULL;
> + struct shmem_inode_info *info = SHMEM_I(inode);
> +
> + if ((pgoff << PAGE_CACHE_SHIFT) >= i_size_read(inode))
> + goto out;
> +
> + spin_lock(&info->lock);
> + ptr = shmem_swp_entry(info, pgoff, NULL);
> + if (ptr && ptr->val) {
> + entry.val = ptr->val;
> + page = find_get_page(&swapper_space, entry.val);
> + } else
> + page = find_get_page(inode->i_mapping, pgoff);
> + if (ptr)
> + shmem_swp_unmap(ptr);
> + spin_unlock(&info->lock);
> +out:
> + *pagep = page;
> + *ent = entry;
> +}
> +#endif
> +
> #else /* !CONFIG_SHMEM */
>
> /*
> @@ -2607,6 +2644,31 @@ int shmem_lock(struct file *file, int lock, struct user_struct *user)
> return 0;
> }
>
> +#ifdef CONFIG_CGROUP_MEM_RES_CTLR
> +/**
> + * mem_cgroup_get_shmem_target - find a page or entry assigned to the shmem file
> + * @inode: the inode to be searched
> + * @pgoff: the offset to be searched
> + * @pagep: the pointer for the found page to be stored
> + * @ent: the pointer for the found swap entry to be stored
> + *
> + * If a page is found, refcount of it is incremented. Callers should handle
> + * these refcount.
> + */
> +void mem_cgroup_get_shmem_target(struct inode *inode, pgoff_t pgoff,
> + struct page **pagep, swp_entry_t *ent)
> +{
> + struct page *page = NULL;
> +
> + if ((pgoff << PAGE_CACHE_SHIFT) >= i_size_read(inode))
> + goto out;
> + page = find_get_page(inode->i_mapping, pgoff);
> +out:
> + *pagep = page;
> + *ent = (swp_entry_t){ .val = 0 };
> +}
> +#endif
> +
> #define shmem_vm_ops generic_file_vm_ops
> #define shmem_file_operations ramfs_file_operations
> #define shmem_get_inode(sb, mode, dev, flags) ramfs_get_inode(sb, mode, dev)
> @@ -2701,40 +2763,3 @@ int shmem_zero_setup(struct vm_area_struct *vma)
> vma->vm_ops = &shmem_vm_ops;
> return 0;
> }
> -
> -#ifdef CONFIG_CGROUP_MEM_RES_CTLR
> -/**
> - * mem_cgroup_get_shmem_target - find a page or entry assigned to the shmem file
> - * @inode: the inode to be searched
> - * @pgoff: the offset to be searched
> - * @pagep: the pointer for the found page to be stored
> - * @ent: the pointer for the found swap entry to be stored
> - *
> - * If a page is found, refcount of it is incremented. Callers should handle
> - * these refcount.
> - */
> -void mem_cgroup_get_shmem_target(struct inode *inode, pgoff_t pgoff,
> - struct page **pagep, swp_entry_t *ent)
> -{
> - swp_entry_t entry = { .val = 0 }, *ptr;
> - struct page *page = NULL;
> - struct shmem_inode_info *info = SHMEM_I(inode);
> -
> - if ((pgoff << PAGE_CACHE_SHIFT) >= i_size_read(inode))
> - goto out;
> -
> - spin_lock(&info->lock);
> - ptr = shmem_swp_entry(info, pgoff, NULL);
> - if (ptr && ptr->val) {
> - entry.val = ptr->val;
> - page = find_get_page(&swapper_space, entry.val);
> - } else
> - page = find_get_page(inode->i_mapping, pgoff);
> - if (ptr)
> - shmem_swp_unmap(ptr);
> - spin_unlock(&info->lock);
> -out:
> - *pagep = page;
> - *ent = entry;
> -}
> -#endif
--
~Randy
next prev parent reply other threads:[~2010-04-19 2:18 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-15 21:42 mmotm 2010-04-15-14-42 uploaded akpm
2010-04-15 23:38 ` [PATCH -mmotm] vmstat: fix build errors when PROC_FS is disabled Randy Dunlap
2010-04-16 16:03 ` mmotm 2010-04-15-14-42 uploaded (shmem, CGROUP_MEM_RES_CTLR) Randy Dunlap
2010-04-19 1:49 ` Daisuke Nishimura
2010-04-19 2:17 ` Randy Dunlap [this message]
2010-04-19 10:01 ` error at compaction (Re: mmotm 2010-04-15-14-42 uploaded KAMEZAWA Hiroyuki
2010-04-19 18:14 ` Mel Gorman
2010-04-19 19:39 ` Mel Gorman
2010-04-20 2:30 ` KAMEZAWA Hiroyuki
2010-04-20 2:39 ` Minchan Kim
2010-04-20 3:07 ` KAMEZAWA Hiroyuki
2010-04-20 3:58 ` Minchan Kim
2010-04-20 4:24 ` KAMEZAWA Hiroyuki
2010-04-20 8:20 ` Mel Gorman
2010-04-20 8:32 ` Minchan Kim
2010-04-20 8:44 ` Mel Gorman
2010-04-20 9:50 ` Minchan Kim
2010-04-20 9:58 ` Mel Gorman
2010-04-20 10:14 ` Minchan Kim
2010-04-21 8:28 ` KAMEZAWA Hiroyuki
2010-04-21 9:48 ` KAMEZAWA Hiroyuki
2010-04-21 10:20 ` Mel Gorman
2010-04-21 16:52 ` Minchan Kim
2010-04-21 23:01 ` Minchan Kim
2010-04-20 2:35 ` KAMEZAWA Hiroyuki
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=4BCBBD3D.5020102@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=balbir@linux.vnet.ibm.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nishimura@mxp.nes.nec.co.jp \
/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).