Page MenuHomeFreeBSD
Differential D34120

arm64, riscv: handle RB_KDB
ClosedPublic
Actions

Authored by mhorne on Jan 31 2022, 9:35 PM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 22 2025, 2:16 PM
Unknown Object (File)
Feb 22 2025, 1:51 PM
Unknown Object (File)
Feb 11 2025, 12:20 AM
Unknown Object (File)
Feb 8 2025, 12:01 AM
Unknown Object (File)
Jan 30 2025, 5:11 PM
Unknown Object (File)
Jan 26 2025, 6:30 AM
Unknown Object (File)
Jan 22 2025, 3:30 PM
Unknown Object (File)
Dec 8 2024, 2:29 PM
View All 49 Files
Subscribers
andrew
emaste
imp
jhb

Details

Reviewers
manu
jhb
Group Reviewers
riscv
arm64
Commits
rGa0b526b4d56a: arm64, riscv: handle RB_KDB
rG4e1bc961bb44: arm64, riscv: handle RB_KDB
Summary

This allows entering the debugger at the earliest possible time, if
the '-d' argument is passed to the kernel.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

mhorne created this revision.Jan 31 2022, 9:35 PM
Herald added a reviewer: manu. · View Herald TranscriptJan 31 2022, 9:35 PM
Herald added subscribers: emaste, andrew, imp. · View Herald Transcript
mhorne requested review of this revision.Jan 31 2022, 9:35 PM
Harbormaster completed remote builds in B44203: Diff 102183.Jan 31 2022, 9:35 PM
jhb added a subscriber: jhb.Jan 31 2022, 9:54 PM
jhb added inline comments.
sys/arm64/arm64/machdep.c
859

Have you tested this to verify if kdb works that early?

mhorne added inline comments.Jan 31 2022, 10:07 PM
sys/arm64/arm64/machdep.c
859

Yes. I recall having to fix it a few months back, but I did test this for both.

jhb accepted this revision.Jan 31 2022, 10:10 PM
This revision is now accepted and ready to land.Jan 31 2022, 10:10 PM
Closed by commit rG4e1bc961bb44: arm64, riscv: handle RB_KDB (authored by mhorne). · Explain WhyFeb 1 2022, 6:01 PM
This revision was automatically updated to reflect the committed changes.
mhorne added a commit: rG4e1bc961bb44: arm64, riscv: handle RB_KDB.
mhorne added a commit: rGa0b526b4d56a: arm64, riscv: handle RB_KDB.Feb 7 2022, 2:43 PM

Revision Contents
Changeset List

PathSize
sys/
arm64/
arm64/
4 lines
riscv/
riscv/
4 lines

Diff 102228

View Options

sys/arm64/arm64/machdep.c

Show First 20 Lines • Show All 196 Lines • ▼ Show 20 LinesSYSCTL_INT(_net_inet_tcp, OID_AUTO, insecure_syn, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(tcp_insecure_syn), 0, &VNET_NAME(tcp_insecure_syn), 0,
"Follow RFC793 instead of RFC5961 criteria for accepting SYN packets"); "Follow RFC793 instead of RFC5961 criteria for accepting SYN packets");
VNET_DEFINE(int, tcp_insecure_rst) = 0; VNET_DEFINE(int, tcp_insecure_rst) = 0;
SYSCTL_INT(_net_inet_tcp, OID_AUTO, insecure_rst, CTLFLAG_VNET | CTLFLAG_RW, SYSCTL_INT(_net_inet_tcp, OID_AUTO, insecure_rst, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(tcp_insecure_rst), 0, &VNET_NAME(tcp_insecure_rst), 0,
"Follow RFC793 instead of RFC5961 criteria for accepting RST packets"); "Follow RFC793 instead of RFC5961 criteria for accepting RST packets");
VNET_DEFINE(int, tcp_insecure_ack) = 0;
SYSCTL_INT(_net_inet_tcp, OID_AUTO, insecure_ack, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(tcp_insecure_ack), 0,
"Follow RFC793 criteria for validating SEG.ACK");
VNET_DEFINE(int, tcp_recvspace) = 1024*64; VNET_DEFINE(int, tcp_recvspace) = 1024*64;
#define V_tcp_recvspace VNET(tcp_recvspace) #define V_tcp_recvspace VNET(tcp_recvspace)
SYSCTL_INT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace, CTLFLAG_VNET | CTLFLAG_RW, SYSCTL_INT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(tcp_recvspace), 0, "Initial receive socket buffer size"); &VNET_NAME(tcp_recvspace), 0, "Initial receive socket buffer size");
VNET_DEFINE(int, tcp_do_autorcvbuf) = 1; VNET_DEFINE(int, tcp_do_autorcvbuf) = 1;
SYSCTL_INT(_net_inet_tcp, OID_AUTO, recvbuf_auto, CTLFLAG_VNET | CTLFLAG_RW, SYSCTL_INT(_net_inet_tcp, OID_AUTO, recvbuf_auto, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(tcp_do_autorcvbuf), 0, &VNET_NAME(tcp_do_autorcvbuf), 0,
▲ Show 20 Lines • Show All 2,018 Lines • ▼ Show 20 Lines if (V_tcp_insecure_syn &&
/* Send challenge ACK. */ /* Send challenge ACK. */
tcp_respond(tp, mtod(m, void *), th, m, tp->rcv_nxt, tcp_respond(tp, mtod(m, void *), th, m, tp->rcv_nxt,
tp->snd_nxt, TH_ACK); tp->snd_nxt, TH_ACK);
tp->last_ack_sent = tp->rcv_nxt; tp->last_ack_sent = tp->rcv_nxt;
m = NULL; m = NULL;
} }
goto drop; goto drop;
} }
ccUnsubmitted
Done
Inline Actions

