Skip to content

ceph+fscrypt: full support

Jeff Layton ceph-devel 12 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v14 Latest64 patches 11 repliesIn review
  2. v1359 patches 0 repliesSuperseded
  3. v1254 patches 8 repliesSuperseded
Earlier versions · 9
VersionPostedPatchesRepliesStatus
v11 RFC51 patches7 repliesSuperseded
v10 RFC48 patches35 repliesSuperseded
v8 RFC24 patches9 repliesSuperseded
v7 RFC24 patches34 repliesSuperseded
v6 RFC20 patches11 repliesSuperseded
v5 RFC19 patches19 repliesSuperseded
v4 RFC17 patches15 repliesSuperseded
v3 RFC16 patches31 repliesSuperseded
v2 RFC18 patches40 repliesSuperseded

Patches in v14 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/64libceph: add spinlock around osd->o_requestsinclude/linux/ceph/osd_client.h net/ceph/osd_client.c+12 -10 replies
2/64libceph: define struct ceph_sparse_extent and add some helpersinclude/linux/ceph/osd_client.h net/ceph/osd_client.c+55 -10 replies
3/64libceph: add sparse read support to msgr2 crc state machineinclude/linux/ceph/messenger.h net/ceph/messenger.c net/ceph/messenger_v2.c+188 -90 replies
4/64libceph: add sparse read support to OSD clientinclude/linux/ceph/osd_client.h net/ceph/osd_client.c+284 -40 replies
5/64libceph: support sparse reads on msgr2 secure codepathnet/ceph/messenger_v2.c+109 -100 replies
6/64libceph: add sparse read support to msgr1include/linux/ceph/messenger.h net/ceph/messenger_v1.c+94 -80 replies
7/64ceph: add new mount option to enable sparse readsfs/ceph/addr.c fs/ceph/file.c fs/ceph/super.c +1 more+74 -110 replies
8/64fs: change test in inode_insert5 for adding to the sb listfs/inode.c+8 -30 replies
9/64fscrypt: export fscrypt_fname_encrypt and fscrypt_fname_encrypted_sizefs/crypto/fname.c fs/crypto/fscrypt_private.h fs/crypto/hooks.c +1 more+40 -150 replies
10/64fscrypt: add fscrypt_context_for_new_inodefs/crypto/policy.c include/linux/fscrypt.h+30 -60 replies
11/64ceph: preallocate inode for ops that may create onefs/ceph/dir.c fs/ceph/file.c fs/ceph/inode.c +3 more+169 -660 replies
12/64ceph: fscrypt_auth handling for cephfs/ceph/Makefile fs/ceph/acl.c fs/ceph/crypto.c +7 more+313 -220 replies
13/64ceph: ensure that we accept a new context from MDS for new inodesfs/ceph/inode.c+11 -100 replies
14/64ceph: add support for fscrypt_auth/fscrypt_file to cap messagesfs/ceph/caps.c+63 -130 replies
15/64ceph: implement -o test_dummy_encryption mount optionfs/ceph/crypto.c fs/ceph/crypto.h fs/ceph/inode.c +3 more+176 -60 replies
16/64ceph: decode alternate_name in lease infofs/ceph/mds_client.c fs/ceph/mds_client.h+40 -140 replies
17/64ceph: add fscrypt ioctlsfs/ceph/ioctl.c+83 -00 replies
18/64ceph: make the ioctl cmd more readable in debug logfs/ceph/ioctl.c+38 -10 replies
19/64ceph: make ceph_msdc_build_path use ref-walkfs/ceph/mds_client.c+19 -160 replies
20/64ceph: add base64 endcoding routines for encrypted namesfs/ceph/crypto.c fs/ceph/crypto.h+92 -00 replies
21/64ceph: add encrypted fname handling to ceph_mdsc_build_pathfs/ceph/crypto.c fs/ceph/crypto.h fs/ceph/mds_client.c+117 -180 replies
22/64ceph: send altname in MClientRequestfs/ceph/mds_client.c fs/ceph/mds_client.h+73 -50 replies
23/64ceph: encode encrypted name in dentry releasefs/ceph/caps.c fs/ceph/mds_client.c+44 -80 replies
24/64ceph: properly set DCACHE_NOKEY_NAME flag in lookupfs/ceph/dir.c+11 -00 replies
25/64ceph: set DCACHE_NOKEY_NAME in atomic openfs/ceph/file.c+7 -00 replies
26/64ceph: make d_revalidate call fscrypt revalidator for encrypted dentriesfs/ceph/dir.c+6 -20 replies
27/64ceph: add helpers for converting names for userland presentationfs/ceph/crypto.c fs/ceph/crypto.h+117 -00 replies
28/64ceph: fix base64 encoded name's length check in ceph_fname_to_usr()fs/ceph/crypto.c+1 -10 replies
29/64ceph: add fscrypt support to ceph_fill_tracefs/ceph/inode.c+28 -20 replies
30/64ceph: pass the request to parse_reply_info_readdir()fs/ceph/mds_client.c+12 -100 replies
31/64ceph: add ceph_encode_encrypted_dname() helperfs/ceph/crypto.c fs/ceph/crypto.h+16 -30 replies
32/64ceph: add support to readdir for encrypted filenamesfs/ceph/crypto.c fs/ceph/crypto.h fs/ceph/dir.c +3 more+124 -210 replies
33/64ceph: create symlinks with encrypted and base64-encoded targetsfs/ceph/crypto.c fs/ceph/dir.c fs/ceph/inode.c+142 -180 replies
34/64ceph: make ceph_get_name decrypt filenamesfs/ceph/export.c+32 -120 replies
35/64ceph: add a new ceph.fscrypt.auth vxattrfs/ceph/xattr.c+26 -00 replies
36/64ceph: add some fscrypt guardrailsfs/ceph/dir.c fs/ceph/file.c fs/ceph/inode.c+25 -10 replies
37/64ceph: don't allow changing layout on encrypted files/directoriesfs/ceph/ioctl.c+4 -00 replies
38/64libceph: add CEPH_OSD_OP_ASSERT_VER supportinclude/linux/ceph/osd_client.h include/linux/ceph/rados.h net/ceph/osd_client.c+14 -10 replies
39/64ceph: size handling for encrypted inodes in cap updatesfs/ceph/caps.c fs/ceph/crypto.h+29 -180 replies
40/64ceph: fscrypt_file field handling in MClientRequest messagesfs/ceph/dir.c fs/ceph/file.c fs/ceph/inode.c +2 more+30 -30 replies
41/64ceph: get file size from fscrypt_file when present in inode tracesfs/ceph/inode.c+15 -30 replies
42/64ceph: handle fscrypt fields in cap messages from MDSfs/ceph/caps.c+76 -20 replies
43/64ceph: update WARN_ON message to pr_warnfs/ceph/caps.c+7 -40 replies
44/64ceph: add __ceph_get_caps helper supportfs/ceph/caps.c fs/ceph/super.h+15 -60 replies
45/64ceph: add __ceph_sync_read helper supportfs/ceph/file.c fs/ceph/super.h+23 -120 replies
46/64ceph: add object version support for sync readfs/ceph/file.c fs/ceph/super.h+12 -30 replies
47/64ceph: add infrastructure for file encryption and decryptionfs/ceph/crypto.c fs/ceph/crypto.h fs/ceph/super.c +1 more+257 -00 replies
48/64ceph: add truncate size handling support for fscryptfs/ceph/crypto.h fs/ceph/inode.c fs/ceph/super.h+217 -70 replies
49/64libceph: allow ceph_osdc_new_request to accept a multi-op readnet/ceph/osd_client.c+21 -60 replies
50/64ceph: disable fallocate for encrypted inodesfs/ceph/file.c+3 -00 replies
51/64ceph: disable copy offload on encrypted inodesfs/ceph/file.c+4 -00 replies
52/64ceph: don't use special DIO path for encrypted inodesfs/ceph/file.c+4 -20 replies
53/64ceph: align data in pages in ceph_sync_writefs/ceph/file.c+10 -100 replies
54/64ceph: add read/modify/write to ceph_sync_writefs/ceph/file.c+290 -290 replies
55/64ceph: plumb in decryption during sync readsfs/ceph/file.c+65 -240 replies
56/64ceph: add fscrypt decryption support to ceph_netfs_issue_opfs/ceph/addr.c+23 -90 replies
57/64ceph: set i_blkbits to crypto block size for encrypted inodesfs/ceph/inode.c+9 -70 replies
58/64ceph: add encryption support to writepagefs/ceph/addr.c+27 -710 replies
59/64ceph: fscrypt support for writepagesfs/ceph/addr.c fs/ceph/crypto.h+68 -130 replies
60/64ceph: invalidate pages when doing direct/sync writesfs/ceph/file.c+14 -50 replies
61/64ceph: add support for encrypted snapshot namesfs/ceph/inode.c+29 -40 replies
62/64ceph: add support for handling encrypted snapshot namesfs/ceph/crypto.c fs/ceph/crypto.h+165 -290 replies
63/64ceph: update documentation regarding snapshot naming limitationsDocumentation/filesystems/ceph.rst+10 -00 replies
64/64ceph: prevent snapshots to be created in encrypted locked directoriesfs/ceph/dir.c+5 -00 replies

