From: Kent Gibson <warthog618@gmail.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
linux-gpio@vger.kernel.org
Subject: Re: [PATCH v2] gpiolib: Switch to use compat_need_64bit_alignment_fixup() helper
Date: Mon, 12 Oct 2020 21:07:41 +0800 [thread overview]
Message-ID: <20201012130741.GA58711@sol> (raw)
In-Reply-To: <20201008134105.51387-1-andriy.shevchenko@linux.intel.com>
On Thu, Oct 08, 2020 at 04:41:05PM +0300, Andy Shevchenko wrote:
> The new compat_need_64bit_alignment_fixup() helper allows to avoid
> ugly ifdeffery in IOCTL compatible code. Use it in GPIO cdev code.
>
I'd re-arrange that checkin comment to
"Use the new compat_need_64bit_alignment_fixup() helper to avoid
ugly ifdeffery in IOCTL compatibility code."
but otherwise all good.
+1 on the deuglification, and it still works too.
Tested-by: Kent Gibson <warthog618@gmail.com>
> Depends-on: 527c412519eb ("compat: add a compat_need_64bit_alignment_fixup() helper")
> Depends-on: cc7886d25bca ("compat: lift compat_s64 and compat_u64 to <asm-generic/compat.h>")
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> v2: removed lineevent_get_size() completely, fixed typo in commit message
> drivers/gpio/gpiolib-cdev.c | 24 ++++++++----------------
> 1 file changed, 8 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
> index e9faeaf65d14..192721f829a3 100644
> --- a/drivers/gpio/gpiolib-cdev.c
> +++ b/drivers/gpio/gpiolib-cdev.c
> @@ -1479,21 +1479,10 @@ static __poll_t lineevent_poll(struct file *file,
> return events;
> }
>
> -static ssize_t lineevent_get_size(void)
> -{
> -#if defined(CONFIG_X86_64) && !defined(CONFIG_UML)
> - /* i386 has no padding after 'id' */
> - if (in_ia32_syscall()) {
> - struct compat_gpioeevent_data {
> - compat_u64 timestamp;
> - u32 id;
> - };
> -
> - return sizeof(struct compat_gpioeevent_data);
> - }
> -#endif
> - return sizeof(struct gpioevent_data);
> -}
> +struct compat_gpioeevent_data {
> + compat_u64 timestamp;
> + u32 id;
> +};
>
> static ssize_t lineevent_read(struct file *file,
> char __user *buf,
> @@ -1515,7 +1504,10 @@ static ssize_t lineevent_read(struct file *file,
> * actual sizeof() and pass this as an argument to copy_to_user() to
> * drop unneeded bytes from the output.
> */
> - ge_size = lineevent_get_size();
> + if (compat_need_64bit_alignment_fixup())
> + ge_size = sizeof(struct compat_gpioeevent_data);
> + else
> + ge_size = sizeof(struct gpioevent_data);
> if (count < ge_size)
> return -EINVAL;
>
> --
> 2.28.0
>
next prev parent reply other threads:[~2020-10-12 13:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 13:41 [PATCH v2] gpiolib: Switch to use compat_need_64bit_alignment_fixup() helper Andy Shevchenko
2020-10-12 4:20 ` Kent Gibson
2020-10-12 10:03 ` Andy Shevchenko
2020-10-12 13:07 ` Kent Gibson [this message]
2020-10-12 14:00 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201012130741.GA58711@sol \
--to=warthog618@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).