drm/panfrost: Fix sleeping while atomic in panfrost_gem_open

[sfrench/cifs-2.6.git] / drivers / block / nbd.c

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 3a9bca3aa0933d760f11a46b2bded7caad0d2b2c..9bcde2325893183167dcaed84f299af777d62a39 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -134,6 +134,8 @@ static struct dentry *nbd_dbg_dir;
 
 #define NBD_MAGIC 0x68797548
 
+#define NBD_DEF_BLKSIZE 1024
+
 static unsigned int nbds_max = 16;
 static int max_part = 16;
 static struct workqueue_struct *recv_workqueue;
@@ -1236,6 +1238,14 @@ static void nbd_clear_sock_ioctl(struct nbd_device *nbd,
                nbd_config_put(nbd);
 }
 
+static bool nbd_is_valid_blksize(unsigned long blksize)
+{
+       if (!blksize || !is_power_of_2(blksize) || blksize < 512 ||
+           blksize > PAGE_SIZE)
+               return false;
+       return true;
+}
+
 /* Must be called with config_lock held */
 static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                       unsigned int cmd, unsigned long arg)
@@ -1251,8 +1261,9 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
        case NBD_SET_SOCK:
                return nbd_add_socket(nbd, arg, false);
        case NBD_SET_BLKSIZE:
-               if (!arg || !is_power_of_2(arg) || arg < 512 ||
-                   arg > PAGE_SIZE)
+               if (!arg)
+                       arg = NBD_DEF_BLKSIZE;
+               if (!nbd_is_valid_blksize(arg))
                        return -EINVAL;
                nbd_size_set(nbd, arg,
                             div_s64(config->bytesize, arg));
@@ -1332,7 +1343,7 @@ static struct nbd_config *nbd_alloc_config(void)
        atomic_set(&config->recv_threads, 0);
        init_waitqueue_head(&config->recv_wq);
        init_waitqueue_head(&config->conn_wait);
-       config->blksize = 1024;
+       config->blksize = NBD_DEF_BLKSIZE;
        atomic_set(&config->live_connections, 0);
        try_module_get(THIS_MODULE);
        return config;
@@ -1673,6 +1684,30 @@ nbd_device_policy[NBD_DEVICE_ATTR_MAX + 1] = {
        [NBD_DEVICE_CONNECTED]          =       { .type = NLA_U8 },
 };
 
+static int nbd_genl_size_set(struct genl_info *info, struct nbd_device *nbd)
+{
+       struct nbd_config *config = nbd->config;
+       u64 bsize = config->blksize;
+       u64 bytes = config->bytesize;
+
+       if (info->attrs[NBD_ATTR_SIZE_BYTES])
+               bytes = nla_get_u64(info->attrs[NBD_ATTR_SIZE_BYTES]);
+
+       if (info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]) {
+               bsize = nla_get_u64(info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]);
+               if (!bsize)
+                       bsize = NBD_DEF_BLKSIZE;
+               if (!nbd_is_valid_blksize(bsize)) {
+                       printk(KERN_ERR "Invalid block size %llu\n", bsize);
+                       return -EINVAL;
+               }
+       }
+
+       if (bytes != config->bytesize || bsize != config->blksize)
+               nbd_size_set(nbd, bsize, div64_u64(bytes, bsize));
+       return 0;
+}
+
 static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
 {
        struct nbd_device *nbd = NULL;
@@ -1760,16 +1795,10 @@ again:
        refcount_set(&nbd->config_refs, 1);
        set_bit(NBD_BOUND, &config->runtime_flags);
 
-       if (info->attrs[NBD_ATTR_SIZE_BYTES]) {
-               u64 bytes = nla_get_u64(info->attrs[NBD_ATTR_SIZE_BYTES]);
-               nbd_size_set(nbd, config->blksize,
-                            div64_u64(bytes, config->blksize));
-       }
-       if (info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]) {
-               u64 bsize =
-                       nla_get_u64(info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]);
-               nbd_size_set(nbd, bsize, div64_u64(config->bytesize, bsize));
-       }
+       ret = nbd_genl_size_set(info, nbd);
+       if (ret)
+               goto out;
+
        if (info->attrs[NBD_ATTR_TIMEOUT]) {
                u64 timeout = nla_get_u64(info->attrs[NBD_ATTR_TIMEOUT]);
                nbd->tag_set.timeout = timeout * HZ;
@@ -1938,6 +1967,10 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
                goto out;
        }
 
+       ret = nbd_genl_size_set(info, nbd);
+       if (ret)
+               goto out;
+
        if (info->attrs[NBD_ATTR_TIMEOUT]) {
                u64 timeout = nla_get_u64(info->attrs[NBD_ATTR_TIMEOUT]);
                nbd->tag_set.timeout = timeout * HZ;