[8u] RFR: 8143925 : enhancing CounterMode.crypt() for AESCrypt.implEncryptBlock() + 8146581 : Minor corrections to the patch submitted for earlier bug id - 8143925

[Martin Balao]

On 12/20/19 2:18 PM, Anton Kozlov wrote:
> 
> 
> On 20.12.2019 12:13, Andrew John Hughes wrote:
>>> please review a backport of JDK-8143925:
>>> and of JDK-8146581:
>>
>> Please keep to one bug review per thread for simplicity.
> 
> Thanks, we'll do next time. These seemed to be closely related, so I decided that it would be OK.
> 
>> Looks good to me, though I think this warrants a second review from
>> someone more familiar with the HotSpot side.
> 
> OK, waiting for another review before requesting push.
> 

I'm not an official reviewer but I'll have a look at this, as I had my
own 8u backport of 8143925 -which I did not propose due to lack of
time-. I had a quick look and may have some comments. Please hold the push.

It worth noticing that this patch affects AArch64 too (for which I have
a minor patch).

Just in case you want to have a look, I'll share my patch draft (never
made public before):


http://cr.openjdk.java.net/~mbalao/webrevs/8143925/8143925.webrev.8u.hotspot.v0/


Changes from JDK baseline patch:

 * Path changes

 * src/cpu/x86/vm/assembler_x86.cpp
  * 1st hook does not apply cleanly because 8210764 [2], 8132207 [3] and
8145688 [4] are not in 8u. Manually applied changes.
  * 4th hook does not apply cleanly because 8132207 [3] is not in 8u.
Manually applied changes.
  * Removed all instruction attributes

 * src/cpu/x86/vm/assembler_x86.hpp
  * 1st hook does not apply cleanly because 8132207 [3] is not in 8u.
Manually applied changes without further conflicts.

 * src/cpu/x86/vm/stubRoutines_x86.hpp
  * 2nd hook does not apply cleanly because 8134553 [5] is not in 8u.
Manually applied changes without further conflicts.

 * src/cpu/x86/vm/stubRoutines_x86_32.hpp
  * 1st hook does not apply cleanly because 8132160 [6] is not in 8u.
Manually applied changes adding 3800 to the current code_size2 value.

 * src/cpu/x86/vm/stubRoutines_x86_64.hpp
  * 1st hook does not apply cleanly because 8132160 [6] is not in 8u.
Manually applied changes adding 3000 to the current code_size2 value.

 * src/cpu/x86/vm/stubGenerator_x86_64.cpp
  * VM_Version::supports_avx512vlbw is not in 8u because 8210764 [2] has
not been backported. As a result, calling this function is similar to
false. Removed the block under the true case.

 * src/cpu/x86/vm/stubRoutines_x86_32.cpp
  * VM_Version::supports_avx512vlbw is not in 8u because 8210764 [2] has
not been backported. As a result, calling this function is similar to
false. Removed the block under the true case.

 * src/cpu/x86/vm/vm_version_x86.cpp
  * 3rd hook does not apply cleanly because 8134553 [5] is not in 8u.
Manually applied changes. Re-ordered the hooks and added conditionals to
keep the semantics.

 * src/share/vm/classfile/vmSymbols.cpp
  * 1st and 2nd hook do not apply cleanly because 8130832 [7] is not in
8u. These changes are a N/A for 8u.

 * src/share/vm/opto/c2compiler.cpp
  * 1st hook does not apply cleanly because 8130832 [7] is not in 8u.
This change is an N/A for 8u.

 * src/share/vm/opto/library_call.cpp
  * 1st hook does not apply cleanly because 8073583 [8] is not in 8u.
  * Added C param to CheckCastPPNode, ProjNode, CmpINode, BoolNode
allocators

Testing

 * test/compiler/7184394/TestAESMain.java
  * Passed

--
[1] - https://bugs.openjdk.java.net/browse/JDK-8143925
[2] - https://bugs.openjdk.java.net/browse/JDK-8210764
[3] - https://bugs.openjdk.java.net/browse/JDK-8132207
[4] - https://bugs.openjdk.java.net/browse/JDK-8145688
[5] - https://bugs.openjdk.java.net/browse/JDK-8134553
[6] - https://bugs.openjdk.java.net/browse/JDK-8132160
[7] - https://bugs.openjdk.java.net/browse/JDK-8130832
[8] - https://bugs.openjdk.java.net/browse/JDK-8073583