dns_resolver: Allow used keys to be invalidated

Allow used DNS resolver keys to be invalidated after use if the caller is
doing its own caching of the results.  This reduces the amount of resources
required.

Fix AFS to invalidate DNS results to kill off permanent failure records
that get lodged in the resolver keyring and prevent future lookups from
happening.

Fixes: 0a5143f2f89c ("afs: Implement VL server rotation")
Signed-off-by: David Howells <dhowells@redhat.com>

7 files changed, 12 insertions, 7 deletions

diff --git a/fs/afs/addr_list.c b/fs/afs/addr_list.c
index 967db336d11a..9eaff55df7b4 100644
--- a/fs/afs/addr_list.c
+++ b/fs/afs/addr_list.c
@@ -251,7 +251,7 @@ struct afs_vlserver_list *afs_dns_query(struct afs_cell *cell, time64_t *_expiry
         _enter("%s", cell->name);
 
         ret = dns_query("afsdb", cell->name, cell->name_len, "srv=1",
-                        &result, _expiry);
+                        &result, _expiry, true);
         if (ret < 0) {
                 _leave(" = %d [dns]", ret);
                 return ERR_PTR(ret);
diff --git a/fs/afs/dynroot.c b/fs/afs/dynroot.c
index a9ba81ddf154..07484b5a3bbb 100644
--- a/fs/afs/dynroot.c
+++ b/fs/afs/dynroot.c
@@ -46,7 +46,7 @@ static int afs_probe_cell_name(struct dentry *dentry)
                 return 0;
         }
 
-        ret = dns_query("afsdb", name, len, "srv=1", NULL, NULL);
+        ret = dns_query("afsdb", name, len, "srv=1", NULL, NULL, false);
         if (ret == -ENODATA)
                 ret = -EDESTADDRREQ;
         return ret;
diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c
index 7ede7306599f..1e21b2528cfb 100644
--- a/fs/cifs/dns_resolve.c
+++ b/fs/cifs/dns_resolve.c
@@ -77,7 +77,7 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)
                 goto name_is_IP_address;
 
         /* Perform the upcall */
-        rc = dns_query(NULL, hostname, len, NULL, ip_addr, NULL);
+        rc = dns_query(NULL, hostname, len, NULL, ip_addr, NULL, false);
         if (rc < 0)
                 cifs_dbg(FYI, "%s: unable to resolve: %*.*s\n",
                          __func__, len, len, hostname);
diff --git a/fs/nfs/dns_resolve.c b/fs/nfs/dns_resolve.c
index a7d3df85736d..e6a700f01452 100644
--- a/fs/nfs/dns_resolve.c
+++ b/fs/nfs/dns_resolve.c
@@ -22,7 +22,7 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen,
         char *ip_addr = NULL;
         int ip_len;
 
-        ip_len = dns_query(NULL, name, namelen, NULL, &ip_addr, NULL);
+        ip_len = dns_query(NULL, name, namelen, NULL, &ip_addr, NULL, false);
         if (ip_len > 0)
                 ret = rpc_pton(net, ip_addr, ip_len, sa, salen);
         else
diff --git a/include/linux/dns_resolver.h b/include/linux/dns_resolver.h
index 34a744a1bafc..f2b3ae22e6b7 100644
--- a/include/linux/dns_resolver.h
+++ b/include/linux/dns_resolver.h
@@ -27,6 +27,7 @@
 #include <uapi/linux/dns_resolver.h>
 
 extern int dns_query(const char *type, const char *name, size_t namelen,
-                     const char *options, char **_result, time64_t *_expiry);
+                     const char *options, char **_result, time64_t *_expiry,
+                     bool invalidate);
 
 #endif /* _LINUX_DNS_RESOLVER_H */
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 3083988ce729..579d6a1ac7fe 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -1889,7 +1889,7 @@ static int ceph_dns_resolve_name(const char *name, size_t namelen,
                 return -EINVAL;
 
         /* do dns_resolve upcall */
-        ip_len = dns_query(NULL, name, end - name, NULL, &ip_addr, NULL);
+        ip_len = dns_query(NULL, name, end - name, NULL, &ip_addr, NULL, false);
         if (ip_len > 0)
                 ret = ceph_pton(ip_addr, ip_len, ss, -1, NULL);
         else
diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index 19aa32fc1802..2d260432b3be 100644
--- a/net/dns_resolver/dns_query.c
+++ b/net/dns_resolver/dns_query.c
@@ -54,6 +54,7 @@
  * @options: Request options (or NULL if no options)
  * @_result: Where to place the returned data (or NULL)
  * @_expiry: Where to store the result expiry time (or NULL)
+ * @invalidate: Always invalidate the key after use
  *
  * The data will be returned in the pointer at *result, if provided, and the
  * caller is responsible for freeing it.
@@ -69,7 +70,8 @@
  * Returns the size of the result on success, -ve error code otherwise.
  */
 int dns_query(const char *type, const char *name, size_t namelen,
-              const char *options, char **_result, time64_t *_expiry)
+              const char *options, char **_result, time64_t *_expiry,
+              bool invalidate)
 {
         struct key *rkey;
         struct user_key_payload *upayload;
@@ -157,6 +159,8 @@ int dns_query(const char *type, const char *name, size_t namelen,
         ret = len;
 put:
         up_read(&rkey->sem);
+        if (invalidate)
+                key_invalidate(rkey);
         key_put(rkey);
 out:
         kleave(" = %d", ret);