Page MenuHomeFreeBSD
Differential D46508

EC2: Make amazon-ssm-agent optional
ClosedPublic
Actions

Authored by cperciva on Sep 1 2024, 6:08 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 6, 9:34 PM
Unknown Object (File)
Thu, Mar 6, 4:23 PM
Unknown Object (File)
Thu, Mar 6, 4:09 PM
Unknown Object (File)
Thu, Mar 6, 1:34 PM
Unknown Object (File)
Sat, Mar 1, 8:01 PM
Unknown Object (File)
Fri, Feb 28, 5:55 PM
Unknown Object (File)
Feb 22 2025, 2:12 PM
Unknown Object (File)
Feb 22 2025, 1:45 PM
View All 44 Files
Subscribers
imp
jrtc27

Details

Reviewers
None
Commits
rG6a9e7f6a1d35: EC2: Make amazon-ssm-agent optional
rG40ff0753abb9: EC2: Make amazon-ssm-agent optional
Summary

Move it from VM_EXTRA_PACKAGES in ec2.conf to VM_EXTRA_PACKAGES in
ec2-{base,cloud-init}.conf

Sponsored by: Amazon

Diff Detail

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

Revision Contents
Changeset List

PathSize
release/
tools/
4 lines
4 lines
6 lines

Diff 142836

View Options

release/tools/ec2-base.conf

