Skip to content

cifs: add compounding support for smb2+

Ronnie Sahlberg linux-cifs 1 version Applied

Status from this message: merged into cifs-2.6.git for-next and added cc:stable

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest14 patches 2 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/14cifs: remove rfc1002 header from all SMB2 response structuresfs/cifs/cifsglob.h fs/cifs/cifssmb.c fs/cifs/connect.c +11 more+277 -2490 replies
2/14cifs: update multiplex loop to handle compounded responsesfs/cifs/cifsglob.h fs/cifs/connect.c fs/cifs/smb2misc.c +1 more+45 -60 replies
3/14cifs: push rfc1002 generation down the stackfs/cifs/cifsencrypt.c fs/cifs/smb2ops.c fs/cifs/smb2pdu.c +2 more+85 -1270 replies
4/14cifs: remove smb2_send_recv()fs/cifs/cifsproto.h fs/cifs/smb2pdu.c fs/cifs/transport.c+116 -420 replies
5/14cifs: update __smb_send_rqst() to take an array of requestsfs/cifs/cifsglob.h fs/cifs/smb2ops.c fs/cifs/smb2proto.h +1 more+63 -380 replies
6/14cifs: make smb_send_rqst() take an array of requestsfs/cifs/cifsglob.h fs/cifs/smb2ops.c fs/cifs/transport.c+38 -270 replies
7/14cifs: update init_sg and crypt_message to take an array of rqstfs/cifs/smb2ops.c+30 -160 replies
8/14cifs: update smb3_init_transform_rq to take an array of requestsfs/cifs/smb2ops.c+67 -520 replies
9/14cifs: add compound_send_recv()fs/cifs/cifsproto.h fs/cifs/transport.c+82 -580 replies
10/14cifs: fix memory leak in SMB2_open()fs/cifs/smb2pdu.c+6 -21 reply
11/14cifs: create SMB2_open_init()/SMB2_open_free() helpers.fs/cifs/smb2pdu.c fs/cifs/smb2proto.h+73 -620 replies
12/14cifs: add SMB2_close_init()/SMB2_close_free()fs/cifs/smb2pdu.c fs/cifs/smb2proto.h+37 -140 replies
13/14cifs: add SMB2_query_info_[init|free]()fs/cifs/smb2pdu.c fs/cifs/smb2proto.h+52 -230 replies
14/14cifs: update smb2_queryfs() to use compoundingfs/cifs/cifsglob.h fs/cifs/smb2ops.c fs/cifs/smb2pdu.c +3 more+140 -580 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/14] cifs: add compounding support for smb2+

Steve, all,

Please find attached a series that adds the plumbing to do compounding as well as, the last patch, changing smb2_queryfs() to use a compound for the Create/Query/Close cycle.

There is still a small bug in SMB2_read() when using SMB3 encryption in that we get the wrong buffer (offset by 4) for the data, but I will look into that.
As the series is somewhat large, that does not preclude us from starting to review.

Basic manual testing looks promising so far.
The only operation so far that will use compounding is smb2_queryfs() so far. You can use 'df' to invoke this operation if you want to look at what the PDUs for compounding looks like on the wire.

Once we get this finished and ready to merge, we can move on and convert all other create/set|query/close operations to be compounded too. that should be very easy.

Wooohooo