RDS: Add rds_send_path_drop_acked()

rds_send_path_drop_acked() is the path-specific version of
rds_send_drop_acked() to be invoked by MP capable callers.

Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/rds/rds.h b/net/rds/rds.h
index c3b14ccd703703f1673d21ce1b07bcd4de5a7ae7..d94aa36cab9341ad177005b9eab80abf1c0a8bff 100644 (file)
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -786,6 +786,8 @@ void rds_send_drop_to(struct rds_sock *rs, struct sockaddr_in *dest);
 typedef int (*is_acked_func)(struct rds_message *rm, uint64_t ack);
 void rds_send_drop_acked(struct rds_connection *conn, u64 ack,
                         is_acked_func is_acked);
+void rds_send_path_drop_acked(struct rds_conn_path *cp, u64 ack,
+                             is_acked_func is_acked);
 int rds_send_pong(struct rds_connection *conn, __be16 dport);
 struct rds_message *rds_send_get_message(struct rds_connection *,
                                         struct rm_rdma_op *);

diff --git a/net/rds/send.c b/net/rds/send.c
index bfb3e053021389d05a2a2582b4a91c27846d0055..3f6a96cb3b940dab6a187955b2b8c7bd4abde9ab 100644 (file)
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -691,16 +691,16 @@ unlock_and_drop:
  * assigned the m_ack_seq yet - but that's fine as long as tcp_is_acked
  * checks the RDS_MSG_HAS_ACK_SEQ bit.
  */
-void rds_send_drop_acked(struct rds_connection *conn, u64 ack,
-                        is_acked_func is_acked)
+void rds_send_path_drop_acked(struct rds_conn_path *cp, u64 ack,
+                             is_acked_func is_acked)
 {
        struct rds_message *rm, *tmp;
        unsigned long flags;
        LIST_HEAD(list);
 
-       spin_lock_irqsave(&conn->c_lock, flags);
+       spin_lock_irqsave(&cp->cp_lock, flags);
 
-       list_for_each_entry_safe(rm, tmp, &conn->c_retrans, m_conn_item) {
+       list_for_each_entry_safe(rm, tmp, &cp->cp_retrans, m_conn_item) {
                if (!rds_send_is_acked(rm, ack, is_acked))
                        break;
 
@@ -712,11 +712,19 @@ void rds_send_drop_acked(struct rds_connection *conn, u64 ack,
        if (!list_empty(&list))
                smp_mb__after_atomic();
 
-       spin_unlock_irqrestore(&conn->c_lock, flags);
+       spin_unlock_irqrestore(&cp->cp_lock, flags);
 
        /* now remove the messages from the sock list as needed */
        rds_send_remove_from_sock(&list, RDS_RDMA_SUCCESS);
 }
+EXPORT_SYMBOL_GPL(rds_send_path_drop_acked);
+
+void rds_send_drop_acked(struct rds_connection *conn, u64 ack,
+                        is_acked_func is_acked)
+{
+       WARN_ON(conn->c_trans->t_mp_capable);
+       rds_send_path_drop_acked(&conn->c_path[0], ack, is_acked);
+}
 EXPORT_SYMBOL_GPL(rds_send_drop_acked);
 
 void rds_send_drop_to(struct rds_sock *rs, struct sockaddr_in *dest)