From: Hangbin Liu <liuhangbin@gmail.com>
To: Miroslav Lichvar <mlichvar@redhat.com>,
Richard Cochran <richardcochran@gmail.com>
Cc: Jiri Benc <jbenc@redhat.com>,
netdev@vger.kernel.org, David Miller <davem@davemloft.net>,
Patrick McHardy <kaber@trash.net>,
stefan.sorensen@spectralink.com
Subject: Re: [PATCH net-next] macvlan: pass get_ts_info and SIOC[SG]HWTSTAMP ioctl to real device
Date: Mon, 6 May 2019 15:34:02 +0800 [thread overview]
Message-ID: <20190506073401.GK18865@dhcp-12-139.nay.redhat.com> (raw)
In-Reply-To: <20190425134006.GG18865@dhcp-12-139.nay.redhat.com>
On Thu, Apr 25, 2019 at 09:40:06PM +0800, Hangbin Liu wrote:
> On Tue, Apr 23, 2019 at 11:32:13AM +0200, Miroslav Lichvar wrote:
> > If those values I described above were in an array called ts_map
> > indexed by the RX filter enum, I think the check could just be:
> >
> > (ts_map[old_filter] & ts_map[new_filter]) == tsmap[old_filter]
> >
> > The individual bits would correspond to:
> >
> > PTP_V1_L4_SYNC
> > PTP_V1_L4_DELAY_REQ
> > PTP_V2_L4_SYNC
> > PTP_V2_L4_DELAY_REQ
> > PTP_V2_L2_SYNC
> > PTP_V2_L2_DELAY_REQ
> > NTP_ALL
> >
> > And the remaining RX filters would be combinations of those.
> >
> > --
> Hi Miroslav, Richard,
>
> Here is a draft patch with your idea. I haven't test it and it may has some
> issues. But the logic should looks like what you said. The copy_from/to_user
> is a little ugly, but I haven't come up with a more gentle way.
>
> Would you please help have a look at it and see which way we should use?
> Drop SIOCSHWTSTAMP in container or add a filter on macvlan(maybe only in
> container)?
Hi Richard,
Any suggestion?
Thanks
Hangbin
>
> diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
> index 4a6be8fab884..0f87a42fc61c 100644
> --- a/drivers/net/macvlan.c
> +++ b/drivers/net/macvlan.c
> @@ -824,18 +824,75 @@ static int macvlan_change_mtu(struct net_device *dev, int new_mtu)
> return 0;
> }
>
> +int check_rx_filter(unsigned int new_filter, unsigned int old_filter)
> +{
> + u8 ts_map[HWTSTAMP_FILTER_NTP_ALL];
> +
> + memset(ts_map, 0, sizeof(ts_map));
> +
> + ts_map[HWTSTAMP_FILTER_PTP_V1_L4_SYNC - 1] = 0x01;
> + ts_map[HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ - 1] = 0x02;
> + ts_map[HWTSTAMP_FILTER_PTP_V1_L4_EVENT - 1] = 0x03;
> +
> + ts_map[HWTSTAMP_FILTER_PTP_V2_L4_SYNC - 1] = 0x11;
> + ts_map[HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ - 1] = 0x12;
> + ts_map[HWTSTAMP_FILTER_PTP_V2_L4_EVENT - 1] = 0x13;
> +
> + ts_map[HWTSTAMP_FILTER_PTP_V2_SYNC - 1] = 0x31;
> + ts_map[HWTSTAMP_FILTER_PTP_V2_DELAY_REQ - 1] = 0x32;
> + ts_map[HWTSTAMP_FILTER_PTP_V2_EVENT - 1] = 0x33;
> +
> + ts_map[HWTSTAMP_FILTER_NTP_ALL - 1] = 0xF0;
> + ts_map[HWTSTAMP_FILTER_ALL - 1] = 0xFF;
> +
> + if ((ts_map[new_filter] & ts_map[old_filter]) == ts_map[old_filter])
> + return 0;
> + else
> + return -EACCES;
> +}
> +
> static int macvlan_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
> {
> struct net_device *real_dev = macvlan_dev_real_dev(dev);
> const struct net_device_ops *ops = real_dev->netdev_ops;
> - struct ifreq ifrr;
> + unsigned int old_filter, new_filter, new_tx_type;
> + struct hwtstamp_config new_stmpconf, old_stmpconf;
> int err = -EOPNOTSUPP;
> + struct ifreq ifrr;
> +
> + /* Get new rx_filter */
> + if (copy_from_user(&new_stmpconf, ifr->ifr_data, sizeof(new_stmpconf))) {
> + return -EFAULT;
> + } else {
> + new_tx_type = new_stmpconf.tx_type;
> + new_filter = new_stmpconf.rx_filter;
> + }
>
> + /* Get old rx_filter */
> strncpy(ifrr.ifr_name, real_dev->name, IFNAMSIZ);
> ifrr.ifr_ifru = ifr->ifr_ifru;
>
> + if (netif_device_present(real_dev) && ops->ndo_do_ioctl)
> + err = ops->ndo_do_ioctl(real_dev, &ifrr, SIOCGHWTSTAMP);
> +
> + if (!err && copy_from_user(&old_stmpconf, ifrr.ifr_data, sizeof(old_stmpconf)))
> + old_filter = old_stmpconf.rx_filter;
> + else
> + return err;
> +
> + /* Copy new data back */
> + if (copy_to_user(ifrr.ifr_data, &new_stmpconf, sizeof(new_stmpconf)))
> + return -EFAULT;
> +
> switch (cmd) {
> case SIOCSHWTSTAMP:
> + if (new_tx_type != HWTSTAMP_TX_ON ||
> + new_filter == HWTSTAMP_FILTER_SOME)
> + return err;
> +
> + err = check_rx_filter(new_filter, old_filter);
> + if (err)
> + break;
> case SIOCGHWTSTAMP:
> if (netif_device_present(real_dev) && ops->ndo_do_ioctl)
> err = ops->ndo_do_ioctl(real_dev, &ifrr, cmd);
> --
> 2.19.2
>
next prev parent reply other threads:[~2019-05-06 7:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-20 2:23 [PATCH net-next] macvlan: pass get_ts_info and SIOC[SG]HWTSTAMP ioctl to real device Hangbin Liu
2019-03-20 18:05 ` David Miller
2019-04-17 8:05 ` Hangbin Liu
2019-04-17 15:43 ` Richard Cochran
2019-04-17 18:59 ` Jiri Benc
2019-04-18 3:31 ` Richard Cochran
2019-04-18 6:10 ` Hangbin Liu
2019-04-18 8:05 ` Miroslav Lichvar
2019-04-23 4:18 ` Hangbin Liu
2019-04-23 8:31 ` Miroslav Lichvar
2019-04-23 9:15 ` Hangbin Liu
2019-04-23 9:32 ` Miroslav Lichvar
2019-04-25 13:40 ` Hangbin Liu
2019-05-06 7:34 ` Hangbin Liu [this message]
2019-05-06 14:01 ` Richard Cochran
2019-05-07 8:35 ` Miroslav Lichvar
2019-05-08 1:41 ` Hangbin Liu
2019-05-08 13:58 ` Michal Kubecek
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=20190506073401.GK18865@dhcp-12-139.nay.redhat.com \
--to=liuhangbin@gmail.com \
--cc=davem@davemloft.net \
--cc=jbenc@redhat.com \
--cc=kaber@trash.net \
--cc=mlichvar@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=stefan.sorensen@spectralink.com \
/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).