Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 71092ea122062012f8e4b7fb2f9a747212d1479c

Authored by Allan Stephens
Committed by Paul Gortmaker
1 parent f137917332
Exists in master and in 40 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, emb_lf-6.6.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

tipc: Add support for SO_RCVTIMEO socket option 

Adds support for the SO_RCVTIMEO socket option to TIPC's socket
receive routines.

Thanks go out to Raj Hegde <rajenhegde@yahoo.ca> for his contribution
to the development and testing this enhancement.

Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Showing 1 changed file with 17 additions and 15 deletions Side-by-side Diff

... ... @@ -58,6 +58,9 @@
58 58 #define tipc_sk(sk) ((struct tipc_sock *)(sk))
59 59 #define tipc_sk_port(sk) ((struct tipc_port *)(tipc_sk(sk)->p))
60 60  
  61 +#define tipc_rx_ready(sock) (!skb_queue_empty(&sock->sk->sk_receive_queue) || \
  62 + (sock->state == SS_DISCONNECTING))
  63 +
61 64 static int backlog_rcv(struct sock *sk, struct sk_buff *skb);
62 65 static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf);
63 66 static void wakeupdispatch(struct tipc_port *tport);
... ... @@ -911,6 +914,7 @@
911 914 struct tipc_port *tport = tipc_sk_port(sk);
912 915 struct sk_buff *buf;
913 916 struct tipc_msg *msg;
  917 + long timeout;
914 918 unsigned int sz;
915 919 u32 err;
916 920 int res;
... ... @@ -927,6 +931,7 @@
927 931 goto exit;
928 932 }
929 933  
  934 + timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
930 935 restart:
931 936  
932 937 /* Look for a message in receive queue; wait if necessary */
933 938  
934 939  
... ... @@ -936,17 +941,15 @@
936 941 res = -ENOTCONN;
937 942 goto exit;
938 943 }
939   - if (flags & MSG_DONTWAIT) {
940   - res = -EWOULDBLOCK;
  944 + if (timeout <= 0L) {
  945 + res = timeout ? timeout : -EWOULDBLOCK;
941 946 goto exit;
942 947 }
943 948 release_sock(sk);
944   - res = wait_event_interruptible(*sk_sleep(sk),
945   - (!skb_queue_empty(&sk->sk_receive_queue) ||
946   - (sock->state == SS_DISCONNECTING)));
  949 + timeout = wait_event_interruptible_timeout(*sk_sleep(sk),
  950 + tipc_rx_ready(sock),
  951 + timeout);
947 952 lock_sock(sk);
948   - if (res)
949   - goto exit;
950 953 }
951 954  
952 955 /* Look at first message in receive queue */
... ... @@ -1034,6 +1037,7 @@
1034 1037 struct tipc_port *tport = tipc_sk_port(sk);
1035 1038 struct sk_buff *buf;
1036 1039 struct tipc_msg *msg;
  1040 + long timeout;
1037 1041 unsigned int sz;
1038 1042 int sz_to_copy, target, needed;
1039 1043 int sz_copied = 0;
... ... @@ -1054,7 +1058,7 @@
1054 1058 }
1055 1059  
1056 1060 target = sock_rcvlowat(sk, flags & MSG_WAITALL, buf_len);
1057   -
  1061 + timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
1058 1062 restart:
1059 1063  
1060 1064 /* Look for a message in receive queue; wait if necessary */
1061 1065  
1062 1066  
... ... @@ -1064,17 +1068,15 @@
1064 1068 res = -ENOTCONN;
1065 1069 goto exit;
1066 1070 }
1067   - if (flags & MSG_DONTWAIT) {
1068   - res = -EWOULDBLOCK;
  1071 + if (timeout <= 0L) {
  1072 + res = timeout ? timeout : -EWOULDBLOCK;
1069 1073 goto exit;
1070 1074 }
1071 1075 release_sock(sk);
1072   - res = wait_event_interruptible(*sk_sleep(sk),
1073   - (!skb_queue_empty(&sk->sk_receive_queue) ||
1074   - (sock->state == SS_DISCONNECTING)));
  1076 + timeout = wait_event_interruptible_timeout(*sk_sleep(sk),
  1077 + tipc_rx_ready(sock),
  1078 + timeout);
1075 1079 lock_sock(sk);
1076   - if (res)
1077   - goto exit;
1078 1080 }
1079 1081  
1080 1082 /* Look at first message in receive queue */