Both are fine and mean the same thing, although the second's a colloquial usage - "What are you upset about?" and "What are you upset over?" I really don't know if the second is particularly an American thing, or if the Brits, Aussies, etc. use that post-position too. Btw, "how do I distinguish between..."