Reviews trailers per patch

13 of 64 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchEric BiggersXiubo LiLuís HenriquesDave Chinner
SeriesR-b
1/64R-b
2/64R-b
3/64R-b
4/64R-b
5/64
6/64
7/64R-b
8/64R-b
9/64A-b
10/64A-b
11/64
12/64
13/64
14/64
15/64
16/64
17/64
18/64
19/64
20/64R-b
21/64
22/64
23/64
24/64
25/64R-b R-b
26/64
27/64
28/64
29/64
30/64
31/64
32/64
33/64
34/64
35/64
36/64
37/64
38/64
39/64
40/64
41/64
42/64
43/64
44/64
45/64
46/64
47/64
48/64
49/64
50/64
51/64
52/64
53/64
54/64
55/64
56/64
57/64
58/64
59/64
60/64
61/64R-b
62/64R-b
63/64R-b
64/64

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v14 thread

Cover letter [PATCH v14 00/64] ceph+fscrypt: full support

Yet another ceph+fscrypt posting. The main changes since v13:

- rebased onto v5.18-rc4 + ceph testing branch patches, fixed up minor merge conflicts, and squashed a few patches together

- squashed in a number of patches from Xiubo to fix issues with truncation handling

- incorporated Luís' patches to encrypt snapshot names

