]) # LC_HAVE_QC_MAKE_REQUEST_FN
#
+# LC_HAVE_KEY_PAYLOAD_DATA_ARRAY
+#
+# 4.4 kernel merged type-specific data with the payload data for keys
+#
+AC_DEFUN([LC_HAVE_KEY_PAYLOAD_DATA_ARRAY], [
+LB_CHECK_COMPILE([if 'struct key' has 'payload.data' as an array],
+key_payload_data_array, [
+ #include <linux/key.h>
+],[
+ ((struct key *)0)->payload.data[0] = NULL;
+],[
+ AC_DEFINE(HAVE_KEY_PAYLOAD_DATA_ARRAY, 1, [payload.data is an array])
+])
+]) #LC_HAVE_KEY_PAYLOAD_DATA_ARRAY
+
+#
# LC_PROG_LINUX
#
# Lustre linux kernel checks
# 4.4
LC_HAVE_LOCKS_LOCK_FILE_WAIT
LC_HAVE_QC_MAKE_REQUEST_FN
+ LC_HAVE_KEY_PAYLOAD_DATA_ARRAY
#
AS_IF([test "x$enable_server" != xno], [
}
/*
+ * Get specific payload. Newer kernels support 4 slots.
+ */
+static void *
+key_get_payload(struct key *key, unsigned int index)
+{
+ void *key_ptr = NULL;
+
+#ifdef HAVE_KEY_PAYLOAD_DATA_ARRAY
+ key_ptr = key->payload.data[index];
+#else
+ if (!index)
+ key_ptr = key->payload.data;
+#endif
+ return key_ptr;
+}
+
+/*
+ * Set specific payload. Newer kernels support 4 slots.
+ */
+static int key_set_payload(struct key *key, unsigned int index,
+ struct ptlrpc_cli_ctx *ctx)
+{
+ int rc = -EINVAL;
+
+#ifdef HAVE_KEY_PAYLOAD_DATA_ARRAY
+ if (index < 4) {
+ key->payload.data[index] = ctx;
+#else
+ if (!index) {
+ key->payload.data = ctx;
+#endif
+ rc = 0;
+ }
+ return rc;
+}
+
+/*
* bind a key with a ctx together.
* caller must hold write lock of the key, as well as ref on key & ctx.
*/
LASSERT(atomic_read(&ctx->cc_refcount) > 0);
LASSERT(atomic_read(&key->usage) > 0);
LASSERT(ctx2gctx_keyring(ctx)->gck_key == NULL);
- LASSERT(key->payload.data == NULL);
+ LASSERT(!key_get_payload(key, 0));
/* at this time context may or may not in list. */
key_get(key);
atomic_inc(&ctx->cc_refcount);
ctx2gctx_keyring(ctx)->gck_key = key;
- key->payload.data = ctx;
+ LASSERT(!key_set_payload(key, 0, ctx));
}
/*
*/
static void unbind_key_ctx(struct key *key, struct ptlrpc_cli_ctx *ctx)
{
- LASSERT(key->payload.data == ctx);
+ LASSERT(key_get_payload(key, 0) == ctx);
LASSERT(test_bit(PTLRPC_CTX_CACHED_BIT, &ctx->cc_flags) == 0);
/* must revoke the key, or others may treat it as newly created */
key_revoke_locked(key);
- key->payload.data = NULL;
+ key_set_payload(key, 0, NULL);
ctx2gctx_keyring(ctx)->gck_key = NULL;
/* once ctx get split from key, the timer is meaningless */
struct key *key = ctx2gctx_keyring(ctx)->gck_key;
if (key) {
- LASSERT(key->payload.data == ctx);
+ LASSERT(key_get_payload(key, 0) == ctx);
key_get(key);
down_write(&key->sem);
*/
static void unbind_key_locked(struct key *key)
{
- struct ptlrpc_cli_ctx *ctx = key->payload.data;
+ struct ptlrpc_cli_ctx *ctx = key_get_payload(key, 0);
if (ctx)
unbind_key_ctx(key, ctx);
*/
static void kill_key_locked(struct key *key)
{
- struct ptlrpc_cli_ctx *ctx = key->payload.data;
+ struct ptlrpc_cli_ctx *ctx = key_get_payload(key, 0);
if (ctx && ctx_unlist_kr(ctx, 0))
unbind_key_locked(key);
* need wirtelock of key->sem to serialize them. */
down_write(&key->sem);
- if (likely(key->payload.data != NULL)) {
- ctx = key->payload.data;
-
+ ctx = key_get_payload(key, 0);
+ if (likely(ctx)) {
LASSERT(atomic_read(&ctx->cc_refcount) >= 1);
LASSERT(ctx2gctx_keyring(ctx)->gck_key == key);
LASSERT(atomic_read(&key->usage) >= 2);
down_write(&key->sem);
- LASSERT(key->payload.data == NULL);
+ LASSERT(!key_get_payload(key, 0));
cli_ctx = ctx_create_kr(sec, &vcred);
if (cli_ctx == NULL) {
RETURN(-EINVAL);
}
- if (key->payload.data != NULL) {
+ if (key_get_payload(key, 0)) {
CERROR("key already have payload\n");
RETURN(-EINVAL);
}
RETURN(rc);
}
- CDEBUG(D_SEC, "key %p instantiated, ctx %p\n", key, key->payload.data);
+ CDEBUG(D_SEC, "key %p instantiated, ctx %p\n", key,
+ key_get_payload(key, 0));
RETURN(0);
}
{
__u32 datalen32 = (__u32) datalen;
#endif
- struct ptlrpc_cli_ctx *ctx = key->payload.data;
+ struct ptlrpc_cli_ctx *ctx = key_get_payload(key, 0);
struct gss_cli_ctx *gctx;
rawobj_t tmpobj = RAWOBJ_EMPTY;
int rc;
void gss_kt_destroy(struct key *key)
{
ENTRY;
- LASSERT(key->payload.data == NULL);
+ LASSERT(!key_get_payload(key, 0));
CDEBUG(D_SEC, "destroy key %p\n", key);
EXIT;
}