defer: Add r1 and r2 values to RCU ordering diagrams

Reported-by: Saravanan D <saravanand@fb.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

3 files changed, 85 insertions, 36 deletions

diff --git a/defer/RCUGuaranteeFwd.svg b/defer/RCUGuaranteeFwd.svg
index ecf8c156..a3a3aea0 100644
--- a/defer/RCUGuaranteeFwd.svg
+++ b/defer/RCUGuaranteeFwd.svg
@@ -124,8 +124,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="3.7201446"
-     inkscape:cx="123.2479"
-     inkscape:cy="139.77951"
+     inkscape:cx="221.63117"
+     inkscape:cy="175.66521"
      inkscape:document-units="px"
      inkscape:current-layer="g5416"
      showgrid="false"
@@ -133,11 +133,11 @@
      fit-margin-left="5"
      fit-margin-right="5"
      fit-margin-bottom="5"
-     inkscape:window-width="2326"
-     inkscape:window-height="1465"
-     inkscape:window-x="1514"
-     inkscape:window-y="337"
-     inkscape:window-maximized="0"
+     inkscape:window-width="1846"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
      inkscape:pagecheckerboard="0" />
   <metadata
      id="metadata7">
@@ -187,32 +187,45 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="101.40975"
+           x="119.40975"
            y="800.49298"
            id="text5458"><tspan
              sodipodi:role="line"
-             x="101.40975"
+             x="119.40975"
              y="800.49298"
              id="tspan5462"
-             style="font-size:8px;line-height:1.25;font-family:sans-serif">Given this ordering ...</tspan></text>
+             style="font-size:8px;line-height:1.25;font-family:sans-serif">Given this ordering</tspan></text>
         <text
            id="text5466"
            y="973.47589"
-           x="-9.9471989"
+           x="-37.947197"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
            xml:space="preserve"><tspan
              id="tspan5468"
              y="973.47589"
-             x="-9.9471989"
+             x="-37.947197"
              sodipodi:role="line"
-             style="font-size:8px;line-height:1.25;font-family:sans-serif">.... RCU guarantees this ordering.</tspan></text>
+             style="font-size:8px;line-height:1.25;font-family:sans-serif">.... RCU guarantees this ordering (r2 == 0).</tspan></text>
         <path
            style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
-           d="M 112.24243,68.219555 43.42895,217.88049"
+           d="M 160.99516,70.682917 37.207544,218.2186"
            id="path5470"
            inkscape:connector-curvature="0"
            transform="translate(26.137646,740.75144)"
            sodipodi:nodetypes="cc" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none"
+           x="804.29675"
+           y="-199.22833"
+           id="text35568"
+           transform="rotate(90)"><tspan
+             sodipodi:role="line"
+             id="tspan35566"
+             x="804.29675"
+             y="-199.22833"><tspan
+               style="font-size:8px"
+               id="tspan41444">(r1 == 0) ...</tspan></tspan></text>
       </g>
     </g>
     <g
diff --git a/defer/RCUGuaranteeMid.svg b/defer/RCUGuaranteeMid.svg
index 5b721478..ab1fa25a 100644
--- a/defer/RCUGuaranteeMid.svg
+++ b/defer/RCUGuaranteeMid.svg
@@ -197,11 +197,11 @@
      fit-margin-left="5"
      fit-margin-right="5"
      fit-margin-bottom="5"
-     inkscape:window-width="2224"
-     inkscape:window-height="1484"
-     inkscape:window-x="1602"
-     inkscape:window-y="403"
-     inkscape:window-maximized="0"
+     inkscape:window-width="1846"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
      inkscape:pagecheckerboard="0">
     <inkscape:grid
        type="xygrid"
@@ -263,12 +263,12 @@
         <text
            id="text5466"
            y="891.99835"
-           x="44.399769"
+           x="42.399769"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
            xml:space="preserve"><tspan
              id="tspan5468"
              y="891.99835"
-             x="44.399769"
+             x="42.399769"
              sodipodi:role="line"
              style="font-size:8px;line-height:1.25;font-family:sans-serif">... this can happen</tspan></text>
         <path
