Yes, you will need Canada Visa to get in Canada, but you don't need US visa to come back as long as you have valid I-94, also with you H1-b approval.