mptcp.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: "Y.b. Lu" <yangbo.lu@nxp.com>
To: Mat Martineau <mathew.j.martineau@linux.intel.com>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"linux-kselftest@vger.kernel.org"
	<linux-kselftest@vger.kernel.org>,
	"mptcp@lists.linux.dev" <mptcp@lists.linux.dev>,
	Richard Cochran <richardcochran@gmail.com>,
	"David S . Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	Matthieu Baerts <matthieu.baerts@tessares.net>,
	Shuah Khan <shuah@kernel.org>, Michal Kubecek <mkubecek@suse.cz>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Andrew Lunn <andrew@lunn.ch>, Rui Sousa <rui.sousa@nxp.com>,
	Sebastien Laveze <sebastien.laveze@nxp.com>
Subject: RE: [net-next, v4, 08/11] net: sock: extend SO_TIMESTAMPING for PHC binding
Date: Wed, 30 Jun 2021 08:29:56 +0000	[thread overview]
Message-ID: <AM6PR04MB50160B2B6FB6ADA46EAF76E1F8019@AM6PR04MB5016.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <8e78961d-238f-fd22-42b-999c3647a328@linux.intel.com>

Hi Mat,

> -----Original Message-----
> From: Mat Martineau <mathew.j.martineau@linux.intel.com>
> Sent: 2021年6月26日 9:00
> To: Y.b. Lu <yangbo.lu@nxp.com>
> Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org;
> linux-kselftest@vger.kernel.org; mptcp@lists.linux.dev; Richard Cochran
> <richardcochran@gmail.com>; David S . Miller <davem@davemloft.net>;
> Jakub Kicinski <kuba@kernel.org>; Matthieu Baerts
> <matthieu.baerts@tessares.net>; Shuah Khan <shuah@kernel.org>; Michal
> Kubecek <mkubecek@suse.cz>; Florian Fainelli <f.fainelli@gmail.com>;
> Andrew Lunn <andrew@lunn.ch>; Rui Sousa <rui.sousa@nxp.com>; Sebastien
> Laveze <sebastien.laveze@nxp.com>
> Subject: Re: [net-next, v4, 08/11] net: sock: extend SO_TIMESTAMPING for
> PHC binding
> 
> On Fri, 25 Jun 2021, Yangbo Lu wrote:
> 
[...]
> > diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
> > index ea38cbcd2ad4..e20aefc20d75 100644
> > --- a/net/mptcp/sockopt.c
> > +++ b/net/mptcp/sockopt.c
> > @@ -207,14 +207,26 @@ static int
> mptcp_setsockopt_sol_socket_timestamping(struct mptcp_sock *msk,
> > {
> > 	struct mptcp_subflow_context *subflow;
> > 	struct sock *sk = (struct sock *)msk;
> > +	struct so_timestamping timestamping;
> > 	int val, ret;
> >
> > -	ret = mptcp_get_int_option(msk, optval, optlen, &val);
> > -	if (ret)
> > -		return ret;
> > +	if (optlen == sizeof(timestamping)) {
> > +		if (copy_from_sockptr(&timestamping, optval,
> > +				      sizeof(timestamping)))
> > +			return -EFAULT;
> > +	} else if (optlen == sizeof(int)) {
> > +		if (copy_from_sockptr(val, optval, sizeof(*val)))
>                                        ^^^
> 
> As the kbuild bot noted, this needs to be a pointer. You could pass in
> &timestamping.flags and you wouldn't need the 'val' variable at all.
> 
> 

Ok, I sent v5 to fix.
Sorry for the trouble. It seemed my test config missed to enable MPTCP.

Thanks.

> -Mat
> 
> 
> > +			return -EFAULT;
> > +
> > +		memset(&timestamping, 0, sizeof(timestamping));
> > +		timestamping.flags = val;
> > +	} else {
> > +		return -EINVAL;
> > +	}
> >
> > 	ret = sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname,
> > -			      KERNEL_SOCKPTR(&val), sizeof(val));
> > +			      KERNEL_SOCKPTR(&timestamping),
> > +			      sizeof(timestamping));
> > 	if (ret)
> > 		return ret;
> >
> > @@ -224,7 +236,7 @@ static int
> mptcp_setsockopt_sol_socket_timestamping(struct mptcp_sock *msk,
> > 		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
> > 		bool slow = lock_sock_fast(ssk);
> >
> > -		sock_set_timestamping(sk, optname, val);
> > +		sock_set_timestamping(sk, optname, timestamping);
> > 		unlock_sock_fast(ssk, slow);
> > 	}
> >
> > --
> > 2.25.1
> >
> >
> 
> --
> Mat Martineau
> Intel

  reply	other threads:[~2021-06-30  8:29 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-25  9:35 [net-next, v4, 00/11] ptp: support virtual clocks and timestamping Yangbo Lu
2021-06-25  9:35 ` [net-next, v4, 01/11] ptp: add ptp virtual clock driver framework Yangbo Lu
2021-06-25  9:35 ` [net-next, v4, 02/11] ptp: support ptp physical/virtual clocks conversion Yangbo Lu
2021-06-27  9:50   ` [ptp] d7b8e363d0: BUG:kernel_NULL_pointer_dereference,address kernel test robot
2021-06-25  9:35 ` [net-next, v4, 03/11] ptp: track available ptp vclocks information Yangbo Lu
2021-06-25  9:35 ` [net-next, v4, 04/11] ptp: add kernel API ptp_get_vclocks_index() Yangbo Lu
2021-06-25  9:35 ` [net-next, v4, 05/11] ethtool: add a new command for getting PHC virtual clocks Yangbo Lu
2021-08-29 17:04   ` Michal Kubecek
2021-06-25  9:35 ` [net-next, v4, 06/11] ptp: add kernel API ptp_convert_timestamp() Yangbo Lu
2021-06-25  9:35 ` [net-next, v4, 07/11] mptcp: setsockopt: convert to mptcp_setsockopt_sol_socket_timestamping() Yangbo Lu
2021-06-25  9:35 ` [net-next, v4, 08/11] net: sock: extend SO_TIMESTAMPING for PHC binding Yangbo Lu
2021-06-25 14:19   ` kernel test robot
2021-06-26  0:59   ` Mat Martineau
2021-06-30  8:29     ` Y.b. Lu [this message]
2021-06-25  9:35 ` [net-next, v4, 09/11] net: socket: support hardware timestamp conversion to PHC bound Yangbo Lu
2021-06-25  9:35 ` [net-next, v4, 10/11] selftests/net: timestamping: support binding PHC Yangbo Lu
2021-06-26  0:26   ` kernel test robot
2021-06-25  9:35 ` [net-next, v4, 11/11] MAINTAINERS: add entry for PTP virtual clock driver Yangbo Lu

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=AM6PR04MB50160B2B6FB6ADA46EAF76E1F8019@AM6PR04MB5016.eurprd04.prod.outlook.com \
    --to=yangbo.lu@nxp.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=mathew.j.martineau@linux.intel.com \
    --cc=matthieu.baerts@tessares.net \
    --cc=mkubecek@suse.cz \
    --cc=mptcp@lists.linux.dev \
    --cc=netdev@vger.kernel.org \
    --cc=richardcochran@gmail.com \
    --cc=rui.sousa@nxp.com \
    --cc=sebastien.laveze@nxp.com \
    --cc=shuah@kernel.org \
    --subject='RE: [net-next, v4, 08/11] net: sock: extend SO_TIMESTAMPING for PHC binding' \
    /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

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).