mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
19d37ce2a7
This set fixes error reporting for dlm sockets, removes the unbound property on the dlm callback workqueue to improve performance, and includes a couple trivial changes. -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJYTwosAAoJEDgbc8f8gGmqqHUQAKj+/z+kIrMp5MJEhzriMLpP wKIZa9bkmcm+BuLLf7EOwmaYx374HCq4oNNY7DJT0bE9rbFLwx9zgOvdoIjJFU3V mSvhyH8FeyueNyZHZdXmA1JZCGbuCeS36cxseaeS14+ANE/cQFlOHW5ihvLAmmnR fyV/38IjbDl33pTVf2YU5G232csicNMM8xR+1+ctrhd6CREdbY8Nf4TYVjNLHAsD r3FsuzScv1+p1LuczEhFP/Nl0YcVpH3EzSgOY67WRSQlSMyrfdnVvJkgwSIZkhpp XwW++ZBFq3B5Et1YgrFtTECrvMOb3hvoejtKTeTPq3tWoOvgweml1brtO8rVN85U brdTn3blKE7oyh+0ITdENLKXsWB5+qe1afNN51qO+MZyXKCR6uct+SjSI+zelet8 jKqxP1bQCxbnvPfF/pWVGujDE4Cb6qoeCrFSoJ/VpC/JcKxxLB7p06yflY5Ztokr yWnPiBSEz7M7+lRF/HKmJ2PZKwdZwyrrRWtCyRXPPD29kg4pG46oxjqU9iEp3R9F hDCt/AiqQWWQuhU0RZ910h2ce1y9oSyQSAbVqfmqNYZMk6UeO+0X9+kxl5fSeIWT bjO+LsZqz8QQG33XYADs+5dSRK9Lmh5roR6j7QKlVJUsB+RbBhkDSMArh+jSCQap 61L10OPKaN97m6TNXfVw =4ZWQ -----END PGP SIGNATURE----- Merge tag 'dlm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm Pull dlm fixes from David Teigland: "This set fixes error reporting for dlm sockets, removes the unbound property on the dlm callback workqueue to improve performance, and includes a couple trivial changes" * tag 'dlm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: fix error return code in sctp_accept_from_sock() dlm: don't specify WQ_UNBOUND for the ast callback workqueue dlm: remove lock_sock to avoid scheduling while atomic dlm: don't save callbacks after accept dlm: audit and remove any unnecessary uses of module.h dlm: make genl_ops const
140 lines
2.9 KiB
C
140 lines
2.9 KiB
C
/*
|
|
* Copyright (C) 2007 Red Hat, Inc. All rights reserved.
|
|
*
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
|
* of the GNU General Public License v.2.
|
|
*/
|
|
|
|
#include <net/genetlink.h>
|
|
#include <linux/dlm.h>
|
|
#include <linux/dlm_netlink.h>
|
|
#include <linux/gfp.h>
|
|
|
|
#include "dlm_internal.h"
|
|
|
|
static uint32_t dlm_nl_seqnum;
|
|
static uint32_t listener_nlportid;
|
|
|
|
static struct genl_family family;
|
|
|
|
static int prepare_data(u8 cmd, struct sk_buff **skbp, size_t size)
|
|
{
|
|
struct sk_buff *skb;
|
|
void *data;
|
|
|
|
skb = genlmsg_new(size, GFP_NOFS);
|
|
if (!skb)
|
|
return -ENOMEM;
|
|
|
|
/* add the message headers */
|
|
data = genlmsg_put(skb, 0, dlm_nl_seqnum++, &family, 0, cmd);
|
|
if (!data) {
|
|
nlmsg_free(skb);
|
|
return -EINVAL;
|
|
}
|
|
|
|
*skbp = skb;
|
|
return 0;
|
|
}
|
|
|
|
static struct dlm_lock_data *mk_data(struct sk_buff *skb)
|
|
{
|
|
struct nlattr *ret;
|
|
|
|
ret = nla_reserve(skb, DLM_TYPE_LOCK, sizeof(struct dlm_lock_data));
|
|
if (!ret)
|
|
return NULL;
|
|
return nla_data(ret);
|
|
}
|
|
|
|
static int send_data(struct sk_buff *skb)
|
|
{
|
|
struct genlmsghdr *genlhdr = nlmsg_data((struct nlmsghdr *)skb->data);
|
|
void *data = genlmsg_data(genlhdr);
|
|
|
|
genlmsg_end(skb, data);
|
|
|
|
return genlmsg_unicast(&init_net, skb, listener_nlportid);
|
|
}
|
|
|
|
static int user_cmd(struct sk_buff *skb, struct genl_info *info)
|
|
{
|
|
listener_nlportid = info->snd_portid;
|
|
printk("user_cmd nlpid %u\n", listener_nlportid);
|
|
return 0;
|
|
}
|
|
|
|
static const struct genl_ops dlm_nl_ops[] = {
|
|
{
|
|
.cmd = DLM_CMD_HELLO,
|
|
.doit = user_cmd,
|
|
},
|
|
};
|
|
|
|
static struct genl_family family __ro_after_init = {
|
|
.name = DLM_GENL_NAME,
|
|
.version = DLM_GENL_VERSION,
|
|
.ops = dlm_nl_ops,
|
|
.n_ops = ARRAY_SIZE(dlm_nl_ops),
|
|
.module = THIS_MODULE,
|
|
};
|
|
|
|
int __init dlm_netlink_init(void)
|
|
{
|
|
return genl_register_family(&family);
|
|
}
|
|
|
|
void dlm_netlink_exit(void)
|
|
{
|
|
genl_unregister_family(&family);
|
|
}
|
|
|
|
static void fill_data(struct dlm_lock_data *data, struct dlm_lkb *lkb)
|
|
{
|
|
struct dlm_rsb *r = lkb->lkb_resource;
|
|
|
|
memset(data, 0, sizeof(struct dlm_lock_data));
|
|
|
|
data->version = DLM_LOCK_DATA_VERSION;
|
|
data->nodeid = lkb->lkb_nodeid;
|
|
data->ownpid = lkb->lkb_ownpid;
|
|
data->id = lkb->lkb_id;
|
|
data->remid = lkb->lkb_remid;
|
|
data->status = lkb->lkb_status;
|
|
data->grmode = lkb->lkb_grmode;
|
|
data->rqmode = lkb->lkb_rqmode;
|
|
if (lkb->lkb_ua)
|
|
data->xid = lkb->lkb_ua->xid;
|
|
if (r) {
|
|
data->lockspace_id = r->res_ls->ls_global_id;
|
|
data->resource_namelen = r->res_length;
|
|
memcpy(data->resource_name, r->res_name, r->res_length);
|
|
}
|
|
}
|
|
|
|
void dlm_timeout_warn(struct dlm_lkb *lkb)
|
|
{
|
|
struct sk_buff *uninitialized_var(send_skb);
|
|
struct dlm_lock_data *data;
|
|
size_t size;
|
|
int rv;
|
|
|
|
size = nla_total_size(sizeof(struct dlm_lock_data)) +
|
|
nla_total_size(0); /* why this? */
|
|
|
|
rv = prepare_data(DLM_CMD_TIMEOUT, &send_skb, size);
|
|
if (rv < 0)
|
|
return;
|
|
|
|
data = mk_data(send_skb);
|
|
if (!data) {
|
|
nlmsg_free(send_skb);
|
|
return;
|
|
}
|
|
|
|
fill_data(data, lkb);
|
|
|
|
send_data(send_skb);
|
|
}
|
|
|