On 6/20/19 8:03 AM, Jack Wang wrote:
+#undef pr_fmt
+#define pr_fmt(fmt) KBUILD_MODNAME " L" __stringify(__LINE__) ": " fmt
Same comment here as for a previous patch - please do not include line
number information in pr_fmt().
+MODULE_AUTHOR("ibnbd@xxxxxxxxxxxxxxxx");
+MODULE_VERSION(IBNBD_VER_STRING);
+MODULE_DESCRIPTION("InfiniBand Network Block Device Server");
+MODULE_LICENSE("GPL");
Please remove the version number (MODULE_VERSION()).
+static char dev_search_path[PATH_MAX] = DEFAULT_DEV_SEARCH_PATH;
Please change dev_search_path[] into a dynamically allocated string to
avoid a hard-coded length limit.
+ if (dup[strlen(dup) - 1] == '\n')
+ dup[strlen(dup) - 1] = '\0';
Can this be changed into a call to strim()?
+static void ibnbd_endio(void *priv, int error)
+{
+ struct ibnbd_io_private *ibnbd_priv = priv;
+ struct ibnbd_srv_sess_dev *sess_dev = ibnbd_priv->sess_dev;
+
+ ibnbd_put_sess_dev(sess_dev);
+
+ ibtrs_srv_resp_rdma(ibnbd_priv->id, error);
+
+ kfree(priv);
+}
Since ibtrs_srv_resp_rdma() starts an RDMA WRITE without waiting for the
write completion, shouldn't the session reference be retained until the
completion for that RDMA WRITE has been received? In other words, is
there a risk with the current approach that the buffer that is being
transferred to the client will be freed before the RDMA WRITE has finished?
+static struct ibnbd_srv_sess_dev *
+ibnbd_get_sess_dev(int dev_id, struct ibnbd_srv_session *srv_sess)
+{
+ struct ibnbd_srv_sess_dev *sess_dev;
+ int ret = 0;
+
+ read_lock(&srv_sess->index_lock);
+ sess_dev = idr_find(&srv_sess->index_idr, dev_id);
+ if (likely(sess_dev))
+ ret = kref_get_unless_zero(&sess_dev->kref);
+ read_unlock(&srv_sess->index_lock);
+
+ if (unlikely(!sess_dev || !ret))
+ return ERR_PTR(-ENXIO);
+
+ return sess_dev;
+}
Something that is not important: isn't the sess_dev check superfluous in
the if-statement just above the return statement? If ret == 1, does that
imply that sess_dev != 0 ?
Has it been considered to return -ENODEV instead of -ENXIO if no device
is found?
+static int create_sess(struct ibtrs_srv *ibtrs)
+{
> [ ... ]
+ strlcpy(srv_sess->sessname, sessname, sizeof(srv_sess->sessname));
Please change the session name into a dynamically allocated string such
that strdup() can be used instead of strlcpy().
+static int process_msg_open(struct ibtrs_srv *ibtrs,
+ struct ibnbd_srv_session *srv_sess,
+ const void *msg, size_t len,
+ void *data, size_t datalen);
+
+static int process_msg_sess_info(struct ibtrs_srv *ibtrs,
+ struct ibnbd_srv_session *srv_sess,
+ const void *msg, size_t len,
+ void *data, size_t datalen);
Can the code be reordered such that these forward declarations can be
dropped?
+static struct ibnbd_srv_sess_dev *
+ibnbd_srv_create_set_sess_dev(struct ibnbd_srv_session *srv_sess,
+ const struct ibnbd_msg_open *open_msg,
+ struct ibnbd_dev *ibnbd_dev, fmode_t open_flags,
+ struct ibnbd_srv_dev *srv_dev)
+{
+ struct ibnbd_srv_sess_dev *sdev = ibnbd_sess_dev_alloc(srv_sess);
+
+ if (IS_ERR(sdev))
+ return sdev;
+
+ kref_init(&sdev->kref);
+
+ strlcpy(sdev->pathname, open_msg->dev_name, sizeof(sdev->pathname));
Can the path name be changed into a dynamically allocated string?
+static char *ibnbd_srv_get_full_path(struct ibnbd_srv_session *srv_sess,
+ const char *dev_name)
+{
+ char *full_path;
+ char *a, *b;
+
+ full_path = kmalloc(PATH_MAX, GFP_KERNEL);
+ if (!full_path)
+ return ERR_PTR(-ENOMEM);
+
+ /*
+ * Replace %SESSNAME% with a real session name in order to
+ * create device namespace.
+ */
+ a = strnstr(dev_search_path, "%SESSNAME%", sizeof(dev_search_path));
+ if (a) {
+ int len = a - dev_search_path;
+
+ len = snprintf(full_path, PATH_MAX, "%.*s/%s/%s", len,
+ dev_search_path, srv_sess->sessname, dev_name);
+ if (len >= PATH_MAX) {
+ pr_err("Tooooo looong path: %s, %s, %s\n",
+ dev_search_path, srv_sess->sessname, dev_name);
+ kfree(full_path);
+ return ERR_PTR(-EINVAL);
+ }
+ } else {
+ snprintf(full_path, PATH_MAX, "%s/%s",
+ dev_search_path, dev_name);
+ }
Has it been considered to use kasprintf() instead of kmalloc() + snprintf()?
+static int process_msg_sess_info(struct ibtrs_srv *ibtrs,
+ struct ibnbd_srv_session *srv_sess,
+ const void *msg, size_t len,
+ void *data, size_t datalen)
+{
+ const struct ibnbd_msg_sess_info *sess_info_msg = msg;
+ struct ibnbd_msg_sess_info_rsp *rsp = data;
+
+ srv_sess->ver = min_t(u8, sess_info_msg->ver, IBNBD_PROTO_VER_MAJOR);
+ pr_debug("Session %s using protocol version %d (client version: %d,"
+ " server version: %d)\n", srv_sess->sessname,
+ srv_sess->ver, sess_info_msg->ver, IBNBD_PROTO_VER_MAJOR);
Has this patch been verified with checkpatch? I think checkpatch
recommends not to split literal strings.
+/**
+ * find_srv_sess_dev() - a dev is already opened by this name
+ *
+ * Return struct ibnbd_srv_sess_dev if srv_sess already opened the dev_name
+ * NULL if the session didn't open the device yet.
+ */
+static struct ibnbd_srv_sess_dev *
+find_srv_sess_dev(struct ibnbd_srv_session *srv_sess, const char *dev_name)
+{
+ struct ibnbd_srv_sess_dev *sess_dev;
+
+ if (list_empty(&srv_sess->sess_dev_list))
+ return NULL;
+
+ list_for_each_entry(sess_dev, &srv_sess->sess_dev_list, sess_list)
+ if (!strcmp(sess_dev->pathname, dev_name))
+ return sess_dev;
+
+ return NULL;
+}
Is explicit the list_empty() check really necessary? Would the behavior
of this function change if that check is left out?
Has the posted code been compiled with W=1? I'm asking this because the
documentation of the function arguments is missing from the kernel-doc
header. I expect that a warning will be reported if this code is
compiled with W=1.
Thanks,
Bart.
