Paths

Table of Contentst

-
sys/dev/usb/serial/
-
dev/
-
usb/
-
serial/
-
usb_serial.c

usb: serial: propagate errors from ucom_queue_command()
ClosedPublic
Actions

Authored by kevans on Dec 6 2024, 10:01 PM.

Details

Reviewers

imp
kib

Commits

rG51f3d0874f62: usb: serial: propagate errors from ucom_queue_command()

Summary

There's only one error that we can get back right now, but future
changes will add some more cases that we need to watch out for. Start
by returning errors and propagating them back.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 61019
Build 57903: arc lint + arc unit

Event Timeline

kevans requested review of this revision.Dec 6 2024, 10:01 PM

kevans created this revision.

Harbormaster completed remote builds in B60991: Diff 147623.Dec 6 2024, 10:01 PM

kevans added a child revision: D47951: usb: serial: allow the open/close sleep to be interruptible.Dec 6 2024, 10:01 PM

kevans mentioned this in D24459: (WIP) tty: split the tty lock up, make the primary tty lock sleepable.Dec 6 2024, 10:04 PM

kenrap_kennethraplee.com added a subscriber: kenrap_kennethraplee.com.Dec 6 2024, 10:19 PM

kib added inline comments.Dec 7 2024, 2:39 AM

sys/dev/usb/serial/usb_serial.c
809	Why return ENOTTY and then translate the error?

kevans added inline comments.Dec 7 2024, 3:40 AM

sys/dev/usb/serial/usb_serial.c
809	Will fix- originally this bubbled up to ucom_ioctl as well, where it didn't get translated. Later revisions added `ucom_command_barrier` which will get used in some contexts where ENOTTY makes sense for the tty layer (ioctl) and others where ENXIO makes more sense.

Return ENXIO from ucom_queue_command; the ENOTTY conversion to ENXIO in some
callers goes away for now.

Harbormaster completed remote builds in B61019: Diff 147668.Dec 7 2024, 4:28 AM

kib accepted this revision.Dec 7 2024, 11:23 PM

This revision is now accepted and ready to land.Dec 7 2024, 11:23 PM

Closed by commit rG51f3d0874f62: usb: serial: propagate errors from ucom_queue_command() (authored by kevans). · Explain WhyDec 11 2024, 1:25 AM

This revision was automatically updated to reflect the committed changes.

kevans added a commit: rG51f3d0874f62: usb: serial: propagate errors from ucom_queue_command().

Revision Contents
Changeset List

Path

Size

sys/

dev/

usb/

serial/

usb_serial.c

49 lines

Diff 147668

View Options

sys/dev/usb/serial/usb_serial.c

Show All 36 Lines
#include <sys/mutex.h>		#include <sys/mutex.h>
#include <sys/pcpu.h>		#include <sys/pcpu.h>
#include <sys/proc.h>		#include <sys/proc.h>
#include <sys/socket.h>		#include <sys/socket.h>
#include <sys/socketvar.h>		#include <sys/socketvar.h>
#include <sys/time.h>		#include <sys/time.h>
#include <sys/uio.h>		#include <sys/uio.h>

		#include <netinet/tcp.h>

#include <rpc/rpc.h>		#include <rpc/rpc.h>
#include <rpc/rpc_com.h>		#include <rpc/rpc_com.h>
#include <rpc/krpc.h>		#include <rpc/krpc.h>
#include <rpc/rpcsec_tls.h>		#include <rpc/rpcsec_tls.h>

