The doctor ordered an X-ray, which shows "joint space narrowing of the patellofemoral compartment" "consistent with degenerative changes." The translates into "a little arthritis," the doctor says, and has prescribed a short course of anti-inflammatories.
If that doesn't fix it, he says we'll send me to an orthopedist.
It's better already, so I'm not too worried.