At the server side (listening side), I am thinking if we move the secure ACK check here and above the TOF_TS check, it would save cycles on checking these timestamps.

cc: At the server side (listening side), I am thinking if we move the secure ACK check here and…
tuexenAuthorUnsubmitted
Done
Inline Actions

This patch is only about improving the input validation, not about changing the sequence of checks.
Please note that RFC 7323 requires to perform the timestamp checks before the SEG.ACK number checks.

tuexen: This patch is only about improving the input validation, not about changing the sequence of…
ccUnsubmitted
Done
Inline Actions

I see, in the section 5.3. Basic PAWS Algorithm from RFC7323 claims Also, PAWS processing MUST take precedence over the regular TCP acceptability check (Section 3.3 in [RFC0793]), which is performed after verification of the received Timestamps option...

cc: I see, in the section `5.3. Basic PAWS Algorithm` from RFC7323 claims `Also, PAWS processing…
/* /*
* RFC 1323 PAWS: If we have a timestamp reply on this segment * RFC 1323 PAWS: If we have a timestamp reply on this segment
* and it's less than ts_recent, drop it. * and it's less than ts_recent, drop it.
*/ */
if ((to.to_flags & TOF_TS) != 0 && tp->ts_recent && if ((to.to_flags & TOF_TS) != 0 && tp->ts_recent &&
TSTMP_LT(to.to_tsval, tp->ts_recent)) { TSTMP_LT(to.to_tsval, tp->ts_recent)) {
/* Check to see if ts_recent is over 24 days old. */ /* Check to see if ts_recent is over 24 days old. */
if (tcp_ts_getticks() - tp->ts_recent_age > TCP_PAWS_IDLE) { if (tcp_ts_getticks() - tp->ts_recent_age > TCP_PAWS_IDLE) {
▲ Show 20 Lines • Show All 185 Lines • ▼ Show 20 Lines if (tp->t_state == TCPS_SYN_RECEIVED ||
goto dropafterack; goto dropafterack;
else else
goto drop; goto drop;
} }
/* /*
* Ack processing. * Ack processing.
*/ */
if (SEQ_GEQ(tp->snd_una, tp->iss + (65535 << tp->snd_scale))) {
ccUnsubmitted
Done
Inline Actions

Can use TCP_MAXWIN instead of 65535.

cc: Can use `TCP_MAXWIN` instead of `65535`.
tuexenAuthorUnsubmitted
Done
Inline Actions

Fixed in 37b3e6a660f551ceda412e2115748f3b97b2e615, since this review has already been committed.

tuexen: Fixed in [[ https://cgit.FreeBSD.org/src/commit/?id=37b3e6a660f551ceda412e2115748f3b97b2e615 |…
/* Checking SEG.ACK against ISS is definitely redundant. */
tp->t_flags2 |= TF2_NO_ISS_CHECK;
ccUnsubmitted
Done
Inline Actions

code style: As there are two lines, recommend using a pair of {} for readability.

cc: code style: As there are two lines, recommend using a pair of `{}` for readability.
tuexenAuthorUnsubmitted
Done
Inline Actions

Fixed.

tuexen: Fixed.
}
if (!V_tcp_insecure_ack) {
tcp_seq seq_min;
bool ghost_ack_check;
if (tp->t_flags2 & TF2_NO_ISS_CHECK) {
/* Check for too old ACKs (RFC 5961, Section 5.2). */
seq_min = tp->snd_una - tp->max_sndwnd;
ghost_ack_check = false;
} else {
if (SEQ_GT(tp->iss + 1, tp->snd_una - tp->max_sndwnd)) {
/* Checking for ghost ACKs is stricter. */
seq_min = tp->iss + 1;
ghost_ack_check = true;
} else {
/*
* Checking for too old ACKs (RFC 5961,
* Section 5.2) is stricter.
*/
seq_min = tp->snd_una - tp->max_sndwnd;
ghost_ack_check = false;
}
}
if (SEQ_LT(th->th_ack, seq_min)) {
if (ghost_ack_check)
TCPSTAT_INC(tcps_rcvghostack);
else
TCPSTAT_INC(tcps_rcvacktooold);
/* Send a challenge ACK. */
tcp_respond(tp, mtod(m, void *), th, m,
tp->rcv_nxt, tp->snd_nxt, TH_ACK);
tp->last_ack_sent = tp->rcv_nxt;
m = NULL;
goto drop;
}
}
switch (tp->t_state) { switch (tp->t_state) {
/* /*
* In SYN_RECEIVED state, the ack ACKs our SYN, so enter * In SYN_RECEIVED state, the ack ACKs our SYN, so enter
* ESTABLISHED state and continue processing. * ESTABLISHED state and continue processing.
* The ACK was checked above. * The ACK was checked above.
*/ */
case TCPS_SYN_RECEIVED: case TCPS_SYN_RECEIVED:
▲ Show 20 Lines • Show All 1,746 Lines • Show Last 20 Lines
View Options

sys/riscv/riscv/machdep.c

Show First 20 Lines • Show All 196 Lines • ▼ Show 20 LinesSYSCTL_INT(_net_inet_tcp, OID_AUTO, insecure_syn, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(tcp_insecure_syn), 0, &VNET_NAME(tcp_insecure_syn), 0,
"Follow RFC793 instead of RFC5961 criteria for accepting SYN packets"); "Follow RFC793 instead of RFC5961 criteria for accepting SYN packets");
VNET_DEFINE(int, tcp_insecure_rst) = 0; VNET_DEFINE(int, tcp_insecure_rst) = 0;
SYSCTL_INT(_net_inet_tcp, OID_AUTO, insecure_rst, CTLFLAG_VNET | CTLFLAG_RW, SYSCTL_INT(_net_inet_tcp, OID_AUTO, insecure_rst, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(tcp_insecure_rst), 0, &VNET_NAME(tcp_insecure_rst), 0,
"Follow RFC793 instead of RFC5961 criteria for accepting RST packets"); "Follow RFC793 instead of RFC5961 criteria for accepting RST packets");
VNET_DEFINE(int, tcp_insecure_ack) = 0;
SYSCTL_INT(_net_inet_tcp, OID_AUTO, insecure_ack, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(tcp_insecure_ack), 0,
"Follow RFC793 criteria for validating SEG.ACK");
VNET_DEFINE(int, tcp_recvspace) = 1024*64; VNET_DEFINE(int, tcp_recvspace) = 1024*64;
#define V_tcp_recvspace VNET(tcp_recvspace) #define V_tcp_recvspace VNET(tcp_recvspace)
SYSCTL_INT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace, CTLFLAG_VNET | CTLFLAG_RW, SYSCTL_INT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(tcp_recvspace), 0, "Initial receive socket buffer size"); &VNET_NAME(tcp_recvspace), 0, "Initial receive socket buffer size");
VNET_DEFINE(int, tcp_do_autorcvbuf) = 1; VNET_DEFINE(int, tcp_do_autorcvbuf) = 1;
SYSCTL_INT(_net_inet_tcp, OID_AUTO, recvbuf_auto, CTLFLAG_VNET | CTLFLAG_RW, SYSCTL_INT(_net_inet_tcp, OID_AUTO, recvbuf_auto, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(tcp_do_autorcvbuf), 0, &VNET_NAME(tcp_do_autorcvbuf), 0,
▲ Show 20 Lines • Show All 2,018 Lines • ▼ Show 20 Lines if (V_tcp_insecure_syn &&
/* Send challenge ACK. */ /* Send challenge ACK. */
tcp_respond(tp, mtod(m, void *), th, m, tp->rcv_nxt, tcp_respond(tp, mtod(m, void *), th, m, tp->rcv_nxt,
tp->snd_nxt, TH_ACK); tp->snd_nxt, TH_ACK);
tp->last_ack_sent = tp->rcv_nxt; tp->last_ack_sent = tp->rcv_nxt;
m = NULL; m = NULL;
} }
goto drop; goto drop;
} }
ccUnsubmitted
Done
Inline Actions

At the server side (listening side), I am thinking if we move the secure ACK check here and above the TOF_TS check, it would save cycles on checking these timestamps.

cc: At the server side (listening side), I am thinking if we move the secure ACK check here and…
tuexenAuthorUnsubmitted
Done
Inline Actions

This patch is only about improving the input validation, not about changing the sequence of checks.
Please note that RFC 7323 requires to perform the timestamp checks before the SEG.ACK number checks.

tuexen: This patch is only about improving the input validation, not about changing the sequence of…
ccUnsubmitted
Done
Inline Actions

I see, in the section 5.3. Basic PAWS Algorithm from RFC7323 claims Also, PAWS processing MUST take precedence over the regular TCP acceptability check (Section 3.3 in [RFC0793]), which is performed after verification of the received Timestamps option...

cc: I see, in the section `5.3. Basic PAWS Algorithm` from RFC7323 claims `Also, PAWS processing…
/* /*
* RFC 1323 PAWS: If we have a timestamp reply on this segment * RFC 1323 PAWS: If we have a timestamp reply on this segment
* and it's less than ts_recent, drop it. * and it's less than ts_recent, drop it.
*/ */
if ((to.to_flags & TOF_TS) != 0 && tp->ts_recent && if ((to.to_flags & TOF_TS) != 0 && tp->ts_recent &&
TSTMP_LT(to.to_tsval, tp->ts_recent)) { TSTMP_LT(to.to_tsval, tp->ts_recent)) {
/* Check to see if ts_recent is over 24 days old. */ /* Check to see if ts_recent is over 24 days old. */
if (tcp_ts_getticks() - tp->ts_recent_age > TCP_PAWS_IDLE) { if (tcp_ts_getticks() - tp->ts_recent_age > TCP_PAWS_IDLE) {
▲ Show 20 Lines • Show All 185 Lines • ▼ Show 20 Lines if (tp->t_state == TCPS_SYN_RECEIVED ||
goto dropafterack; goto dropafterack;
else else
goto drop; goto drop;
} }
/* /*
* Ack processing. * Ack processing.
*/ */
if (SEQ_GEQ(tp->snd_una, tp->iss + (65535 << tp->snd_scale))) {
ccUnsubmitted
Done
Inline Actions

Can use TCP_MAXWIN instead of 65535.

cc: Can use `TCP_MAXWIN` instead of `65535`.
tuexenAuthorUnsubmitted
Done
Inline Actions

Fixed in 37b3e6a660f551ceda412e2115748f3b97b2e615, since this review has already been committed.

tuexen: Fixed in [[ https://cgit.FreeBSD.org/src/commit/?id=37b3e6a660f551ceda412e2115748f3b97b2e615 |…
/* Checking SEG.ACK against ISS is definitely redundant. */
tp->t_flags2 |= TF2_NO_ISS_CHECK;
ccUnsubmitted
Done
Inline Actions

code style: As there are two lines, recommend using a pair of {} for readability.

cc: code style: As there are two lines, recommend using a pair of `{}` for readability.
tuexenAuthorUnsubmitted
Done
Inline Actions

Fixed.

tuexen: Fixed.
}
if (!V_tcp_insecure_ack) {
tcp_seq seq_min;
bool ghost_ack_check;
if (tp->t_flags2 & TF2_NO_ISS_CHECK) {
/* Check for too old ACKs (RFC 5961, Section 5.2). */
seq_min = tp->snd_una - tp->max_sndwnd;
ghost_ack_check = false;
} else {
if (SEQ_GT(tp->iss + 1, tp->snd_una - tp->max_sndwnd)) {
/* Checking for ghost ACKs is stricter. */
seq_min = tp->iss + 1;
ghost_ack_check = true;
} else {
/*
* Checking for too old ACKs (RFC 5961,
* Section 5.2) is stricter.
*/
seq_min = tp->snd_una - tp->max_sndwnd;
ghost_ack_check = false;
}
}
if (SEQ_LT(th->th_ack, seq_min)) {
if (ghost_ack_check)
TCPSTAT_INC(tcps_rcvghostack);
else
TCPSTAT_INC(tcps_rcvacktooold);
/* Send a challenge ACK. */
tcp_respond(tp, mtod(m, void *), th, m,
tp->rcv_nxt, tp->snd_nxt, TH_ACK);
tp->last_ack_sent = tp->rcv_nxt;
m = NULL;
goto drop;
}
}
switch (tp->t_state) { switch (tp->t_state) {
/* /*
* In SYN_RECEIVED state, the ack ACKs our SYN, so enter * In SYN_RECEIVED state, the ack ACKs our SYN, so enter
* ESTABLISHED state and continue processing. * ESTABLISHED state and continue processing.
* The ACK was checked above. * The ACK was checked above.
*/ */
case TCPS_SYN_RECEIVED: case TCPS_SYN_RECEIVED:
▲ Show 20 Lines • Show All 1,746 Lines • Show Last 20 Lines