Roger Federer produced his best display of the year to defeat Marin Cilic in four sets in the second round of the French Open.

The 20-time grand slam singles champion overcame frustrations with the umpire and the powerful resilience of his opponent to win 6-2 2-6 7-6 (7-4) 6-2 on Thursday.

The Swiss great holds an 11-1 lead in their head-to-head record, that one defeat coming back in the US Open semi-finals in 2014 when Cilic went on to lift the trophy, and it seemed as though Federer had their latest contest on his racquet early on.

He raced into a 5-1 lead in the first set before closing it out in just 31 minutes, the crowd left stunned when the eighth seed stretched up to produce a remarkable drop-shot return winner.

Matters became trickier in the second set as Cilic went 3-0 ahead and only some precise serve-and-forehand work from Federer prevented the double break.

A curious moment occurred with Cilic leading 3-1 when Federer was issued a time violation when receiving serve at deuce. A bemused Federer spoke at length with the umpire before calling to Cilic, "Am I playing too slow?".

Although far from descending into a shouting match, the incident seemed to throw off Federer, who gifted the set to Cilic with two forehand errors and looked unsettled until he refocused with a ripped backhand winner in the opening game of the third.

Cilic forced the tie-break after Federer had spurned an easy chance for a double break, but a double fault from the world number 47 handed the initiative to his rival, who by this time looked imperious on serve and in control from the baseline.

An ace on his first set point wrapped up the breaker and another Cilic double fault saw him fall a break behind in the fourth. This time, Federer did not allow a sniff of a comeback.

Data Slam: Federer back in the groove with clinical display

More accustomed to facing Cilic in the later stages of majors – he has beaten the Croatian in Wimbledon and Australian Open finals – Federer nonetheless needed to find something close to his best tennis after allowing early control to slip away in only his fourth match since returning after knee surgery.

The 39-year-old fired down 16 aces to one double fault and 47 winners to just 27 unforced errors. As Cilic said before the contest: "No matter the age, Roger has the formula."

WINNERS/UNFORCED ERRORS
Cilic – 43/44
Federer – 47/27

ACES/DOUBLE FAULTS
Cilic – 12/6
Federer – 16/1

BREAK POINTS WON
Cilic – 3/8
Federer – 5/16