Show First 20 Lines • Show All 1,860 Lines • ▼ Show 20 Lines#endif
else if (acked > 1) else if (acked > 1)
tp->t_acktime = ticks; tp->t_acktime = ticks;
if (tp->snd_una == tp->snd_max) if (tp->snd_una == tp->snd_max)
tcp_timer_activate(tp, TT_REXMT, 0); tcp_timer_activate(tp, TT_REXMT, 0);
else if (!tcp_timer_active(tp, TT_PERSIST)) else if (!tcp_timer_active(tp, TT_PERSIST))
tcp_timer_activate(tp, TT_REXMT, tcp_timer_activate(tp, TT_REXMT,
TP_RXTCUR(tp)); TP_RXTCUR(tp));
sowwakeup(so); sowwakeup(so);
if (sbavail(&so->so_snd)) /*
* Only call tcp_output when there
* is new data available to be sent
* or we need to send an ACK.
*/
if (SEQ_GT(tp->snd_una + sbavail(&so->so_snd),
tp->snd_max) || tp->t_flags & TF_ACKNOW)
(void) tcp_output(tp); (void) tcp_output(tp);
goto check_delack; goto check_delack;
} }
} else if (th->th_ack == tp->snd_una && } else if (th->th_ack == tp->snd_una &&
tlen <= sbspace(&so->so_rcv)) { tlen <= sbspace(&so->so_rcv)) {
int newsize = 0; /* automatic sockbuf scaling */ int newsize = 0; /* automatic sockbuf scaling */
/* /*
▲ Show 20 Lines • Show All 150 Lines • ▼ Show 20 Lines#endif
/* Do window scaling on this connection? */ /* Do window scaling on this connection? */
if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) == if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
(TF_RCVD_SCALE|TF_REQ_SCALE)) { (TF_RCVD_SCALE|TF_REQ_SCALE)) {
tp->rcv_scale = tp->request_r_scale; tp->rcv_scale = tp->request_r_scale;
} }
tp->rcv_adv += min(tp->rcv_wnd, tp->rcv_adv += min(tp->rcv_wnd,
TCP_MAXWIN << tp->rcv_scale); TCP_MAXWIN << tp->rcv_scale);
tp->snd_una++; /* SYN is acked */ tp->snd_una++; /* SYN is acked */
if (SEQ_LT(tp->snd_nxt, tp->snd_una))
tp->snd_nxt = tp->snd_una;
/* /*
* If not all the data that was sent in the TFO SYN * If not all the data that was sent in the TFO SYN
* has been acked, resend the remainder right away. * has been acked, resend the remainder right away.
*/ */
if (IS_FASTOPEN(tp->t_flags) && if (IS_FASTOPEN(tp->t_flags) &&
(tp->snd_una != tp->snd_max)) { (tp->snd_una != tp->snd_max)) {
tp->snd_nxt = th->th_ack; tp->snd_nxt = th->th_ack;
tfo_partial_ack = 1; tfo_partial_ack = 1;
▲ Show 20 Lines • Show All 2,053 Lines • Show Last 20 Lines
View Options

release/tools/ec2-cloud-init.conf

Show First 20 Lines • Show All 1,860 Lines • ▼ Show 20 Lines#endif
else if (acked > 1) else if (acked > 1)
tp->t_acktime = ticks; tp->t_acktime = ticks;
if (tp->snd_una == tp->snd_max) if (tp->snd_una == tp->snd_max)
tcp_timer_activate(tp, TT_REXMT, 0); tcp_timer_activate(tp, TT_REXMT, 0);
else if (!tcp_timer_active(tp, TT_PERSIST)) else if (!tcp_timer_active(tp, TT_PERSIST))
tcp_timer_activate(tp, TT_REXMT, tcp_timer_activate(tp, TT_REXMT,
TP_RXTCUR(tp)); TP_RXTCUR(tp));
sowwakeup(so); sowwakeup(so);
if (sbavail(&so->so_snd)) /*
* Only call tcp_output when there
* is new data available to be sent
* or we need to send an ACK.
*/
if (SEQ_GT(tp->snd_una + sbavail(&so->so_snd),
tp->snd_max) || tp->t_flags & TF_ACKNOW)
(void) tcp_output(tp); (void) tcp_output(tp);
goto check_delack; goto check_delack;
} }
} else if (th->th_ack == tp->snd_una && } else if (th->th_ack == tp->snd_una &&
tlen <= sbspace(&so->so_rcv)) { tlen <= sbspace(&so->so_rcv)) {
int newsize = 0; /* automatic sockbuf scaling */ int newsize = 0; /* automatic sockbuf scaling */
/* /*
▲ Show 20 Lines • Show All 150 Lines • ▼ Show 20 Lines#endif
/* Do window scaling on this connection? */ /* Do window scaling on this connection? */
if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) == if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
(TF_RCVD_SCALE|TF_REQ_SCALE)) { (TF_RCVD_SCALE|TF_REQ_SCALE)) {
tp->rcv_scale = tp->request_r_scale; tp->rcv_scale = tp->request_r_scale;
} }
tp->rcv_adv += min(tp->rcv_wnd, tp->rcv_adv += min(tp->rcv_wnd,
TCP_MAXWIN << tp->rcv_scale); TCP_MAXWIN << tp->rcv_scale);
tp->snd_una++; /* SYN is acked */ tp->snd_una++; /* SYN is acked */
if (SEQ_LT(tp->snd_nxt, tp->snd_una))
tp->snd_nxt = tp->snd_una;
/* /*
* If not all the data that was sent in the TFO SYN * If not all the data that was sent in the TFO SYN
* has been acked, resend the remainder right away. * has been acked, resend the remainder right away.
*/ */
if (IS_FASTOPEN(tp->t_flags) && if (IS_FASTOPEN(tp->t_flags) &&
(tp->snd_una != tp->snd_max)) { (tp->snd_una != tp->snd_max)) {
tp->snd_nxt = th->th_ack; tp->snd_nxt = th->th_ack;
tfo_partial_ack = 1; tfo_partial_ack = 1;
▲ Show 20 Lines • Show All 2,053 Lines • Show Last 20 Lines
View Options

release/tools/ec2.conf

Show First 20 Lines • Show All 1,860 Lines • ▼ Show 20 Lines#endif
else if (acked > 1) else if (acked > 1)
tp->t_acktime = ticks; tp->t_acktime = ticks;
if (tp->snd_una == tp->snd_max) if (tp->snd_una == tp->snd_max)
tcp_timer_activate(tp, TT_REXMT, 0); tcp_timer_activate(tp, TT_REXMT, 0);
else if (!tcp_timer_active(tp, TT_PERSIST)) else if (!tcp_timer_active(tp, TT_PERSIST))
tcp_timer_activate(tp, TT_REXMT, tcp_timer_activate(tp, TT_REXMT,
TP_RXTCUR(tp)); TP_RXTCUR(tp));
sowwakeup(so); sowwakeup(so);
if (sbavail(&so->so_snd)) /*
* Only call tcp_output when there
* is new data available to be sent
* or we need to send an ACK.
*/
if (SEQ_GT(tp->snd_una + sbavail(&so->so_snd),
tp->snd_max) || tp->t_flags & TF_ACKNOW)
(void) tcp_output(tp); (void) tcp_output(tp);
goto check_delack; goto check_delack;
} }
} else if (th->th_ack == tp->snd_una && } else if (th->th_ack == tp->snd_una &&
tlen <= sbspace(&so->so_rcv)) { tlen <= sbspace(&so->so_rcv)) {
int newsize = 0; /* automatic sockbuf scaling */ int newsize = 0; /* automatic sockbuf scaling */
/* /*
▲ Show 20 Lines • Show All 150 Lines • ▼ Show 20 Lines#endif
/* Do window scaling on this connection? */ /* Do window scaling on this connection? */
if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) == if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) ==
(TF_RCVD_SCALE|TF_REQ_SCALE)) { (TF_RCVD_SCALE|TF_REQ_SCALE)) {
tp->rcv_scale = tp->request_r_scale; tp->rcv_scale = tp->request_r_scale;
} }
tp->rcv_adv += min(tp->rcv_wnd, tp->rcv_adv += min(tp->rcv_wnd,
TCP_MAXWIN << tp->rcv_scale); TCP_MAXWIN << tp->rcv_scale);
tp->snd_una++; /* SYN is acked */ tp->snd_una++; /* SYN is acked */
if (SEQ_LT(tp->snd_nxt, tp->snd_una))
tp->snd_nxt = tp->snd_una;
/* /*
* If not all the data that was sent in the TFO SYN * If not all the data that was sent in the TFO SYN
* has been acked, resend the remainder right away. * has been acked, resend the remainder right away.
*/ */
if (IS_FASTOPEN(tp->t_flags) && if (IS_FASTOPEN(tp->t_flags) &&
(tp->snd_una != tp->snd_max)) { (tp->snd_una != tp->snd_max)) {
tp->snd_nxt = th->th_ack; tp->snd_nxt = th->th_ack;
tfo_partial_ack = 1; tfo_partial_ack = 1;
▲ Show 20 Lines • Show All 2,053 Lines • Show Last 20 Lines