Can I get a 72 hour visa waiver?

I fly from London to Tokyo. Cruise round Japan and South Korea. Arrive in Shanghai by cruise ship from South Korea and stay in Shanghai for two nights then fly back to the UK. Do I need a full entry permit or do I qualify for the 72 hour free transit waiver?

Thank you