2 files changed, 6 insertions, 2 deletions

diff --git a/tools/perf/Documentation/perf-list.txt b/tools/perf/Documentation/perf-list.txt
index 236b9b97dfdb..667c14e56031 100644
--- a/tools/perf/Documentation/perf-list.txt
+++ b/tools/perf/Documentation/perf-list.txt
@@ -55,7 +55,6 @@ counted. The following modifiers exist:
  S - read sample value (PERF_SAMPLE_READ)
  D - pin the event to the PMU
  W - group is weak and will fallback to non-group if not schedulable,
-     only supported in 'perf stat' for now.
 
 The 'p' modifier can be used for specifying how precise the instruction
 address should be. The 'p' modifier can be specified multiple times:
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 10cf889c6d75..488779bc4c8d 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -391,7 +391,12 @@ try_again:
                                         ui__warning("%s\n", msg);
                                 goto try_again;
                         }
-
+                        if ((errno == EINVAL || errno == EBADF) &&
+                            pos->leader != pos &&
+                            pos->weak_group) {
+                                pos = perf_evlist__reset_weak_group(evlist, pos);
+                                goto try_again;
+                        }
                         rc = -errno;
                         perf_evsel__open_strerror(pos, &opts->target,
                                                   errno, msg, sizeof(msg));