Skip to contentSkip to conversation

fs: dlm: handle DLM_PLOCK_FL_NO_REPLY

PATCH New Alexander Aring 1 participant 3 messages Jul 13, 2023 – Jul 14, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 fs: dlm: handle DLM_PLOCK_FL_NO_REPLY

This patch will handle a newly introduced op flag DLM_PLOCK_FL_NO_REPLY to be sure we never send a result back in case of the kernel doesn't expect never a result back.

---
 dlm_controld/plock.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
dlm_controld/plock.c +10 -0
index a91aecb0..ab19e8d7 100644
@@ -9,6 +9,10 @@
 #include "dlm_daemon.h"
 #include <linux/dlm_plock.h>
 
+#ifndef DLM_PLOCK_FL_NO_REPLY
+#define DLM_PLOCK_FL_NO_REPLY 2
+#endif
+
 static uint32_t plock_read_count;
 static uint32_t plock_recv_count;
 static uint32_t plock_rate_delays;
@@ -680,6 +684,12 @@ static void write_result(struct dlm_plock_info *in, int rv)
 {
 	int write_rv;
 
+	if (in->flags & DLM_PLOCK_FL_NO_REPLY) {
+		log_debug("write_result: ignored rv %d fd %d\n",
+			  rv, plock_device_fd);
+		return;
+	}
+
 	in->rv = rv;
 	write_rv = write(plock_device_fd, in, sizeof(struct dlm_plock_info));
 	if (write_rv < 0)
Signature · 1 line
2.31.1
#1 lore raw

PATCH 2/2 fs: dlm: implement DLM_PLOCK_OP_CANCEL

This patch implements DLM_PLOCK_OP_CANCEL to try to delete waiters for a lock request which are waiting to being granted. If the waiter can be deleted the reply to the kernel will be replaced from DLM_PLOCK_OP_LOCK to the sent DLM_PLOCK_OP_CANCEL and clearing the DLM_PLOCK_FL_NO_REPLY flag.

---
 dlm_controld/plock.c | 47 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
dlm_controld/plock.c +47 -0
index ab19e8d7..fd2bd2cf 100644
@@ -9,6 +9,10 @@
 #include "dlm_daemon.h"
 #include <linux/dlm_plock.h>
 
+#ifndef DLM_PLOCK_OP_CANCEL
+#define DLM_PLOCK_OP_CANCEL 4
+#endif
+
 #ifndef DLM_PLOCK_FL_NO_REPLY
 #define DLM_PLOCK_FL_NO_REPLY 2
 #endif
@@ -136,6 +140,8 @@ static const char *op_str(int optype)
 	switch (optype) {
 	case DLM_PLOCK_OP_LOCK:
 		return "LK";
+	case DLM_PLOCK_OP_CANCEL:
+		return "CL";
 	case DLM_PLOCK_OP_UNLOCK:
 		return "UN";
 	case DLM_PLOCK_OP_GET:
@@ -751,6 +757,43 @@ static void do_lock(struct lockspace *ls, struct dlm_plock_info *in,
 	put_resource(ls, r);
 }
 
+static int remove_waiter(const struct resource *r, struct dlm_plock_info *in)
+{
+	struct lock_waiter *w;
+
+	list_for_each_entry(w, &r->waiters, list) {
+		if (w->info.nodeid == in->nodeid &&
+		    w->info.fsid == in->fsid &&
+		    w->info.number == in->number &&
+		    w->info.owner == in->owner &&
+		    w->info.pid == in->pid &&
+		    w->info.start == in->start &&
+		    w->info.end == in->end &&
+		    w->info.ex == in->ex) {
+			list_del(&w->list);
+			free(w);
+			return 0;
+		}
+	}
+
+	return -ENOENT;
+}
+
+static void do_cancel(struct lockspace *ls, struct dlm_plock_info *in,
+		      struct resource *r)
+{
+	int rv;
+
+	rv = remove_waiter(r, in);
+	if (in->nodeid == our_nodeid && rv == 0) {
+		/* we replacing a reply because we canceled waiter */
+		in->flags &= ~DLM_PLOCK_FL_NO_REPLY;
+		write_result(in, rv);
+	}
+
+	put_resource(ls, r);
+}
+
 static void do_unlock(struct lockspace *ls, struct dlm_plock_info *in,
 		      struct resource *r)
 {
@@ -816,6 +859,10 @@ static void __receive_plock(struct lockspace *ls, struct dlm_plock_info *in,
 		ls->last_plock_time = monotime();
 		do_lock(ls, in, r);
 		break;
+	case DLM_PLOCK_OP_CANCEL:
+		ls->last_plock_time = monotime();
+		do_cancel(ls, in, r);
+		break;
 	case DLM_PLOCK_OP_UNLOCK:
 		ls->last_plock_time = monotime();
 		do_unlock(ls, in, r);
Signature · 1 line
2.31.1
#2 lore raw

PATCH 2/2 fs: dlm: implement DLM_PLOCK_OP_CANCEL

Hi,

Quoted 59 lines · On Thu, Jul 13, 2023 at 1:08?PM Alexander Aring <[email protected]> wrote:

This patch implements DLM_PLOCK_OP_CANCEL to try to delete waiters for a lock request which are waiting to being granted. If the waiter can be deleted the reply to the kernel will be replaced from DLM_PLOCK_OP_LOCK to the sent DLM_PLOCK_OP_CANCEL and clearing the DLM_PLOCK_FL_NO_REPLY flag.

---
 dlm_controld/plock.c | 47 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
dlm_controld/plock.c +27 -0
index ab19e8d7..fd2bd2cf 100644
@@ -9,6 +9,10 @@
 #include "dlm_daemon.h"
 #include <linux/dlm_plock.h>
 
+#ifndef DLM_PLOCK_OP_CANCEL
+#define DLM_PLOCK_OP_CANCEL 4
+#endif
+
 #ifndef DLM_PLOCK_FL_NO_REPLY
 #define DLM_PLOCK_FL_NO_REPLY 2
 #endif
@@ -136,6 +140,8 @@ static const char *op_str(int optype)
        switch (optype) {
        case DLM_PLOCK_OP_LOCK:
                return "LK";
+       case DLM_PLOCK_OP_CANCEL:
+               return "CL";
        case DLM_PLOCK_OP_UNLOCK:
                return "UN";
        case DLM_PLOCK_OP_GET:
@@ -751,6 +757,43 @@ static void do_lock(struct lockspace *ls, struct dlm_plock_info *in,
        put_resource(ls, r);
 }
 
+static int remove_waiter(const struct resource *r, struct dlm_plock_info *in)
+{
+       struct lock_waiter *w;
+
+       list_for_each_entry(w, &r->waiters, list) {
+               if (w->info.nodeid == in->nodeid &&
+                   w->info.fsid == in->fsid &&
+                   w->info.number == in->number &&
+                   w->info.owner == in->owner &&
+                   w->info.pid == in->pid &&
+                   w->info.start == in->start &&
+                   w->info.end == in->end &&
+                   w->info.ex == in->ex) {
+                       list_del(&w->list);
+                       free(w);
+                       return 0;
+               }
+       }
+
+       return -ENOENT;
+}

dlm_controld/plock.c static void do_lock(struct lockspace *ls, struct dlm_plock_info *in, · line 790

Quoted 10 lines
dlm_controld/plock.c +10 -0
+
+static void do_cancel(struct lockspace *ls, struct dlm_plock_info *in,
+                     struct resource *r)
+{
+       int rv;
+
+       rv = remove_waiter(r, in);
+       if (in->nodeid == our_nodeid && rv == 0) {
+               /* we replacing a reply because we canceled waiter */
+               in->flags &= ~DLM_PLOCK_FL_NO_REPLY;

I think we should do a copy of "in" here and then clear the flag... it can have side effects if the ongoing processing will then call write_result().

At some point dlm_plock_info should be const here...

- Alex