[SMB3] New compression flags
diff mbox series

Message ID CAH2r5ms_oxqwHm56nzabM-x2XMR1Ni-WD1_LEYYxOW_NkswsOQ@mail.gmail.com
State New
Headers show
Series
  • [SMB3] New compression flags
Related show

Commit Message

Steve French March 15, 2020, 10:50 p.m. UTC
Some compression related flags I noticed were added in the latest MS-SMB2

Comments

Steve French March 15, 2020, 11:07 p.m. UTC | #1
And one more small set of structures for the updated transform header.
See MS-SMB2 2.2.42.1 and 2.2.42.2


On Sun, Mar 15, 2020 at 5:50 PM Steve French <smfrench@gmail.com> wrote:
>
> Some compression related flags I noticed were added in the latest MS-SMB2
>
>
>
> --
> Thanks,
>
> Steve
ronnie sahlberg March 15, 2020, 11:09 p.m. UTC | #2
Typo in
+    __le32    Repititions;

otherwise looks good.
Acked-by me for both.

On Mon, Mar 16, 2020 at 9:07 AM Steve French via samba-technical
<samba-technical@lists.samba.org> wrote:
>
> And one more small set of structures for the updated transform header.
> See MS-SMB2 2.2.42.1 and 2.2.42.2
>
>
> On Sun, Mar 15, 2020 at 5:50 PM Steve French <smfrench@gmail.com> wrote:
> >
> > Some compression related flags I noticed were added in the latest MS-SMB2
> >
> >
> >
> > --
> > Thanks,
> >
> > Steve
>
>
>
> --
> Thanks,
>
> Steve
Steve French March 16, 2020, 1:19 a.m. UTC | #3
fixed typo - thx

(and also added acked-by) and pushed to cifs-2.6.git for-next

On Sun, Mar 15, 2020 at 6:10 PM ronnie sahlberg
<ronniesahlberg@gmail.com> wrote:
>
> Typo in
> +    __le32    Repititions;
>
> otherwise looks good.
> Acked-by me for both.
>
> On Mon, Mar 16, 2020 at 9:07 AM Steve French via samba-technical
> <samba-technical@lists.samba.org> wrote:
> >
> > And one more small set of structures for the updated transform header.
> > See MS-SMB2 2.2.42.1 and 2.2.42.2
> >
> >
> > On Sun, Mar 15, 2020 at 5:50 PM Steve French <smfrench@gmail.com> wrote:
> > >
> > > Some compression related flags I noticed were added in the latest MS-SMB2
> > >
> > >
> > >
> > > --
> > > Thanks,
> > >
> > > Steve
> >
> >
> >
> > --
> > Thanks,
> >
> > Steve
Aurélien Aptel March 16, 2020, 10:50 a.m. UTC | #4
Hi,

Changes looks good.

I had a quick look at this new stuff with Pike recently but it seems
even the latest windows server (1909) doesn't support it yet (not
returned in negprot).

Cheers,
Tom Talpey March 16, 2020, 7:01 p.m. UTC | #5
Note that this new document is published, as always, in advance of the upcoming release. The new protocol bits won’t be visible until "20H1" ships.

https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-smb2/5606ad47-5ee0-437a-817e-70c366052962

-----Original Message-----
From: linux-cifs-owner@vger.kernel.org <linux-cifs-owner@vger.kernel.org> On Behalf Of Steve French
Sent: Sunday, March 15, 2020 6:50 PM
To: CIFS <linux-cifs@vger.kernel.org>; samba-technical <samba-technical@lists.samba.org>
Subject: [EXTERNAL] [SMB3] New compression flags

Some compression related flags I noticed were added in the latest MS-SMB2

Patch
diff mbox series

From 12837ae091d533b58c80a0da43b92980b7ff5b6b Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Sun, 15 Mar 2020 17:42:41 -0500
Subject: [PATCH] SMB3: Add new compression flags

Additional compression capabilities can now be negotiated and a
new compression algorithm.  Add the flags for these.

See newly updated MS-SMB2 sections 3.1.4.4.1 and 2.2.3.1.3

Signed-off-by: Steve French <stfrench@microsoft.com>
---
 fs/cifs/smb2pdu.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
index 817bc0531536..4a7d154fffae 100644
--- a/fs/cifs/smb2pdu.h
+++ b/fs/cifs/smb2pdu.h
@@ -307,11 +307,17 @@  struct smb2_encryption_neg_context {
 #define SMB3_COMPRESS_LZNT1	cpu_to_le16(0x0001)
 #define SMB3_COMPRESS_LZ77	cpu_to_le16(0x0002)
 #define SMB3_COMPRESS_LZ77_HUFF	cpu_to_le16(0x0003)
+/* Pattern scanning algorithm See MS-SMB2 3.1.4.4.1 */
+#define SMB3_COMPRESS_PATTERN	cpu_to_le16(0x0004)
+
+/* Compression Flags */
+#define SMB2_COMPRESSION_CAPABILITIES_FLAG_NONE		cpu_to_le32(0x00000000)
+#define SMB2_COMPRESSION_CAPABILITIES_FLAG_CHAINED	cpu_to_le32(0x00000001)
 
 struct smb2_compression_capabilities_context {
 	__le16	ContextType; /* 3 */
 	__le16  DataLength;
-	__u32	Reserved;
+	__u32	Flags;
 	__le16	CompressionAlgorithmCount;
 	__u16	Padding;
 	__u32	Reserved1;
-- 
2.20.1