svn commit: r367024 - head/usr.sbin/ctld
Richard Scheffenegger
rscheff at FreeBSD.org
Sat Oct 24 21:10:55 UTC 2020
Author: rscheff
Date: Sat Oct 24 21:10:53 2020
New Revision: 367024
URL: https://svnweb.freebsd.org/changeset/base/367024
Log:
Add network QoS support for PCP to iscsi target.
Mak the Ethernet PCP codepoint configurable
for L2 local traffic, to allow lower latency for
iSCSI block IO. This addresses the target
side only.
Reviewed by: mav, trasz, bcr
Sponsored by: NetApp, Inc.
Differential Revision: https://reviews.freebsd.org/D26740
Modified:
head/usr.sbin/ctld/ctl.conf.5
head/usr.sbin/ctld/ctld.c
head/usr.sbin/ctld/ctld.h
head/usr.sbin/ctld/parse.y
head/usr.sbin/ctld/token.l
head/usr.sbin/ctld/uclparse.c
Modified: head/usr.sbin/ctld/ctl.conf.5
==============================================================================
--- head/usr.sbin/ctld/ctl.conf.5 Sat Oct 24 21:07:13 2020 (r367023)
+++ head/usr.sbin/ctld/ctl.conf.5 Sat Oct 24 21:10:53 2020 (r367024)
@@ -258,6 +258,13 @@ well-defined
and
.Qq Ar AFxx
codepoints.
+.It Ic pcp Ar value
+The 802.1Q Priority CodePoint used for sending packets.
+The PCP can be set to a value in the range between
+.Qq Ar 0
+to
+.Qq Ar 7 .
+When omitted, the default for the outgoing interface is used.
.El
.Ss target Context
.Bl -tag -width indent
Modified: head/usr.sbin/ctld/ctld.c
==============================================================================
--- head/usr.sbin/ctld/ctld.c Sat Oct 24 21:07:13 2020 (r367023)
+++ head/usr.sbin/ctld/ctld.c Sat Oct 24 21:10:53 2020 (r367024)
@@ -626,6 +626,7 @@ portal_group_new(struct conf *conf, const char *name)
pg->pg_conf = conf;
pg->pg_tag = 0; /* Assigned later in conf_apply(). */
pg->pg_dscp = -1;
+ pg->pg_pcp = -1;
TAILQ_INSERT_TAIL(&conf->conf_portal_groups, pg, pg_next);
return (pg);
@@ -2210,6 +2211,32 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
IPPROTO_IPV6, IPV6_TCLASS,
&tos, sizeof(tos)) == -1)
log_warn("setsockopt(IPV6_TCLASS) "
+ "failed for %s",
+ newp->p_listen);
+ }
+ }
+ if (newpg->pg_pcp != -1) {
+ struct sockaddr sa;
+ int len = sizeof(sa);
+ getsockname(newp->p_socket, &sa, &len);
+ /*
+ * Only allow the 6-bit DSCP
+ * field to be modified
+ */
+ int pcp = newpg->pg_pcp;
+ if (sa.sa_family == AF_INET) {
+ if (setsockopt(newp->p_socket,
+ IPPROTO_IP, IP_VLAN_PCP,
+ &pcp, sizeof(pcp)) == -1)
+ log_warn("setsockopt(IP_VLAN_PCP) "
+ "failed for %s",
+ newp->p_listen);
+ } else
+ if (sa.sa_family == AF_INET6) {
+ if (setsockopt(newp->p_socket,
+ IPPROTO_IPV6, IPV6_VLAN_PCP,
+ &pcp, sizeof(pcp)) == -1)
+ log_warn("setsockopt(IPV6_VLAN_PCP) "
"failed for %s",
newp->p_listen);
}
Modified: head/usr.sbin/ctld/ctld.h
==============================================================================
--- head/usr.sbin/ctld/ctld.h Sat Oct 24 21:07:13 2020 (r367023)
+++ head/usr.sbin/ctld/ctld.h Sat Oct 24 21:10:53 2020 (r367024)
@@ -128,6 +128,7 @@ struct portal_group {
char *pg_offload;
char *pg_redirection;
int pg_dscp;
+ int pg_pcp;
uint16_t pg_tag;
};
Modified: head/usr.sbin/ctld/parse.y
==============================================================================
--- head/usr.sbin/ctld/parse.y Sat Oct 24 21:07:13 2020 (r367023)
+++ head/usr.sbin/ctld/parse.y Sat Oct 24 21:10:53 2020 (r367024)
@@ -65,8 +65,8 @@ extern void yyrestart(FILE *);
%token DISCOVERY_AUTH_GROUP DISCOVERY_FILTER DSCP FOREIGN
%token INITIATOR_NAME INITIATOR_PORTAL ISNS_SERVER ISNS_PERIOD ISNS_TIMEOUT
%token LISTEN LISTEN_ISER LUN MAXPROC OFFLOAD OPENING_BRACKET OPTION
-%token PATH PIDFILE PORT PORTAL_GROUP REDIRECT SEMICOLON SERIAL SIZE STR
-%token TAG TARGET TIMEOUT
+%token PATH PCP PIDFILE PORT PORTAL_GROUP REDIRECT SEMICOLON SERIAL
+%token SIZE STR TAG TARGET TIMEOUT
%token AF11 AF12 AF13 AF21 AF22 AF23 AF31 AF32 AF33 AF41 AF42 AF43
%token BE EF CS0 CS1 CS2 CS3 CS4 CS5 CS6 CS7
@@ -359,6 +359,8 @@ portal_group_entry:
portal_group_tag
|
portal_group_dscp
+ |
+ portal_group_pcp
;
portal_group_discovery_auth_group: DISCOVERY_AUTH_GROUP STR
@@ -512,6 +514,24 @@ portal_group_dscp
| DSCP AF43 { portal_group->pg_dscp = IPTOS_DSCP_AF43 >> 2 ; }
;
+portal_group_pcp: PCP STR
+ {
+ uint64_t tmp;
+
+ if (expand_number($2, &tmp) != 0) {
+ yyerror("invalid numeric value");
+ free($2);
+ return (1);
+ }
+ if (!((tmp >= 0) && (tmp <= 7))) {
+ yyerror("invalid pcp value");
+ free($2);
+ return (1);
+ }
+
+ portal_group->pg_pcp = tmp;
+ }
+ ;
lun: LUN lun_name
OPENING_BRACKET lun_entries CLOSING_BRACKET
Modified: head/usr.sbin/ctld/token.l
==============================================================================
--- head/usr.sbin/ctld/token.l Sat Oct 24 21:07:13 2020 (r367023)
+++ head/usr.sbin/ctld/token.l Sat Oct 24 21:10:53 2020 (r367024)
@@ -64,6 +64,7 @@ device-type { return DEVICE_TYPE; }
discovery-auth-group { return DISCOVERY_AUTH_GROUP; }
discovery-filter { return DISCOVERY_FILTER; }
dscp { return DSCP; }
+pcp { return PCP; }
foreign { return FOREIGN; }
initiator-name { return INITIATOR_NAME; }
initiator-portal { return INITIATOR_PORTAL; }
Modified: head/usr.sbin/ctld/uclparse.c
==============================================================================
--- head/usr.sbin/ctld/uclparse.c Sat Oct 24 21:07:13 2020 (r367023)
+++ head/usr.sbin/ctld/uclparse.c Sat Oct 24 21:10:53 2020 (r367024)
@@ -672,6 +672,19 @@ uclparse_portal_group(const char *name, const ucl_obje
}
}
}
+
+ if (!strcmp(key, "pcp")) {
+ if (obj->type != UCL_INT) {
+ log_warnx("\"pcp\" property of portal group "
+ "\"%s\" is not an integer", portal_group->pg_name);
+ return(1);
+ }
+ portal_group->pg_pcp = ucl_object_toint(obj);
+ if (!((portal_group->pg_pcp >= 0) && (portal_group->pg_pcp <= 7))) {
+ log_warnx("invalid \"pcp\" value %d, using default", portal_group->pg_pcp);
+ portal_group->pg_pcp = -1;
+ }
+ }
}
return (0);
More information about the svn-src-all
mailing list