7 files changed, 36 insertions, 19 deletions

diff --git a/include/linux/ceph/auth.h b/include/linux/ceph/auth.h
index e931da8424a4..6728c2ee0205 100644
--- a/include/linux/ceph/auth.h
+++ b/include/linux/ceph/auth.h
@@ -64,6 +64,10 @@ struct ceph_auth_client_ops {
         /* ensure that an existing authorizer is up to date */
         int (*update_authorizer)(struct ceph_auth_client *ac, int peer_type,
                                  struct ceph_auth_handshake *auth);
+        int (*add_authorizer_challenge)(struct ceph_auth_client *ac,
+                                        struct ceph_authorizer *a,
+                                        void *challenge_buf,
+                                        int challenge_buf_len);
         int (*verify_authorizer_reply)(struct ceph_auth_client *ac,
                                        struct ceph_authorizer *a);
         void (*invalidate_authorizer)(struct ceph_auth_client *ac,
@@ -118,6 +122,10 @@ void ceph_auth_destroy_authorizer(struct ceph_authorizer *a);
 extern int ceph_auth_update_authorizer(struct ceph_auth_client *ac,
                                        int peer_type,
                                        struct ceph_auth_handshake *a);
+int ceph_auth_add_authorizer_challenge(struct ceph_auth_client *ac,
+                                       struct ceph_authorizer *a,
+                                       void *challenge_buf,
+                                       int challenge_buf_len);
 extern int ceph_auth_verify_authorizer_reply(struct ceph_auth_client *ac,
                                              struct ceph_authorizer *a);
 extern void ceph_auth_invalidate_authorizer(struct ceph_auth_client *ac,
diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h
index 3901927cf6a0..6b92b3395fa9 100644
--- a/include/linux/ceph/ceph_features.h
+++ b/include/linux/ceph/ceph_features.h
@@ -165,9 +165,9 @@ DEFINE_CEPH_FEATURE(58, 1, FS_FILE_LAYOUT_V2) // overlap
 DEFINE_CEPH_FEATURE(59, 1, FS_BTIME)
 DEFINE_CEPH_FEATURE(59, 1, FS_CHANGE_ATTR) // overlap
 DEFINE_CEPH_FEATURE(59, 1, MSG_ADDR2) // overlap
-DEFINE_CEPH_FEATURE(60, 1, BLKIN_TRACING)  // *do not share this bit*
+DEFINE_CEPH_FEATURE(60, 1, OSD_RECOVERY_DELETES) // *do not share this bit*
+DEFINE_CEPH_FEATURE(61, 1, CEPHX_V2)             // *do not share this bit*
 
-DEFINE_CEPH_FEATURE(61, 1, RESERVED2)          // unused, but slow down!
 DEFINE_CEPH_FEATURE(62, 1, RESERVED)           // do not use; used as a sentinal
 DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facing
 
@@ -210,7 +210,8 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
          CEPH_FEATURE_SERVER_JEWEL |            \
          CEPH_FEATURE_MON_STATEFUL_SUB |        \
          CEPH_FEATURE_CRUSH_TUNABLES5 |         \
-         CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING)
+         CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING | \
+         CEPH_FEATURE_CEPHX_V2)
 
 #define CEPH_FEATURES_REQUIRED_DEFAULT   \
         (CEPH_FEATURE_NOSRCADDR |        \
diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index d143ac8879c6..a6c2a48d42e0 100644
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -194,16 +194,22 @@ ceph_decode_skip_n(p, end, sizeof(u8), bad)
         } while (0)
 
 /*
- * struct ceph_timespec <-> struct timespec
+ * struct ceph_timespec <-> struct timespec64
  */
-static inline void ceph_decode_timespec(struct timespec *ts,
-                                        const struct ceph_timespec *tv)
+static inline void ceph_decode_timespec64(struct timespec64 *ts,
+                                          const struct ceph_timespec *tv)
 {
-        ts->tv_sec = (__kernel_time_t)le32_to_cpu(tv->tv_sec);
+        /*
+         * This will still overflow in year 2106.  We could extend
+         * the protocol to steal two more bits from tv_nsec to
+         * add three more 136 year epochs after that the way ext4
+         * does if necessary.
+         */
+        ts->tv_sec = (time64_t)le32_to_cpu(tv->tv_sec);
         ts->tv_nsec = (long)le32_to_cpu(tv->tv_nsec);
 }
-static inline void ceph_encode_timespec(struct ceph_timespec *tv,
-                                        const struct timespec *ts)
+static inline void ceph_encode_timespec64(struct ceph_timespec *tv,
+                                          const struct timespec64 *ts)
 {
         tv->tv_sec = cpu_to_le32((u32)ts->tv_sec);
         tv->tv_nsec = cpu_to_le32((u32)ts->tv_nsec);
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index c7dfcb8a1fb2..fc2b4491ee0a 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -31,6 +31,9 @@ struct ceph_connection_operations {
         struct ceph_auth_handshake *(*get_authorizer) (
                                 struct ceph_connection *con,
                                int *proto, int force_new);
+        int (*add_authorizer_challenge)(struct ceph_connection *con,
+                                        void *challenge_buf,
+                                        int challenge_buf_len);
         int (*verify_authorizer_reply) (struct ceph_connection *con);
         int (*invalidate_authorizer)(struct ceph_connection *con);
 
@@ -286,9 +289,8 @@ struct ceph_connection {
                                  attempt for this connection, client */
         u32 peer_global_seq;  /* peer's global seq for this connection */
 
+        struct ceph_auth_handshake *auth;
         int auth_retry;       /* true if we need a newer authorizer */
-        void *auth_reply_buf;   /* where to put the authorizer reply */
-        int auth_reply_buf_len;
 
         struct mutex mutex;
 
@@ -330,7 +332,7 @@ struct ceph_connection {
         int in_base_pos;     /* bytes read */
         __le64 in_temp_ack;  /* for reading an ack */
 
-        struct timespec last_keepalive_ack; /* keepalive2 ack stamp */
+        struct timespec64 last_keepalive_ack; /* keepalive2 ack stamp */
 
         struct delayed_work work;           /* send|recv work */
         unsigned long       delay;          /* current delay interval */
diff --git a/include/linux/ceph/msgr.h b/include/linux/ceph/msgr.h
index 73ae2a926548..9e50aede46c8 100644
--- a/include/linux/ceph/msgr.h
+++ b/include/linux/ceph/msgr.h
@@ -91,7 +91,7 @@ struct ceph_entity_inst {
 #define CEPH_MSGR_TAG_SEQ           13 /* 64-bit int follows with seen seq number */
 #define CEPH_MSGR_TAG_KEEPALIVE2    14 /* keepalive2 byte + ceph_timespec */
 #define CEPH_MSGR_TAG_KEEPALIVE2_ACK 15 /* keepalive2 reply */
-
+#define CEPH_MSGR_TAG_CHALLENGE_AUTHORIZER 16  /* cephx v2 doing server challenge */
 
 /*
  * connection negotiation
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 0d6ee04b4c41..02096da01845 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -199,7 +199,7 @@ struct ceph_osd_request {
         /* set by submitter */
         u64 r_snapid;                         /* for reads, CEPH_NOSNAP o/w */
         struct ceph_snap_context *r_snapc;    /* for writes */
-        struct timespec r_mtime;              /* ditto */
+        struct timespec64 r_mtime;            /* ditto */
         u64 r_data_offset;                    /* ditto */
         bool r_linger;                        /* don't resend on failure */
 
@@ -253,7 +253,7 @@ struct ceph_osd_linger_request {
         struct ceph_osd_request_target t;
         u32 map_dne_bound;
 
-        struct timespec mtime;
+        struct timespec64 mtime;
 
         struct kref kref;
         struct mutex lock;
@@ -508,7 +508,7 @@ extern int ceph_osdc_writepages(struct ceph_osd_client *osdc,
                                 struct ceph_snap_context *sc,
                                 u64 off, u64 len,
                                 u32 truncate_seq, u64 truncate_size,
-                                struct timespec *mtime,
+                                struct timespec64 *mtime,
                                 struct page **pages, int nr_pages);
 
 /* watch/notify */
@@ -528,12 +528,12 @@ int ceph_osdc_notify_ack(struct ceph_osd_client *osdc,
                          u64 notify_id,
                          u64 cookie,
                          void *payload,
-                         size_t payload_len);
+                         u32 payload_len);
 int ceph_osdc_notify(struct ceph_osd_client *osdc,
                      struct ceph_object_id *oid,
                      struct ceph_object_locator *oloc,
                      void *payload,
-                     size_t payload_len,
+                     u32 payload_len,
                      u32 timeout,
                      struct page ***preply_pages,
                      size_t *preply_len);
diff --git a/include/linux/ceph/pagelist.h b/include/linux/ceph/pagelist.h
index 7edcded07641..d0223364349f 100644
--- a/include/linux/ceph/pagelist.h
+++ b/include/linux/ceph/pagelist.h
@@ -68,7 +68,7 @@ static inline int ceph_pagelist_encode_8(struct ceph_pagelist *pl, u8 v)
         return ceph_pagelist_append(pl, &v, 1);
 }
 static inline int ceph_pagelist_encode_string(struct ceph_pagelist *pl,
-                                              char *s, size_t len)
+                                              char *s, u32 len)
 {
         int ret = ceph_pagelist_encode_32(pl, len);
         if (ret)