Skip to contentSkip to conversation

fs,epoll: Add ability to call kcmp to find target files

RFC In review Cyrill Gorcunov 3 participants 4 messages Feb 21, 2017 – Feb 28, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover fs,epoll: Add ability to call kcmp to find target files

Hi! In previous series EPOLL_CTL_DUP operation has been discussed but considered as potentially scary. So here is an another approach:

- extend fdinfo of epoll files with inode, device and file position for every target, which allow the reader to gather targets with this bundle as a key for primary sorting

- extent kcmp to check if some particular file is matching one sitting inside epoll queue (duplicate numbers are resolved with offset parameter)

Please take a look once time permit. Note that I did only basic testing (without CRIU) but it should fit our needs because we sort and lookup regualr files by same scheme. So I'm about to implemet full criu support for this new kernel features in a couple of days thus any comments are *higly* appreciated.

NB: Initially I added

	if (file_ns_capable(epi->ffd.file, ns, CAP_SYS_ADMIN))

into fdinfo output to check if caller is allowed to see target ino/dev/pos but dropped it later because if process is added file descriptor into epoll queue it mean fdstat and such already can be called and this information is already obtained, so I don't this it's information disclosure.

Cyrill

#1 lore raw
Quoted 11 lines · Cyrill Gorcunov

Hi! In previous series EPOLL_CTL_DUP operation has been discussed but considered as potentially scary. So here is an another approach:

- extend fdinfo of epoll files with inode, device and file position for every target, which allow the reader to gather targets with this bundle as a key for primary sorting

- extent kcmp to check if some particular file is matching one sitting inside epoll queue (duplicate numbers are resolved with offset parameter)

Hi,

Since an epoll fd can be added to another epoll fd, I'm wondering if you have enough data here to figure that out. The inode is the 'anon_inode_inode', so I'm wondering if that is sufficient to distinguish it from other anonymous inodes, or if an extra bit is required to indicate if the target file is in fact and epoll fd.

Thanks,

-Jason

Quoted 19 lines

Please take a look once time permit. Note that I did only basic testing (without CRIU) but it should fit our needs because we sort and lookup regualr files by same scheme. So I'm about to implemet full criu support for this new kernel features in a couple of days thus any comments are *higly* appreciated.

NB: Initially I added

	if (file_ns_capable(epi->ffd.file, ns, CAP_SYS_ADMIN))

into fdinfo output to check if caller is allowed to see target ino/dev/pos but dropped it later because if process is added file descriptor into epoll queue it mean fdstat and such already can be called and this information is already obtained, so I don't this it's information disclosure.

Cyrill

#2 lore raw
Quoted 7 lines · Jason Baron

Hi,

Since an epoll fd can be added to another epoll fd, I'm wondering if you have enough data here to figure that out. The inode is the 'anon_inode_inode', so I'm wondering if that is sufficient to distinguish it from other anonymous inodes, or if an extra bit is required to indicate if the target file is in fact and epoll fd.

I think it should be ebough (together with sdev and pos). But will look more closely tomorrow once I sit implementing criu support :) (that's why it is early rfc, to gather comments)

#3 lore raw
Quoted 4 lines · Cyrill Gorcunov

I think it should be ebough (together with sdev and pos). But will look more closely tomorrow once I sit implementing criu support :) (that's why it is early rfc, to gather comments)

FWIW, yes, it is enough for primary sorting key. Once it matches the key from other anon block we use kcmp call to find exact match (kid_epoll_lookup lookups over primary keys generated by inode/sdev/pos, and then using kcmp we walk over files)

https://github.com/cyrillos/criu/blob/epoll-tgt-3/criu/kcmp-ids.c#L158

Cyrill