Do I need a Visa for Shanghai?

I am arriving in Shanghai on cruise ship QM2 on 26.03.2016, 01:30 and leaving same day at 23:59 for Hong Kong, where I will terminate the cruise on 29.03.2016. I want to stay 2 days in Hong Kong or Macau after the cruise. Departure from Hong Kong will be 31.03.2016 by air.
Nobody seems to be able to tell me if I need an entry permit for those stops. I am Australian citizen traveling on an Australian passport.
My cruise agency advised me that I need an entry permit for PRC, as I will not be able to board the vessel at the beginning of the cruise in Brisbane.
Please advise as my cruise starts on 13.03.2016 from Brisbane.