* linux-next: manual merge of the nfsd tree with the nfs-anna tree
@ 2020-05-29 0:59 Stephen Rothwell
2020-05-29 19:27 ` Chuck Lever
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2020-05-29 0:59 UTC (permalink / raw)
To: J. Bruce Fields, Anna Schumaker, Trond Myklebust, NFS Mailing List
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chuck Lever
[-- Attachment #1: Type: text/plain, Size: 2190 bytes --]
Hi all,
Today's linux-next merge of the nfsd tree got a conflict in:
include/trace/events/sunrpc.h
between commit:
2baebf955125 ("SUNRPC: Split the xdr_buf event class")
from the nfs-anna tree and commit:
998024dee197 ("SUNRPC: Add more svcsock tracepoints")
from the nfsd tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/trace/events/sunrpc.h
index 73193c79fcaa,852413cbb7d9..000000000000
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@@ -14,9 -14,41 +14,42 @@@
#include <linux/net.h>
#include <linux/tracepoint.h>
+ TRACE_DEFINE_ENUM(SOCK_STREAM);
+ TRACE_DEFINE_ENUM(SOCK_DGRAM);
+ TRACE_DEFINE_ENUM(SOCK_RAW);
+ TRACE_DEFINE_ENUM(SOCK_RDM);
+ TRACE_DEFINE_ENUM(SOCK_SEQPACKET);
+ TRACE_DEFINE_ENUM(SOCK_DCCP);
+ TRACE_DEFINE_ENUM(SOCK_PACKET);
+
+ #define show_socket_type(type) \
+ __print_symbolic(type, \
+ { SOCK_STREAM, "STREAM" }, \
+ { SOCK_DGRAM, "DGRAM" }, \
+ { SOCK_RAW, "RAW" }, \
+ { SOCK_RDM, "RDM" }, \
+ { SOCK_SEQPACKET, "SEQPACKET" }, \
+ { SOCK_DCCP, "DCCP" }, \
+ { SOCK_PACKET, "PACKET" })
+
+ /* This list is known to be incomplete, add new enums as needed. */
+ TRACE_DEFINE_ENUM(AF_UNSPEC);
+ TRACE_DEFINE_ENUM(AF_UNIX);
+ TRACE_DEFINE_ENUM(AF_LOCAL);
+ TRACE_DEFINE_ENUM(AF_INET);
+ TRACE_DEFINE_ENUM(AF_INET6);
+
+ #define rpc_show_address_family(family) \
+ __print_symbolic(family, \
+ { AF_UNSPEC, "AF_UNSPEC" }, \
+ { AF_UNIX, "AF_UNIX" }, \
+ { AF_LOCAL, "AF_LOCAL" }, \
+ { AF_INET, "AF_INET" }, \
+ { AF_INET6, "AF_INET6" })
+
-DECLARE_EVENT_CLASS(xdr_buf_class,
+DECLARE_EVENT_CLASS(rpc_xdr_buf_class,
TP_PROTO(
+ const struct rpc_task *task,
const struct xdr_buf *xdr
),
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the nfsd tree with the nfs-anna tree
2020-05-29 0:59 linux-next: manual merge of the nfsd tree with the nfs-anna tree Stephen Rothwell
@ 2020-05-29 19:27 ` Chuck Lever
0 siblings, 0 replies; 3+ messages in thread
From: Chuck Lever @ 2020-05-29 19:27 UTC (permalink / raw)
To: Stephen Rothwell, Bruce Fields
Cc: Anna Schumaker, Trond Myklebust, Linux NFS Mailing List,
Linux Next Mailing List, Linux Kernel Mailing List
> On May 28, 2020, at 8:59 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the nfsd tree got a conflict in:
>
> include/trace/events/sunrpc.h
>
> between commit:
>
> 2baebf955125 ("SUNRPC: Split the xdr_buf event class")
>
> from the nfs-anna tree and commit:
>
> 998024dee197 ("SUNRPC: Add more svcsock tracepoints")
>
> from the nfsd tree.
Alternately, I can provide a v4 nfsd-5.8 series for Bruce that
includes 2baebf955125 ("SUNRPC: Split the xdr_buf event class")
so that these merge conflicts are avoided.
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc include/trace/events/sunrpc.h
> index 73193c79fcaa,852413cbb7d9..000000000000
> --- a/include/trace/events/sunrpc.h
> +++ b/include/trace/events/sunrpc.h
> @@@ -14,9 -14,41 +14,42 @@@
> #include <linux/net.h>
> #include <linux/tracepoint.h>
>
> + TRACE_DEFINE_ENUM(SOCK_STREAM);
> + TRACE_DEFINE_ENUM(SOCK_DGRAM);
> + TRACE_DEFINE_ENUM(SOCK_RAW);
> + TRACE_DEFINE_ENUM(SOCK_RDM);
> + TRACE_DEFINE_ENUM(SOCK_SEQPACKET);
> + TRACE_DEFINE_ENUM(SOCK_DCCP);
> + TRACE_DEFINE_ENUM(SOCK_PACKET);
> +
> + #define show_socket_type(type) \
> + __print_symbolic(type, \
> + { SOCK_STREAM, "STREAM" }, \
> + { SOCK_DGRAM, "DGRAM" }, \
> + { SOCK_RAW, "RAW" }, \
> + { SOCK_RDM, "RDM" }, \
> + { SOCK_SEQPACKET, "SEQPACKET" }, \
> + { SOCK_DCCP, "DCCP" }, \
> + { SOCK_PACKET, "PACKET" })
> +
> + /* This list is known to be incomplete, add new enums as needed. */
> + TRACE_DEFINE_ENUM(AF_UNSPEC);
> + TRACE_DEFINE_ENUM(AF_UNIX);
> + TRACE_DEFINE_ENUM(AF_LOCAL);
> + TRACE_DEFINE_ENUM(AF_INET);
> + TRACE_DEFINE_ENUM(AF_INET6);
> +
> + #define rpc_show_address_family(family) \
> + __print_symbolic(family, \
> + { AF_UNSPEC, "AF_UNSPEC" }, \
> + { AF_UNIX, "AF_UNIX" }, \
> + { AF_LOCAL, "AF_LOCAL" }, \
> + { AF_INET, "AF_INET" }, \
> + { AF_INET6, "AF_INET6" })
> +
> -DECLARE_EVENT_CLASS(xdr_buf_class,
> +DECLARE_EVENT_CLASS(rpc_xdr_buf_class,
> TP_PROTO(
> + const struct rpc_task *task,
> const struct xdr_buf *xdr
> ),
>
--
Chuck Lever
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the nfsd tree with the nfs-anna tree
@ 2020-05-29 1:05 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-05-29 1:05 UTC (permalink / raw)
To: J. Bruce Fields, Anna Schumaker, Trond Myklebust, NFS Mailing List
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chuck Lever
[-- Attachment #1: Type: text/plain, Size: 1526 bytes --]
Hi all,
Today's linux-next merge of the nfsd tree got a conflict in:
net/sunrpc/svc_xprt.c
between commit:
2baebf955125 ("SUNRPC: Split the xdr_buf event class")
from the nfs-anna tree and commit:
ca4faf543a33 ("SUNRPC: Move xpt_mutex into socket xpo_sendto methods")
from the nfsd tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/sunrpc/svc_xprt.c
index 8ef44275c255,c1ff8cdb5b2b..000000000000
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@@ -913,17 -906,11 +906,11 @@@ int svc_send(struct svc_rqst *rqstp
xb->len = xb->head[0].iov_len +
xb->page_len +
xb->tail[0].iov_len;
- trace_svc_sendto(xb);
+ trace_svc_xdr_sendto(rqstp, xb);
-
- /* Grab mutex to serialize outgoing data. */
- mutex_lock(&xprt->xpt_mutex);
trace_svc_stats_latency(rqstp);
- if (test_bit(XPT_DEAD, &xprt->xpt_flags)
- || test_bit(XPT_CLOSE, &xprt->xpt_flags))
- len = -ENOTCONN;
- else
- len = xprt->xpt_ops->xpo_sendto(rqstp);
- mutex_unlock(&xprt->xpt_mutex);
+
+ len = xprt->xpt_ops->xpo_sendto(rqstp);
+
trace_svc_send(rqstp, len);
svc_xprt_release(rqstp);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-29 19:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-29 0:59 linux-next: manual merge of the nfsd tree with the nfs-anna tree Stephen Rothwell
2020-05-29 19:27 ` Chuck Lever
2020-05-29 1:05 Stephen Rothwell
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).