- dropped a patch to export fscrypt's base64 implementation, since Luís' snapshot implementation added a new variant that we need to use.

At this point, I'm mainly waiting on Al to merge this patch into -next and eventually into v5.19:

fs: change test in inode_insert5 for adding to the sb list

Once that's in, it should clear the way for us to start merging the rest of the pile (though probably not all at once).

There are also some mysterious failures that have cropped up in testing with teuthology, particularly with thrash testing. We'll need to get to the bottom of that before we can merge the bulk of these patches.

I've updated the wip-fscrypt branch in the ceph tree with this pile for now. Help with testing would be welcome!

Jeff Layton (48):
libceph: add spinlock around osd->o_requests
libceph: define struct ceph_sparse_extent and add some helpers
libceph: add sparse read support to msgr2 crc state machine
libceph: add sparse read support to OSD client
libceph: support sparse reads on msgr2 secure codepath
libceph: add sparse read support to msgr1
ceph: add new mount option to enable sparse reads
fs: change test in inode_insert5 for adding to the sb list
fscrypt: export fscrypt_fname_encrypt and fscrypt_fname_encrypted_size
fscrypt: add fscrypt_context_for_new_inode
ceph: preallocate inode for ops that may create one
ceph: fscrypt_auth handling for ceph
ceph: ensure that we accept a new context from MDS for new inodes
ceph: add support for fscrypt_auth/fscrypt_file to cap messages
ceph: implement -o test_dummy_encryption mount option
ceph: decode alternate_name in lease info
ceph: add fscrypt ioctls
ceph: make ceph_msdc_build_path use ref-walk
ceph: add encrypted fname handling to ceph_mdsc_build_path
ceph: send altname in MClientRequest
ceph: encode encrypted name in dentry release
ceph: properly set DCACHE_NOKEY_NAME flag in lookup
ceph: set DCACHE_NOKEY_NAME in atomic open
ceph: make d_revalidate call fscrypt revalidator for encrypted
dentries
ceph: add helpers for converting names for userland presentation
ceph: add fscrypt support to ceph_fill_trace
ceph: create symlinks with encrypted and base64-encoded targets
ceph: make ceph_get_name decrypt filenames
ceph: add a new ceph.fscrypt.auth vxattr
ceph: add some fscrypt guardrails
libceph: add CEPH_OSD_OP_ASSERT_VER support
ceph: size handling for encrypted inodes in cap updates
ceph: fscrypt_file field handling in MClientRequest messages
ceph: get file size from fscrypt_file when present in inode traces
ceph: handle fscrypt fields in cap messages from MDS
ceph: update WARN_ON message to pr_warn
ceph: add infrastructure for file encryption and decryption
libceph: allow ceph_osdc_new_request to accept a multi-op read
ceph: disable fallocate for encrypted inodes
ceph: disable copy offload on encrypted inodes
ceph: don't use special DIO path for encrypted inodes
ceph: align data in pages in ceph_sync_write
ceph: add read/modify/write to ceph_sync_write
ceph: plumb in decryption during sync reads
ceph: add fscrypt decryption support to ceph_netfs_issue_op
ceph: set i_blkbits to crypto block size for encrypted inodes
ceph: add encryption support to writepage
ceph: fscrypt support for writepages