@@ -280,14 +280,38 @@
         <text
            id="text5466-7"
            y="848.10419"
-           x="47.993519"
+           x="49.993519"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
            xml:space="preserve"><tspan
              id="tspan5468-2"
              y="848.10419"
-             x="47.993519"
+             x="49.993519"
              sodipodi:role="line"
-             style="font-size:8px;line-height:1.25;font-family:sans-serif">Given this ordering ...</tspan></text>
+             style="font-size:8px;line-height:1.25;font-family:sans-serif">Given this ordering</tspan></text>
+        <text
+           id="text5466-7-3"
+           y="132.93481"
+           x="-838.94916"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+           xml:space="preserve"
+           transform="rotate(-90)"><tspan
+             id="tspan5468-2-6"
+             y="132.93481"
+             x="-838.94916"
+             sodipodi:role="line"
+             style="font-size:8px;line-height:1.25;font-family:sans-serif">(r1 == 1) ....</tspan></text>
+        <text
+           id="text5466-7-3-7"
+           y="-116.00721"
+           x="896.62994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+           xml:space="preserve"
+           transform="rotate(90)"><tspan
+             id="tspan5468-2-6-5"
+             y="-116.00721"
+             x="896.62994"
+             sodipodi:role="line"
+             style="font-size:8px;line-height:1.25;font-family:sans-serif">(r1 == 0) </tspan></text>
       </g>
     </g>
     <g
diff --git a/defer/RCUGuaranteeRev.svg b/defer/RCUGuaranteeRev.svg
index 191a751a..d5b98caf 100644
--- a/defer/RCUGuaranteeRev.svg
+++ b/defer/RCUGuaranteeRev.svg
@@ -189,11 +189,11 @@
      fit-margin-left="5"
      fit-margin-right="5"
      fit-margin-bottom="5"
-     inkscape:window-width="2322"
-     inkscape:window-height="1216"
-     inkscape:window-x="1518"
-     inkscape:window-y="208"
-     inkscape:window-maximized="0"
+     inkscape:window-width="1846"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
      inkscape:pagecheckerboard="0" />
   <metadata
      id="metadata7">
@@ -243,15 +243,15 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-           x="-837.23907"
+           x="-831.23907"
            y="132.1207"
            id="text5458"
            transform="rotate(-90)"><tspan
              sodipodi:role="line"
-             x="-837.23907"
+             x="-831.23907"
              y="132.1207"
              id="tspan5462"
-             style="font-size:8px;line-height:1.25;font-family:sans-serif">this ordering.</tspan></text>
+             style="font-size:8px;line-height:1.25;font-family:sans-serif">ordering (r1 == 1).</tspan></text>
         <text
            id="text5466"
            y="891.99835"
@@ -262,24 +262,36 @@
              y="891.99835"
              x="54.399769"
              sodipodi:role="line"
-             style="font-size:8px;line-height:1.25;font-family:sans-serif">Given this ordering ...</tspan></text>
+             style="font-size:8px;line-height:1.25;font-family:sans-serif">Given this ordering (r2 == 1) ...</tspan></text>
         <path
            style="fill:none;stroke:#000000;stroke-width:0.948683px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
-           d="M 88.499834,879.27124 98.0701,855.77211"
+           d="m 104.49983,879.27124 9.57027,-23.49913"
            id="path5470"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cc" />
         <text
            id="text5466-7"
            y="848.10419"
-           x="53.993519"
+           x="43.993519"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
            xml:space="preserve"><tspan
              id="tspan5468-2"
              y="848.10419"
-             x="53.993519"
+             x="43.993519"
              sodipodi:role="line"
              style="font-size:8px;line-height:1.25;font-family:sans-serif">... RCU guarantees</tspan></text>
+        <text
+           id="text5466-7-3"
+           y="555.25598"
+           x="-653.35986"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+           xml:space="preserve"
+           transform="rotate(-58.073452)"><tspan
+             id="tspan5468-2-6"
+             y="555.25598"
+             x="-653.35986"
+             sodipodi:role="line"
+             style="font-size:8px;line-height:1.25;font-family:sans-serif">this</tspan></text>
       </g>
     </g>
     <g