Do I qualifty for a visa-free stay or do I need a Visa?

I booked a round trip flight from United States to Shanghai in July 8th-24th. I only plan to be in Shanghai for 2 days then leaving to Japan, Taiwan, Thailand and then back to Shanghai on the 23rd or 24th to go on a plane back home. I am unsure if I need entry permit. Can you please help?