static enum clnt_stat clnt_reconnect_call(CLIENT , struct rpc_callextra ,		static enum clnt_stat clnt_reconnect_call(CLIENT , struct rpc_callextra ,
rpcproc_t, struct mbuf , struct mbuf *, struct timeval);		rpcproc_t, struct mbuf , struct mbuf *, struct timeval);
static void clnt_reconnect_geterr(CLIENT , struct rpc_err );		static void clnt_reconnect_geterr(CLIENT , struct rpc_err );
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Lines	clnt_reconnect_create(
rc->rc_retries = INT_MAX;		rc->rc_retries = INT_MAX;
rc->rc_privport = FALSE;		rc->rc_privport = FALSE;
rc->rc_waitchan = "rpcrecv";		rc->rc_waitchan = "rpcrecv";
rc->rc_intr = 0;		rc->rc_intr = 0;
rc->rc_connecting = FALSE;		rc->rc_connecting = FALSE;
rc->rc_closed = FALSE;		rc->rc_closed = FALSE;
rc->rc_ucred = crdup(curthread->td_ucred);		rc->rc_ucred = crdup(curthread->td_ucred);
rc->rc_client = NULL;		rc->rc_client = NULL;
		rc->rc_ddp = false;
rc->rc_tls = false;		rc->rc_tls = false;
rc->rc_tlscertname = NULL;		rc->rc_tlscertname = NULL;
rc->rc_reconcall = NULL;		rc->rc_reconcall = NULL;
rc->rc_reconarg = NULL;		rc->rc_reconarg = NULL;

cl->cl_refs = 1;		cl->cl_refs = 1;
cl->cl_ops = &clnt_reconnect_ops;		cl->cl_ops = &clnt_reconnect_ops;
cl->cl_private = (caddr_t)(void *)rc;		cl->cl_private = (caddr_t)(void *)rc;
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines	if (rc->rc_tls && newclient != NULL) {
rpc_createerr.cf_error.re_errno = 0;		rpc_createerr.cf_error.re_errno = 0;
CLNT_CLOSE(newclient);		CLNT_CLOSE(newclient);
CLNT_RELEASE(newclient);		CLNT_RELEASE(newclient);
newclient = NULL;		newclient = NULL;
td->td_ucred = oldcred;		td->td_ucred = oldcred;
goto out;		goto out;
}		}
}		}
		if (rc->rc_ddp && newclient != NULL) {
		int optval = 1;

		(void)so_setsockopt(so, IPPROTO_TCP, TCP_USE_DDP,
		&optval, sizeof(optval));
		}
		rmacklemUnsubmitted Not Done Inline Actions Normally the clnt_rc.c (reconnect layer) would do a CLSET_TCP_DDP and the so_setsockopt() would be done for CLSET_TCP_DDP in clnt_vc.c and ignored in clnt_dg.c. I've never been much of an object oriented guy, but the Sun folk loved these layers. rmacklem: Normally the clnt_rc.c (reconnect layer) would do a CLSET_TCP_DDP and the so_setsockopt() would…
if (newclient != NULL && rc->rc_reconcall != NULL)		if (newclient != NULL && rc->rc_reconcall != NULL)
(*rc->rc_reconcall)(newclient, rc->rc_reconarg,		(*rc->rc_reconcall)(newclient, rc->rc_reconarg,
rc->rc_ucred);		rc->rc_ucred);
}		}
td->td_ucred = oldcred;		td->td_ucred = oldcred;

if (!newclient) {		if (!newclient) {
soclose(so);		soclose(so);
▲ Show 20 Lines • Show All 292 Lines • ▼ Show 20 Lines	case CLSET_TLSCERTNAME:
rc->rc_tlscertname = mem_alloc(slen);		rc->rc_tlscertname = mem_alloc(slen);
strlcpy(rc->rc_tlscertname, info, slen);		strlcpy(rc->rc_tlscertname, info, slen);
break;		break;

case CLSET_RECONUPCALL:		case CLSET_RECONUPCALL:
upcp = (struct rpc_reconupcall *)info;		upcp = (struct rpc_reconupcall *)info;
rc->rc_reconcall = upcp->call;		rc->rc_reconcall = upcp->call;
rc->rc_reconarg = upcp->arg;		rc->rc_reconarg = upcp->arg;
		break;

		case CLSET_DDP:
		rc->rc_ddp = true;
break;		break;

default:		default:
return (FALSE);		return (FALSE);
}		}

return (TRUE);		return (TRUE);
}		}
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines

usb: serial: propagate errors from ucom_queue_command()ClosedPublicActions