apf: Tweak the interpreter data addressing schemeandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev

After releasing APFv3, we realized that addressing memory from the top
could be simplified by adjusting a few details:

1) The APF interpreter now receives a single unified buffer containing
both the program bytecode and the data segment, unambiguously matching
the memory layout seen by installApfPacketFilter() and
readApfPacketFilter().

2) Data address zero coincides with the beginning of the APF program,
thus decoupling data addresses from the length of the program (which
could change between invokations of installApfPacketFilter()). This
simplifies the ApfGenerator by not requiring a data relocation step
similar to jump relocation.

3) For convenience, the interpreter pre-fills one volatile memory slot
with the total size of the APF buffer. The APF program can load this
value into a register to efficiently write near the end of the data
segment, thus allowing the program-data boundary to shift freely.

4) Negative addresses wrap around the end of the data buffer, such that
address -1 coincides with the last byte of the buffer.

5) The immediate offet of LDDW and SDDW are now sign-extended, such that
small negative offsets can be encoded as a 1-byte immediate. This,
combined with the modular addressing at (4), can be used to address
memory cells near the end of the data region with 2-byte opcodes.

Overall, the above changes allow building a simple 32bit counter with
a sequence more or less like this:

 2  li R1, -4          ; R1  = -4 (last 32bit word of data)
 1  lddw R0, [R1 + 0]  ; R0  = old counter value
 2  add R0, 42         ; Increment counter by some value
 1  stdw R0, [R1 + 0]  ; Write back the new value

Total: 6 bytes. Note how the above bytecode is independent of the actual
size of the program and data segments. To reduce bytecode size,
the counter increment sequence can be moved to an "IncrementAndDrop"
trampoline, taking only 2 bytes more than a direct jump to DROP:

 2  li R1, -12         ; R0 = counter offset (third to last counter)
 3  jmp CountAndDrop  ; (could be 2 bytes if jumping nearby)
 ...
CountAndDrop:
 1  lddw R0, [R1+0]   ; R0 = old counter value
 2  add R0, 1         ; Increment counter
 1  stdw R0, [R1+0]   ; Write back updated value
 3  jmp DROP          ; cya!

Adding a 1-byte INC instruction would make things a little nicer.

Change-Id: Ia9b25e49e127a48d7344ddc60b17c93d6421ab7d
Bug: 73804303
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
(cherry picked from commit 17c1fbc9e98e380e508fa83d0f927bc742a5161b)

1 files changed, 13 insertions, 5 deletions

diff --git a/apf_run.c b/apf_run.c
index 3d654cf..d485b71 100644
--- a/apf_run.c
+++ b/apf_run.c
@@ -74,14 +74,22 @@ int main(int argc, char* argv[]) {
     uint8_t* data = NULL;
     uint32_t data_len = argc > 3 ? parse_hex(argv[3], &data) : 0;
     uint32_t filter_age = argc > 4 ? atoi(argv[4]) : 0;
-    int ret = accept_packet(program, program_len, packet, packet_len,
-                            data, data_len, filter_age);
-    printf("Packet %sed\n", ret ? "pass" : "dropp");
+
+    // Combine the program and data into the unified APF buffer.
     if (data) {
+        program = realloc(program, program_len + data_len);
+        memcpy(program + program_len, data, data_len);
+        free(data);
+    }
+
+    uint32_t ram_len = program_len + data_len;
+    int ret = accept_packet(program, program_len, ram_len, packet, packet_len,
+                            filter_age);
+    printf("Packet %sed\n", ret ? "pass" : "dropp");
+    if (data_len) {
         printf("Data: ");
-        print_hex(data, data_len);
+        print_hex(program + program_len, data_len);
         printf("\n");
-        free(data);
     }
     free(program);
     free(packet);