Attachment 212664 Details for Bug 245022 – modify kernel UDP client to use global xid

[patch] modify kernel UDP client to use global xid

xid.patch (text/plain), 1.64 KB, created by Rick Macklem on 2020-03-24 00:35:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rick Macklem

Created: 2020-03-24 00:35:00 UTC

Size: 1.64 KB

patch

obsolete

>--- rpc/clnt_dg.c.sav	2020-01-08 14:20:34.193993000 -0800
>+++ rpc/clnt_dg.c	2020-01-08 14:46:03.213393000 -0800
>@@ -94,6 +94,8 @@ static struct clnt_ops clnt_dg_ops = {
> 	.cl_control =	clnt_dg_control
> };
> 
>+static volatile uint32_t rpc_xid = 0;
>+
> /*
>  * A pending RPC request which awaits a reply. Requests which have
>  * received their reply will have cr_xid set to zero and cr_mrep to
>@@ -193,6 +195,7 @@ clnt_dg_create(
> 	struct __rpc_sockinfo si;
> 	XDR xdrs;
> 	int error;
>+	uint32_t newxid;
> 
> 	if (svcaddr == NULL) {
> 		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
>@@ -245,8 +248,9 @@ clnt_dg_create(
> 	cu->cu_sent = 0;
> 	cu->cu_cwnd_wait = FALSE;
> 	(void) getmicrotime(&now);
>-	cu->cu_xid = __RPC_GETXID(&now);
>-	call_msg.rm_xid = cu->cu_xid;
>+	newxid = __RPC_GETXID(&now);
>+	atomic_cmpset_32(&rpc_xid, 0, newxid);
>+	call_msg.rm_xid = atomic_fetchadd_32(&rpc_xid, 1);
> 	call_msg.rm_call.cb_prog = program;
> 	call_msg.rm_call.cb_vers = version;
> 	xdrmem_create(&xdrs, cu->cu_mcallc, MCALL_MSG_SIZE, XDR_ENCODE);
>@@ -418,8 +422,7 @@ clnt_dg_call(
> call_again:
> 	mtx_assert(&cs->cs_lock, MA_OWNED);
> 
>-	cu->cu_xid++;
>-	xid = cu->cu_xid;
>+	xid = atomic_fetchadd_32(&rpc_xid, 1);
> 
> send_again:
> 	mtx_unlock(&cs->cs_lock);
>@@ -865,14 +868,16 @@ clnt_dg_control(CLIENT *cl, u_int request, void *info)
> 		(void) memcpy(&cu->cu_raddr, addr, addr->sa_len);
> 		break;
> 	case CLGET_XID:
>-		*(uint32_t *)info = cu->cu_xid;
>+		*(uint32_t *)info = rpc_xid;
> 		break;
> 
>+#ifdef notnow
> 	case CLSET_XID:
> 		/* This will set the xid of the NEXT call */
> 		/* decrement by 1 as clnt_dg_call() increments once */
> 		cu->cu_xid = *(uint32_t *)info - 1;
> 		break;
>+#endif
> 
> 	case CLGET_VERS:
> 		/*

Actions: View | Diff

Attachments on bug 245022: 212663 | 212664