misc: 21.10 Release Notes

Change-Id: I7aa0708d54156166f2dcdc8359e2450a3c4bf9af Type: docs Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
nat: fix static mapping segv
2021-10-27 12:39:32 +00:00 · 2021-10-25 19:53:58 +00:00 · 2021-09-24 16:37:13 +00:00 · 2021-09-23 14:52:28 +02:00
4 changed files with 481 additions and 5 deletions
--- a/.gitreview
+++ b/.gitreview
@ -2,3 +2,4 @@
 host=gerrit.fd.io
 port=29418
 project=vpp
+defaultbranch=stable/2110
--- a/RELEASE.md
+++ b/RELEASE.md
--- a/src/plugins/nat/nat44-ed/nat44_ed.c
+++ b/src/plugins/nat/nat44-ed/nat44_ed.c
@ -3342,7 +3342,7 @@ nat44_ed_add_del_interface_address_cb (ip4_main_t *im, uword opaque,
 	    {
 	      rv = nat44_ed_add_static_mapping (
 		rp->l_addr, address[0], rp->l_port, rp->e_port, rp->proto,
-		rp->vrf_id, ~0, rp->flags, rp->pool_addr, rp->tag);
+		rp->vrf_id, sw_if_index, rp->flags, rp->pool_addr, rp->tag);
 	      if (rv)
 		{
 		  nat_elog_notice_X1 (sm, "add_static_mapping returned %d",
--- a/src/vcl/vcl_private.c
+++ b/src/vcl/vcl_private.c
@ -167,16 +167,19 @@ vcl_worker_alloc_and_init ()
  if (vcl_get_worker_index () != ~0)
    return 0;

+  /* Grab lock before selecting mem thread index */
+  clib_spinlock_lock (&vcm->workers_lock);
+
  /* Use separate heap map entry for worker */
  clib_mem_set_thread_index ();

  if (pool_elts (vcm->workers) == vcm->cfg.max_workers)
    {
      VDBG (0, "max-workers %u limit reached", vcm->cfg.max_workers);
-      return 0;
+      wrk = 0;
+      goto done;
    }

-  clib_spinlock_lock (&vcm->workers_lock);
  wrk = vcl_worker_alloc ();
  vcl_set_worker_index (wrk->wrk_index);
  wrk->thread_id = pthread_self ();
@ -203,9 +206,9 @@ vcl_worker_alloc_and_init ()
  vec_reset_length (wrk->mq_msg_vector);
  vec_validate (wrk->unhandled_evts_vector, 128);
  vec_reset_length (wrk->unhandled_evts_vector);
-  clib_spinlock_unlock (&vcm->workers_lock);

 done:
+  clib_spinlock_unlock (&vcm->workers_lock);
  return wrk;
 }
Author	SHA1	Message	Date
Andrew Yourtchenko	0e0384cde9	misc: 21.10 Release Notes Change-Id: I7aa0708d54156166f2dcdc8359e2450a3c4bf9af Type: docs Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>	2021-10-27 12:39:32 +00:00
Joshua Roys	9298a7ec0c	nat: fix static mapping segv Adding a nat44 static mapping during startup on a DHCP interface leads to a segv via this path: - dhcp_client_acquire_address - ip4_add_del_interface_address - ip4_add_del_interface_address_internal - nat44_ed_add_del_interface_address_cb - nat44_ed_add_static_mapping - ip4_interface_first_address Type: fix Signed-off-by: Joshua Roys <roysjosh@gmail.com> Change-Id: I38dac8a096b052550f2b87b4e13a950d2cd868b0 (cherry picked from commit f9074fc51544d1849a2df06713c1ccf6cb2eb908)	2021-10-25 19:53:58 +00:00
Florin Coras	c1931b2f09	vcl: grab wrk create lock sooner Type: fix Signed-off-by: Florin Coras <fcoras@cisco.com> Change-Id: I0faeef20c57486564122e39f01f31c8c45f38014 (cherry picked from commit 94fef3e67662c6a92e32164d8db6fcf4bc83e79e)	2021-09-24 16:37:13 +00:00
Andrew Yourtchenko	fd9d936b3c	misc: Initial changes for stable/2110 branch Change-Id: Ib3bf8f46a987324be4c7f016b96027558e9d58ef Type: docs Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>	2021-09-23 14:52:28 +02:00