Luís Henriques (7):
ceph: add base64 endcoding routines for encrypted names
ceph: don't allow changing layout on encrypted files/directories
ceph: invalidate pages when doing direct/sync writes
ceph: add support for encrypted snapshot names
ceph: add support for handling encrypted snapshot names
ceph: update documentation regarding snapshot naming limitations
ceph: prevent snapshots to be created in encrypted locked directories

Xiubo Li (9):
ceph: make the ioctl cmd more readable in debug log
ceph: fix base64 encoded name's length check in ceph_fname_to_usr()
ceph: pass the request to parse_reply_info_readdir()
ceph: add ceph_encode_encrypted_dname() helper
ceph: add support to readdir for encrypted filenames
ceph: add __ceph_get_caps helper support
ceph: add __ceph_sync_read helper support
ceph: add object version support for sync read
ceph: add truncate size handling support for fscrypt

 Documentation/filesystems/ceph.rst |  10 +
 fs/ceph/Makefile                   |   1 +
 fs/ceph/acl.c                      |   4 +-
 fs/ceph/addr.c                     | 136 ++++--
 fs/ceph/caps.c                     | 219 ++++++++--
 fs/ceph/crypto.c                   | 638 +++++++++++++++++++++++++++++
 fs/ceph/crypto.h                   | 264 ++++++++++++
 fs/ceph/dir.c                      | 187 +++++++--
 fs/ceph/export.c                   |  44 +-
 fs/ceph/file.c                     | 598 ++++++++++++++++++++++-----
 fs/ceph/inode.c                    | 579 +++++++++++++++++++++++---
 fs/ceph/ioctl.c                    | 126 +++++-
 fs/ceph/mds_client.c               | 465 +++++++++++++++++----
 fs/ceph/mds_client.h               |  24 +-
 fs/ceph/super.c                    | 107 ++++-
 fs/ceph/super.h                    |  43 +-
 fs/ceph/xattr.c                    |  29 ++
 fs/crypto/fname.c                  |  36 +-
 fs/crypto/fscrypt_private.h        |   9 +-
 fs/crypto/hooks.c                  |   6 +-
 fs/crypto/policy.c                 |  35 +-
 fs/inode.c                         |  11 +-
 include/linux/ceph/ceph_fs.h       |  21 +-
 include/linux/ceph/messenger.h     |  32 ++
 include/linux/ceph/osd_client.h    |  89 +++-
 include/linux/ceph/rados.h         |   4 +
 include/linux/fscrypt.h            |   5 +
 net/ceph/messenger.c               |   1 +
 net/ceph/messenger_v1.c            |  98 ++++-
 net/ceph/messenger_v2.c            | 287 ++++++++++++-
 net/ceph/osd_client.c              | 306 +++++++++++++-
 31 files changed, 4009 insertions(+), 405 deletions(-)
 create mode 100644 fs/ceph/crypto.c
 create mode 100644 fs/ceph/crypto.h
Signature · 1 line
2.35.1