Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: Ingo Molnar <mingo.kernel.org@gmail.com>
Date:   Sat, 6 Mar 2021 14:14:42 +0100
From:   Ingo Molnar <mingo@kernel.org>
To:     Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc:     Peter Zijlstra <peterz@infradead.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@redhat.com>,
        Namhyung Kim <namhyung@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: "struct perf_sample_data" alignment
Message-ID: <20210306131442.GA552533@gmail.com>
References: <CAHk-=wgQWHDUFjzmAazg8WN0BR7nOyHmduj-MV1GWWDUu+UKCQ@mail.gmail.com>
 <YEHtjioucovbxbRt@hirez.programming.kicks-ass.net>
 <YEJG8v/sCxsG5Lsg@hirez.programming.kicks-ass.net>
 <CAADnVQLBrdBggyP1kBVrRQ2JDG+-5HzWAiLR7e-bNuLsKu2PkQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAADnVQLBrdBggyP1kBVrRQ2JDG+-5HzWAiLR7e-bNuLsKu2PkQ@mail.gmail.com>
Precedence: bulk


* Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote:

> > This seems to be it... (completely untested)
> >
> > ---
> > diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
> > index 3f7f89ea5e51..918a296d2ca2 100644
> > --- a/include/linux/perf_event.h
> > +++ b/include/linux/perf_event.h
> > @@ -1032,7 +1032,9 @@ struct perf_sample_data {
> >         u64                             cgroup;
> >         u64                             data_page_size;
> >         u64                             code_page_size;
> > -} ____cacheline_aligned;
> > +};
> > +
> > +typedef struct perf_sample_data perf_sample_data_t ____cacheline_aligned;
> >
> >  /* default value for data source */
> >  #define PERF_MEM_NA (PERF_MEM_S(OP, NA)   |\
> > diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
> > index b0c45d923f0f..f32c623abef6 100644
> > --- a/kernel/trace/bpf_trace.c
> > +++ b/kernel/trace/bpf_trace.c
> > @@ -923,7 +923,7 @@ __bpf_perf_event_output(struct pt_regs *regs, struct bpf_map *map,
> >   * bpf_perf_event_output
> >   */
> >  struct bpf_trace_sample_data {
> > -       struct perf_sample_data sds[3];
> > +       perf_sample_data_t sds[3];
> 
> bpf side doesn't care about about cacheline aligned.
> No need to add new typedef just for that.

So this structure is not supposed to be exposed to any ABI anywhere.

I did a (non-exhaustive) search of tooling, and there doesn't appear 
to be any accidental exposure.

The in-kernel ABI interaction appears to be the following:

 - In __perf_event_header_size() we only use fields within 
   perf_sample_data to size the header. Alignment won't change any of 
   the output.

 - Ditto in perf_event__id_header_size().

I.e. I think we should just zap it per the patch below (untested).

Thanks,

	Ingo

============>

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 3f7f89ea5e51..d75e03ff31ea 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -1032,7 +1032,7 @@ struct perf_sample_data {
 	u64				cgroup;
 	u64				data_page_size;
 	u64				code_page_size;
-} ____cacheline_aligned;
+};
 
 /* default value for data source */
 #define PERF_MEM_NA (PERF_MEM_S(OP, NA)   |\